From aa37dde5e3f9853797322b438e6516a1b27b01be Mon Sep 17 00:00:00 2001
From: Hongwei <hongwei@tesobe.com>
Date: Thu, 30 Sep 2021 15:24:51 +0200
Subject: [PATCH] feature/Re-brand API Manager -- step3

---
 apimanager/base/static/css/base.css     | 15 +++++++++++++++
 apimanager/base/static/css/override.css | 18 ++++++++++++++----
 apimanager/base/templates/base.html     | 18 +++++++++---------
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/apimanager/base/static/css/base.css b/apimanager/base/static/css/base.css
index afb6436..b1d6042 100644
--- a/apimanager/base/static/css/base.css
+++ b/apimanager/base/static/css/base.css
@@ -164,3 +164,18 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo
 .authentication-method {
 	display: none;
 }
+#navbar-login-username{
+	color: #FFFFFF;
+}
+
+.navbar-default .navbar-nav > li > a:hover {
+	color: #fff;
+	text-decoration: underline;
+}
+.dropdown-hr{
+	margin:0px;
+	padding: 0px;
+}
+.dropdown-menu{
+	padding: 0;
+}
\ No newline at end of file
diff --git a/apimanager/base/static/css/override.css b/apimanager/base/static/css/override.css
index 5614432..bc0d52a 100644
--- a/apimanager/base/static/css/override.css
+++ b/apimanager/base/static/css/override.css
@@ -1,5 +1,4 @@
 /* Override Log on/out button */
-/*
 .navbar-btn .btn-default {
     font-family: UniversNextforDolphin-Regular;
     font-size: 16px;
@@ -11,9 +10,20 @@
     border: 0;
 }
 .navbar-btn .btn-default:hover {
-	background: #AF000D;
+    background: #AF000D;
 }
 .navbar-btn .btn-default:active {
-	background: #83000A;
+    background: #83000A;
 }
-*/
\ No newline at end of file
+
+.navbar-default {
+    background-color: #333333;
+    border: none;
+}
+.btn-primary {
+    background-color: #F3F3F3;
+    border: 1px solid #333333;
+    border-radius: 0;
+    outline: 0;
+    color: #000;
+}
\ No newline at end of file
diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html
index 992f3ae..7533831 100644
--- a/apimanager/base/templates/base.html
+++ b/apimanager/base/templates/base.html
@@ -41,8 +41,8 @@
 					<li class="dropdown{% if users_index_url in request.path or url_users_detail in request.path or my_user_invitation in request.path %} active{% endif %}">
 						<a href="#" data-toggle="dropdown" class="dropdown-toggle">Users</a>
 						<ul class="dropdown-menu">
-							<li{% if users_index_url in request.path  %} class="active"{% endif %}><a href="{{ users_index_url }}">All</a></li>
-							<li{% ifequal request.path url_users_detail  %} class="active" {% endifequal %}><a href="{{ url_users_detail }}">My User</a></li>
+							<li{% if users_index_url in request.path  %} class="active"{% endif %}><a href="{{ users_index_url }}">All</a></li><hr class="dropdown-hr">
+							<li{% ifequal request.path url_users_detail  %} class="active" {% endifequal %}><a href="{{ url_users_detail }}">My User</a></li><hr class="dropdown-hr">
 							<li{% ifequal request.path my_user_invitation  %} class="active" {% endifequal %}><a href="{{ my_user_invitation }}">Invite Developer</a></li>
 						</ul>
 					</li>
@@ -52,8 +52,8 @@
 					<li class="dropdown{% if api_metrics_url in request.path or connector_metrics_url in request.path or metrics_summary_url in request.path %} active{% endif %}">
 						<a href="#" data-toggle="dropdown" class="dropdown-toggle">Metrics</a>
 						<ul class="dropdown-menu">
-							<li{% if api_metrics_url in request.path  %} class="active"{% endif %}><a href="{{ api_metrics_url }}">API Metrics</a></li>
-							<li{% if connector_metrics_url in request.path  %} class="active"{% endif %}><a href="{{ connector_metrics_url }}">Connector Metrics</a></li>
+							<li{% if api_metrics_url in request.path  %} class="active"{% endif %}><a href="{{ api_metrics_url }}">API Metrics</a></li><hr class="dropdown-hr">
+							<li{% if connector_metrics_url in request.path  %} class="active"{% endif %}><a href="{{ connector_metrics_url }}">Connector Metrics</a></li><hr class="dropdown-hr">
 							<li{% if metrics_summary_url in request.path  %} class="active"{% endif %}><a href="{{ metrics_summary_url }}">KPI Dashboard</a></li>
 						</ul>
 					</li>
@@ -62,7 +62,7 @@
 					<li class="dropdown{% if customers_create_url in request.path %} active{% endif %}">
 						<a href="#" data-toggle="dropdown" class="dropdown-toggle">Resources</a>
 						<ul class="dropdown-menu">
-							<li{% if customers_create_url in request.path  %} class="active"{% endif %}><a href="{{ customers_create_url }}">Customers</a></li>
+							<li{% if customers_create_url in request.path  %} class="active"{% endif %}><a href="{{ customers_create_url }}">Customers</a></li><hr class="dropdown-hr">
 							<li{% if branches_list_url in request.path  %} class="active"{% endif %}><a href="{{ branches_list_url }}">Branches</a></li>
 						</ul>
 					</li>
@@ -73,9 +73,9 @@
                     <li class="dropdown{% if config_index_url in request.path %} active{% endif %}">
 						<a href="#" data-toggle="dropdown" class="dropdown-toggle">Configurations</a>
 						<ul class="dropdown-menu">
-							<li{% if config_index_url in request.path  %} class="active"{% endif %}><a href="{{ config_index_url }}">Config</a></li>
-							<li{% if webui_props_index_url in request.path  %} class="active"{% endif %}><a href="{{ webui_props_index_url }}">Webui Props</a></li>
-							<li{% if methodrouting_index_url in request.path  %} class="active"{% endif %}><a href="{{ methodrouting_index_url }}">Method Routings</a></li>
+							<li{% if config_index_url in request.path  %} class="active"{% endif %}><a href="{{ config_index_url }}">Config</a></li><hr class="dropdown-hr">
+							<li{% if webui_props_index_url in request.path  %} class="active"{% endif %}><a href="{{ webui_props_index_url }}">Webui Props</a></li><hr class="dropdown-hr">
+							<li{% if methodrouting_index_url in request.path  %} class="active"{% endif %}><a href="{{ methodrouting_index_url }}">Method Routings</a></li><hr class="dropdown-hr">
 							<li{% if dynamic_endpoints_index_url in request.path  %} class="active"{% endif %}><a href="{{ dynamic_endpoints_index_url }}">Dynamic Endpoints</a></li>
 						</ul>
 					</li>
@@ -89,7 +89,7 @@
 				<ul class="nav navbar-nav navbar-right">
 					<li>
 {% if user.is_authenticated %}
-                    <p class="navbar-btn"><a href="{% url 'oauth-logout' %}" class="btn btn-default">Logout {{ API_USERNAME }}</a></p>
+                    <p class="navbar-btn"><span id ="navbar-login-username">{{ API_USERNAME }}</span>&nbsp&nbsp</nr><a href="{% url 'oauth-logout' %}" class="btn btn-default">Logout </a></p>
 {% endif %}
 					</li>
 				</ul>