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 a4f146c..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" %}
@@ -63,10 +64,10 @@ $(document).ready(function() {
              drawSlices(slices);
          }
          {% if theme == "fed4fire" %}
-        myslice.loadProjects(function(){
-            p = myslice.projects();
+        p = myslice.projects();
+        if(p != null){
              drawProjects(p);
-        });
+        }
          {% endif %}
      });
  
@@ -85,7 +86,7 @@ $(document).ready(function() {
          var items = [];
                 
          $.each( projects, function(i, val) {
-            items.push( "<li><a href=\"/project/"+val.authority_hrn+"\">" + val.authority_hrn + "</a></li>" );
+            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( "" ));
@@ -97,6 +98,9 @@ $(document).ready(function() {
  </script>
  </head>
  <body ng-app="ManifoldApp">
+<div class="row">
+{% widget '_widget-message.html' %}
+</div>
  {% block container %}
         {% block topmenu %}
         {% widget "_widget-topmenu.html" %}