remove obsolete welcome view
diff --git a/planetstack/core/dashboard/sites.py b/planetstack/core/dashboard/sites.py
index 3284dae..4a2e742 100644
--- a/planetstack/core/dashboard/sites.py
+++ b/planetstack/core/dashboard/sites.py
@@ -12,7 +12,7 @@
def get_urls(self):
"""Add our dashboard view to the admin urlconf. Deleted the default index."""
from django.conf.urls import patterns, url
- from views import DashboardCustomize, DashboardDynamicView, DashboardWelcomeView, SimulatorView, \
+ from views import DashboardCustomize, DashboardDynamicView, SimulatorView, \
DashboardUserSiteView, \
TenantViewData, TenantCreateSlice, TenantAddUser,TenantAddOrRemoveSliverView, TenantPickSitesView, TenantDeleteSliceView, \
TenantUpdateSlice, DashboardSliceInteractions, RequestAccessView
@@ -40,7 +40,7 @@
name="customize"),
url(r'^hpcdashuserslices/', self.admin_view(DashboardUserSiteView.as_view()),
name="hpcdashuserslices"),
- url(r'^welcome/$', self.admin_view(DashboardWelcomeView.as_view()),
+ url(r'^welcome/$', self.admin_view(DashboardDynamicView.as_view()),
name="welcome"),
url(r'^simulator/', self.admin_view(SimulatorView.as_view()),
name="simulator"),
diff --git a/planetstack/core/dashboard/views/home.py b/planetstack/core/dashboard/views/home.py
index 3084c0e..c58c51f 100644
--- a/planetstack/core/dashboard/views/home.py
+++ b/planetstack/core/dashboard/views/home.py
@@ -1,13 +1,5 @@
from view_common import *
-class DashboardWelcomeView(TemplateView):
- template_name = 'admin/dashboard/welcome.html'
-
- def get(self, request, *args, **kwargs):
- context = self.get_context_data(**kwargs)
- context = getDashboardContext(request.user, context)
- return self.render_to_response(context=context)
-
class DashboardDynamicView(TemplateView):
head_template = r"""{% extends "admin/dashboard/dashboard_base.html" %}
{% load admin_static %}
diff --git a/planetstack/templates/admin/base.html b/planetstack/templates/admin/base.html
index 2d00343..29823a5 100644
--- a/planetstack/templates/admin/base.html
+++ b/planetstack/templates/admin/base.html
@@ -117,7 +117,7 @@
{% if not is_popup %}
<div id=openCloudTopPage>
- {% include "/opt/planetstack/templates/admin/newminidashboard.html" %}
+ {% include "admin/newminidashboard.html" %}
</div>
{% block breadcrumbs %}
diff --git a/planetstack/templates/admin/dashboard/welcome.html b/planetstack/templates/admin/dashboard/welcome.html
deleted file mode 100644
index 0f616e5..0000000
--- a/planetstack/templates/admin/dashboard/welcome.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "admin/dashboard/dashboard_base.html" %}
-{% load admin_static %}
-
-{% block content %}
-<!-- <div id="hometabs" class="inner-center-column ui-tabs ui-widget ui-widget-content ui-corner-all"> -->
-<div id="hometabs" >
- <ul id="suit_form_tabs" class="nav nav-tabs nav-tabs-suit" data-tab-prefix="suit-tab">
- <li><a href="#tabs-1">Developer View</a></li>
- <li><a href="#tabs-2">CDN Operations </a></li>
- <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>
- </ul>
-<div id="tabs-1">
-{% include "/opt/planetstack/templates/admin/dashboard/developer.html" %}
-</div>
-<div id="tabs-2">
-{% include "/opt/planetstack/templates/admin/dashboard/cdnoperations.html" %}
-</div>
-<div id="tabs-3">
-{% include "/opt/planetstack/templates/admin/dashboard/hpc_historical.html" %}
-</div>
-<div id="tabs-4">
-{% include "/opt/planetstack/templates/admin/dashboard/slice_interactions.html" %}
-</div>
-<div id="tabs-5">
-{% include "/opt/planetstack/templates/admin/dashboard/tenant.html" %}
-</div>
-</div>
-
-{% endblock %}