mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Show username in navbar and setting. Show greeting in dashboard for user's name

Browse source
This commit is contained in:
ahmadbilalkhalid 2019-12-16 12:54:59 +05:00
commit f9a9a24516
5 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hosting/static/hosting/css/dashboard.css
View file

@ -23,7 +23,6 @@
.hosting-dashboard .dashboard-container-head { .hosting-dashboard .dashboard-container-head {
color: #fff; color: #fff;
margin-bottom: 60px;
} }
.hosting-dashboard-item { .hosting-dashboard-item {

11
hosting/static/hosting/css/virtual-machine.css
View file

@ -248,6 +248,9 @@
.dashboard-title-thin { .dashboard-title-thin {
font-size: 22px; font-size: 22px;
} }
.dashboard-greetings-thin {
font-size: 16px;
}
} }
.btn-vm-invoice { .btn-vm-invoice {
@ -315,6 +318,11 @@
font-size: 32px; font-size: 32px;
} }
.dashboard-greetings-thin {
font-weight: 300;
font-size: 24px;
}
.dashboard-title-thin .un-icon { .dashboard-title-thin .un-icon {
height: 34px; height: 34px;
margin-right: 5px; margin-right: 5px;
@ -411,6 +419,9 @@
.dashboard-title-thin { .dashboard-title-thin {
font-size: 22px; font-size: 22px;
} }
.dashboard-greetings-thin {
font-size: 16px;
}
.dashboard-title-thin .un-icon { .dashboard-title-thin .un-icon {
height: 22px; height: 22px;
width: 22px; width: 22px;

3
hosting/templates/hosting/dashboard.html
View file

@ -7,6 +7,9 @@
<div class="dashboard-container-head"> <div class="dashboard-container-head">
<h1 class="dashboard-title-thin">{% trans "My Dashboard" %}</h1> <h1 class="dashboard-title-thin">{% trans "My Dashboard" %}</h1>
</div> </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"> <div class="hosting-dashboard-content">
<a href="{% url 'hosting:create_virtual_machine' %}" class="hosting-dashboard-item"> <a href="{% url 'hosting:create_virtual_machine' %}" class="hosting-dashboard-item">
<h2>{% trans "Create VM" %}</h2> <h2>{% trans "Create VM" %}</h2>

2
hosting/templates/hosting/includes/_navbar_user.html
View file

@ -26,7 +26,7 @@
</li> </li>
<li class="dropdown highlights-dropdown"> <li class="dropdown highlights-dropdown">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#"> <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> </a>
<ul id="g-account-menu" class="dropdown-menu" role="menu"> <ul id="g-account-menu" class="dropdown-menu" role="menu">
<li><a href="{% url 'hosting:logout' %}">{% trans "Logout"%}</a></li> <li><a href="{% url 'hosting:logout' %}">{% trans "Logout"%}</a></li>

4
hosting/templates/hosting/settings.html
View file

@ -15,6 +15,10 @@
<div class="settings-container"> <div class="settings-container">
<div class="row"> <div class="row">
<div class="col-sm-5 col-md-6 billing dcl-billing"> <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> <h3>{%trans "Billing Address" %}</h3>
<hr> <hr>
<form role="form" id="billing-form" method="post" action="" novalidate> <form role="form" id="billing-form" method="post" action="" novalidate>