+ Implemented inventarization

+ minor translation fixes
This commit is contained in:
Clemens-Dautermann 2018-12-19 22:03:01 +01:00
parent e0b98dabce
commit 5877b83424
10 changed files with 121 additions and 185 deletions

View file

@ -11,6 +11,9 @@
integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Dosis" rel="stylesheet">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<title>{{ title }}</title>
@ -24,7 +27,7 @@
<img src="{% static 'user_manager/images/logo_50_50.png' %}" class="logo">
</div>
<span class="welcome">Welcome {{ user.username }}!</span>
<span class="welcome">Wilkommen {{ user.username }}!</span>
{% else %}
<div class="navbar-header">
<img src="{% static 'user_manager/images/logo_50_50.png' %}" class="logo_not_logged_in">

View file

@ -0,0 +1,8 @@
{% extends 'bases/navbar.html' %}
<html>
{% block content %}
<div class="container">
<p class="red">{{ error }}</p>
</div>
{% endblock %}
</html>

View file

@ -1,12 +1,42 @@
{% extends 'bases/navbar.html' %}
<html>
{% block content%}
{% block content %}
<body>
<div class="container">
<p>On this page objects can be added.</p>
</div>
</body>
<body>
<div class="container">
{% if not obj_name is None %}
<div class="alert alert-info alert-dismissible">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
Das Objekt <strong>{{ obj_name }}</strong> wurde inventarisiert!
</div>
{% endif %}
<form method="POST" class="post-form invform">
{% csrf_token %}
<div class="ammout-wrapper">
{{ form.ammout.errors }}
<label for="{{ form.ammout.id_for_lable }}">Anzahl:</label>
{{ form.ammout }}
</div>
<div class="title-wrapper">
{{ form.title.errors }}
<label for="{{ form.title.id_for_lable }}">Objekt:</label>
{{ form.title }}
</div>
<div class="img-wrapper">
{{ form.img.errors }}
<label for="{{ form.img.id_for_lable }}">Bild:</label>
{{ form.img }}
</div>
<div class="description-wrapper">
{{ form.description.errors }}
<label for="{{ form.description.id_for_lable }}">Beschreibung:</label>
{{ form.description }}
</div>
<button type="submit" class="save btn btn-primary">inventarisieren</button>
</form>
</div>
</body>
{% endblock %}
</html>

View file

@ -12,7 +12,7 @@
{% endif %}
{% if next %}
<p class="error">You cannot access that page without being logged in.</p>
<p class="error">Sie müssen sich zuerst anmelden um diese Seite zu besuchen.</p>
{% endif %}
@ -33,7 +33,7 @@
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-default">Login</button>
<button type="submit" class="btn btn-primary">Login</button>
<input type="hidden" name="next" value="{{ next }}">
<span class="reset"><a href="{% url 'password_reset' %}">Lost password?</a></span>

View file

@ -4,8 +4,17 @@
<body>
<div class="container">
<h3>Right Aligned Navbar</h3>
<p>The .navbar-right class is used to right-align navigation bar buttons.</p>
<h3>Inventarium</h3>
<p>Mit diesem System können allerlei Dinge inventarisiert werden.</p>
<p>Zum Beispiel: </p>
<ul>
<li>Krims</li>
<li>Krams</li>
<li>Dings</li>
<li>Bums</li>
</ul>
<h3>UUUUUND: </h3>
<h1>ZEUGS!!!</h1>
</div>
</body>
{% endblock %}