From 6c72358426bbc1862df5e181f2c4cb6bb1419559 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Tue, 21 Aug 2012 07:06:36 +0200 Subject: [PATCH] provide actions for agenda items; show state in meeting minutes browser view --- browser/skin/lobo/lobo.css | 4 ++++ locales/de/LC_MESSAGES/loops.mo | Bin 18719 -> 19020 bytes locales/de/LC_MESSAGES/loops.po | 14 +++++++++++- organize/browser/event.py | 18 ++++++++++++++++ organize/browser/view_macros.pt | 3 ++- organize/work/meeting.pt | 37 ++++++++++++++++++++++++-------- organize/work/report.py | 4 ++-- 7 files changed, 67 insertions(+), 13 deletions(-) diff --git a/browser/skin/lobo/lobo.css b/browser/skin/lobo/lobo.css index 693b38b..ec06252 100644 --- a/browser/skin/lobo/lobo.css +++ b/browser/skin/lobo/lobo.css @@ -597,6 +597,10 @@ div.comment { /* calendar, work items */ +.MinutesAndAgendaTitles a[href] { + color: white; +} + .today { color: #444488; font-weight: bold; diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index 25e408f49f0556a845b72ad254e0b6e8330e026a..e3d088f6b48f789fe72174d4b72ff9e04eb4986d 100644 GIT binary patch delta 7324 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ǻhTOG`Ac$|nUr1JA55^bZ6w!&Uav1Omz zGLb~t$9RJ1Lb{KwX;zRET$Qky9{1 z1=C#vy>F=TcAG+<8)}5Ky%^}7oLJ?P_@r;xw8{64EiEe@H*HE;>BQ--qSBJ$aZ49x zHmj;g&GHVZdv|GKMtIe+v|ZkzbxS8suX-#q*EjseGS`^mqWi`aGojL|_p|Q|{x5I} B;bs5; delta 7117 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 diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index 4336297..9e1801a 100644 --- a/locales/de/LC_MESSAGES/loops.po +++ b/locales/de/LC_MESSAGES/loops.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: $Id$\n" "POT-Creation-Date: 2007-05-22 12:00 CET\n" -"PO-Revision-Date: 2012-08-09 12:00 CET\n" +"PO-Revision-Date: 2012-08-20 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -254,6 +254,18 @@ msgstr "Termin bearbeiten" msgid "Modify follow-up event." msgstr "Folgetermin bearbeiten" +msgid "Create Agenda Item..." +msgstr "Tagesordnungspunkt anlegen..." + +msgid "Create a new agenda item." +msgstr "Einen neuen Tagesordnungspunkt anlegen." + +msgid "Edit Agenda Item..." +msgstr "Tagesordnungspunkt bearbeiten..." + +msgid "Modify agenda item." +msgstr "Tagesordnungspunkt bearbeiten" + msgid "Create Task..." msgstr "Aufgabe anlegen..." diff --git a/organize/browser/event.py b/organize/browser/event.py index 514c0ed..90f0f76 100644 --- a/organize/browser/event.py +++ b/organize/browser/event.py @@ -80,6 +80,24 @@ actions.register('editFollowUpEvent', 'portlet', TargetAction, prerequisites=['registerDojoDateWidget'], ) +actions.register('createAgendaItem', 'portlet', DialogAction, + title=_(u'Create Agenda Item...'), + description=_(u'Create a new agenda item.'), + viewName='create_concept.html', + dialogName='createAgendaItem', + typeToken='.loops/concepts/agendaitem', + fixedType=True, + innerForm='inner_concept_form.html', + prerequisites=['registerDojoDateWidget'], +) + +actions.register('editAgendaItem', 'portlet', DialogAction, + title=_(u'Edit Agenda Item...'), + description=_(u'Modify agenda item.'), + viewName='edit_concept.html', + dialogName='editAgendaItem', +) + class Events(ConceptView): diff --git a/organize/browser/view_macros.pt b/organize/browser/view_macros.pt index e99a3f8..9eb86b9 100644 --- a/organize/browser/view_macros.pt +++ b/organize/browser/view_macros.pt @@ -58,7 +58,8 @@
+ tal:define="item nocall:item|nocall:view; + showState python:True">

+ results reportView/results; + showState python:True">
@@ -24,11 +25,12 @@ report item/reportInstance; reportView nocall:item; results reportView/results; - fields results/context/fields"> + fields results/context/fields; + showCheckboxes nothing; + showState nothing">
- +
@@ -39,7 +41,7 @@ - +
@@ -84,6 +86,8 @@ Copy Agenda Items +   @@ -91,24 +95,27 @@       +   + style="border: 1px solid #777777" class="center">
+ @@ -125,7 +132,9 @@ - + + header_responsible header_deadline + - @@ -182,6 +193,14 @@ + + + + + diff --git a/organize/work/report.py b/organize/work/report.py index 15bc425..537e32f 100644 --- a/organize/work/report.py +++ b/organize/work/report.py @@ -285,14 +285,14 @@ class MeetingMinutesWorkRow(WorkRow): @Lazy def isActive(self): return self.context.state not in ( - 'finished', 'closed', 'cancelled') + 'finished', 'closed', 'cancelled', 'moved') class MeetingMinutesWork(WorkReportInstance, SubReport): rowFactory = MeetingMinutesWorkRow - fields = Jeep((workTitle, party, deadline)) #, state)) #description, + fields = Jeep((workTitle, party, deadline, state)) #description, defaultOutputFields = fields defaultSortCriteria = (day,) states = ('planned', 'accepted', 'running', 'done',