[kupu-checkins] r41836 - in kupu/trunk/kupu: common default doc

[duncan at codespeak.net]

Author: duncan
Date: Tue Apr  3 10:36:10 2007
New Revision: 41836

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/doc/CHANGES.txt
Log:
Make ToC numbering optional

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Tue Apr  3 10:36:10 2007
@@ -1425,6 +1425,7 @@
         this.style1 = getFromSelector('kupu-bm-sel1');
         this.style2 = getFromSelector('kupu-bm-sel2');
         this.ostyle = getFromSelector('kupu-bm-outcls');
+        this.nstyle = getFromSelector('kupu-bm-number');
         this.radio1 = getFromSelector('kupu-ins-bm');
         this.radio2 = getFromSelector('kupu-toc');
         this.paralist = getBaseTagClass(this.element, 'div', 'kupu-bm-paras');
@@ -1532,7 +1533,7 @@
                     };
                     var li = ed.newElement('li', {'className': 'level'+level},
                         [ed.newElement('a', {'href': '#'+a},
-                        [ed.newText(number + ' ' + caption)])]);
+                        [ed.newText((this.nstyle.checked?number + ' ':'') + caption)])]);
 
                     if (level==0) {
                         toc.appendChild(li);

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Tue Apr  3 10:36:10 2007
@@ -268,6 +268,12 @@
                     <option value="" i18n:translate="">Normal</option>
                   </select>
                 </div>
+                <div style="float:right">
+                  <label i18n:translate="" for="kupu-bm-number">
+                    Numbering
+                  </label>
+                  <input type="checkbox" checked="checked" id="kupu-bm-number"/>
+                </div>
                 <label for="kupu-bm-checkall">
                   <em i18n:translate="">toggle all</em>
                 </label>

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Tue Apr  3 10:36:10 2007
@@ -2,8 +2,19 @@
 Kupu changes
 ============
 
+- latest
   - Adjusted some more Plone tests to work on Plone 3.0.
 
+  - Kupu is automatically suppressed when the content being edited
+    starts with an html comment (<!--).
+
+  - getToolByName directed through a local kupu implementation in an
+    attempt to suppress CMFCore deprecation warning. (This is the wrong
+    way round, we should really call queryUtility everywhere in kupu and
+    have the mapping fallback to getToolByName, but it should do for now)
+
+  - Table of contents numbering is now optional.
+
 - 1.4 Beta 4
 
   - Adjusted some Plone tests to work on Plone 3.0.