diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index edb456d..854773c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ -image: docker.io/ofalk/fedora28-python3 +image: docker.io/ofalk/fedora31-python3 before_script: - - virtualenv-3 -p python3 /tmp/.virtualenv + - virtualenv -p python3 /tmp/.virtualenv - source /tmp/.virtualenv/bin/activate - pip install Pillow - pip install -r requirements.txt diff --git a/README.md b/README.md index 20995ca..0dfd8b7 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,13 @@ Authors and contributors ======================== Lead developer/Owner: Oliver Falk (aka ofalk or falko) - https://git.linux-kernel.at/oliver + Operations: Michal Novotny (aka clime) + QA: Tristan Le Guern (aka tleguern) -Frontend developer: Niklas Poslovski (aka nipos) + +Frontend developer: Lukas Schönsgibl (aka hybridpicker), Niklas Poslovski (aka nipos) + Organisation/Meeting moderation: Lars Kruse (aka sumpfralle) Initial developer: François Marier - https://fmarier.org/ diff --git a/config.py b/config.py index 71207dc..fecce2d 100644 --- a/config.py +++ b/config.py @@ -52,7 +52,7 @@ OPENID_CREATE_USERS = True OPENID_UPDATE_DETAILS_FROM_SREG = True SITE_NAME = os.environ.get('SITE_NAME', 'libravatar') -IVATAR_VERSION = '1.1' +IVATAR_VERSION = '1.2' SECURE_BASE_URL = os.environ.get('SECURE_BASE_URL', 'https://avatars.linux-kernel.at/avatar/') BASE_URL = os.environ.get('BASE_URL', 'http://avatars.linux-kernel.at/avatar/') diff --git a/ivatar/ivataraccount/models.py b/ivatar/ivataraccount/models.py index e4fc338..64a2265 100644 --- a/ivatar/ivataraccount/models.py +++ b/ivatar/ivataraccount/models.py @@ -180,7 +180,7 @@ class Photo(BaseAccountModel): # Testing? Ideas anyone? except Exception as exc: # pylint: disable=broad-except # For debugging only - print('Exception caught: %s' % exc) + print('Exception caught in Photo.save(): %s' % exc) return False self.format = file_format(img.format) if not self.format: diff --git a/ivatar/ivataraccount/templates/_import_photo_form.html b/ivatar/ivataraccount/templates/_import_photo_form.html index ef950e4..9d91493 100644 --- a/ivatar/ivataraccount/templates/_import_photo_form.html +++ b/ivatar/ivataraccount/templates/_import_photo_form.html @@ -32,7 +32,7 @@ {% endfor %}

- +

{% endif %} diff --git a/ivatar/ivataraccount/templates/add_email.html b/ivatar/ivataraccount/templates/add_email.html index 2f7e96b..1b17f79 100644 --- a/ivatar/ivataraccount/templates/add_email.html +++ b/ivatar/ivataraccount/templates/add_email.html @@ -25,7 +25,7 @@ - + diff --git a/ivatar/ivataraccount/templates/add_openid.html b/ivatar/ivataraccount/templates/add_openid.html index 760be38..f720bad 100644 --- a/ivatar/ivataraccount/templates/add_openid.html +++ b/ivatar/ivataraccount/templates/add_openid.html @@ -20,7 +20,7 @@ - + diff --git a/ivatar/ivataraccount/templates/assign_photo_email.html b/ivatar/ivataraccount/templates/assign_photo_email.html index 1fcfab9..29968fe 100644 --- a/ivatar/ivataraccount/templates/assign_photo_email.html +++ b/ivatar/ivataraccount/templates/assign_photo_email.html @@ -22,7 +22,7 @@ outline: inherit; {% url 'upload_photo' as upload_url %}

{% blocktrans %}You need to upload some photos first!{% endblocktrans %}

-

{% trans 'Back to your profile' %}

+

{% trans 'Back to your profile' %}

