Rename views: settings->index, index->login

5 files changed, 97 insertions, 97 deletions

diff --git a/accounts/templates/base.html b/accounts/templates/base.html
index f59408d..b97c5ed 100644
--- a/accounts/templates/base.html
+++ b/accounts/templates/base.html
@@ -17,9 +17,9 @@
     <header>
       <h1>
         {%- if current_user.is_authenticated -%}
-        <a href="{{ url_for('default.settings') }}">
-        {%- else -%}
         <a href="{{ url_for('default.index') }}">
+        {%- else -%}
+        <a href="{{ url_for('default.login') }}">
         {%- endif -%}
           <img src="{{ url_for('static', filename='logo.png') }}" alt="spline accounts" />
         </a>
@@ -45,7 +45,7 @@
           <li><a href="{{ url_for('default.logout') }}">Abmelden</a></li>
           {%- else %}
           <li>Nicht angemeldet</li>
-          <li><a href="{{ url_for('default.index') }}">Login</a></li>
+          <li><a href="{{ url_for('default.login') }}">Login</a></li>
           {%- endif %}
         </ul>
       </nav>
diff --git a/accounts/templates/index.html b/accounts/templates/index.html
index 075e7c9..d10adf7 100644
--- a/accounts/templates/index.html
+++ b/accounts/templates/index.html
@@ -1,21 +1,62 @@
 {%- extends 'base.html' %}
 {%- from '_macros.html' import render_field, render_submit %}
+{%- set title = 'Einstellungen' %}
 {%- block content %}
-<h2>Login</h2>
-<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>.
-</p>
-
 <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>
-</form>
+  <h2>Globale Einstellungen ändern</h2>
+  {{ render_field(form.mail) }}
+  <p></p>
+  {{ render_field(form.old_password) }}
+  {{ render_field(form.password) }}
+  {{ render_field(form.password_confirm) }}
+  {{ render_field(form.csrf_token) }}
+  {{ render_submit(value='Speichern',name='submit_main') }}
+
+  <h2>Dienste verwalten</h2>
+  <p>
+    Standardmäßig kannst du dich auf allen teilnehmenden Diensten mit dem
+    oben konfigurierten allgemeinen Passwort einloggen.
+  </p>
+  <p>
+    Du kannst für jeden Dienst ein eigenes Passwort setzen. Das empfiehlt
+    sich zum Beispiel, wenn du einen der Dienste oft unterwegs an fremden
+    Rechnern nutzt.
+  </p>
+
+  {%- for service in services %}
+  <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">eigenes Passwort</li>
+      </li>
+      {%- else %}
+      <li class="inactive">allgemeines Passwort</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 zurücksetzen" name="submit_services" />
+  </div>
+</form>
 {%- endblock %}
+
+{% block javascript %}
+  $(document).ready(settings_service_toggle);
+{% endblock %}
diff --git a/accounts/templates/login.html b/accounts/templates/login.html
new file mode 100644
index 0000000..34fb6d0
--- /dev/null
+++ b/accounts/templates/login.html
@@ -0,0 +1,21 @@
+{%- extends 'base.html' %}
+{%- from '_macros.html' import render_field, render_submit %}
+{%- block content %}
+<h2>Login</h2>
+<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>.
+</p>
+
+<form action="{{ url_for('.login') }}" 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>
+</form>
+
+{%- endblock %}
diff --git a/accounts/templates/settings.html b/accounts/templates/settings.html
deleted file mode 100644
index 6591026..0000000
--- a/accounts/templates/settings.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{%- extends 'base.html' %}
-{%- from '_macros.html' import render_field, render_submit %}
-{%- set title = 'Einstellungen' %}
-{%- block content %}
-<form action="{{ url_for('.settings') }}" method="post" class="form-horizontal">
-  <h2>Globale Einstellungen ändern</h2>
-  {{ render_field(form.mail) }}
-  <p></p>
-  {{ render_field(form.old_password) }}
-  {{ render_field(form.password) }}
-  {{ render_field(form.password_confirm) }}
-  {{ render_field(form.csrf_token) }}
-  {{ render_submit(value='Speichern',name='submit_main') }}
-
-  <h2>Dienste verwalten</h2>
-  <p>
-    Standardmäßig kannst du dich auf allen teilnehmenden Diensten mit dem
-    oben konfigurierten allgemeinen Passwort einloggen.
-  </p>
-  <p>
-    Du kannst für jeden Dienst ein eigenes Passwort setzen. Das empfiehlt
-    sich zum Beispiel, wenn du einen der Dienste oft unterwegs an fremden
-    Rechnern nutzt.
-  </p>
-
-  {%- for service in services %}
-  <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">eigenes Passwort</li>
-      </li>
-      {%- else %}
-      <li class="inactive">allgemeines Passwort</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 zurücksetzen" name="submit_services" />
-  </div>
-</form>
-{%- endblock %}
-
-{% block javascript %}
-  $(document).ready(settings_service_toggle);
-{% endblock %}
diff --git a/accounts/views/default/__init__.py b/accounts/views/default/__init__.py
index 37f71f6..88105bd 100644
--- a/accounts/views/default/__init__.py
+++ b/accounts/views/default/__init__.py
@@ -17,11 +17,11 @@ from accounts.models import Account
 bp = Blueprint('default', __name__)
 
 
