Merge lp:~aelkner/schooltool.gradebook/flourish into lp:schooltool.gradebook/flourish

[Alan Elkner]

Gediminas,

Please look over the latest commit that I made to my branch which I didn't merge yet so that you could review it first. It passes all tests, so I will merge it to trunk after the meeting regardless of whether you have reviewed it, but I wanted to give you the chance to react to the code leading up to the meeting.

Note that I created three bugs in launchpad to explain what I did in the latest commit which actually was the result of work that I did last year in my personal branch that got lost from the trunk merge cycle due to my failed tests and your resultant commit rejection. I think I did a much better job of explaining with the three launchpad bugs and of making sure all tests pass.

Regarding new tests for the new course worksheets feature, I am ready to do that following the meeting, but I don't see the lack of tests as any basis for rejecting the code that I just committed, considering the fact that 99% of all the flourish code we wrote is as yet untested. I may be able to start reversing that trend by writing some gradebook tests this week.

Thanks,
Alan

[lp:~aelkner/schooltool.gradebook/flourish]

417. By Gediminas Paulauskas on 2012-01-16

Fix problems when all sheets are hidden (LP: #913055)

418. By Gediminas Paulauskas on 2012-01-16

Fixed edit category view to accept non-ascii text (LP: #913581)

419. By Alan Elkner on 2012-01-16

Deploy course worksheets feature (LP: #916678)

[Gediminas Paulauskas (menesis)]

Thank you. This is a lot of code, but I guess some copied from elsewhere.

I have tested it a little, and it all seems to work without problems.

I have merged this to flourish already.

review: Approve

=== modified file 'src/schooltool/gradebook/browser/flourish.zcml'
--- src/schooltool/gradebook/browser/flourish.zcml	2011-12-20 23:49:21 +0000
+++ src/schooltool/gradebook/browser/flourish.zcml	2012-01-16 16:26:27 +0000
@@ -80,7 +80,6 @@
   <flourish:page
       name="index.html"
       for="..interfaces.IGradebook"
-      title="Enter Grades"
       content_template="templates/f_gradebook_overview.pt"
       class=".gradebook.FlourishGradebookOverview"
       permission="schooltool.view"

=== modified file 'src/schooltool/gradebook/browser/gradebook.py'
--- src/schooltool/gradebook/browser/gradebook.py	2012-01-16 01:25:04 +0000
+++ src/schooltool/gradebook/browser/gradebook.py	2012-01-16 16:26:27 +0000
@@ -788,8 +788,23 @@
                                 flourish.page.WideContainerPage):
     """flourish Gradebook Overview/Table"""
 
-    has_header = False
-    page_class = 'page grid'
+    @property
+    def page_class(self):
+        if self.all_hidden:
+            return 'page'
+        else:
+            return 'page grid'
+
+    @property
+    def title(self):
+        if self.all_hidden:
+            return _('No Visible Worksheets')
+        else:
+            return _('Enter Grades')
+
+    @property
+    def has_header(self):
+        return self.all_hidden
 
     @property
     def journal_present(self):

=== modified file 'src/schooltool/gradebook/browser/resources/f_gradebook.css'
--- src/schooltool/gradebook/browser/resources/f_gradebook.css	2012-01-16 01:25:04 +0000
+++ src/schooltool/gradebook/browser/resources/f_gradebook.css	2012-01-16 16:26:27 +0000
@@ -34,12 +34,6 @@
     width: 104px;
 }
 
-.empty_message {
-    padding: 10px;
-    font-size: 14pt;
-    line-height: 20px;
-}
-
 li.deployed a {
     font-style: italic;
 }

=== modified file 'src/schooltool/gradebook/browser/templates/f_gradebook_overview.pt'
--- src/schooltool/gradebook/browser/templates/f_gradebook_overview.pt	2012-01-14 22:51:48 +0000
+++ src/schooltool/gradebook/browser/templates/f_gradebook_overview.pt	2012-01-16 16:26:27 +0000
@@ -1,3 +1,13 @@
+<tal:block condition="view/all_hidden">
+  <p i18n:translate="">
+    This section contains only worksheets that are hidden.
+    You can unhide a worksheet using the following link:
+    <a class="empty_message" href="../.." i18n:translate="">Worksheets</a>
+  </p>
+  <p i18n:translate="">You can also add a new worksheet using this link:
+    <a class="empty_message" href="../../addWorksheet.html" i18n:translate="">Add a New Worksheet</a>
+  </p>
+</tal:block>
 <div i18n:domain="schooltool.gradebook"
      tal:define="table view/table;
                  activities view/activities">
@@ -24,17 +34,6 @@
       window.onunload = checkChanges;
       warningText = '<tal:block replace="view/warningText" />';
   <metal:block tal:replace="structure string:&lt;/script&gt;" />
-  <div tal:condition="view/all_hidden">
-    <p class="empty_message" i18n:translate="">
-      This section contains only worksheets that are hidden.
-      You can unhide a worksheet using the following link:
-    </p>
-    <a class="empty_message" href="../.." i18n:translate="">Worksheets</a>
-    <p>&nbsp;</p>
-    <p class="empty_message" i18n:translate="">You can also add a new worksheet using this link:</p>
-    <a class="empty_message" href="../../addWorksheet.html" i18n:translate="">Add a New Worksheet</a>
-    <p>&nbsp;</p>
-  </div>
   <form method="post" class="grid-form"
         tal:condition="not: view/all_hidden"
         tal:attributes="action string:${context/@@absolute_url}">