merged ashoks changes

edgware/templates/files/browser.html

@@ -16,7 +16,7 @@
           {{ filterForm.as_p }}
           <p>
             <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>
         </form>
       </div>

edgware/templates/main/faq.html

@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block extra_head %}
-  <link rel="stylesheet" href="/static/css/main/home.css" />
+  <link rel="stylesheet" href="/static/css/files/faq.css" />
 {% endblock %}
 
 {% block pageTitle %}
@@ -13,8 +13,11 @@
 {% endblock %}
 
 {% block content %}
-  <div class="centerSentence">
-    FAQs are here. we should start writing a few. 
+  <div id="faqBlock">
+    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>
 
 {% endblock %}

edgware/templates/upload_files.html

@@ -83,7 +83,7 @@ $(function() {
       </div>
       <form id="categoryForm" action="" method="POST">
         {{ categoryForm.as_p }}
-        <input id="categorySubmit" value="Submit" type="submit" />
+        <input id="categorySubmit" value="Begin Uploading" type="submit" />
       </form>
     </div>
 
@@ -92,7 +92,7 @@ $(function() {
         Uploading to: <span id="uploadStudy"></span>
       </div>
       <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>
       <form id="addFile" action="/files/add" method="POST" enctype="multipart/form-data">
        <input id="files_category" name="files_category" type="hidden" />