Merge branch 'persona_resquash'

[mediagoblin.git] / mediagoblin / templates / mediagoblin / edit / edit.html

diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index 3dc170c81f608b09449773dc793af21e9886f5d4..9a0400951b92a3e335306024f8fdc2e3d452c52e 100644 (file)
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -1,6 +1,6 @@
 {#
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -19,24 +19,30 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block title -%}
+  {% trans media_title=media.title -%}
+    Editing {{ media_title }}
+  {%- endtrans %} — {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.edit.edit_media',
-                               user= media.uploader().username,
-                               media= media._id) }}"
+                               user= media.get_uploader.username,
+                               media_id=media.id) }}"
         method="POST" enctype="multipart/form-data">
-    <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
+    <div class="form_box_xl edit_box">
       <h1>{% trans media_title=media.title %}Editing {{ media_title }}{% endtrans %}</h1>
       <div style="text-align: center;" >
-        <img src="{{ request.app.public_store.file_url(
-                         media['media_files']['thumb']) }}" />
+        <img src="{{ media.thumb_url }}" />
       </div>
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
-        <a href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
-        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" />
+        <a class="button_action" href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
+        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
+       {{ csrf_token }}
       </div>
     </div>
   </form>
-  
-{% endblock %}    
+
+{% endblock %}