[django-page-cms] r708 committed - Various little fixes in javascript, add a new setting

[codesite...@google.com]

Revision: 708
Author: batiste.bieler
Date: Thu Sep 24 08:36:38 2009
Log: Various little fixes in javascript, add a new setting
http://code.google.com/p/django-page-cms/source/detail?r=708

Modified:
/trunk/pages/media/pages/javascript/pages_form.js
/trunk/pages/media/pages/javascript/pages_list.js
/trunk/pages/settings.py
/trunk/pages/templates/admin/pages/page/change_form.html
/trunk/pages/templates/admin/pages/page/change_list.html
/trunk/pages/utils.py
/trunk/pages/views.py

=======================================
--- /trunk/pages/media/pages/javascript/pages_form.js Mon Sep 21 11:09:36
2009
+++ /trunk/pages/media/pages/javascript/pages_form.js Thu Sep 24 08:36:38
2009
@@ -22,6 +22,7 @@

// Set the publication status
var select = $('#id_status');
+ var img = $('<img src="'+media_url+'pages/images/icons/'+opt+'.gif"
alt="'+opt+'" />').insertAfter(select);
var opt = ({ 0: 'draft', 1: 'published', 2: 'expired', 3: 'hidden'
})[select.val()];
var img = $('<img src="/media/pages/images/icons/'+opt+'.gif"
alt="'+opt+'" />').insertAfter(select);
// disable ajax post if page not already created (add view)
=======================================
--- /trunk/pages/media/pages/javascript/pages_list.js Mon Sep 21 11:09:36
2009
+++ /trunk/pages/media/pages/javascript/pages_list.js Thu Sep 24 08:36:38
2009
@@ -135,7 +135,7 @@
changelist.removeClass('insert-add insert-move');
$('tr', changelist).removeClass('selected insertable');
$('.expand-collapse', row).remove();
- $('.insert', row).after('<img class="insert-loading"
src="/media/pages/images/loading.gif" alt="Loading" />');
+ $('.insert', row).after('<img class="insert-loading"
src="'+media_url+'pages/images/loading.gif" alt="Loading" />');

if (action == 'move') {
$.post(selected_page+'/move-page/', { position:
position, target: id },
=======================================
--- /trunk/pages/settings.py Thu Sep 3 08:20:34 2009
+++ /trunk/pages/settings.py Thu Sep 24 08:36:38 2009
@@ -159,3 +159,7 @@

# pagelink url validator user agent
PAGE_URL_VALIDATOR_USER_AGENT =
getattr(settings, 'URL_VALIDATOR_USER_AGENT', False)
+
+# This setting is a function that can be defined if you need to pass extra
context
+# data to the pages templates.
+PAGE_EXTRA_CONTEXT = getattr(settings, 'PAGE_EXTRA_CONTEXT', None)
=======================================
--- /trunk/pages/templates/admin/pages/page/change_form.html Mon Sep 21
11:09:36 2009
+++ /trunk/pages/templates/admin/pages/page/change_form.html Thu Sep 24
08:36:38 2009
@@ -5,6 +5,7 @@

{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="{%
admin_media_prefix %}js/urlify.js"></script>
+<script type="text/javascript">var media_url = {{
PAGES_MEDIA_URL}}</script>
{% endblock %}

{% block content %}
=======================================
--- /trunk/pages/templates/admin/pages/page/change_list.html Sat Sep 5
11:38:42 2009
+++ /trunk/pages/templates/admin/pages/page/change_list.html Thu Sep 24
08:36:38 2009
@@ -17,6 +17,7 @@
{% block extrahead %}{{ block.super }}
<link rel="stylesheet" type="text/css" href="{{ PAGES_MEDIA_URL
}}css/rte.css" />
<link rel="stylesheet" type="text/css" href="{{ PAGES_MEDIA_URL
}}css/pages.css" />
+<script type="text/javascript">var media_url = {{
PAGES_MEDIA_URL}}</script>
<script type="text/javascript" src="{{ PAGES_MEDIA_URL
}}javascript/jquery.js"></script>
<script type="text/javascript" src="{{ PAGES_MEDIA_URL
}}javascript/jquery.query.js"></script>
<script type="text/javascript" src="{{ PAGES_MEDIA_URL
}}javascript/pages.js"></script>
=======================================
--- /trunk/pages/utils.py Wed Sep 23 13:58:16 2009
+++ /trunk/pages/utils.py Thu Sep 24 08:36:38 2009
@@ -8,6 +8,13 @@
from pages import settings
from pages.http import get_request_mock, get_language_from_request

+def get_context_mock():
+ """return a mockup dictionnary to use in get_placeholders."""
+ context = {}
+ if settings.PAGE_EXTRA_CONTEXT:
+ context.update(settings.PAGE_EXTRA_CONTEXT())
+ return context
+
def get_placeholders(template_name):
"""Return a list of PlaceholderNode found in the given template.

@@ -19,7 +26,10 @@
return []

request = get_request_mock()
- temp.render(RequestContext(request, {}))
+ context = get_context_mock()
+ # I need to render the template in order to extract
+ # placeholder tags
+ temp.render(RequestContext(request, context))
plist, blist = [], []
_placeholders_recursif(temp.nodelist, plist, blist)
return plist
=======================================
--- /trunk/pages/views.py Mon Sep 21 07:54:39 2009
+++ /trunk/pages/views.py Thu Sep 24 08:36:38 2009
@@ -75,6 +75,9 @@

if current_page:
context['current_page'] = current_page
+
+ if settings.PAGE_EXTRA_CONTEXT:
+ context.update(settings.PAGE_EXTRA_CONTEXT())

return template_name, context