[Checkins] SVN: z3ext.preferences/trunk/ Fixed group category layout

[Nikolay Kim]

Log message for revision 85093:
  Fixed group category layout

Changed:
  U   z3ext.preferences/trunk/CHANGES.txt
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/group.py

-=-
Modified: z3ext.preferences/trunk/CHANGES.txt
===================================================================
--- z3ext.preferences/trunk/CHANGES.txt	2008-04-04 08:06:12 UTC (rev 85092)
+++ z3ext.preferences/trunk/CHANGES.txt	2008-04-04 08:56:08 UTC (rev 85093)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.0.1 (2008-04-04)
+------------------
+
+- Fixed group category layout
+
+
 1.0.0 (2008-03-25)
 ------------------
 

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt	2008-04-04 08:06:12 UTC (rev 85092)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt	2008-04-04 08:56:08 UTC (rev 85093)
@@ -5,13 +5,13 @@
 
   <tal:block tal:content="structure view/form_result" />
   
-  <tal:block tal:condition="view/editable">
+  <div class="frame" tal:condition="view/editable" tal:omit-tag="not:view/category">
     <tal:block repeat="group view/subgroups">
       <div tal:condition="nocall:group/view"
 	   tal:content="structure python:group['view'].render(True)"></div>
       <br />
     </tal:block>
-  </tal:block>
+  </div>
 
   <div class="topframe" tal:condition="not:view/editable">
     <tal:block repeat="group view/subgroups">

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/group.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/group.py	2008-04-04 08:06:12 UTC (rev 85092)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/group.py	2008-04-04 08:56:08 UTC (rev 85093)
@@ -35,6 +35,8 @@
     group = ViewPageTemplateFile('group.pt')
     template = ViewPageTemplateFile('edit.pt')
 
+    category = False
+
     @property
     def label(self):
         return self.context.__title__
@@ -51,6 +53,10 @@
         context = self.context
         request = self.request
 
+        self.hasFields = bool(schema.getFields(context.__schema__))
+        if self.hasFields:
+            super(PreferenceGroup, self).update()
+
         if IPreferenceCategory.providedBy(context):
             subgroups = []
 
@@ -63,6 +69,8 @@
 
             self.subgroups = [{'group': group, 'view': view}
                               for t, group, view in subgroups]
+
+            self.category = True
         else:
             subgroups = []
             for name, group in context.items():
@@ -82,9 +90,6 @@
             if subgroups:
                 self.editable = True
 
-        self.hasFields = bool(schema.getFields(context.__schema__))
-        if self.hasFields:
-            super(PreferenceGroup, self).update()
 
     form_result = u''