X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fbase.html;h=ceebc5d75f7d903ef31351bb9ee95a0feefd2aac;hb=5199a0430bc1d916307395058c6ffe5cc24a6a91;hp=0f2ecb5294c8ad6007cfbc2e296145dfd3801ef0;hpb=1fca38c650b5ec5b36e7fa7954143dc3961275ff;p=unfold.git diff --git a/portal/templates/base.html b/portal/templates/base.html index 0f2ecb52..ceebc5d7 100644 --- a/portal/templates/base.html +++ b/portal/templates/base.html @@ -1,9 +1,19 @@ {% load portal_filters %} {# This is required by insert_above #}{% insert_handler %} - + + {{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' %} @@ -11,13 +21,19 @@ - + + + + + + {{ 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" %} @@ -38,6 +54,7 @@ {% insert_str prelude "css/slider.css" %} {% insert_str prelude "css/topmenu.css" %} {% insert_str prelude "js/logout.js" %} + @@ -48,42 +65,103 @@ 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.get_user(); + + var slices = []; + if($.isEmptyObject(user)){ + $("div#home-slice-list").html( + "
You do not yet have a slice
"); + $("ul#dropdown-slice-list").append("
  • no slice
  • "); + slices.push("no slice"); + }else{ + slices = user.slices; + {% if theme != "fed4fire" or "onelab" in theme %} + drawSlices(slices); + {% endif %} + } + {% if theme == "fed4fire" or "onelab" in theme%} + p = myslice.get_projects(); + if(p != null){ + //drawProjects(p); + drawProjectsTree(p,slices); + } + {% 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( - "
    You do not yet have a slice
    "); - $("ul#dropdown-slice-list").append("
  • no slice
  • "); - slices.push("no slice"); - } - }); - }else{ - slices = user.slices; - drawSlices(slices); - } function drawSlices(slices){ var items = []; - + console.log(slices); $.each( slices, function(i, val) { - items.push( "
  • " + val + "
  • " ); + items.push( "
  • " + val + "
  • " ); }); $("div#home-slice-list").html($( "