Author: gabriel.walt
Date: Tue Apr 28 07:06:52 2009
New Revision: 487
Added:
branches/electron/pages/media/pages/images/icon-draft.gif (contents,
props changed)
branches/electron/pages/media/pages/images/icon-hidden.gif (contents,
props changed)
branches/electron/pages/media/pages/images/icon-published.gif
(contents, props changed)
branches/electron/pages/media/pages/images/icon-view.gif (contents,
props changed)
branches/electron/pages/media/pages/images/icon_add.gif (contents,
props changed)
branches/electron/pages/media/pages/images/icon_delete.gif (contents,
props changed)
branches/electron/pages/media/pages/images/rte/
branches/electron/pages/media/pages/images/rte/bold.gif
- copied unchanged from r484,
/branches/electron/pages/media/pages/images/bold.gif
branches/electron/pages/media/pages/images/rte/close.gif
- copied unchanged from r484,
/branches/electron/pages/media/pages/images/close.gif
branches/electron/pages/media/pages/images/rte/image.png
- copied unchanged from r484,
/branches/electron/pages/media/pages/images/image.png
branches/electron/pages/media/pages/images/rte/italic.gif
- copied unchanged from r484,
/branches/electron/pages/media/pages/images/italic.gif
branches/electron/pages/media/pages/images/rte/link.png
- copied unchanged from r484,
/branches/electron/pages/media/pages/images/link.png
branches/electron/pages/media/pages/images/rte/unordered.gif
- copied unchanged from r484,
/branches/electron/pages/media/pages/images/unordered.gif
Removed:
branches/electron/pages/media/pages/images/bold.gif
branches/electron/pages/media/pages/images/close.gif
branches/electron/pages/media/pages/images/image.png
branches/electron/pages/media/pages/images/italic.gif
branches/electron/pages/media/pages/images/link.png
branches/electron/pages/media/pages/images/unordered.gif
Modified:
branches/electron/pages/media/pages/javascript/change_list.js
branches/electron/pages/templates/admin/pages/page/menu.html
branches/electron/pages/templates/admin/pages/page/widgets/richtextarea.html
Log:
Putting a redirect on a page disables the page content + some minor changes
concerning the icons
Added: branches/electron/pages/media/pages/images/icon-draft.gif
==============================================================================
Binary file. No diff available.
Added: branches/electron/pages/media/pages/images/icon-hidden.gif
==============================================================================
Binary file. No diff available.
Added: branches/electron/pages/media/pages/images/icon-published.gif
==============================================================================
Binary file. No diff available.
Added: branches/electron/pages/media/pages/images/icon-view.gif
==============================================================================
Binary file. No diff available.
Added: branches/electron/pages/media/pages/images/icon_add.gif
==============================================================================
Binary file. No diff available.
Added: branches/electron/pages/media/pages/images/icon_delete.gif
==============================================================================
Binary file. No diff available.
Modified: branches/electron/pages/media/pages/javascript/change_list.js
==============================================================================
--- branches/electron/pages/media/pages/javascript/change_list.js
(original)
+++ branches/electron/pages/media/pages/javascript/change_list.js Tue Apr
28 07:06:52 2009
@@ -50,7 +50,8 @@
$('a.expanded').each(function() {
col.push(this.id.substring(1));
});
- $.cookie('tree_expanded', col.join(','), { 'expires': 12 }); //
expire in 12 days
+ // expire in 12 days
+ $.cookie('tree_expanded', col.join(','), {"expires":12});
}
function remove_children(id) {
Modified: branches/electron/pages/templates/admin/pages/page/menu.html
==============================================================================
--- branches/electron/pages/templates/admin/pages/page/menu.html
(original)
+++ branches/electron/pages/templates/admin/pages/page/menu.html Tue Apr
28
07:06:52 2009
@@ -29,12 +29,13 @@
{% endfor %}
</td>
<td class="publish-cell">
-
{% ifequal page.status page.DRAFT %}
- <img alt="False" src="{% admin_media_prefix %}img/admin/icon-no.gif" />
+ <img src="/media/pages/images/icon-draft.gif" alt="Draft" />
+{% else %}{% ifequal page.status page.PUBLISHED %}
+ <img src="/media/pages/images/icon-published.gif" alt="Published" />
{% else %}
- <img alt="True" src="{% admin_media_prefix %}img/admin/icon-yes.gif"/>
-{% endifequal %}
+ <img src="/media/pages/images/icon-hidden.gif" alt="Hidden"/>
+{% endifequal %}{% endifequal %}
<select class="publish-select" name="select-status-{{ page.id }}">
<option {% ifequal page.status page.DRAFT %}selected="selected"{%
endifequal %}>{% trans "Draft" %}</option>
Modified:
branches/electron/pages/templates/admin/pages/page/widgets/richtextarea.html
==============================================================================
---
branches/electron/pages/templates/admin/pages/page/widgets/richtextarea.html
(original)
+++
branches/electron/pages/templates/admin/pages/page/widgets/richtextarea.html
Tue Apr 28 07:06:52 2009
@@ -3,7 +3,7 @@
if(window.$) {
$(document).ready(function() {
if($.fn.rte)
- $('#id_{{ name }}').rte('{{ PAGES_MEDIA_URL
}}/css/rte.css', '{{ PAGES_MEDIA_URL }}images/');
+ $('#id_{{ name }}').rte('{{ PAGES_MEDIA_URL
}}/css/rte.css', '{{ PAGES_MEDIA_URL }}images/rte/');
});
}
-->
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
