Merge lp:~menesis/schooltool/flourish into lp:schooltool/flourish

[Gediminas Paulauskas]

Filtered empty person fields, made expanded page wide, added password form.

[lp:~menesis/schooltool/flourish]

2958. By Douglas Cerna on 2011-06-30

Changed ExpandedPage class name to NoSidebarPage. Also conditioned sidebar rendering

2959. By Douglas Cerna on 2011-06-30

Removed label from contact edit form and styled contact forms errors

2960. By Alan Elkner on 2011-06-30

various chnages to the reorder.html view

2961. By Alan Elkner on 2011-06-30

swapped student and teacher columns to match edit views

2962. By Douglas Cerna on 2011-07-01

Merged Gediminas filter of empty person fields and password form

=== modified file 'src/schooltool/basicperson/browser/person.py'
--- src/schooltool/basicperson/browser/person.py	2011-06-29 15:04:50 +0000
+++ src/schooltool/basicperson/browser/person.py	2011-06-30 14:43:28 +0000
@@ -741,8 +741,10 @@
         rows = []
         fields = field.Fields(IBasicPerson)
         for attr in fields:
-            label = fields[attr].field.title
-            rows.append(self.makeRow(label, getattr(self.context, attr)))
+            value = getattr(self.context, attr)
+            if value:
+                label = fields[attr].field.title
+                rows.append(self.makeRow(label, value))
         return rows
 
     @property
@@ -775,8 +777,10 @@
         rows = []
         demographics = IDemographics(self.context)
         for attr in fields:
-            label = fields[attr].field.title
-            rows.append(self.makeRow(label, demographics[attr]))
+            value = demographics[attr]
+            if value:
+                label = fields[attr].field.title
+                rows.append(self.makeRow(label, value))
         return rows
 
     @property

=== modified file 'src/schooltool/contact/browser/contact.py'
--- src/schooltool/contact/browser/contact.py	2011-06-29 15:04:50 +0000
+++ src/schooltool/contact/browser/contact.py	2011-06-30 14:43:28 +0000
@@ -743,8 +743,10 @@
         rows = []
         fields = field.Fields(IAddress, IEmails, IPhones, ILanguages)
         for attr in fields:
-            label = fields[attr].field.title
-            rows.append(self.makeRow(label, getattr(contact, attr)))
+            value = getattr(contact, attr) 
+            if value:
+                label = fields[attr].field.title
+                rows.append(self.makeRow(label, value))
         return rows
 
     def makeRow(self, attr, value):

=== added file 'src/schooltool/person/browser/f_password_form.pt'
--- src/schooltool/person/browser/f_password_form.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/person/browser/f_password_form.pt	2011-06-30 14:43:28 +0000
@@ -0,0 +1,1 @@
+<div metal:use-macro="macro:form" />

=== modified file 'src/schooltool/person/browser/flourish.zcml'
--- src/schooltool/person/browser/flourish.zcml	2011-06-29 15:38:03 +0000
+++ src/schooltool/person/browser/flourish.zcml	2011-06-30 14:43:28 +0000
@@ -23,6 +23,7 @@
       permission="schooltool.view"
       />
 
+<<<<<<< TREE
   <configure package="schooltool.skin.flourish">
     <flourish:page
         name="index.html"
@@ -41,4 +42,15 @@
 
   <zope:adapter factory=".person.CalendarPublicWidgetLabel" name="label" />
 
+=======
+  <flourish:page
+      name="password_edit.html"
+      for="schooltool.person.interfaces.IPerson"
+      class=".person.FlourishPersonPasswordEditView"
+      content_template="f_password_form.pt"
+      permission="schooltool.edit"
+      subtitle="Password"
+      />
+
+>>>>>>> MERGE-SOURCE
 </configure>

=== modified file 'src/schooltool/person/browser/person.py'
--- src/schooltool/person/browser/person.py	2011-06-29 15:38:03 +0000
+++ src/schooltool/person/browser/person.py	2011-06-30 14:43:28 +0000
@@ -284,6 +284,12 @@
         self.actions['cancel'].addClass('button-cancel')
 
 
+class FlourishPersonPasswordEditView(flourish.page.Page, PersonPasswordEditView):
+
+    def update(self):
+        PersonPasswordEditView.update(self)
+
+
 class IPersonInfoManager(IViewletManager):
     """Provides a viewlet hook for the information on a Person's page."""
 

=== modified file 'src/schooltool/skin/flourish/resources/flourish.css'
--- src/schooltool/skin/flourish/resources/flourish.css	2011-06-29 15:04:50 +0000
+++ src/schooltool/skin/flourish/resources/flourish.css	2011-06-30 14:43:28 +0000
@@ -69,6 +69,8 @@
 
 pre {
     overflow: auto;
+    font-size: 12px;
+    line-height: 16px;
 }
 
 a.modify {
@@ -277,3 +279,18 @@
 .header ul.breadcrumbs a {
     color: #aa0000;
 }
+<<<<<<< TREE
+=======
+
+
+/* XXX: where do we put styles like this? */
+
+a.manage-contacts-link {
+    width: auto;
+    float: left;
+    display: block;
+    line-height: 16px;
+    font-size: 12px;
+    margin-top: 8px;
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'src/schooltool/skin/flourish/resources/page.css'
--- src/schooltool/skin/flourish/resources/page.css	2011-06-28 16:13:30 +0000
+++ src/schooltool/skin/flourish/resources/page.css	2011-06-30 14:43:28 +0000
@@ -59,6 +59,14 @@
     padding: 16px 192px 16px 16px;
 }
 
+.page > .body > .expand_container {
+    display: block;
+    float: none;
+    width: 912px;
+    background-color: #f7f7f7;
+    padding: 16px;
+}
+
 /* Refine */
 
 .page > .body > .refine > .content {