Cleaning up

diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index d6d07dae26f5f6d8213e0cb4d3becb5188312260..ec776bd9f5a9b28d3d99ed4eeca99cdcc53c7c6b 100644 (file)
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -30,5 +30,5 @@ add_route('mediagoblin.edit.email', '/edit/email/',
     'mediagoblin.edit.views:change_email')
 add_route('mediagoblin.edit.deauthorize_applications', '/edit/deauthorize/',
     'mediagoblin.edit.views:deauthorize_applications')
-add_route('mediagoblin.edit.edit_subtitles', '/c_s/<string:path>/edit/',
-    'mediagoblin.edit.views:edit_subtitles')
+add_route('mediagoblin.edit.custom_subtitles', '/c_s/<string:path>/edit/',
+    'mediagoblin.edit.views:custom_subtitles')

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 0582b08c3a2eb1ee485d879c1ca16639e89e73cd..6d3e684b591eb4e4b90e3563d16f0f710f10d038 100644 (file)
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -579,39 +579,13 @@ def edit_metadata(request, media):
         {'form':form,
          'media':media})
 
-@require_active_login
-@path_subtitle
-def custom_subtitles(request,path=None):
-    path = path.encode('ascii','ignore')[1:-1].split(',')
-    for index in range(0,len(path)):
-        path[index] = path[index].encode('utf8')
-        path[index] = path[index].strip()
-        path[index] = path[index][2:-1]
-    temp = path[0]
-    for index in range(1,len(path)):
-        temp = temp + "/" + path[index]
-    path = "/mgoblin_media/" + temp #Bug, have to solve this
-    return render_to_response(
-        request,
-        "mediagoblin/user_pages/custom_subtitles.html",
-        {"path": path}
-        )
 
 @require_active_login
 @path_subtitle
-def edit_subtitles(request,path=None):
-    path = path.encode('ascii','ignore')[1:-1].split(',')
-    for index in range(0,len(path)):
-        path[index] = path[index].encode('utf8')
-        path[index] = path[index].strip()
-        path[index] = path[index][2:-1]
-    temp = path[0]
-    for index in range(1,len(path)):
-        temp = temp + "/" + path[index]
-    path = "/mgoblin_media/" + temp #Bug, have to solve this
+def custom_subtitles(request,path=None):
     form = forms.CustomizeSubtitlesForm(request.form)
     return render_to_response(
         request,
-        "mediagoblin/edit/edit_subtitles.html",
+        "mediagoblin/edit/custom_subtitles.html",
         {"path": path,
          "form": form })
\ No newline at end of file

diff --git a/mediagoblin/templates/mediagoblin/edit/custom_subtitles.html b/mediagoblin/templates/mediagoblin/edit/custom_subtitles.html
new file mode 100644 (file)
index 0000000..005e661
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/edit/custom_subtitles.html
@@ -0,0 +1,37 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "mediagoblin/base.html" %}
+
+{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+{% block title -%}
+{%- endblock %}
+
+{% block mediagoblin_content %}
+{{ path }}
+
+  <form action="{{ request.urlgen('mediagoblin.edit.custom_subtitles',path=path) }}" method="POST" enctype="multipart/form-data">
+    <div class="form_box edit_box">
+      {{ wtforms_util.render_divs(form) }}
+      <div class="form_submit_buttons">
+        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
+       {{ csrf_token }}
+      </div>
+    </div>
+  </form>
+{% endblock %}

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index a9c71c8e1f1e17127bfb7102b121ca42f4a444e6..0654bcf98ad294999aca9a84b9f891b7531ca23b 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -25,14 +25,10 @@
 {% block mediagoblin_head %}
 <!--[if lte IE 8]><link rel="stylesheet"
     href="{{ request.staticdirect('/extlib/leaflet/leaflet.ie.css') }}" /><![endif]-->
-
- <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/lightbox.css') }}">
   <script type="text/javascript"
           src="{{ request.staticdirect('/js/comment_show.js') }}"></script>
   <script type="text/javascript"
           src="{{ request.staticdirect('/js/keyboard_navigation.js') }}"></script>
-  <script type="text/javascript"
-          src="{{ request.staticdirect('/js/lightbox.js') }}"></script>
 
   {% template_hook("location_head") %}
   {% template_hook("media_head") %}
@@ -61,7 +57,7 @@
          #}
         {% if media.media_files.has_key('medium') %}
           <a href="{{ request.app.public_store.file_url(
-                        media.media_files['original']) }}" class="lightbox">
+                        media.media_files['original']) }}">
             <img class="media_image"
                  src="{{ display_media }}"
                  alt="{% trans media_title=media.title -%}
@@ -239,9 +235,9 @@
         {%- for subtitle in media.subtitle_files %}
           <li>
         <!--    <a href="{{ request.app.public_store.file_url(subtitle.filepath) }}"> -->
-              <a href="{{ request.urlgen('mediagoblin.edit.edit_subtitles',
+              <a href="{{ request.urlgen('mediagoblin.edit.custom_subtitles',
                           path=subtitle.filepath) }}">
-              {{- subtitle.name -}}
+              {{- subtitle.filepath -}} 
       <!--      </a>  -->
           </li>
         {%- endfor %}