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
|
b
|
|
31 | 31 | Really delete {{ title }}? |
32 | 32 | {%- endtrans %} |
33 | 33 | </h1> |
34 | | <p> |
35 | | <em> |
36 | | {%- trans -%} |
37 | | If you choose yes, the media entry will be deleted <strong>permanently.</strong> |
38 | | {%- endtrans %} |
39 | | </em> |
40 | | </p> |
41 | 34 | |
42 | | {{ wtforms_util.render_divs(form) }} |
| 35 | <div style="text-align: center;" > |
| 36 | <img src="{{ request.app.public_store.file_url( |
| 37 | media['media_files']['thumb']) }}" /> |
| 38 | </div> |
| 39 | |
| 40 | <br /> |
| 41 | |
| 42 | <p> |
| 43 | {{ form.confirm }} |
| 44 | {{ _(form.confirm.label.text) }} |
| 45 | </p> |
43 | 46 | <div class="form_submit_buttons"> |
44 | | <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" /> |
| 47 | <input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button" /> |
45 | 48 | </div> |
46 | 49 | </div> |
47 | 50 | </form> |
diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index 22dedfd..bf45663 100644
a
|
b
|
class MediaCommentForm(wtforms.Form):
|
26 | 26 | |
27 | 27 | |
28 | 28 | class ConfirmDeleteForm(wtforms.Form): |
29 | | confirm = wtforms.RadioField('Confirm', |
30 | | default='False', |
31 | | choices=[('False', 'No, I made a mistake!'), |
32 | | ('True', 'Yes, delete it!')]) |
| 29 | confirm = wtforms.BooleanField('I am sure I want to delete this', |
| 30 | [wtforms.validators.Required()]) |
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 2c37628..f60bd18 100644
a
|
b
|
def media_confirm_delete(request, media):
|
154 | 154 | form = user_forms.ConfirmDeleteForm(request.POST) |
155 | 155 | |
156 | 156 | if request.method == 'POST' and form.validate(): |
157 | | if request.POST.get('confirm') == 'True': |
| 157 | if form.confirm.data is True: |
158 | 158 | username = media.uploader()['username'] |
159 | 159 | |
160 | 160 | # 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
|
b
|
|
44 | 44 | {{ _(form.confirm.label.text) }} |
45 | 45 | </p> |
46 | 46 | <div class="form_submit_buttons"> |
| 47 | |
| 48 | <a href="{{ media.url_for_self(request.urlgen) }}"><input type="button" value="{% trans %}Cancel{% endtrans %}" class="button" /></a> |
47 | 49 | <input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button" /> |
| 50 | |
48 | 51 | </div> |
49 | 52 | </div> |
50 | 53 | </form> |