From 23292e0a35384f893cbc218ffe04cf8c96bb4847 Mon Sep 17 00:00:00 2001
From: Madhusudan.C.S
Date: Tue, 20 Jul 2010 19:23:40 +0530
Subject: Add scope for all the URLs and adjust the formatting and indentation.

---
 project/templates/_menu.html                       |  3 +-
 project/templates/proceedings/submit.html          | 12 ++-
 .../templates/registration/edit-registration.html  |  2 +-
 project/templates/talk/edit-talk.html              | 18 ++---
 project/templates/talk/submit-talk.html            | 92 ++++++++++------------
 project/templates/talk/talk_list.html              |  1 -
 project/templates/talk/talks-cfp.html              | 64 +++++++++------
 project/templates/user/editprofile.html            |  2 +-
 project/templates/user/password.html               |  7 +-
 project/templates/user/username.html               |  2 +-
 10 files changed, 103 insertions(+), 100 deletions(-)

(limited to 'project/templates')

diff --git a/project/templates/_menu.html b/project/templates/_menu.html
index 0b6b622..cd4af81 100644
--- a/project/templates/_menu.html
+++ b/project/templates/_menu.html
@@ -26,10 +26,11 @@
             Speakers
           </a>
         </li>
-         -->
+         
         {% if user.is_authenticated %}
           <li><a href="/talks-cfp/list-talks/{{ user.id }}">My talks</a></li>
         {% endif %}
+        -->
       </ul>
     </li>
     <li>
