From: Nathan Yergler <nathan@yergler.net>
Date: Sat, 1 Oct 2011 19:08:58 +0000 (-0700)
Subject: Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6bfbe0242653678c09258b7a642514d706153eac;p=mediagoblin.git

Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application-middleware

Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
---

6bfbe0242653678c09258b7a642514d706153eac
diff --cc mediagoblin/config_spec.ini
index 8018b243,0801b39e..37fe7130
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@@ -41,11 -41,9 +41,12 @@@ celery_setup_elsewhere = boolean(defaul
  # source files for a media file but can also be a HUGE security risk.
  allow_attachments = boolean(default=False)
  
 +# Cookie stuff
 +secret_key = string(default="Something Super Duper Secrit!")
 +csrf_cookie_name = string(default='mediagoblin_nonce')
  
  [storage:publicstore]
+ storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage")
  base_dir = string(default="%(here)s/user_dev/media/public")
  base_url = string(default="/mgoblin_media/")
  
diff --cc mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index 3acf802b,01323a6e..dd6923a9
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@@ -31,18 -31,23 +31,24 @@@
            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 class="delete_checkbox_box">
+ 	{{ form.confirm }}
+ 	{{ _(form.confirm.label.text) }}
+       </p>
+ 
        <div class="form_submit_buttons">
-         <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" />
+         {# TODO: This isn't a button really... might do unexpected things :) #}
+ 	<a class="cancel_link" href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
+         <input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button" />
 +	{{ csrf_token }}
        </div>
      </div>
    </form>