From 3f7c6fdee0b1f906d0d89bfa5573b94977905a24 Mon Sep 17 00:00:00 2001 From: Nico von Geyso Date: Sat, 29 Sep 2012 01:58:04 +0200 Subject: added some javascript code to handle visiblity of service forms --- templates/_macros.html | 12 ++++++ templates/base.html | 7 +++- templates/lost_password.html | 4 +- templates/lost_password_complete.html | 4 +- templates/register.html | 4 +- templates/register_complete.html | 4 +- templates/settings.html | 77 +++++++++++++++++++++++++++-------- 7 files changed, 85 insertions(+), 27 deletions(-) (limited to 'templates') 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() %} +
+
+ +
+
+{%- endmacro %} + {% macro render_field(field) %}
{{ field.label }} diff --git a/templates/base.html b/templates/base.html index df4658f..95384d9 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,7 +1,6 @@ {%- set styles = ['layout.css', 'bootstrap-form.css'] + styles|default([]) %} {%- set scripts = ['jquery-1.8.2.min.js'] + scripts|default([]) %} - - + {% if title %}{{ title }} – {% endif %}spline accounts @@ -60,5 +59,9 @@ {% endif %} {% block content %}{% 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.

{{ render_field(form.username, autofocus="autofocus") }} -
+ {{ render_submit(value='Weiter')}} {%- 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 @@
{{ render_field(form.password, autofocus="autofocus") }} {{ render_field(form.password_confirm) }} -
+ {{ render_submit(value='Speichern')}} {%- 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 %}
{{ render_field(form.username, autofocus="autofocus") }} {{ render_field(form.mail) }} -
+ {{ render_submit(value='E-Mail-Adresse bestätigen')}}
{%- 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 @@ {{ render_field(form.password, autofocus="autofocus") }} {{ render_field(form.password_confirm) }} -
+ {{ render_submit(value='Registrieren')}} {%- endblock %} diff --git a/templates/settings.html b/templates/settings.html index 8bf3d7e..241ea00 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 %}
@@ -8,25 +8,68 @@ {{ render_field(form.password) }} {{ render_field(form.password_confirm) }} {{ render_csrf(form) }} -
+ {{ render_submit(value='Speichern',name='submit_main') }}

Dienste verwalten

+

+ Du kannst für jeden Dienst ein eigenes Passwort setzen: +

+ {%- for service in services %} -

- {{ service.name }} - - {%- if service.changed %} - aktiv - löschen - {%- else %} - inaktiv - {%- endif %} - -

-

Neues Passwort setzen:

- {{ render_field(form.get_servicepassword(service.id)) }} - {{ render_field(form.get_servicepasswordconfirm(service.id)) }} - +
+

+ {{ service.name }} +

+ +
    + {%- if service.changed %} +
  • aktiv
    • +
  • + löschen +
    • + {%- else %} +
  • inaktiv
    • + {%- endif %} +
+ +
+

Neues Passwort setzen:

+ {{ render_field(form.get_servicepassword(service.id)) }} + {{ render_field(form.get_servicepasswordconfirm(service.id)) }} + {{ render_submit(value='Speichern',name='submit_main') }} +
+
{%- endfor %}
{%- 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 = $('bearbeiten') + + 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.append(elem); + list.append(li); + } + + content.hide(); + }); + + }); +{% endblock %} -- cgit v1.2.3-1-g7c22