From 4136a0d11e6ae80c0fdcfc25dd7ba377426d1220 Mon Sep 17 00:00:00 2001 From: Karen Date: Thu, 30 Jun 2011 19:48:29 +0530 Subject: [PATCH] put upload and browser into brown bar template; small fixes with requirements.txt --- edgware/templates/base.html | 1 + edgware/templates/files/browser.html | 15 +++++++-------- edgware/templates/upload_files.html | 15 ++++++++++++--- requirements.txt | 3 ++- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/edgware/templates/base.html b/edgware/templates/base.html index 9d9709f..e82125f 100644 --- a/edgware/templates/base.html +++ b/edgware/templates/base.html @@ -1,3 +1,4 @@ + diff --git a/edgware/templates/files/browser.html b/edgware/templates/files/browser.html index 56d61f8..4feb9cc 100644 --- a/edgware/templates/files/browser.html +++ b/edgware/templates/files/browser.html @@ -1,11 +1,11 @@ - - - +{% extends 'main_base.html' %} + +{% block extra_head %} - - - +{% endblock %} + +{% block content %}
@@ -26,5 +26,4 @@
- - +{% endblock %} diff --git a/edgware/templates/upload_files.html b/edgware/templates/upload_files.html index cebdbdc..a8d77fd 100644 --- a/edgware/templates/upload_files.html +++ b/edgware/templates/upload_files.html @@ -1,6 +1,14 @@ -{% extends 'base.html' %} +{% extends 'main_base.html' %} -{% block head %} +{% block title %} + Upload Files +{% endblock %} + +{% block pageTitle %} + Edgware Road File Uploader +{% endblock %} + +{% block extra_head %} @@ -92,11 +100,12 @@ $(function() { margin-bottom: 12px; } + {% endblock %} -{% block body %} +{% block content %}
diff --git a/requirements.txt b/requirements.txt index 28439d8..640300b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,9 @@ --e svn+http://code.djangoproject.com/svn/django/trunk/#egg=django +# -e svn+http://code.djangoproject.com/svn/django/trunk/#egg=django -e bzr+http://code.0xdb.org/python-oxdjango/#egg=python-oxdjango -e svn+http://django-tagging.googlecode.com/svn/trunk/#egg=tagging -e bzr+http://firefogg.org/dev/python-firefogg/#egg=python-firefogg -e bzr+http://firefogg.org/dev/django_firefogg/#egg=django_firefogg +-e bzr+http://code.0x2620.org/python-ox/#egg=python-ox django_extensions django-debug-toolbar sorl-thumbnail