[Checkins] SVN: zopeorg.theme/trunk/zopeorg/theme/ Simplify the divider: use simple string fields instead of a rich text field

[Wichert Akkerman]

Log message for revision 84064:
  Simplify the divider: use simple string fields instead of a rich text field

Changed:
  U   zopeorg.theme/trunk/zopeorg/theme/browser/templates/feature.pt
  U   zopeorg.theme/trunk/zopeorg/theme/browser/viewlets.py
  U   zopeorg.theme/trunk/zopeorg/theme/content/feature.py
  U   zopeorg.theme/trunk/zopeorg/theme/skins/zopeorg_theme_styles/main.css.dtml

-=-
Modified: zopeorg.theme/trunk/zopeorg/theme/browser/templates/feature.pt
===================================================================
--- zopeorg.theme/trunk/zopeorg/theme/browser/templates/feature.pt	2008-02-19 19:11:53 UTC (rev 84063)
+++ zopeorg.theme/trunk/zopeorg/theme/browser/templates/feature.pt	2008-02-19 19:25:08 UTC (rev 84064)
@@ -10,5 +10,12 @@
 </div>
 
 <div id="portal-header-divider">
-    <tal:divider metal:use-macro="view/divider" />
-</div>
\ No newline at end of file
+    <tal:block condition="view/divider_url">
+        <a tal:attributes="href view/divider_url">
+            <tal:divider metal:use-macro="view/divider" />
+        </a>
+    </tal:block>
+    <tal:block condition="not:view/divider_url">
+        <tal:divider metal:use-macro="view/divider" />
+    </tal:block>
+</div>

Modified: zopeorg.theme/trunk/zopeorg/theme/browser/viewlets.py
===================================================================
--- zopeorg.theme/trunk/zopeorg/theme/browser/viewlets.py	2008-02-19 19:11:53 UTC (rev 84063)
+++ zopeorg.theme/trunk/zopeorg/theme/browser/viewlets.py	2008-02-19 19:25:08 UTC (rev 84064)
@@ -24,11 +24,13 @@
         return self.context.widget('blurb', mode='view')
     
     def divider(self):
-        # return self.context.getDivider()  
         return self.context.widget('divider', mode='view')
+
+    def divider_url(self):
+        return self.context.getDivider_url()
     
 class ZopeorgSearchBoxViewlet(SearchBoxViewlet):
     render = ViewPageTemplateFile('templates/searchbox.pt')
     
 class ZopeorgPersonalBarViewlet(PersonalBarViewlet):
-    render = ViewPageTemplateFile('templates/anonymous_personal_bar.pt')
\ No newline at end of file
+    render = ViewPageTemplateFile('templates/anonymous_personal_bar.pt')

Modified: zopeorg.theme/trunk/zopeorg/theme/content/feature.py
===================================================================
--- zopeorg.theme/trunk/zopeorg/theme/content/feature.py	2008-02-19 19:11:53 UTC (rev 84063)
+++ zopeorg.theme/trunk/zopeorg/theme/content/feature.py	2008-02-19 19:25:08 UTC (rev 84064)
@@ -1,7 +1,9 @@
 from Products.Archetypes.public import Schema
 from Products.Archetypes.public import ImageWidget
 from Products.Archetypes.public import RichWidget
+from Products.Archetypes.public import StringWidget
 from Products.Archetypes.public import ImageField
+from Products.Archetypes.public import StringField
 from Products.Archetypes.public import TextField
 from Products.Archetypes.public import AnnotationStorage
 from Products.validation import V_REQUIRED
@@ -53,14 +55,12 @@
                 default=u"Will be shown next to the blurb."),
             show_content_type = False)
     ),
-    TextField("divider",
+    StringField("divider",
               required=False,
               searchable=False,
               primary=False,
               storage = AnnotationStorage(migrate=True),
-              validators = ("isTidyHtmlWithCleanup",),
-              default_output_type = "text/x-html-safe",
-              widget = RichWidget(
+              widget = StringWidget(
                         label = _(u"label_divider",
                             default=u"Divider line"),
                         description = _(u"help_divider",
@@ -69,10 +69,25 @@
                         rows = 5,
                         allow_file_upload = False),
     ),
+    StringField("divider_url",
+              required=False,
+              searchable=False,
+              primary=False,
+              storage = AnnotationStorage(migrate=True),
+              widget = StringWidget(
+                        label = _(u"label_divider_url",
+                            default=u"Divider link"),
+                        description = _(u"help_divider_url",
+                            default=u"If you specify a URL here the divider "
+                                    u"act as a a link."),
+                        ),
+    ),
     ))
 
 FeatureSchema.moveField("blurb", after="description")
 FeatureSchema.moveField("image", after="blurb")
+FeatureSchema.moveField("divider", after="image")
+FeatureSchema.moveField("divider_url", after="divider")
 
 
 class Feature(ATDocument):

Modified: zopeorg.theme/trunk/zopeorg/theme/skins/zopeorg_theme_styles/main.css.dtml
===================================================================
--- zopeorg.theme/trunk/zopeorg/theme/skins/zopeorg_theme_styles/main.css.dtml	2008-02-19 19:11:53 UTC (rev 84063)
+++ zopeorg.theme/trunk/zopeorg/theme/skins/zopeorg_theme_styles/main.css.dtml	2008-02-19 19:25:08 UTC (rev 84064)
@@ -121,7 +121,7 @@
     border: 1px solid &dtml-globalBorderColor;;
     border-style: solid none;
     text-align: center;
-    padding: 1.5em 0 0.75em;
+    padding: 0.5em 0 0.25em;
 }
 #portal-header-divider table {
     text-align: left;