Author: mbonetti
Date: Fri May 8 00:32:43 2009
New Revision: 516
Modified:
branches/electron/ (props changed)
branches/electron/AUTHORS
branches/electron/INSTALL (props changed)
branches/electron/docs/admin-screenshot1.png (props changed)
branches/electron/docs/admin-screenshot2.png (props changed)
branches/electron/docs/frontend-screenshot1.png (props changed)
branches/electron/example/__init__.py (props changed)
branches/electron/example/manage.py (props changed)
branches/electron/example/settings.py (props changed)
branches/electron/example/templates/ (props changed)
branches/electron/example/templates/pages/cool.html (props changed)
branches/electron/example/templates/pages/debug.html (props changed)
branches/electron/example/templates/pages/index.html (props changed)
branches/electron/example/templates/pages/nice.html (props changed)
branches/electron/example/urls.py (props changed)
branches/electron/pages/templates/admin/pages/page/change_form.html
branches/electron/pages/templates/admin/pages/page/includes/fieldset.html
Log:
svn merge -r 514:HEAD https://django-page-cms.googlecode.com/svn/trunk .
Modified: branches/electron/AUTHORS
==============================================================================
--- branches/electron/AUTHORS (original)
+++ branches/electron/AUTHORS Fri May 8 00:32:43 2009
@@ -2,5 +2,7 @@
Jannis Leidel
Antoni Aloy López
Benjamin Wohlwend
-poweredbypenguins
-homebrew79
+poweredbypenguins <-- who is this guy?
+homebrew79 <-- and this one?
+Marco Bonetti
+Gabriel Walt
\ No newline at end of file
Modified:
branches/electron/pages/templates/admin/pages/page/change_form.html
==============================================================================
--- branches/electron/pages/templates/admin/pages/page/change_form.html
(original)
+++ branches/electron/pages/templates/admin/pages/page/change_form.html Fri
May 8 00:32:43 2009
@@ -24,7 +24,7 @@
{% for fieldset in adminform %}
{% include "admin/pages/page/includes/fieldset.html" %}
- {% if forloop.first and not add %}
+ {% if forloop.first %}
<fieldset class="module module-translation-helper aligned">
<h2>{% trans "Translation helper" %}</h2>
<div class="form-row">
@@ -35,6 +35,7 @@
<option value="{{ lang.0 }}">{{ lang.1
}}</option>
{% endfor %}
</select>
+ {% comment %}A little "smart" trick here to have
this right column{% endcomment %}
<div id="translation-helper-content"></div>
</div>
</fieldset>
Modified:
branches/electron/pages/templates/admin/pages/page/includes/fieldset.html
==============================================================================
---
branches/electron/pages/templates/admin/pages/page/includes/fieldset.html
(original)
+++
branches/electron/pages/templates/admin/pages/page/includes/fieldset.html
Fri May 8 00:32:43 2009
@@ -22,7 +22,7 @@
<ul class="clearfix">
{% for lang in page_languages %}
{% ifequal language lang.0 %}
- <li><span class="current">{{
lang.0 }}</li>
+ <li><span class="current">{{
lang.0 }}</span></li>
{% else %}
{% if page|has_content_in:lang.0 %}
<li><a class="editlink"
href="?language={{ lang.0 }}">{{ lang.0 }}</a></li>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
