X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fbase.html;h=08b910d23a223a507e71cecd75e7d61f4f1147fd;hb=3a35ca5961754c1a0b8cbdd7aa717dcd837f3a43;hp=4b5999eeae3ffc4c18cc9a787c86eaf393bc2001;hpb=81e73becc2f47d96de6cf9f94ba4c86f710a18ba;p=unfold.git
diff --git a/portal/templates/base.html b/portal/templates/base.html
index 4b5999ee..08b910d2 100644
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -55,6 +55,7 @@
{% insert_str prelude "css/topmenu.css" %}
{% insert_str prelude "js/logout.js" %}
+
@@ -76,11 +77,11 @@ $(document).ready(function() {
slices.push("no slice");
}else{
slices = user.slices;
- {% if theme != "fed4fire" %}
+ {% if theme != "fed4fire" or "onelab" in theme %}
drawSlices(slices);
{% endif %}
}
- {% if theme == "fed4fire" %}
+ {% if theme == "fed4fire" or "onelab" in theme%}
p = myslice.get_projects();
if(p != null){
//drawProjects(p);
@@ -91,20 +92,20 @@ $(document).ready(function() {
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" %}
+ {% if theme == "fed4fire" or "onelab" in theme%}
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( "" ));
@@ -112,14 +113,17 @@ $(document).ready(function() {
function drawProjectsTree(projects,slices) {
var items = [];
var items_sl = [];
+ var slices_no_project = [];
$.each( projects, function(i, p) {
$.each( slices, function(y, s) {
- console.log(escapeRegExp(p));
if (s.match('^' + escapeRegExp(p))) {
- items_sl.push( "" + s.replace(p + '.','') + "" );
+ slicename = s.replace(p + '.','')
+ items_sl.push( " " + slicename + "" );
+ }else if(s.split('.').length < 4){
+ slices_no_project.push( " " + s + "" );
}
});
- el = "" + p + "";
+ el = "" + p + "";
if (items_sl.length > 0) {
el += "" + items_sl.join( "" ) + "
";
}
@@ -127,6 +131,18 @@ $(document).ready(function() {
items.push(el);
items_sl = [];
});
+ if (projects.length == 0){
+ $.each( slices, function(y, s) {
+ 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();
@@ -135,7 +151,7 @@ $(document).ready(function() {
window.setTimeout(function() {
$('.projects-loading').hide();
- },10000);
+ },20000);
{% endif %}
{% endif %}
jQuery('[title!=""]').qtip();