start with form and template changes for service password management

2 files changed, 22 insertions, 20 deletions

diff --git a/templates/base.html b/templates/base.html
index c3ed80b..425ea34 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -15,15 +15,11 @@
 
     <h1 id="header"><img src="{{url_for('static', filename='logo.png')}}" alt="Spline" /></h1>
 
-    {% if title %}
-      <h2>{{ title }}</h2>
-    {% endif %}
-
     {%- if not no_login_message %}
     {%- if g.user %}
-    <p>Logged in as {{ g.user.uid }}. <a href="{{ url_for('logout') }}">Log out</a></p>
+    <p>Angemeldet als <strong>{{ g.user.uid }}</strong> | <a href="{{ url_for('logout') }}">Abmelden</a></p>
     {%- else %}
-    <p>Not logged in. <a href="{{ url_for('index') }}">Log in</a></p>
+    <p>Nicht angemeldet |  <a href="{{ url_for('index') }}">Login</a></p>
     {%- endif %}
     {%- endif %}
 
@@ -37,6 +33,10 @@
       {% endif %}
     {% endwith %}
 
+    {% if title %}
+      <h2>{{ title }}</h2>
+    {% endif %}
+
     {% block content %}{% endblock %}
   </body>
 </html>
diff --git a/templates/settings.html b/templates/settings.html
index 13d63f4..1d112d8 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -3,25 +3,27 @@
 {%- set title = 'Einstellungen' %}
 {%- block content %}
 <form action="{{ url_for('settings') }}" method="post" class="form-horizontal">
-  <h2>Globale Einstellungen ändern</h2>
   {{ render_field(form.old_password) }}
+  <h3>Globale Einstellungen ändern</h3>
   {{ render_field(form.mail) }}
   {{ render_field(form.password) }}
   {{ render_field(form.password_confirm) }}
   {{ form.csrf_token }}
-  <div class="form-actions"><input type="submit" value="Speichern" /></div>
+  <div class="form-actions"><input type="submit" value="Speichern" name="submit_main" /></div>
 
-  <h2>Dienste verwalten</h2>
-  <ul>
-    {%- for service, changed in services %}
-    <li>
-      <strong>{{ service }}</strong>
-      {%- if changed %}
-      ändern, löschen
-      {%- else %}
-      setzen
-      {%- endif %}
-    </li>
-    {%- endfor %}
+  <h3>Dienste verwalten</h3>
+  {%- for service in services %}
+  <h4>{{ service.name }}</h4>
+  {%- if service.changed %}
+  <p>Eigenes Passwort gesetzt</p>
+  <p>löschen, todo</p>
+  <p>Ändern:</p>
+  {%- else %}
+  <p>Kein eigenes Passwort gesetzt.</p>
+  <p>Eigenes Passwort setzen:</p>
+  {%- endif %}
+  {{ render_field(form.get_servicepassword(service.id)) }}
+  {{ render_field(form.get_servicepasswordconfirm(service.id)) }}
+  {%- endfor %}
 </form>
 {%- endblock %}