X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fbase.html;h=7f9bd44921df4a229e232150e9ef29264e936f95;hb=c95c98421985b3d3bcc371d665cf5efb65d2882b;hp=fd1869ee9239d8c51702f5230de6941b584e228c;hpb=bb7c2839a257b071008c32fe4a39eb5e48864368;p=unfold.git

diff --git a/portal/templates/base.html b/portal/templates/base.html
index fd1869ee..7f9bd449 100644
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -55,6 +55,7 @@
 {% insert_str prelude "css/topmenu.css" %}
 {% insert_str prelude "js/logout.js" %}
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/myslice.css">
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/jquery.qtip.min.css">
 
 
@@ -66,7 +67,7 @@ This list of slices should go into SESSION !
 $(document).ready(function() {
 {% if username %}
     myslice.login(function(){
-        user = myslice.user();
+        user = myslice.get_user();
 
         var slices = [];
         if($.isEmptyObject(user)){
@@ -76,12 +77,14 @@ $(document).ready(function() {
             slices.push("no slice");
         }else{
             slices = user.slices;
+            {% if theme != "fed4fire" or "onelab" in theme %}
             drawSlices(slices);
+            {% endif %}
         }
-        {% if theme == "fed4fire" %}
-        p = myslice.projects();
+        {% if theme == "fed4fire" or "onelab" in theme%}
+        p = myslice.get_projects();
         if(p != null){
-            drawProjects(p);
+            //drawProjects(p);
             drawProjectsTree(p,slices);
         }
         {% endif %}
@@ -89,20 +92,20 @@ $(document).ready(function() {
 
     function drawSlices(slices){
         var items = [];
-		
+        console.log(slices);
         $.each( slices, function(i, val) {
-            items.push( "<li><a href=\"/resources/"+val+"\">" + val + "</a></li>" );
+            items.push( "<li><a href=\"/resources/"+val+"\" title='Add resources to slice "+val+"'><img src='/static/img/icon_slices_small.png' style='width: 12px;'>" + val + "</a></li>" );
         });
         $("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
         $("ul#dropdown-slice-list").append(items.join( "" ));
     }
     
-    {% if theme == "fed4fire" %}
+    {% if theme == "fed4fire" or "onelab" in theme%}
     function drawProjects(projects){
         var items = [];
 		
         $.each( projects, function(i, val) {
-            items.push( "<li><a href=\"/portal/project/"+val+"\">" + val + "</a></li>" );
+            items.push( "<li><a href=\"/portal/project/"+val+"\" title='Manage project "+val+"'>" + val + "</a></li>" );
         });
         $("div#home-project-list").html($( "<ul/>", { html: items.join( "" ) }));
         $("ul#dropdown-project-list").append(items.join( "" ));
@@ -110,14 +113,17 @@ $(document).ready(function() {
     function drawProjectsTree(projects,slices) {
         var items = [];
         var items_sl = [];
+        var slices_no_project = [];
         $.each( projects, function(i, p) {
             $.each( slices, function(y, s) {
-                console.log(escapeRegExp(p));
                 if (s.match('^' + escapeRegExp(p))) {
-                     items_sl.push( "<li><a href=\"/resources/" + s + "\">" + s.replace(p + '.','') + "</a></li>" );
+                    slicename = s.replace(p + '.','')
+                    items_sl.push( "<li><a href=\"/resources/" + s + "\" title='Add resources to slice "+slicename+"'><img src='/static/img/icon_slices_small.png' style='width: 12px;'>  " + slicename + "</a></li>" );
+                }else if(s.split('.').length < 4){
+                     slices_no_project.push( "<li><a href=\"/resources/" + s + "\" title='Add resources to slice "+s+"'><img src='/static/img/icon_slices_small.png' style='width: 12px;'>  " + s + "</a></li>" );
                 }
             });
-            el = "<li><a href=\"/portal/project/" + p + "\">" + p + "</a>";
+            el = "<li><a href=\"/portal/project/" + p + "\" title='Manage project "+p+"' >" + p + "</a>";
             if (items_sl.length > 0) {
                 el += "<ul>" + items_sl.join( "" ) + "</ul>";
             }
@@ -125,8 +131,27 @@ $(document).ready(function() {
             items.push(el);
             items_sl = [];
         });
+        if (projects.length == 0){
+            $.each( slices, function(y, s) {
+                slices_no_project.push( "<li><a href=\"/resources/" + s + "\" title='Add resources to slice "+s+"'><img src='/static/img/icon_slices_small.png' style='width: 12px;'>  " + s + "</a></li>" );
+            });
+        }
+        if (slices_no_project.length > 0) {
+            elm = '<li>other slices <span class="glyphicon glyphicon-info-sign" title="these are <b>legacy slices</b> from now on, slices must be created within a project">&nbsp;</span>';
+            elm += "<ul>" + slices_no_project.join( "" ) + "</ul>";
+            elm += "</li>";
+            items.push(elm);
+        }
+
         $("div#home-project-tree").html($( "<ul/>", { html: items.join( "" ) }));
+        if (projects.length > 0) {
+            $('.dashboard-create-slice').show();
+        }
     }
+    
+    window.setTimeout(function() {
+        $('.projects-loading').hide();
+    },20000);
     {% endif %}
 {% endif %}
 	jQuery('[title!=""]').qtip();