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

[Douglas Cerna]

Justas:

Some views show empty sidebars usually when there's only one viewlet manager registered and its rendering is conditional. Some views where I've seen this:

Report Sheets (/report_sheets) when there are not report sheets to hide?
Schedule Timetable (/.../{section}/schedule/addTimetable.html)
Email View (/email/Email) when email service is disabled
Others...?

The diff here fixes it, but I want to check if there could be side effects or maybe a better way to do it.

Thanks.

[Gediminas Paulauskas (menesis)]

I don't see any effect in those pages.

What would you like to see? The form aligned to the left if there is no sidebar?

review: Abstain

[Douglas Cerna (replaceafill)]

> I don't see any effect in those pages.

http://img442.imageshack.us/img442/7663/pantallazodel2011112711.png

Notice the empty <div class="sidebar refine"></div> in firebug.

> What would you like to see? The form aligned to the left if there is no
> sidebar?

I'd like to see no sidebar in these cases.

PS: Is it me or it's not possible to attach screenshots to merge requests comments? :)

[Gediminas Paulauskas (menesis)]

The look of these pages does not change, so OK.

review: Approve

[lp:~replaceafill/schooltool/flourish]

3257. By Gediminas Paulauskas on 2011-11-28

Remove simplejson dependency on python >= 2.6

3258. By Justas Sadzevičius on 2011-11-29

Batchin' fixes

3259. By Justas Sadzevičius on 2011-11-29

Pyatiletka: usernames on every persons table.

3260. By Douglas Cerna on 2011-12-02

Made string translatable in timetables link

3261. By Justas Sadzevičius on 2011-12-12

Register more specific publish traverse pluggable traverser for flourish.

3262. By Douglas Cerna on 2011-12-13

Added css classes for buttons in edit view for groups

3263. By Douglas Cerna on 2011-12-13

Fixed i18n in group filter widget template

3264. By Douglas Cerna on 2011-12-14

Fixed i18n in contact filter widget template

3265. By Douglas Cerna on 2011-12-14

Fixed i18n in section and course filter widget templates

3266. By Douglas Cerna on 2011-12-14

Fixed i18n of title in contact view

3267. By Gediminas Paulauskas on 2011-12-14

Merge fixes from trunk

3268. By Douglas Cerna on 2011-12-15

Made pack database and changed password dialogs to not close on ESC and set common css class to hide their close button
Set button-ok class for Done button in pack database view
Fixed action name in /password_changed.html view
Fixed i18n string for fieldset title in security view

3269. By Douglas Cerna on 2011-12-15

Fixed CSS of file upload fieldset in csv import views

3270. By Douglas Cerna on 2011-12-16

Fixed i18n of Done link in term index view

3271. By Douglas Cerna on 2011-12-19

Changed some button labels (LP: #905393)

3272. By Douglas Cerna on 2011-12-19

Changed terminology in section schedule view (LP: #905421)

3273. By Douglas Cerna on 2011-12-19

Sorted course titles in section add form (LP: #905386)

3274. By Douglas Cerna on 2011-12-19

Changed button label in course add form

3275. By Douglas Cerna on 2011-12-19

Removed empty sidebars

=== modified file 'src/schooltool/skin/flourish/page.py'
--- src/schooltool/skin/flourish/page.py	2011-11-16 13:24:51 +0000
+++ src/schooltool/skin/flourish/page.py	2011-11-25 18:53:28 +0000
@@ -97,7 +97,9 @@
     def render(self, *args, **kw):
         if not self.viewlets:
             return ''
-        return ViewletManager.render(self, *args, **kw)
+        result = ViewletManager.render(self, *args, **kw)
+        if result is not None:
+            return result.strip()
 
 
 class DisabledViewlet(Viewlet):