rlbr
/
winpydash-django-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

style updates and more

windows
Florian N 12 years ago
parent
ddaaf9fa7d
commit
bd62ead54d
5 changed files with 25 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pydash/settings.py
  2. 2
      static/css/style.css
  3. 14
      templates/base_auth.html
  4. 2
      templates/login.html
  5. 38
      templates/main.html

2
pydash/settings.py
View File

@ -67,7 +67,7 @@ WSGI_APPLICATION = 'pydash.wsgi.application'
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
'NAME': os.path.join(BASE_DIR, 'db.sqlite3')
}
}

2
static/css/style.css
View File

@ -76,7 +76,7 @@ textarea {
.navbar-inner {
padding: 7px 0;
background: #00ba8b !important;
background: #515254 !important;
-moz-border-radius: 0;
-webkit-border-radius: 0;

14
templates/base_auth.html
View File

@ -6,8 +6,12 @@
<link rel="shortcut icon" href="{% static "img/favicon.ico" %}">
<title>{% block title %}{% endblock %}</title>
<link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "css/base.css" %}" rel="stylesheet">
<link href="{% static "css/dashboard.css" %}" rel="stylesheet">
<link href="{% static "css/signin.css" %}" rel="stylesheet">
<link href="{% static "css/style.css" %}" rel="stylesheet">
<link href="{% static "css/fonts.css" %}" rel="stylesheet">
<link href="{% static "css/font-awesome.css" %}" rel="stylesheet">
<link href="{% static "css/bootstrap-responsive.min.css" %}" rel="stylesheet">
</head>
<body>
<!-- Static navbar -->
@ -15,15 +19,11 @@
<div class="navbar-inner">
<div class="container">
<a class="brand" href="/">pyDash</a>
<ul class="btn-group btn">
<ul class="btn btn-mini">
{% if request.user.is_authenticated %}
<li class="">
<a href="{% url 'logout' %}">{% trans "Sign out" %}</a>
</li>
{% else %}
<li class="">
<a href="{% url 'login' %}">{% trans "Sign in" %}</a>
</li>
{% endif %}
</ul>
</div>
@ -32,7 +32,7 @@
<div class="container">
{% block content %}{% endblock %}
</div>
<script src="{% static "js/jquery-1.10.2.js" %}"></script>
<script src="{% static "js/jquery.js" %}"></script>
<script src="{% static "js/bootstrap.min.js" %}"></script>
</body>
</html>

2
templates/login.html
View File

@ -14,6 +14,6 @@
<input type="text" class="form-control" name="username" placeholder="Login" autofocus>
<input type="password" class="form-control" name="password" placeholder="Password">
<input name="next" id="next" type="hidden" value="/main/"><br />
<button class="btn btn-lg btn-success btn-block" type="submit">{% trans "Sign In" %}</button>
<button class="btn btn-lrg btn-success btn-block" type="submit">{% trans "Sign In" %}</button>
</form>
{% endblock %}

38
templates/main.html
View File

@ -11,7 +11,6 @@
<link href="{% static "css/bootstrap-responsive.min.css" %}" rel="stylesheet">
<link href="{% static "css/dashboard.css" %}" rel="stylesheet">
<link href="{% static "css/style.css" %}" rel="stylesheet">
<link href="{% static "css/progressbar.css" %}" rel="stylesheet">
{% block style %}{% endblock %}
</head>
<body>
@ -19,17 +18,16 @@
<div class="navbar-inner">
<div class="container">
<a class="brand" href="/">pyDash</a>
<ul class="btn-group btn">
<ul class="btn btn-mini">
{% if request.user.is_authenticated or user.is_authenticated %}
<li class="">
<a href="{% url 'logout' %}">{% trans "Sign out" %}</a>
</li>
{% else %}
<li class="">
<a href="{% url 'login' %}">{% trans "Sign in" %}</a>
</li>
{% endif %}
</ul>
<div class="nav-collapse" id="refresh-home">
</div>
</div>
</div>
</div>
@ -38,11 +36,12 @@
<div class="container">
<ul class="mainnav">
<li><a href="#refresh-os"><i class="icon-dashboard"></i><span>General</span> </a> </li>
<li><a href="#refresh-df"><i class="icon-list-alt"></i><span>Disk</span> </a> </li>
<li><a href="#refresh-df"><i class="icon-hdd"></i><span>Disk</span> </a> </li>
<li><a href="#refresh-ps"><i class="icon-list-alt"></i><span>CPU</span> </a> </li>
<li><a href="#refresh-ram"><i class="icon-list-alt"></i><span>RAM</span> </a> </li>
<li><a href="#refresh-load"><i class="icon-group"></i><span>Users</span> </a> </li>
<li><a href="#refresh-load"><i class="icon-bolt"></i><span>Load</span> </a> </li>
<li><a href="#refresh-ispeed"><i class="icon-exchange"></i><span>Network</span> </a> </li>
<li><a href="#refresh-home"><i class="icon-home"></i><span>Home</span> </a> </li>
</ul>
</div>
<!-- /container -->
@ -61,9 +60,7 @@
<div class="widget-header"> <i class="icon-info-sign"></i>
<h3>General Info</h3>
<div id="refresh-os" class="btn btn-mini js-refresh-info">
<i class="icon-refresh"></i> &nbsp;&nbsp;Refresh
<div id="refresh-os">
</div>
</div>
@ -106,10 +103,9 @@
<div class="row">
<div class="span6">
<div class="widget">
<div class="widget-header"> <i class="icon-list"></i>
<div class="widget-header"> <i class="icon-hdd"></i>
<h3>Disk Usage</h3>
<div id="refresh-df" class="btn btn-mini js-refresh-info">
<i class="icon-refresh"></i> &nbsp;&nbsp;Refresh
<div id="refresh-df">
</div>
</div>
<!-- /widget-header -->
@ -123,7 +119,7 @@
<div class="span6">
<div class="widget widget-table action-table">
<div class="widget-header"> <i class="icon-group"></i>
<div class="widget-header"> <i class="icon-bolt"></i>
<h3>Load Average</h3>
<div id="refresh-load">
</div>
@ -150,8 +146,7 @@
<div class="widget">
<div class="widget-header"> <i class="icon-list"></i>
<h3>Software</h3>
<div id="refresh-whereis" class="btn btn-mini js-refresh-info">
<i class="icon-refresh"></i> &nbsp;&nbsp;Refresh
<div id="refresh-whereis">
</div>
</div>
<!-- /widget-header -->
@ -187,8 +182,7 @@
<div class="widget">
<div class="widget-header"> <i class="icon-monitor"></i>
<h3>Internet Speed</h3>
<div id="refresh-ispeed" class="btn btn-mini js-refresh-info">
<i class="icon-refresh"></i> &nbsp;&nbsp;Refresh
<div id="refresh-ispeed">
</div>
</div>
<!-- /widget-header -->
@ -208,8 +202,7 @@
<div class="widget widget-table action-table">
<div class="widget-header"> <i class="icon-group"></i>
<h3>Online</h3>
<div id="refresh-online" class="btn btn-mini js-refresh-info">
<i class="icon-refresh"></i> &nbsp;&nbsp;Refresh
<div id="refresh-online">
</div>
</div>
<!-- /widget-header -->
@ -231,8 +224,7 @@
<div class="widget">
<div class="widget-header"> <i class="icon-dashboard"></i>
<h3> Processes </h3>
<div id="refresh-ps" class="btn btn-mini js-refresh-info">
<i class="icon-refresh"></i> &nbsp;&nbsp;Refresh
<div id="refresh-ps">
</div>
<div class="pull-right">
<input type="text" id="filter-ps" class="widget-search" placeholder="search..." />

Write Preview
Loading…
Cancel
Save