LocalStorage used in templates

diff --git a/portal/templates/base.html b/portal/templates/base.html
index 6bb7e23..decd041 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -38,30 +38,34 @@ XXX TODO: session
 This list of slices should go into SESSION !
 */
 $(document).ready(function() {
+    {% if username %}
+    myslice.login();
 
     user = myslice.user();
-    if(user.length>0){
-       $.each( user.slices, function(i, val) {
-               items.push( "<li><a href=\"/slice/"+val+"\">" + val + "</a></li>" );
+    
+    var slices = [];
+    if($.isEmptyObject(user)){
+        $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
+            if(data.length > 0){
+                slices = data[0].slices;  
+            }else{
+                slices.push("no slice");
+            }
+            drawSlices(slices);
        });
-       $("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
-       $("ul#dropdown-slice-list").append(items.join( "" ));
+    }else{
+        slices = user.slices;
+        drawSlices(slices);
     }
-       {% if person %}
-    $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
-         var items = [];
-      if(data.length > 0){
-                 $.each( data[0].slices, function(i, val) {
-                       items.push( "<li><a href=\"/slice/"+val+"\">" + val + "</a></li>" );
-                 });
-                 
-                 $("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
-                 $("ul#dropdown-slice-list").append(items.join( "" ));
-         }else{
-                 $("div#home-slice-list").html("no slice");
-      } 
-       });
-       {% endif %}
+    function drawSlices(slices){
+        var items = [];
+        $.each( slices, function(i, val) {
+            items.push( "<li><a href=\"/slice/"+val+"\">" + val + "</a></li>" );
+        });
+        $("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
+        $("ul#dropdown-slice-list").append(items.join( "" ));
+    }
+    {% endif %}
 });
 </script>
 </head>

diff --git a/portal/templates/home-view.html b/portal/templates/home-view.html
index 93e1f15..cb51b53 100644 (file)
--- a/portal/templates/home-view.html
+++ b/portal/templates/home-view.html
@@ -88,10 +88,6 @@
 </div>
 <script type="text/javascript">
        $(document).ready(function() {
-        {% if person %}
-        myslice.login();
-        {% endif %}
-
                $('a.home-tab').click(function() {
                        $('ul.nav-tabs li').removeClass('active');
                        $(this).parent().addClass('active');