X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fbase.html;h=347fe99481ae924d47230fb1d0371071b6520278;hb=8d1991bdded62a4f68cc93889435b9c28f8565b0;hp=cbbc0ac4950a82417bb8a908700289d6238a4a99;hpb=1d9a6983edf2136e2158980462a5170e430510fc;p=unfold.git
diff --git a/portal/templates/base.html b/portal/templates/base.html
index cbbc0ac4..347fe994 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,10 +54,7 @@
{% insert_str prelude "css/slider.css" %}
{% insert_str prelude "css/topmenu.css" %}
{% insert_str prelude "js/logout.js" %}
-{% insert_str prelude "js/jquery-ui.js" %}
-{% insert_str prelude "js/jquery-ui-combobox.js" %}
-
-
+
@@ -54,7 +67,7 @@ This list of slices should go into SESSION !
$(document).ready(function() {
{% if username %}
myslice.login(function(){
- user = myslice.user();
+ user = myslice.get_user();
var slices = [];
if($.isEmptyObject(user)){
@@ -64,37 +77,74 @@ $(document).ready(function() {
slices.push("no slice");
}else{
slices = user.slices;
- drawSlices(slices);
}
- {% if theme == "fed4fire" %}
- p = myslice.projects();
+ p = myslice.get_projects();
if(p != null){
- drawProjects(p);
+ //drawProjects(p);
+ drawProjectsTree(p,slices);
}
- {% endif %}
});
function drawSlices(slices){
var items = [];
-
+ console.log(slices);
$.each( slices, function(i, val) {
- items.push( "" + val + "" );
+ items.push( "
" + val + "" );
});
$("div#home-slice-list").html($( "", { 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( "" + val + "" );
+ items.push( "" + val + "" );
});
$("div#home-project-list").html($( "", { html: items.join( "" ) }));
$("ul#dropdown-project-list").append(items.join( "" ));
}
- {% endif %}
+ function drawProjectsTree(projects,slices) {
+ var items = [];
+ var items_sl = [];
+ var slices_no_project = [];
+ $.each( projects, function(i, p) {
+ $.each( slices, function(y, s) {
+ if (s.match('^' + escapeRegExp(p))) {
+ slicename = s.replace(p + '.','')
+ items_sl.push( " " + slicename + "" );
+ }
+ });
+ el = "" + p + "";
+ if (items_sl.length > 0) {
+ el += "" + items_sl.join( "" ) + "
";
+ }
+ el += "";
+ items.push(el);
+ items_sl = [];
+ });
+
+ $.each( slices, function(y, s) {
+ if(s.split('.').length < 4){
+ slices_no_project.push( " " + s + "" );
+ }
+ });
+ if (slices_no_project.length > 0) {
+ elm = 'other slices ';
+ elm += "" + slices_no_project.join( "" ) + "
";
+ elm += "";
+ items.push(elm);
+ }
+
+ $("div#home-project-tree").html($( "", { html: items.join( "" ) }));
+ if (projects.length > 0) {
+ $('.dashboard-create-slice').show();
+ }
+ }
+
+ window.setTimeout(function() {
+ $('.projects-loading').hide();
+ },20000);
{% endif %}
jQuery('[title!=""]').qtip();
});