diff options
-rw-r--r-- | mediagoblin/edit/views.py | 5 | ||||
-rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/custom_subtitles.html | 35 |
2 files changed, 37 insertions, 3 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index ba727b07..cad58306 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -592,9 +592,10 @@ def custom_subtitles(request,path=None): temp = path[0] for index in range(1,len(path)): temp = temp + "/" + path[index] - path = temp + path = "/mgoblin_media/" + temp #Bug, have to solve this return render_to_response( request, "mediagoblin/user_pages/custom_subtitles.html", {"path": path} - )
\ No newline at end of file + ) + diff --git a/mediagoblin/templates/mediagoblin/user_pages/custom_subtitles.html b/mediagoblin/templates/mediagoblin/user_pages/custom_subtitles.html index 0457fcc3..6730ab92 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/custom_subtitles.html +++ b/mediagoblin/templates/mediagoblin/user_pages/custom_subtitles.html @@ -1 +1,34 @@ -{{path}}
\ No newline at end of file +{# +# 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/>. +# + +# This is the main user homepage for active users +#} + + +<script> +$(document).ready(function() { + $(".loadSubtitle").load("{{ path }}"); +}); +</script> +{% extends "mediagoblin/base.html" %} + + +{% block mediagoblin_content %} +<p>{{ path }}</p> +<textarea id="loadSubtitle" style="width:512px;height:256px"></textarea> +{% endblock %}
\ No newline at end of file |