{% else %} @@ -61,8 +61,8 @@ outline: inherit;
- {% blocktrans %}Upload a new one{% endblocktrans %}   - {% blocktrans %}Import from other services{% endblocktrans %} + {% blocktrans %}Upload a new one{% endblocktrans %}   + {% blocktrans %}Import from other services{% endblocktrans %} {% endif %}
{% endblock content %} diff --git a/ivatar/ivataraccount/templates/assign_photo_openid.html b/ivatar/ivataraccount/templates/assign_photo_openid.html index 28bf7b3..54a40b7 100644 --- a/ivatar/ivataraccount/templates/assign_photo_openid.html +++ b/ivatar/ivataraccount/templates/assign_photo_openid.html @@ -22,7 +22,7 @@ outline: inherit; {% url 'upload_photo' as upload_url %}

{% blocktrans %}You need to upload some photos first!{% endblocktrans %}

-

{% trans 'Back to your profile' %}

+

{% trans 'Back to your profile' %}

{% else %} @@ -61,7 +61,7 @@ outline: inherit;
-{% blocktrans %}upload a new one{% endblocktrans %} +{% blocktrans %}upload a new one{% endblocktrans %} {% endif %}
diff --git a/ivatar/ivataraccount/templates/choose_libravatar_export.html b/ivatar/ivataraccount/templates/choose_libravatar_export.html index 3d1b7e1..76ba0ef 100644 --- a/ivatar/ivataraccount/templates/choose_libravatar_export.html +++ b/ivatar/ivataraccount/templates/choose_libravatar_export.html @@ -48,7 +48,7 @@ input[type=checkbox].image:checked + label:before {letter-spacing: 3px} {% endif %}

- +

diff --git a/ivatar/ivataraccount/templates/crop_photo.html b/ivatar/ivataraccount/templates/crop_photo.html index d6874a0..7a756ef 100644 --- a/ivatar/ivataraccount/templates/crop_photo.html +++ b/ivatar/ivataraccount/templates/crop_photo.html @@ -24,7 +24,9 @@
- + +   + {% trans 'Skip cropping' %}
diff --git a/ivatar/ivataraccount/templates/delete.html b/ivatar/ivataraccount/templates/delete.html index d0d55b6..b451b6d 100644 --- a/ivatar/ivataraccount/templates/delete.html +++ b/ivatar/ivataraccount/templates/delete.html @@ -27,7 +27,7 @@   - + diff --git a/ivatar/ivataraccount/templates/import_photo.html b/ivatar/ivataraccount/templates/import_photo.html index 39b4083..149a662 100644 --- a/ivatar/ivataraccount/templates/import_photo.html +++ b/ivatar/ivataraccount/templates/import_photo.html @@ -25,7 +25,7 @@ input[type=checkbox]:checked + label:before {letter-spacing: 3px}
- +
{% if user.is_authenticated %} {% if user.userpreference and user.userpreference.theme != 'default' %} @@ -30,7 +36,7 @@ {% endwith %} {% endif %} {% endif %} - + diff --git a/templates/home.html b/templates/home.html index 84ad794..c322e51 100644 --- a/templates/home.html +++ b/templates/home.html @@ -9,76 +9,82 @@ {% url 'new_account' as new_account_url %}
-
-
-

{{ site_name }}

-

{% trans 'freeing the web one face at a time' %}

-{% if user.is_anonymous %} -{% trans 'Login' %}  -{% trans 'Sign up' %}  -{% else %} -
+
+
+

{{ site_name }}

+

{% trans 'freeing the web one face at a time' %}

