heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin

Browse Source
This commit is contained in:
Boris Bobrov 2017-06-26 21:32:56 +03:00
commit 1f8c877d74
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html
View File

@ -53,7 +53,7 @@
{% set blog_delete_url = request.urlgen('mediagoblin.media_types.blog.blog_delete', {% set blog_delete_url = request.urlgen('mediagoblin.media_types.blog.blog_delete',
blog_slug=blog.slug, blog_slug=blog.slug,
user=request.user.username) %} 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 -%} {%- trans %}Delete Blog{% endtrans -%}
</a> </a>
</p> </p>
@ -90,7 +90,7 @@
media_id=blog_post.id) %} media_id=blog_post.id) %}
<td> <td>
<a class="button_action" href="{{ blogpost_edit_url }}">{% trans %}Edit{% endtrans %}</a> <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> </td>
</tr> </tr>
{% endfor %} {% endfor %}

2
mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html
View File

@ -33,7 +33,7 @@
user= blogpost.get_actor.username, user= blogpost.get_actor.username,
media_id=blogpost.id) %} media_id=blogpost.id) %}
<a class="button_action" href="{{ blogpost_edit_url }}">{% trans %}Edit{% endtrans %}</a> <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 %} {% endblock %}

4
mediagoblin/templates/mediagoblin/user_pages/blog_media.html
View File

@ -77,7 +77,7 @@
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user= media.get_actor.username, user= media.get_actor.username,
media_id=media.id) %} 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 %} {% endif %}
</br> </br>
@ -165,8 +165,6 @@
{% include "mediagoblin/utils/license.html" %} {% include "mediagoblin/utils/license.html" %}
{% include "mediagoblin/utils/exif.html" %}
{% template_hook("media_sideinfo") %} {% template_hook("media_sideinfo") %}
{% block mediagoblin_sidebar %} {% block mediagoblin_sidebar %}