-@bp.route('/', methods=['GET', 'POST'])
-@templated('index.html')
-def index():
+@bp.route('/login', methods=['GET', 'POST'])
+@templated('login.html')
+def login():
     if current_user.is_authenticated:
-        return redirect(url_for('.settings'))
+        return redirect(url_for('.index'))
 
     form = LoginForm(request.form)
     if form.validate_on_submit():
@@ -30,7 +30,7 @@ def index():
                                                  form.password.data)
             login_user(user)
             flash(u'Erfolgreich eingeloggt', 'success')
-            return redirect(url_for('.settings'))
+            return redirect(url_for('.index'))
         except (current_app.user_backend.NoSuchUserError,
                 current_app.user_backend.InvalidPasswordError):
             flash(u'Ungültiger Benutzername und/oder Passwort', 'error')
@@ -50,7 +50,7 @@ def register():
               u'um diese zu überprüfen. Bitte folge den Anweisungen in der '
               u'E-Mail.', 'success')
 
-        return redirect(url_for('.index'))
+        return redirect(url_for('.login'))
 
     return {'form': form}
 
@@ -69,7 +69,7 @@ def register_complete(token):
         pass
     else:
         flash(u'Du hast den Benutzer bereits angelegt! Du kannst dich jetzt einfach einloggen:')
-        return redirect(url_for('.index'))
+        return redirect(url_for('.login'))
 
     form = RegisterCompleteForm(request.form)
     if form.validate_on_submit():
@@ -89,7 +89,7 @@ def register_complete(token):
             )
 
         flash(u'Benutzer erfolgreich angelegt.', 'success')
-        return redirect(url_for('.settings'))
+        return redirect(url_for('.index'))
 
     return {
         'form': form,
@@ -120,7 +120,7 @@ def lost_password():
         flash(u'Wir haben dir eine E-Mail mit einem Link zum Passwort ändern '
               u'geschickt. Bitte folge den Anweisungen in der E-Mail.', 'success')
 
-        return redirect(url_for('.index'))
+        return redirect(url_for('.login'))
 
     return {'form': form}
 
@@ -139,7 +139,7 @@ def lost_password_complete(token):
         login_user(user)
 
         flash(u'Passwort geändert.', 'success')
-        return redirect(url_for('.settings'))
+        return redirect(url_for('.index'))
 
     return {
         'form': form,
@@ -148,10 +148,10 @@ def lost_password_complete(token):
     }
 
 
-@bp.route('/settings', methods=['GET', 'POST'])
-@templated('settings.html')
+@bp.route('/', methods=['GET', 'POST'])
+@templated('index.html')
 @login_required
-def settings():
+def index():
     form = SettingsForm(request.form, mail=current_user.attributes['mail'])
     if form.validate_on_submit():
         changed = False
@@ -194,7 +194,7 @@ def settings():
         if changed:
             current_app.user_backend.update(current_user, as_admin=True) #XXX: as_admin wieder wegmachen sobald ACLs richtig gesetzt sind
             login_user(current_user)
-            return redirect(url_for('.settings'))
+            return redirect(url_for('.index'))
         else:
             flash(u'Nichts geändert.')
 
@@ -209,7 +209,7 @@ def settings():
     }
 
 
-@bp.route('/settings/change_mail/<token>')
+@bp.route('/change_mail/<token>')
 @login_required
 def change_mail(token):
     username, mail = Confirmation('change_mail').loads_http(token, max_age=3*24*60*60)
@@ -226,14 +226,14 @@ def change_mail(token):
     current_app.user_backend.update(current_user)
 
     flash(u'E-Mail-Adresse geändert.', 'success')
-    return redirect(url_for('.settings'))
+    return redirect(url_for('.index'))
 
 
 @bp.route('/logout')
 def logout():
     logout_user()
     flash(u'Erfolgreich ausgeloggt.', 'success')
-    return redirect(url_for('.index'))
+    return redirect(url_for('.login'))
 
 
 @bp.route('/about')