Move general views into blueprint

The use of a default blueprint allows more independence of the app object.

9 files changed, 16 insertions, 16 deletions

diff --git a/accounts/templates/base.html b/accounts/templates/base.html
index d6a1726..1eeda55 100644
--- a/accounts/templates/base.html
+++ b/accounts/templates/base.html
@@ -15,7 +15,7 @@
 
     <div id="header-background">&nbsp;</div>
     <header>
-      <h1><a href="{{ url_for('settings') if g.user else url_for('index') }}">
+      <h1><a href="{{ url_for('default.settings') if g.user else url_for('default.index') }}">
         <img src="{{ url_for('static', filename='logo.png') }}" alt="spline accounts" />
       </a></h1>
       <span id="roundcornerb">&nbsp;</span>
@@ -24,7 +24,7 @@
       <nav id="mainnav">
         <ul>
           <li><a href="http://spline.de">spline.de</a></li>
-          <li><a href="{{ url_for('about') }}">FAQ</a></li>
+          <li><a href="{{ url_for('default.about') }}">FAQ</a></li>
         </ul>
       </nav>
 
@@ -36,10 +36,10 @@
             {%- if g.user.uid in config.get('ADMIN_USERS', []) %}
           <li><a href="{{ url_for('admin.index') }}">Admin</a></li>
             {%- endif %}
-          <li><a href="{{ url_for('logout') }}">Abmelden</a></li>
+          <li><a href="{{ url_for('default.logout') }}">Abmelden</a></li>
           {%- else %}
           <li>Nicht angemeldet</li>
-          <li><a href="{{ url_for('index') }}">Login</a></li>
+          <li><a href="{{ url_for('default.index') }}">Login</a></li>
           {%- endif %}
         </ul>
       </nav>
diff --git a/accounts/templates/index.html b/accounts/templates/index.html
index 4d398de..075e7c9 100644
--- a/accounts/templates/index.html
+++ b/accounts/templates/index.html
@@ -5,17 +5,17 @@
 <p>
   Willkommen bei <strong>spline accounts</strong>.
   Melde dich an,
-  <a href="{{ url_for('about') }}">informier dich</a>, oder
-  <a href="{{ url_for('register') }}">leg einen Account an</a>.
+  <a href="{{ url_for('.about') }}">informier dich</a>, oder
+  <a href="{{ url_for('.register') }}">leg einen Account an</a>.
 </p>
 
-<form action="{{ url_for('index') }}" method="post" class="form-horizontal">
+<form action="{{ url_for('.index') }}" method="post" class="form-horizontal">
   {% for field in form %}
     {{ render_field(field) }}
   {% endfor %}
   {{ render_submit(value='Login') }}
-  <p class="form-actions"><a href="{{ url_for('register') }}">Account erstellen</a></div>
-  <p class="form-actions"><a href="{{ url_for('lost_password') }}">Passwort oder Benutzername vergessen</a></div>
+  <p class="form-actions"><a href="{{ url_for('.register') }}">Account erstellen</a></div>
+  <p class="form-actions"><a href="{{ url_for('.lost_password') }}">Passwort oder Benutzername vergessen</a></div>
 </form>
 
 {%- endblock %}
diff --git a/accounts/templates/lost_password.html b/accounts/templates/lost_password.html
index 11021f1..5940973 100644
--- a/accounts/templates/lost_password.html
+++ b/accounts/templates/lost_password.html
@@ -10,7 +10,7 @@
   In dieser Mail steht dann auch dein Benutzername.
 </p>
 
-<form action="{{ url_for('lost_password') }}" method="post" class="form-horizontal">
+<form action="{{ url_for('.lost_password') }}" method="post" class="form-horizontal">
   {% for field in form %}
     {{ render_field(field) }}
   {% endfor %}
diff --git a/accounts/templates/lost_password_complete.html b/accounts/templates/lost_password_complete.html
index 78ef512..e14d650 100644
--- a/accounts/templates/lost_password_complete.html
+++ b/accounts/templates/lost_password_complete.html
@@ -6,7 +6,7 @@
 <p>
   Hier kannst du jetzt ein neues Passwort setzen.
 </p>
-<form action="{{ url_for('lost_password_complete', token=token) }}" method="post" class="form-horizontal">
+<form action="{{ url_for('.lost_password_complete', token=token) }}" method="post" class="form-horizontal">
   <div class="control-group">
     <div class="control-label">Benutzername</div>
     <div class="controls"><input readonly="readonly" value="{{ username }}" /></div>
diff --git a/accounts/templates/mail/change_mail.txt b/accounts/templates/mail/change_mail.txt
index 2319672..64cda14 100644
--- a/accounts/templates/mail/change_mail.txt
+++ b/accounts/templates/mail/change_mail.txt
@@ -13,4 +13,4 @@ Wenn du dies nicht möchtest, brauchst du nichts weiter zu tun.
 Ohne deine Bestätigung wird die Adresse nicht geändert.
 
 
-[1] {{ url_for('index', _external=True) }}
+[1] {{ url_for('default.index', _external=True) }}
diff --git a/accounts/templates/mail/register.txt b/accounts/templates/mail/register.txt
index 1f837d6..c5af422 100644
--- a/accounts/templates/mail/register.txt
+++ b/accounts/templates/mail/register.txt
@@ -16,4 +16,4 @@ Wenn du diesen Account nicht anlegen möchtest, brauchst du nichts
 weiter zu tun. Ohne deine Bestätigung wird der Account nicht erstellt.
 
 
-[1] {{ url_for('index', _external=True) }}
+[1] {{ url_for('default.index', _external=True) }}
diff --git a/accounts/templates/register.html b/accounts/templates/register.html
index c317396..162cc20 100644
--- a/accounts/templates/register.html
+++ b/accounts/templates/register.html
@@ -13,7 +13,7 @@
   Bitte such dir deinen Benutzernamen gut aus. Er kann später nicht mehr
   geändert werden.
 </p>
-<form action="{{ url_for('register') }}" method="post" class="form-horizontal">
+<form action="{{ url_for('.register') }}" method="post" class="form-horizontal">
   {% for field in form %}
     {{ render_field(field) }}
   {% endfor %}
diff --git a/accounts/templates/register_complete.html b/accounts/templates/register_complete.html
index d5cec72..1fb69de 100644
--- a/accounts/templates/register_complete.html
+++ b/accounts/templates/register_complete.html
@@ -7,7 +7,7 @@
   Deine E-Mail-Adresse wurde erfolgreich bestätigt.
   Bitte setze nun ein Passwort, um die Registrierung abzuschließen.
 </p>
-<form action="{{ url_for('register_complete', token=token) }}" method="post" class="form-horizontal">
+<form action="{{ url_for('.register_complete', token=token) }}" method="post" class="form-horizontal">
   <div class="control-group">
     <div class="control-label">Benutzername</div>
     <div class="controls"><input readonly="readonly" value="{{ username }}" /></div>
diff --git a/accounts/templates/settings.html b/accounts/templates/settings.html
index 58f2079..6591026 100644
--- a/accounts/templates/settings.html
+++ b/accounts/templates/settings.html
@@ -2,7 +2,7 @@
 {%- from '_macros.html' import render_field, render_submit %}
 {%- set title = 'Einstellungen' %}
 {%- block content %}
-<form action="{{ url_for('settings') }}" method="post" class="form-horizontal">
+<form action="{{ url_for('.settings') }}" method="post" class="form-horizontal">
   <h2>Globale Einstellungen ändern</h2>
   {{ render_field(form.mail) }}
   <p></p>