X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fslicerequest_view.html;h=9bbc22bd0cbd0dde70a9589534962a88c835b8d6;hb=e49329b43a640671476f2a793bde1d40b57e4d2e;hp=af787c2f3ee75cac03040474018cfc46b8d62b93;hpb=6525a09c12184206e7e90578d2e48d9b15006dba;p=unfold.git

diff --git a/portal/templates/slicerequest_view.html b/portal/templates/slicerequest_view.html
index af787c2f..9bbc22bd 100644
--- a/portal/templates/slicerequest_view.html
+++ b/portal/templates/slicerequest_view.html
@@ -1,96 +1,86 @@
-{% extends "layout-unfold1.html" %}
+{% extends "layout.html" %}
 {% load i18n %}
 
-{% block head %}
-{{ wizard.form.media }}
-{% endblock %}
-
-{% block unfold_main %}
-
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
-<!-- xxx ideally only onelab.css but ... xxx -->
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
-
-<div class="onelab-title well-lg">
-  <h2>Request a Slice</h2>
-</div>
-
-{% if errors %}
-<ul>
-  {% for error in errors %}
-  <li>{{ error }}</li>
-  {% endfor %}
-</ul>
-{% endif %}
-
-<div class='well'>
-  <form id="commentForm" class="form-horizontal" action="" method="post" role="form">{% 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" style="height:34px;">{{ 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="Purpose" required>{{ purpose }}</textarea>
-       </div>
-    </div>
-     <div class="col-xs-6"><p class="form-hint">Purpose of your experiment (informative)</p></div>
-   </div>
-
-   <button class="submit btn btn-default col-xs-12" type="submit">Request Slice</button>
-  </fieldset>
-  </form>
-</div>
+{% 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>
 
+	{% if errors %}
+	<ul>
+	  {% for error in errors %}
+	  <li>{{ error }}</li>
+	  {% endfor %}
+	</ul>
+	{% endif %}
+	<div class="row">
+		<div class="col-md-12">&nbsp;</div>
+	</div>
+	<div class="row">
+		<div class="col-md-2"></div>
+		<div class="col-md-8">
+			<form role="form" method="post">
+			{% csrf_token %}
+			  <div class="form-group">
+			    <label for="email">Experimenter</label>
+			    <input type="email" class="form-control" id="email" value="{{ email }}" readonly="readonly">
+			  </div>
+			  <div class="form-group">
+			    <label for="slice_name">Slice Name</label>
+			    <input type="text" class="form-control" name="slice_name" id="slice_name" placeholder="Slice Name" required="required">
+			  	<p class="help-block"></p>
+			  </div>
+			  <div class="form-group">
+			    <label for="authority">Authority</label>
+				{%if 'is_pi'  in pi %}
+				<input type="text" class="form-control" id="authority_hrn" name="authority_hrn" placeholder="Authority" required="required">
+				<p class="help-block">An authority responsible for vetting your slice</p>
+				{%else%}
+			    <input type="text" class="form-control" id="authority_hrn" name="authority_hrn" placeholder="Authority" required="required" readonly="readonly">
+			  	<p class="help-block">An authority responsible for vetting your slice</p>
+				{%endif%}
+			  </div>
+			  <div class="form-group">
+			    <label for="number_of_nodes">Number of Nodes</label>
+			    <input type="number" class="form-control" name="number_of_nodes" id="number_of_nodes" placeholder="Number of Nodes">
+			  	<p class="help-block">Number of nodes you expect to request (informative)</p>
+			  </div>
+			  <div class="form-group">
+			    <label for="purpose">Experiment Purpose</label>
+			  	<textarea id="purpose" name="purpose" class="form-control" rows="6" placeholder="Experiment Purpose" required="required">{{ purpose }}</textarea>
+			    <p class="help-block">Purpose of your experiment (informative)</p>
+			  </div>
+			  <button type="submit" class="btn btn-default">Request Slice</button>
+			</form>
+	
+		</div>
+	</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 %}
-        {value:"{{ authority.authority_hrn }}",label:"{{authority.name}}"},
-        {% endfor %}    
-    {% else %}
-        {value:"",label:"No authority found !!!"}
-    {% endif %}
+     {% if authorities %}
+         {% for authority in authorities %}
+             {% if authority.name %}
+                 {value:"{{ authority.authority_hrn }}",label:"{{authority.name}}"},
+             {% else %}
+                 {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
+             {% endif %}
+         {% endfor %}    
+     {% else %}
+         {value:"",label:"No authority found !!!"}
+     {% endif %}
     ];
     $( "#authority_hrn" ).autocomplete({
       source: availableTags,
+      minLength: 0,
       select: function( event, ui ) {console.log(jQuery(this))}
     });
 });