[Plone-cvs] r10872 - in ResourceRegistries/branches/1.3: . doc www

[fschulze <svn...@pl...>]

Author: fschulze
Date: Mon Sep 11 20:52:20 2006
New Revision: 10872

Modified:
   ResourceRegistries/branches/1.3/doc/HISTORY.txt
   ResourceRegistries/branches/1.3/version.txt
   ResourceRegistries/branches/1.3/www/cssconfig.zpt
   ResourceRegistries/branches/1.3/www/jsconfig.zpt
Log:
Updated branch with changes from trunk.

Modified: ResourceRegistries/branches/1.3/doc/HISTORY.txt
==============================================================================
--- ResourceRegistries/branches/1.3/doc/HISTORY.txt	(original)
+++ ResourceRegistries/branches/1.3/doc/HISTORY.txt	Mon Sep 11 20:52:20 2006
@@ -1,9 +1,15 @@
-1.3.2 (SVN/unreleased)
+1.3.3 (SVN/unreleased)
 ======================
 
+1.3.2
+=====
+
  * Made GenericSetup importer not fail on repeated imports.
    [alecm]
 
+ * Made enabled checkbox work again.
+   [fschulze]
+
 1.3.1
 =====
 
@@ -53,6 +59,33 @@
    portal creation)
    [rafrombrc]
 
+1.2.4
+=====
+
+ * Made enabled checkbox work again.
+   [fschulze]
+
+1.2.3
+=====
+
+ * Backported several fixes from 1.3.1:
+   [fschulze]
+
+     - Enable use of z3 / Five resources.
+       [ree]
+
+     - Mark missing or unaccessible ressources in management screens.
+       [fschulze]
+
+     - Moved 'enabled' checkbox into legend before 'id' textbox.
+       [fschulze]
+
+     - Don't remove conditional compile instructions for IE from javascripts.
+       [fschulze]
+
+     - Fixed error when content is unicode.
+       [rocky]
+
 1.2.2
 =====
 

Modified: ResourceRegistries/branches/1.3/version.txt
==============================================================================
--- ResourceRegistries/branches/1.3/version.txt	(original)
+++ ResourceRegistries/branches/1.3/version.txt	Mon Sep 11 20:52:20 2006
@@ -1 +1 @@
-1.3.1 (SVN/unreleased)
+1.3.3 (SVN/unreleased)

Modified: ResourceRegistries/branches/1.3/www/cssconfig.zpt
==============================================================================
--- ResourceRegistries/branches/1.3/www/cssconfig.zpt	(original)
+++ ResourceRegistries/branches/1.3/www/cssconfig.zpt	Mon Sep 11 20:52:20 2006
@@ -170,6 +170,9 @@
       <fieldset tal:define="resourceExists python:path('exists:portal/%s' % stylesheet.getId());"
                 tal:attributes="class python:test(resourceExists, nothing, 'notFound')">
 
+        <input type="hidden" name="stylesheets.sort:records:int"
+               tal:attributes="value repeat/stylesheet/index" />
+
         <legend>
             <label class="hiddenLabel">Enabled?</label>
             <input type="checkbox" name="stylesheets.enabled:records"
@@ -199,9 +202,6 @@
                 <span tal:condition="not:resourceExists">(resource not found or not accessible)</span>
         </legend>
         
-        <input type="hidden" name="stylesheets.sort:records:int"
-               tal:attributes="value repeat/stylesheet/index" />
-
         <div class="stylesheetform">
             <label>Title</label>
             <input type="text" name="stylesheets.title:records"

Modified: ResourceRegistries/branches/1.3/www/jsconfig.zpt
==============================================================================
--- ResourceRegistries/branches/1.3/www/jsconfig.zpt	(original)
+++ ResourceRegistries/branches/1.3/www/jsconfig.zpt	Mon Sep 11 20:52:20 2006
@@ -170,6 +170,9 @@
       <fieldset tal:define="resourceExists python:path('exists:portal/%s' % script.getId());"
                 tal:attributes="class python:test(resourceExists, nothing, 'notFound')">
 
+        <input type="hidden" name="scripts.sort:records:int"
+               tal:attributes="value repeat/script/index" />
+
         <legend>
             <label class="hiddenLabel">Enabled?</label>
             <input type="checkbox" name="scripts.enabled:records:boolean"
@@ -198,10 +201,6 @@
             <span tal:condition="not:resourceExists">(resource not found or not accessible)</span>
         </legend>
 
-        <input type="hidden" name="scripts.sort:records:int"
-               tal:attributes="value repeat/script/index" />
-
-
         <div class="scriptform">
             <label>Condition</label>
             <input type="text" name="scripts.expression:records:string" size="25"