merged ashoks changes

This commit is contained in:
Sanj 2011-07-03 06:21:07 +05:30
commit 1179bc6c3e
4 changed files with 9 additions and 6 deletions

Binary file not shown.

View File

@ -16,7 +16,7 @@
{{ filterForm.as_p }} {{ filterForm.as_p }}
<p> <p>
<input type="hidden" name="page_no" id="page_no" value="1" /> <input type="hidden" name="page_no" id="page_no" value="1" />
<input type="submit" value="Submit" id="submitFilter" /> <input type="submit" value="Find" id="submitFilter" />
</p> </p>
</form> </form>
</div> </div>

View File

@ -5,7 +5,7 @@
{% endblock %} {% endblock %}
{% block extra_head %} {% block extra_head %}
<link rel="stylesheet" href="/static/css/main/home.css" /> <link rel="stylesheet" href="/static/css/files/faq.css" />
{% endblock %} {% endblock %}
{% block pageTitle %} {% block pageTitle %}
@ -13,8 +13,11 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="centerSentence"> <div id="faqBlock">
FAQs are here. we should start writing a few. FAQs <br />
<p> Q. Does one need to login in order to use the printing tools? <br />
A. Yes, this is required to establish which documents you have permissions to modify or edit. To do this anonymously, use "guest" </p>
</div> </div>
{% endblock %} {% endblock %}

View File

@ -83,7 +83,7 @@ $(function() {
</div> </div>
<form id="categoryForm" action="" method="POST"> <form id="categoryForm" action="" method="POST">
{{ categoryForm.as_p }} {{ categoryForm.as_p }}
<input id="categorySubmit" value="Submit" type="submit" /> <input id="categorySubmit" value="Begin Uploading" type="submit" />
</form> </form>
</div> </div>
@ -92,7 +92,7 @@ $(function() {
Uploading to: <span id="uploadStudy"></span> Uploading to: <span id="uploadStudy"></span>
</div> </div>
<div id="uploadInstructions"> <div id="uploadInstructions">
Select one or multiple files, or just drag any number of files from your computer into this browser window to upload. You can then view them <a href="http://edgwareroad.org/files/browse/">here</a>. Select one or multiple files, or just drag any number of files from your computer into this browser window to upload. You can then view them <a href="http://edgwareroad.org/sandbox/archive">here</a>.
</div> </div>
<form id="addFile" action="/files/add" method="POST" enctype="multipart/form-data"> <form id="addFile" action="/files/add" method="POST" enctype="multipart/form-data">
<input id="files_category" name="files_category" type="hidden" /> <input id="files_category" name="files_category" type="hidden" />