From 178d89f41591093376a52983699694ce88ba7cc2 Mon Sep 17 00:00:00 2001
From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Fri, 4 Jul 2014 14:55:21 +0200
Subject: [PATCH] fixe styles, fixed link to requests to be validated from home

---
 portal/static/css/onelab.css                        | 13 ++++++++-----
 portal/templates/onelab/onelab_home-view.html       |  2 +-
 portal/templates/onelab/onelab_institution.html     |  8 ++++++--
 .../onelab/onelab_management-tab-requests.html      |  2 +-
 portal/templates/slice-request-view.html            |  2 +-
 portal/templates/slicerequest_view.html             |  2 +-
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 17b8c1ad..458e5acb 100644
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -32,15 +32,18 @@ h3 {
     font-size:13pt;
     color:#201E62;
 }
-input[type=text], input[type=password], input[type=email], select, option {
+input[type=text], input[type=password], input[type=email],input[type=number], select, option {
     min-width:260px;
     padding:6px;
     border:1pt solid #22606D;
     vertical-align:bottom;
     border-radius:0;
 }
-input {
-    
+
+textarea {
+    padding:6px;
+    border:1pt solid #22606D !important;
+    border-radius:0 !important;
 }
 
 span.label {
@@ -92,13 +95,13 @@ button.btn-primary:active {
     margin-top:2px;
 }
 button.btn-danger {
-    border-bottom:3px solid #EEA236;
+    border-bottom:3px solid #A13F3A;
 }
 button.btn-danger:hover {
     box-shadow:none;
     background-color:#d9534f;
     border:1px solid #d43f3a;
-    border-bottom:3px solid #EEA236;
+    border-bottom:3px solid #A13F3A;
 }
 button.btn-danger:active {
     border:1px solid #d43f3a;
diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index 4afaf5d9..f5d6cf14 100644
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -159,7 +159,7 @@
 			$('div#'+$(this).data('panel')).show();
 		});
 		$('button#validaterequestbtn').click(function() {
-			window.location="/portal/validate/";
+			window.location="/portal/institution#requests";
 		});
 		$('button#ticketbtn').click(function() {
 			window.location="/portal/contact/";
diff --git a/portal/templates/onelab/onelab_institution.html b/portal/templates/onelab/onelab_institution.html
index 7fea6352..4b429c9c 100644
--- a/portal/templates/onelab/onelab_institution.html
+++ b/portal/templates/onelab/onelab_institution.html
@@ -58,9 +58,9 @@
 	<div class="tab-pane row" id="slices">
 		<div class="col-md-12 el">
 		{% if 'is_pi'  in pi %}
-	  	<button id="createslice" type="button" class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Create slice</button>
+	  	<button id="createslice" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create slice</button>
 		{% else %}
-		<button id="createslice" type="button" class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Request slice</button>
+		<button id="createslice" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request slice</button>
 		{% endif %}
 		<br /><br />
 	    <div id="slice-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
@@ -228,6 +228,10 @@ $(document).ready(function() {
     	if (id == 'requests') 
     		$("#" + id).load('/management/' + id);
 	});
+	var hash = window.location.hash;
+	if (hash) {
+		$('.nav-tabs a[href='+hash+']').click();
+	}
 });
 </script>
 {% endblock %}
diff --git a/portal/templates/onelab/onelab_management-tab-requests.html b/portal/templates/onelab/onelab_management-tab-requests.html
index 8db652f4..1356ef52 100644
--- a/portal/templates/onelab/onelab_management-tab-requests.html
+++ b/portal/templates/onelab/onelab_management-tab-requests.html
@@ -224,5 +224,5 @@
 </div>
 {% endif %}
 <div class="col-md-12">
-	<button class="btn btn-onelab" type="button" id="portal__validate" onclick="on_click_event();">Validate</button>
+	<button class="btn btn-primary" type="button" id="portal__validate" onclick="on_click_event();"><span class="glyphicon glyphicon-ok"></span> Validate</button>
 </div>
diff --git a/portal/templates/slice-request-view.html b/portal/templates/slice-request-view.html
index 2b92f461..830c7eeb 100644
--- a/portal/templates/slice-request-view.html
+++ b/portal/templates/slice-request-view.html
@@ -24,7 +24,7 @@
       <div class="col-xs-6"> <p class="form-hint">{{ field.help_text }}</p> </div>
     </div>
     {% endfor %}
-    <button class="submit btn btn-default col-xs-12" type="submit">Request Slice</button>
+    <button class="submit btn btn-default" type="submit"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
   </fieldset>
   </form>
 </div>
diff --git a/portal/templates/slicerequest_view.html b/portal/templates/slicerequest_view.html
index d898b060..3fdf8f7a 100644
--- a/portal/templates/slicerequest_view.html
+++ b/portal/templates/slicerequest_view.html
@@ -48,7 +48,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>
-			  <button type="submit" class="btn btn-default btn-onelab">Request Slice</button>
+			  <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
 			</form>
 	
 		</div>
-- 
2.43.0