X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fbase.html;h=4760849629b1b4b766baeb9d8b038242233da580;hb=d0bb04b0886c2a2395c14aa7b2b30f58227f00c7;hp=5a1248cdedb548894123e3942abf63b358c1eecd;hpb=740a2bea5a69b3702a77c1e559456c13aa491829;p=unfold.git
diff --git a/portal/templates/base.html b/portal/templates/base.html
index 5a1248cd..47608496 100644
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -76,11 +76,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);
@@ -93,18 +93,18 @@ $(document).ready(function() {
var items = [];
$.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( "" ));
@@ -115,10 +115,11 @@ $(document).ready(function() {
$.each( projects, function(i, p) {
$.each( slices, function(y, s) {
if (s.match('^' + escapeRegExp(p))) {
- items_sl.push( "" + s.replace(p + '.','') + "" );
+ slicename = s.replace(p + '.','')
+ items_sl.push( " " + slicename + "" );
}
});
- el = "" + p + "";
+ el = "" + p + "";
if (items_sl.length > 0) {
el += "" + items_sl.join( "" ) + "
";
}