Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin
This commit is contained in:
commit
1f8c877d74
@ -53,7 +53,7 @@
|
||||
{% set blog_delete_url = request.urlgen('mediagoblin.media_types.blog.blog_delete',
|
||||
blog_slug=blog.slug,
|
||||
user=request.user.username) %}
|
||||
<a class="button_action" href="{{ blog_delete_url }}">
|
||||
<a class="button_action button_warning" href="{{ blog_delete_url }}">
|
||||
{%- trans %}Delete Blog{% endtrans -%}
|
||||
</a>
|
||||
</p>
|
||||
@ -90,7 +90,7 @@
|
||||
media_id=blog_post.id) %}
|
||||
<td>
|
||||
<a class="button_action" href="{{ blogpost_edit_url }}">{% trans %}Edit{% endtrans %}</a>
|
||||
<a class="button_action" href="{{ blogpost_delete_url }}">{% trans %}Delete{% endtrans %}</a>
|
||||
<a class="button_action button_warning" href="{{ blogpost_delete_url }}">{% trans %}Delete{% endtrans %}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
@ -33,7 +33,7 @@
|
||||
user= blogpost.get_actor.username,
|
||||
media_id=blogpost.id) %}
|
||||
<a class="button_action" href="{{ blogpost_edit_url }}">{% trans %}Edit{% endtrans %}</a>
|
||||
<a class="button_action" href="{{ blogpost_delete_url }}">{% trans %}Delete{% endtrans %}</a>
|
||||
<a class="button_action button_warning" href="{{ blogpost_delete_url }}">{% trans %}Delete{% endtrans %}</a>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
@ -77,7 +77,7 @@
|
||||
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
|
||||
user= media.get_actor.username,
|
||||
media_id=media.id) %}
|
||||
<a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
|
||||
<a class="button_action button_warning" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
|
||||
|
||||
{% endif %}
|
||||
</br>
|
||||
@ -165,8 +165,6 @@
|
||||
|
||||
{% include "mediagoblin/utils/license.html" %}
|
||||
|
||||
{% include "mediagoblin/utils/exif.html" %}
|
||||
|
||||
{% template_hook("media_sideinfo") %}
|
||||
|
||||
{% block mediagoblin_sidebar %}
|
||||
|
Loading…
x
Reference in New Issue
Block a user