Revision: 710
Author: [email protected]
Date: Fri Sep 25 02:26:34 2009
Log: fix bug medial_url on js
http://code.google.com/p/django-page-cms/source/detail?r=710
Modified:
/trunk/pages/admin/widgets.py
/trunk/pages/media/pages/javascript/pages_form.js
/trunk/pages/templates/admin/pages/page/change_form.html
=======================================
--- /trunk/pages/admin/widgets.py Mon Sep 21 11:09:36 2009
+++ /trunk/pages/admin/widgets.py Fri Sep 25 02:26:34 2009
@@ -109,7 +109,6 @@
def render(self, name, value, attrs=None):
rendered = super(WYMEditor, self).render(name, value, attrs)
context = {
- 'page_list': Page.objects.all().order_by('tree_id','lft'),
'name': name,
'lang': self.language[:2],
'language': self.language,
@@ -118,6 +117,7 @@
context['page_link_wymeditor'] = 0
if [editor for editor in PAGE_LINK_EDITOR if
editor.endswith('WYMEditor')]:
context['page_link_wymeditor'] = 1
+ context['page_list'] =
Page.objects.all().order_by('tree_id','lft')
context['filebrowser'] = 0
if "filebrowser" in getattr(settings, 'INSTALLED_APPS', []):
=======================================
--- /trunk/pages/media/pages/javascript/pages_form.js Thu Sep 24 08:36:38
2009
+++ /trunk/pages/media/pages/javascript/pages_form.js Fri Sep 25 02:26:34
2009
@@ -22,9 +22,8 @@
// 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);
+ var img = $('<img src="'+media_url+'pages/images/icons/'+opt+'.gif"
alt="'+opt+'" />').insertAfter(select);
// disable ajax post if page not already created (add view)
var change_status = (typeof(add_form) !== 'undefined' && add_form) ?
0 : 1;
=======================================
--- /trunk/pages/templates/admin/pages/page/change_form.html Thu Sep 24
08:36:38 2009
+++ /trunk/pages/templates/admin/pages/page/change_form.html Fri Sep 25
02:26:34 2009
@@ -5,7 +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>
+<script type="text/javascript">var media_url
= '{{PAGES_MEDIA_URL}}'</script>
{% endblock %}
{% block content %}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
