From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 7 Jul 2014 14:39:55 +0000 (+0200)
Subject: styles
X-Git-Tag: myslice-1.1~47^2~2^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c4f02ddef58163120a6b51a04fd376e7706f6040;p=unfold.git

styles
---

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