+ {% if user.is_anonymous %} + {% trans 'Login' %}  + {% trans 'Sign up' %}  + {% else %} +
+
  • {% trans 'Profile' %}
    • +
  • {% trans 'Preferences' %}
    • +
  • {% trans 'Import photo via mail address' %}
    • +
  • {% trans 'Import libravatar XML export' %}
    • +
  • {% trans 'Change password' %}
    • +
  • {% trans 'Reset password' %}
    • +
  • {% trans 'Logout' %}
    • + {% if user.is_staff %} +
  • + {% trans 'Admin' %} +
    • + {% endif %} + +
    + {% endif %} +  {% trans 'Check' %}  +
    +
    -{% endif %} - {% trans 'Check' %}  -
    -
    -
    -
    -
    -
    -
    -

    {% trans 'The open avatar service' %}

    -

    {% blocktrans %}{{ site_name }} is a service which delivers your avatar (profile picture) to other websites. If you create an account with us, your photo could start popping up next to forum posts or blog comments on any site where you left your email address.{% endblocktrans %}
    -{% trans 'Read more...' %}

    -
    -
    -
    -
    -

    {% trans 'Federated Open Source Service' %}

    -

    {% trans 'This service is powered by Free and Open Source software called ivatar. With this software you can also run your own instance and serve avatars yourself.' %}

    -
    -

    {% trans 'Simple API for Developers' %}

    -

    {% trans 'Application developers can easily add support for this service using our simple API or one of the libraries and plugins available for a number of platforms and languages.' %}

    -
    -{% trans 'Contribute' %} -
    -
    -

    Useful links

    -{% trans 'Contact us' %}
    -{% trans 'Security' %}
    -{% trans 'Source code' %}
    -{% trans 'Report bugs' %}
    -{% trans 'Questions' %}
    -{% trans 'Wiki' %}
    -{% trans 'Blog' %}
    -

    {% trans 'Social media' %}

    -Mastodon
    -Identica
    -Twitter
    -
    -
    -
    -

    {% trans 'Big thanks to our sponsors without whom none of this would be possible!' %}

    -{% trans 'Fedora Logo' %} -
    -
    -{% endblock %} +
    +
    +

    {% trans 'The open avatar service' %}

    +

    {% blocktrans %}{{ site_name }} is a service which delivers your avatar (profile picture) to other websites. If you create an account with us, your photo could start popping up next to forum posts or blog comments on any site where you left your email address.{% endblocktrans %}
    + {% trans 'Read more...' %}

    +
    +
    + +
    +
    + +

    {% trans 'Federated Open Source Service' %}

    +

    {% trans 'This service is powered by Free and Open Source software called ivatar. With this software you can also run your own instance and serve avatars yourself.' %}

    +
    +

    {% trans 'Simple API for Developers' %}

    +

    {% trans 'Application developers can easily add support for this service using our simple API or one of the libraries and plugins available for a number of platforms and languages.' %}

    +
    + {% trans 'Contribute' %} + + +
    +
    +

    Useful links

    + {% trans 'Contact us' %}
    + {% trans 'Security' %}
    + {% trans 'Source code' %}
    + {% trans 'Report bugs' %}
    + {% trans 'Questions' %}
    + {% trans 'Wiki' %}
    + {% trans 'Blog' %}
    + +
    +
    +

    {% trans 'Social media' %}

    + Mastodon
    + Identica
    + Twitter
    + +
    +
    +
    +

    {% trans 'Big thanks to our sponsors without whom none of this would be possible!' %}

    + {% trans 'Fedora Logo' %} +
    + + {% endblock %} diff --git a/templates/maintenance.html b/templates/maintenance.html new file mode 100644 index 0000000..47e3dfa --- /dev/null +++ b/templates/maintenance.html @@ -0,0 +1,30 @@ +{% extends 'base_home.html' %} +{% load i18n %} +{% load static %} + +{% block title %}{% trans 'federated avatar hosting service' %}{% endblock %} + +{% block content %} + +
    +
    +
    +

    {{ site_name }}

    +

    {% trans 'freeing the web one face at a time' %}

    +
    +
    +
    +
    +
    +
    +

    {% trans 'Maintenance mode' %}

    + Libravatar is currently in maintenance mode.
    + Avatars are still served, but all write operations may result + in loss of these changes. +

    +
    +
    +
    +
    + +{% endblock %} diff --git a/templates/navbar.html b/templates/navbar.html index 7179a25..b95673f 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -1,13 +1,10 @@ {% load i18n %} {% block topbar_base %} -