Merge lp://qastaging/~sam92/openlp/bug-1695620 into lp://qastaging/openlp

Proposed by Samuel Mehrbrodt
Status: Superseded
Proposed branch: lp://qastaging/~sam92/openlp/bug-1695620
Merge into: lp://qastaging/openlp
Diff against target: 720 lines (+289/-144)
7 files modified
openlp/core/lib/serviceitem.py (+5/-7)
openlp/core/ui/maindisplay.py (+2/-2)
openlp/core/ui/printserviceform.py (+5/-5)
openlp/plugins/songs/lib/mediaitem.py (+43/-19)
openlp/plugins/songs/lib/songstab.py (+74/-37)
openlp/plugins/songs/songsplugin.py (+53/-3)
tests/functional/openlp_plugins/songs/test_mediaitem.py (+107/-71)
To merge this branch: bzr merge lp://qastaging/~sam92/openlp/bug-1695620
Reviewer Review Type Date Requested Status
Raoul Snyman Disapprove
Tim Bentley Needs Fixing
Review via email: mp+325043@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2017-06-12.

Description of the change

make use of pystache for footer generation being configurable in song settings

- removed now obsolete and via template better configurable options to display "songbook", "written by" and "copyright" information in footer
- added explanation box for so far used settings as pystache placeholders
- added songs configuration setting for template including reset button
- added default template replacing currently existing configuration as best as possible (should be backwards compatible or at least be adaptable to correspond to former settings)
- write and adapt tests for new and removed functionality
- Added some more available fields in the footer: Alternate Title, CCLI Number, Topics, Authors (all music, all words)

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

You need to run CI on this to show the success of tests.
Not sure why but this request did a full download when I did a check out. Also cannot run due to chord issues.
Cannot run this but there seem to be lots of line breaks in the footer display. As the footer area is small this will not be displayed and lead to forum comments.
You need some validation do defend against too long footers!

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

We're moving away from Python generated HTML, and using a JS system based on Reveal.js. Come chat with tgc and myself in IRC.

review: Disapprove
2753. By Samuel Mehrbrodt

Use Mako instead of Pystache

2754. By Samuel Mehrbrodt

Fix test

2755. By Samuel Mehrbrodt

Merge trunk

2756. By Samuel Mehrbrodt

PEP8 fixes

2757. By Samuel Mehrbrodt

Remove blank lines

2758. By Samuel Mehrbrodt

Adjust display of available placeholders to mako syntax

2759. By Samuel Mehrbrodt

Only save footer template if it has been changed

2760. By Samuel Mehrbrodt

Merge trunk

2761. By Samuel Mehrbrodt

Remove blank lines

2762. By Samuel Mehrbrodt

Merge trunk

2763. By Samuel Mehrbrodt

Merge trunk

2764. By Samuel Mehrbrodt

Fix songstab

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.