bofh/baroness
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- added stylesheet entries for tables/forms, small changes to templates

Browse Source
This commit is contained in:
Bernhard Stampfer
2016-02-20 18:32:33 +01:00
parent c51340fa6e
commit 2ad94b8753
9 changed files with 89 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/base.html
View File

@@ -18,7 +18,7 @@
<h1> {{ title }} - Baroness</h1>
<a href="/index"><div class="item">Home</div></a>
{% if user %}
<a href="/logout"><div class="item">Logout</div></a>
<a href="/logout"><div class="item" style="float:right;">Logout</div></a>
<a href="/consume"><div class="item">Konsumieren</div></a>
<a href="/personal"><div class="item">Personal</div></a>
{% if user.isbaron %}
@@ -27,7 +27,7 @@
<a href="/manage_users"><div class="item">Konsumentenverwaltung</div></a>
{% endif %}
{% else %}
<a href="/login"><div class="item right">Login</div></a>
<a href="/login"><div class="item" style="float:right;">Login</div></a>
{% endif %}
</div>
{% if user %}

8
app/templates/login.html
View File

@@ -3,15 +3,15 @@
{% block content %}
<h3>TODO: </h3>
<ul>
<li>encrypt and salt passwords</li>
<li>TODO?</li>
</ul>
<h1> Login </h1>
{% if error %}
<p>{{ error }}</p>
{% endif %}
<form name="login" method="post" action="/login">
Username:<input type="text" name=username required placeholder="Username"><br>
Passwort:<input type="password" name=password required placeholder="Password"><br>
<input type="submit" value="Login">
Username:<br><input type="text" name=username required placeholder="Username"><br>
Passwort:<br><input type="password" name=password required placeholder="Password"><br>
<input type="submit" value="Login">
</form>
{% endblock %}

2
app/templates/manage_beverages.html
View File

@@ -26,5 +26,5 @@
{% endfor %}
</table>
<br />
<a href=/manage_beverages/add>Getränk Hinzufügen</a></li>
<a href=/manage_beverages/add><div class="item">Getränk Hinzufügen</div></a>
{% endblock %}

6
app/templates/manage_beverages_add.html
View File

@@ -1,7 +1,7 @@
{% extends "base.html"%}
{% set title = "Produkt hinzufügen" %}
{% block content %}
<h1> Produkt hinzufügen</h1>
<h1>Konsumat hinzufügen</h1>
{% if error %}
<p>Fehler: {{ error }}</p>
{% endif %}
@@ -10,8 +10,8 @@
{% endif %}
<p> TODO: many </p>
<form name="user" method="post" action="/manage_beverages/add">
Produktname:<input type="text" name="name" required><br>
Preis:<input type="number" name="price" step="any" required value="0.0" /> € <br>
Produktname:<br><input type="text" name="name" required><br>
Preis:<br><input type="number" name="price" step="any" required value="0.0" /> € <br>
Angezeigt: <input type="checkbox" name="isshown" checked /><br>
<input type="submit" value="Hinzufügen">
</form>

8
app/templates/manage_beverages_edit.html
View File

@@ -1,7 +1,7 @@
{% extends "base.html"%}
{% set title = "Konsumat bearbeiten" %}
{% block content %}
<h1> {{product_to_edit.name}} bearbeiten</h1>
<h1>Konsumat {{product_to_edit.name}} bearbeiten</h1>
{% if error %}
<p>Fehler: {{ error }}</p>
{% else %}
@@ -9,9 +9,9 @@
<p>{{ success }}</p>
{% endif %}
<form name="product" method="post" action="/manage_beverages/edit">
Userid: <input type="text" name="id" required value="{{product_to_edit.id}}" readonly="readonly" /> <br>
Username:<input type="text" name="name" required value="{{product_to_edit.name}}" /> <br>
Preis:<input type="number" name="price" step="any" required value="{{product_to_edit.price}}" /> € <br>
ProduktID:<br><input type="text" name="id" required value="{{product_to_edit.id}}" readonly="readonly" /> <br>
ProduktName:<br><input type="text" name="name" required value="{{product_to_edit.name}}" /> <br>
Preis:<br><input type="number" name="price" step="any" required value="{{product_to_edit.price}}" /> € <br>
Angezeigt: <input type="checkbox" name="isshown" {% if product_to_edit.isshown %} checked {% endif %} /><br>
<input type="submit" value="Übernehmen" />
</form>

