Author: gabriel.walt
Date: Tue May 5 09:54:00 2009
New Revision: 511
Modified:
branches/electron/pages/admin/__init__.py
branches/electron/pages/media/pages/css/pages.css
branches/electron/pages/templates/admin/pages/page/change_form.html
branches/electron/pages/templates/admin/pages/page/includes/fieldset.html
Log:
IE6 fixes
Modified: branches/electron/pages/admin/__init__.py
==============================================================================
--- branches/electron/pages/admin/__init__.py (original)
+++ branches/electron/pages/admin/__init__.py Tue May 5 09:54:00 2009
@@ -50,11 +50,11 @@
fieldsets = (
(_('General'), {
'fields': general_fields,
- 'classes': ('module-general', 'sidebar',),
+ 'classes': ('module-general',),
}),
(_('Options'), {
'fields': normal_fields,
- 'classes': ('module-options', 'clearfix',),
+ 'classes': ('module-options',),
}),
)
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 09:54:00
2009
@@ -203,6 +203,7 @@
width: auto;
height: auto;
padding: 0 10px;
+ background: #FFFFBB; /* IE6 fix */
}
/* Move links */
@@ -210,6 +211,7 @@
display: none;
position: absolute;
right: 0; top: -4px;
+ height: 21px; /* IE6 fix */
}
.change-list .insertable .insert {
display: block;
@@ -330,21 +332,22 @@
/* Global */
.change-form .sidebar {
width: 288px;
- clear: left;
float: left;
+ display: inline; /* IE6 fix */
margin-right: 1em;
}
.change-form label {
+ width: 90px; /* IE6 fix */
line-height: 20px;
}
.change-form .sidebar input,
.change-form .sidebar select {
- width: 150px;
+ width: 148px;
}
.change-form .sidebar p.help,
.change-form .sidebar .form-row p.help {
margin-left: 0;
- padding: 0;
+ padding: 2px 0 0;
}
.change-form .sidebar div.description {
margin: 5px;
@@ -357,10 +360,11 @@
/* Title */
.module-general .title label {
+ float: none;
padding-top: 0;
}
.module-general .title input {
- width: 256px;
+ width: 248px;
font-size: 16px;
}
@@ -403,14 +407,17 @@
.change-form .module-options .language li {
display: inline;
list-style: none;
+ margin: 0;
padding: 0
}
.change-form .module-options .language .editlink,
.change-form .module-options .language .addlink,
.change-form .module-options .language .current {
- margin: 0 4px;
+ float: left;
+ display: inline; /* IE6 fix */
+ margin: 0 6px 0 0;
padding: 0 12px 0 0;
- line-height: 20px;
+ line-height: 16px;
font-weight: bold;
text-transform: uppercase;
background: none;
@@ -426,6 +433,9 @@
background: url(../images/icons/add.gif) right 0.2em no-repeat;
}
.change-form .module-options .language .current {
+ margin-right: 16px;
+ padding: 0 2px;
+ border: 1px solid #888;
color: black;
}
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 Tue
May 5 09:54:00 2009
@@ -20,11 +20,12 @@
{% endblock %}
<form id="page_form" action="?language={{ request.GET.language }}{%if
request.GET.target %}&target={{ request.GET.target }}{%
endif %}&{%if request.GET.target %}position={{ request.GET.position
}}{% endif %}" method="post">
+ <div class="sidebar">
{% for fieldset in adminform %}
{% include "admin/pages/page/includes/fieldset.html" %}
{% if forloop.first and not add %}
- <div><fieldset class="module module-translation-helper
aligned sidebar">
+ <fieldset class="module module-translation-helper aligned">
<h2>{% trans "Translation helper" %}</h2>
<div class="form-row">
<label for="translation-helper-select"
class="required">{% trans "Language:" %}</label>
@@ -36,9 +37,12 @@
</select>
<div id="translation-helper-content"></div>
</div>
- </fieldset></div>
+ </fieldset>
+
+ </div><div class="content">
{% endif %}
{% endfor %}
+ </div>
{% submit_row %}
</form>
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 09:54:00 2009
@@ -10,15 +10,15 @@
{% if field.field.is_hidden %}
{{ field.field }}
{% else %}
- <div class="field-box">
+ <div class="field-box clearfix">
{% if field.is_checkbox %}
{{ field.field }}{{ field.label_tag }}
{% else %}
{% ifequal field.field.name 'language' %}
<label>{% trans "Language:" %}</label>
- <ul>
+ <ul class="clearfix">
<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><span title="current translation"
class="current">de</span></li>
<li><a title="create english
translation" class="addlink" href="11/?language=en">en</a></li>
</ul>
{% else %}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
