From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 7 Jul 2014 15:03:50 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~47^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d388cfb66e5396cd949af7f1f5976c4b8724432d;hp=a71b20258a7c07e5e10b812acb887bc755f6ec22;p=unfold.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/plugins/apply/templates/apply.html b/plugins/apply/templates/apply.html
index a4c5a332..1c449b2b 100644
--- a/plugins/apply/templates/apply.html
+++ b/plugins/apply/templates/apply.html
@@ -5,7 +5,7 @@
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="{{domid}}__apply__label">Columns selector</h4>
+            <h4 class="modal-title" id="{{domid}}__apply__label">Apply pending changes</h4>
         </div>
         <div class="modal-body">
           {{query_updater}}
@@ -19,6 +19,6 @@
 
   
   <!-- Button toolbar -->
-  <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#{{domid}}__apply">Apply</button>
+  <button class="btn btn-onelab btn-sm" data-toggle="modal" data-target="#{{domid}}__apply">Apply</button>
   <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#{{domid}}__cancel">Cancel</button>
 </div> 
diff --git a/plugins/queryupdater/templates/queryupdater.html b/plugins/queryupdater/templates/queryupdater.html
index c4d018e9..92a6400d 100644
--- a/plugins/queryupdater/templates/queryupdater.html
+++ b/plugins/queryupdater/templates/queryupdater.html
@@ -10,7 +10,7 @@
 </table>
 </div>
 <!--not all buttons are expected to work for now, hence the disabled mark-->
-<button type="button" id="{{domid}}__update"  class="btn btn-default">Update</button>
-<button type="button" id="{{domid}}__refresh"  class="btn btn-default" disabled>Refresh</button>
-<button type="button" id="{{domid}}__reset"  class="btn btn-default" disabled>Reset</button>
-<button type="button" id="{{domid}}__clear_annotations"  class="btn btn-default" disabled>Clear Annotations</button>
+<button type="button" id="{{domid}}__update"  class="btn btn-onelab">Update</button>
+<button type="button" id="{{domid}}__refresh"  class="btn btn-primary" disabled>Refresh</button>
+<button type="button" id="{{domid}}__reset"  class="btn btn-danger" disabled>Reset</button>
+<button type="button" id="{{domid}}__clear_annotations"  class="btn btn-danger" disabled>Clear Annotations</button>
diff --git a/plugins/scheduler2/static/css/scheduler2.css b/plugins/scheduler2/static/css/scheduler2.css
index cb844a87..93101003 100755
--- a/plugins/scheduler2/static/css/scheduler2.css
+++ b/plugins/scheduler2/static/css/scheduler2.css
@@ -273,7 +273,7 @@ td.no-image {
 }
 
 .legend ol li.selected {
-    background: #25BA25;
+    background: #FFFF99;
 }
 
 /* latest stuff */
diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py
index da362d36..d7768991 100644
--- a/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@ -18,7 +18,7 @@ from myslice.configengine               import ConfigEngine
 from plugins.apply                      import ApplyPlugin
 from plugins.querytable                 import QueryTable
 from plugins.googlemap                  import GoogleMap
-#from plugins.queryupdater               import QueryUpdater
+# from plugins.queryupdater               import QueryUpdaterPlugin
 from plugins.filter_status              import FilterStatusPlugin
 from plugins.testbeds                   import TestbedsPlugin
 from plugins.scheduler2                 import Scheduler2
@@ -185,17 +185,17 @@ class SliceResourceView (LoginRequiredView, ThemeView):
         # --------------------------------------------------------------------------
         # QueryUpdater (Pending Operations)
  
-#DEPRECATED|        pending_resources = QueryUpdater(
-#DEPRECATED|            page                = page,
-#DEPRECATED|            title               = 'Pending operations',
-#DEPRECATED|            query               = main_query,
-#DEPRECATED|            togglable           = False,
-#DEPRECATED|            # start turned off, it will open up itself when stuff comes in
-#DEPRECATED|            toggled             = False,
-#DEPRECATED|            domid               = 'pending',
-#DEPRECATED|            outline_complete    = True,
-#DEPRECATED|            username            = request.user,
-#DEPRECATED|        )
+#         pending_resources = QueryUpdaterPlugin(
+#             page                = page,
+#             title               = 'Pending operations',
+#             query               = main_query,
+#             togglable           = False,
+#             # start turned off, it will open up itself when stuff comes in
+#             toggled             = False,
+#             domid               = 'pending',
+#             outline_complete    = True,
+#             username            = request.user,
+#         )
 
         # --------------------------------------------------------------------------
         # NETWORKS
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>