From 87464a3828558f03bd752570747b45ee563a0c46 Mon Sep 17 00:00:00 2001
From: Shawn Khan <shawn@Shawn-Khans-MacBook-Pro.local>
Date: Mon, 5 Sep 2011 19:12:53 -0400
Subject: [PATCH 1/2] Page Redesign to Delete confirmation page

---
 .../user_pages/media_confirm_delete.html           |   21 +++++++++++--------
 mediagoblin/user_pages/forms.py                    |    6 +---
 mediagoblin/user_pages/views.py                    |    2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index 48fbc3b..1e7752c 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -31,17 +31,20 @@
           Really delete {{ title }}?
         {%- endtrans %}
       </h1>
-      <p>
-	<em>
-	  {%- trans -%}
-	    If you choose yes, the media entry will be deleted <strong>permanently.</strong>
-	  {%- endtrans %}
-	</em>
-      </p>
 	  
-      {{ wtforms_util.render_divs(form) }}
+	  <div style="text-align: center;" >
+        <img src="{{ request.app.public_store.file_url(
+                         media['media_files']['thumb']) }}" />
+      </div>
+	  
+	  <br />
+	  
+      <p>
+		{{ form.confirm }}
+		{{ _(form.confirm.label.text) }}
+	  </p>
       <div class="form_submit_buttons">
-        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" />
+        <input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button" />
       </div>
     </div>
   </form>
diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index 22dedfd..bf45663 100644
--- a/mediagoblin/user_pages/forms.py
+++ b/mediagoblin/user_pages/forms.py
@@ -26,7 +26,5 @@ class MediaCommentForm(wtforms.Form):
 
 
 class ConfirmDeleteForm(wtforms.Form):
-    confirm = wtforms.RadioField('Confirm',
-                                 default='False',
-                                 choices=[('False', 'No, I made a mistake!'),
-                                          ('True', 'Yes, delete it!')])
+    confirm = wtforms.BooleanField('I am sure I want to delete this',
+				 [wtforms.validators.Required()])
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 2c37628..f60bd18 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -154,7 +154,7 @@ def media_confirm_delete(request, media):
     form = user_forms.ConfirmDeleteForm(request.POST)
 
     if request.method == 'POST' and form.validate():
-        if request.POST.get('confirm') == 'True':
+        if form.confirm.data is True:
             username = media.uploader()['username']
 
             # Delete all files on the public storage
-- 
1.7.4.4


From 941a4f90a9a1e243228aaf49e170055790381fa4 Mon Sep 17 00:00:00 2001
From: Shawn Khan <shawn@Shawn-Khans-MacBook-Pro.local>
Date: Mon, 5 Sep 2011 19:35:25 -0400
Subject: [PATCH 2/2] Created a Cancel Button, if you don't want to delete
 Media.

---
 .../user_pages/media_confirm_delete.html           |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index 1e7752c..3fbc286 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -44,7 +44,10 @@
 		{{ _(form.confirm.label.text) }}
 	  </p>
       <div class="form_submit_buttons">
+		
+		<a href="{{ media.url_for_self(request.urlgen) }}"><input type="button" value="{% trans %}Cancel{% endtrans %}" class="button" /></a>
         <input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button" />
+		
       </div>
     </div>
   </form>
-- 
1.7.4.4