fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3c0f69b)
Templaty używają teraz ścieżek z konfiguracji dal plików statycznych.
authorŁukasz Rekucki <lrekucki@gmail.com>
Thu, 3 Sep 2009 07:00:44 +0000 (09:00 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Thu, 3 Sep 2009 07:00:44 +0000 (09:00 +0200)
apps/explorer/context_processors.py [new file with mode: 0644] patch | blob
project/settings.py patch | blob | history
project/templates/base.html patch | blob | history
project/templates/explorer/editor.html patch | blob | history
project/templates/explorer/panels/xmleditor.html patch | blob | history
project/urls.py patch | blob | history

diff --git a/apps/explorer/context_processors.py b/apps/explorer/context_processors.py
new file mode 100644 (file)
index 0000000..634b015
--- /dev/null
+++ b/apps/explorer/context_processors.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8
+__author__="lreqc"
+__date__ ="$2009-09-03 08:34:10$"
+
+def settings(request):
+    from django.conf import settings
+    return {'MEDIA_URL': settings.MEDIA_URL, 'STATIC_URL': settings.STATIC_URL}
+
+
diff --git a/project/settings.py b/project/settings.py
index 22d9bdd..b2c7f85 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -66,7 +66,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
+    "explorer.context_processors.settings",
     "django.core.context_processors.request",
 )
 
diff --git a/project/templates/base.html b/project/templates/base.html
index ec32616..bf7ed04 100644 (file)
--- a/project/templates/base.html
+++ b/project/templates/base.html
@@ -4,9 +4,9 @@
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <title>{% block title %}Platforma Redakcyjna{% block subtitle %}{% endblock subtitle %}{% endblock title%}</title>
-        <link rel="stylesheet" href="/static/css/master.css" type="text/css" />
-        <script src="/static/js/jquery.js" type="text/javascript" charset="utf-8"></script>
-               <script src="/static/js/jquery.logging.js" type="text/javascript" charset="utf-8"></script> 
+        <link rel="stylesheet" href="{{ STATIC_URL }}css/master.css" type="text/css" />
+        <script src="{{ STATIC_URL }}js/jquery.js" type="text/javascript" charset="utf-8"></script>
+               <script src="{{ STATIC_URL }}js/jquery.logging.js" type="text/javascript" charset="utf-8"></script>
         {% block extrahead %}
         {% endblock %}
     </head>
diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index c7eadbf..bba8e1d 100644 (file)
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -1,15 +1,15 @@
 {% extends "base.html" %}
 
 {% block extrahead %}
-    <link rel="stylesheet" href="/static/css/toolbar.css" type="text/css" />
-    <script src="/static/js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/static/js/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/static/js/jquery.autoscroll.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/static/js/jquery.wtooltip.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/static/js/jquery.hpanel.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/static/js/jquery.json.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/static/js/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/static/js/editor.js" type="text/javascript" charset="utf-8"></script>
+    <link rel="stylesheet" href="{{STATIC_URL}}css/toolbar.css" type="text/css" />
+    <script src="{{STATIC_URL}}js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/jquery.autoscroll.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/jquery.wtooltip.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/jquery.hpanel.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/jquery.json.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/editor.js" type="text/javascript" charset="utf-8"></script>
 {% endblock extrahead %}
 
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> ❯ plik {{ hash }}{% endblock breadcrumbs %}
diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html
index 0f26ccf..e2e6b0b 100644 (file)
--- a/project/templates/explorer/panels/xmleditor.html
+++ b/project/templates/explorer/panels/xmleditor.html
@@ -25,8 +25,8 @@ panel_hooks = {
 
                var texteditor = CodeMirror.fromTextArea(textareaId, {
             parserfile: 'parsexml.js',
-            path: "/static/js/codemirror/",
-            stylesheet: "/static/css/xmlcolors.css",
+            path: "{{STATIC_URL}}js/codemirror/",
+            stylesheet: "{{STATIC_URL}}css/xmlcolors.css",
             parserConfig: {useHTMLKludges: false},
             onChange: function() {
                                panel.trigger('panel:contentChanged', self);
@@ -64,7 +64,7 @@ panel_hooks = {
                 opacity: 0.9, 
                 background: "#FBFBC6", 
                 padding: "1px",
-                fontSize: "12px",
+                fontSize: "12px"
             }
         });
 
diff --git a/project/urls.py b/project/urls.py
index ec919ae..972c33d 100644 (file)
--- a/project/urls.py
+++ b/project/urls.py
@@ -37,9 +37,9 @@ urlpatterns = patterns('',
 
 
 # Static files
-if settings.DEBUG:
+if settings.DEBUG and not hasattr(settings, 'DONT_SERVE_STATIC'):
     urlpatterns += patterns('',
-        url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', 
+        url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
             {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
         url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
             {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),