From 6f5fcc5b52f97e88d5679fa12c2a2798a518ef1b Mon Sep 17 00:00:00 2001
From: Andrew Browning <ayleph@thisshitistemp.com>
Date: Mon, 19 Jun 2017 00:11:29 -0400
Subject: [PATCH 1/2] Fix #830 - Remove exif from blog posts

---
 mediagoblin/templates/mediagoblin/user_pages/blog_media.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mediagoblin/templates/mediagoblin/user_pages/blog_media.html b/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
index 261b21e7..7740c0f3 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
@@ -165,8 +165,6 @@
 
     {% include "mediagoblin/utils/license.html" %}
 
-    {% include "mediagoblin/utils/exif.html" %}
-
     {% template_hook("media_sideinfo") %}
 
     {% block mediagoblin_sidebar %}

From 12c0872b79500d05f8f7e0a9240ad8ee5d763fff Mon Sep 17 00:00:00 2001
From: Andrew Browning <ayleph@thisshitistemp.com>
Date: Mon, 19 Jun 2017 00:58:21 -0400
Subject: [PATCH 2/2] Apply button_warning style to blog delete buttons

---
 .../blog/templates/mediagoblin/blog/blog_admin_dashboard.html | 4 ++--
 .../blog/templates/mediagoblin/blog/blogpost_draft_view.html  | 2 +-
 mediagoblin/templates/mediagoblin/user_pages/blog_media.html  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html
index 3b881466..97408b59 100644
--- a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html
+++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html
@@ -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 %}
diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html
index 6d820550..7a53cc9e 100644
--- a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html
+++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html
@@ -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 %}
   
diff --git a/mediagoblin/templates/mediagoblin/user_pages/blog_media.html b/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
index 7740c0f3..24328725 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
@@ -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>