Skip to content

Commit 37823c3

Browse files
usmannasirusmannasir
committed
bug fix: some design issues
1 parent b4674e5 commit 37823c3

File tree

2 files changed

+12
-64
lines changed

2 files changed

+12
-64
lines changed

‎baseTemplate/templates/baseTemplate/index.html‎

Lines changed: 10 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
<link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/custom-js/pnotify.custom.min.css' %}">
9191
<link rel="stylesheet" type="text/css" href="{% static 'websiteFunctions/websiteFunctions.css' %}">
9292
<link rel="icon" type="image/png" href="{% static 'baseTemplate/assets/finalBase/favicon.png' %}">
93-
<link type="text/css" href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet"/>
93+
<link type="text/css" href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css"
94+
rel="stylesheet"/>
9495
{% block styles %}
9596
{% endblock %}
9697

@@ -115,11 +116,6 @@
115116

116117

117118
<body>
118-
<div id="sb-site">
119-
120-
121-
<!------- ng-controller="systemStatusInfo" ------------>
122-
123119

124120
<div class="sb-slidebar bg-black sb-right sb-style-overlay">
125121
<div class="scrollable-content scrollable-slim-sidebar">
@@ -174,7 +170,6 @@
174170
</div>
175171
</div>
176172

177-
178173
<div id="loading">
179174
<div class="spinner">
180175
<div class="bounce1"></div>
@@ -203,60 +198,20 @@
203198
<i class="glyph-icon icon-angle-left"></i>
204199
</a>
205200
</div>
206-
<div id="header-nav-left">
207-
<div ng-controller="adminController" class="user-account-btn dropdown">
208-
<a href="#" title="{% trans 'My Account' %}" class="user-profile clearfix"
209-
data-toggle="dropdown">
210-
<img width="28" src="{% static 'baseTemplate/assets/image-resources/gravatar.png' %}"
211-
alt="Profile image">
212-
<span>{$ currentAdmin $}</span>
213-
<i class="glyph-icon icon-angle-down"></i>
214-
</a>
215-
<div class="dropdown-menu float-left">
216-
<div class="box-sm">
217-
<div class="login-box clearfix">
218-
<div class="user-img">
219-
<a href="#" title="{% trans '' %}" class="change-img">Change photo</a>
220-
<img src="{% static 'baseTemplate/assets/image-resources/gravatar.png' %}"
221-
alt="">
222-
</div>
223-
<div class="user-info">
224-
<span>
225-
{$ currentAdmin $}
226-
<i>{$ admin_type $}</i>
227-
</span>
228-
<a href="{% url 'modifyUsers' %}"
229-
title="{% trans 'Edit profile' %}">{% trans "Edit profile" %}</a>
230-
<a href="{% url 'viewProfile' %}"
231-
title="{% trans 'View Profile' %}">{% trans "View Profile" %}</a>
232-
</div>
233-
</div>
234-
<div class="divider"></div>
235-
<div class="pad5A button-pane button-pane-alt text-center">
236-
<a href="{% url 'logout' %}" class="btn display-block font-normal btn-danger">
237-
<i class="glyph-icon icon-power-off"></i>
238-
{% trans "Logout" %}
239-
</a>
240-
</div>
241-
</div>
242-
</div>
243-
</div>
244-
</div><!-- #header-nav-left -->
245-
246201

247202
<div ng-controller="loadAvg" id="header-nav-right">
248203

249-
<a class="hide-on-phone" style="background-color: none;width: 33px" href="#" class="hdr-btn"
204+
<a class="hide-on-phone" style="background-color: unset;width: 33px" href="#" class="hdr-btn"
250205
title="{% trans 'CPU Load Average' %}" data-placement="bottom">
251206
<span class="badge bg-yellow">{$ one $}</span>
252207
</a>
253208

254-
<a class="hide-on-phone" style="background-color: none;width: 33px" href="#" class="hdr-btn"
209+
<a class="hide-on-phone" style="background-color: unset;width: 33px" href="#" class="hdr-btn"
255210
title="{% trans 'CPU Load Average' %}" data-placement="bottom">
256211
<span class="badge bg-yellow">{$ two $}</span>
257212
</a>
258213

