From db891aaa1ef0b590a08a4ff33658fb0a88bac761 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 7 Sep 2017 21:01:17 +0530 Subject: [PATCH] hosting navbar changed and consistent with dcl navbar --- .../datacenterlight/includes/_navbar.html | 6 +- dynamicweb/urls.py | 78 +++++++++++-------- hosting/static/hosting/css/commons.css | 2 +- hosting/static/hosting/css/landing-page.css | 8 +- hosting/templates/hosting/base_short.html | 56 +------------ .../hosting/includes/_navbar_user.html | 50 ++++++++++++ hosting/urls.py | 1 + 7 files changed, 108 insertions(+), 93 deletions(-) create mode 100644 hosting/templates/hosting/includes/_navbar_user.html diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index ee791648..9c17d39e 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -1,10 +1,12 @@ -{% load staticfiles i18n%} {% load custom_tags %} {% get_current_language as LANGUAGE_CODE %} +{% load staticfiles i18n%} +{% load custom_tags %} +{% get_current_language as LANGUAGE_CODE %} + {% include "hosting/includes/_navbar_user.html" %} {% endblock navbar %} diff --git a/hosting/templates/hosting/includes/_navbar_user.html b/hosting/templates/hosting/includes/_navbar_user.html new file mode 100644 index 00000000..cfd313ce --- /dev/null +++ b/hosting/templates/hosting/includes/_navbar_user.html @@ -0,0 +1,50 @@ +{% load staticfiles %} +{% load i18n %} +{% load custom_tags %} + + + + \ No newline at end of file diff --git a/hosting/urls.py b/hosting/urls.py index e6b6fee3..94444107 100644 --- a/hosting/urls.py +++ b/hosting/urls.py @@ -11,6 +11,7 @@ from .views import ( HostingBillDetailView, SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView, SSHKeyChoiceView, DashboardView) + urlpatterns = [ url(r'index/?$', IndexView.as_view(), name='index'), url(r'django/?$', DjangoHostingView.as_view(), name='djangohosting'),