Skip to content

Commit f008986

Browse files
jimmy201602jimmy201602
committed
fix template style
1 parent b900602 commit f008986

File tree

4 files changed

+7
-226
lines changed

4 files changed

+7
-226
lines changed

‎db.sqlite3‎

0 Bytes
Binary file not shown.

‎superadmin/views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def get(self,request):
127127
request.session['username'] = request.user.username
128128
username = request.session['username']
129129
usertypecode = request.session['usertype']
130-
return render_to_response('index.html',locals())
130+
return render_to_response('base.html',locals())
131131

132132
# Show node
133133
class showNode(LoginRequiredMixin,View):

‎templates/base.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{%load i18n%}
77
<meta charset="utf-8">
88
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9-
<title>{% block title %}{%trans 'AdminLTE 2 | Dashboard'%}{%endblock%}</title>
9+
<title>{% block title %}{%trans 'Supervisor Admin'%}{%endblock%}</title>
1010
<!-- Tell the browser to be responsive to screen width -->
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
1212
<!-- Bootstrap 3.3.6 -->
@@ -51,9 +51,9 @@
5151
<!-- Logo -->
5252
<a href="index2.html" class="logo">
5353
<!-- mini logo for sidebar mini 50x50 pixels -->
54-
<span class="logo-mini"><b>{%trans 'W' %}</b>{%trans 'T' %}</span>
54+
<span class="logo-mini"><b>{%trans 'S' %}</b>{%trans 'A' %}</span>
5555
<!-- logo for regular state and mobile devices -->
56-
<span class="logo-lg"><b>{%trans 'web' %}</b>{%trans 'terminal' %}</span>
56+
<span class="logo-lg"><b>{%trans 'supervisor' %}</b>{%trans 'admin' %}</span>
5757
</a>
5858
<!-- Header Navbar: style can be found in header.less -->
5959
<nav class="navbar navbar-static-top">
@@ -347,7 +347,7 @@ <h3>{{stopped_process_count}}</h3>
347347
<!-- End collg-12 maindiv -->
348348
</div>
349349
<!-- /.row -->
350-
350+
<div id="dialog"></div>
351351
{% endblock %}
352352
</section>
353353

@@ -357,7 +357,7 @@ <h3>{{stopped_process_count}}</h3>
357357
<div class="pull-right hidden-xs">
358358
<b>{%trans 'Version' %}</b> 0.1
359359
</div>
360-
<strong>{%trans 'Copyright &copy; 2014-2016' %} <a href="https://github.com/jimmy201602/webterminal">{%trans 'webterminal' %}</a></strong> {%trans 'All rights reserved.' %}
360+
<strong>{%trans 'Copyright &copy; 2014-2016' %} <a href="https://github.com/jimmy201602/supervisoradmin">{%trans 'supervisoradmin' %}</a></strong> {%trans 'All rights reserved.' %}
361361
</footer>
362362

363363

‎templates/index.html‎

