Update django-inlinetrans, now works with django 1.5

Yaco-Sistemas · Sep 12, 2013 · e397b39 · e397b39
1 parent ef8deb5
commit e397b39
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 78 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.pyc
+.#*
diff --git a/inlinetrans/media/css/inlinetrans.css → ...ns/static/inlinetrans/css/inlinetrans.css b/inlinetrans/media/css/inlinetrans.css → ...ns/static/inlinetrans/css/inlinetrans.css
@@ -36,6 +36,6 @@ span.inlinetransUntranslated {
 
 img#changes-loading {
     display: none;
-    width: 16px;
-    height: 16px;
+    width: 12px;
+    height: 12px;
 }
diff --git a/...ans/media/img/ajax-loader-transparent.gif → ...linetrans/img/ajax-loader-transparent.gif b/...ans/media/img/ajax-loader-transparent.gif → ...linetrans/img/ajax-loader-transparent.gif
diff --git a/inlinetrans/media/js/jquery.inlinetrans.js → ...atic/inlinetrans/js/jquery.inlinetrans.js b/inlinetrans/media/js/jquery.inlinetrans.js → ...atic/inlinetrans/js/jquery.inlinetrans.js
@@ -13,7 +13,11 @@
 
             var do_ajax = function(item, msgid, msgstr, retry) {
                 active_loading();
-                var jsondata = $.param({msgid:msgid, msgstr:msgstr, retry:retry});
+                var jsondata = $.param({msgid:msgid,
+                                        msgstr:msgstr,
+                                        retry:retry,
+                                        csrfmiddlewaretoken:csrf_token
+                });
                 $.ajax({
                     data: jsondata,
                     url: new_translation_url,
@@ -130,7 +134,9 @@
                         $(this).toggleClass("active");
                         active_loading();
                         $.ajax({
-                                data: {restart: 1},
+                                data: {restart: 1,
+                                       csrfmiddlewaretoken: csrf_token
+                                },
                                 url: restart_url,
                                 type: "POST",
                                 async: true,

diff --git a/inlinetrans/templates/inlinetrans/inc.csrf_token.html b/inlinetrans/templates/inlinetrans/inc.csrf_token.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+    var csrf_token = "{{ csrf_token }}";
+</script>
diff --git a/inlinetrans/templates/inlinetrans/inline_demo.html b/inlinetrans/templates/inlinetrans/inline_demo.html
diff --git a/inlinetrans/templates/inlinetrans/inline_header.html b/inlinetrans/templates/inlinetrans/inline_header.html
@@ -1,4 +1,5 @@
 {% if is_staff %}
-<link rel="stylesheet" type="text/css" href="{{ INLINETRANS_MEDIA_URL }}css/inlinetrans.css"/>
-<script language="javascript" src="{{ INLINETRANS_MEDIA_URL }}js/jquery.inlinetrans.js"></script>
+    <link rel="stylesheet" type="text/css" href="{{ INLINETRANS_MEDIA_URL }}css/inlinetrans.css"/>
+    <script language="javascript" src="{{ INLINETRANS_MEDIA_URL }}js/jquery.inlinetrans.js"></script>
+    {% include "inlinetrans/inc.csrf_token.html" %}
 {% endif %}
diff --git a/inlinetrans/templates/inlinetrans/inline_toolbar.html b/inlinetrans/templates/inlinetrans/inline_toolbar.html
@@ -13,8 +13,8 @@
        error_cant_restart: "{% trans "Can't restart server" %}"
 
     };
-    var new_translation_url = "{% url inlinetrans.views.set_new_translation %}";
-    var restart_url = "{% url inlinetrans.views.do_restart %}";
+    var new_translation_url = "{{ set_new_translation_url }}";
+    var restart_url = "{{ do_restart_url }}";
 
     var toolbar_tpl = '\
         <div class="inlinetransContainer">\

diff --git a/inlinetrans/templatetags/inlinetrans.py b/inlinetrans/templatetags/inlinetrans.py
@@ -2,6 +2,7 @@
 
 from django import template
 from django.conf import settings
+from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
 from django.template import TemplateSyntaxError, TokenParser, Node, Variable
 try:
@@ -16,8 +17,15 @@
 register = template.Library()
 
 
-def get_media_url():
-    return getattr(settings, 'INLINETRANS_MEDIA_URL', settings.MEDIA_URL + 'inlinetrans/')
+def get_static_url(subfix='inlinetrans'):
+    static_prefix = getattr(settings, 'INLINETRANS_STATIC_URL', None)
+    if static_prefix:
+        return static_prefix
+    static_prefix = getattr(settings, 'INLINETRANS_MEDIA_URL', None)
+    if static_prefix:
+        return static_prefix
+    static_url = getattr(settings, 'STATIC_URL', getattr(settings, 'MEDIA_URL'))
+    return '%s%s/' % (static_url, subfix)
 
 
 def get_language_name(lang):
@@ -101,7 +109,7 @@ def top(self):
 def inlinetrans_media(context):
     tag_context = {
         'is_staff': False,
-        'INLINETRANS_MEDIA_URL': get_media_url(),
+        'INLINETRANS_MEDIA_URL': get_static_url(),
         'request': context['request'],
     }
     if 'user' in context and context['user'].is_staff:
@@ -115,8 +123,10 @@ def inlinetrans_media(context):
 @register.inclusion_tag('inlinetrans/inline_toolbar.html', takes_context=True)
 def inlinetrans_toolbar(context, node_id):
     tag_context = {
-        'INLINETRANS_MEDIA_URL': get_media_url(),
+        'INLINETRANS_MEDIA_URL': get_static_url(),
         'request': context['request'],
+        'set_new_translation_url': reverse('inlinetrans.views.set_new_translation'),
+        'do_restart_url': reverse('inlinetrans.views.do_restart'),
     }
     if 'user' in context and context['user'].is_staff:
         tag_context.update({
@@ -127,7 +137,7 @@ def inlinetrans_toolbar(context, node_id):
     else:
         tag_context.update({
             'is_staff': False,
-            'INLINETRANS_MEDIA_URL': get_media_url(),
+            'INLINETRANS_MEDIA_URL': get_static_url(),
             'request': context['request'],
         })
     return tag_context
diff --git a/inlinetrans/urls.py b/inlinetrans/urls.py
@@ -4,5 +4,4 @@
 urlpatterns = patterns('inlinetrans.views',
     url(r'^apply_changes/$', 'do_restart', name='apply_changes'),
     url(r'^set_new_translation/$', 'set_new_translation', name='set_new_translation'),
-    url(r'^demo/$', 'inline_demo', name='inline_demo'),
 )
diff --git a/inlinetrans/views.py b/inlinetrans/views.py
@@ -20,7 +20,6 @@ def set_new_translation(request):
     """
     Post to include a new translation for a msgid
     """
-
     if not request.user.is_staff:
         return HttpResponseForbidden(_('You have no permission to update translation catalogs'))
     if not request.POST:
@@ -84,14 +83,6 @@ def set_new_translation(request):
     return HttpResponse(simplejson.dumps(result), mimetype='text/plain')
 
 
-def inline_demo(request):
-    """
-    """
-    return render_to_response('inlinetrans/inline_demo.html',
-                              {'INLINETRANS_MEDIA_URL': settings.MEDIA_URL + 'inlinetrans/'},
-                              context_instance=RequestContext(request))
-
-
 def do_restart(request):
     """
     * "test" for a django instance (this do a touch over settings.py for reload)
@@ -106,7 +97,7 @@ def do_restart(request):
         reload_time = get_auto_reload_time()
         command = "echo no script"
         if reload_method == 'test':
-            command = 'touch settings.py'
+            command = 'touch %s' % os.path.join(settings.BASEDIR, 'settings.py')
         ## No RedHAT or similars
         elif reload_method == 'apache2':
             command = 'sudo apache2ctl restart'