X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fslicerequest_view.html;h=cd81810d4bf252c49f0eff36ea02620cbc6f653a;hb=d3b9e64c03b27515bbaec94e34722cb1853f15ff;hp=c99ca4df75aaf354fc37822e7ca3b244682d400e;hpb=5b66e750805a71fee70b0f8c0c4b5e4d71174673;p=unfold.git

diff --git a/portal/templates/slicerequest_view.html b/portal/templates/slicerequest_view.html
index c99ca4df..cd81810d 100644
--- a/portal/templates/slicerequest_view.html
+++ b/portal/templates/slicerequest_view.html
@@ -2,83 +2,65 @@
 {% load i18n %}
 
 {% block content %}
+	<div class="row">
+		<div class="col-md-12">
+			<h1><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="Request a Slice" /> Request a new slice</h1>
+		</div>
+	</div>
 
-<div class="row">
-	<h1><img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="Request a Slice" /> Request a new Slice</h1>
-</div>
-{% if errors %}
-<ul>
-  {% for error in errors %}
-  <li>{{ error }}</li>
-  {% endfor %}
-</ul>
-{% endif %}
-
-<div class="row">
-  <form id="commentForm" class="form-horizontal" method="post">
-  {% csrf_token %}
-  <fieldset>
-
-   <div class="form-group">
-     <label for="email" class="col-xs-2 control-label">Experimenter</label>
-     <div class="col-xs-4">
-        <label class="col-xs-2 control-label">{{ email }}</label>
-     </div>
-     <div class="col-xs-6">
-     	<p class="form-hint">Experimenter requesting a Slice</p>
-     </div>
-   </div>
-
-   <div class="form-group">
-     <label for="slice_name" class="col-xs-2 control-label">Slice Name</label>
-     <div class="col-xs-4">
-        <input type="text" name="slice_name" class="form-control" minlength="2" value="{{ slice_name }}" placeholder="Slice Name" required />
-     </div>
-     <div class="col-xs-6"> <p class="form-hint">The name of the slice you wish to create</p> </div>
-   </div>
-
-   <div class="form-group">
-     <label for="authority_hrn" class="col-xs-2 control-label">Authority</label>
-     <div class="col-xs-4">
-       <div class="ui-widget">
-           <input id="authority_hrn" name="authority_hrn" class="form-control" value="{{ authority_hrn }}" placeholder="Authority" required />
-       </div>
-    </div>
-     <div class="col-xs-6"><p class="form-hint">An authority responsible for vetting your slice</p></div>
-   </div>
-
-   <div class="form-group">
-     <label for="number_of_nodes" class="col-xs-2 control-label">Number of nodes</label>
-     <div class="col-xs-4">
-       <div class="ui-widget">
-           <input id="number_of_nodes" name="number_of_nodes" class="form-control" value="{{ number_of_nodes }}" />
-       </div>
-    </div>
-     <div class="col-xs-6"><p class="form-hint">Number of nodes you expect to request (informative)</p></div>
-   </div>
-
-   <div class="form-group">
-     <label for="purpose" class="col-xs-2 control-label">Experiment purpose</label>
-     <div class="col-xs-4">
-       <div class="ui-widget">
-           <textarea id="purpose" name="purpose" class="form-control" style="height:110px;" placeholder="Experiment Purpose" required>{{ purpose }}</textarea>
-       </div>
-    </div>
-     <div class="col-xs-6">
-     	<p class="form-hint">Purpose of your experiment (informative)</p>
-     </div>
-   </div>
-
-	<div class="col-xs-2">
+	{% if errors %}
+	<div class="row">
+		<div class="col-md-12">
+		<ul>
+		  {% for error in errors %}
+		  <li>{{ error }}</li>
+		  {% endfor %}
+		</ul>
+		</div>
 	</div>
-	<div class="col-xs-4">
-		<button class="submit btn btn-default" type="submit">Request Slice</button>
+	{% endif %}
+	
+	<div class="row">
+		<div class="col-md-8 el">
+			<form role="form" method="post">
+			{% csrf_token %}
+			  <div class="form-group" style="display:none">
+			    <input type="email" class="form-control" id="email" style="width:300px" value="{{ email }}" readonly="readonly">
+			  </div>
+			  <div class="form-group">
+			    <input type="text" class="form-control" name="slice_name" id="slice_name" style="width:300px" placeholder="Slice name" 
+				title="Please enter a name for your slice"required="required">
+			  </div>
+			  <div class="form-group">
+                {% if request.session.user.pi %}
+                <input type="text" class="form-control" id="authority_hrn" name="authority_hrn" style="width:300px" placeholder="Authority" 
+				title="An authority responsible for vetting your slice" required="required">
+                {% else %}
+                <input type="text" class="form-control" id="authority_hrn" name="authority_hrn" placeholder="Authority" style="width:300px; display:none;" 
+				title="An authority responsible for vetting your slice" required="required" readonly="readonly">
+                {% endif %}
+			  </div>
+			  <div class="form-group">
+			    <input type="number" class="form-control" name="number_of_nodes" id="number_of_nodes" style="width:300px" placeholder="Number of nodes"
+				title="Number of nodes you expect to request (informative)">
+			  </div>
+			  <div class="form-group">
+			  	<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>
+			  <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
+			</form>
+	
+		</div>
 	</div>
-  </fieldset>
-  </form>
-</div>
+		
 <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']);
+    });
     var availableTags = [
      {% if authorities %}
          {% for authority in authorities %}
@@ -94,7 +76,8 @@ jQuery(document).ready(function(){
     ];
     $( "#authority_hrn" ).autocomplete({
       source: availableTags,
-      select: function( event, ui ) {console.log(jQuery(this))}
+      minLength: 0,
+      select: function( event, ui ) {console.log(jQuery(this));}
     });
 });
 </script>