2
app/templates/manage_users.html
View File

@@ -30,5 +30,5 @@
{% endfor %}
</table>
<br />
<a href=/manage_users/add>User Hinzufügen</a>
<a href=/manage_users/add><div class="item">User Hinzufügen</div></a>
{% endblock %}

14
app/templates/manage_users_add.html
View File

@@ -1,7 +1,7 @@
{% extends "base.html"%}
{% set title = "Konsumentin hinzufügen" %}
{% block content %}
<h1> Konsumentin hinzufügen</h1>
<h1>Konsumentin hinzufügen</h1>
{% if error %}
<p>Fehler: {{ error }}</p>
{% endif %}
@@ -10,12 +10,12 @@
{% endif %}
<p> TODO: many </p>
<form name="user" method="post" action="/manage_users/add">
Username:<input type="text" name=username required placeholder="Username"><br>
Passwort:<input type="password" name=password1 required placeholder="Password"><br>
Passwort wiederholen:<input type="password" name=password2 required placeholder="Password"><br>
Name:<input type="text" name=longname required placeholder="Vorname Nachname"><br>
Email:<input type="email" name=email required placeholder="petra@fet.at"><br>
Euml ID:<input type="text" name=rfid_id required placeholder="0xDEADBEEF"><br>
Username:<br><input type="text" name=username required placeholder="Username"><br>
Passwort:<br><input type="password" name=password1 required placeholder="Password"><br>
Passwort wiederholen:<br><input type="password" name=password2 required placeholder="Password"><br>
Name:<br><input type="text" name=longname required placeholder="Vorname Nachname"><br>
Email:<br><input type="email" name=email required placeholder="petra@fet.at"><br>
Euml ID:<br><input type="text" name=rfid_id required placeholder="0xDEADBEEF"><br>
<input type="submit" value="Hinzufügen">
</form>
{% endblock %}

12
app/templates/manage_users_edit.html
View File

@@ -1,7 +1,7 @@
{% extends "base.html"%}
{% set title = "Konsumentin bearbeiten" %}
{% block content %}
<h1> {{user.name}} bearbeiten</h1>
<h1>Konsumentin {{user_to_edit.name}} bearbeiten</h1>
{% if error %}
<p>Fehler: {{ error }}</p>
{% else %}
@@ -9,11 +9,11 @@
<p>{{ success }}</p>
{% endif %}
<form name="user" method="post" action="/manage_users/edit">
Userid: <input type="text" name="id" required value="{{user_to_edit.id}}" readonly="readonly" /> <br>
Username:<input type="text" name="username" required value="{{user_to_edit.name}}" /> <br>
Name:<input type="text" name="longname" required value="{{user_to_edit.longname}}" /><br>
Email:<input type="email" name="email" required value="{{user_to_edit.email}}" /><br>
Euml ID:<input type="text" name="rfid_id" required value="{{user_to_edit.rfid_id}}" /><br>
Userid:<br><input type="text" name="id" required value="{{user_to_edit.id}}" readonly="readonly" /> <br>
Username:<br><input type="text" name="username" required value="{{user_to_edit.name}}" /> <br>
Name:<br><input type="text" name="longname" required value="{{user_to_edit.longname}}" /><br>
Email:<br><input type="email" name="email" required value="{{user_to_edit.email}}" /><br>
Euml ID:<br><input type="text" name="rfid_id" required value="{{user_to_edit.rfid_id}}" /><br>
Geschwärzt: <input type="checkbox" name="isblack" {% if user_to_edit.isblack %} checked {% endif %} /> <br>
Baron: <input type="checkbox" name="isbaron" {% if user_to_edit.isbaron %} checked {% endif %} /> <br>
Angezeigt: <input type="checkbox" name="isshown" {% if user_to_edit.isshown %} checked {% endif %} /><br>