meeting minutes: layout improvements

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 {

expert/browser/results.pt

@@ -89,7 +89,6 @@
 
 
 <div metal:define-macro="subreport">
-  <tal:column>
     <table class="subreport"
            tal:define="results python:col.getValue(row)">
       <tr>
@@ -111,7 +110,6 @@
         </td>
       </tr>
     </table>
-  </tal:column>
 </div>
 
 

organize/work/meeting.pt

@@ -7,8 +7,48 @@
   <div tal:attributes="class string:content-$level;">
     <metal:block use-macro="view/concept_macros/concepttitle" />
     <metal:block use-macro="view/concept_macros/conceptfields" />
-  </div>
+  </div><br />
-  <div metal:use-macro="item/resultsRenderer" />
+  <div metal:use-macro="reportView/resultsRenderer" />
+</div>
+
+
+<div metal:define-macro="results">
+  <table class="report"
+         tal:define="results reportView/results">
+    <tr>
+        <th i18n:translate=""
+            style="border: 1px solid grey">Task/Action</th>
+        <th colspan="3" style="border: 1px solid grey"
+            i18n:translate="">Who/When</th>
+    </tr>
+    <tal:task repeat="row results">
+        <tr tal:repeat="colname python: ('title', 'description',)">
+          <td colspan="4" style="border: 1px solid grey"
+              tal:define="col report/fields/?colname"
+              tal:attributes="class col/cssClass">
+            <metal:column use-macro="python:
+                            reportView.getColumnRenderer(col)" />
+          </td>
+        </tr>
+        <tal:workitems define="col report/fields/workItems">
+            <metal:column use-macro="python:
+                            reportView.getColumnRenderer(col)" />
+        </tal:workitems>
+    </tal:task>
+  </table>
+</div>
+
+
+<div metal:define-macro="subreport"
+     tal:define="results python:col.getValue(row)">
+      <tr class="listing" tal:repeat="row results">
+        <td tal:repeat="col results/displayedColumns"
+            tal:attributes="class col/cssClass"
+            style="border: 1px solid grey">
+            <metal:column use-macro="python:
+                            reportView.getColumnRenderer(col)" />
+        </td>
+      </tr>
 </div>
 
 

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]

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.',