[kupu-checkins] r48419 - in kupu/trunk/kupu: common default plone/kupu_plone_layer
duncan at codespeak.net
duncan at codespeak.net
Thu Nov 8 16:14:08 CET 2007
Author: duncan
Date: Thu Nov 8 16:14:05 2007
New Revision: 48419
Modified:
kupu/trunk/kupu/common/kupudrawerstyles.css
kupu/trunk/kupu/default/drawers.kupu
kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Plone ticket 7315 Kupu table of contents generator doesn't allow multiple paragraph styles to be selected in IE7
An IE bug prevented the display updating correctly. I've changed the drawer layout to avoid triggering the bug, and at the
same time tidied it up so that all tabs are the same height.
Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css (original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css Thu Nov 8 16:14:05 2007
@@ -275,13 +275,13 @@
white-space: nowrap;
}
-.kupu-tabs { border-bottom: 1px solid; margin: 0; padding: 0.5em 0 0 1.5em; }
+ul.kupu-tabs { border-bottom: 1px solid; margin: 0; padding: 0.5em 0.5em 1px 1.5em; }
.kupu-tabs li {
display: inline; padding: 2px; border: 1px solid; margin: 0 5px 0 0;
}
.kupu-tabs a { text-decoration: none; }
.kupu-tabs li.selected { background: white; border-bottom: none !IMPORTANT; padding-bottom: 3px;}
-table.kupu-tabbed { border-spacing: 0;}
+.kupu-panels table.kupu-tabbed { border:none; border-spacing: 0;}
.kupu-linkdrawer-addlink .kupu-embed,
.kupu-linkdrawer-embed .kupu-addlink { display: none; }
@@ -299,6 +299,9 @@
.kupu-ins-bm .hide-ins-bm, .kupu-anchor .hide-anchor, .kupu-toc .hide-toc {
display: none;
}
+.kupu-ins-bm .invis-ins-bm, .kupu-anchor .invis-anchor, .kupu-toc .invis-toc {
+ visibility: hidden; /* Hide controls without changing surrounding layout */
+}
.image-dimensions {
display: none;
@@ -318,6 +321,10 @@
.kupu-bm-level1 SPAN { padding-left: 2em; }
/* Anchor drawer */
+.kupu-bm-help { min-height: 2.5em; }
+.kupu-bm-heading { line-height: 2em; border-bottom: 1px solid; }
+.kupu-bm-tablestyle, .kupu-bm-numbering { float:right; padding-left: 0.5em; }
+
.kupu-drawer label {
font-weight: normal;
vertical-align:middle;
Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu (original)
+++ kupu/trunk/kupu/default/drawers.kupu Thu Nov 8 16:14:05 2007
@@ -297,14 +297,14 @@
<li class="kupu-toc"
tal:condition="filter/toc-tab|nothing"><a href="#" i18n:translate="tab_toc">Table of contents</a></li>
</ul>
- <table class="kupu-tabbed">
+ <table class="kupu-tabbed" cellspacing="0">
<tr>
<td class="kupu-bm-select">
<select id="kupu-bm-sel1" size="10"> </select>
</td>
- <td rowspan="2">
- <div class="kupu-bm-heading hide-ins-bm">
- <div style="float:right" class="hide-anchor">
+ <td>
+ <div class="kupu-bm-heading">
+ <div class="kupu-bm-tablestyle invis-ins-bm invis-anchor">
<label i18n:translate="label_table_style" for="kupu-bm-outcls">
Table style
</label>
@@ -312,39 +312,43 @@
<option value="" i18n:translate="Normal">Normal paragraph</option>
</select>
</div>
- <div style="float:right" class="hide-anchor">
+ <div class="kupu-bm-numbering invis-ins-bm invis-anchor">
<label i18n:translate="label_numbering" for="kupu-bm-number">
Numbering
</label>
- <input type="checkbox" checked="checked" id="kupu-bm-number"/>
+ <input type="checkbox" class="hide-ins-bm hide-anchor" checked="checked" id="kupu-bm-number"/>
+ </div>
+ <div class="invis-ins-bm">
+ <label for="kupu-bm-checkall">
+ <em i18n:translate="label_toggle_all">toggle all</em>
+ </label>
+ <input type="checkbox" class="hide-ins-bm" checked="checked" id="kupu-bm-checkall"/>
</div>
- <label for="kupu-bm-checkall">
- <em i18n:translate="label_toggle_all">toggle all</em>
- </label>
- <input type="checkbox" checked="checked" id="kupu-bm-checkall"/>
</div>
<div class="kupu-bm-paras"> </div>
- <div class="kupu-bm-helpanchor hide-anchor hide-toc"
- i18n:translate="create_anchor_link_help">
- Select a paragraph style then choose a paragraph and Ok to insert a link to that location.
- </div>
- <div class="kupu-bm-helptoc hide-ins-bm hide-anchor"
- i18n:translate="create_toc_help">
- Select one or two paragraph styles, then Ok to insert a table of contents.
- </div>
- <div class="hide-ins-bm hide-toc" i18n:translate="create_anchor_help">
- Anchors are created for checked paragraphs and
- removed for unchecked paragraphs when you press Ok.
- Anchors in use on this page may not be deleted.
- </div>
</td>
</tr>
<tr>
- <td class="hide-ins-bm hide-anchor">
+ <td>
<select id="kupu-bm-sel2" size="1" class="hide-ins-bm hide-anchor">
<option value="" i18n:translate="opt_2nd_style">(optional 2nd style)</option>
</select>
</td>
+ <td>
+ <div class="kupu-bm-help">
+ <span class="hide-anchor hide-toc discreet" i18n:translate="create_anchor_link_help">
+ Select a paragraph style then choose a paragraph and Ok to insert a link to that location.
+ </span>
+ <span class="hide-ins-bm hide-anchor discreet" i18n:translate="create_toc_help">
+ Select one or two paragraph styles, then Ok to insert a table of contents.
+ </span>
+ <span class="hide-ins-bm hide-toc discreet" i18n:translate="create_anchor_help">
+ Anchors are created for checked paragraphs and
+ removed for unchecked paragraphs when you press Ok.
+ Anchors in use on this page may not be deleted.
+ </span>
+ </div>
+ </td>
</tr>
</table>
<div class="kupu-dialogbuttons">
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html Thu Nov 8 16:14:05 2007
@@ -404,14 +404,14 @@
<li class="kupu-anchor" tal:condition="filter/manage-anchors-tab"><a href="#" i18n:translate="tab_manage_anchors">Manage Anchors</a></li>
<li class="kupu-toc" tal:condition="filter/toc-tab|nothing"><a href="#" i18n:translate="tab_toc">Table of contents</a></li>
</ul>
- <table class="kupu-tabbed">
+ <table class="kupu-tabbed" cellspacing="0">
<tr>
<td class="kupu-bm-select">
<select id="kupu-bm-sel1" size="10"> </select>
</td>
- <td rowspan="2">
- <div class="kupu-bm-heading hide-ins-bm">
- <div style="float:right" class="hide-anchor">
+ <td>
+ <div class="kupu-bm-heading">
+ <div class="kupu-bm-tablestyle invis-ins-bm invis-anchor">
<label i18n:translate="label_table_style" for="kupu-bm-outcls">
Table style
</label>
@@ -419,37 +419,43 @@
<option value="" i18n:translate="Normal">Normal paragraph</option>
</select>
</div>
- <div style="float:right" class="hide-anchor">
+ <div class="kupu-bm-numbering invis-ins-bm invis-anchor">
<label i18n:translate="label_numbering" for="kupu-bm-number">
Numbering
</label>
- <input type="checkbox" checked="checked" id="kupu-bm-number"/>
+ <input type="checkbox" class="hide-ins-bm hide-anchor" checked="checked" id="kupu-bm-number"/>
+ </div>
+ <div class="invis-ins-bm">
+ <label for="kupu-bm-checkall">
+ <em i18n:translate="label_toggle_all">toggle all</em>
+ </label>
+ <input type="checkbox" class="hide-ins-bm" checked="checked" id="kupu-bm-checkall"/>
</div>
- <label for="kupu-bm-checkall">
- <em i18n:translate="label_toggle_all">toggle all</em>
- </label>
- <input type="checkbox" checked="checked" id="kupu-bm-checkall"/>
</div>
<div class="kupu-bm-paras"> </div>
- <div class="kupu-bm-helpanchor hide-anchor hide-toc" i18n:translate="create_anchor_link_help">
- Select a paragraph style then choose a paragraph and Ok to insert a link to that location.
- </div>
- <div class="kupu-bm-helptoc hide-ins-bm hide-anchor" i18n:translate="create_toc_help">
- Select one or two paragraph styles, then Ok to insert a table of contents.
- </div>
- <div class="hide-ins-bm hide-toc" i18n:translate="create_anchor_help">
- Anchors are created for checked paragraphs and
- removed for unchecked paragraphs when you press Ok.
- Anchors in use on this page may not be deleted.
- </div>
</td>
</tr>
<tr>
- <td class="hide-ins-bm hide-anchor">
+ <td>
<select id="kupu-bm-sel2" size="1" class="hide-ins-bm hide-anchor">
<option value="" i18n:translate="opt_2nd_style">(optional 2nd style)</option>
</select>
</td>
+ <td>
+ <div class="kupu-bm-help">
+ <span class="hide-anchor hide-toc discreet" i18n:translate="create_anchor_link_help">
+ Select a paragraph style then choose a paragraph and Ok to insert a link to that location.
+ </span>
+ <span class="hide-ins-bm hide-anchor discreet" i18n:translate="create_toc_help">
+ Select one or two paragraph styles, then Ok to insert a table of contents.
+ </span>
+ <span class="hide-ins-bm hide-toc discreet" i18n:translate="create_anchor_help">
+ Anchors are created for checked paragraphs and
+ removed for unchecked paragraphs when you press Ok.
+ Anchors in use on this page may not be deleted.
+ </span>
+ </div>
+ </td>
</tr>
</table>
<div class="kupu-dialogbuttons">
More information about the kupu-checkins
mailing list