CAMP/edgware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

put upload and browser into brown bar template; small fixes with requirements.txt

Browse Source
This commit is contained in:
Karen 2011-06-30 19:48:29 +05:30
parent 62bde4531f
commit 4136a0d11e
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
edgware/templates/base.html
View File

@ -1,3 +1,4 @@
<!doctype html>
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">

15
edgware/templates/files/browser.html
View File

@ -1,11 +1,11 @@
<!doctype html> {% extends 'main_base.html' %}
<html>
<head> {% block extra_head %}
<link rel="stylesheet" href="/static/css/files/browse.css" /> <link rel="stylesheet" href="/static/css/files/browse.css" />
<script type="text/javascript" src="/static/js/jquery.js"></script>
<script type="text/javascript" src="/static/js/files/browse.js"></script> <script type="text/javascript" src="/static/js/files/browse.js"></script>
</head> {% endblock %}
<body>
{% block content %}
<div id="leftCol"> <div id="leftCol">
<div id="fileFilters"> <div id="fileFilters">
<form id="filterForm"> <form id="filterForm">
@ -26,5 +26,4 @@
<div id="previewPane"> <div id="previewPane">
</div> </div>
</body> {% endblock %}
</html>

15
edgware/templates/upload_files.html
View File

@ -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 %}
<script type="text/javascript" src="/static/js/upload/progressbar.js"></script> <script type="text/javascript" src="/static/js/upload/progressbar.js"></script>
<!-- <script type="text/javascript" src="/static/js/upload/firefogg.js"></script> --> <!-- <script type="text/javascript" src="/static/js/upload/firefogg.js"></script> -->
<script type="text/javascript" src="/static/js/upload/upload.js"></script> <script type="text/javascript" src="/static/js/upload/upload.js"></script>
@ -92,11 +100,12 @@ $(function() {
margin-bottom: 12px; margin-bottom: 12px;
} }
</style> </style>
{% endblock %} {% endblock %}
{% block body %} {% block content %}
<div> <div>
<div id="categoryWrapper"> <div id="categoryWrapper">
<div id="categoryHelp"> <div id="categoryHelp">

3
requirements.txt
View File

@ -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 bzr+http://code.0xdb.org/python-oxdjango/#egg=python-oxdjango
-e svn+http://django-tagging.googlecode.com/svn/trunk/#egg=tagging -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/python-firefogg/#egg=python-firefogg
-e bzr+http://firefogg.org/dev/django_firefogg/#egg=django_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_extensions
django-debug-toolbar django-debug-toolbar
sorl-thumbnail sorl-thumbnail