Mercurial > agora-palash

changeset 69:dab85878bac0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge in William's patch
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Mon, 19 Mar 2012 18:19:51 -0400
parents 9c1e26cc80e3 (current diff) cd71470af46c (diff)
children 7f1957f2adb4
files
diffstat 5 files changed, 43 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Mon Mar 19 22:06:39 2012 +0000
+++ b/.hgignore	Mon Mar 19 18:19:51 2012 -0400
@@ -1,4 +1,8 @@
-syntax: glob
-*.pyc
+syntax: regexp
+.*\.pyc
 agora.sqlite
 agora.conf
+
+.*\.swp$
+.*\.swo$
+^Honza.*/
--- a/settings.py	Mon Mar 19 22:06:39 2012 +0000
+++ b/settings.py	Mon Mar 19 18:19:51 2012 -0400
@@ -136,11 +136,11 @@
     'django.contrib.messages',
     'django.contrib.admindocs',
     'django.contrib.admin',
-	'django.contrib.comments',
+#	'django.contrib.comments',
 
     #Third-party apps
     'registration',
-	'threadedcomments',
+#	'threadedcomments',
 
     #Agora apps
     'agora.apps.profile',
--- a/templates/base.djhtml	Mon Mar 19 22:06:39 2012 +0000
+++ b/templates/base.djhtml	Mon Mar 19 18:19:51 2012 -0400
@@ -71,7 +71,7 @@
   <!-- END #container -->
   <div id="footer">
     <p>
-      <a href="http://bitbucket.org/jordigh/agora">HELP US BUILD THIS
+      <a href="http://inversethought.com/hg/hgwebdir.cgi/agora/">HELP US BUILD THIS
       SITE!</a> Clone the source and start contributing.
     </p>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/bundle/bundle.djhtml	Mon Mar 19 18:19:51 2012 -0400
@@ -0,0 +1,33 @@
+{% extends "whitebox.djhtml" %}
+
+{% block content %}
+<div class="info">
+  <h3>
+    {{bundle.name}} by <a href="/{{bundle.uploader}}/">{{bundle.uploader}}</a>
+  </h3>
+
+  {% if files %}
+
+  <div class="whitebox">
+    <p>
+      files:
+    </p>
+    <ul>
+      {% for f in files%}
+      <li><a href="/{{f.bundle_file}}">{{f}}</a></li>
+      {% endfor %}
+    </ul>
+  </div>
+
+  {% else %}
+
+  <div class="whitebox">
+    <p>
+      No files in this bundle!
+    </p>
+  </div>
+
+  {% endif %}
+
+</div>
+{% endblock %}
--- a/templates/index.djhtml	Mon Mar 19 22:06:39 2012 +0000
+++ b/templates/index.djhtml	Mon Mar 19 18:19:51 2012 -0400
@@ -20,7 +20,7 @@
   </h3>
   <div class="whitebox">
     <p>
-      <a href="http://bitbucket.org/jordigh/agora">HELP US BUILD THIS
+      <a href="http://inversethought.com/hg/hgwebdir.cgi/agora/">HELP US BUILD THIS
       SITE!</a> Clone the source and start contributing.
     </p>
   </div>