FIX: removed jquery-ui js+css from base cz it conflicts with sliceresourceview--...

[myslice.git] / portal / templates / base.html
diff --git a/portal/templates/base.html b/portal/templates/base.html

index 237cfa6..df38156 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -18,6 +18,7 @@
  {{ header_prelude }}
  {% block head %} {% endblock head %}
  {# let's add these ones no matter what #}
+{#NOTE: DO NOT ADD JQUERY-UI JS & CSS HERE. IT BREAKS THE RESOURCE BROWSING PAGE -- DETAILS WITH JORDAN AUGE#}
  {% insert_str prelude "js/jquery.min.js" %}
  {% insert_str prelude "js/angular/angular.min.js" %}
  {% insert_str prelude "js/jquery.html5storage.min.js" %}
@@ -48,27 +49,28 @@ XXX TODO: session
  This list of slices should go into SESSION !
  */
  $(document).ready(function() {
-    {% if username %}
-    myslice.login();
+{% if username %}
+    myslice.login(function(){
+        user = myslice.user();
+
+        var slices = [];
+        if($.isEmptyObject(user)){
+            $("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");
+        }else{
+            slices = user.slices;
+            drawSlices(slices);
+        }
+        {% if theme == "fed4fire" %}
+        p = myslice.projects();
+        if(p != null){
+            drawProjects(p);
+        }
+        {% endif %}
+    });
  
-    user = myslice.user();
-    
-    var slices = [];
-    if($.isEmptyObject(user)){
-        $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
-            if(data.length > 0){
-                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");
-            }
-       });
-    }else{
-        slices = user.slices;
-        drawSlices(slices);
-    }
      function drawSlices(slices){
          var items = [];
                 
@@ -78,19 +80,39 @@ $(document).ready(function() {
          $("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
          $("ul#dropdown-slice-list").append(items.join( "" ));
      }
+    
+    {% if theme == "fed4fire" %}
+    function drawProjects(projects){
+        var items = [];
+               
+        $.each( projects, function(i, val) {
+            items.push( "<li><a href=\"/portal/project/"+val+"\">" + val + "</a></li>" );
+        });
+        $("div#home-project-list").html($( "<ul/>", { html: items.join( "" ) }));
+        $("ul#dropdown-project-list").append(items.join( "" ));
+    }
      {% endif %}
+{% endif %}
         jQuery('[title!=""]').qtip();
  });
  </script>
  </head>
  <body ng-app="ManifoldApp">
+<div class="row">
+{% widget '_widget-message.html' %}
+</div>
  {% block container %}
         {% 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>