Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

[myslice.git] / portal / templates / base.html
diff --git a/portal/templates/base.html b/portal/templates/base.html

index 449c5d2..a7dc6fd 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -3,11 +3,11 @@
  <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/fibre-logo2.ico"height ='16' width='16'>
  {# 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-ui.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>
@@ -86,11 +86,16 @@ $(document).ready(function() {
  <body ng-app="ManifoldApp">
  {% block container %}
         {% block topmenu %}
-       {% widget "_widget-topmenu.html" %}
+       {% widget "__widget-topmenu.html" %}
         {% endblock topmenu %}
-       {% include 'messages-transient.html' %}
         {% block base_content %}
         {% endblock %}
  {% endblock container %}
+{% widget "_footer.html" %}
+<div class="loading">
+       <div><img src="{{ STATIC_URL }}/img/loading.gif" /> Loading...</div>
+       <div>&nbsp;</div>
+       <div class="message"></div>
+</div>
  </body>
  </html>