Conjunto de mudanças 6578 no repositório publico

Timestamp:

28/06/2012 20:38:10 (9 anos atrás)

Autor:

mazza

Mensagem:

refatoracao: IRelated como schema base (detalhes de interface)

Localização:

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser

Arquivos:

• boxes/interfaces.py (modificado) (2 diffs)
• boxes/templates/ihighlight.html (modificado) (1 diff)
• boxes/templates/irelated.html (adicionado)
• boxes/templates/isupertitlebox.html (modificado) (1 diff)
• homes.py (modificado) (2 diffs)

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/boxes/interfaces.py

@@ -22 +22 @@
 
 
-@rich(text=WysiwygFieldWidget, target=AutocompleteFieldWidget)
+# TODO: title in "almost" WysiwygFieldWidget... (just <b></b> allowed)... configure Tiny and filters
+@rich(text=WysiwygFieldWidget,
+      target=AutocompleteFieldWidget)
 class IRelated(BoxSchema):
     target = schema.Choice(title=u"Conteúdo relacionado",
@@ -33 +35 @@
 
 class ISuperTitleBox(IRelated):
+    # TODO: usar hint para que este campo seja o primeiro
     supertitle = schema.TextLine(title=u"Supertítulo", required=True)
 

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/boxes/templates/ihighlight.html

@@ -1 @@
-      <h2 class="box-header">Destaque</h2>
-      TODO: <br/><br/><br/>
+<h2 class="box-header">Destaque</h2>
+TODO: <br/><br/><br/>

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/boxes/templates/isupertitlebox.html

@@ -1 +1 @@
         <div class="simple-box">
-          <a href="/portal/{{target}}">
-            <h2>{{title}}</h2>
-            <h3 class="icon-news">{{subtitle}}</h3>
+          <a href="/portal/{{ target }}">
+            <h2>{{ supertitle }}</h2>
+            <h3 class="icon-news">{{ title }}</h3>
             <p>
               {{text}}

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/homes.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
+from collections import defaultdict
+from itertools import count
+
 from Products.CMFPlone.interfaces import IPloneSiteRoot
+from five import grok
+
 from boxes.carousel import CarouselBox
-from boxes.interfaces import ISuperTitleBox, ICalendar, IAcompanheOInterlegis, IHighlight
+from boxes.interfaces import ISuperTitleBox, ICalendar, IAcompanheOInterlegis, IHighlight, IRelated
 from boxes.manager import DtRow, Box, GridView
 from boxes.tabs import Tab, TabbedPane
-from five import grok
 from interfaces import \
      IComunidadeLegislativa, IInformacao, ICapacitacao, ITecnologia, IComunicacao
 
 
-# These are meant for more legible grid definitions. Do not overuse.
+# These are meant for more readable grid definitions. Do not overuse.
 FULL = 16
-___, _ = DtRow, Box
-
+_count_dict = defaultdict(count)
+def _(interface):
+    return Box(interface, _count_dict[interface].next())
+___ = DtRow
 
 class Home(GridView):
@@ -21 +27 @@
 
     grid = [
-        ___((10, CarouselBox()), (6, _(ICalendar, 1)),),
+        ___((10, CarouselBox()), (6, _(ICalendar)),),
         ___((FULL, TabbedPane(
             Tab(u'Informação',  u'Informação Legislativa',
-                (4, _(IHighlight, 1)), (4, _(IHighlight, 1)), (4, _(IHighlight, 1)), (4, _(IHighlight, 1)),),
+                (4, _(IRelated)), (4, _(IRelated)), (4, _(IRelated)), (4, _(IRelated)),),
             Tab(u'Capacitação', u'Capacitação Legislativa',
-                (4, _(IHighlight, 1)), (4, _(IHighlight, 1)), (4, _(IHighlight, 1)), (4, _(IHighlight, 1)),),
+                (4, _(IRelated)), (4, _(IRelated)), (4, _(IRelated)), (4, _(IRelated)),),
             Tab(u'Tecnologia',  u'Tecnologia Legislativa',
-                (4, _(IHighlight, 1)), (4, _(IHighlight, 1)), (4, _(IHighlight, 1)), (4, _(IHighlight, 1)),),
+                (4, _(IRelated)), (4, _(IRelated)), (4, _(IRelated)), (4, _(IRelated)),),
             Tab(u'Comunicação', u'Comunicação Legislativa',
-                (4, _(IHighlight, 1)), (4, _(IHighlight, 1)), (4, _(IHighlight, 1)), (4, _(IHighlight, 1)),),
+                (4, _(IRelated)), (4, _(IRelated)), (4, _(IRelated)), (4, _(IRelated)),),
             ))),
-        ___((FULL, _(IAcompanheOInterlegis, 1)), ),
-        ___((4, _(IHighlight, 1)), (4, _(ISuperTitleBox, 1)), (4, _(ISuperTitleBox, 2)), (4, _(ISuperTitleBox, 3)),),
+        ___((FULL, _(IAcompanheOInterlegis)), ),
+        ___((4, _(IHighlight)), (4, _(ISuperTitleBox)), (4, _(ISuperTitleBox)), (4, _(ISuperTitleBox)),),
     ]