diff --git a/browser/skin/lobo/lobo.css b/browser/skin/lobo/lobo.css index 712e4ca..65d4826 100644 --- a/browser/skin/lobo/lobo.css +++ b/browser/skin/lobo/lobo.css @@ -100,6 +100,10 @@ textarea { font-size: 100%; } +table { + border-collapse: collapse; +} + thead th { background: none; } @@ -136,7 +140,6 @@ table.listing { margin: 1px; /*margin-top: 0.5em; */ margin-bottom: 1em; - border-collapse: collapse; } table.listing th { @@ -206,10 +209,6 @@ table.listing th span.descending { background-repeat: no-repeat; } -table.records { - border-collapse: collapse; -} - table.records input, table.records textarea { border: none; padding: 0; @@ -490,6 +489,19 @@ img.notselected { margin-bottom: 4px; } +.header-1 { + font-size: 120%; + font-weight: bold; +} + +.center { + text-align: center; +} + +.right { + text-align: right; +} + /* lobo layout-specific classes */ .legend { diff --git a/expert/browser/results.pt b/expert/browser/results.pt index 0f87f8d..b40267c 100644 --- a/expert/browser/results.pt +++ b/expert/browser/results.pt @@ -89,7 +89,6 @@
- @@ -111,7 +110,6 @@
-
diff --git a/organize/work/meeting.pt b/organize/work/meeting.pt index 9e5fe40..75ba4d9 100644 --- a/organize/work/meeting.pt +++ b/organize/work/meeting.pt @@ -7,8 +7,48 @@
-
-
+

+
+
+ + +
+ + + + + + + + + + + + + +
Task/ActionWho/When
+ +
+
+ + +
+ + + + +
diff --git a/organize/work/meeting.py b/organize/work/meeting.py index f03783d..cf4abf9 100644 --- a/organize/work/meeting.py +++ b/organize/work/meeting.py @@ -50,3 +50,12 @@ class MeetingMinutes(ResultsConceptView): def macro(self): return self.meeting_macros['content'] + @Lazy + def resultsRenderer(self): + return self.meeting_macros['results'] + + def getColumnRenderer(self, col): + renderer = col.renderer + if renderer == 'subreport': + return self.meeting_macros[renderer] + return self.result_macros[renderer] diff --git a/organize/work/report.py b/organize/work/report.py index e750dfe..69e2541 100644 --- a/organize/work/report.py +++ b/organize/work/report.py @@ -102,6 +102,7 @@ dayTo = Field('dayTo', u'End Day', executionSteps=['query']) day = DateField('day', u'Day', description=u'The day the work was done.', + cssClass='center', executionSteps=['sort', 'output']) timeStart = TimeField('start', u'Start', description=u'The time the unit of work was started.', @@ -129,6 +130,7 @@ effort = DurationField('effort', u'Effort', executionSteps=['output', 'totals']) state = Field('state', u'State', description=u'The state of the work.', + cssClass='center', executionSteps=['query', 'output']) @@ -265,9 +267,11 @@ class MeetingMinutesWork(WorkReportInstance, SubReport): taskTitle = UrlField('title', u'Title', description=u'The short description of the task.', + cssClass='header-1', executionSteps=['output']) taskDescription = TextField('description', u'Description', description=u'The long description of the task.', + cssClass='header-2', executionSteps=['output']) workItems = SubReportField('workItems', u'Work Items', description=u'A list of work items belonging to the task.',