Mercurial > hg > agora-dellsystem
changeset 69:dab85878bac0
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 | 6 files changed, 43 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore +++ b/.hgignore @@ -1,4 +1,8 @@ -syntax: glob -*.pyc +syntax: regexp +.*\.pyc agora.sqlite agora.conf + +.*\.swp$ +.*\.swo$ +^Honza.*/
--- a/settings.py +++ b/settings.py @@ -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 +++ b/templates/base.djhtml @@ -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>
new file mode 100644 --- /dev/null +++ b/templates/bundle/bundle.djhtml @@ -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 +++ b/templates/index.djhtml @@ -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>