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

Proposed by Douglas Cerna
Status: Merged
Merged at revision: 3275
Proposed branch: lp:~replaceafill/schooltool/flourish
Merge into: lp:schooltool/flourish
Diff against target: 14 lines (+3/-1)
1 file modified
src/schooltool/skin/flourish/ (+3/-1)
To merge this branch: bzr merge lp:~replaceafill/schooltool/flourish
Reviewer Review Type Date Requested Status
Gediminas Paulauskas (community) Approve
Justas Sadzevičius Pending
Review via email:

Description of the change


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

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


To post a comment you must log in.
Revision history for this message
Gediminas Paulauskas (menesis) wrote :

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
Revision history for this message
Douglas Cerna (replaceafill) wrote :

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

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? :)

Revision history for this message
Gediminas Paulauskas (menesis) wrote :

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

review: Approve
lp:~replaceafill/schooltool/flourish updated
3257. By Gediminas Paulauskas

Remove simplejson dependency on python >= 2.6

3258. By Justas Sadzevičius

Batchin' fixes

3259. By Justas Sadzevičius

Pyatiletka: usernames on every persons table.

3260. By Douglas Cerna

Made string translatable in timetables link

3261. By Justas Sadzevičius

Register more specific publish traverse pluggable traverser for flourish.

3262. By Douglas Cerna

Added css classes for buttons in edit view for groups

3263. By Douglas Cerna

Fixed i18n in group filter widget template

3264. By Douglas Cerna

Fixed i18n in contact filter widget template

3265. By Douglas Cerna

Fixed i18n in section and course filter widget templates

3266. By Douglas Cerna

Fixed i18n of title in contact view

3267. By Gediminas Paulauskas

Merge fixes from trunk

3268. By Douglas Cerna

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

Fixed CSS of file upload fieldset in csv import views

3270. By Douglas Cerna

Fixed i18n of Done link in term index view

3271. By Douglas Cerna

Changed some button labels (LP: #905393)

3272. By Douglas Cerna

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

3273. By Douglas Cerna

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

3274. By Douglas Cerna

Changed button label in course add form

3275. By Douglas Cerna

Removed empty sidebars

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/schooltool/skin/flourish/'
2--- src/schooltool/skin/flourish/ 2011-11-16 13:24:51 +0000
3+++ src/schooltool/skin/flourish/ 2011-11-25 18:53:28 +0000
4@@ -97,7 +97,9 @@
5 def render(self, *args, **kw):
6 if not self.viewlets:
7 return ''
8- return ViewletManager.render(self, *args, **kw)
9+ result = ViewletManager.render(self, *args, **kw)
10+ if result is not None:
11+ return result.strip()
14 class DisabledViewlet(Viewlet):


People subscribed via source and target branches