From ded84d38d30f06c76fa92fbe337ae16eb83cdcdc Mon Sep 17 00:00:00 2001 From: Ola Blissing Date: Fri, 20 Oct 2017 16:38:47 +0200 Subject: [PATCH 01/17] Add user gravatar and fix navbar margins --- assets/css/style.less | 5 ++ messages.pot | 67 +++++++++---------- xl_auth/public/views.py | 6 +- xl_auth/templates/nav.html | 17 +++-- .../translations/sv/LC_MESSAGES/messages.po | 67 +++++++++---------- xl_auth/utils.py | 10 +++ 6 files changed, 93 insertions(+), 79 deletions(-) diff --git a/assets/css/style.less b/assets/css/style.less index 1b2e5d79..0aa55e6e 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -39,6 +39,11 @@ textarea { .logotype { } } + .navbar-user-gravatar { + border-radius: 50%; + float: left; + margin: -.4em 0.5em; + } } .login-panel { diff --git a/messages.pot b/messages.pot index 1522933d..0fa15c42 100644 --- a/messages.pot +++ b/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: xl_auth 0.4.0\n" +"Project-Id-Version: xl_auth 0.4.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-19 15:20+0200\n" +"POT-Creation-Date: 2017-10-20 16:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,16 +19,16 @@ msgstr "" #: tests/end2end/test_deleting_permission.py:24 tests/end2end/test_deleting_permission.py:51 #: tests/end2end/test_editing_permission.py:29 tests/end2end/test_editing_permission.py:63 -#: tests/end2end/test_editing_permission.py:91 tests/end2end/test_editing_user.py:181 +#: tests/end2end/test_editing_permission.py:91 tests/end2end/test_editing_user.py:184 #: tests/end2end/test_registering_permission.py:25 tests/end2end/test_registering_permission.py:58 #: tests/end2end/test_registering_permission.py:85 xl_auth/templates/nav.html:28 #: xl_auth/templates/permissions/home.html:4 xl_auth/templates/users/profile.html:34 msgid "Permissions" msgstr "" -#: tests/end2end/test_deleting_permission.py:26 tests/end2end/test_editing_collection.py:150 +#: tests/end2end/test_deleting_permission.py:26 tests/end2end/test_editing_collection.py:158 #: tests/end2end/test_editing_permission.py:31 tests/end2end/test_editing_permission.py:66 -#: tests/end2end/test_editing_user.py:187 tests/end2end/test_editing_user.py:213 +#: tests/end2end/test_editing_user.py:190 tests/end2end/test_editing_user.py:216 #: xl_auth/templates/permissions/home.html:37 msgid "Edit" msgstr "" @@ -42,59 +42,59 @@ msgstr "" msgid "Successfully deleted permissions for \"%(username)s\" on collection \"%(code)s\"." msgstr "" -#: tests/end2end/test_editing_collection.py:26 tests/end2end/test_editing_collection.py:147 -#: tests/end2end/test_registering_collection.py:30 tests/end2end/test_registering_collection.py:162 +#: tests/end2end/test_editing_collection.py:26 tests/end2end/test_editing_collection.py:155 +#: tests/end2end/test_registering_collection.py:29 tests/end2end/test_registering_collection.py:168 #: xl_auth/templates/collections/home.html:4 xl_auth/templates/nav.html:25 #: xl_auth/templates/users/home.html:20 msgid "Collections" msgstr "" -#: tests/end2end/test_editing_collection.py:47 tests/end2end/test_registering_collection.py:48 +#: tests/end2end/test_editing_collection.py:53 tests/end2end/test_registering_collection.py:52 msgid "category" msgstr "" -#: tests/end2end/test_editing_collection.py:49 tests/end2end/test_registering_collection.py:50 +#: tests/end2end/test_editing_collection.py:57 tests/end2end/test_registering_collection.py:56 #: xl_auth/collection/forms.py:21 xl_auth/templates/collections/home.html:37 #: xl_auth/templates/collections/home.html:79 msgid "No category" msgstr "" -#: tests/end2end/test_editing_collection.py:72 tests/end2end/test_registering_collection.py:73 +#: tests/end2end/test_editing_collection.py:80 tests/end2end/test_registering_collection.py:79 #: xl_auth/collection/forms.py:17 xl_auth/templates/collections/home.html:21 #: xl_auth/templates/collections/home.html:65 xl_auth/templates/users/profile.html:40 msgid "Code" msgstr "" -#: tests/end2end/test_editing_collection.py:72 tests/forms/test_collection.py:77 +#: tests/end2end/test_editing_collection.py:80 tests/forms/test_collection.py:77 #: xl_auth/collection/forms.py:63 msgid "Code cannot be modified" msgstr "" -#: tests/end2end/test_editing_collection.py:94 tests/end2end/test_registering_collection.py:96 +#: tests/end2end/test_editing_collection.py:102 tests/end2end/test_registering_collection.py:102 #: xl_auth/collection/forms.py:18 xl_auth/templates/users/home.html:19 msgid "Name" msgstr "" -#: tests/end2end/test_editing_collection.py:94 tests/end2end/test_editing_user.py:144 -#: tests/end2end/test_registering_collection.py:73 tests/end2end/test_registering_collection.py:96 +#: tests/end2end/test_editing_collection.py:102 tests/end2end/test_editing_user.py:147 +#: tests/end2end/test_registering_collection.py:79 tests/end2end/test_registering_collection.py:102 #: tests/forms/test_collection.py:21 tests/forms/test_collection.py:38 #: tests/forms/test_permission.py:31 tests/forms/test_permission.py:39 #: tests/forms/test_permission.py:47 tests/forms/test_permission.py:55 msgid "This field is required." msgstr "" -#: tests/end2end/test_editing_collection.py:116 tests/end2end/test_registering_collection.py:119 +#: tests/end2end/test_editing_collection.py:124 tests/end2end/test_registering_collection.py:125 #: xl_auth/collection/forms.py:19 xl_auth/templates/collections/home.html:23 #: xl_auth/templates/collections/home.html:68 msgid "Category" msgstr "" -#: tests/end2end/test_editing_collection.py:116 tests/end2end/test_registering_collection.py:119 +#: tests/end2end/test_editing_collection.py:124 tests/end2end/test_registering_collection.py:125 #: tests/forms/test_collection.py:104 tests/forms/test_collection.py:113 msgid "Not a valid choice" msgstr "" -#: tests/end2end/test_editing_collection.py:132 xl_auth/collection/views.py:58 +#: tests/end2end/test_editing_collection.py:140 xl_auth/collection/views.py:58 #, python-format msgid "Collection code \"%(code)s\" does not exist" msgstr "" @@ -111,7 +111,7 @@ msgstr "" msgid "Permissions for user \"%(username)s\" on collection \"%(code)s\" already registered" msgstr "" -#: tests/end2end/test_editing_user.py:23 tests/end2end/test_editing_user.py:60 +#: tests/end2end/test_editing_user.py:23 tests/end2end/test_editing_user.py:63 #: tests/end2end/test_registering_user.py:27 tests/end2end/test_registering_user.py:56 #: xl_auth/templates/collections/home.html:24 xl_auth/templates/collections/home.html:69 #: xl_auth/templates/nav.html:27 xl_auth/templates/users/home.html:4 @@ -123,52 +123,52 @@ msgstr "" msgid "Edit Details" msgstr "" -#: tests/end2end/test_editing_user.py:45 xl_auth/templates/permissions/home.html:30 +#: tests/end2end/test_editing_user.py:46 xl_auth/templates/permissions/home.html:30 #: xl_auth/templates/permissions/home.html:31 xl_auth/templates/permissions/home.html:32 #: xl_auth/templates/users/home.html:36 xl_auth/templates/users/profile.html:53 #: xl_auth/templates/users/profile.html:56 xl_auth/templates/users/profile.html:59 msgid "Yes" msgstr "" -#: tests/end2end/test_editing_user.py:45 xl_auth/templates/permissions/home.html:30 +#: tests/end2end/test_editing_user.py:46 xl_auth/templates/permissions/home.html:30 #: xl_auth/templates/permissions/home.html:31 xl_auth/templates/permissions/home.html:32 #: xl_auth/templates/users/home.html:36 xl_auth/templates/users/profile.html:53 #: xl_auth/templates/users/profile.html:56 xl_auth/templates/users/profile.html:59 msgid "No" msgstr "" -#: tests/end2end/test_editing_user.py:62 tests/end2end/test_editing_user.py:188 +#: tests/end2end/test_editing_user.py:65 tests/end2end/test_editing_user.py:191 #: xl_auth/templates/users/home.html:46 xl_auth/templates/users/profile.html:17 msgid "Change Password" msgstr "" -#: tests/end2end/test_editing_user.py:99 tests/end2end/test_editing_user.py:123 +#: tests/end2end/test_editing_user.py:102 tests/end2end/test_editing_user.py:126 #: xl_auth/templates/users/home.html:18 xl_auth/user/forms.py:13 msgid "Email" msgstr "" -#: tests/end2end/test_editing_user.py:99 tests/end2end/test_editing_user.py:123 +#: tests/end2end/test_editing_user.py:102 tests/end2end/test_editing_user.py:126 #: tests/forms/test_user.py:95 tests/forms/test_user.py:123 tests/forms/test_user.py:143 #: xl_auth/user/forms.py:67 msgid "Email cannot be modified" msgstr "" -#: tests/end2end/test_editing_user.py:144 xl_auth/user/forms.py:14 +#: tests/end2end/test_editing_user.py:147 xl_auth/user/forms.py:14 msgid "Full name" msgstr "" -#: tests/end2end/test_editing_user.py:160 tests/end2end/test_editing_user.py:165 +#: tests/end2end/test_editing_user.py:163 tests/end2end/test_editing_user.py:168 #: xl_auth/user/views.py:62 xl_auth/user/views.py:89 xl_auth/user/views.py:114 #, python-format msgid "User \"%(username)s\" does not exist" msgstr "" -#: tests/end2end/test_editing_user.py:209 tests/end2end/test_editing_user.py:221 -#: tests/end2end/test_editing_user.py:223 xl_auth/templates/users/profile.html:6 +#: tests/end2end/test_editing_user.py:212 tests/end2end/test_editing_user.py:224 +#: tests/end2end/test_editing_user.py:226 xl_auth/templates/users/profile.html:6 msgid "Welcome" msgstr "" -#: tests/end2end/test_logging_in.py:35 xl_auth/public/views.py:45 +#: tests/end2end/test_logging_in.py:35 xl_auth/public/views.py:47 msgid "You are logged out." msgstr "" @@ -180,12 +180,12 @@ msgstr "" msgid "Unknown username/email" msgstr "" -#: tests/end2end/test_registering_collection.py:32 tests/end2end/test_registering_collection.py:165 +#: tests/end2end/test_registering_collection.py:31 tests/end2end/test_registering_collection.py:171 #: xl_auth/templates/collections/home.html:15 msgid "New Collection" msgstr "" -#: tests/end2end/test_registering_collection.py:147 tests/forms/test_collection.py:47 +#: tests/end2end/test_registering_collection.py:153 tests/forms/test_collection.py:47 #: tests/forms/test_collection.py:59 xl_auth/collection/forms.py:46 #, python-format msgid "Code \"%(code)s\" already registered" @@ -330,7 +330,7 @@ msgstr "" msgid "Password" msgstr "" -#: xl_auth/public/views.py:32 +#: xl_auth/public/views.py:34 msgid "You are logged in." msgstr "" @@ -366,9 +366,8 @@ msgstr "" msgid "xl_auth" msgstr "" -#: xl_auth/templates/nav.html:35 -#, python-format -msgid "Logged in as %(user)s" +#: xl_auth/templates/nav.html:39 +msgid "Log out" msgstr "" #: xl_auth/templates/collections/edit.html:5 diff --git a/xl_auth/public/views.py b/xl_auth/public/views.py index 50292e99..894ea5f0 100644 --- a/xl_auth/public/views.py +++ b/xl_auth/public/views.py @@ -10,7 +10,7 @@ from ..extensions import login_manager from ..public.forms import LoginForm from ..user.models import User -from ..utils import flash_errors +from ..utils import flash_errors, get_gravatar_url blueprint = Blueprint('public', __name__, static_folder='../static') @@ -18,7 +18,9 @@ @login_manager.user_loader def load_user(user_id): """Load user by ID.""" - return User.get_by_id(int(user_id)) + user = User.get_by_id(int(user_id)) + user.gravatar = get_gravatar_url(user.email, 32) + return user @blueprint.route('/', methods=['GET', 'POST']) diff --git a/xl_auth/templates/nav.html b/xl_auth/templates/nav.html index 0750d894..d3131bbf 100644 --- a/xl_auth/templates/nav.html +++ b/xl_auth/templates/nav.html @@ -22,22 +22,21 @@
  • -

    - - {{ _('Logged in as %(user)s', user=current_user.full_name) }} - -

    + + + {{ current_user.full_name }} +
  • - +
    • diff --git a/xl_auth/translations/sv/LC_MESSAGES/messages.po b/xl_auth/translations/sv/LC_MESSAGES/messages.po index e1ec1445..35622ba8 100644 --- a/xl_auth/translations/sv/LC_MESSAGES/messages.po +++ b/xl_auth/translations/sv/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2.1\n" "Report-Msgid-Bugs-To: mats.blomdahl@gmail.com\n" -"POT-Creation-Date: 2017-10-19 15:20+0200\n" +"POT-Creation-Date: 2017-10-20 16:26+0200\n" "PO-Revision-Date: 2017-09-19 12:23+0200\n" "Last-Translator: Mats Blomdahl \n" "Language: sv\n" @@ -20,16 +20,16 @@ msgstr "" #: tests/end2end/test_deleting_permission.py:24 tests/end2end/test_deleting_permission.py:51 #: tests/end2end/test_editing_permission.py:29 tests/end2end/test_editing_permission.py:63 -#: tests/end2end/test_editing_permission.py:91 tests/end2end/test_editing_user.py:181 +#: tests/end2end/test_editing_permission.py:91 tests/end2end/test_editing_user.py:184 #: tests/end2end/test_registering_permission.py:25 tests/end2end/test_registering_permission.py:58 #: tests/end2end/test_registering_permission.py:85 xl_auth/templates/nav.html:28 #: xl_auth/templates/permissions/home.html:4 xl_auth/templates/users/profile.html:34 msgid "Permissions" msgstr "Behörigheter" -#: tests/end2end/test_deleting_permission.py:26 tests/end2end/test_editing_collection.py:150 +#: tests/end2end/test_deleting_permission.py:26 tests/end2end/test_editing_collection.py:158 #: tests/end2end/test_editing_permission.py:31 tests/end2end/test_editing_permission.py:66 -#: tests/end2end/test_editing_user.py:187 tests/end2end/test_editing_user.py:213 +#: tests/end2end/test_editing_user.py:190 tests/end2end/test_editing_user.py:216 #: xl_auth/templates/permissions/home.html:37 msgid "Edit" msgstr "Ändra" @@ -43,59 +43,59 @@ msgstr "🙀 Ta bort behörighet" msgid "Successfully deleted permissions for \"%(username)s\" on collection \"%(code)s\"." msgstr "Behörighet borttagen för \"%(username)s\" på samling \"%(code)s\"." -#: tests/end2end/test_editing_collection.py:26 tests/end2end/test_editing_collection.py:147 -#: tests/end2end/test_registering_collection.py:30 tests/end2end/test_registering_collection.py:162 +#: tests/end2end/test_editing_collection.py:26 tests/end2end/test_editing_collection.py:155 +#: tests/end2end/test_registering_collection.py:29 tests/end2end/test_registering_collection.py:168 #: xl_auth/templates/collections/home.html:4 xl_auth/templates/nav.html:25 #: xl_auth/templates/users/home.html:20 msgid "Collections" msgstr "Samlingar" -#: tests/end2end/test_editing_collection.py:47 tests/end2end/test_registering_collection.py:48 +#: tests/end2end/test_editing_collection.py:53 tests/end2end/test_registering_collection.py:52 msgid "category" msgstr "kategori" -#: tests/end2end/test_editing_collection.py:49 tests/end2end/test_registering_collection.py:50 +#: tests/end2end/test_editing_collection.py:57 tests/end2end/test_registering_collection.py:56 #: xl_auth/collection/forms.py:21 xl_auth/templates/collections/home.html:37 #: xl_auth/templates/collections/home.html:79 msgid "No category" msgstr "Kategori saknas" -#: tests/end2end/test_editing_collection.py:72 tests/end2end/test_registering_collection.py:73 +#: tests/end2end/test_editing_collection.py:80 tests/end2end/test_registering_collection.py:79 #: xl_auth/collection/forms.py:17 xl_auth/templates/collections/home.html:21 #: xl_auth/templates/collections/home.html:65 xl_auth/templates/users/profile.html:40 msgid "Code" msgstr "Kod" -#: tests/end2end/test_editing_collection.py:72 tests/forms/test_collection.py:77 +#: tests/end2end/test_editing_collection.py:80 tests/forms/test_collection.py:77 #: xl_auth/collection/forms.py:63 msgid "Code cannot be modified" msgstr "Koden kan inte ändras" -#: tests/end2end/test_editing_collection.py:94 tests/end2end/test_registering_collection.py:96 +#: tests/end2end/test_editing_collection.py:102 tests/end2end/test_registering_collection.py:102 #: xl_auth/collection/forms.py:18 xl_auth/templates/users/home.html:19 msgid "Name" msgstr "Namn" -#: tests/end2end/test_editing_collection.py:94 tests/end2end/test_editing_user.py:144 -#: tests/end2end/test_registering_collection.py:73 tests/end2end/test_registering_collection.py:96 +#: tests/end2end/test_editing_collection.py:102 tests/end2end/test_editing_user.py:147 +#: tests/end2end/test_registering_collection.py:79 tests/end2end/test_registering_collection.py:102 #: tests/forms/test_collection.py:21 tests/forms/test_collection.py:38 #: tests/forms/test_permission.py:31 tests/forms/test_permission.py:39 #: tests/forms/test_permission.py:47 tests/forms/test_permission.py:55 msgid "This field is required." msgstr "Det här fältet är obligatoriskt." -#: tests/end2end/test_editing_collection.py:116 tests/end2end/test_registering_collection.py:119 +#: tests/end2end/test_editing_collection.py:124 tests/end2end/test_registering_collection.py:125 #: xl_auth/collection/forms.py:19 xl_auth/templates/collections/home.html:23 #: xl_auth/templates/collections/home.html:68 msgid "Category" msgstr "Kategori" -#: tests/end2end/test_editing_collection.py:116 tests/end2end/test_registering_collection.py:119 +#: tests/end2end/test_editing_collection.py:124 tests/end2end/test_registering_collection.py:125 #: tests/forms/test_collection.py:104 tests/forms/test_collection.py:113 msgid "Not a valid choice" msgstr "Inte ett giltigt val" -#: tests/end2end/test_editing_collection.py:132 xl_auth/collection/views.py:58 +#: tests/end2end/test_editing_collection.py:140 xl_auth/collection/views.py:58 #, python-format msgid "Collection code \"%(code)s\" does not exist" msgstr "Samlingskod \"%(code)s\" existerar inte" @@ -112,7 +112,7 @@ msgstr "Behörighet uppdaterad för \"%(username)s\" på samling \"%(code)s\"." msgid "Permissions for user \"%(username)s\" on collection \"%(code)s\" already registered" msgstr "En behörighet för användare \"%(username)s\" på samling \"%(code)s\" finns redan registrerad" -#: tests/end2end/test_editing_user.py:23 tests/end2end/test_editing_user.py:60 +#: tests/end2end/test_editing_user.py:23 tests/end2end/test_editing_user.py:63 #: tests/end2end/test_registering_user.py:27 tests/end2end/test_registering_user.py:56 #: xl_auth/templates/collections/home.html:24 xl_auth/templates/collections/home.html:69 #: xl_auth/templates/nav.html:27 xl_auth/templates/users/home.html:4 @@ -124,52 +124,52 @@ msgstr "Användare" msgid "Edit Details" msgstr "Ändra profil" -#: tests/end2end/test_editing_user.py:45 xl_auth/templates/permissions/home.html:30 +#: tests/end2end/test_editing_user.py:46 xl_auth/templates/permissions/home.html:30 #: xl_auth/templates/permissions/home.html:31 xl_auth/templates/permissions/home.html:32 #: xl_auth/templates/users/home.html:36 xl_auth/templates/users/profile.html:53 #: xl_auth/templates/users/profile.html:56 xl_auth/templates/users/profile.html:59 msgid "Yes" msgstr "Ja" -#: tests/end2end/test_editing_user.py:45 xl_auth/templates/permissions/home.html:30 +#: tests/end2end/test_editing_user.py:46 xl_auth/templates/permissions/home.html:30 #: xl_auth/templates/permissions/home.html:31 xl_auth/templates/permissions/home.html:32 #: xl_auth/templates/users/home.html:36 xl_auth/templates/users/profile.html:53 #: xl_auth/templates/users/profile.html:56 xl_auth/templates/users/profile.html:59 msgid "No" msgstr "Nej" -#: tests/end2end/test_editing_user.py:62 tests/end2end/test_editing_user.py:188 +#: tests/end2end/test_editing_user.py:65 tests/end2end/test_editing_user.py:191 #: xl_auth/templates/users/home.html:46 xl_auth/templates/users/profile.html:17 msgid "Change Password" msgstr "Byt lösenord" -#: tests/end2end/test_editing_user.py:99 tests/end2end/test_editing_user.py:123 +#: tests/end2end/test_editing_user.py:102 tests/end2end/test_editing_user.py:126 #: xl_auth/templates/users/home.html:18 xl_auth/user/forms.py:13 msgid "Email" msgstr "Epost" -#: tests/end2end/test_editing_user.py:99 tests/end2end/test_editing_user.py:123 +#: tests/end2end/test_editing_user.py:102 tests/end2end/test_editing_user.py:126 #: tests/forms/test_user.py:95 tests/forms/test_user.py:123 tests/forms/test_user.py:143 #: xl_auth/user/forms.py:67 msgid "Email cannot be modified" msgstr "Epost/användarnamn går inte att ändra" -#: tests/end2end/test_editing_user.py:144 xl_auth/user/forms.py:14 +#: tests/end2end/test_editing_user.py:147 xl_auth/user/forms.py:14 msgid "Full name" msgstr "Fullständigt namn" -#: tests/end2end/test_editing_user.py:160 tests/end2end/test_editing_user.py:165 +#: tests/end2end/test_editing_user.py:163 tests/end2end/test_editing_user.py:168 #: xl_auth/user/views.py:62 xl_auth/user/views.py:89 xl_auth/user/views.py:114 #, python-format msgid "User \"%(username)s\" does not exist" msgstr "Användaren \"%(username)s\" existerar inte" -#: tests/end2end/test_editing_user.py:209 tests/end2end/test_editing_user.py:221 -#: tests/end2end/test_editing_user.py:223 xl_auth/templates/users/profile.html:6 +#: tests/end2end/test_editing_user.py:212 tests/end2end/test_editing_user.py:224 +#: tests/end2end/test_editing_user.py:226 xl_auth/templates/users/profile.html:6 msgid "Welcome" msgstr "Välkommen" -#: tests/end2end/test_logging_in.py:35 xl_auth/public/views.py:45 +#: tests/end2end/test_logging_in.py:35 xl_auth/public/views.py:47 msgid "You are logged out." msgstr "Du är utloggad." @@ -181,12 +181,12 @@ msgstr "Felaktigt lösenord" msgid "Unknown username/email" msgstr "Okänd epost/användarnamn" -#: tests/end2end/test_registering_collection.py:32 tests/end2end/test_registering_collection.py:165 +#: tests/end2end/test_registering_collection.py:31 tests/end2end/test_registering_collection.py:171 #: xl_auth/templates/collections/home.html:15 msgid "New Collection" msgstr "Ny samling" -#: tests/end2end/test_registering_collection.py:147 tests/forms/test_collection.py:47 +#: tests/end2end/test_registering_collection.py:153 tests/forms/test_collection.py:47 #: tests/forms/test_collection.py:59 xl_auth/collection/forms.py:46 #, python-format msgid "Code \"%(code)s\" already registered" @@ -331,7 +331,7 @@ msgstr "Användarnamn" msgid "Password" msgstr "Lösenord" -#: xl_auth/public/views.py:32 +#: xl_auth/public/views.py:34 msgid "You are logged in." msgstr "Du har loggat in." @@ -367,10 +367,9 @@ msgstr "Kontakt" msgid "xl_auth" msgstr "Libris Login (alpha)" -#: xl_auth/templates/nav.html:35 -#, python-format -msgid "Logged in as %(user)s" -msgstr "Inloggad som %(user)s" +#: xl_auth/templates/nav.html:39 +msgid "Log out" +msgstr "Logga ut" #: xl_auth/templates/collections/edit.html:5 msgid "Edit Existing Collection" diff --git a/xl_auth/utils.py b/xl_auth/utils.py index 19f3088c..43f5b724 100644 --- a/xl_auth/utils.py +++ b/xl_auth/utils.py @@ -3,6 +3,8 @@ from __future__ import absolute_import, division, print_function, unicode_literals +import hashlib + from flask import flash @@ -11,3 +13,11 @@ def flash_errors(form, category='warning'): for field, errors in form.errors.items(): for error in errors: flash('{0} - {1}'.format(getattr(form, field).label.text, error), category) + + +def get_gravatar_url(user_email, size): + """Get gravatar url from user email.""" + clean_email = str(user_email).lower() + hash = hashlib.md5(clean_email) + url = 'https://www.gravatar.com/avatar/' + hash.hexdigest() + '?d=mm&s=' + str(size) + return url From 2e65c63e25c544b5a1ff5525bb0540ea9d454d80 Mon Sep 17 00:00:00 2001 From: Ola Blissing Date: Mon, 23 Oct 2017 14:06:27 +0200 Subject: [PATCH 02/17] Encode string before hash --- xl_auth/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xl_auth/utils.py b/xl_auth/utils.py index 43f5b724..40cf689e 100644 --- a/xl_auth/utils.py +++ b/xl_auth/utils.py @@ -17,7 +17,7 @@ def flash_errors(form, category='warning'): def get_gravatar_url(user_email, size): """Get gravatar url from user email.""" - clean_email = str(user_email).lower() + clean_email = str(user_email).lower().encode() hash = hashlib.md5(clean_email) url = 'https://www.gravatar.com/avatar/' + hash.hexdigest() + '?d=mm&s=' + str(size) return url From 900664e42370f527ac5828fab394de79a3bd6552 Mon Sep 17 00:00:00 2001 From: Ola Blissing Date: Mon, 23 Oct 2017 14:49:19 +0200 Subject: [PATCH 03/17] Make get_gravatar_url a user method instead of util --- xl_auth/public/views.py | 3 +-- xl_auth/templates/nav.html | 2 +- xl_auth/user/models.py | 6 ++++++ xl_auth/utils.py | 10 ---------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/xl_auth/public/views.py b/xl_auth/public/views.py index 894ea5f0..679bc165 100644 --- a/xl_auth/public/views.py +++ b/xl_auth/public/views.py @@ -10,7 +10,7 @@ from ..extensions import login_manager from ..public.forms import LoginForm from ..user.models import User -from ..utils import flash_errors, get_gravatar_url +from ..utils import flash_errors blueprint = Blueprint('public', __name__, static_folder='../static') @@ -19,7 +19,6 @@ def load_user(user_id): """Load user by ID.""" user = User.get_by_id(int(user_id)) - user.gravatar = get_gravatar_url(user.email, 32) return user diff --git a/xl_auth/templates/nav.html b/xl_auth/templates/nav.html index d3131bbf..23bd9ef1 100644 --- a/xl_auth/templates/nav.html +++ b/xl_auth/templates/nav.html @@ -31,7 +31,7 @@
    • - + {{ current_user.full_name }}
      • diff --git a/xl_auth/user/models.py b/xl_auth/user/models.py index bbbadd4d..798763ef 100644 --- a/xl_auth/user/models.py +++ b/xl_auth/user/models.py @@ -4,6 +4,7 @@ from __future__ import absolute_import, division, print_function, unicode_literals import datetime as dt +import hashlib from flask_login import UserMixin @@ -57,6 +58,11 @@ def check_password(self, value): """Check password.""" return bcrypt.check_password_hash(self.password, value) + def get_gravatar_url(self, size=32): + """Get Gravatar URL.""" + hashed_email = hashlib.md5(str(self.email).lower()).hexdigest() + return 'https://www.gravatar.com/avatar/{}?d=mm&s={}'.format(hashed_email, size) + def __repr__(self): """Represent instance as a unique string.""" return ''.format(email=self.email) diff --git a/xl_auth/utils.py b/xl_auth/utils.py index 40cf689e..19f3088c 100644 --- a/xl_auth/utils.py +++ b/xl_auth/utils.py @@ -3,8 +3,6 @@ from __future__ import absolute_import, division, print_function, unicode_literals -import hashlib - from flask import flash @@ -13,11 +11,3 @@ def flash_errors(form, category='warning'): for field, errors in form.errors.items(): for error in errors: flash('{0} - {1}'.format(getattr(form, field).label.text, error), category) - - -def get_gravatar_url(user_email, size): - """Get gravatar url from user email.""" - clean_email = str(user_email).lower().encode() - hash = hashlib.md5(clean_email) - url = 'https://www.gravatar.com/avatar/' + hash.hexdigest() + '?d=mm&s=' + str(size) - return url From 2ed9da5711a2b516a37a8599f9af12e7ff29075f Mon Sep 17 00:00:00 2001 From: Ola Blissing Date: Mon, 23 Oct 2017 14:55:37 +0200 Subject: [PATCH 04/17] Encode string before hash --- xl_auth/user/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xl_auth/user/models.py b/xl_auth/user/models.py index 798763ef..3971aa63 100644 --- a/xl_auth/user/models.py +++ b/xl_auth/user/models.py @@ -60,7 +60,7 @@ def check_password(self, value): def get_gravatar_url(self, size=32): """Get Gravatar URL.""" - hashed_email = hashlib.md5(str(self.email).lower()).hexdigest() + hashed_email = hashlib.md5(str(self.email).lower().encode()).hexdigest() return 'https://www.gravatar.com/avatar/{}?d=mm&s={}'.format(hashed_email, size) def __repr__(self): From abf0b897d0410ffda4aa76795f1b414701c025e2 Mon Sep 17 00:00:00 2001 From: Ola Blissing Date: Mon, 23 Oct 2017 15:08:02 +0200 Subject: [PATCH 05/17] Update translations --- messages.pot | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/messages.pot b/messages.pot index 690f8c4a..b90d8edc 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xl_auth 0.4.2\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-23 12:41+0200\n" +"POT-Creation-Date: 2017-10-23 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -159,7 +159,7 @@ msgstr "" msgid "Welcome" msgstr "" -#: tests/end2end/test_logging_in.py:35 xl_auth/public/views.py:45 +#: tests/end2end/test_logging_in.py:35 xl_auth/public/views.py:46 msgid "You are logged out." msgstr "" @@ -321,7 +321,7 @@ msgstr "" msgid "Password" msgstr "" -#: xl_auth/public/views.py:32 +#: xl_auth/public/views.py:33 msgid "You are logged in." msgstr "" @@ -362,9 +362,8 @@ msgstr "" msgid "Collections" msgstr "" -#: xl_auth/templates/nav.html:35 -#, python-format -msgid "Logged in as %(user)s" +#: xl_auth/templates/nav.html:39 +msgid "Log out" msgstr "" #: xl_auth/templates/collections/edit.html:5 From 5eb29e391167c76aaa06fedc35a707afb3565471 Mon Sep 17 00:00:00 2001 From: Ola Blissing Date: Mon, 23 Oct 2017 15:11:38 +0200 Subject: [PATCH 06/17] Remove stray brace --- assets/css/style.less | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/css/style.less b/assets/css/style.less index 1d6f6853..5855a2fb 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -37,7 +37,6 @@ textarea { width: 50px; padding: 0.1em; .logotype { - } } } .navbar-user-gravatar { From 9b1e2aaa60229b87bea13486b207591863101571 Mon Sep 17 00:00:00 2001 From: Ola Blissing Date: Mon, 23 Oct 2017 15:25:18 +0200 Subject: [PATCH 07/17] Make code compact --- xl_auth/public/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xl_auth/public/views.py b/xl_auth/public/views.py index 679bc165..50292e99 100644 --- a/xl_auth/public/views.py +++ b/xl_auth/public/views.py @@ -18,8 +18,7 @@ @login_manager.user_loader def load_user(user_id): """Load user by ID.""" - user = User.get_by_id(int(user_id)) - return user + return User.get_by_id(int(user_id)) @blueprint.route('/', methods=['GET', 'POST']) From ba7132a786d85b6e2a688539b138e77115532740 Mon Sep 17 00:00:00 2001 From: Ola Blissing Date: Mon, 23 Oct 2017 18:14:48 +0200 Subject: [PATCH 08/17] Remove logotype class --- assets/css/style.less | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/assets/css/style.less b/assets/css/style.less index 5855a2fb..a65ffec5 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -36,14 +36,12 @@ textarea { display: inline-block; width: 50px; padding: 0.1em; - .logotype { } - } - .navbar-user-gravatar { - border-radius: 50%; - float: left; - margin: -.4em 0.5em; - } + .navbar-user-gravatar { + border-radius: 50%; + float: left; + margin: -.4em 0.5em; + } } .login-panel { From 5f0ccbbd44939ba4cfe94485f64b39195028550d Mon Sep 17 00:00:00 2001 From: Ola Blissing Date: Mon, 23 Oct 2017 18:16:58 +0200 Subject: [PATCH 09/17] Update translations --- messages.pot | 6 +++--- xl_auth/translations/sv/LC_MESSAGES/messages.po | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/messages.pot b/messages.pot index b90d8edc..1e815213 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xl_auth 0.4.2\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-23 15:06+0200\n" +"POT-Creation-Date: 2017-10-23 18:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -159,7 +159,7 @@ msgstr "" msgid "Welcome" msgstr "" -#: tests/end2end/test_logging_in.py:35 xl_auth/public/views.py:46 +#: tests/end2end/test_logging_in.py:35 xl_auth/public/views.py:45 msgid "You are logged out." msgstr "" @@ -321,7 +321,7 @@ msgstr "" msgid "Password" msgstr "" -#: xl_auth/public/views.py:33 +#: xl_auth/public/views.py:32 msgid "You are logged in." msgstr "" diff --git a/xl_auth/translations/sv/LC_MESSAGES/messages.po b/xl_auth/translations/sv/LC_MESSAGES/messages.po index dd481bff..2b7421d8 100644 --- a/xl_auth/translations/sv/LC_MESSAGES/messages.po +++ b/xl_auth/translations/sv/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2.1\n" "Report-Msgid-Bugs-To: mats.blomdahl@gmail.com\n" -"POT-Creation-Date: 2017-10-23 15:06+0200\n" +"POT-Creation-Date: 2017-10-23 18:16+0200\n" "PO-Revision-Date: 2017-09-19 12:23+0200\n" "Last-Translator: Mats Blomdahl \n" "Language: sv\n" @@ -160,7 +160,7 @@ msgstr "Byt lösenord" msgid "Welcome" msgstr "Välkommen" -#: tests/end2end/test_logging_in.py:35 xl_auth/public/views.py:46 +#: tests/end2end/test_logging_in.py:35 xl_auth/public/views.py:45 msgid "You are logged out." msgstr "Du är utloggad." @@ -322,7 +322,7 @@ msgstr "Användarnamn" msgid "Password" msgstr "Lösenord" -#: xl_auth/public/views.py:33 +#: xl_auth/public/views.py:32 msgid "You are logged in." msgstr "Du har loggat in." @@ -555,6 +555,3 @@ msgstr "Användarinställningar uppdaterade för \"%(username)s\"." msgid "Thank you for changing password for \"%(username)s\"." msgstr "Lösenord för \"%(username)s\" har ändrats." -#~ msgid "Logged in as %(user)s" -#~ msgstr "Inloggad som %(user)s" - From 94ca74bd91fbfd1e77980b86f249272f6e9362e6 Mon Sep 17 00:00:00 2001 From: Mats Blomdahl Date: Tue, 24 Oct 2017 05:19:37 +0200 Subject: [PATCH 10/17] #70 Add unit test for get_gravatar_url --- tests/models/test_user.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/models/test_user.py b/tests/models/test_user.py index cd62415c..f9b3677d 100644 --- a/tests/models/test_user.py +++ b/tests/models/test_user.py @@ -93,6 +93,15 @@ def test_removing_permissions(collection): assert permission not in user.permissions +@pytest.mark.usefixtures('db') +def test_get_gravatar_url(): + """Check get_gravatar_url output.""" + user = UserFactory(email='foo@example.com') + + assert user.get_gravatar_url(64) == 'https://www.gravatar.com/avatar/' \ + 'b48def645758b95537d4424c84d1a9ff?d=mm&s=64' + + @pytest.mark.usefixtures('db') def test_roles(): """Add a role to a user.""" From 457f16f69ce22a9c7b9a498d280f275ba8480d7e Mon Sep 17 00:00:00 2001 From: Mats Blomdahl Date: Tue, 24 Oct 2017 05:39:22 +0200 Subject: [PATCH 11/17] Bump version and start populating changelog --- README.rst | 6 ++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 93ad44b5..bb915f02 100644 --- a/README.rst +++ b/README.rst @@ -183,6 +183,12 @@ DB Models Changelog ========= +v. 0.4.3 +-------- + +* Personalized user icons (Gravatar) + + v. 0.4.2 -------- diff --git a/package-lock.json b/package-lock.json index 4c1c831a..17141a5b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "xl_auth", - "version": "0.4.2", + "version": "0.4.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 18da0eab..9f073b0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xl_auth", - "version": "0.4.2", + "version": "0.4.3", "author": "National Library of Sweden", "license": "Apache-2.0", "description": "OAuth2 authorization for LibrisXL, replacing BibDB counterpart", From a34f0bf8e553fd3fe44ddcfcdf77dd2e224ff7d1 Mon Sep 17 00:00:00 2001 From: Mats Blomdahl Date: Tue, 24 Oct 2017 05:48:19 +0200 Subject: [PATCH 12/17] Correct outdated "Existing Users" heading --- messages.pot | 6 +++--- xl_auth/templates/users/home.html | 2 +- xl_auth/translations/sv/LC_MESSAGES/messages.po | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/messages.pot b/messages.pot index 1e815213..e311a7d8 100644 --- a/messages.pot +++ b/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: xl_auth 0.4.2\n" +"Project-Id-Version: xl_auth 0.4.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-23 18:16+0200\n" +"POT-Creation-Date: 2017-10-24 05:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -487,7 +487,7 @@ msgid "Change User Password" msgstr "" #: xl_auth/templates/users/home.html:8 -msgid "Existing Users" +msgid "Active Users" msgstr "" #: xl_auth/templates/users/home.html:20 xl_auth/templates/users/home.html:63 diff --git a/xl_auth/templates/users/home.html b/xl_auth/templates/users/home.html index f9484a34..f1942689 100644 --- a/xl_auth/templates/users/home.html +++ b/xl_auth/templates/users/home.html @@ -5,7 +5,7 @@

      {{ _('Users') }}


      - {{ _('Existing Users') }} + {{ _('Active Users') }} {% if current_user.is_admin %} {{ _('New User') }} diff --git a/xl_auth/translations/sv/LC_MESSAGES/messages.po b/xl_auth/translations/sv/LC_MESSAGES/messages.po index 2b7421d8..69db42e0 100644 --- a/xl_auth/translations/sv/LC_MESSAGES/messages.po +++ b/xl_auth/translations/sv/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2.1\n" "Report-Msgid-Bugs-To: mats.blomdahl@gmail.com\n" -"POT-Creation-Date: 2017-10-23 18:16+0200\n" +"POT-Creation-Date: 2017-10-24 05:43+0200\n" "PO-Revision-Date: 2017-09-19 12:23+0200\n" "Last-Translator: Mats Blomdahl \n" "Language: sv\n" @@ -490,8 +490,8 @@ msgid "Change User Password" msgstr "Byt användarlösenord" #: xl_auth/templates/users/home.html:8 -msgid "Existing Users" -msgstr "Befintliga användare" +msgid "Active Users" +msgstr "Aktiva användare" #: xl_auth/templates/users/home.html:20 xl_auth/templates/users/home.html:63 msgid "Admin" From a2c39fc55ff1e6abd2062fababad84e137d8b88c Mon Sep 17 00:00:00 2001 From: Mats Blomdahl Date: Tue, 24 Oct 2017 06:05:31 +0200 Subject: [PATCH 13/17] On profile page, only list permissions on active collections --- messages.pot | 8 ++++++-- xl_auth/templates/users/profile.html | 4 ++-- xl_auth/translations/sv/LC_MESSAGES/messages.po | 8 ++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/messages.pot b/messages.pot index e311a7d8..a600289e 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xl_auth 0.4.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-24 05:43+0200\n" +"POT-Creation-Date: 2017-10-24 06:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgstr "" #: tests/end2end/test_editing_permission.py:91 tests/end2end/test_editing_user.py:183 #: tests/end2end/test_registering_permission.py:25 tests/end2end/test_registering_permission.py:58 #: tests/end2end/test_registering_permission.py:85 xl_auth/templates/nav.html:28 -#: xl_auth/templates/permissions/home.html:4 xl_auth/templates/users/profile.html:34 +#: xl_auth/templates/permissions/home.html:4 msgid "Permissions" msgstr "" @@ -520,6 +520,10 @@ msgid "" "are not correctly listed below." msgstr "" +#: xl_auth/templates/users/profile.html:34 +msgid "Permissions (Active Collections Only)" +msgstr "" + #: xl_auth/templates/users/register.html:5 msgid "Register New User" msgstr "" diff --git a/xl_auth/templates/users/profile.html b/xl_auth/templates/users/profile.html index de814e3f..ccd3b91f 100644 --- a/xl_auth/templates/users/profile.html +++ b/xl_auth/templates/users/profile.html @@ -31,7 +31,7 @@

      {{ _('Important') }}!

      -

      {{ _('Permissions') }}

      +

      {{ _('Permissions (Active Collections Only)') }}

      @@ -45,7 +45,7 @@

      {{ _('Permissions') }}

      - {% for permission in user.permissions %} + {% for permission in user.permissions if permission.collection.active %} diff --git a/xl_auth/translations/sv/LC_MESSAGES/messages.po b/xl_auth/translations/sv/LC_MESSAGES/messages.po index 69db42e0..a9d75393 100644 --- a/xl_auth/translations/sv/LC_MESSAGES/messages.po +++ b/xl_auth/translations/sv/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2.1\n" "Report-Msgid-Bugs-To: mats.blomdahl@gmail.com\n" -"POT-Creation-Date: 2017-10-24 05:43+0200\n" +"POT-Creation-Date: 2017-10-24 06:02+0200\n" "PO-Revision-Date: 2017-09-19 12:23+0200\n" "Last-Translator: Mats Blomdahl \n" "Language: sv\n" @@ -23,7 +23,7 @@ msgstr "" #: tests/end2end/test_editing_permission.py:91 tests/end2end/test_editing_user.py:183 #: tests/end2end/test_registering_permission.py:25 tests/end2end/test_registering_permission.py:58 #: tests/end2end/test_registering_permission.py:85 xl_auth/templates/nav.html:28 -#: xl_auth/templates/permissions/home.html:4 xl_auth/templates/users/profile.html:34 +#: xl_auth/templates/permissions/home.html:4 msgid "Permissions" msgstr "Behörigheter" @@ -525,6 +525,10 @@ msgstr "" "Kontakta omgående kundservice på libris@kb.se för rättning " "ifall dina behörigheter inte är 100 %% korrekt listade." +#: xl_auth/templates/users/profile.html:34 +msgid "Permissions (Active Collections Only)" +msgstr "Behörigheter på aktiva samlingar/sigler" + #: xl_auth/templates/users/register.html:5 msgid "Register New User" msgstr "Registrera ny användare" From 83a39f4b68f72239d40f960c517cce999c15dd97 Mon Sep 17 00:00:00 2001 From: Mats Blomdahl Date: Tue, 24 Oct 2017 06:37:51 +0200 Subject: [PATCH 14/17] Update `/about/` page to show current version + link to GitHub releases overview --- README.rst | 4 +++- messages.pot | 10 +++++++++- xl_auth/public/views.py | 5 ++--- xl_auth/templates/public/about.html | 8 +++++++- xl_auth/translations/sv/LC_MESSAGES/messages.po | 13 ++++++++++++- 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index bb915f02..6d95f102 100644 --- a/README.rst +++ b/README.rst @@ -186,7 +186,9 @@ Changelog v. 0.4.3 -------- -* Personalized user icons (Gravatar) +* Personalized user icons (Gravatar, `#70 `_) +* Updated `/about/` page with current version number + links + (`#71 `_) v. 0.4.2 diff --git a/messages.pot b/messages.pot index a600289e..00c22c42 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xl_auth 0.4.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-24 06:02+0200\n" +"POT-Creation-Date: 2017-10-24 06:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -438,6 +438,14 @@ msgid "" "href=\"https://github.com/libris/xl_auth/issues\">GitHub repo for ongoing progress." msgstr "" +#: xl_auth/templates/public/about.html:13 +#, python-format +msgid "" +"Current release version is %(version)s. Please check out the releases overview page for recent " +"changes." +msgstr "" + #: xl_auth/templates/public/home.html:8 msgid "Welcome to xl_auth" msgstr "" diff --git a/xl_auth/public/views.py b/xl_auth/public/views.py index 50292e99..9349a77f 100644 --- a/xl_auth/public/views.py +++ b/xl_auth/public/views.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, division, print_function, unicode_literals -from flask import Blueprint, flash, redirect, render_template, request, url_for +from flask import Blueprint, current_app, flash, redirect, render_template, request, url_for from flask_babel import lazy_gettext as _ from flask_login import login_required, login_user, logout_user @@ -49,5 +49,4 @@ def logout(): @blueprint.route('/about/') def about(): """About page.""" - login_form = LoginForm(request.form) - return render_template('public/about.html', login_form=login_form) + return render_template('public/about.html', version=current_app.config['APP_VERSION']) diff --git a/xl_auth/templates/public/about.html b/xl_auth/templates/public/about.html index 828eb3a7..7fc611be 100644 --- a/xl_auth/templates/public/about.html +++ b/xl_auth/templates/public/about.html @@ -6,7 +6,13 @@

      {{ _('About') }}

      - {{ _('Under construction. Please refer to our GitHub repo for ongoing progress.') }} + {{ _('Under construction. Please refer to our GitHub repo for ongoing progress.') }} +

      +

      + {{ _('Current release version is %(version)s. Please check out \ +the releases overview page for \ +recent changes.', version=version) }}

      diff --git a/xl_auth/translations/sv/LC_MESSAGES/messages.po b/xl_auth/translations/sv/LC_MESSAGES/messages.po index a9d75393..6ebb7f51 100644 --- a/xl_auth/translations/sv/LC_MESSAGES/messages.po +++ b/xl_auth/translations/sv/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2.1\n" "Report-Msgid-Bugs-To: mats.blomdahl@gmail.com\n" -"POT-Creation-Date: 2017-10-24 06:02+0200\n" +"POT-Creation-Date: 2017-10-24 06:34+0200\n" "PO-Revision-Date: 2017-09-19 12:23+0200\n" "Last-Translator: Mats Blomdahl \n" "Language: sv\n" @@ -441,6 +441,17 @@ msgstr "" "Tjänsten är under konstruktion. Vänligen se vårt GitHub-repo för löpande utveckling." +#: xl_auth/templates/public/about.html:13 +#, python-format +msgid "" +"Current release version is %(version)s. Please check out the releases overview page for recent " +"changes." +msgstr "" +"Detta är version %(version)s. Se release-översikten på GitHub för info om " +"ändringar mellan olika versioner." + #: xl_auth/templates/public/home.html:8 msgid "Welcome to xl_auth" msgstr "Välkommen till Libris Login" From 2dafaec32be680ba1ad1e03b2bdcbc8b50786f10 Mon Sep 17 00:00:00 2001 From: Mats Blomdahl Date: Tue, 24 Oct 2017 06:54:06 +0200 Subject: [PATCH 15/17] Help text explaining what a "Cataloging Admin" is/does --- messages.pot | 26 ++++++++++------- xl_auth/templates/users/profile.html | 2 ++ .../translations/sv/LC_MESSAGES/messages.po | 29 ++++++++++++------- 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/messages.pot b/messages.pot index 00c22c42..a4782713 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xl_auth 0.4.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-24 06:34+0200\n" +"POT-Creation-Date: 2017-10-24 06:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgstr "" #: tests/end2end/test_editing_collection.py:80 tests/end2end/test_registering_collection.py:79 #: xl_auth/collection/forms.py:17 xl_auth/templates/collections/home.html:21 -#: xl_auth/templates/collections/home.html:65 xl_auth/templates/users/profile.html:40 +#: xl_auth/templates/collections/home.html:65 xl_auth/templates/users/profile.html:42 msgid "Code" msgstr "" @@ -115,16 +115,16 @@ msgstr "" #: tests/end2end/test_editing_user.py:45 xl_auth/templates/permissions/home.html:30 #: xl_auth/templates/permissions/home.html:31 xl_auth/templates/permissions/home.html:32 #: xl_auth/templates/users/home.html:33 xl_auth/templates/users/home.html:76 -#: xl_auth/templates/users/profile.html:53 xl_auth/templates/users/profile.html:56 -#: xl_auth/templates/users/profile.html:59 +#: xl_auth/templates/users/profile.html:55 xl_auth/templates/users/profile.html:58 +#: xl_auth/templates/users/profile.html:61 msgid "Yes" msgstr "" #: tests/end2end/test_editing_user.py:45 xl_auth/templates/permissions/home.html:30 #: xl_auth/templates/permissions/home.html:31 xl_auth/templates/permissions/home.html:32 #: xl_auth/templates/users/home.html:33 xl_auth/templates/users/home.html:76 -#: xl_auth/templates/users/profile.html:53 xl_auth/templates/users/profile.html:56 -#: xl_auth/templates/users/profile.html:59 +#: xl_auth/templates/users/profile.html:55 xl_auth/templates/users/profile.html:58 +#: xl_auth/templates/users/profile.html:61 msgid "No" msgstr "" @@ -295,17 +295,17 @@ msgid "Collection" msgstr "" #: xl_auth/permission/forms.py:22 xl_auth/templates/permissions/home.html:18 -#: xl_auth/templates/users/profile.html:42 +#: xl_auth/templates/users/profile.html:44 msgid "Registrant" msgstr "" #: xl_auth/permission/forms.py:23 xl_auth/templates/permissions/home.html:19 -#: xl_auth/templates/users/profile.html:43 +#: xl_auth/templates/users/profile.html:45 msgid "Cataloger" msgstr "" #: xl_auth/permission/forms.py:24 xl_auth/templates/permissions/home.html:20 -#: xl_auth/templates/users/profile.html:44 +#: xl_auth/templates/users/profile.html:46 msgid "Cataloguing Administrator" msgstr "" @@ -390,7 +390,7 @@ msgid "Active Collections" msgstr "" #: xl_auth/templates/collections/home.html:22 xl_auth/templates/collections/home.html:66 -#: xl_auth/templates/users/profile.html:41 +#: xl_auth/templates/users/profile.html:43 msgid "Friendly Name" msgstr "" @@ -532,6 +532,12 @@ msgstr "" msgid "Permissions (Active Collections Only)" msgstr "" +#: xl_auth/templates/users/profile.html:35 +msgid "" +"Note: Cataloguing Admin is a new privilege that, in the tear future, will allow you to " +"create new user accounts and grant registrant/cataloger privileges to others. " +msgstr "" + #: xl_auth/templates/users/register.html:5 msgid "Register New User" msgstr "" diff --git a/xl_auth/templates/users/profile.html b/xl_auth/templates/users/profile.html index ccd3b91f..389e3c1b 100644 --- a/xl_auth/templates/users/profile.html +++ b/xl_auth/templates/users/profile.html @@ -32,6 +32,8 @@

      {{ _('Important') }}!

      {{ _('Permissions (Active Collections Only)') }}

      +

      {{ _('Note: Cataloguing Admin is a new privilege that, in the tear future, \ +will allow you to create new user accounts and grant registrant/cataloger privileges to others. ') }}

      {{ permission.collection.code }} {{ permission.collection.friendly_name }}
      diff --git a/xl_auth/translations/sv/LC_MESSAGES/messages.po b/xl_auth/translations/sv/LC_MESSAGES/messages.po index 6ebb7f51..29753e8c 100644 --- a/xl_auth/translations/sv/LC_MESSAGES/messages.po +++ b/xl_auth/translations/sv/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2.1\n" "Report-Msgid-Bugs-To: mats.blomdahl@gmail.com\n" -"POT-Creation-Date: 2017-10-24 06:34+0200\n" +"POT-Creation-Date: 2017-10-24 06:53+0200\n" "PO-Revision-Date: 2017-09-19 12:23+0200\n" "Last-Translator: Mats Blomdahl \n" "Language: sv\n" @@ -55,7 +55,7 @@ msgstr "Kategori saknas" #: tests/end2end/test_editing_collection.py:80 tests/end2end/test_registering_collection.py:79 #: xl_auth/collection/forms.py:17 xl_auth/templates/collections/home.html:21 -#: xl_auth/templates/collections/home.html:65 xl_auth/templates/users/profile.html:40 +#: xl_auth/templates/collections/home.html:65 xl_auth/templates/users/profile.html:42 msgid "Code" msgstr "Kod" @@ -116,16 +116,16 @@ msgstr "Användare" #: tests/end2end/test_editing_user.py:45 xl_auth/templates/permissions/home.html:30 #: xl_auth/templates/permissions/home.html:31 xl_auth/templates/permissions/home.html:32 #: xl_auth/templates/users/home.html:33 xl_auth/templates/users/home.html:76 -#: xl_auth/templates/users/profile.html:53 xl_auth/templates/users/profile.html:56 -#: xl_auth/templates/users/profile.html:59 +#: xl_auth/templates/users/profile.html:55 xl_auth/templates/users/profile.html:58 +#: xl_auth/templates/users/profile.html:61 msgid "Yes" msgstr "Ja" #: tests/end2end/test_editing_user.py:45 xl_auth/templates/permissions/home.html:30 #: xl_auth/templates/permissions/home.html:31 xl_auth/templates/permissions/home.html:32 #: xl_auth/templates/users/home.html:33 xl_auth/templates/users/home.html:76 -#: xl_auth/templates/users/profile.html:53 xl_auth/templates/users/profile.html:56 -#: xl_auth/templates/users/profile.html:59 +#: xl_auth/templates/users/profile.html:55 xl_auth/templates/users/profile.html:58 +#: xl_auth/templates/users/profile.html:61 msgid "No" msgstr "Nej" @@ -296,17 +296,17 @@ msgid "Collection" msgstr "Samling" #: xl_auth/permission/forms.py:22 xl_auth/templates/permissions/home.html:18 -#: xl_auth/templates/users/profile.html:42 +#: xl_auth/templates/users/profile.html:44 msgid "Registrant" msgstr "Beståndsregistrerare" #: xl_auth/permission/forms.py:23 xl_auth/templates/permissions/home.html:19 -#: xl_auth/templates/users/profile.html:43 +#: xl_auth/templates/users/profile.html:45 msgid "Cataloger" msgstr "Katalogisatör" #: xl_auth/permission/forms.py:24 xl_auth/templates/permissions/home.html:20 -#: xl_auth/templates/users/profile.html:44 +#: xl_auth/templates/users/profile.html:46 msgid "Cataloguing Administrator" msgstr "Katalogiseringsadmin" @@ -391,7 +391,7 @@ msgid "Active Collections" msgstr "Aktiva samlingar" #: xl_auth/templates/collections/home.html:22 xl_auth/templates/collections/home.html:66 -#: xl_auth/templates/users/profile.html:41 +#: xl_auth/templates/users/profile.html:43 msgid "Friendly Name" msgstr "Namn" @@ -540,6 +540,15 @@ msgstr "" msgid "Permissions (Active Collections Only)" msgstr "Behörigheter på aktiva samlingar/sigler" +#: xl_auth/templates/users/profile.html:35 +msgid "" +"Note: Cataloguing Admin is a new privilege that, in the tear future, will allow you to " +"create new user accounts and grant registrant/cataloger privileges to others. " +msgstr "" +"Obs: Katalogiseringsadmin är en behörighet som (inom en snar framtid) kommer ge dig " +"rättigheter för att skapa nya användare. På dina samlingar/sigler kommer du kunna tilldela " +"behörigheter till andra som beståndregistrerare/katalogisatörer." + #: xl_auth/templates/users/register.html:5 msgid "Register New User" msgstr "Registrera ny användare" From cb2e63843ce8d2ce4b39b0aa996611704c54f63c Mon Sep 17 00:00:00 2001 From: Mats Blomdahl Date: Tue, 24 Oct 2017 07:12:01 +0200 Subject: [PATCH 16/17] Changelog update; Only list permissions on active collections on ``/users/profile/`` page --- README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 6d95f102..057db723 100644 --- a/README.rst +++ b/README.rst @@ -187,8 +187,9 @@ v. 0.4.3 -------- * Personalized user icons (Gravatar, `#70 `_) -* Updated `/about/` page with current version number + links +* Updated ``/about/`` page with current version number + links (`#71 `_) +* Only list permissions on active collections on ``/users/profile/`` page v. 0.4.2 From 476195eb00c86b473f36850e670f77d999eeeacd Mon Sep 17 00:00:00 2001 From: Mats Blomdahl Date: Tue, 24 Oct 2017 08:24:29 +0200 Subject: [PATCH 17/17] s/tear/near/ --- xl_auth/templates/users/profile.html | 2 +- xl_auth/translations/sv/LC_MESSAGES/messages.po | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xl_auth/templates/users/profile.html b/xl_auth/templates/users/profile.html index 389e3c1b..df760ef0 100644 --- a/xl_auth/templates/users/profile.html +++ b/xl_auth/templates/users/profile.html @@ -32,7 +32,7 @@

      {{ _('Important') }}!

      {{ _('Permissions (Active Collections Only)') }}

      -

      {{ _('Note: Cataloguing Admin is a new privilege that, in the tear future, \ +

      {{ _('Note: Cataloguing Admin is a new privilege that, in the near future, \ will allow you to create new user accounts and grant registrant/cataloger privileges to others. ') }}

      diff --git a/xl_auth/translations/sv/LC_MESSAGES/messages.po b/xl_auth/translations/sv/LC_MESSAGES/messages.po index 29753e8c..8588b2e9 100644 --- a/xl_auth/translations/sv/LC_MESSAGES/messages.po +++ b/xl_auth/translations/sv/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2.1\n" "Report-Msgid-Bugs-To: mats.blomdahl@gmail.com\n" -"POT-Creation-Date: 2017-10-24 06:53+0200\n" +"POT-Creation-Date: 2017-10-24 08:23+0200\n" "PO-Revision-Date: 2017-09-19 12:23+0200\n" "Last-Translator: Mats Blomdahl \n" "Language: sv\n" @@ -542,7 +542,7 @@ msgstr "Behörigheter på aktiva samlingar/sigler" #: xl_auth/templates/users/profile.html:35 msgid "" -"Note: Cataloguing Admin is a new privilege that, in the tear future, will allow you to " +"Note: Cataloguing Admin is a new privilege that, in the near future, will allow you to " "create new user accounts and grant registrant/cataloger privileges to others. " msgstr "" "Obs: Katalogiseringsadmin är en behörighet som (inom en snar framtid) kommer ge dig "