external-repos/ivatar
1
0
Fork 0
mirror of https://git.linux-kernel.at/oliver/ivatar.git synced 2025-11-17 13:38:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into 'master'

Browse Source 
Merge in devel branch

See merge request oliver/ivatar!23
This commit is contained in:
Oliver Falk
2018-07-05 12:52:45 +02:00
parent 10c97f272b 469ff6dbab
commit f4803536f0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ivatar/ivataraccount/templates/profile.html
View File

@@ -55,7 +55,7 @@
{% endfor %} {% endfor %}
{% for openid in user.unconfirmedopenid_set.all %} {% for openid in user.unconfirmedopenid_set.all %}
<li><form action="{% url 'remove_unconfirmed_openid' openid.id %}" method="post">{% csrf_token %}{{ openid.openid }} <li><form action="{% url 'remove_unconfirmed_openid' openid.id %}" method="post">{% csrf_token %}{{ openid.openid }}
<input type="image" src="{% static '/static/img/delete_button.png' %}" value="{% trans 'Remove' %}"></form>{# TODO: (expires in xx hours) #}</li> <input type="image" src="{% static '/img/delete_button.png' %}" value="{% trans 'Remove' %}"></form>{# TODO: (expires in xx hours) #}</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
@@ -72,7 +72,7 @@
<p>{% trans 'Here are the photos you have uploaded/imported:' %}</p> <p>{% trans 'Here are the photos you have uploaded/imported:' %}</p>
<ul class="horizontal-list avatar-list centered"> <ul class="horizontal-list avatar-list centered">
{% for photo in user.photo_set.all %} {% for photo in user.photo_set.all %}
<li><img class="thumbnail" src="{% url 'raw_image' photo.id %}" title="{% blocktrans with photo.add_date as datetime %}Uploaded on {{ datetime }}{% endblocktrans %}" alt="{% blocktrans with photo.add_date as datetime %}Uploaded on {{ datetime }}{% endblocktrans %}"><br> <li><a href="{% url 'raw_image' photo.id %}"><img class="thumbnail" src="{% url 'raw_image' photo.id %}" title="{% blocktrans with photo.add_date as datetime %}Uploaded on {{ datetime }}{% endblocktrans %}" alt="{% blocktrans with photo.add_date as datetime %}Uploaded on {{ datetime }}{% endblocktrans %}"></a><br>
<a href="{% url 'delete_photo' photo.id %}">{% trans 'Delete' %}</a></li> <a href="{% url 'delete_photo' photo.id %}">{% trans 'Delete' %}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>

4
ivatar/ivataraccount/views.py
View File

@@ -374,7 +374,9 @@ class AddOpenIDView(SuccessMessageMixin, FormView):
if not openid_id: if not openid_id:
return render(self.request, self.template_name, {'form': form}) return render(self.request, self.template_name, {'form': form})
else: else:
messages.success(self.request, _('ID added successfully')) # At this point we have an unconfirmed OpenID, but
# we do not add the message, that we successfully added it,
# since this is misleading
return HttpResponseRedirect( return HttpResponseRedirect(
reverse_lazy('openid_redirection', args=[openid_id])) reverse_lazy('openid_redirection', args=[openid_id]))