X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_projectrequest_view.html;h=ae0c18776e1f20ab41ef89a31562f6f0d8e5fc34;hb=bc0ddf61d3ba190e05ce93672270009170e04806;hp=a4c433bca7169efe5f62a207c82ee86b24a500b0;hpb=5c6d3dfae3a4aed1a18a9f1a946655631328351d;p=myslice.git

diff --git a/portal/templates/fed4fire/fed4fire_projectrequest_view.html b/portal/templates/fed4fire/fed4fire_projectrequest_view.html
index a4c433bc..ae0c1877 100644
--- a/portal/templates/fed4fire/fed4fire_projectrequest_view.html
+++ b/portal/templates/fed4fire/fed4fire_projectrequest_view.html
@@ -1,13 +1,24 @@
 {% extends "layout.html" %}
 {% load i18n %}
-
+{% 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">
+         <div class="breadcrumbs" style="line-height: 3;">
+             Experiment &nbsp;>&nbsp; Create or join a Project
+         </div>
+    </div>
+</div>
 <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>
@@ -26,8 +37,57 @@
 {% endif %}
 
 <div class="container tab-content">
+
+    <div class="tab-pane active" id="new"> 
+        
+        <div class="row">
+            <div class="col-sm-6 col-sm-offset-3">
+                <form role="form" method="post" action="/portal/project_request">
+                {% csrf_token %}
+                    <label>
+                        Please insert a name for your project under which you will be able to create slices <br />
+                        <span class="sublabel">
+                         The project name should only contain letters, numbers and the underscore character "_" <br />
+                        </span>
+                    </label>
+                    <div class="form-group">
+                        <input type="text" name="project_name" value="" style="width:100%;" title="The project name should not contain spaces but only letters, numbers and the underscore character" placeholder="Project name" required>
+                    </div>
+                    
+                    <label>
+                        The authority under which your project will be managed <br />
+                        <span class="sublabel">
+                        Before you can access your newly created project a manager of this authority should approve the request
+                        </span>
+                    </label>
+                    <div class="form-group">
+                        <select id="org_name" name="authority_name" class="form-control" style="width:100%" value="{{ organization }}" required> 
+                        {% if authorities %}
+                            {% for authority in authorities %}
+                                {% if authority.name %}
+                                    <option value="{{ authority.authority_hrn }}" {% if authority.authority_hrn == authority_hrn %}selected{% endif %}>{{authority.name}}</option>
+                                {% else %}
+                                    <option value="{{ authority.authority_hrn }}" {% if authority.authority_hrn == authority_hrn %}selected{% endif %}>{{authority.authority_hrn}}</option>
+                                {% endif %}
+                            {% endfor %} 
+                        {% endif %}
+                        </select>
+                    </div>
+                  
+                    <label>
+                        Please provide a description of the purpose for your project
+                    </label>
+                    <div class="form-group">
+                        <textarea id="purpose" name="purpose" class="form-control" rows="6" placeholder="Project description" style="width:100%" title="Purpose of your project (informative)" required="required"></textarea>
+                    </div>
+                    <button type="submit" class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Send Request</button>
+                </form>
+        
+            </div>
+        </div>
+    </div>
     
-	<div class="tab-pane active" id="existing"> 
+	<div class="tab-pane" id="existing"> 
         <div class="row">
             <div class="col-md-6">
                  <h3>Join an existing Project</h3>
@@ -38,9 +98,13 @@
         </div>
         <div class="row">
             <div class="col-md-6">
-                <form role="form" method="post">
+                <form role="form" method="post" action="/portal/project_request">
                 {% csrf_token %}
-                <select id="projects"></select> <button type="submit" class="btn">Join</button>
+                <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">
@@ -48,59 +112,25 @@
                     {% 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="row">
-            <div class="col-md-12">
-                 <h3>Create a new Project</h3>
-            </div>
-        </div>
-    
-        
-        <div class="row">
-            <div class="col-md-12">
-                <form role="form" method="post" action="/portal/project_request">
-                {% csrf_token %}
-                  <div class="form-group">
-                    <input type="text" name="project_name" value="" placeholder="Name" required>
-                  </div>
-                  <div class="form-group">
-                    <select id="org_name" name="authority_name" class="form-control" style="width:590px" value="{{ organization }}" required> 
-                    {% if authorities %}
-                        {% for authority in authorities %}
-                            {% if authority.name %}
-                                <option value="{{ authority.authority_hrn }}">{{authority.name}}</option>
-                            {% else %}
-                                <option value="{{ authority.authority_hrn }}">{{authority.authority_hrn}}</option>
-                            {% endif %}
-                        {% endfor %} 
-                    {% endif %}
-                    </select>
-                  </div>
-                  
-                  
-                  <div class="form-group">
-                    <textarea id="purpose" name="purpose" class="form-control" rows="6" placeholder="Description" style="width:300px" title="Purpose of your project (informative)" required="required"></textarea>
-                  </div>
-                  <button type="submit" class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Send Request</button>
-                </form>
-        
-            </div>
-        </div>
-    </div>
-    
 </div>
 		
 <script>
 $(document).ready(function() {
-    var myprojects = localStorage.getItem('projects');
+    var myprojects = JSON.parse(localStorage.getItem('projects'));
     console.log(myprojects);
     if (myprojects) {
-        
+        $.each(myprojects, function (i, val){
+            console.log(val);
+            $('.project-list').append('<tr><td>'+ val +'</td></tr>');
+        });
     } else {
         $('.project-list').html('<tr><td>no projetcs</td></tr>');
     }
@@ -109,18 +139,26 @@ $(document).ready(function() {
         e.preventDefault();
         $(this).tab('show');
     });
-    $.post("/rest/myslice:authority/",{'fields':['authority_hrn','pi_users'],'filters':{'authority_hrn':'CONTAINS{{ authority_hrn }}' }}, function( data ) {
+    $.post("/rest/myslice:authority/",{'fields':['authority_hrn','pi_users'],'filters':{'authority_hrn':'CONTAINS{{ root_authority_hrn }}' }}, function( data ) {
        
         var projects = [];
         project_row = "<option value=''> - </option>";
         projects.push(project_row);
        
         $.each( data, function( key, val ) {
-            console.log(val);
-            project_row = "<option value='"+val.authority_hrn+"'>"+val.authority_hrn+"</option>";
-            projects.push(project_row);
+            if(val.authority_hrn.split('.').length > 2){
+                if($.inArray(val.authority_hrn, myprojects)==-1){
+                project_row = "<option value='"+val.authority_hrn+"'>"+val.authority_hrn+"</option>";
+                projects.push(project_row);
+                }
+            }
         });
+        $("#projects").show();
+        $("#projects_button").css('margin-left', '50px');
+        $("#projects_button").css('display', 'inline-block');
+        $("#project_loading").hide();
         $("#projects").html(projects.join( "" ));
+        $("#projects").combobox();
     });
 /*
 	
@@ -164,7 +202,7 @@ $(document).ready(function() {
 		localStorage.clear();
 	});
 	// auto-complete the form
-    //jQuery("#org_name").combobox();
+    jQuery("#org_name").combobox();
 
 });
 </script>