From 1ea5dd06424a2a2fb60692513d59591187389021 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Fri, 22 Jan 2016 19:06:47 +0100
Subject: Move admin interface into a blueprint

---
 templates/admin/create_account.html  | 21 +++++++++++++++++++++
 templates/admin/disable_account.html | 20 ++++++++++++++++++++
 templates/admin/index.html           |  9 +++++++++
 templates/admin/view_blacklist.html  | 19 +++++++++++++++++++
 templates/admin_create_account.html  | 21 ---------------------
 templates/admin_disable_account.html | 20 --------------------
 templates/admin_index.html           |  9 ---------
 templates/admin_view_blacklist.html  | 19 -------------------
 templates/base.html                  |  2 +-
 9 files changed, 70 insertions(+), 70 deletions(-)
 create mode 100644 templates/admin/create_account.html
 create mode 100644 templates/admin/disable_account.html
 create mode 100644 templates/admin/index.html
 create mode 100644 templates/admin/view_blacklist.html
 delete mode 100644 templates/admin_create_account.html
 delete mode 100644 templates/admin_disable_account.html
 delete mode 100644 templates/admin_index.html
 delete mode 100644 templates/admin_view_blacklist.html

(limited to 'templates')

diff --git a/templates/admin/create_account.html b/templates/admin/create_account.html
new file mode 100644
index 0000000..2a53fd9
--- /dev/null
+++ b/templates/admin/create_account.html
@@ -0,0 +1,21 @@
+{%- extends 'base.html' %}
+{%- from '_macros.html' import render_field, render_submit, render_csrf %}
+{%- set title = 'Account erstellen' %}
+{%- block content %}
+<p>
+  Hier kannst du einen Account erstellen, auch wenn der gewünschte
+  Benutzername in der Blacklist steht. Bitte stelle dabei sicher,
+  dass Accounts dieses Namens auf <b>allen</b> Diensten dem User
+  gehören.
+</p>
+<p>
+  Der Benutzer bekommt eine Mail, mit der er sich dann ganz normal
+  ein Passwort setzen kann.
+</p>
+<form action="" method="post" class="form-horizontal">
+  {{ render_field(form.username, autofocus="autofocus") }}
+  {{ render_field(form.mail) }}
+  {{ render_submit(value='Link verschicken')}}
+  {{ render_csrf(form) }}
+</form>
+{%- endblock %}
diff --git a/templates/admin/disable_account.html b/templates/admin/disable_account.html
new file mode 100644
index 0000000..b6eccda
--- /dev/null
+++ b/templates/admin/disable_account.html
@@ -0,0 +1,20 @@
+{%- extends 'base.html' %}
+{%- from '_macros.html' import render_field, render_submit, render_csrf %}
+{%- set title = 'Account deaktivieren' %}
+{%- block content %}
+<p>
+  Hier kannst du einen Account deaktivieren. Da es quasi unmöglich ist,
+  Accounts zu löschen, ohne dass es Konsistenzprobleme zwischen dem LDAP und
+  den Datenbanken der Anwendungen gibt, wird dazu einfach das Passwort auf was
+  zufälliges und die Mail auf was ungültiges gesetzt.
+</p>
+<p>
+  Der Benutzer wird davon nicht benachrichtigt, mach das also nur mit
+  Accounts, die sicher Spammer sind!
+</p>
+<form action="" method="post" class="form-horizontal">
+  {{ render_field(form.username, autofocus="autofocus") }}
+  {{ render_submit(value='Account deaktivieren')}}
+  {{ render_csrf(form) }}
+</form>
+{%- endblock %}
diff --git a/templates/admin/index.html b/templates/admin/index.html
new file mode 100644
index 0000000..722a9ac
--- /dev/null
+++ b/templates/admin/index.html
@@ -0,0 +1,9 @@
+{%- extends 'base.html' %}
+{%- set title = 'Admin-Interface' %}
+{%- block content %}
+<ul>
+  <li><a href="{{ url_for('admin.create_account') }}">Account erstellen</a></li>
+  <li><a href="{{ url_for('admin.view_blacklist') }}">Blacklist anzeigen</a></li>
+  <li><a href="{{ url_for('admin.disable_account') }}">Account deaktivieren</a></li>
+</ul>
+{%- endblock %}
diff --git a/templates/admin/view_blacklist.html b/templates/admin/view_blacklist.html
new file mode 100644
index 0000000..bde3f7c
--- /dev/null
+++ b/templates/admin/view_blacklist.html
@@ -0,0 +1,19 @@
+{%- extends 'base.html' %}
+{%- set title = 'Blacklist anzeigen' %}
+{%- block content %}
+<nav>
+  <ul>
+    {%- if start %}
+    <li><a href="{{ url_for('admin.view_blacklist') }}">Alle</a></li>
+    {%- endif %}
+    {%- for l in next_letters %}
+    <li><a href="{{ url_for('admin.view_blacklist', start=start+l) }}">{{ l }}</a></li>
+    {%- endfor %}
+  </ul>
+</nav>
+<ul>
+  {%- for e in entries %}
+  <li>{{ e }}</li>
+  {%- endfor %}
+</ul>
+{%- endblock %}
diff --git a/templates/admin_create_account.html b/templates/admin_create_account.html
deleted file mode 100644
index 2a53fd9..0000000
--- a/templates/admin_create_account.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- extends 'base.html' %}
-{%- from '_macros.html' import render_field, render_submit, render_csrf %}
-{%- set title = 'Account erstellen' %}
-{%- block content %}
-<p>
-  Hier kannst du einen Account erstellen, auch wenn der gewünschte
-  Benutzername in der Blacklist steht. Bitte stelle dabei sicher,
-  dass Accounts dieses Namens auf <b>allen</b> Diensten dem User
-  gehören.
-</p>
-<p>
-  Der Benutzer bekommt eine Mail, mit der er sich dann ganz normal
-  ein Passwort setzen kann.
-</p>
-<form action="" method="post" class="form-horizontal">
-  {{ render_field(form.username, autofocus="autofocus") }}
-  {{ render_field(form.mail) }}
-  {{ render_submit(value='Link verschicken')}}
-  {{ render_csrf(form) }}
-</form>
-{%- endblock %}
diff --git a/templates/admin_disable_account.html b/templates/admin_disable_account.html
deleted file mode 100644
index b6eccda..0000000
--- a/templates/admin_disable_account.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{%- extends 'base.html' %}
-{%- from '_macros.html' import render_field, render_submit, render_csrf %}
-{%- set title = 'Account deaktivieren' %}
-{%- block content %}
-<p>
-  Hier kannst du einen Account deaktivieren. Da es quasi unmöglich ist,
-  Accounts zu löschen, ohne dass es Konsistenzprobleme zwischen dem LDAP und
-  den Datenbanken der Anwendungen gibt, wird dazu einfach das Passwort auf was
-  zufälliges und die Mail auf was ungültiges gesetzt.
-</p>
-<p>
-  Der Benutzer wird davon nicht benachrichtigt, mach das also nur mit
-  Accounts, die sicher Spammer sind!
-</p>
-<form action="" method="post" class="form-horizontal">
-  {{ render_field(form.username, autofocus="autofocus") }}
-  {{ render_submit(value='Account deaktivieren')}}
-  {{ render_csrf(form) }}
-</form>
-{%- endblock %}
diff --git a/templates/admin_index.html b/templates/admin_index.html
deleted file mode 100644
index 7267493..0000000
--- a/templates/admin_index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{%- extends 'base.html' %}
-{%- set title = 'Admin-Interface' %}
-{%- block content %}
-<ul>
-  <li><a href="{{ url_for('admin_create_account') }}">Account erstellen</a></li>
-  <li><a href="{{ url_for('admin_view_blacklist') }}">Blacklist anzeigen</a></li>
-  <li><a href="{{ url_for('admin_disable_account') }}">Account deaktivieren</a></li>
-</ul>
-{%- endblock %}
diff --git a/templates/admin_view_blacklist.html b/templates/admin_view_blacklist.html
deleted file mode 100644
index 4f203f6..0000000
--- a/templates/admin_view_blacklist.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{%- extends 'base.html' %}
-{%- set title = 'Blacklist anzeigen' %}
-{%- block content %}
-<nav>
-  <ul>
-    {%- if start %}
-    <li><a href="{{ url_for('admin_view_blacklist') }}">Alle</a></li>
-    {%- endif %}
-    {%- for l in next_letters %}
-    <li><a href="{{ url_for('admin_view_blacklist', start=start+l) }}">{{ l }}</a></li>
-    {%- endfor %}
-  </ul>
-</nav>
-<ul>
-  {%- for e in entries %}
-  <li>{{ e }}</li>
-  {%- endfor %}
-</ul>
-{%- endblock %}
diff --git a/templates/base.html b/templates/base.html
index 4123d7f..d6a1726 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -34,7 +34,7 @@
           {%- if g.user %}
           <li>Angemeldet als <strong>{{ g.user.uid }}</strong></li>
             {%- if g.user.uid in config.get('ADMIN_USERS', []) %}
-          <li><a href="{{ url_for('admin') }}">Admin</a></li>
+          <li><a href="{{ url_for('admin.index') }}">Admin</a></li>
             {%- endif %}
           <li><a href="{{ url_for('logout') }}">Abmelden</a></li>
           {%- else %}
-- 
cgit v1.2.3-1-g7c22