summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@entrouvert.com>2011-11-14 15:21:02 (GMT)
committerFrédéric Péters <fpeters@entrouvert.com>2011-11-14 15:21:02 (GMT)
commit5a4bc0e94168a1792478b2d91f6bf38db3d5e67c (patch)
tree1fa2aa8e5eca2f07427c31c7ec897b203a87ea27
parent8d2faae11d79ddf5c5b4b57618f029496dec7ddc (diff)
downloadtabellio.mixedcommittee-5a4bc0e94168a1792478b2d91f6bf38db3d5e67c.zip
tabellio.mixedcommittee-5a4bc0e94168a1792478b2d91f6bf38db3d5e67c.tar.gz
tabellio.mixedcommittee-5a4bc0e94168a1792478b2d91f6bf38db3d5e67c.tar.bz2
change first tab to composition, add agenda tab (#883)
-rw-r--r--tabellio/mixedcommittee/committee.py2
-rw-r--r--tabellio/mixedcommittee/folder.pt12
2 files changed, 9 insertions, 5 deletions
diff --git a/tabellio/mixedcommittee/committee.py b/tabellio/mixedcommittee/committee.py
index 4742583..74d71e7 100644
--- a/tabellio/mixedcommittee/committee.py
+++ b/tabellio/mixedcommittee/committee.py
@@ -13,7 +13,7 @@ from plone.namedfile.field import NamedImage
from tabellio.mixedcommittee import MessageFactory as _
class ICommittee(form.Schema):
- objectives = RichText(title=_(u'Objectives'), required=False)
+ composition = RichText(title=_(u'Composition'), required=False)
relationship = RichText(title=_(u'Relationship'), required=False)
resolutions = RichText(title=_(u'Resolutions'), required=False)
diff --git a/tabellio/mixedcommittee/folder.pt b/tabellio/mixedcommittee/folder.pt
index 6dcfc13..a8906b5 100644
--- a/tabellio/mixedcommittee/folder.pt
+++ b/tabellio/mixedcommittee/folder.pt
@@ -22,17 +22,21 @@
<div class="inner">
<div class="tabs_container">
<dl class="enableFormTabbing">
- <dt>Objectifs</dt>
+ <dt>Composition</dt>
<dd>
- <div tal:content="structure item/objectives/output"/>
+ <div tal:condition="item/composition" tal:content="structure item/composition/output"/>
</dd>
<dt>Entente</dt>
<dd>
- <div tal:content="structure item/relationship/output"/>
+ <div tal:condition="item/relationship" tal:content="structure item/relationship/output"/>
</dd>
<dt>Résolutions</dt>
<dd>
- <div tal:content="structure item/resolutions/output"/>
+ <div tal:condition="item/resolutions" tal:content="structure item/resolutions/output"/>
+ </dd>
+ <dt>Agenda</dt>
+ <dd>
+ <div/>
</dd>
</dl>