project request fix

[unfold.git] / portal / templates / fed4fire / fed4fire_projectrequest_view.html

diff --git a/portal/templates/fed4fire/fed4fire_projectrequest_view.html b/portal/templates/fed4fire/fed4fire_projectrequest_view.html
index d5885a0..45d8a1a 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_projectrequest_view.html
+++ b/portal/templates/fed4fire/fed4fire_projectrequest_view.html
@@ -1,17 +1,18 @@
 {% extends "layout.html" %}
 {% load i18n %}
-
-{% block content %}
+{% block head %}
 <script src="{{ STATIC_URL }}js/jquery-ui.js"></script>
 <script src="{{ STATIC_URL }}js/jquery-ui-combobox.js"></script>
 <link rel='stylesheet' type='text/css' href="{{ STATIC_URL }}css/jquery-ui.css">
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/jquery.ui.combobox.css">
+{% endblock head %}
+{% block content %}
 <br />
 <div class="row">
     <div class="col-md-12">
         <ul class="nav nav-tabs nav-section">
-            <li class="active"><a href="#existing">Join existing Project</a></li>
-            <li><a href="#new">Create new Project</a></li>
+            <li class="active"><a href="#new">Create new Project</a></li>
+            <li><a href="#existing">Join existing Project</a></li>
             
         </ul>
     </div>
@@ -30,39 +31,8 @@
 {% endif %}
 
 <div class="container tab-content">
-    
-       <div class="tab-pane active" id="existing"> 
-        <div class="row">
-            <div class="col-md-6">
-                 <h3>Join an existing Project</h3>
-            </div>
-            <div class="col-md-6">
-                 <h3>List of projects you are part of</h3>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-6">
-                <form role="form" method="post" action="/portal/project_request">
-                {% csrf_token %}
-                <div id="project_loading" style="display:inline;"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div> 
-                <select id="projects" name="project_name" style="display:none;"></select> <div style="display:none;" id="projects_button"><input type="submit" id="join" name="join" value="Join" class="btn"/></div>
-                </form>
-            </div>
-            <div class="col-md-6">
-                <table class="table project-list">
-                    {% for pending in pending_projects %}
-                    <tr><td>(PENDING) {{ pending.project_name }}</td><td>{{ pending.authority_hrn }}</td><td>{{ pending.created|date:"d/m/Y" }}</td></tr>
-                    {% endfor %}
-                    {% for pending in pending_join_projects %}
-                    <tr><td>(PENDING JOIN) {{ pending.project_name }}</td><td>&nbsp;</td><td>{{ pending.created|date:"d/m/Y" }}</td></tr>
-                    {% endfor %}
 
-                </table>
-            </div>
-        </div>
-    </div>
-    
-    <div class="tab-pane" id="new"> 
+    <div class="tab-pane active" id="new"> 
         <div class="row">
             <div class="col-md-12">
                  <h3>Create a new Project</h3>
@@ -82,9 +52,9 @@
                     {% if authorities %}
                         {% for authority in authorities %}
                             {% if authority.name %}
-                                <option value="{{ authority.authority_hrn }}">{{authority.name}}</option>
+                                <option value="{{ authority.authority_hrn }}" {% if authority.authority_hrn == authority_hrn %}selected{% endif %}>{{authority.name}}</option>
                             {% else %}
-                                <option value="{{ authority.authority_hrn }}">{{authority.authority_hrn}}</option>
+                                <option value="{{ authority.authority_hrn }}" {% if authority.authority_hrn == authority_hrn %}selected{% endif %}>{{authority.authority_hrn}}</option>
                             {% endif %}
                         {% endfor %} 
                     {% endif %}
@@ -102,6 +72,39 @@
         </div>
     </div>
     
+       <div class="tab-pane" id="existing"> 
+        <div class="row">
+            <div class="col-md-6">
+                 <h3>Join an existing Project</h3>
+            </div>
+            <div class="col-md-6">
+                 <h3>List of projects you are part of</h3>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-6">
+                <form role="form" method="post" action="/portal/project_request">
+                {% csrf_token %}
+                <div id="project_loading" style="display:inline;"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div> 
+                <select id="projects" name="project_name" style="display:none;"></select> 
+                <div style="display:none;" id="projects_button">
+                    <input type="submit" id="join" name="join" value="Join" class="btn"/>
+                </div>
+                </form>
+            </div>
+            <div class="col-md-6">
+                <table class="table project-list">
+                    {% for pending in pending_projects %}
+                    <tr><td>(PENDING) {{ pending.project_name }}</td><td>{{ pending.authority_hrn }}</td><td>{{ pending.created|date:"d/m/Y" }}</td></tr>
+                    {% endfor %}
+                    {% for pending in pending_join_projects %}
+                    <tr><td>(PENDING JOIN) {{ pending.project_name }}</td><td>&nbsp;</td><td>{{ pending.created|date:"d/m/Y" }}</td></tr>
+                    {% endfor %}
+
+                </table>
+            </div>
+        </div>
+    </div>
 </div>
                
 <script>