Author: gabriel.walt
Date: Tue May 5 08:25:26 2009
New Revision: 507
Modified:
branches/electron/pages/media/pages/css/pages.css
branches/electron/pages/templates/admin/pages/page/includes/fieldset.html
branches/electron/pages/templates/admin/pages/page/menu.html
Log:
Tried to make an exception for the languages in the page_form, not finished
yet & doesn't work yet
Modified: branches/electron/pages/media/pages/css/pages.css
==============================================================================
--- branches/electron/pages/media/pages/css/pages.css (original)
+++ branches/electron/pages/media/pages/css/pages.css Tue May 5 08:25:26
2009
@@ -395,6 +395,40 @@
border-right: none;
}
+/* Languages */
+.change-form .module-options .language ul {
+ margin: 0;
+ padding: 3px 0;
+}
+.change-form .module-options .language li {
+ display: inline;
+ list-style: none;
+ padding: 0
+}
+.change-form .module-options .language .editlink,
+.change-form .module-options .language .addlink,
+.change-form .module-options .language .current {
+ margin: 0 4px;
+ padding: 0 12px 0 0;
+ line-height: 20px;
+ font-weight: bold;
+ text-transform: uppercase;
+ background: none;
+}
+.change-form .module-options .language .editlink:hover {
+ background: url(../images/icons/edit.gif) right 0.2em no-repeat;
+}
+.change-form .module-options .language .addlink {
+ color: #ccc;
+}
+.change-form .module-options .language .addlink:hover {
+ color: #007418;
+ background: url(../images/icons/add.gif) right 0.2em no-repeat;
+}
+.change-form .module-options .language .current {
+ color: black;
+}
+
/* Content */
.change-form .module-content .form-row {
position: relative;
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
Tue May 5 08:25:26 2009
@@ -15,7 +15,12 @@
{{ field.field }}{{ field.label_tag }}
{% else %}
{% ifequal field.field.name 'language' %}
- <label>{% trans "Language" %}</label>
+ <label>{% trans "Language:" %}</label>
+ <ul>
+ <li><a title="edit french translation"
class="editlink" href="11/?language=fr">fr</a></li>
+ <li><span title="current translation"
class="current">de</li>
+ <li><a title="create english
translation" class="addlink" href="11/?language=en">en</a></li>
+ </ul>
{% else %}
{{ field.label_tag }}{{ field.field }}
{% endifequal %}
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 May
5
08:25:26 2009
@@ -14,16 +14,16 @@
<a href="{{ url }}{{ page.id }}/" class="title
changelink">{% show_content page "slug" %}</a>
- <div class="actions popup">
+ <div class="actions">
<a class="viewlink" href="{{ page.get_absolute_url }}"
target="_blank" title="{% trans "view this page" %}"></a>
<a class="movelink" id="move-link-{{ page.id }}"
href="#" title="{% trans "move this page" %}"></a>
<a class="addlink" id="add-link-{{ page.id }}"
href="#" title="{% trans "insert a new page here" %}"></a>
<a class="deletelink" href="{{ page.id }}/delete/"
title="{% trans "delete this page" %}"></a>
- <a class="cancellink popup" href="#" title="{%
trans "don't move this page" %}">{% trans "cancel" %}</a>
+ <a class="cancellink" href="#" title="{%
trans "don't move this page" %}">{% trans "cancel" %}</a>
</div>
- <div id="move-target-{{ page.id }}" class="insert popup
container">
- <a class="cancellink popup" href="#" title="{%
trans "don't insert a new page here" %}">{% trans "cancel" %}</a>
+ <div id="move-target-{{ page.id }}" class="insert
container">
+ <a class="cancellink" href="#" title="{%
trans "don't insert a new page here" %}">{% trans "cancel" %}</a>
<a href="#" class="move-target left" title="{%
trans "insert above" %}"></a>
<a href="#" class="move-target right" title="{%
trans "insert below" %}"></a>
<a href="#" class="move-target first-child" title="{%
trans "insert as child" %}"></a>
@@ -31,15 +31,15 @@
</div>
</th>
<td class="language-cell">
- <ul class="popup">
+ <ul>
{% for lang in page_languages %}
- <li class="{% if not forloop.last %}last{% endif %}">
- {% if page|has_content_in:lang.0 %}
- <a href="{{ url }}{{ page.id }}/?language={{
lang.0 }}" class="changelink" title="{% blocktrans with lang.1|lower as
lang %}edit {{ lang }} translation{% endblocktrans %}">{{ lang.0 }}</a>
- {% else %}
- <a href="{{ url }}{{ page.id }}/?language={{
lang.0 }}" class="changelink addlang" title="{% blocktrans with lang.1|
lower as lang %}create {{ lang }} translation{% endblocktrans %}">{{ lang.0
}}</a>
- {% endif %}
- </li>
+ <li>
+ {% if page|has_content_in:lang.0 %}
+ <a href="{{ url }}{{ page.id }}/?language={{
lang.0 }}" class="changelink" title="{% blocktrans with lang.1|lower as
lang %}edit {{ lang }} translation{% endblocktrans %}">{{ lang.0 }}</a>
+ {% else %}
+ <a href="{{ url }}{{ page.id }}/?language={{
lang.0 }}" class="changelink addlang" title="{% blocktrans with lang.1|
lower as lang %}create {{ lang }} translation{% endblocktrans %}">{{ lang.0
}}</a>
+ {% endif %}
+ </li>
{% endfor %}
</ul>
</td>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