259-
<a class="hide-on-phone" style="background-color: none;width: 33px" href="#" class="hdr-btn"
214+
<a class="hide-on-phone" style="background-color: unset;width: 33px" href="#" class="hdr-btn"
260215
title="{% trans 'CPU Load Average' %}" data-placement="bottom">
261216
<span class="badge bg-yellow">{$ three $}</span>
262217
</a>
@@ -324,20 +279,19 @@
324279
</a>
325280

326281

327-
</div><!-- #header-nav-right -->
282+
</div>
283+
<!-- #header-nav-right -->
328284

329285
</div>
330286
<div id="page-sidebar">
331287
<div class="scroll-sidebar">
332-
333-
334288
<ul id="sidebar-menu">
335289
<li class="header"><span>{% trans "Overview" %}</span></li>
336290
<li>
337291
<a href="#" title="{% trans 'Server IP Address' %}">
338292
<i class="glyph-icon tooltip-button icon-laptop" title="{% trans 'Server IP Address' %}"
339293
data-original-title=".icon-laptop"></i>
340-
<span style="color: #db6868;font-weight: bold;" id="serverIPAddress"></span>
294+
<span style="color: #db6868;font-weight: bold;">{{ ipAddress }}</span>
341295
</a>
342296
<a href="{% url 'index' %}" title="{% trans 'Dashboard' %}">
343297
<i class="glyph-icon icon-dashboard"></i>
@@ -711,7 +665,7 @@
711665
{% endif %}
712666
</ul>
713667

714-
</div><!-- .sidebar-submenu -->
668+
</div>
715669
</li>
716670

717671

@@ -740,7 +694,7 @@
740694
{% endif %}
741695
</ul>
742696

743-
</div><!-- .sidebar-submenu -->
697+
</div>
744698
</li>
745699

746700
{% if admin %}
@@ -1047,10 +1001,8 @@
10471001
{% endif %}
10481002

10491003
</ul><!-- #sidebar-menu -->
1050-
10511004
</div>
10521005
</div>
1053-
10541006
<div id="page-content-wrapper">
10551007
<div id="page-content">
10561008

@@ -1061,13 +1013,8 @@
10611013
</div>
10621014

10631015
</div>
1064-
10651016
</div>
10661017

1067-
1068-
<!-- WIDGETS -->
1069-
1070-
<!-- Sparklines charts -->
10711018
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrious/4.0.2/qrious.js"></script>
10721019
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
10731020
<script src="{% static 'baseTemplate/custom-js/pnotify.custom.min.js' %}"></script>
@@ -1084,7 +1031,6 @@
10841031
<script src="{% static 'serverLogs/serverLogs.js' %}?ver={{ version }}"></script>
10851032
<script src="{% static 'emailPremium/emailPremium.js' %}?ver={{ version }}"></script>
10861033
<script src="{% static 'emailMarketing/emailMarketing.js' %}?ver={{ version }}"></script>
1087-
10881034
<script type="text/javascript" src="{% static 'baseTemplate/assets/finalJS/final.js' %}"></script>
10891035
<script src="{% static 'backup/backup.js' %}?ver={{ version }}"></script>
10901036
<script src="{% static 'managePHP/managePHP.js' %}?ver={{ version }}"></script>

‎plogical/httpProc.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ def render(self):
1919
from plogical.acl import ACLManager
2020

2121
currentACL = ACLManager.loadedACL(userID)
22+
admin = Administrator.objects.get(pk=userID)
2223

2324
### Permissions Check
2425

@@ -38,6 +39,7 @@ def render(self):
3839
ipData = f.read()
3940
ipAddress = ipData.split('\n', 1)[0]
4041
self.data['ipAddress'] = ipAddress
42+
self.data['fullName'] = '%s %s' % (admin.firstName, admin.lastName)
4143

4244
self.data.update(currentACL)
4345

0 commit comments

Comments
 (0)