cashonly
/
cashonly
3
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity
Browse Source

Redesign using bootstrap and its nifty features

master
Niklas Brachmann 11 years ago
parent
f2d5398b23
commit
68124c7a32
4 changed files with 101 additions and 63 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. 15
      cash/static/style.css
  2. 111
      cash/templates/cash/base.html
  3. 36
      cash/templates/cash/product_list.html
  4. 2
      cash/templates/cash/usersettings.html

15
cash/static/style.css
Unescape View File

@ -1,8 +1,17 @@ @@ -1,8 +1,17 @@
html {
min-height: 100%;
}
body {
background-color: #eeeeee;
padding-top: 50px;
padding-bottom: 50px;
background-color: #ffcc33;
padding-top: 70px;
//padding-bottom: 50px;
height: 100%;
}
#content {
background-color: #f8f8f8;
border: 1px solid #E7E7E7;
}
table {

111
cash/templates/cash/base.html
Unescape View File

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
{% load staticfiles %}
{% load url from future %}
{% load i18n %}
<!DOCTYPE html>
<html lang="en">
<head>
@ -11,65 +10,95 @@ @@ -11,65 +10,95 @@
<title>Kassensystem</title>
<link href="{% static "bootstrap/css/bootstrap.css" %}" rel="stylesheet" />
<script src="{% static "jquery.min.js" %}" type="text/javascript"></script>
<script src="{% static "bootstrap/js/bootstrap.min.js" %}" type="text/javascript"></script>
<link href="{% static "bootstrap/css/bootstrap.min.css" %}" rel="stylesheet" />
<link href="{% static "style.css" %}" rel="stylesheet" />
<script type="text/javascript">
function getuserinfo(xs){
if(xs)
userinfo = '<strong>{% trans "Name" %}</strong>: {{ user.first_name }} {{ user.last_name }}<br/>';
else
userinfo = '<strong>{% trans "Username" %}</strong>: {{ user.username }}<br/>';
userinfo += '<strong>{% trans "Credit" %}</strong>: {{ user.account.credit }}€<br/>';
{% if user.account.credit|add:"35" < 5 %}
userinfo += '<span style="color: #FF5252">{% trans "Warning!" %}<br/>{% blocktrans with debtlimitamount=user.account.credit|add:"35"|floatformat:2 %}Only {{ debtlimitamount }}&nbsp;&euro; until reaching the debt limit.{% endblocktrans %}</span>';
{% endif %}
return userinfo;
}
$(document).ready(function() {
$('#userinfo').popover({animation: true, placement: 'bottom', trigger: 'hover', content: getuserinfo(false), html: true, container: '#top-navbar'});
$('#xs-userinfo').popover({animation: true, placement: 'bottom', trigger: 'hover', content: getuserinfo(true), html: true, container: '#top-navbar'});
});
</script>
{% endblock %}
</head>
<body>
<div class="container">
<div class="navbar navbar-default">
<div class="container" id="main">
<div class="navbar navbar-default navbar-fixed-top" id="top-navbar">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#top-navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="navbar-header">
<a class="navbar-brand" href="{% url 'overview' %}">Kassensystem</a>
<div class="pull-right visible-xs" style="padding-right: 1em">
<p class="navbar-text" id="xs-userinfo">
<span class="glyphicon glyphicon-info-sign"></span>
<strong>{{ user.username }}</strong>
</p>
</div>
</div>
<ul class="nav navbar-nav">
<li><a href="{% url 'overview' %}">{% trans "Overview" %}</a></li>
<li><a href="{% url 'products' %}">{% trans "Buy" %}</a></li>
<li><a href="{% url 'transactions' %}">{% trans "Transaction list" context "monthly staement" %}</a></li>
<li><a href="{% url 'usersettings' %}">{% trans "Preferences" %}</a></li>
{% if user.is_staff %}
<li><a href="{% url 'admin:index' %}">{% trans "Administration" %}</a></li>
{% endif %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="{% url 'django.contrib.auth.views.logout_then_login' %}">{% trans "Logout" %}</a></li>
</ul>
<div class="collapse navbar-collapse" id="top-navbar-collapse">
<ul class="nav navbar-nav">
<li><a href="{% url 'overview' %}">{% trans "Overview" %}</a></li>
<li><a href="{% url 'products' %}">{% trans "Buy" %}</a></li>
<li><a href="{% url 'transactions' %}">{% trans "Transaction list" context "monthly staement" %}</a></li>
<li><a href="{% url 'usersettings' %}">{% trans "Preferences" %}</a></li>
{% if user.is_staff %}
<li><a href="{% url 'admin:index' %}">{% trans "Administration" %}</a></li>
{% endif %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="hidden-xs">
<p class="navbar-text" id="userinfo">
<span class="glyphicon glyphicon-info-sign"></span>
<strong>{{ user.first_name }} {{ user.last_name }}</strong>
(<span {% if user.account.credit < 0 %} style="color: red"{% endif %}>{{ user.account.credit|floatformat:2 }}€</span>)
</p>
</li>
<li><a href="{% url 'django.contrib.auth.views.logout_then_login' %}">{% trans "Logout" %}</a></li>
</ul>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-md-2 well" style="text-align: center;">
<img src="{% static "images/cash-register-64x64.png" %}" />
</div>
<div class="col-md-8">
<div class="container">
{% block content %}
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-body">
{% block content %}
<h1>{% trans "Overview" %}</h1>
<h1>{% trans "Overview" %}</h1>
<strong>{% blocktrans with firstname=user.first_name %}Welcome, {{ firstname }}!{% endblocktrans %}</strong>
<strong>{% blocktrans with firstname=user.first_name %}Welcome, {{ firstname }}!{% endblocktrans %}</strong>
{% endblock %}
{% endblock %}
</div>
</div>
</div>
<div class="col-md-2 well">
<span>{% trans "Username" %}:</span>
<span><strong>{{ user.username }}</strong></span><br/>
<span>{% trans "Credit" %}:</span>
<span {% if user.account.credit < 0 %} style="color: red"{% endif %}><b>{{ user.account.credit|floatformat:2 }} &euro;</b></span><br/>
{% if user.account.credit|add:"35" < 5 %}
<span style="color: #FF5252">{% trans "Warning!" %}<br/>{% blocktrans with debtlimitamount=user.account.credit|add:"35"|floatformat:2 %}Only {{ debtlimitamount }}&nbsp;&euro; until reaching the debt limit.{% endblocktrans %}</span>
{% endif %}
</div>
</div>
</div>
</div>

36
cash/templates/cash/product_list.html
Unescape View File

@ -1,33 +1,35 @@ @@ -1,33 +1,35 @@
{% extends "cash/base.html" %}
{% load url from future %}
{% load static %}
{% load i18n %}
{% block content %}
{% trans "Category" %}:
<ul>
<li {% if not category %}style="font-weight: bold"{% endif %}><a href="{% url 'products' %}">{% trans "All categories" %}</a></li>
<ul class="nav nav-tabs">
<li {% if not category %}class="active"{% endif %}><a href="{% url 'products' %}">{% trans "All categories" %}</a></li>
{% for c in categories %}
<li {% if c == category %}style="font-weight: bold"{% endif %}><a href="{% url 'products' %}{{c.id}}">{{ c.name }}</a></li>
<li {% if c == category %}class="active"{% endif %}><a href="{% url 'products' %}{{c.id}}">{{ c.name }}</a></li>
{% endfor %}
</ul>
<!-- Ugly workaround -->
<br/>
<table>
<thead>
<tr><td>{% trans "Name" %}</td><td>{% trans "price" %}</td><td>{% trans "Actions" %}</td></tr>
</thead>
<div class="row">
{% for p in product_list %}
<tr>
<td>{{ p.name }}</td>
<td>{{ p.price|floatformat:2 }} &euro;</td>
<td>
<a class="btn btn-default" href="{% url 'buy' p.id %}">{% trans "Buy" %}</a>
<a class="btn btn-default" href="{% url 'product' p.id %}">{% trans "Details" %}</a>
</td>
</tr>
<div class="col-xs-12 col-md-3">
<div class="thumbnail">
<img src="{% if p.image_thumbnail %}{{ p.image_thumbnail.url }}{% else %}{% static "images/no-image.png" %}{% endif %}" alt="{% trans "Product image" %}" style="width: 100%" />
<div class="caption">
<h3>{{ p.name }}</h3>
<h4>{{ p.price|floatformat:2 }} &euro;</h4>
<a class="btn btn-primary" href="{% url 'buy' p.id %}">{% trans "Buy" %}</a>
<a class="btn btn-default" href="{% url 'product' p.id %}">{% trans "Details" %}</a>
</div>
</div>
</div>
{% endfor %}
</table>
</div>
{% endblock %}

2
cash/templates/cash/usersettings.html
Unescape View File

@ -6,8 +6,6 @@ @@ -6,8 +6,6 @@
{% block head %}
{{ block.super }}
<script src="{% static "jquery.min.js" %}" type="text/javascript"></script>
<script src="{% static "bootstrap/js/bootstrap.min.js" %}" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
$("#pin-submit").click(function(event) {

Write Preview
Loading…
Cancel
Save