summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@entrouvert.com>2012-05-12 16:41:04 (GMT)
committerFrédéric Péters <fpeters@entrouvert.com>2012-05-12 16:41:52 (GMT)
commitf6d9f2b201fdfa58feeed646c1b0e1db50685e6a (patch)
tree407e7f71b190d373bf904a3940123eb8f7ec44d4
parentc598e4ce0e31e19efd08d243ad9ec127f07ed1bb (diff)
downloadtabellio.webviews-f6d9f2b201fdfa58feeed646c1b0e1db50685e6a.zip
tabellio.webviews-f6d9f2b201fdfa58feeed646c1b0e1db50685e6a.tar.gz
tabellio.webviews-f6d9f2b201fdfa58feeed646c1b0e1db50685e6a.tar.bz2
add question type before its label (#1381)
-rw-r--r--tabellio/webviews/deputy.pt21
1 files changed, 16 insertions, 5 deletions
diff --git a/tabellio/webviews/deputy.pt b/tabellio/webviews/deputy.pt
index cfe32f7..d7eb477 100644
--- a/tabellio/webviews/deputy.pt
+++ b/tabellio/webviews/deputy.pt
@@ -92,12 +92,23 @@
<h2>Session <span tal:replace="session">session</span></h2>
<ul>
- <li tal:repeat="activity python:view.activity(session)"><span
- tal:content="python: hasattr(activity[0], 'date_str') and activity[0].date_str or ''"/> :
-
- <a tal:attributes="href python: activity[0].canonical_path"><span tal:content="python: activity[0].title"/></a>
+ <tal:block tal:repeat="activity python:view.activity(session)">
+ <tal:block tal:condition="python: hasattr(activity[0], 'date_str') and activity[0].date_str"
+ tal:define="actobj python:activity[0]">
+ <li>
+ <span tal:content="python: hasattr(actobj, 'date_str') and actobj.date_str or ''"/> :
+ <span class="acticity-type"
+ tal:condition="python: actobj.portal_type == 'tabellio.documents.question'">
+ <span tal:replace="actobj/questype_str"/>
+ <span tal:condition="actobj/no"> n°<span tal:replace="actobj/no"/></span>
+ :
+ </span>
+
+ <a tal:attributes="href actobj/canonical_path"><span tal:content="actobj/title"/></a>
<span tal:condition="python: activity[1] == 'participant'">(en tant que participant)</span>
- </li>
+ </li>
+ </tal:block>
+ </tal:block>
</ul>
</div>
</div>