summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorMarian Sigler <m@qjym.de>2012-09-29 15:12:18 +0200
committerMarian Sigler <m@qjym.de>2012-09-29 15:12:18 +0200
commit12a6678d280733bd420923b49608d62f8f920ab1 (patch)
tree057cb7f98d60600373f8056f597199140d836397 /templates
parentfaa5a67b30bcedaf67223d1905036bff806cbf45 (diff)
parentf6b2d051966a232c6227a31e9851fce031d6b9f6 (diff)
downloadweb-12a6678d280733bd420923b49608d62f8f920ab1.tar.gz
web-12a6678d280733bd420923b49608d62f8f920ab1.tar.bz2
web-12a6678d280733bd420923b49608d62f8f920ab1.zip
Merge branch 'master' of ssh://git.spline.de/account-web
Diffstat (limited to 'templates')
-rw-r--r--templates/_macros.html12
-rw-r--r--templates/base.html11
-rw-r--r--templates/error.html8
-rw-r--r--templates/lost_password.html4
-rw-r--r--templates/lost_password_complete.html4
-rw-r--r--templates/register.html4
-rw-r--r--templates/register_complete.html4
-rw-r--r--templates/settings.html81
8 files changed, 101 insertions, 27 deletions
diff --git a/templates/_macros.html b/templates/_macros.html
index 1608c1f..58739ae 100644
--- a/templates/_macros.html
+++ b/templates/_macros.html
@@ -1,3 +1,15 @@
+{% macro render_submit() %}
+<div class="control-group">
+ <div class="controls">
+ <input type="submit"
+ {%- for key, value in kwargs.items() %}
+ {{key}}="{{value}}"
+ {% endfor %}
+ />
+ </div>
+</div>
+{%- endmacro %}
+
{% macro render_field(field) %}
<div class="control-group">
{{ field.label }}
diff --git a/templates/base.html b/templates/base.html
index 5aaa9ff..475e837 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,7 +1,6 @@
{%- set styles = ['layout.css', 'bootstrap-form.css'] + styles|default([]) %}
-{%- set scripts = [] + scripts|default([]) %}
-<!doctype html>
-<html>
+{%- set scripts = ['jquery-1.8.2.min.js'] + scripts|default([]) %}
+<!doctype html> <html>
<head>
<meta charset="utf-8" />
<title>{% if title %}{{ title }} – {% endif %}spline accounts</title>
@@ -9,7 +8,7 @@
<script type="text/javascript" src="{{ url_for('static', filename=script) }}"></script>
{%- endfor %}
{%- for style in styles %}
- <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename=style) }}">
+ <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename=style, version='0.1') }}">
{%- endfor %}
</head>
<body>
@@ -60,5 +59,9 @@
{% endif %}
{% block content %}{% endblock %}
</section>
+
+ <script type="text/javascript">
+ {% block javascript %}{% endblock %}
+ </script>
</body>
</html>
diff --git a/templates/error.html b/templates/error.html
new file mode 100644
index 0000000..b025572
--- /dev/null
+++ b/templates/error.html
@@ -0,0 +1,8 @@
+{%- extends 'base.html' %}
+{%- from '_macros.html' import render_field %}
+{%- block content %}
+
+<h1>{{error.message}}</h1>
+<p><b>Fehler</b>: {{error.description}}</p>
+
+{%- endblock %}
diff --git a/templates/lost_password.html b/templates/lost_password.html
index 0856366..7f6dbd7 100644
--- a/templates/lost_password.html
+++ b/templates/lost_password.html
@@ -1,5 +1,5 @@
{%- extends 'base.html' %}
-{%- from '_macros.html' import render_field %}
+{%- from '_macros.html' import render_field, render_submit %}
{%- set title = 'Passwort vergessen' %}
{%- set no_login_message = true %}
{%- block content %}
@@ -10,6 +10,6 @@
mit dem du dir ein neues setzen kannst.
</p>
{{ render_field(form.username, autofocus="autofocus") }}
- <div class="form-actions"><input type="submit" value="Weiter" /></div>
+ {{ render_submit(value='Weiter')}}
</form>
{%- endblock %}
diff --git a/templates/lost_password_complete.html b/templates/lost_password_complete.html
index de59d64..6ab4a1c 100644
--- a/templates/lost_password_complete.html
+++ b/templates/lost_password_complete.html
@@ -1,5 +1,5 @@
{%- extends 'base.html' %}
-{%- from '_macros.html' import render_field %}
+{%- from '_macros.html' import render_field, render_submit %}
{%- set title = 'Passwort vergessen' %}
{%- set no_login_message = true %}
{%- block content %}
@@ -13,6 +13,6 @@
</div>
{{ render_field(form.password, autofocus="autofocus") }}
{{ render_field(form.password_confirm) }}
- <div class="form-actions"><input type="submit" value="Speichern" /></div>
+ {{ render_submit(value='Speichern')}}
</form>
{%- endblock %}
diff --git a/templates/register.html b/templates/register.html
index 2fe562a..489a7a0 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -1,11 +1,11 @@
{%- extends 'base.html' %}
-{%- from '_macros.html' import render_field %}
+{%- from '_macros.html' import render_field, render_submit %}
{%- set title = 'Account erstellen' %}
{%- set no_login_message = true %}
{%- block content %}
<form action="{{ url_for('register') }}" method="post" class="form-horizontal">
{{ render_field(form.username, autofocus="autofocus") }}
{{ render_field(form.mail) }}
- <div class="form-actions"><input type="submit" value="E-Mail-Adresse bestätigen" /></div>
+ {{ render_submit(value='E-Mail-Adresse bestätigen')}}
</form>
{%- endblock %}
diff --git a/templates/register_complete.html b/templates/register_complete.html
index 1372b7f..558606a 100644
--- a/templates/register_complete.html
+++ b/templates/register_complete.html
@@ -1,5 +1,5 @@
{%- extends 'base.html' %}
-{%- from '_macros.html' import render_field %}
+{%- from '_macros.html' import render_field, render_submit %}
{%- set title = 'Account erstellen' %}
{%- set no_login_message = true %}
{%- block content %}
@@ -19,6 +19,6 @@
</div>
{{ render_field(form.password, autofocus="autofocus") }}
{{ render_field(form.password_confirm) }}
- <div class="form-actions"><input type="submit" value="Registrieren" /></div>
+ {{ render_submit(value='Registrieren')}}
</form>
{%- endblock %}
diff --git a/templates/settings.html b/templates/settings.html
index 3189d6a..3bc5f4d 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -1,5 +1,5 @@
{%- extends 'base.html' %}
-{%- from '_macros.html' import render_field, render_csrf %}
+{%- from '_macros.html' import render_field, render_csrf, render_submit %}
{%- set title = 'Einstellungen' %}
{%- block content %}
<form action="{{ url_for('settings') }}" method="post" class="form-horizontal">
@@ -8,23 +8,74 @@
{{ render_field(form.password) }}
{{ render_field(form.password_confirm) }}
{{ render_csrf(form) }}
- <div class="form-actions"><input type="submit" value="Speichern" name="submit_main" /></div>
+ {{ render_submit(value='Speichern',name='submit_main') }}
- <!--
<h2>Dienste verwalten</h2>
+ <p>
+ Du kannst für jeden Dienst ein eigenes Passwort setzen:
+ </p>
+
{%- for service in services %}
- <h3>{{ service.name }}</h3>
- {%- 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)) }}
+ <div class="service">
+ <h3>
+ {% if service.changed %}
+ {{ form.get_servicedelete(service.id) }}
+ {% else %}
+ {{ form.get_servicedelete(service.id)(disabled=True) }}
+ {% endif %}
+ {{ service.name }}
+ </h3>
+
+ <ul>
+ {%- if service.changed %}
+ <li class="active">aktiv</li>
+ </li>
+ {%- else %}
+ <li class="inactive">inaktiv</li>
+ {%- endif %}
+ </ul>
+
+ <div class="form-service">
+ <p>Neues Passwort setzen:</p>
+ {{ render_field(form.get_servicepassword(service.id)) }}
+ {{ render_field(form.get_servicepasswordconfirm(service.id)) }}
+ {{ render_submit(value='Speichern',name='submit_main') }}
+ </div>
+ </div>
{%- endfor %}
- -->
+ <div class="form-submit-services">
+ <input type="submit" value="selektierte Passwörter löschen" name="submit_services" />
+ </div>
</form>
{%- endblock %}
+
+
+{% block javascript %}
+ $(document).ready(function() {
+
+ $('.service').each(function() {
+ var header = $(this).find('h3');
+ var list = $(this).find('ul');
+ var content = $(this).find('.form-service');
+ var elem = $('<a class="service-edit" href="">bearbeiten</a>')
+
+ elem.click(function() {
+ content.toggle();
+
+ return false;
+ });
+
+ console.log(list.find('a'))
+ if(list.find('a').length > 0) {
+ list.find('a').parent().prepend(elem);
+ } else {
+ var li = $('<li></li>');
+ li.append(elem);
+ list.append(li);
+ }
+
+ content.hide();
+ });
+
+ });
+{% endblock %}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-28 05:07:34 +0000