From 38bf1d1ab57df154ba4de31b2c7e85a972a5289e Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Sun, 12 Apr 2015 21:57:20 +0200
Subject: Fixed a bug when creating a new user via the dashboard. An other
 little improvement for the main menu.

---
 pyaggr3g470r/templates/admin/create_user.html |  3 +++
 pyaggr3g470r/templates/layout.html            | 13 +++++++++----
 pyaggr3g470r/templates/management.html        | 15 ---------------
 pyaggr3g470r/templates/profile.html           | 16 ++++++++++++++++
 4 files changed, 28 insertions(+), 19 deletions(-)

(limited to 'pyaggr3g470r/templates')

diff --git a/pyaggr3g470r/templates/admin/create_user.html b/pyaggr3g470r/templates/admin/create_user.html
index 1d6d6c11..64387dce 100644
--- a/pyaggr3g470r/templates/admin/create_user.html
+++ b/pyaggr3g470r/templates/admin/create_user.html
@@ -18,6 +18,9 @@
             {{ form.password.label }}
             {{ form.password(class_="form-control") }} {% for error in form.password.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
 
+            {{ form.refresh_rate.label }}
+            {{ form.refresh_rate(class_="form-control") }} {% for error in form.refresh_rate.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
+
             <br />
             {{ form.submit(class_="btn btn-default") }}
         </form>
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html
index 94d3fdc6..e3d3be38 100644
--- a/pyaggr3g470r/templates/layout.html
+++ b/pyaggr3g470r/templates/layout.html
@@ -79,16 +79,21 @@
                     </ul>
                 </li>
                 <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ _('Tools') }} <b class="caret"></b></a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        <div><span class="glyphicon glyphicon-user"></span>&nbsp;<b class="caret"></b></div>
+                    </a>
                     <ul class="dropdown-menu">
-                        <li><a accesskey="m" href="{{ url_for("management") }}"><span class="glyphicon glyphicon-cog"></span> {{ _('Management') }}</a></li>
+                        <li><a href="{{ url_for("profile") }}"><span class="glyphicon glyphicon-user"></span> {{ _('Profile') }}</a></li>
+                        <li><a href="{{ url_for("management") }}"><span class="glyphicon glyphicon-cog"></span> {{ _('Your data') }}</a></li>
                         {% if g.user.is_admin() %}
+                        <li role="presentation" class="divider"></li>
                         <li><a href="{{ url_for("dashboard") }}"><span class="glyphicon glyphicon-dashboard"></span> {{ _('Dashboard') }}</a></li>
+                        <li role="presentation" class="divider"></li>
                         {% endif %}
-                        <li><a href="{{ url_for("about") }}"><span class="glyphicon glyphicon-question-sign"></span> {{ _('About') }}</a></li>
+                        <li><a href="{{ url_for("logout") }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li>
                     </ul>
                 </li>
-                <li><a href="{{ url_for("logout") }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li>
+
                 {% if not on_heroku %}
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
diff --git a/pyaggr3g470r/templates/management.html b/pyaggr3g470r/templates/management.html
index 1f8b096f..998334a3 100644
--- a/pyaggr3g470r/templates/management.html
+++ b/pyaggr3g470r/templates/management.html
@@ -10,21 +10,6 @@
         {% endif %}
         <a href="/expire_articles?weeks=10" class="btn btn-default" onclick="return confirm('{{ _('You are going to delete old articles.') }}');">{{ _('Delete articles older than 10 weeks') }}</a>
     </div>
-    <div class="well">
-        <h1>{{ _('Your Profile') }}</h1>
-        <div class="row">
-            <div class="col-md-6">
-                <p>{{ _('Update your') }} <a href="/profile">{{ _('profile') }}</a>.</p>
-                <p>{{ _('Member since') }} {{ user.date_created  | datetime }}.</p>
-                <p>{{ _('Last seen:') }} {{ user.last_seen  | datetime }}.</p>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-12">
-                <a href="/delete_account" class="btn btn-default" onclick="return confirm('{{ _('You are going to delete your account.') }}');">{{ _('Delete your account') }}</a>
-            </div>
-       </div>
-    </div>
     <div class="well">
         <h1 id="import">{{ _('OPML import/export') }}</h1>
         <form action="" method="post" id="formImportOPML" enctype="multipart/form-data">
diff --git a/pyaggr3g470r/templates/profile.html b/pyaggr3g470r/templates/profile.html
index 971c4e64..acd593b2 100644
--- a/pyaggr3g470r/templates/profile.html
+++ b/pyaggr3g470r/templates/profile.html
@@ -1,6 +1,20 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
+    <div class="well">
+        <h1>{{ _('Your Profile') }}</h1>
+        <div class="row">
+            <div class="col-md-6">
+                <p>{{ _('Member since') }} {{ user.date_created  | datetime }}.</p>
+                <p>{{ _('Last seen:') }} {{ user.last_seen  | datetime }}.</p>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a href="/delete_account" class="btn btn-default" onclick="return confirm('{{ _('You are going to delete your account.') }}');">{{ _('Delete your account') }}</a>
+            </div>
+       </div>
+    </div>
     <div class="well">
         <h2>Edit your profile</h2>
         <form action="" method="post" name="save">
@@ -14,8 +28,10 @@
 
             {{ form.password.label }}
             {{ form.password(class_="form-control") }} {% for error in form.password.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
+
             {{ form.password_conf.label }}
             {{ form.password_conf(class_="form-control") }} {% for error in form.password_conf.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
+
             {{ form.refresh_rate.label }}
             {{ form.refresh_rate(class_="form-control") }} {% for error in form.refresh_rate.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
             <br />
-- 
cgit