From f9a9a24516cc8636112cc966311e613954490855 Mon Sep 17 00:00:00 2001
From: meow <ahmedbilal96@gmail.com>
Date: Mon, 16 Dec 2019 12:54:59 +0500
Subject: [PATCH] Show username in navbar and setting. Show greeting in
 dashboard for user's name

---
 hosting/static/hosting/css/dashboard.css             |  1 -
 hosting/static/hosting/css/virtual-machine.css       | 11 +++++++++++
 hosting/templates/hosting/dashboard.html             |  3 +++
 hosting/templates/hosting/includes/_navbar_user.html |  2 +-
 hosting/templates/hosting/settings.html              |  4 ++++
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/hosting/static/hosting/css/dashboard.css b/hosting/static/hosting/css/dashboard.css
index c7bbecd9..0b718178 100644
--- a/hosting/static/hosting/css/dashboard.css
+++ b/hosting/static/hosting/css/dashboard.css
@@ -23,7 +23,6 @@
 
 .hosting-dashboard .dashboard-container-head {
     color: #fff;
-    margin-bottom: 60px;
 }
 
 .hosting-dashboard-item {
diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css
index 726b0f35..4d490ff7 100644
--- a/hosting/static/hosting/css/virtual-machine.css
+++ b/hosting/static/hosting/css/virtual-machine.css
@@ -248,6 +248,9 @@
   .dashboard-title-thin {
     font-size: 22px;
   }
+  .dashboard-greetings-thin {
+    font-size: 16px;
+  }
 }
 
 .btn-vm-invoice {
@@ -315,6 +318,11 @@
   font-size: 32px;
 }
 
+.dashboard-greetings-thin {
+  font-weight: 300;
+  font-size: 24px;
+}
+
 .dashboard-title-thin .un-icon {
   height: 34px;
   margin-right: 5px;
@@ -411,6 +419,9 @@
   .dashboard-title-thin {
     font-size: 22px;
   }
+  .dashboard-greetings-thin {
+    font-size: 16px;
+  }
   .dashboard-title-thin .un-icon {
     height: 22px;
     width: 22px;
diff --git a/hosting/templates/hosting/dashboard.html b/hosting/templates/hosting/dashboard.html
index 35ee9b6e..f87c3f61 100644
--- a/hosting/templates/hosting/dashboard.html
+++ b/hosting/templates/hosting/dashboard.html
@@ -7,6 +7,9 @@
             <div class="dashboard-container-head">
                 <h1 class="dashboard-title-thin">{% trans "My Dashboard" %}</h1>
             </div>
+            <div style="color:#fff; padding: 0 8px; margin-top: 12px; margin-bottom: 12px;">
+                {% trans "Welcome" %} {{request.user.name}}
+            </div>
             <div class="hosting-dashboard-content">
                 <a href="{% url 'hosting:create_virtual_machine' %}" class="hosting-dashboard-item">
                     <h2>{% trans "Create VM" %}</h2>
diff --git a/hosting/templates/hosting/includes/_navbar_user.html b/hosting/templates/hosting/includes/_navbar_user.html
index 7362f447..bd77eb5c 100644
--- a/hosting/templates/hosting/includes/_navbar_user.html
+++ b/hosting/templates/hosting/includes/_navbar_user.html
@@ -26,7 +26,7 @@
                 </li>
                 <li class="dropdown highlights-dropdown">
                     <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
-                        <i class="fa fa-fw fa-user"></i>&nbsp;&nbsp;{{request.user.name}}&nbsp;<span class="fa fa-fw fa-caret-down"></span>
+                        <i class="fa fa-fw fa-user"></i>&nbsp;&nbsp;{{request.user.username}}&nbsp;<span class="fa fa-fw fa-caret-down"></span>
                     </a>
                     <ul id="g-account-menu" class="dropdown-menu" role="menu">
                         <li><a href="{% url 'hosting:logout' %}">{% trans "Logout"%}</a></li>
diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html
index 5cdd830c..3ca0eee6 100644
--- a/hosting/templates/hosting/settings.html
+++ b/hosting/templates/hosting/settings.html
@@ -15,6 +15,10 @@
         <div class="settings-container">
             <div class="row">
                 <div class="col-sm-5 col-md-6  billing dcl-billing">
+                    <h3><b>{%trans "My Username"%}</b></h3>
+                    <hr class="top-hr">
+                    <p>{{request.user.username}}</p>
+                    <br>
                     <h3>{%trans "Billing Address" %}</h3>
                     <hr>
                     <form role="form" id="billing-form" method="post" action="" novalidate>