From df2f973109c47faee74d3b889c93bb211e865819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Sat, 19 Oct 2013 12:18:27 +0200
Subject: Rename 'login' to 'user'

---
 app/views/__init__.py       |  4 ++--
 app/views/login.py          | 29 -----------------------------
 app/views/user.py           | 29 +++++++++++++++++++++++++++++
 templates/login/login.jinja | 13 -------------
 templates/menu.jinja        |  2 +-
 templates/user/login.jinja  | 13 +++++++++++++
 6 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 app/views/login.py
 create mode 100644 app/views/user.py
 delete mode 100644 templates/login/login.jinja
 create mode 100644 templates/user/login.jinja

diff --git a/app/views/__init__.py b/app/views/__init__.py
index 8737d07..7d344ad 100644
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -51,10 +51,10 @@ def page_not_found (error):
     return render_template('404.jinja', page = request.path), 404
 
 # Now import the views
-from . import categories, consts, expenses, login, api
+from . import categories, consts, expenses, user, api
 
-app.register_blueprint(login.mod)
 app.register_blueprint(expenses.mod)
+app.register_blueprint(user.mod, url_prefix='/user')
 app.register_blueprint(consts.mod, url_prefix='/const')
 app.register_blueprint(categories.mod, url_prefix='/cat')
 
diff --git a/app/views/login.py b/app/views/login.py
deleted file mode 100644
index 7b46665..0000000
--- a/app/views/login.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from . import Blueprint, flash, db, \
-        current_user, login_required, \
-        templated, request, url_for
-
-from ..forms import LoginForm
-from ..login import login_user, logout_user, login_manager
-
-# we explicitly need flask's redirect and not our variant
-from flask import redirect
-
-mod = Blueprint('login', __name__)
-
-@mod.route('/login', methods=('GET', 'POST'))
-@templated
-def login():
-   form = LoginForm(flash=u"Login fehlgeschlagen!")
-
-   if form.validate_on_submit():
-       login_user(form.user)
-       return redirect(request.args.get('next') or url_for('index'))
-
-   return { 'form': form }
-
-@mod.route('/logout')
-def logout():
-    logout_user()
-    return redirect(url_for('.login'))
-
-login_manager.login_view = 'login.login'
diff --git a/app/views/user.py b/app/views/user.py
new file mode 100644
index 0000000..e3c9251
--- /dev/null
+++ b/app/views/user.py
@@ -0,0 +1,29 @@
+from . import Blueprint, flash, db, \
+        current_user, login_required, \
+        templated, request, url_for
+
+from ..forms import LoginForm
+from ..login import login_user, logout_user, login_manager
+
+# we explicitly need flask's redirect and not our variant
+from flask import redirect
+
+mod = Blueprint('user', __name__)
+
+@mod.route('/login', methods=('GET', 'POST'))
+@templated
+def login():
+   form = LoginForm(flash=u"Login fehlgeschlagen!")
+
+   if form.validate_on_submit():
+       login_user(form.user)
+       return redirect(request.args.get('next') or url_for('index'))
+
+   return { 'form': form }
+
+@mod.route('/logout')
+def logout():
+    logout_user()
+    return redirect(url_for('.login'))
+
+login_manager.login_view = 'user.login'
diff --git a/templates/login/login.jinja b/templates/login/login.jinja
deleted file mode 100644
index 0b2813c..0000000
--- a/templates/login/login.jinja
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "layout.jinja" %}
-{% from "macros.jinja" import render_form %}
-
-{% block heading %}
-    Login
-{% endblock %}
-
-{% block content %}
-    <form name="login" method="post">
-        {{ render_form(form, username = {'autofocus' : True}) }}
-        <input type="submit">
-    </form>
-{% endblock %}
diff --git a/templates/menu.jinja b/templates/menu.jinja
index aa2bdd4..cebe1e5 100644
--- a/templates/menu.jinja
+++ b/templates/menu.jinja
@@ -6,5 +6,5 @@
         ]
 %}
 {% if current_user.is_authenticated() %}
-    {% set menu = menu + [("login.logout", "Logout")] %}
+    {% set menu = menu + [("user.logout", "Logout")] %}
 {% endif %}
diff --git a/templates/user/login.jinja b/templates/user/login.jinja
new file mode 100644
index 0000000..0b2813c
--- /dev/null
+++ b/templates/user/login.jinja
@@ -0,0 +1,13 @@
+{% extends "layout.jinja" %}
+{% from "macros.jinja" import render_form %}
+
+{% block heading %}
+    Login
+{% endblock %}
+
+{% block content %}
+    <form name="login" method="post">
+        {{ render_form(form, username = {'autofocus' : True}) }}
+        <input type="submit">
+    </form>
+{% endblock %}
-- 
cgit v1.2.3