X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_slicerequest_view.html;h=729616db6a9e00a76be246934b1590b0dd0f8eef;hb=3946884bca738e49ae7a342cb51ab1dd7de29b5b;hp=7c172d58d438f608d7563c21f5b5da2ac6ea9ead;hpb=5c6d3dfae3a4aed1a18a9f1a946655631328351d;p=unfold.git

diff --git a/portal/templates/fed4fire/fed4fire_slicerequest_view.html b/portal/templates/fed4fire/fed4fire_slicerequest_view.html
index 7c172d58..729616db 100644
--- a/portal/templates/fed4fire/fed4fire_slicerequest_view.html
+++ b/portal/templates/fed4fire/fed4fire_slicerequest_view.html
@@ -34,24 +34,10 @@
 				title="Please enter a name for your slice"required="required">
 			  </div>
 			  <div class="form-group">
-				{% if pi %}
-				<input type="text" class="form-control" id="authority_hrn" name="org_name" style="width:300px" placeholder="Organization" 
-				title="An authority responsible for vetting your slice" required="required">
-				{% else %}
-			    <input type="hidden" class="form-control" id="authority_hrn" name="org_name" placeholder="Organization" style="width:300px;" 
-				title="An authority responsible for vetting your slice" required="required" readonly>
-                <span style="float:left;">Authority: &nbsp;</span>
-                <div id="authority_display">
-                <img src="{{ STATIC_URL }}img/loading.gif" alt="Loading authority" />
-                </div>
-				{% endif %}
+				<input type="text" class="form-control" id="authority_hrn" name="org_name" style="width:300px" placeholder="Project" 
+				title="Select a project under which you want to create your slice. Don't have any project yet! Create/Join project from the dashboard." required="required">
 			  </div>
 			  <div class="form-group">
-                Project: 
-                <select id="project" name="project">
-                </select>
-              </div>
-			  <div class="form-group">
 			    <input type="text" class="form-control" name="url" id="url" style="width:300px" placeholder="Experiment URL (if one exists)"
 				title="Please provide the url of your experiment if you have one." value="{{url}}">
 			  </div>
@@ -59,11 +45,7 @@
 			  	<textarea id="purpose" name="purpose" class="form-control" rows="6" placeholder="Experiment purpose" style="width:300px" 
 				title="Purpose of your experiment (informative)" required="required">{{ purpose }}</textarea>
 			  </div>
-			  {% if pi %}	
 			  <button type="submit" id=submit_pi class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Create slice</button>
-			  {% else %}
-			  <button type="submit" class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Request slice</button>
-			  {% endif %}	
 			</form>
 	
 		</div>
@@ -71,56 +53,22 @@
 		
 <script>
 jQuery(document).ready(function(){
-	
-	$("#authority_hrn").load("/rest/user/", {"fields" : ["parent_authority"], "filters": {"user_hrn": "{{ user_hrn }}"}}, function(data) {
-		var jsonData = JSON.parse(data);
-        $(this).attr("value", jsonData[0]['parent_authority']);
-	    {% if pi %}
-        draw_projects(jsonData[0]['parent_authority']);
-        {% else %}
-        $('#authority_display').html(jsonData[0]['parent_authority']);
-        draw_projects('');
-        {% endif %}
-    });
-
-	{% if pi %}
-	$("#authority_hrn").val("{{authority_name}}");
-	var availableTags = [
-    {% if authorities %}
-        {% for authority in authorities %}
-            {% if authority.name %}
-                {value:"{{ authority.name }}",label:"{{authority.name}}"},
-			// to show only full name
-            {% else %}
-                {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
-            {% endif %}
-        {% endfor %}    
-    {% else %}
-        {value:"",label:"No authority found !!!"}
-    {% endif %}
-    ];
-	// sorting the list
-	availableTags.sort(function(a,b){
-		var nameA=a.value.toLowerCase(), nameB=b.value.toLowerCase();
-		if (nameA < nameB) {
-    		return -1;
-		}
-		if (nameA > nameB) {
-    		return 1;
-		}
-	return 0;
-	}); 
+    var myprojects = JSON.parse(localStorage.getItem('projects'));
     $( "#authority_hrn" ).autocomplete({
-      source: availableTags,
-      minLength: 0,
-      select: function( event, ui ) {
-        draw_projects(jQuery('.ui-state-focus').html());
-      },
+        source: myprojects,
+        change: function (event, ui) {
+                if(!ui.item){
+                    //http://api.jqueryui.com/autocomplete/#event-change -
+                    // The item selected from the menu, if any. Otherwise the property is null
+                    //so clear the item for force selection
+                    $("#authority_hrn").val("");
+                }
+        }
     });
-    {% endif %}
 });
 
-function draw_projects(authority_hrn){
+/*function draw_projects(authority_hrn){
+
     var projects = [];
     project_row = "<option value=''> - </option>";
     projects.push(project_row);
@@ -147,7 +95,9 @@ function draw_projects(authority_hrn){
         });
         $("#project").html(projects.join( "" ));
     }
-}
+    $("#project").show();
+    $("#project_loading").hide();
+}*/
 </script>
 {% endblock %}