From 10d4a15ca4339fc13ba128be4d4eaac256055f64 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Fri, 17 Oct 2008 09:38:41 +0000
Subject: [PATCH] allow hiding of controller macros, e.g. portlets

git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@2921 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 browser/action_macros.pt  |   6 ++++--
 browser/controller.py     |  15 +++++++++++----
 browser/icons/ledgrey.png | Bin 0 -> 493 bytes
 organize/party.py         |   7 ++++---
 stateful/publishing.py    |   4 ++--
 5 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 browser/icons/ledgrey.png

diff --git a/browser/action_macros.pt b/browser/action_macros.pt
index ab185c0..38492dc 100644
--- a/browser/action_macros.pt
+++ b/browser/action_macros.pt
@@ -8,7 +8,8 @@
     <div class="action"
          tal:attributes="class action/cssClass;
                          id action/dialogName|nothing;
-                         title action/description;">
+                         title action/description;"
+         i18n:attributes="title">
         <a href="#" target="target_window" title="Description text"
            tal:omit-tag="not:action/url"
            tal:attributes="href action/url;
@@ -18,7 +19,8 @@
            i18n:attributes="title"><img src="#" alt="icon"
                tal:condition="action/icon"
                tal:attributes="src string:$resourceBase${action/icon};
-                               alt action/description" />
+                               alt action/description"
+               i18n:attributes="alt" />
            <span i18n:translate=""
                  tal:condition="action/title"
                  tal:content="action/title">Action Title</span></a>
diff --git a/browser/controller.py b/browser/controller.py
index c44c408..3fcd482 100644
--- a/browser/controller.py
+++ b/browser/controller.py
@@ -83,7 +83,7 @@ class Macros(dict):
 
     def __init__(self, controller):
         self.controller = controller
-        self.identifiers = set()
+        self.identifiers = {}
 
     def register(self, slot, identifier=None, template=None, name=None,
                  priority=50, **kw):
@@ -91,21 +91,28 @@ class Macros(dict):
             # make sure a certain resource is only registered once
             if identifier in self.identifiers:
                 return
-            self.identifiers.add(identifier)
+            #self.identifiers.add(identifier)
+            self.identifiers[identifier] = True
         if template is None:
             template = self.standardTemplate
         if name is None:
             name = slot
-        macro = Macro(template, name, priority, **kw)
+        macro = Macro(template, name, priority, identifier=identifier, **kw)
         entry = self.setdefault(slot, [])
         entry.append(macro)
 
+    def hide(self, identifier):
+        self.identifiers[identifier] = False
+
     def __getitem__(self, key):
-        return list(sorted(self.get(key, []), key=lambda x: x.priority))
+        return [m for m in sorted(self.get(key, []), key=lambda x: x.priority)
+                  if self.identifiers.get(m.identifier, True)]
 
 
 class Macro(object):
 
+    identifier = ''
+
     def __init__(self, template, name, priority, **kw):
         self.template = template
         self.name = name
diff --git a/browser/icons/ledgrey.png b/browser/icons/ledgrey.png
new file mode 100644
index 0000000000000000000000000000000000000000..53369b02e60cfe3cad57b44403dec1fb367b6cf6
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru*a{H|5F20G{EGkp0e(qDK~yNu
zRgp1F6JZ?1f8TfC-SudDXFyp{BQ%mg!l(``5Eq<W9Gr=ZiMyMNt4<DG9EgjXgS!Dj
zAgRQVv<X9x&^QS>fwr_gDtF)Cr4oE^d%u^rJjIm?p<1#PggD>Kdi<{&(c-&Tr(fiU
z?8;|(o<wg=@fr@NpT#xl%TTOX8A@Ni$$Z0^8sSp-xVbGYNu(!38A?wQIh1v|S65@8
zq4K7DUojvhWpHJe*@fUW=$m2m;)0kiosqkAIcFcu-IoMLEssYYI~Z<Lz(vTo;3vC;
z+_@D$GNuwzpiGm5aROk#DQzMIg`PG>N)##MV>zP@2tt4ZWPs64pCUd!9xfWNT%v&@
zN7$BWZ~Q))oN)2*@o<2ARD)KM*L0`9R}~B{9t8q|(Uu`)uS)7byOunCFzMps6W}6P
zGIBmPj#s(V@Mln8sn$~rpiqFJ%ZJ9n6Z+r)$a(T<D?6L>N|p{WUys+`|61h)KwbMR
ja31Ozu!s3~(tqJ!rVF8wY5L-&00000NkvXXu0mjf5c<wk

literal 0
HcmV?d00001

diff --git a/organize/party.py b/organize/party.py
index 508aa7b..cb0cb96 100644
--- a/organize/party.py
+++ b/organize/party.py
@@ -48,10 +48,11 @@ class Person(object):
     def age(self):
         return self.ageAt(date.today())
 
-    def ageAt(self, date):
-        if not self.birthDate:
+    def ageAt(self, dt):
+        bd = self.birthDate
+        if not bd:
             return None
-        return int((date - self.birthDate).days/365.25)
+        return int((dt - date(bd.year, bd.month, bd.day)).days/365.25)
 
 
 class Address(object):
diff --git a/stateful/publishing.py b/stateful/publishing.py
index 41a9d90..5b376e3 100644
--- a/stateful/publishing.py
+++ b/stateful/publishing.py
@@ -35,9 +35,9 @@ def simplePublishing():
     return StatesDefinition('simple_publishing',
         State('private', 'private', ('show', 'archive', 'remove'), color='red'),
         State('draft', 'draft', ('publish', 'hide', 'archive', 'remove'),
-              color='yellow'),
+              color='blue'),
         State('published', 'published', ('retract', 'archive'), color='green'),
-        State('archived', 'archived', ('show', 'remove'), color='lightblue'),
+        State('archived', 'archived', ('show', 'remove'), color='grey'),
         State('removed', 'removed', ('show',), icon='cancel.png'),
         Transition('show', 'show', 'draft'),
         Transition('hide', 'hide', 'private'),