From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 7 Jul 2014 14:24:20 +0000 (+0200)
Subject: styled users view
X-Git-Tag: myslice-1.1~53^2~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a615a543d9b878ae221d170c7f10073dee3914c5;p=myslice.git

styled users view
---

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index df1e7dc4..1104c988 100644
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -310,11 +310,13 @@ ul.nav-resources a {
 }
 
 /* SLICE VIEW */
-div.container-resource {
+div.container-resource, div.container-slice {
     padding-right:15px;
     padding-left:15px;
 }
-
+.table th {
+    border-top:0 !important;
+}
 div#slice-view {
     margin:0;
 }
diff --git a/portal/templates/onelab/onelab_slice-user-view.html b/portal/templates/onelab/onelab_slice-user-view.html
index 1751ce91..0a239f15 100644
--- a/portal/templates/onelab/onelab_slice-user-view.html
+++ b/portal/templates/onelab/onelab_slice-user-view.html
@@ -1,37 +1,35 @@
-	<div class="col-md-2">
-		<div id="select-platform" class="list-group">
-		</div>
-			
-		<ul class="list-group">
-		  <li class="list-group-item">Authority:<b> {{user_details.parent_authority}}</b>
-			<!--<select id="auth_list">
-  				<option value="ple.upmc">UPMC</option>
-  				<option value="ple.inria">INRIA</option>
-  				<option value="ple.nitos">NITOS</option>
-  				<option value="ple.iminds">iMinds</option>
-			</select> -->
-		  </li>
-		  <li class="list-group-item">Filter: slice</li>
-		  <li class="list-group-item">...</li>
-		  <li class="list-group-item">...</li>
-		  <li class="list-group-item">...</li>
-		</ul>
-	
+
+<div class="col-md-2">
+	<div id="select-platform" class="list-group">
 	</div>
-	<div class="col-md-10">
-		<div class="row">
-		</div>
-        	<div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Useres" /></div>
-        	<div id="user-tab-loaded" style="display:none;">
-            	<table id="user-tab">
-                	<tr>
-                    	<th>+/-</th>
-                    	<th>Email</th>
-                    	<th>user_hrn</th>
-                    	<th>Enabled</th>
-                	</tr>
-            	</table>
-        	</div>
+		
+	<ul class="list-group">
+	  <li class="list-group-item">Authority:<b> {{user_details.parent_authority}}</b>
+		<!--<select id="auth_list">
+			<option value="ple.upmc">UPMC</option>
+			<option value="ple.inria">INRIA</option>
+			<option value="ple.nitos">NITOS</option>
+			<option value="ple.iminds">iMinds</option>
+		</select> -->
+	  </li>
+	  <li class="list-group-item">Filter: slice</li>
+	  
+	</ul>
+
+</div>
+<div class="col-md-10">
+    	<div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Useres" /></div>
+    	<div id="user-tab-loaded" style="display:none;">
+        	<table id="user-tab" class="table">
+            	<tr>
+                	<th>+/-</th>
+                	<th>Email</th>
+                	<th>User hrn</th>
+                	<th>Enabled</th>
+            	</tr>
+        	</table>
+    	</div>
+</div>
 <script>
     $(document).ready(function() {
 			//console.log("the value you selected: " + selectedValue);
@@ -43,7 +41,7 @@
 			    user_urn, user_last_name, user_phone, user_hrn, user_email, user_type
 				*/
             	$.each( data, function( key, val ) {
-                	list_users.push( "<li><a href=\"portal/user/"+val.user_email+"\">" + val.user_email + "</a></li>" );
+                	//list_users.push( "<li><a href=\"portal/user/"+val.user_email+"\">" + val.user_email + "</a></li>" );
                 	user_row = "<tr>";
 					// checking the box for the users that belong to the selected slice
 					var flag_checkbox = 0;
diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html
index e8f84f0f..c885e023 100644
--- a/portal/templates/onelab/onelab_slice-view.html
+++ b/portal/templates/onelab/onelab_slice-view.html
@@ -13,7 +13,7 @@
 	    </div>
 	</div>
 </div>
-<div class="container-fluid tab-content">
+<div class="container-fluid tab-content container-slice">
   <div class="tab-pane active row" id="info">...</div>
   <div class="tab-pane row" id="testbeds">...</div>
   <div class="tab-pane row" id="resources">...</div>
diff --git a/portal/templates/slice-tab-users-view.html b/portal/templates/slice-tab-users-view.html
index 6942861a..f0cb9b0b 100644
--- a/portal/templates/slice-tab-users-view.html
+++ b/portal/templates/slice-tab-users-view.html
@@ -12,9 +12,7 @@
 			</select> -->
 		  </li>
 		  <li class="list-group-item">Filter: slice</li>
-		  <li class="list-group-item">...</li>
-		  <li class="list-group-item">...</li>
-		  <li class="list-group-item">...</li>
+		 
 		</ul>
 	
 	</div>
@@ -23,11 +21,11 @@
 		</div>
         	<div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Useres" /></div>
         	<div id="user-tab-loaded" style="display:none;">
-            	<table id="user-tab">
+            	<table id="user-tab" class="table">
                 	<tr>
                     	<th>+/-</th>
                     	<th>Email</th>
-                    	<th>user_hrn</th>
+                    	<th>User hrn</th>
                     	<th>Enabled</th>
                 	</tr>
             	</table>