From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 3 Jul 2014 15:57:25 +0000 (+0200)
Subject: moved requests to management
X-Git-Tag: myslice-1.1~60^2~12
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d0e9b255a79411a4d214f95ec81eeb1b67ecc74f;hp=a5d8ec473bf69cbb0540e3afadd66e1b57ebeff4;p=myslice.git

moved requests to management
---

diff --git a/portal/templates/join_complete.html b/portal/templates/join_complete.html
index 74813b5f..43be76e5 100644
--- a/portal/templates/join_complete.html
+++ b/portal/templates/join_complete.html
@@ -10,7 +10,7 @@
 <p>
 We will contact the manager that you have listed with any questions that we might have.<br> 
 Once we have added the organization to the list, we will alert the manager.<br>
-At that time users will be able to sign up to join OneLab.
+At that time users from your organization will be able to sign up to join OneLab.
 </p>
 </div>
 
diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index ff6ec256..4afaf5d9 100644
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -20,9 +20,12 @@
 				<button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
 			</div>
 			<div>
-			<p title="A slice is a set of testbed resources on which you can conduct an experiment. 
-			Either ask your colleagues to give you access to an existing slice or request a new slice now.">
-			<strong>Your slices</strong></p>
+				<p><strong>Your slices </strong>
+ 				 	<span title="A slice is a set of testbed resources on which you can conduct an experiment. 
+      					Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'." 
+      					class="glyphicon glyphicon-info-sign">
+  					</span>
+  				</p>
 			</div>
 			<div>	
 				<div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
@@ -80,9 +83,12 @@
 				<button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
 			</div>
 			<div>
-			<p title="A slice is a set of testbed resources on which you can conduct an experiment. 
-			Either ask your colleagues to give you access to an existing slice or request a new slice now.">
-			<strong>Your slices</strong></p>
+				<p><strong>Your slices </strong>
+				<span title="A slice is a set of testbed resources on which you can conduct an experiment. 
+					Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'." 
+					class="glyphicon glyphicon-info-sign">
+				</span>
+				</p>
 			</div>
 			<div>	
 				<div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
diff --git a/portal/templates/slicerequest_view.html b/portal/templates/slicerequest_view.html
index a9e536d6..7ef30cd5 100644
--- a/portal/templates/slicerequest_view.html
+++ b/portal/templates/slicerequest_view.html
@@ -24,34 +24,29 @@
 		<div class="col-md-8 col-md-offset-2 el">
 			<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 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">
-			    <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>
+			    <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">
-			    <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>
+				<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" required="required" readonly="readonly">
-			  	<p class="help-block">An authority responsible for vetting your slice</p>
+			    <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">
-			    <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>
+			    <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">
-			    <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>
+			  	<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 btn-onelab">Request Slice</button>
 			</form>