From d643e6a5b135e9c12234f00ee5a391fa38694433 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 7 Sep 2017 20:24:19 +0530 Subject: [PATCH 01/15] login btn on datacenterlight pages --- .../datacenterlight/css/landing-page.css | 25 +++++++++++++++++++ .../datacenterlight/includes/_navbar.html | 7 ++++++ 2 files changed, 32 insertions(+) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9025473e..1507de2c 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -175,6 +175,31 @@ button, input, optgroup, select, textarea { .navbar-default .btn-link { box-shadow: none; } +.navbar-default .navbar-nav>li>.topnav_login { +/* color: #179; */ + font-weight: 400; + background: rgba(0,0,0,0.03); + border-radius: 5px; + padding-top: 10px; + padding-bottom: 10px; + top: 5px; +} +.navbar-default .navbar-nav>li>.topnav_login:hover, +.navbar-default .navbar-nav>li>.topnav_login:focus { + background: rgba(0,0,0,0.02); +} +.navbar-transparent .navbar-nav>li>.topnav_login { + background: rgba(0,0,0,0.2); + border-radius: 5px; + padding-top: 10px; + padding-bottom: 10px; + top: 5px; + color: #fff; +} +.navbar-transparent .navbar-nav>li>.topnav_login:hover, +.navbar-transparent .navbar-nav>li>.topnav_login:focus { + background: rgba(0,0,0,0.1); +} .navbar-brand { padding: 10px 15px; diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index ee791648..b2ae4cb4 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -34,6 +34,13 @@ Deutsch   {% else %} English   {% endif %} + {% if not request.user.is_authenticated %} +
  • + +
    • + {% endif %} + {% if request.path == '/en-us/datacenterlight/' or request.path == '/de/datacenterlight/' %} + {% endif %} {% comment %}
  • From 43c6abea7eb160bf70a6fe2831080e3823bb4de4 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 7 Sep 2017 20:27:18 +0530 Subject: [PATCH 02/15] minor changes --- datacenterlight/templates/datacenterlight/includes/_navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index b2ae4cb4..ab6a2ffe 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -36,7 +36,7 @@
    • {% if not request.user.is_authenticated %}
  • - +
    • {% endif %} {% if request.path == '/en-us/datacenterlight/' or request.path == '/de/datacenterlight/' %} From db891aaa1ef0b590a08a4ff33658fb0a88bac761 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 7 Sep 2017 21:01:17 +0530 Subject: [PATCH 03/15] 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'), From ac2791a3f1d0477e68a414277380fc8207f94b49 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 7 Sep 2017 22:44:06 +0530 Subject: [PATCH 04/15] dcl navbar border dadded --- datacenterlight/static/datacenterlight/css/landing-page.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9025473e..052e55c8 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -122,7 +122,7 @@ button, input, optgroup, select, textarea { .navbar-default { background: #fff; - border: none; + /* border: none; */ padding: 5px; } From c8b0e2388dcb4fe8c54c759a67621a91fcd20a2f Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 7 Sep 2017 23:10:05 +0530 Subject: [PATCH 05/15] login btn special style reset --- .../datacenterlight/css/landing-page.css | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 1507de2c..9025473e 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -175,31 +175,6 @@ button, input, optgroup, select, textarea { .navbar-default .btn-link { box-shadow: none; } -.navbar-default .navbar-nav>li>.topnav_login { -/* color: #179; */ - font-weight: 400; - background: rgba(0,0,0,0.03); - border-radius: 5px; - padding-top: 10px; - padding-bottom: 10px; - top: 5px; -} -.navbar-default .navbar-nav>li>.topnav_login:hover, -.navbar-default .navbar-nav>li>.topnav_login:focus { - background: rgba(0,0,0,0.02); -} -.navbar-transparent .navbar-nav>li>.topnav_login { - background: rgba(0,0,0,0.2); - border-radius: 5px; - padding-top: 10px; - padding-bottom: 10px; - top: 5px; - color: #fff; -} -.navbar-transparent .navbar-nav>li>.topnav_login:hover, -.navbar-transparent .navbar-nav>li>.topnav_login:focus { - background: rgba(0,0,0,0.1); -} .navbar-brand { padding: 10px 15px; From 223606947ac717ff45f40679b60be26eed5256a1 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 7 Sep 2017 23:48:53 +0530 Subject: [PATCH 06/15] removed icon --- .../templates/datacenterlight/includes/_navbar.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index ab6a2ffe..b098c916 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -36,7 +36,11 @@ {% if not request.user.is_authenticated %}
  • - + {% trans "Login" %}   +
    • + {% else %} +
  • + {% trans "Dashboard" %}
    • {% endif %} {% if request.path == '/en-us/datacenterlight/' or request.path == '/de/datacenterlight/' %} From b4641e9dfddab42e7de54c7ac20008207c8b751b Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 8 Sep 2017 00:07:09 +0530 Subject: [PATCH 07/15] font wieght 300 --- hosting/static/hosting/css/landing-page.css | 1 + 1 file changed, 1 insertion(+) diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 076ec34c..8ae52442 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -44,6 +44,7 @@ h6 { .navbar-default .navbar-nav>li>a { padding-top: 20px; padding-bottom: 20px; + font-weight: 300; } .navbar-transparent { From 84d35ea9164256cfb1d919293461a2ce6acfc1c0 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 8 Sep 2017 00:11:20 +0530 Subject: [PATCH 08/15] padding fixed --- hosting/static/hosting/css/landing-page.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 8ae52442..8881f7fd 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -35,6 +35,8 @@ h6 { .navbar-default { background: #fff; /* box-shadow: 0 3px 3px -2px hsla(0,0%,78%,.72); */ + padding-left: 5px; + padding-right: 5px; } .navbar-default .navbar-header { From 4937baa2e0e9aaf01bf809923ea4be321f59b66d Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 8 Sep 2017 02:22:03 +0530 Subject: [PATCH 09/15] dropdown style updated --- .../static/datacenterlight/css/landing-page.css | 2 +- hosting/static/hosting/css/landing-page.css | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 052e55c8..5eeed036 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -924,7 +924,7 @@ tech-sub-sec h2 { border: 1px solid #fff; -webkit-box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); -moz-box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); - box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); + box-shadow: -8px 14px 20px -5px rgba(77, 77, 77, 0.5); display: none; text-align: center; border-radius: 4px !important; diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 8881f7fd..7522827d 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -85,13 +85,17 @@ h6 { left: 0 !important; min-width: 155px; margin-left: 15px; - padding: 5px !important; + padding: 0 5px 8px !important; } @media(min-width: 768px) { .navbar-right .highlights-dropdown .dropdown-menu { - border: 1px solid #fff; + box-shadow: 0 2px 5px 0 rgba(0,0,0,0.02); + border-width: 0 0 1px 0; + border-color: #e7e7e7; + box-shadow: -8px 14px 20px -5px rgba(77, 77, 77, 0.5); + top: 53px; } - .navbar-right .highlights-dropdown .dropdown-menu:before { +/* .navbar-right .highlights-dropdown .dropdown-menu:before { content: ''; display: block; height: 1px; @@ -100,7 +104,7 @@ h6 { top: -1px; left: -1px; right: -1px; - } + } */ } .navbar-right .highlights-dropdown .dropdown-menu > li > a{ font-size: 13px; From bbee94072052dbd85c18e62df226b25ae1003dc7 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 8 Sep 2017 03:19:08 +0530 Subject: [PATCH 10/15] padding fix --- hosting/static/hosting/css/landing-page.css | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 7522827d..f75fa826 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -29,14 +29,13 @@ h6 { max-height: 740px; } .navbar-brand { - /* padding: 10px 15px; */ + padding: 10px 15px; } .navbar-default { background: #fff; /* box-shadow: 0 3px 3px -2px hsla(0,0%,78%,.72); */ - padding-left: 5px; - padding-right: 5px; + padding: 5px; } .navbar-default .navbar-header { @@ -44,8 +43,8 @@ h6 { z-index: 1; } .navbar-default .navbar-nav>li>a { - padding-top: 20px; - padding-bottom: 20px; + /* padding-top: 20px; */ + /* padding-bottom: 20px; */ font-weight: 300; } @@ -93,7 +92,7 @@ h6 { border-width: 0 0 1px 0; border-color: #e7e7e7; box-shadow: -8px 14px 20px -5px rgba(77, 77, 77, 0.5); - top: 53px; + /* top: 53px; */ } /* .navbar-right .highlights-dropdown .dropdown-menu:before { content: ''; From fc170462e2e3ec0363d8f99729d073ff8d7c4522 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 8 Sep 2017 03:41:25 +0530 Subject: [PATCH 11/15] font weight on mobile --- .../static/datacenterlight/css/landing-page.css | 12 ++++++++---- hosting/static/hosting/css/landing-page.css | 11 ++++------- hosting/templates/hosting/includes/_navbar_user.html | 10 ++++++---- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 5eeed036..4b0bfbc7 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -143,15 +143,19 @@ button, input, optgroup, select, textarea { .navbar-default .navbar-nav>li>a { cursor: pointer; - /*font-family: 'Lato-Light', sans-serif;*/ - font-weight: 300; + font-weight: 400; } .navbar-transparent .navbar-nav>li>a { color: #fff; cursor: pointer; - /*font-family: 'Lato-Light', sans-serif;*/ - font-weight: 300; +} + +@media (min-width: 768px) { + .navbar-default .navbar-nav>li>a, + .navbar-transparent .navbar-nav>li>a { + font-weight: 300; + } } .navbar-transparent .navbar-nav>li>a:hover { diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index f75fa826..09b2e066 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -42,11 +42,6 @@ h6 { position: relative; z-index: 1; } -.navbar-default .navbar-nav>li>a { - /* padding-top: 20px; */ - /* padding-bottom: 20px; */ - font-weight: 300; -} .navbar-transparent { background: transparent; @@ -87,12 +82,14 @@ h6 { padding: 0 5px 8px !important; } @media(min-width: 768px) { + .navbar-default .navbar-nav>li>a { + font-weight: 300; + } .navbar-right .highlights-dropdown .dropdown-menu { box-shadow: 0 2px 5px 0 rgba(0,0,0,0.02); border-width: 0 0 1px 0; border-color: #e7e7e7; box-shadow: -8px 14px 20px -5px rgba(77, 77, 77, 0.5); - /* top: 53px; */ } /* .navbar-right .highlights-dropdown .dropdown-menu:before { content: ''; @@ -109,7 +106,7 @@ h6 { font-size: 13px; font-weight: 300; font-family: 'Lato', sans-serif; - padding: 1px 10px !important; + padding: 1px 10px 1px 18px !important; background: transparent; color: #333; } diff --git a/hosting/templates/hosting/includes/_navbar_user.html b/hosting/templates/hosting/includes/_navbar_user.html index cfd313ce..75e2b4cf 100644 --- a/hosting/templates/hosting/includes/_navbar_user.html +++ b/hosting/templates/hosting/includes/_navbar_user.html @@ -24,12 +24,12 @@
    • -   {% trans "Dashboard"%} +   {% trans "Dashboard"%}
    • -   {{request.user.name}}  +   {{request.user.name}}  From 60bc1a86b39a84900e3cbbaa5cefe3c62fc384a2 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 8 Sep 2017 03:52:24 +0530 Subject: [PATCH 12/15] font weight on mobile --- .../static/datacenterlight/css/landing-page.css | 8 ++++++-- hosting/static/hosting/css/landing-page.css | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 4b0bfbc7..6537dd0d 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -980,8 +980,12 @@ tech-sub-sec h2 { .dropdown-menu>li>a { font-size: 13px; - font-weight: 300; - /*font-family: 'Lato-Light', sans-serif;*/ +} + +@media (min-width: 768px) { + .dropdown-menu>li>a { + font-weight: 300; + } } .navbar-default .navbar-nav>.active>a, diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 09b2e066..374a584b 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -82,7 +82,8 @@ h6 { padding: 0 5px 8px !important; } @media(min-width: 768px) { - .navbar-default .navbar-nav>li>a { + .navbar-default .navbar-nav>li>a, + .navbar-right .highlights-dropdown .dropdown-menu > li > a { font-weight: 300; } .navbar-right .highlights-dropdown .dropdown-menu { @@ -104,7 +105,6 @@ h6 { } .navbar-right .highlights-dropdown .dropdown-menu > li > a{ font-size: 13px; - font-weight: 300; font-family: 'Lato', sans-serif; padding: 1px 10px 1px 18px !important; background: transparent; From 5c543af25c5af62fa1b2da5a0de7ecb158123629 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 8 Sep 2017 20:14:43 +0530 Subject: [PATCH 13/15] code cleanup --- datacenterlight/templates/datacenterlight/includes/_navbar.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index b098c916..1709b6bc 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -43,8 +43,6 @@ {% trans "Dashboard" %}
      • {% endif %} - {% if request.path == '/en-us/datacenterlight/' or request.path == '/de/datacenterlight/' %} - {% endif %} {% comment %}
    • From e9e72f48835a643f7fd4c94284ccc64f5d05d1a3 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 9 Sep 2017 00:46:13 +0530 Subject: [PATCH 14/15] hosting navbar logo link fixed to dcl landing --- hosting/templates/hosting/includes/_navbar_user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/includes/_navbar_user.html b/hosting/templates/hosting/includes/_navbar_user.html index 75e2b4cf..d06477ca 100644 --- a/hosting/templates/hosting/includes/_navbar_user.html +++ b/hosting/templates/hosting/includes/_navbar_user.html @@ -16,7 +16,7 @@ {% endif %} - + {% if request.user.is_authenticated %} From 09852aade2ae3e3224bd9fde69d4a300988c9006 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 9 Sep 2017 02:04:28 +0530 Subject: [PATCH 15/15] Changelog updated 1.2.1 -> 1.2.2 --- Changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Changelog b/Changelog index efd6190f..423517ee 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,12 @@ +1.2.2: 2017-09-08 + * #3704: [hosting] Added my settings page + * #3771: [datacenterlight] Fixed the inconsistency in navbar style in billing page and onward + * #3769: [datacenterlight] Fixed EN dashboard url redirecting to the wrong page + * #3775: [hosting] Made the dashboard as the default start page for hosting app + * #3779: [hosting] Changed signup validation and activation page navbar transparent + * #3759: [hosting] Made the navbar style consistent to the dcl navbar and changed font weight from 300 to 400 for mobile navbar text + * #3644: [datacenterlight] Added a login button on landing + * #3659: [hosting] Changed hosting navbar design 1.2.1: 2017-09-06 * #3757: [datacenterlight] Added /l route for linkedin 1.2: 2017-09-01