X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fbase.html;h=cc60f7f166d267f15517d6cd47627e84aab66d89;hb=refs%2Ftags%2Fmyslice-1.1;hp=66eb50982108a2bf3dde05033acab0f1bb627452;hpb=1d7b0fb8b69c6eca9880a3966acf0352341882bb;p=unfold.git

diff --git a/portal/templates/base.html b/portal/templates/base.html
index 66eb5098..cc60f7f1 100644
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -3,11 +3,13 @@
 <html lang="en"><head>
 <title>{{theme}} portal - {{ section }}</title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="shortcut icon" href="/static/img/favicon_fed4fire.ico">
+<link rel="shortcut icon" href="/static/img/favicon.ico">
 {# This is where insert_str will end up #}{% media_container prelude %}
 {% include 'messages-transient-header.html' %}
 <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
+<!--<script src="{{ STATIC_URL }}js/jquery-ui.js"></script>-->
 <script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
+<script src="{{ STATIC_URL }}js/jquery.qtip.min.js"></script>
 <script src="{{ STATIC_URL }}js/bootstrap.datatables.js"></script>
 <!-- <script src="{{ STATIC_URL }}js/stash.min.js"></script> -->
 <script src="{{ STATIC_URL }}js/myslice.js"></script>
@@ -37,6 +39,8 @@
 {% 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/jquery.qtip.min.css">
+
 
 <script type="text/javascript">
 /*
@@ -51,27 +55,42 @@ $(document).ready(function() {
     
     var slices = [];
     if($.isEmptyObject(user)){
-        $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
+        $.post("/rest/myslice:user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
             if(data.length > 0){
-                slices = data[0].slices;  
+                drawSlices(data[0].slices);  
             }else{
+            	$("div#home-slice-list").html(
+					"<div>You do not yet have a slice</div>");
+        		$("ul#dropdown-slice-list").append("<li>no slice</li>");
                 slices.push("no slice");
             }
-            drawSlices(slices);
     	});
     }else{
         slices = user.slices;
         drawSlices(slices);
     }
+
+    /*
+        Launch queries to get the resources and leases in Manifold Cache
+    */
+        
     function drawSlices(slices){
         var items = [];
+		
         $.each( slices, function(i, val) {
-            items.push( "<li><a href=\"/slice/"+val+"\">" + val + "</a></li>" );
+            items.push( "<li><a href=\"/resources/"+val+"\">" + val + "</a></li>" );
+            /*
+            // Launch a Query for each slice to get resources and leases in Manifold Cache
+            // Now only done in Homeview to speed up the other pages
+            $.post("/rest/slice/", { 'filters': { 'slice_hrn' : val } }, function(data) {
+            });
+            */
         });
         $("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
         $("ul#dropdown-slice-list").append(items.join( "" ));
     }
     {% endif %}
+	jQuery('[title!=""]').qtip();
 });
 </script>
 </head>
@@ -80,9 +99,14 @@ $(document).ready(function() {
   	{% block topmenu %}
   	{% widget "_widget-topmenu.html" %}
   	{% endblock topmenu %}
-	{% include 'messages-transient.html' %}
 	{% block base_content %}
 	{% endblock %}
 {% endblock container %}
+{% widget "_footer.html" %}
+<div class="loading">
+	<div><img src="{{ STATIC_URL }}/img/loading.gif" /> Loading...</div>
+	<div>&nbsp;</div>
+	<div class="message"></div>
+</div>
 </body>
 </html>
