[Plone-cvs] r9914 - in CMFPlone/branches/2.5/skins: plone_form_scripts plone_prefs

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

Author: wichert
Date: Sat May 27 22:38:57 2006
New Revision: 9914

Modified:
   CMFPlone/branches/2.5/skins/plone_form_scripts/reconfig.cpy
   CMFPlone/branches/2.5/skins/plone_prefs/reconfig_form.cpt
Log:
Improve UI of allowRoleToAddKeyword options

Modified: CMFPlone/branches/2.5/skins/plone_form_scripts/reconfig.cpy
==============================================================================
--- CMFPlone/branches/2.5/skins/plone_form_scripts/reconfig.cpy	(original)
+++ CMFPlone/branches/2.5/skins/plone_form_scripts/reconfig.cpy	Sat May 27 22:38:57 2006
@@ -11,11 +11,22 @@
 from Products.CMFPlone import PloneMessageFactory as _
 
 REQUEST=context.REQUEST
+
+marker=[]
+
+if REQUEST.get("submitted", marker) is marker:
+    return state
+
 portal_properties=context.portal_properties
 portal_properties.editProperties(REQUEST)
 portal_properties.site_properties.manage_changeProperties(REQUEST)
 context.portal_url.getPortalObject().manage_changeProperties(REQUEST)
 
+roles=REQUEST.get('tmp_allowRoleToAddKeyword', [])
+if roles is not None:
+	portal_properties.site_properties.manage_changeProperties(
+			allowRolesToAddKeywords=roles)
+
 from Products.CMFPlone.utils import transaction_note
 transaction_note('Reconfigured portal')
 

Modified: CMFPlone/branches/2.5/skins/plone_prefs/reconfig_form.cpt
==============================================================================
--- CMFPlone/branches/2.5/skins/plone_prefs/reconfig_form.cpt	(original)
+++ CMFPlone/branches/2.5/skins/plone_prefs/reconfig_form.cpt	Sat May 27 22:38:57 2006
@@ -354,21 +354,34 @@
             <div class="field"
                  tal:condition="exists:site_properties/allowRolesToAddKeywords"
                  tal:define="allowRolesToAddKeywords request/allowRolesToAddKeywords|site_properties/allowRolesToAddKeywords;
-                             error errors/allowRolesToAddKeywords | nothing;
-                             content python:'\n'.join(allowRolesToAddKeywords)"
+		             avail_roles python:mtool.getCandidateLocalRoles(here);
+                             error errors/allowRolesToAddKeywords | nothing;"
                   >
-
-                <label i18n:translate="label_allowRolesToAddKeywords">Roles Allowed To Add Keywords</label>
+              <fieldset id="fieldset_allowRolesToAddKeywords">
+                <legend i18n:translate="label_allowRolesToAddKeywords">Roles allowed to add keywords</legend>
 
                 <div class="formHelp" i18n:translate="help_allowRolesToAddKeywords">
-                   Determines which roles are allowed to add keywords.
+                  Users with one of the roles selected here are allowed to add
+                  keywords to the site.
                 </div>
-                <textarea name="allowRolesToAddKeywords" id="ta_allowRolesToAddKeywords"
-                   rows="5" cols="15"
-                  tal:content="content"
-                >
-                </textarea>
 
+		<ul class="configlets"
+                    tal:define="allowed_roles site_properties/allowRolesToAddKeywords">
+                  <li tal:repeat="role avail_roles">
+                    <input class="noborder"
+                           type="checkbox"
+                           name="tmp_allowRoleToAddKeyword:list"
+                           tal:attributes="value role;
+                                           id string:tmp_allowRoleToAddKeyword_${role};
+                                           checked python:test(role in allowed_roles, 'checked', '');"/>
+                    <label for=""
+                           i18n:translate=""
+                           tal:attributes="for string:tmp_allowRoleToAddKeyword_${role}"
+                           tal:content="role"
+                           />
+                  </li>
+                </ul>
+              </fieldset>
             </div>
 
             <div class="formControls">
@@ -386,6 +399,7 @@
         </fieldset>
 
         <input type="hidden" name="form.submitted" value="1" />
+        <input type="hidden" name="submitted" value="1" />
 
     </form>