X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fbase.html;h=82fa444f6efcb2b2517e920e8fe32a873c804e74;hb=335a5be14ae49e9f9ed35710be9e516f9ea8b789;hp=a4f146cc6d2fc91ce044447bc80ea8b4e147494f;hpb=3669e3329a72f94940f4bbf6aa94781d973332d9;p=myslice.git
diff --git a/portal/templates/base.html b/portal/templates/base.html
index a4f146cc..82fa444f 100644
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -3,7 +3,16 @@
{{theme}} portal - {{ section }}
-
+
+
+{% if theme == "fed4fire" %}
+
+{% elif theme == "smartfire" %}
+
+{% else %}
+
+{% endif %}
+
{# This is where insert_str will end up #}{% media_container prelude %}
{% include 'messages-transient-header.html' %}
@@ -14,10 +23,16 @@
+
+
+
+
+
{{ 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 +78,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 +100,7 @@ $(document).ready(function() {
var items = [];
$.each( projects, function(i, val) {
- items.push( "" + val.authority_hrn + "" );
+ items.push( "" + val + "" );
});
$("div#home-project-list").html($( "", { html: items.join( "" ) }));
$("ul#dropdown-project-list").append(items.join( "" ));
@@ -97,6 +112,9 @@ $(document).ready(function() {
+
+{% widget '_widget-message.html' %}
+
{% block container %}
{% block topmenu %}
{% widget "_widget-topmenu.html" %}