Lines changed: 1 addition & 220 deletions
Original file line numberDiff line numberDiff line change
@@ -1,220 +1 @@
1-
<!DOCTYPE html>
2-
<html>
3-
{% load staticfiles %}
4-
{% load customizetags %}
5-
<head>
6-
7-
<meta charset="utf-8">
8-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
9-
10-
<title>cesi</title>
11-
12-
<!-- Core CSS - Include with every page -->
13-
<link rel=stylesheet type=text/css href="{% static 'plugins/bootstrap/bootstrap.min.css' %}" rel="stylesheet">
14-
<link rel=stylesheet type=text/css href="{% static 'plugins/font-awesome/css/font-awesome.css' %}" rel="stylesheet">
15-
<link rel=stylesheet type=text/css href="{% static 'plugins/jquery-ui-1.11.0.custom/jquery-ui.min.css' %}">
16-
<link rel=stylesheet type=text/css href="{% static 'plugins/jquery-ui-1.11.0.custom/jquery-ui.css' %}">
17-
18-
<!-- Page-Level Plugin CSS - Dashboard -->
19-
<link rel=stylesheet type=text/css href="{% static 'plugins/morris/morris-0.4.3.min.css' %}" rel="stylesheet">
20-
<link rel=stylesheet type=text/css href="{% static 'plugins/timeline/timeline.css' %}" rel="stylesheet">
21-
22-
<!-- SB Admin CSS - Include with every page -->
23-
<link rel=stylesheet type=text/css href="{% static 'css/sb-admin.css' %}" rel="stylesheet">
24-
25-
<!-- Table links -->
26-
<link rel=stylesheet type=text/css href="{% static 'css/custom.css' %}">
27-
</head>
28-
29-
<body>
30-
31-
<div id="wrapper">
32-
33-
<nav class="navbar navbar-default navbar-fixed-top" role="navigation" style="margin-bottom: 0">
34-
<div class="navbar-header">
35-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-collapse">
36-
<span class="sr-only">Toggle navigation</span>
37-
<span class="icon-bar"></span>
38-
<span class="icon-bar"></span>
39-
<span class="icon-bar"></span>
40-
</button>
41-
<div class="logo"><img src="{% static 'cesi.png' %}" width="80" height="80"/></div>
42-
</div>
43-
<!-- /.navbar-header -->
44-
45-
<ul class="nav navbar-top-links navbar-right">
46-
<li class="dropdown">
47-
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
48-
<i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i>
49-
</a>
50-
<ul class="dropdown-menu dropdown-user">
51-
<li><a href="#"><i class="fa fa-user fa-fw"></i> {{username}}({{usertype}}) </a></li>
52-
<li><a href="{% url 'logout' %}"><i class="fa fa-sign-out fa-fw"></i> Logout</a></li>
53-
</ul>
54-
<!-- /.dropdown-user -->
55-
</li>
56-
<!-- /.dropdown -->
57-
</ul>
58-
<!-- /.navbar-top-links -->
59-
60-
<div class="navbar-default navbar-static-side" role="navigation">
61-
<div class="sidebar-collapse">
62-
<ul class="nav" id="side-menu">
63-
<!-- Navbar Dashboard -->
64-
<li>
65-
<a href="/" class="dashboard"><i class="glyphicon glyphicon-dashboard"></i> Dashboard</a>
66-
</li>
67-
68-
<!--Navbar showall-->
69-
<li>
70-
<a href="#" class="showall" usertype="{{usertypecode}}"><i class="glyphicon glyphicon-list"></i> Show All</a>
71-
</li>
72-
73-
<!--Navbar Nodes-->
74-
<li>
75-
<a href="#"><i class="glyphicon glyphicon-th-list"></i> Nodes<span class="fa arrow"></span></a>
76-
<ul class="nav nav-second-level">
77-
{% for node_name in connected_node_list %}
78-
<li class="ajax2" value="{{node_name}}" usertype="{{usertypecode}}">
79-
<a> <input type="checkbox" class="ajax" value="{{ node_name }}" disabled="true"> {{ node_name }} </a>
80-
</li>
81-
{% endfor %}
82-
{% for node_name in not_connected_node_list %}
83-
<li value="{{node_name}}" >
84-
<a><i class="glyphicon glyphicon-remove"></i> {{ node_name }} </a>
85-
</li>
86-
{% endfor %}
87-
</ul>
88-
<!-- /.nav-second-level -->
89-
</li>
90-
91-
<!--Navbar Environments-->
92-
<li>
93-
<a><i class="glyphicon glyphicon-th-large"></i> Environments<span class="fa arrow"></span></a>
94-
<ul class="nav nav-second-level">
95-
<!--Environment names-->
96-
{% for memberlist in environment_list %}
97-
<li>
98-
<a><i class="glyphicon glyphicon-tag"></i> {{ environment_name_list|index:forloop.counter0 }}<span class="fa arrow"></span></a>
99-
<ul class="nav nav-third-level">
100-
<!--Environment's node names-->
101-
{% for member in memberlist %}
102-
<li class="ajax2" value="member {{member}}" usertype="{{usertypecode}}">
103-
<a><input type="checkbox" value="{{ member }}" disabled="true"> {{ member }}</a>
104-
</li>
105-
{% endfor %}
106-
</ul>
107-
</li>
108-
{% endfor %}
109-
</ul>
110-
<!-- /.nav-second-level -->
111-
112-
</li>
113-
114-
<!--Navbar groups-->
115-
<li>
116-
<a href="#" class="groups"><i class="glyphicon glyphicon-th"></i> Groups <span class="fa arrow"></span></a>
117-
<ul class="nav nav-second-level">
118-
{% for index in group_list %}
119-
<li>
120-
<a><i class="glyphicon glyphicon-paperclip"></i> {{ index }} <span class="fa arrow"> </a>
121-
<ul class="nav nav-third-level">
122-
{% for env_name in g_environment_list|index:forloop.counter0 %}
123-
<li class="ajax3" usertype="{{usertypecode}}">
124-
<a><input type="checkbox" group="{{ index }}" env="{{ env_name }}" disabled="true"> {{ env_name }} </a>
125-
</li>
126-
{% endfor %}
127-
</ul>
128-
</li>
129-
{% endfor %}
130-
</ul>
131-
</li>
132-
</ul>
133-
<!-- /#side-menu -->
134-
</div>
135-
<!-- /.sidebar-collapse -->
136-
</div>
137-
<!-- /.navbar-static-side -->
138-
</nav>
139-
140-
<div id="page-wrapper">
141-
<div class="row">
142-
<div class="col-lg-12 pagewrap" id="maindiv">
143-
<div class="dash">
144-
<div class="row">
145-
<div class="col-lg-4 col-xs-4">
146-
<div class="small-box bg-teal">
147-
<div class="inner">
148-
<h3>Environment</h3>
149-
<h4> Node Count </h4>
150-
<h3>{{node_count}}</h3>
151-
<h4>Process Count</h4>
152-
<h3>{{all_process_count}}</h3>
153-
<br/><br/><br/><br/>
154-
</div>
155-
</div>
156-
</div><!-- ./col -->
157-
<div class="col-lg-4 col-xs-4">
158-
<div class="small-box bg-blue">
159-
<div class="inner">
160-
<h3>Nodes</h3>
161-
<h4> Node Count </h4>
162-
<h3>{{node_count}}</h3>
163-
<h4>Connected</h4>
164-
<h3>{{connected_count}}</h3>
165-
<h4>Not Connected</h4>
166-
<h3>{{not_connected_count}}</h3<br/>
167-
</div>
168-
</div>
169-
</div><!-- ./col -->
170-
<div class="col-lg-4 col-xs-4">
171-
<!-- small box -->
172-
<div class="small-box bg-navy">
173-
<div class="inner">
174-
<h3>Process</h3>
175-
<h4> Process Count </h4>
176-
<h3>{{all_process_count}}</h3>
177-
<h4>Running</h4>
178-
<h3>{{running_process_count}}</h3>
179-
<h4>Stopped</h4>
180-
<h3>{{stopped_process_count}}</h3>
181-
</div>
182-
</div>
183-
</div><!-- ./col -->
184-
</div><!-- /.row -->
185-
</div> <!--Dashboard-->
186-
187-
<div class="panel panel-custom activity-log bg-black" ><div class="panel-heading bg-yellow">Activity log</div><p></p></div>
188-
189-
</div>
190-
<!-- End collg-12 maindiv -->
191-
</div>
192-
</div>
193-
<!-- /.row -->
194-
</div>
195-
<!-- /#page-wrapper -->
196-
</div>
197-
<!-- /#wrapper -->
198-
<div id="dialog">
199-
</div>
200-
<script language="JavaScript" type="text/javascript" src="{% static 'plugins/jquery/jquery.min.js' %}"></script>
201-
<script language="JavaScript" type="text/javascript" src="{% static 'plugins/jquery-ui-1.11.0.custom/jquery-ui.js' %}"></script>
202-
<script language="JavaScript" type="text/javascript" src="{% static 'plugins/jquery-ui-1.11.0.custom/jquery-ui.min.js' %}"></script>
203-
<!-- Core Scripts - Include with every page -->
204-
<script language="JavaScript" type="text/javascript" src="{% static 'js/custom.js' %}"></script>
205-
<script language="JavaScript" type="text/javascript" src="{% static 'plugins/bootstrap/bootstrap.min.js' %}"></script>
206-
<script language="JavaScript" type="text/javascript" src="{% static 'plugins/metisMenu/jquery.metisMenu.js' %}"></script>
207-
208-
<!-- Page-Level Plugin Scripts - Dashboard -->
209-
<script language="JavaScript" type="text/javascript" src="{% static 'plugins/morris/raphael-2.1.0.min.js' %}"></script>
210-
<!--<script language="JavaScript" type="text/javascript" src="{% static 'plugins/morris/morris.js' %}"></script>-->
211-
212-
<!-- SB Admin Scripts - Include with every page -->
213-
<script language="JavaScript" type="text/javascript" src="{% static 'js/sb-admin.js' %}"></script>
214-
215-
<!-- Page-Level Demo Scripts - Dashboard - Use for reference -->
216-
<!--<script language="JavaScript" type="text/javascript" src="{% static 'js/demo/dashboard-demo.js' %}"></script>-->
217-
<script language="JavaScript" type="text/javascript" src="{% static 'plugins/noty-2.2.4/js/noty/packaged/jquery.noty.packaged.min.js' %}"></script>
218-
</body>
219-
220-
</html>
1+
{% extends 'base.html'%}

0 commit comments

Comments
 (0)