X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fbase.html;h=cc60f7f166d267f15517d6cd47627e84aab66d89;hb=f20d421a356e75a8eb58a17ba60cf22c14de9990;hp=5989508a39d52aba756e5b1b578803be00187b05;hpb=3687fceeb71642a4251bf3968dba294856f2b0c2;p=unfold.git
diff --git a/portal/templates/base.html b/portal/templates/base.html
index 5989508a..cc60f7f1 100644
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -3,10 +3,11 @@
{{theme}} portal - {{ section }}
-
+
{# This is where insert_str will end up #}{% media_container prelude %}
{% include 'messages-transient-header.html' %}
+
@@ -18,17 +19,23 @@
{% block head %} {% endblock head %}
{# let's add these ones no matter what #}
{% insert_str prelude "js/jquery.min.js" %}
+{% insert_str prelude "js/angular/angular.min.js" %}
{% insert_str prelude "js/jquery.html5storage.min.js" %}
{% insert_str prelude "js/messages-runtime.js" %}
{% insert_str prelude "js/class.js" %}
{% insert_str prelude "js/plugin-helper.js" %}
{% insert_str prelude "js/mustache.js" %}
+{% insert_str prelude "js/hashtable.js" %}
{% insert_str prelude "js/plugin.js" %}
{% insert_str prelude "js/manifold.js" %}
{% insert_str prelude "css/manifold.css" %}
{% insert_str prelude "css/plugin.css" %}
{% insert_str prelude "js/bootstrap.js" %}
{% insert_str prelude "css/bootstrap.css" %}
+{% insert_str prelude "js/bootstrap-datepicker.js" %}
+{% insert_str prelude "css/datepicker.css" %}
+{% insert_str prelude "js/bootstrap-slider.js" %}
+{% insert_str prelude "css/slider.css" %}
{% insert_str prelude "css/topmenu.css" %}
{% insert_str prelude "js/logout.js" %}
@@ -48,7 +55,7 @@ $(document).ready(function() {
var slices = [];
if($.isEmptyObject(user)){
- $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
+ $.post("/rest/myslice:user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
if(data.length > 0){
drawSlices(data[0].slices);
}else{
@@ -62,11 +69,22 @@ $(document).ready(function() {
slices = user.slices;
drawSlices(slices);
}
+
+ /*
+ Launch queries to get the resources and leases in Manifold Cache
+ */
+
function drawSlices(slices){
var items = [];
$.each( slices, function(i, val) {
- items.push( "" + val + " " );
+ items.push( "" + val + " " );
+ /*
+ // Launch a Query for each slice to get resources and leases in Manifold Cache
+ // Now only done in Homeview to speed up the other pages
+ $.post("/rest/slice/", { 'filters': { 'slice_hrn' : val } }, function(data) {
+ });
+ */
});
$("div#home-slice-list").html($( "", { html: items.join( "" ) }));
$("ul#dropdown-slice-list").append(items.join( "" ));
@@ -76,14 +94,19 @@ $(document).ready(function() {
});
-
+
{% block container %}
{% block topmenu %}
{% widget "_widget-topmenu.html" %}
{% endblock topmenu %}
- {% include 'messages-transient.html' %}
{% block base_content %}
{% endblock %}
{% endblock container %}
+{% widget "_footer.html" %}
+
+
Loading...
+
+
+