modified dropdown menu

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 920e6fd..c39de29 100644 (file)
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -143,6 +143,16 @@ div#navigation li.slices {
     position:relative;
     cursor:pointer;
 }
+div#navigation .dropdown-menu {
+    color:white;
+    padding:0 15px 15px 15px;
+    margin-top:5px;
+    margin-left:-16px;
+    background-color:black;
+}
+div#navigation .dropdown-menu a {
+    color:white;
+}
 
 div#menu-slice-list{
     display:none;
@@ -152,16 +162,10 @@ div#menu-slice-list{
     left:-15px;
     z-index:10;
 }
-div#menu-slice-list ul {
-    margin:0;
-    padding:0;
-}
-div#menu-slice-list li {
-    margin:0;
-    padding:10px 0;
-}
-div#menu-slice-list li:first-child {
+
+div#navigation .dropdown-menu li:first-child {
     border-bottom:1px solid white;
+    padding-bottom:5px;
      
 }
 /* HOME DASHBOARD */

diff --git a/portal/templates/onelab/onelab__widget-topmenu.html b/portal/templates/onelab/onelab__widget-topmenu.html
index 3c30654..da834ac 100644 (file)
--- a/portal/templates/onelab/onelab__widget-topmenu.html
+++ b/portal/templates/onelab/onelab__widget-topmenu.html
@@ -22,17 +22,19 @@
                        <li id="nav-account"><a href="/portal/account/">{{ username }}</a></li>
                        <li>|</li>
                        <li id="nav-institution" class=""><a href="/portal/institution">INSTITUTION</a></li>
-                       <li class="slices">SLICES
-                               <div id="menu-slice-list">
+                       <li class="slices">
+                               <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                                       SLICES <span class="caret"></span>
+                       </a>
+                               
+                               <div class="dropdown-menu">
                                                <ul>
-                                                       <li>Request Slice</li>
-                                                       <li>   ple.upmc.agent3</li>
-                                                   <li>  ple.upmc.agent</li>
-                                                   <li>  ple.upmc.myslicedemo</li>
-                                                   <li>  ple.upmc.slicestat</li>
-                                                   <li>  ple.upmc.agent2</li>
-                                                               
-                                                       
+                                                       <li><a href="/portal/slice_request/">Request Slice</a></li>
+                                                       <li><a href="/slice/ple.upmc.agent3/">ple.upmc.agent3</a></li>
+                                                   <li><a href="/slice/ple.upmc.agent/">ple.upmc.agent</a></li>
+                                                   <li><a href="/slice/ple.upmc.myslicedemo/">ple.upmc.myslicedemo</a></li>
+                                                   <li><a href="/slice/ple.upmc.slicestat/">ple.upmc.slicestat</a></li>
+                                                   <li><a href="/slice/ple.upmc.agent2/">ple.upmc.agent2</a></li>
                                                </ul>
                                </div>
                                </li>
@@ -54,8 +56,10 @@
                $('li.slices').mouseenter(function() {
                        $('div#menu-slice-list').fadeIn(100);
                });
-               $('div#menu-slice-list').mouseleave(function() {
-                       $(this).fadeOut(100);
+               $('div#menu-slice-list').mouseleave(function(e) {
+                       if (!$('li.slices').is(":hover")) {
+                               $(this).fadeOut(100);
+                       }
                });
                // var slices = localStorage.getItem('slices');
                // if (slices.length == 0) {

diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html
index 48ba76f..0444a82 100644 (file)
--- a/portal/templates/onelab/onelab_slice-view.html
+++ b/portal/templates/onelab/onelab_slice-view.html
@@ -21,12 +21,5 @@
   <div class="tab-pane row" id="statistics">...</div>
   <div class="tab-pane row" id="measurements">...</div>
   <div class="tab-pane row" id="experiment">...</div>
-</div>
-<div class="container-fluid">
-       <div class="row">
-               <div class="col-md-2">
-               </div>
-               
-       </div>
-</div>         
+</div>         
 {% endblock %}

diff --git a/portal/templates/onelab/onelab_widget-slice-sections.html b/portal/templates/onelab/onelab_widget-slice-sections.html
index 052ab6b..47dea17 100644 (file)
--- a/portal/templates/onelab/onelab_widget-slice-sections.html
+++ b/portal/templates/onelab/onelab_widget-slice-sections.html
@@ -1,5 +1,7 @@
 <ul class="nav nav-tabs nav-sliceview">
-       <li {% if section != "resources" %}class="active"{% endif %}><a href="#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a></li>
+       <li {% if section != "resources" %}class="active"{% endif %}>
+               <a href="#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a>
+       </li>
        <li><a href="#testbeds">Testbeds</a></li>
        <li {% if section == "resources" %}class="active"{% endif %}><a class="link" href="/resources/{{ slice }}">Resources</a></li>
        <li><a href="#users">Users</a></li>