From: Scott Baker <smbaker@gmail.com>
Date: Mon, 19 May 2014 20:40:20 +0000 (-0700)
Subject: welcome.html inherits from dashboard_base.html
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5cc598dfd42d9e990aec735a2ae232c09cc4e92a;p=plstackapi.git

welcome.html inherits from dashboard_base.html
---

diff --git a/planetstack/templates/admin/dashboard/welcome.html b/planetstack/templates/admin/dashboard/welcome.html
index 19b022c..0f616e5 100644
--- a/planetstack/templates/admin/dashboard/welcome.html
+++ b/planetstack/templates/admin/dashboard/welcome.html
@@ -1,77 +1,6 @@
-{% extends "admin/base.html" %}
+{% extends "admin/dashboard/dashboard_base.html" %}
 {% load admin_static %}
 
-{% block extrahead %}
-
-<link rel="stylesheet"  href="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.0/css/jquery.dataTables.css">
-<link rel="stylesheet" type="text/css" href="{% static 'suit/css/suit.css' %}" media="all">
-<link rel="stylesheet" type="text/css" href="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.0/css/jquery.dataTables_themeroller.css">
-<link rel="stylesheet" type="text/css" href="{% static 'planetstack.css' %}" media="all">
-<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css">
-
-<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.css" />
-<script src="http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.js"></script>
-
-
-<!-- no need to include jquery here as it's already included by base.html. Including it multiple times will break mtuity statistics. -->
-<!-- src="http://code.jquery.com/jquery-1.9.1.js" -->
-
-<script src="http://code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
-<script src="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/jquery.dataTables.min.js"></script>
-<script type="text/javascript" src="{% static 'log4javascript-1.4.6/log4javascript.js' %}"></script>
-<script src="{% static 'js/Leaflet.MakiMarkers.js' %}" > </script>
-
-<script>
-  $(function() {
-    $( "#hometabs" ).tabs({active: 0, //event: "mouseover"
-      //collapsible: true
-    });
-  });
-</script>
-
-<script>
-var consoleAppender = new log4javascript.BrowserConsoleAppender();
-var patternLayout = new log4javascript.PatternLayout("%d{HH:mm:ss,SSS} %l{s:l} %-5p - %m{1}%n");
-consoleAppender.setLayout(patternLayout);
-//var log  = log4javascript.getDefaultLogger();
-var log  = log4javascript.getRootLogger();
-log.addAppender(consoleAppender);
-log.setLevel(log4javascript.Level.ERROR);
-</script>
-
-<script>
-
-function confirmDialog(title,msg) {
-    var dialog = $('<div>'+msg+'</div>');
-    var def = $.Deferred();
-
-    $(dialog).dialog({
-        resizable: false,
-        title: title,
-        autoOpen: true,
-        modal: true,
-        dialogClass: "dashboard-hpc-sliver",
-        buttons: {
-            'OK': function() {
-                def.resolve();
-                log.debug("Chose to add a sliver");
-                $( this ).dialog( "close" );
-            },
-            'Cancel': function() {
-                def.reject();
-                $( this ).dialog( "close" );
-            }
-        },
-        close: {
-        }
-    });
-    return def.promise();
-}
-
-  </script>
-
-{% endblock %}
-
 {% block content %}
 <!-- <div id="hometabs" class="inner-center-column ui-tabs ui-widget ui-widget-content ui-corner-all"> -->
 <div id="hometabs" >
@@ -81,7 +10,6 @@ function confirmDialog(title,msg) {
     <li><a href="#tabs-3">Historical</a></li>
     <li><a href="#tabs-4">Slice Interactions</a></li>
     <li><a href="#tabs-5">Tenant</a></li>
-    <li><a href="#tabs-6">CDN Nodes</a></lib>
   </ul>
 <div id="tabs-1">
 {% include "/opt/planetstack/templates/admin/dashboard/developer.html" %}
@@ -98,9 +26,6 @@ function confirmDialog(title,msg) {
 <div id="tabs-5">
 {% include "/opt/planetstack/templates/admin/dashboard/tenant.html" %}
 </div>
-<div id="tabs-6">
-{% include "/opt/planetstack/templates/admin/dashboard/cdn_nodes.html" %}
-</div>
 </div>
 
 {% endblock %}