git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
loading messages
[unfold.git]
/
portal
/
templates
/
base.html
diff --git
a/portal/templates/base.html
b/portal/templates/base.html
index
d5ab2da
..
1b83737
100644
(file)
--- a/
portal/templates/base.html
+++ b/
portal/templates/base.html
@@
-3,11
+3,13
@@
<html lang="en"><head>
<title>{{theme}} portal - {{ section }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<html lang="en"><head>
<title>{{theme}} portal - {{ section }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="shortcut icon" href="/static/img/favicon
_fed4fire
.ico">
+<link rel="shortcut icon" href="/static/img/favicon.ico">
{# This is where insert_str will end up #}{% media_container prelude %}
{% include 'messages-transient-header.html' %}
<script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
{# This is where insert_str will end up #}{% media_container prelude %}
{% include 'messages-transient-header.html' %}
<script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
+<!--<script src="{{ STATIC_URL }}js/jquery-ui.js"></script>-->
<script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
<script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
+<script src="{{ STATIC_URL }}js/jquery.qtip.min.js"></script>
<script src="{{ STATIC_URL }}js/bootstrap.datatables.js"></script>
<!-- <script src="{{ STATIC_URL }}js/stash.min.js"></script> -->
<script src="{{ STATIC_URL }}js/myslice.js"></script>
<script src="{{ STATIC_URL }}js/bootstrap.datatables.js"></script>
<!-- <script src="{{ STATIC_URL }}js/stash.min.js"></script> -->
<script src="{{ STATIC_URL }}js/myslice.js"></script>
@@
-17,6
+19,7
@@
{% block head %} {% endblock head %}
{# let's add these ones no matter what #}
{% insert_str prelude "js/jquery.min.js" %}
{% 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/jquery.html5storage.min.js" %}
{% insert_str prelude "js/messages-runtime.js" %}
{% insert_str prelude "js/class.js" %}
@@
-29,9
+32,15
@@
{% insert_str prelude "css/plugin.css" %}
{% insert_str prelude "js/bootstrap.js" %}
{% insert_str prelude "css/bootstrap.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" %}
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
{% insert_str prelude "css/topmenu.css" %}
{% insert_str prelude "js/logout.js" %}
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/jquery.qtip.min.css">
+
<script type="text/javascript">
/*
<script type="text/javascript">
/*
@@
-48,11
+57,13
@@
$(document).ready(function() {
if($.isEmptyObject(user)){
$.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
if(data.length > 0){
if($.isEmptyObject(user)){
$.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
if(data.length > 0){
-
slices = data[0].slices
;
+
drawSlices(data[0].slices)
;
}else{
}else{
+ $("div#home-slice-list").html(
+ "<div>You do not yet have a slice</div>");
+ $("ul#dropdown-slice-list").append("<li>no slice</li>");
slices.push("no slice");
}
slices.push("no slice");
}
- drawSlices(slices);
});
}else{
slices = user.slices;
});
}else{
slices = user.slices;
@@
-60,17
+71,19
@@
$(document).ready(function() {
}
function drawSlices(slices){
var items = [];
}
function drawSlices(slices){
var items = [];
+
$.each( slices, function(i, val) {
$.each( slices, function(i, val) {
- items.push( "<li><a href=\"/
slice
/"+val+"\">" + val + "</a></li>" );
+ items.push( "<li><a href=\"/
resources
/"+val+"\">" + val + "</a></li>" );
});
$("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
$("ul#dropdown-slice-list").append(items.join( "" ));
}
{% endif %}
});
$("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
$("ul#dropdown-slice-list").append(items.join( "" ));
}
{% endif %}
+ jQuery('[title!=""]').qtip();
});
</script>
</head>
});
</script>
</head>
-<body>
+<body
ng-app="ManifoldApp"
>
{% block container %}
{% block topmenu %}
{% widget "_widget-topmenu.html" %}
{% block container %}
{% block topmenu %}
{% widget "_widget-topmenu.html" %}
@@
-79,5
+92,10
@@
$(document).ready(function() {
{% block base_content %}
{% endblock %}
{% endblock container %}
{% block base_content %}
{% endblock %}
{% endblock container %}
+<div class="loading">
+ <div><img src="{{ STATIC_URL }}/img/loading.gif" /> Loading...</div>
+ <div> </div>
+ <div class="message"></div>
+</div>
</body>
</html>
</body>
</html>