diff --git a/ivatar/ivataraccount/templates/_import_photo_form.html b/ivatar/ivataraccount/templates/_import_photo_form.html index 9d91493..7fb5f3b 100644 --- a/ivatar/ivataraccount/templates/_import_photo_form.html +++ b/ivatar/ivataraccount/templates/_import_photo_form.html @@ -12,23 +12,24 @@ {% endif %}
{% for photo in photos %} -
-
-

- - -

-
-
- {{ photo.service_name }} image -
-
-
+
+
+

+ + +

+
+
+
+ {{ photo.service_name }} image +
+
+
{% endfor %}

diff --git a/ivatar/ivataraccount/templates/assign_photo_email.html b/ivatar/ivataraccount/templates/assign_photo_email.html index 9ca1b2d..3f1163c 100644 --- a/ivatar/ivataraccount/templates/assign_photo_email.html +++ b/ivatar/ivataraccount/templates/assign_photo_email.html @@ -17,34 +17,29 @@ outline: inherit;

{% blocktrans with email.email as email_address %}Choose a photo for {{ email_address }}{% endblocktrans %}

-{% if not user.photo_set.count %} +{% if user.photo_set.count %} +

{% trans 'Here are the pictures you have uploaded, click on the one you wish to associate with this email address:' %}

+
+ {% for photo in user.photo_set.all %} +
{% csrf_token %} + + +
+ {% endfor %} +{% endif %} -{% url 'upload_photo' as upload_url %} -

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

- -

{% trans 'Back to your profile' %}

- -{% else %} - -

{% trans 'Here are the pictures you have uploaded, click on the one you wish to associate with this email address:' %}

-{% for photo in user.photo_set.all %} -
{% csrf_token %} - - -
-{% endfor %}
{% csrf_token %}
-
-{% blocktrans %}Upload a new one{% endblocktrans %}   -{% blocktrans %}Import from other services{% endblocktrans %} -
-
{% csrf_token %} -
- - {% if email.bluesky_handle %} - - {% else %} - - {% endif %} +
+
+ {% blocktrans %}Upload a new one{% endblocktrans %}   + {% blocktrans %}Import from other services{% endblocktrans %}
- - -{% endif %} +
+
{% csrf_token %} +
+ + {% if email.bluesky_handle %} + + {% else %} + + {% endif %} +
+ +
+
+
+
{% endblock content %} diff --git a/ivatar/ivataraccount/templates/assign_photo_openid.html b/ivatar/ivataraccount/templates/assign_photo_openid.html index 6595347..74088be 100644 --- a/ivatar/ivataraccount/templates/assign_photo_openid.html +++ b/ivatar/ivataraccount/templates/assign_photo_openid.html @@ -18,64 +18,65 @@ outline: inherit;

{% blocktrans with openid.openid as openid_address %}Choose a photo for {{ openid_address }}{% endblocktrans %}

{% if not user.photo_set.count %} - -{% url 'upload_photo' as upload_url %} -

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

- -

{% trans 'Back to your profile' %}

- -{% else %} - -

{% trans 'Here are the pictures you have uploaded, click on the one you wish to associate with this openid address:' %}

-
-{% for photo in user.photo_set.all %} -
{% csrf_token %} - - -
-{% endfor %} -
{% csrf_token %} - -
-
-
-{% blocktrans %}upload a new one{% endblocktrans %} - -
-
{% csrf_token %} -
- - {% if openid.bluesky_handle %} - - {% else %} - - {% endif %} +

{% trans 'Here are the pictures you have uploaded, click on the one you wish to associate with this openid address:' %}

+
+ {% for photo in user.photo_set.all %} + {% csrf_token %} + + - +
+
+ +
+
+
+ + + {% endfor %} {% endif %} + +
+
{% csrf_token %} + +
+
+ +
+
+ {% blocktrans %}upload a new one{% endblocktrans %} + {% blocktrans %}Import from other services{% endblocktrans %} +
+ +
+
{% csrf_token %} +
+ + {% if openid.bluesky_handle %} + + {% else %} + + {% endif %} +
+ +
+
+ +
{% endblock content %} diff --git a/ivatar/ivataraccount/templates/import_photo.html b/ivatar/ivataraccount/templates/import_photo.html index 149a662..f90a39c 100644 --- a/ivatar/ivataraccount/templates/import_photo.html +++ b/ivatar/ivataraccount/templates/import_photo.html @@ -5,37 +5,37 @@ {% block content %}

{% trans 'Import photo' %}

{% if not email_id %} -
-
-
- - -
-
- -
-
- -
+
+
+
+ + +
+
+ +
+
+ +
{% endif %} {% include '_import_photo_form.html' %}