diff --git a/project/templates/proceedings/submit.html b/project/templates/proceedings/submit.html
index 013980b..f3aa0a7 100644
--- a/project/templates/proceedings/submit.html
+++ b/project/templates/proceedings/submit.html
@@ -11,7 +11,7 @@
 
     // Set autosuggest options with all plugins activated
     var options = {
-      script:"{% url scipycon_get_usernames %}?limit=10&",
+      script:"{% url scipycon_get_usernames params.scope %}?limit=10&",
       varname:"input",
       json:true,            // Returned response type
       shownoresults:true,       // If disable, display nothing if no results
@@ -41,7 +41,13 @@
 
   {% include '_errors.html' %}
 
-  <form action="{% if id %}{% url scipycon_submit_proceedings id %}{% else %}{% url scipycon_submit_proceedings %}{% endif %}" method="post">
+  <form action="
+      {% if id %}
+          {% url scipycon_submit_proceedings id  params.scope %}
+      {% else %}
+          {% url scipycon_submit_proceedings params.scope %}
+      {% endif %}"
+      method="post">
     {% if not user.is_authenticated %}
     <fieldset>
       <legend>Are you a member of this site?</legend>
@@ -51,7 +57,7 @@
     </fieldset>
   </form>
   <br />
-  <form action="{% url scipycon_submit_proceedings id %}" 
+  <form action="{% url scipycon_submit_proceedings id params.scope %}"
     enctype="multipart/form-data" method="post">
     <fieldset>
       <legend>User Registration</legend>
diff --git a/project/templates/registration/edit-registration.html b/project/templates/registration/edit-registration.html
index 776b325..9231386 100644
--- a/project/templates/registration/edit-registration.html
+++ b/project/templates/registration/edit-registration.html
@@ -7,7 +7,7 @@
 
 {% include '_errors.html' %}
 
-<form action="{% url scipycon_edit_registration id %}"
+<form action="{% url scipycon_edit_registration id params.scope %}"
       method="post">
     <fieldset>
         <legend>Edit Registration</legend>
diff --git a/project/templates/talk/edit-talk.html b/project/templates/talk/edit-talk.html
index 5f4ce97..4d93bdd 100644
--- a/project/templates/talk/edit-talk.html
+++ b/project/templates/talk/edit-talk.html
@@ -6,18 +6,14 @@
 <h1>Edit Talk</h1>
 
 {% include '_errors.html' %}
-<form action="{% url scipycon_edit_talk id %}"
-      method="post">
+<form action="{% url scipycon_edit_talk id params.scope %}" method="post">
     <fieldset>
-        <legend>Edit Talk</legend>
-        <table class="scipycon-default">
-            {{ form }}
-        </table>
-        <button class="button left"
-                type="submit">
-            Save Changes
-        </button>
+      <legend>Edit Talk</legend>
+      <table class="scipycon-default">
+        {{ form }}
+      </table>
+
+      <button class="button left" type="submit">Save Changes</button>
     </fieldset>
 </form>
 {% endblock content %}
-
diff --git a/project/templates/talk/submit-talk.html b/project/templates/talk/submit-talk.html
index 9a40f80..0874f91 100644
--- a/project/templates/talk/submit-talk.html
+++ b/project/templates/talk/submit-talk.html
@@ -3,61 +3,51 @@
 {% block title %}Submit Talk Proposal{% endblock %}
 
 {% block content %}
-    <h1>Submit Talk Proposal</h1>
+  <h1>Submit Talk Proposal</h1>
 
-{% include '_errors.html' %}
+  {% include '_errors.html' %}
 
-        <form action="{% url scipycon_submit_talk %}"
-              method="post">
+  <form action="{% url scipycon_submit_talk params.scope %}" method="post">
     {% if not user.is_authenticated %}
-                <fieldset>
-                    <legend>Are you a member of this site?</legend>
-                    <table class="scipycon-default required">
-                        {{ login_form }}
-                    </table>
-
-                <input type="hidden"
-                       name="action"
-                       value="login" />
-
-            <button class="button left"
-                    type="submit">
-                Login
-            </button>
-                </fieldset>
-
-        </form>
-        <br />
-        <form action="{% url scipycon_submit_talk %}"
-              enctype="multipart/form-data"
-              method="post">
-                <fieldset>
-                    <legend>Speaker Registration</legend>
-                    <table class="scipycon-default required">
-                        {{ register_form }}
-                    </table>
-
-                <input type="hidden"
-                       name="action"
-                       value="register" />
-                </fieldset>
+      <fieldset>
+        <legend>Are you a member of this site?</legend>
+        <table class="scipycon-default required">
+          {{ login_form }}
+        </table>
+
+        <input type="hidden" name="action" value="login" />
+
+        <button class="button left" type="submit">Login</button>
+      </fieldset>
+
+    </form>
+    <br />
+
+    <form action="{% url scipycon_submit_talk %}"
+        enctype="multipart/form-data" method="post">
+      <fieldset>
+        <legend>Speaker Registration</legend>
+        <table class="scipycon-default required">
+          {{ register_form }}
+        </table>
+
+        <input type="hidden" name="action" value="register" />
+      </fieldset>
     {% endif %}
-                <br />
-                <fieldset>
-                    <legend>Talk Submission</legend>
-                    <table class="scipycon-default required">
-                        {{ talk_form }}
-                    </table>
-
-                <button class="button left"
-                        type="submit">
-                    Submit Talk
-                </button>
-                </fieldset>
-        </form>
-    {% if message %}
+    <br />
+
+    <fieldset>
+      <legend>Talk Submission</legend>
+      <table class="scipycon-default required">
+        {{ talk_form }}
+      </table>
+
+      <button class="button left" type="submit">Submit Talk</button>
+    </fieldset>
+  </form>
+  {% if message %}
     <script type="text/javascript">
         $.jGrowl("{{ message }}");
-</script>
-    {% endif %}
+     </script>
+  {% endif %}
 {% endblock content %}
diff --git a/project/templates/talk/talk_list.html b/project/templates/talk/talk_list.html
index b3ee5f1..757c0da 100644
--- a/project/templates/talk/talk_list.html
+++ b/project/templates/talk/talk_list.html
@@ -19,4 +19,3 @@
 {% endfor %}
 </ul>
 {% endblock content %}
-
diff --git a/project/templates/talk/talks-cfp.html b/project/templates/talk/talks-cfp.html
index f01018f..46a601b 100644
--- a/project/templates/talk/talks-cfp.html
+++ b/project/templates/talk/talks-cfp.html
@@ -1,31 +1,43 @@
 {% extends "base.html" %}
 {% block content %}
 <div class="section" id="call-for-papers">
-<h1>Call for Papers</h1>
-<p>We look forward to your submissions on the use of Python for Scientific
-Computing and Education. This includes pedagogy, exploration, modeling
-and analysis from both applied and developmental perspectives. We 
-welcome contributions from academia as well as industry.</p>
-<div class="section" id="submission-of-papers">
-<h2>Submission of Papers</h2>
-<p>If you wish to present your paper using this platform, please submit
-an abstract of 300 to 700 words describing the topic, including its relevance
-to scientific computing. Based on the number and quality of the submissions,
- the conference organizers will allot 10 - 30 minutes for each accepted talk.</p>
-<p>In addition to these talks, there will be an open session of lightning talks,
-during which any attendee who wishes to talk on a pertinent topic is invited to 
- do a presentation not exceeding five minutes in duration.</p>
-<p>If you wish to present a talk at the conference, please follow the guidelines below.</p>
-</div>
-<div class="section" id="submission-guidelines">
-<h2>Submission Guidelines</h2>
-<ul class="simple">
-<li>Submissions should be uploaded via <a href="{% url scipycon_submit_talk %}">the web form.</a></li>
-<li>Submissions whose main purpose is to promote a commercial product or
-service will be refused.</li>
-<li>All accepted proposals must be presented at the SciPy conference by
-at least one author.</li>
-</ul>
-</div>
+  <h1>Call for Papers</h1>
+  <p>
+    We look forward to your submissions on the use of Python for Scientific
+    Computing and Education. This includes pedagogy, exploration, modeling
+    and analysis from both applied and developmental perspectives. We 
+    welcome contributions from academia as well as industry.
+  </p>
+  <div class="section" id="submission-of-papers">
+    <h2>Submission of Papers</h2>
+    <p>
+      If you wish to present your paper using this platform, please submit
+      an abstract of 300 to 700 words describing the topic, including its
+      relevance to scientific computing. Based on the number and quality of
+      the submissions, the conference organizers will allot 10 - 30 minutes
+      for each accepted talk.
+    </p>
+    <p>
+      In addition to these talks, there will be an open session of lightning
+      talks, during which any attendee who wishes to talk on a pertinent topic
+      is invited to do a presentation not exceeding five minutes in duration.
+    </p>
+    <p>
+      If you wish to present a talk at the conference, please follow the
+      guidelines below.
+    </p>
+  </div>
+
+  <div class="section" id="submission-guidelines">
+    <h2>Submission Guidelines</h2>
+    <ul class="simple">
+      <li>Submissions should be uploaded via <a href="
+          {% url scipycon_submit_talk params.scope %}">the web form.</a></li>
+      <li>Submissions whose main purpose is to promote a commercial product
+          or service will be refused.</li>
+      <li>All accepted proposals must be presented at the SciPy conference by
+          at least one author.</li>
+    </ul>
+  </div>
 </div>
 {% endblock content %}
\ No newline at end of file
diff --git a/project/templates/user/editprofile.html b/project/templates/user/editprofile.html
index 67857e8..db9b2c9 100644
--- a/project/templates/user/editprofile.html
+++ b/project/templates/user/editprofile.html
@@ -6,7 +6,7 @@
     <h1>Edit Your Profile</h1>
 
 
-    <form action="{% url scipycon_edit_profile %}"
+    <form action="{% url scipycon_edit_profile params.scope %}"
           enctype="multipart/form-data"
           method="post">
                 <fieldset>
diff --git a/project/templates/user/password.html b/project/templates/user/password.html
index db9b890..9119b42 100644
--- a/project/templates/user/password.html
+++ b/project/templates/user/password.html
@@ -11,7 +11,7 @@
         Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.
     </p>
 
-    <form action="{% url scipycon_password %}" 
+    <form action="{% url scipycon_password params.scope %}"
           method="post">
             <table class="scipycon-default">
                 <tr>
@@ -45,12 +45,11 @@
                     <td></td>
                     <td>
                         <input class="button left" type="submit" value="Change password" />
-                    </td>                    
+                    </td>
                 </tr>
             </table>
         
-        </table>  
+        </table>
     </form>
 
 {% endblock %}
-
diff --git a/project/templates/user/username.html b/project/templates/user/username.html
index 5ebbd1c..3850aa6 100644
--- a/project/templates/user/username.html
+++ b/project/templates/user/username.html
@@ -5,7 +5,7 @@
 {% block content %}
     <h1>Change your username</h1>
 
-    <form action="{% url scipycon_username %}"
+    <form action="{% url scipycon_username params.scope %}"
           method="post">
         <table class="scipycon-default">
             <tr>
-- 
cgit