Created attachment 45621 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Created attachment 58272 [details] [review]
Bug 15326: [FOLLOW-UP] Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
work) is the navigation for the CMS pages on both the staff side and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
 with different combinations of display location, library and language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
location and library
- Confirm that if page has not been published and user does not have
permission to edit pages, page content will not display on OPAC side. On
staff side, a message will show saying that page has not been published
- Confirm pagination for table shows and works
- Confirm deleting pages works as expected (confirm message before
delete)
- Confirm link title must be unique when adding new pages
- Confirm that editing the details of an existing page works
- Confirm that adding a child page will only work if the location of
child page matches location of parent page, i.e., if parent page is an
OPAC page then child page must also be OPAC page. if parent page is in
all locations then child page can be in all or either interface(s)
- Confirm Select All/Clear All toggle works
- Confirm viewing of CMS pages in OPAC and in staff client works and
looks nice

Sponsored-by: Region Halland

Created attachment 58607 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Created attachment 58608 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Created attachment 58609 [details] [review]
Bug 15326: [FOLLOW-UP] Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
work) is the navigation for the CMS pages on both the staff side and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
 with different combinations of display location, library and language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
location and library
- Confirm that if page has not been published and user does not have
permission to edit pages, page content will not display on OPAC side. On
staff side, a message will show saying that page has not been published
- Confirm pagination for table shows and works
- Confirm deleting pages works as expected (confirm message before
delete)
- Confirm link title must be unique when adding new pages
- Confirm that editing the details of an existing page works
- Confirm that adding a child page will only work if the location of
child page matches location of parent page, i.e., if parent page is an
OPAC page then child page must also be OPAC page. if parent page is in
all locations then child page can be in all or either interface(s)
- Confirm Select All/Clear All toggle works
- Confirm viewing of CMS pages in OPAC and in staff client works and
looks nice

Sponsored-by: Region Halland

Created attachment 58787 [details] [review]
Bug 15326: [FOLLOW-UP] Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
work) is the navigation for the CMS pages on both the staff side and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
 with different combinations of display location, library and language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
location and library
- Confirm that if page has not been published and user does not have
permission to edit pages, page content will not display on OPAC side. On
staff side, a message will show saying that page has not been published
- Confirm pagination for table shows and works
- Confirm deleting pages works as expected (confirm message before
delete)
- Confirm link title must be unique when adding new pages
- Confirm that editing the details of an existing page works
- Confirm that adding a child page will only work if the location of
child page matches location of parent page, i.e., if parent page is an
OPAC page then child page must also be OPAC page. if parent page is in
all locations then child page can be in all or either interface(s)
- Confirm Select All/Clear All toggle works
- Confirm viewing of CMS pages in OPAC and in staff client works and
looks nice

Sponsored-by: Region Halland

Created attachment 63904 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Created attachment 63905 [details] [review]
Bug 15326: [FOLLOW-UP] Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
work) is the navigation for the CMS pages on both the staff side and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
 with different combinations of display location, library and language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
location and library
- Confirm that if page has not been published and user does not have
permission to edit pages, page content will not display on OPAC side. On
staff side, a message will show saying that page has not been published
- Confirm pagination for table shows and works
- Confirm deleting pages works as expected (confirm message before
delete)
- Confirm link title must be unique when adding new pages
- Confirm that editing the details of an existing page works
- Confirm that adding a child page will only work if the location of
child page matches location of parent page, i.e., if parent page is an
OPAC page then child page must also be OPAC page. if parent page is in
all locations then child page can be in all or either interface(s)
- Confirm Select All/Clear All toggle works
- Confirm viewing of CMS pages in OPAC and in staff client works and
looks nice

Sponsored-by: Region Halland

Created attachment 64241 [details] [review]
Bug 15326: [FOLLOW-UP] Many fixes

This patch:
- moves action buttons into a dropdown, adds a delete button to dropdown
- fixes the tests (they should now all pass)
- fixes qa tool problems
- removes the Koha::CmsPages->remove() method (unnecessary)
- makes changes to the Koha::CmsPages->add() method (now simpler, easier
to test)

This is now ready to test.

Sponsored-by: Catalyst IT

Created attachment 64941 [details] [review]
Bug 15326: [FOLLOW-UP] More fixes

This patch removes the t/Pages.t file because it isn't required, and
other unused methods.

This patch is ready to test. The appropriate tests are in
t/db_dependent/Pages.t

Created attachment 64942 [details] [review]
Bug 15326: [FOLLOW-UP] adding and editing fixes

Sorry, did not see the second half of your comment. This patch should
fix the adding and editing issues in Comment 16.

Created attachment 66255 [details] [review]
Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

Fixes issues from Comment 19, please test

Created attachment 70866 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Created attachment 70867 [details] [review]
Bug 15326: [FOLLOW-UP] Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
work) is the navigation for the CMS pages on both the staff side and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
 with different combinations of display location, library and language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
location and library
- Confirm that if page has not been published and user does not have
permission to edit pages, page content will not display on OPAC side. On
staff side, a message will show saying that page has not been published
- Confirm pagination for table shows and works
- Confirm deleting pages works as expected (confirm message before
delete)
- Confirm link title must be unique when adding new pages
- Confirm that editing the details of an existing page works
- Confirm that adding a child page will only work if the location of
child page matches location of parent page, i.e., if parent page is an
OPAC page then child page must also be OPAC page. if parent page is in
all locations then child page can be in all or either interface(s)
- Confirm Select All/Clear All toggle works
- Confirm viewing of CMS pages in OPAC and in staff client works and
looks nice

Sponsored-by: Region Halland

Created attachment 70868 [details] [review]
Bug 15326: [FOLLOW-UP] Many fixes

This patch:
- moves action buttons into a dropdown, adds a delete button to dropdown
- fixes the tests (they should now all pass)
- fixes qa tool problems
- removes the Koha::CmsPages->remove() method (unnecessary)
- makes changes to the Koha::CmsPages->add() method (now simpler, easier
to test)

This is now ready to test.

Sponsored-by: Catalyst IT

Created attachment 70869 [details] [review]
Bug 15326: [FOLLOW-UP] More fixes

This patch removes the t/Pages.t file because it isn't required, and
other unused methods.

This patch is ready to test. The appropriate tests are in
t/db_dependent/Pages.t

Created attachment 70870 [details] [review]
Bug 15326: [FOLLOW-UP] adding and editing fixes

Sorry, did not see the second half of your comment. This patch should
fix the adding and editing issues in Comment 16.

Created attachment 70871 [details] [review]
Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

Fixes issues from Comment 19, please test

Created attachment 76387 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 76388 [details] [review]
Bug 15326: (follow-up) Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
work) is the navigation for the CMS pages on both the staff side and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
 with different combinations of display location, library and language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
location and library
- Confirm that if page has not been published and user does not have
permission to edit pages, page content will not display on OPAC side. On
staff side, a message will show saying that page has not been published
- Confirm pagination for table shows and works
- Confirm deleting pages works as expected (confirm message before
delete)
- Confirm link title must be unique when adding new pages
- Confirm that editing the details of an existing page works
- Confirm that adding a child page will only work if the location of
child page matches location of parent page, i.e., if parent page is an
OPAC page then child page must also be OPAC page. if parent page is in
all locations then child page can be in all or either interface(s)
- Confirm Select All/Clear All toggle works
- Confirm viewing of CMS pages in OPAC and in staff client works and
looks nice

Sponsored-by: Region Halland

Bug 15326: [FOLLOW-UP] Many fixes

This patch:
- moves action buttons into a dropdown, adds a delete button to dropdown
- fixes the tests (they should now all pass)
- fixes qa tool problems
- removes the Koha::CmsPages->remove() method (unnecessary)
- makes changes to the Koha::CmsPages->add() method (now simpler, easier
to test)

This is now ready to test.

Sponsored-by: Catalyst IT

Bug 15326: [FOLLOW-UP] More fixes

This patch removes the t/Pages.t file because it isn't required, and
other unused methods.

This patch is ready to test. The appropriate tests are in
t/db_dependent/Pages.t

Bug 15326: [FOLLOW-UP] adding and editing fixes

Sorry, did not see the second half of your comment. This patch should
fix the adding and editing issues in Comment 16.

Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

Fixes issues from Comment 19, please test

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 76389 [details] [review]
Bug 15326: (follow-up) utf8 to utf8mb4

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 76390 [details] [review]
Bug 15326: (follow-up) Move js to footer, use Asset plugin

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 76391 [details] [review]
Bug 15326: (follow-up) Don't make links to unpublished pages in opac

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 76392 [details] [review]
Bug 15326: (follow-up) Fix tools menu highlighting

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 78232 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 78233 [details] [review]
Bug 15326: (follow-up) Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
work) is the navigation for the CMS pages on both the staff side and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
 with different combinations of display location, library and language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
location and library
- Confirm that if page has not been published and user does not have
permission to edit pages, page content will not display on OPAC side. On
staff side, a message will show saying that page has not been published
- Confirm pagination for table shows and works
- Confirm deleting pages works as expected (confirm message before
delete)
- Confirm link title must be unique when adding new pages
- Confirm that editing the details of an existing page works
- Confirm that adding a child page will only work if the location of
child page matches location of parent page, i.e., if parent page is an
OPAC page then child page must also be OPAC page. if parent page is in
all locations then child page can be in all or either interface(s)
- Confirm Select All/Clear All toggle works
- Confirm viewing of CMS pages in OPAC and in staff client works and
looks nice

Sponsored-by: Region Halland

Bug 15326: [FOLLOW-UP] Many fixes

This patch:
- moves action buttons into a dropdown, adds a delete button to dropdown
- fixes the tests (they should now all pass)
- fixes qa tool problems
- removes the Koha::CmsPages->remove() method (unnecessary)
- makes changes to the Koha::CmsPages->add() method (now simpler, easier
to test)

This is now ready to test.

Sponsored-by: Catalyst IT

Bug 15326: [FOLLOW-UP] More fixes

This patch removes the t/Pages.t file because it isn't required, and
other unused methods.

This patch is ready to test. The appropriate tests are in
t/db_dependent/Pages.t

Bug 15326: [FOLLOW-UP] adding and editing fixes

Sorry, did not see the second half of your comment. This patch should
fix the adding and editing issues in Comment 16.

Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

Fixes issues from Comment 19, please test

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 78234 [details] [review]
Bug 15326: (follow-up) utf8 to utf8mb4

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 78235 [details] [review]
Bug 15326: (follow-up) Move js to footer, use Asset plugin

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 78236 [details] [review]
Bug 15326: (follow-up) Don't make links to unpublished pages in opac

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 78237 [details] [review]
Bug 15326: (follow-up) Fix tools menu highlighting

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Rebased, working on things in Comment 36

Created attachment 78238 [details] [review]
Bug 15326: (follow-up) Code review fixes

Addresses the following issues:

b) In opac-cmspages there is:
+        flagsrequired   => { borrow => 1 },
The borrow permission has been removed since. (blocker)

c) Comment was removed unnecessarily, just needs to be moved into
its right spot below again:
-# If GoogleIndicTransliteration system preference is On Set
parameter to load Google's javascript in OPAC search screens

d) One file uses qw( -utf-8) but another does not:
+use CGI;
+use CGI qw( -utf8 );  (blocker)

Created attachment 78240 [details] [review]
Bug 15326: (follow-up) Interface fixes

This patch addresses the following:

a) I feel we don't need the "Pages" heading. It only takes up space and
states the obvious. (non-blocker... but navigation needs work, see
below)

b) OpacMainUserBlock should not show on the pages in my opinion.
Libraries use it to place text on the start page instead of using the
news feature, which means it repeats on all pages. I'd really like to
see this changed.

c) Personally I'd change "Location" to "Interface" to avoid confusion
with the item value in translations. But I see it's the same on news. So
out of scope here.

d) Parent pages can be deleted without warning. Childs will be moved to
top level. This is acceptable behaviour as they are not left orphaned.
But it might be something to improve on in the future.

e) In the test plan and in the code I see there should be a confirmation
message on deleting a single or multiple entries, but this doesn't work.
(blocker)

Created attachment 79269 [details] [review]
Bug 15326: (follow-up) Pages navigation fixes

This is the best I've managed to do with the navigation. Would be happy
for someone else to give it a go because I'm aware that some parent
links repeat.

Created attachment 83318 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 83319 [details] [review]
Bug 15326: (follow-up) Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
work) is the navigation for the CMS pages on both the staff side and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
 with different combinations of display location, library and language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
location and library
- Confirm that if page has not been published and user does not have
permission to edit pages, page content will not display on OPAC side. On
staff side, a message will show saying that page has not been published
- Confirm pagination for table shows and works
- Confirm deleting pages works as expected (confirm message before
delete)
- Confirm link title must be unique when adding new pages
- Confirm that editing the details of an existing page works
- Confirm that adding a child page will only work if the location of
child page matches location of parent page, i.e., if parent page is an
OPAC page then child page must also be OPAC page. if parent page is in
all locations then child page can be in all or either interface(s)
- Confirm Select All/Clear All toggle works
- Confirm viewing of CMS pages in OPAC and in staff client works and
looks nice

Sponsored-by: Region Halland

Bug 15326: [FOLLOW-UP] Many fixes

This patch:
- moves action buttons into a dropdown, adds a delete button to dropdown
- fixes the tests (they should now all pass)
- fixes qa tool problems
- removes the Koha::CmsPages->remove() method (unnecessary)
- makes changes to the Koha::CmsPages->add() method (now simpler, easier
to test)

This is now ready to test.

Sponsored-by: Catalyst IT

Bug 15326: [FOLLOW-UP] More fixes

This patch removes the t/Pages.t file because it isn't required, and
other unused methods.

This patch is ready to test. The appropriate tests are in
t/db_dependent/Pages.t

Bug 15326: [FOLLOW-UP] adding and editing fixes

Sorry, did not see the second half of your comment. This patch should
fix the adding and editing issues in Comment 16.

Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

Fixes issues from Comment 19, please test

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 83320 [details] [review]
Bug 15326: (follow-up) utf8 to utf8mb4

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 83321 [details] [review]
Bug 15326: (follow-up) Move js to footer, use Asset plugin

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 83322 [details] [review]
Bug 15326: (follow-up) Don't make links to unpublished pages in opac

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 83323 [details] [review]
Bug 15326: (follow-up) Fix tools menu highlighting

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Created attachment 83324 [details] [review]
Bug 15326: (follow-up) Code review fixes

Addresses the following issues:

b) In opac-cmspages there is:
+        flagsrequired   => { borrow => 1 },
The borrow permission has been removed since. (blocker)

c) Comment was removed unnecessarily, just needs to be moved into
its right spot below again:
-# If GoogleIndicTransliteration system preference is On Set
parameter to load Google's javascript in OPAC search screens

d) One file uses qw( -utf-8) but another does not:
+use CGI;
+use CGI qw( -utf8 );  (blocker)

Created attachment 83325 [details] [review]
Bug 15326: (follow-up) Interface fixes

This patch addresses the following:

a) I feel we don't need the "Pages" heading. It only takes up space and
states the obvious. (non-blocker... but navigation needs work, see
below)

b) OpacMainUserBlock should not show on the pages in my opinion.
Libraries use it to place text on the start page instead of using the
news feature, which means it repeats on all pages. I'd really like to
see this changed.

c) Personally I'd change "Location" to "Interface" to avoid confusion
with the item value in translations. But I see it's the same on news. So
out of scope here.

d) Parent pages can be deleted without warning. Childs will be moved to
top level. This is acceptable behaviour as they are not left orphaned.
But it might be something to improve on in the future.

e) In the test plan and in the code I see there should be a confirmation
message on deleting a single or multiple entries, but this doesn't work.
(blocker)

Created attachment 83326 [details] [review]
Bug 15326: (follow-up) Pages navigation fixes

This is the best I've managed to do with the navigation. Would be happy
for someone else to give it a go because I'm aware that some parent
links repeat.

Created attachment 83404 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 83405 [details] [review]
Bug 15326: (follow-up) Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
work) is the navigation for the CMS pages on both the staff side and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
 with different combinations of display location, library and language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
location and library
- Confirm that if page has not been published and user does not have
permission to edit pages, page content will not display on OPAC side. On
staff side, a message will show saying that page has not been published
- Confirm pagination for table shows and works
- Confirm deleting pages works as expected (confirm message before
delete)
- Confirm link title must be unique when adding new pages
- Confirm that editing the details of an existing page works
- Confirm that adding a child page will only work if the location of
child page matches location of parent page, i.e., if parent page is an
OPAC page then child page must also be OPAC page. if parent page is in
all locations then child page can be in all or either interface(s)
- Confirm Select All/Clear All toggle works
- Confirm viewing of CMS pages in OPAC and in staff client works and
looks nice

Sponsored-by: Region Halland

Bug 15326: [FOLLOW-UP] Many fixes

This patch:
- moves action buttons into a dropdown, adds a delete button to dropdown
- fixes the tests (they should now all pass)
- fixes qa tool problems
- removes the Koha::CmsPages->remove() method (unnecessary)
- makes changes to the Koha::CmsPages->add() method (now simpler, easier
to test)

This is now ready to test.

Sponsored-by: Catalyst IT

Bug 15326: [FOLLOW-UP] More fixes

This patch removes the t/Pages.t file because it isn't required, and
other unused methods.

This patch is ready to test. The appropriate tests are in
t/db_dependent/Pages.t

Bug 15326: [FOLLOW-UP] adding and editing fixes

Sorry, did not see the second half of your comment. This patch should
fix the adding and editing issues in Comment 16.

Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

Fixes issues from Comment 19, please test

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 83406 [details] [review]
Bug 15326: (follow-up) utf8 to utf8mb4

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 83407 [details] [review]
Bug 15326: (follow-up) Move js to footer, use Asset plugin

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 83408 [details] [review]
Bug 15326: (follow-up) Don't make links to unpublished pages in opac

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 83409 [details] [review]
Bug 15326: (follow-up) Fix tools menu highlighting

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 83410 [details] [review]
Bug 15326: (follow-up) Code review fixes

Addresses the following issues:

b) In opac-cmspages there is:
+        flagsrequired   => { borrow => 1 },
The borrow permission has been removed since. (blocker)

c) Comment was removed unnecessarily, just needs to be moved into
its right spot below again:
-# If GoogleIndicTransliteration system preference is On Set
parameter to load Google's javascript in OPAC search screens

d) One file uses qw( -utf-8) but another does not:
+use CGI;
+use CGI qw( -utf8 );  (blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 83411 [details] [review]
Bug 15326: (follow-up) Interface fixes

This patch addresses the following:

a) I feel we don't need the "Pages" heading. It only takes up space and
states the obvious. (non-blocker... but navigation needs work, see
below)

b) OpacMainUserBlock should not show on the pages in my opinion.
Libraries use it to place text on the start page instead of using the
news feature, which means it repeats on all pages. I'd really like to
see this changed.

c) Personally I'd change "Location" to "Interface" to avoid confusion
with the item value in translations. But I see it's the same on news. So
out of scope here.

d) Parent pages can be deleted without warning. Childs will be moved to
top level. This is acceptable behaviour as they are not left orphaned.
But it might be something to improve on in the future.

e) In the test plan and in the code I see there should be a confirmation
message on deleting a single or multiple entries, but this doesn't work.
(blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 83412 [details] [review]
Bug 15326: (follow-up) Pages navigation fixes

This is the best I've managed to do with the navigation. Would be happy
for someone else to give it a go because I'm aware that some parent
links repeat.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 84682 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 84683 [details] [review]
Bug 15326: (follow-up) Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
        work) is the navigation for the CMS pages on both the staff side
and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
         with different combinations of display location, library and
         language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff
interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
    location and library
    - Confirm that if page has not been published and user does not have
    permission to edit pages, page content will not display on OPAC
    side. On
    staff side, a message will show saying that page has not been
    published
    - Confirm pagination for table shows and works
    - Confirm deleting pages works as expected (confirm message before
            delete)
    - Confirm link title must be unique when adding new pages
    - Confirm that editing the details of an existing page works
    - Confirm that adding a child page will only work if the location of
    child page matches location of parent page, i.e., if parent page is
    an
    OPAC page then child page must also be OPAC page. if parent page is
    in
    all locations then child page can be in all or either interface(s)
    - Confirm Select All/Clear All toggle works
    - Confirm viewing of CMS pages in OPAC and in staff client works and
    looks nice

    Sponsored-by: Region Halland

    Bug 15326: [FOLLOW-UP] Many fixes

    This patch:
    - moves action buttons into a dropdown, adds a delete button to
    dropdown
    - fixes the tests (they should now all pass)
    - fixes qa tool problems
    - removes the Koha::CmsPages->remove() method (unnecessary)
    - makes changes to the Koha::CmsPages->add() method (now simpler,
            easier
            to test)

    This is now ready to test.

    Sponsored-by: Catalyst IT

    Bug 15326: [FOLLOW-UP] More fixes

    This patch removes the t/Pages.t file because it isn't required, and
    other unused methods.

    This patch is ready to test. The appropriate tests are in
    t/db_dependent/Pages.t

    Bug 15326: [FOLLOW-UP] adding and editing fixes

    Sorry, did not see the second half of your comment. This patch
    should
    fix the adding and editing issues in Comment 16.

    Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

    Fixes issues from Comment 19, please test

    Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
    Signed-off-by: Michal Denar <black23@gmail.com>

    Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 84684 [details] [review]
Bug 15326: (follow-up) utf8 to utf8mb4

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 84685 [details] [review]
Bug 15326: (follow-up) Move js to footer, use Asset plugin

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 84686 [details] [review]
Bug 15326: (follow-up) Don't make links to unpublished pages in opac

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 84687 [details] [review]
Bug 15326: (follow-up) Fix tools menu highlighting

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 84688 [details] [review]
Bug 15326: (follow-up) Code review fixes

Addresses the following issues:

b) In opac-cmspages there is:
+        flagsrequired   => { borrow => 1 },
The borrow permission has been removed since. (blocker)

c) Comment was removed unnecessarily, just needs to be moved into
its right spot below again:
-# If GoogleIndicTransliteration system preference is On Set
parameter to load Google's javascript in OPAC search screens

d) One file uses qw( -utf-8) but another does not:
+use CGI;
+use CGI qw( -utf8 );  (blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 84689 [details] [review]
Bug 15326: (follow-up) Interface fixes

This patch addresses the following:

a) I feel we don't need the "Pages" heading. It only takes up space and
states the obvious. (non-blocker... but navigation needs work, see
below)

b) OpacMainUserBlock should not show on the pages in my opinion.
Libraries use it to place text on the start page instead of using the
news feature, which means it repeats on all pages. I'd really like to
see this changed.

c) Personally I'd change "Location" to "Interface" to avoid confusion
with the item value in translations. But I see it's the same on news. So
out of scope here.

d) Parent pages can be deleted without warning. Childs will be moved to
top level. This is acceptable behaviour as they are not left orphaned.
But it might be something to improve on in the future.

e) In the test plan and in the code I see there should be a confirmation
message on deleting a single or multiple entries, but this doesn't work.
(blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 84690 [details] [review]
Bug 15326: (follow-up) Pages navigation fixes

This is the best I've managed to do with the navigation. Would be happy
for someone else to give it a go because I'm aware that some parent
links repeat.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Created attachment 84691 [details] [review]
Bug 15326: Schema changes

Applying: Bug 15326: Add CMS feature
.git/rebase-apply/patch:191: tab in indent.
                    -asc => [qw/parent location branchcode lang sortorder/]
.git/rebase-apply/patch:241: tab in indent.
        my ( $self, $id ) = @_;
.git/rebase-apply/patch:243: tab in indent.
        carp( 'Missing CMS page id parameter in Koha::Pages::page' ) unless defined $id;
.git/rebase-apply/patch:245: tab in indent.
        # Probably want to merge these to a single query:
.git/rebase-apply/patch:246: tab in indent.
        my $top_links = $self->_resultset()->search(
warning: squelched 77 whitespace errors
warning: 82 lines add whitespace errors.
Using index info to reconstruct a base tree...
M       installer/data/mysql/kohastructure.sql
M       installer/data/mysql/userpermissions.sql
M       koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
M       opac/opac-main.pl
.git/rebase-apply/patch:191: tab in indent.
                    -asc => [qw/parent location branchcode lang sortorder/]
.git/rebase-apply/patch:241: tab in indent.
        my ( $self, $id ) = @_;
.git/rebase-apply/patch:243: tab in indent.
        carp( 'Missing CMS page id parameter in Koha::Pages::page' ) unless defined $id;
.git/rebase-apply/patch:245: tab in indent.
        # Probably want to merge these to a single query:
.git/rebase-apply/patch:246: tab in indent.
        my $top_links = $self->_resultset()->search(
warning: squelched 77 whitespace errors
warning: 82 lines applied after fixing whitespace errors.

CONFLICT (content): Merge conflict in opac/opac-main.pl

CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc

Patch failed at 0001 Bug 15326: Add CMS feature

Created attachment 87494 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 87495 [details] [review]
Bug 15326: (follow-up) Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
        work) is the navigation for the CMS pages on both the staff side
and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
         with different combinations of display location, library and
         language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff
interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
    location and library
    - Confirm that if page has not been published and user does not have
    permission to edit pages, page content will not display on OPAC
    side. On
    staff side, a message will show saying that page has not been
    published
    - Confirm pagination for table shows and works
    - Confirm deleting pages works as expected (confirm message before
            delete)
    - Confirm link title must be unique when adding new pages
    - Confirm that editing the details of an existing page works
    - Confirm that adding a child page will only work if the location of
    child page matches location of parent page, i.e., if parent page is
    an
    OPAC page then child page must also be OPAC page. if parent page is
    in
    all locations then child page can be in all or either interface(s)
    - Confirm Select All/Clear All toggle works
    - Confirm viewing of CMS pages in OPAC and in staff client works and
    looks nice

    Sponsored-by: Region Halland

    Bug 15326: [FOLLOW-UP] Many fixes

    This patch:
    - moves action buttons into a dropdown, adds a delete button to
    dropdown
    - fixes the tests (they should now all pass)
    - fixes qa tool problems
    - removes the Koha::CmsPages->remove() method (unnecessary)
    - makes changes to the Koha::CmsPages->add() method (now simpler,
            easier
            to test)

    This is now ready to test.

    Sponsored-by: Catalyst IT

    Bug 15326: [FOLLOW-UP] More fixes

    This patch removes the t/Pages.t file because it isn't required, and
    other unused methods.

    This patch is ready to test. The appropriate tests are in
    t/db_dependent/Pages.t

    Bug 15326: [FOLLOW-UP] adding and editing fixes

    Sorry, did not see the second half of your comment. This patch
    should
    fix the adding and editing issues in Comment 16.

    Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

    Fixes issues from Comment 19, please test

    Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
    Signed-off-by: Michal Denar <black23@gmail.com>

    Signed-off-by: Michal Denar <black23@gmail.com>
    Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 87496 [details] [review]
Bug 15326: (follow-up) utf8 to utf8mb4

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 87497 [details] [review]
Bug 15326: (follow-up) Move js to footer, use Asset plugin

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 87498 [details] [review]
Bug 15326: (follow-up) Don't make links to unpublished pages in opac

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 87499 [details] [review]
Bug 15326: (follow-up) Fix tools menu highlighting

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 87500 [details] [review]
Bug 15326: (follow-up) Code review fixes

Addresses the following issues:

b) In opac-cmspages there is:
+        flagsrequired   => { borrow => 1 },
The borrow permission has been removed since. (blocker)

c) Comment was removed unnecessarily, just needs to be moved into
its right spot below again:
-# If GoogleIndicTransliteration system preference is On Set
parameter to load Google's javascript in OPAC search screens

d) One file uses qw( -utf-8) but another does not:
+use CGI;
+use CGI qw( -utf8 );  (blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 87501 [details] [review]
Bug 15326: (follow-up) Interface fixes

This patch addresses the following:

a) I feel we don't need the "Pages" heading. It only takes up space and
states the obvious. (non-blocker... but navigation needs work, see
below)

b) OpacMainUserBlock should not show on the pages in my opinion.
Libraries use it to place text on the start page instead of using the
news feature, which means it repeats on all pages. I'd really like to
see this changed.

c) Personally I'd change "Location" to "Interface" to avoid confusion
with the item value in translations. But I see it's the same on news. So
out of scope here.

d) Parent pages can be deleted without warning. Childs will be moved to
top level. This is acceptable behaviour as they are not left orphaned.
But it might be something to improve on in the future.

e) In the test plan and in the code I see there should be a confirmation
message on deleting a single or multiple entries, but this doesn't work.
(blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 87502 [details] [review]
Bug 15326: (follow-up) Pages navigation fixes

This is the best I've managed to do with the navigation. Would be happy
for someone else to give it a go because I'm aware that some parent
links repeat.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 87503 [details] [review]
Bug 15326: Schema changes

Created attachment 87608 [details] [review]
Bug 15326: (follow-up) Redindent new CMS page templates

This patch is an opinionated reindent of new and changed templates
related to the CMS feature. I think it would be nice for these templates
to start out with good indentation.

To test, apply the patch and test the CMS feature. There should be no
visible change to the way it looks or the way it works.

Created attachment 87609 [details] [review]
Bug 15326: (follow-up) Corrections to staff client templates

This patch makes some corrections to the staff client's CMS-related
templates:

 - Add missing Template Toolkit filters.
 - Remove JavaScript from tools-menu.inc. This must have crept in during
   a rebase.
 - Add navigation link highlighting to tools-menu.js instead.
 - Convert tools/cmspages.tt to Bootstrap grid.
 - Correct toolbar button class.
 - Move some column sorting configuration out of JS and into table
   markup.
 - Move "Select all" / "Clear all" links to the top of the table to
   match similar interfaces.
 - Change the Action menu's "Intranet" and "OPAC" links to be "View" and
   "View in OPAC." The OPAC view now opens a new window.

To test, apply the patches and test the Pages feature in the staff
client: Adding, editing, deleting, viewing. For each view, test that the
page layout adjusts to various browser widths.

Created attachment 87610 [details] [review]
Bug 15326: (follow-up) Remove obsolete LESS file, add TT filters

Previous versions of this patch set adds a LESS file to the OPAC, which
is now obsolete. It should be removed.

In addition, the change made to opac.less contained CSS which didn't
apply to any existing markup, so it need not be added to opac.scss.

The patch also adds missing Template Toolkit filters to template files.

None of these changes should be visible in testing. OPAC CMS pages
should function as usual.

Created attachment 87617 [details] [review]
Bug 15326: (follow-up) Remove obsolete LESS file, add TT filters

Previous versions of this patch set adds a LESS file to the OPAC, which
is now obsolete. It should be removed.

In addition, the change made to opac.less contained CSS which didn't
apply to any existing markup, so it need not be added to opac.scss.

The patch also adds missing Template Toolkit filters to template files.

None of these changes should be visible in testing. OPAC CMS pages
should function as usual.

Created attachment 96084 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 96085 [details] [review]
Bug 15326: (follow-up) Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
        work) is the navigation for the CMS pages on both the staff side
and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
         with different combinations of display location, library and
         language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff
interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
    location and library
    - Confirm that if page has not been published and user does not have
    permission to edit pages, page content will not display on OPAC
    side. On
    staff side, a message will show saying that page has not been
    published
    - Confirm pagination for table shows and works
    - Confirm deleting pages works as expected (confirm message before
            delete)
    - Confirm link title must be unique when adding new pages
    - Confirm that editing the details of an existing page works
    - Confirm that adding a child page will only work if the location of
    child page matches location of parent page, i.e., if parent page is
    an
    OPAC page then child page must also be OPAC page. if parent page is
    in
    all locations then child page can be in all or either interface(s)
    - Confirm Select All/Clear All toggle works
    - Confirm viewing of CMS pages in OPAC and in staff client works and
    looks nice

    Sponsored-by: Region Halland

    Bug 15326: [FOLLOW-UP] Many fixes

    This patch:
    - moves action buttons into a dropdown, adds a delete button to
    dropdown
    - fixes the tests (they should now all pass)
    - fixes qa tool problems
    - removes the Koha::CmsPages->remove() method (unnecessary)
    - makes changes to the Koha::CmsPages->add() method (now simpler,
            easier
            to test)

    This is now ready to test.

    Sponsored-by: Catalyst IT

    Bug 15326: [FOLLOW-UP] More fixes

    This patch removes the t/Pages.t file because it isn't required, and
    other unused methods.

    This patch is ready to test. The appropriate tests are in
    t/db_dependent/Pages.t

    Bug 15326: [FOLLOW-UP] adding and editing fixes

    Sorry, did not see the second half of your comment. This patch
    should
    fix the adding and editing issues in Comment 16.

    Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

    Fixes issues from Comment 19, please test

    Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
    Signed-off-by: Michal Denar <black23@gmail.com>

    Signed-off-by: Michal Denar <black23@gmail.com>
    Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 96086 [details] [review]
Bug 15326: (follow-up) utf8 to utf8mb4

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 96087 [details] [review]
Bug 15326: (follow-up) Move js to footer, use Asset plugin

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 96088 [details] [review]
Bug 15326: (follow-up) Don't make links to unpublished pages in opac

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 96089 [details] [review]
Bug 15326: (follow-up) Fix tools menu highlighting

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 96090 [details] [review]
Bug 15326: (follow-up) Code review fixes

Addresses the following issues:

b) In opac-cmspages there is:
+        flagsrequired   => { borrow => 1 },
The borrow permission has been removed since. (blocker)

c) Comment was removed unnecessarily, just needs to be moved into
its right spot below again:
-# If GoogleIndicTransliteration system preference is On Set
parameter to load Google's javascript in OPAC search screens

d) One file uses qw( -utf-8) but another does not:
+use CGI;
+use CGI qw( -utf8 );  (blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 96091 [details] [review]
Bug 15326: (follow-up) Interface fixes

This patch addresses the following:

a) I feel we don't need the "Pages" heading. It only takes up space and
states the obvious. (non-blocker... but navigation needs work, see
below)

b) OpacMainUserBlock should not show on the pages in my opinion.
Libraries use it to place text on the start page instead of using the
news feature, which means it repeats on all pages. I'd really like to
see this changed.

c) Personally I'd change "Location" to "Interface" to avoid confusion
with the item value in translations. But I see it's the same on news. So
out of scope here.

d) Parent pages can be deleted without warning. Childs will be moved to
top level. This is acceptable behaviour as they are not left orphaned.
But it might be something to improve on in the future.

e) In the test plan and in the code I see there should be a confirmation
message on deleting a single or multiple entries, but this doesn't work.
(blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 96092 [details] [review]
Bug 15326: (follow-up) Pages navigation fixes

This is the best I've managed to do with the navigation. Would be happy
for someone else to give it a go because I'm aware that some parent
links repeat.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 96093 [details] [review]
Bug 15326: (follow-up) Redindent new CMS page templates

This patch is an opinionated reindent of new and changed templates
related to the CMS feature. I think it would be nice for these templates
to start out with good indentation.

To test, apply the patch and test the CMS feature. There should be no
visible change to the way it looks or the way it works.

Created attachment 96094 [details] [review]
Bug 15326: (follow-up) Corrections to staff client templates

This patch makes some corrections to the staff client's CMS-related
templates:

 - Add missing Template Toolkit filters.
 - Remove JavaScript from tools-menu.inc. This must have crept in during
   a rebase.
 - Add navigation link highlighting to tools-menu.js instead.
 - Convert tools/cmspages.tt to Bootstrap grid.
 - Correct toolbar button class.
 - Move some column sorting configuration out of JS and into table
   markup.
 - Move "Select all" / "Clear all" links to the top of the table to
   match similar interfaces.
 - Change the Action menu's "Intranet" and "OPAC" links to be "View" and
   "View in OPAC." The OPAC view now opens a new window.

To test, apply the patches and test the Pages feature in the staff
client: Adding, editing, deleting, viewing. For each view, test that the
page layout adjusts to various browser widths.

Created attachment 96095 [details] [review]
Bug 15326: (follow-up) Remove obsolete LESS file, add TT filters

Previous versions of this patch set adds a LESS file to the OPAC, which
is now obsolete. It should be removed.

In addition, the change made to opac.less contained CSS which didn't
apply to any existing markup, so it need not be added to opac.scss.

The patch also adds missing Template Toolkit filters to template files.

None of these changes should be visible in testing. OPAC CMS pages
should function as usual.

Created attachment 96096 [details] [review]
Bug 15326: Schema changes

Created attachment 96097 [details] [review]
Bug 15326: Fix QA errors

Created attachment 96098 [details] [review]
Bug 15326: Fix filters  and adjust tiny_mce assets

Created attachment 97237 [details] [review]
Bug 15326: (follow-up) Template tweaks

This patch makes some tweaks to the staff-side template:

 - Fix some indentation
 - Add some markup comments
 - Fix some HTML validation errors: Eliminate duplicate id attributes
 - Expand the descriptiveness of <title>, breadcrumbs, and form legend
 - Increase size of link and title fields; Add maxlength attribute to
   title field.
 - Move title and link fields to the second column of the table -- more
   consistent with other tables where the main link is in the first
   column.
 - Link parent page information to corresponding edit page
 - Correct incorrectly filtered action links
 - Correct default table sort
 - Fix TinyMCE configuration - I copied some configuration code from
   another page which was updated more recently.

 To test, apply the patch and test the process of adding, editing, and
 deleting pages. Test all the options in the "Actions" menu.

Created attachment 101565 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 101566 [details] [review]
Bug 15326: (follow-up) Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
        work) is the navigation for the CMS pages on both the staff side
and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
         with different combinations of display location, library and
         language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff
interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
    location and library
    - Confirm that if page has not been published and user does not have
    permission to edit pages, page content will not display on OPAC
    side. On
    staff side, a message will show saying that page has not been
    published
    - Confirm pagination for table shows and works
    - Confirm deleting pages works as expected (confirm message before
            delete)
    - Confirm link title must be unique when adding new pages
    - Confirm that editing the details of an existing page works
    - Confirm that adding a child page will only work if the location of
    child page matches location of parent page, i.e., if parent page is
    an
    OPAC page then child page must also be OPAC page. if parent page is
    in
    all locations then child page can be in all or either interface(s)
    - Confirm Select All/Clear All toggle works
    - Confirm viewing of CMS pages in OPAC and in staff client works and
    looks nice

    Sponsored-by: Region Halland

    Bug 15326: [FOLLOW-UP] Many fixes

    This patch:
    - moves action buttons into a dropdown, adds a delete button to
    dropdown
    - fixes the tests (they should now all pass)
    - fixes qa tool problems
    - removes the Koha::CmsPages->remove() method (unnecessary)
    - makes changes to the Koha::CmsPages->add() method (now simpler,
            easier
            to test)

    This is now ready to test.

    Sponsored-by: Catalyst IT

    Bug 15326: [FOLLOW-UP] More fixes

    This patch removes the t/Pages.t file because it isn't required, and
    other unused methods.

    This patch is ready to test. The appropriate tests are in
    t/db_dependent/Pages.t

    Bug 15326: [FOLLOW-UP] adding and editing fixes

    Sorry, did not see the second half of your comment. This patch
    should
    fix the adding and editing issues in Comment 16.

    Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

    Fixes issues from Comment 19, please test

    Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
    Signed-off-by: Michal Denar <black23@gmail.com>

    Signed-off-by: Michal Denar <black23@gmail.com>
    Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 101567 [details] [review]
Bug 15326: (follow-up) utf8 to utf8mb4

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 101568 [details] [review]
Bug 15326: (follow-up) Move js to footer, use Asset plugin

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 101569 [details] [review]
Bug 15326: (follow-up) Don't make links to unpublished pages in opac

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 101570 [details] [review]
Bug 15326: (follow-up) Fix tools menu highlighting

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 101571 [details] [review]
Bug 15326: (follow-up) Code review fixes

Addresses the following issues:

b) In opac-cmspages there is:
+        flagsrequired   => { borrow => 1 },
The borrow permission has been removed since. (blocker)

c) Comment was removed unnecessarily, just needs to be moved into
its right spot below again:
-# If GoogleIndicTransliteration system preference is On Set
parameter to load Google's javascript in OPAC search screens

d) One file uses qw( -utf-8) but another does not:
+use CGI;
+use CGI qw( -utf8 );  (blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 101572 [details] [review]
Bug 15326: (follow-up) Interface fixes

This patch addresses the following:

a) I feel we don't need the "Pages" heading. It only takes up space and
states the obvious. (non-blocker... but navigation needs work, see
below)

b) OpacMainUserBlock should not show on the pages in my opinion.
Libraries use it to place text on the start page instead of using the
news feature, which means it repeats on all pages. I'd really like to
see this changed.

c) Personally I'd change "Location" to "Interface" to avoid confusion
with the item value in translations. But I see it's the same on news. So
out of scope here.

d) Parent pages can be deleted without warning. Childs will be moved to
top level. This is acceptable behaviour as they are not left orphaned.
But it might be something to improve on in the future.

e) In the test plan and in the code I see there should be a confirmation
message on deleting a single or multiple entries, but this doesn't work.
(blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 101573 [details] [review]
Bug 15326: (follow-up) Pages navigation fixes

This is the best I've managed to do with the navigation. Would be happy
for someone else to give it a go because I'm aware that some parent
links repeat.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 101574 [details] [review]
Bug 15326: (follow-up) Redindent new CMS page templates

This patch is an opinionated reindent of new and changed templates
related to the CMS feature. I think it would be nice for these templates
to start out with good indentation.

To test, apply the patch and test the CMS feature. There should be no
visible change to the way it looks or the way it works.

Created attachment 101575 [details] [review]
Bug 15326: (follow-up) Corrections to staff client templates

This patch makes some corrections to the staff client's CMS-related
templates:

 - Add missing Template Toolkit filters.
 - Remove JavaScript from tools-menu.inc. This must have crept in during
   a rebase.
 - Add navigation link highlighting to tools-menu.js instead.
 - Convert tools/cmspages.tt to Bootstrap grid.
 - Correct toolbar button class.
 - Move some column sorting configuration out of JS and into table
   markup.
 - Move "Select all" / "Clear all" links to the top of the table to
   match similar interfaces.
 - Change the Action menu's "Intranet" and "OPAC" links to be "View" and
   "View in OPAC." The OPAC view now opens a new window.

To test, apply the patches and test the Pages feature in the staff
client: Adding, editing, deleting, viewing. For each view, test that the
page layout adjusts to various browser widths.

Created attachment 101576 [details] [review]
Bug 15326: (follow-up) Remove obsolete LESS file, add TT filters

Previous versions of this patch set adds a LESS file to the OPAC, which
is now obsolete. It should be removed.

In addition, the change made to opac.less contained CSS which didn't
apply to any existing markup, so it need not be added to opac.scss.

The patch also adds missing Template Toolkit filters to template files.

None of these changes should be visible in testing. OPAC CMS pages
should function as usual.

Created attachment 101577 [details] [review]
Bug 15326: Fix QA errors

Created attachment 101578 [details] [review]
Bug 15326: Fix filters and adjust tiny_mce assets

Created attachment 101579 [details] [review]
Bug 15326: (follow-up) Template tweaks

This patch makes some tweaks to the staff-side template:

 - Fix some indentation
 - Add some markup comments
 - Fix some HTML validation errors: Eliminate duplicate id attributes
 - Expand the descriptiveness of <title>, breadcrumbs, and form legend
 - Increase size of link and title fields; Add maxlength attribute to
   title field.
 - Move title and link fields to the second column of the table -- more
   consistent with other tables where the main link is in the first
   column.
 - Link parent page information to corresponding edit page
 - Correct incorrectly filtered action links
 - Correct default table sort
 - Fix TinyMCE configuration - I copied some configuration code from
   another page which was updated more recently.

 To test, apply the patch and test the process of adding, editing, and
 deleting pages. Test all the options in the "Actions" menu.

Created attachment 101580 [details] [review]
Bug 15326: DO NOT PUSH - Schema changes

Created attachment 128341 [details] [review]
Bug 15326: Add CMS feature

INCOMPLETE - For evaluation purposes only!

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 128342 [details] [review]
Bug 15326: (follow-up) Add CMS feature

This patch builds on Martin Persson's patch. I made a few changes that
improve the patch and make this feature functional.
The only thing I am not completely satisfied with (and doesn't reliably
        work) is the navigation for the CMS pages on both the staff side
and the
OPAC side. This needs work. Otherwise the CMS feature works.

- Make sure you update database after applying patch
- After adding a few pages, confirm that filtering results works (play
         with different combinations of display location, library and
         language)
- Confirm that pages with specific locations ONLY show up in those
locations, i.e. OPAC pages can only be accessed in OPAC and staff
interface
pages can only be accessed on staff client
- Confirm that table is showing correct data, particularly language,
    location and library
    - Confirm that if page has not been published and user does not have
    permission to edit pages, page content will not display on OPAC
    side. On
    staff side, a message will show saying that page has not been
    published
    - Confirm pagination for table shows and works
    - Confirm deleting pages works as expected (confirm message before
            delete)
    - Confirm link title must be unique when adding new pages
    - Confirm that editing the details of an existing page works
    - Confirm that adding a child page will only work if the location of
    child page matches location of parent page, i.e., if parent page is
    an
    OPAC page then child page must also be OPAC page. if parent page is
    in
    all locations then child page can be in all or either interface(s)
    - Confirm Select All/Clear All toggle works
    - Confirm viewing of CMS pages in OPAC and in staff client works and
    looks nice

    Sponsored-by: Region Halland

    Bug 15326: [FOLLOW-UP] Many fixes

    This patch:
    - moves action buttons into a dropdown, adds a delete button to
    dropdown
    - fixes the tests (they should now all pass)
    - fixes qa tool problems
    - removes the Koha::CmsPages->remove() method (unnecessary)
    - makes changes to the Koha::CmsPages->add() method (now simpler,
            easier
            to test)

    This is now ready to test.

    Sponsored-by: Catalyst IT

    Bug 15326: [FOLLOW-UP] More fixes

    This patch removes the t/Pages.t file because it isn't required, and
    other unused methods.

    This patch is ready to test. The appropriate tests are in
    t/db_dependent/Pages.t

    Bug 15326: [FOLLOW-UP] adding and editing fixes

    Sorry, did not see the second half of your comment. This patch
    should
    fix the adding and editing issues in Comment 16.

    Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

    Fixes issues from Comment 19, please test

    Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
    Signed-off-by: Michal Denar <black23@gmail.com>

    Signed-off-by: Michal Denar <black23@gmail.com>
    Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 128343 [details] [review]
Bug 15326: (follow-up) utf8 to utf8mb4

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 128344 [details] [review]
Bug 15326: (follow-up) Move js to footer, use Asset plugin

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 128345 [details] [review]
Bug 15326: (follow-up) Don't make links to unpublished pages in opac

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 128346 [details] [review]
Bug 15326: (follow-up) Fix tools menu highlighting

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 128347 [details] [review]
Bug 15326: (follow-up) Code review fixes

Addresses the following issues:

b) In opac-cmspages there is:
+        flagsrequired   => { borrow => 1 },
The borrow permission has been removed since. (blocker)

c) Comment was removed unnecessarily, just needs to be moved into
its right spot below again:
-# If GoogleIndicTransliteration system preference is On Set
parameter to load Google's javascript in OPAC search screens

d) One file uses qw( -utf-8) but another does not:
+use CGI;
+use CGI qw( -utf8 );  (blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 128348 [details] [review]
Bug 15326: (follow-up) Interface fixes

This patch addresses the following:

a) I feel we don't need the "Pages" heading. It only takes up space and
states the obvious. (non-blocker... but navigation needs work, see
below)

b) OpacMainUserBlock should not show on the pages in my opinion.
Libraries use it to place text on the start page instead of using the
news feature, which means it repeats on all pages. I'd really like to
see this changed.

c) Personally I'd change "Location" to "Interface" to avoid confusion
with the item value in translations. But I see it's the same on news. So
out of scope here.

d) Parent pages can be deleted without warning. Childs will be moved to
top level. This is acceptable behaviour as they are not left orphaned.
But it might be something to improve on in the future.

e) In the test plan and in the code I see there should be a confirmation
message on deleting a single or multiple entries, but this doesn't work.
(blocker)

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 128349 [details] [review]
Bug 15326: (follow-up) Pages navigation fixes

This is the best I've managed to do with the navigation. Would be happy
for someone else to give it a go because I'm aware that some parent
links repeat.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>
Rebased-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Created attachment 128350 [details] [review]
Bug 15326: (follow-up) Redindent new CMS page templates

This patch is an opinionated reindent of new and changed templates
related to the CMS feature. I think it would be nice for these templates
to start out with good indentation.

To test, apply the patch and test the CMS feature. There should be no
visible change to the way it looks or the way it works.

Created attachment 128351 [details] [review]
Bug 15326: (follow-up) Corrections to staff client templates

This patch makes some corrections to the staff client's CMS-related
templates:

 - Add missing Template Toolkit filters.
 - Remove JavaScript from tools-menu.inc. This must have crept in during
   a rebase.
 - Add navigation link highlighting to tools-menu.js instead.
 - Convert tools/cmspages.tt to Bootstrap grid.
 - Correct toolbar button class.
 - Move some column sorting configuration out of JS and into table
   markup.
 - Move "Select all" / "Clear all" links to the top of the table to
   match similar interfaces.
 - Change the Action menu's "Intranet" and "OPAC" links to be "View" and
   "View in OPAC." The OPAC view now opens a new window.

To test, apply the patches and test the Pages feature in the staff
client: Adding, editing, deleting, viewing. For each view, test that the
page layout adjusts to various browser widths.

Created attachment 128352 [details] [review]
Bug 15326: (follow-up) Remove obsolete LESS file, add TT filters

Previous versions of this patch set adds a LESS file to the OPAC, which
is now obsolete. It should be removed.

In addition, the change made to opac.less contained CSS which didn't
apply to any existing markup, so it need not be added to opac.scss.

The patch also adds missing Template Toolkit filters to template files.

None of these changes should be visible in testing. OPAC CMS pages
should function as usual.

Created attachment 128353 [details] [review]
Bug 15326: Fix QA errors

Created attachment 128354 [details] [review]
Bug 15326: Fix filters and adjust tiny_mce assets

Created attachment 128355 [details] [review]
Bug 15326: (follow-up) Template tweaks

This patch makes some tweaks to the staff-side template:

 - Fix some indentation
 - Add some markup comments
 - Fix some HTML validation errors: Eliminate duplicate id attributes
 - Expand the descriptiveness of <title>, breadcrumbs, and form legend
 - Increase size of link and title fields; Add maxlength attribute to
   title field.
 - Move title and link fields to the second column of the table -- more
   consistent with other tables where the main link is in the first
   column.
 - Link parent page information to corresponding edit page
 - Correct incorrectly filtered action links
 - Correct default table sort
 - Fix TinyMCE configuration - I copied some configuration code from
   another page which was updated more recently.

 To test, apply the patch and test the process of adding, editing, and
 deleting pages. Test all the options in the "Actions" menu.

Created attachment 128356 [details] [review]
Bug 15326: (follow-up) WIP

Fixing breadcrumbs
Hiding private/unpublished pages etc

Still working on pages navigation

Created attachment 128357 [details] [review]
Bug 15326: Schema updates

Created attachment 128585 [details] [review]
Bug 15326: WIP: Using AdditionalContents for custom pages on OPAC

Created attachment 128642 [details] [review]
Bug 15326: Using AdditionalContents for custom pages on OPAC

This page utilises the Additional Contents feature to add custom pages
to the staff client and the OPAC in the user's desired language.

To test:
1. Apply patch and restart services
2. In the staff client, go to Tools, then go to the new 'Pages' page
3. Add a new page to display on both the staff client and OPAC.
4. Notice the 'View' button in the Actions column. This button should
only show when viewing Pages, it should not show when viewing HTML
customisations or News. Test that the main View button links you to the
page in the staff client. Test that clicking the arrow shows a button to
view the page in the OPAC, and clicking it opens the OPAC in a new tab.
5. When viewing your new page in the staff client, confirm a Pages
navigation shows in the left navigation.
6. When viewing your new page in the OPAC, confirm a Pages navigation
shows in the left navigation. Confirm pages are also linked in the
masthead links (i.e. with Advanced search and Libraries etc).
7. Confirm that any pages made for the staff client only do not show in
the OPAC, and that any pages made for the OPAC only do not show in the
staff client.
8. Pages that can be viewed on the staff client will also show under the
Pages link on the Tools main page.

Sponsored-by: Catalyst IT

Created attachment 136432 [details] [review]
Bug 15326: Using AdditionalContents for custom pages on OPAC

This page utilises the Additional Contents feature to add custom pages
to the staff client and the OPAC in the user's desired language.

To test:
1. Apply patch and restart services
2. In the staff client, go to Tools, then go to the new 'Pages' page
3. Add a new page to display on both the staff client and OPAC.
4. Notice the 'View' button in the Actions column. This button should
only show when viewing Pages, it should not show when viewing HTML
customisations or News. Test that the main View button links you to the
page in the staff client. Test that clicking the arrow shows a button to
view the page in the OPAC, and clicking it opens the OPAC in a new tab.
5. When viewing your new page in the staff client, confirm a Pages
navigation shows in the left navigation.
6. When viewing your new page in the OPAC, confirm a Pages navigation
shows in the left navigation. Confirm pages are also linked in the
masthead links (i.e. with Advanced search and Libraries etc).
7. Confirm that any pages made for the staff client only do not show in
the OPAC, and that any pages made for the OPAC only do not show in the
staff client.
8. Pages that can be viewed on the staff client will also show under the
Pages link on the Tools main page.

Sponsored-by: Chartered Accountants Australia and New Zealand

Created attachment 136757 [details] [review]
Bug 15326: Using AdditionalContents for custom pages on OPAC

This page utilises the Additional Contents feature to add custom pages
to the staff client and the OPAC in the user's desired language.

To test:
1. Apply patch and restart services
2. In the staff client, go to Tools, then go to the new 'Pages' page
3. Add a new page to display on both the staff client and OPAC.
4. Confirm the URLs in the Page URL column work as expected.
5. Confirm that any pages made for the staff client only do not show in
the OPAC, and that any pages made for the OPAC only do not show in the
staff client.
6. Confirm that pages do not show on the OPAC main page where news items
show. Confirm news items show on the OPAC main page as expected.

Sponsored-by: Chartered Accountants Australia and New Zealand

Created attachment 136768 [details] [review]
Bug 15326: Using AdditionalContents for custom pages on OPAC

This page utilises the Additional Contents feature to add custom pages
to the staff client and the OPAC in the user's desired language.

To test:
1. Apply patch and restart services
2. In the staff client, go to Tools, then go to the new 'Pages' page
3. Add a new page to display on both the staff client and OPAC.
4. Confirm the URLs in the Page URL column work as expected.
5. Confirm that any pages made for the staff client only do not show in
the OPAC, and that any pages made for the OPAC only do not show in the
staff client.
6. Confirm that pages do not show on the OPAC main page where news items
show. Confirm news items show on the OPAC main page as expected.

Sponsored-by: Chartered Accountants Australia and New Zealand

Signed-off-by: Thibault Kero <thibault.keromnes@univ-paris8.fr>

Created attachment 138489 [details] [review]
Bug 15326: (follow-up) Hide RSS feed if no news items

If there are pages but no news items showing on the OPAC, the RSS feed container
should not show.

Created attachment 138493 [details] [review]
Bug 15326: (follow-up) Hide RSS feed if no news items

If there are pages but no news items showing on the OPAC, the RSS feed container
should not show.

Sponsored-by: Horowhenua Libraries Trust

Created attachment 139028 [details] [review]
Bug 15326: Using AdditionalContents for custom pages on OPAC

This page utilises the Additional Contents feature to add custom pages
to the staff client and the OPAC in the user's desired language.

To test:
1. Apply patch and restart services
2. In the staff client, go to Tools, then go to the new 'Pages' page
3. Add a new page to display on both the staff client and OPAC.
4. Confirm the URLs in the Page URL column work as expected.
5. Confirm that any pages made for the staff client only do not show in
the OPAC, and that any pages made for the OPAC only do not show in the
staff client.
6. Confirm that pages do not show on the OPAC main page where news items
show. Confirm news items show on the OPAC main page as expected.

Sponsored-by: Chartered Accountants Australia and New Zealand

Signed-off-by: Thibault Kero <thibault.keromnes@univ-paris8.fr>

Signed-off-by: Lisette Scheer <lisettePalouse+Koha@gmail.com>

Created attachment 139031 [details] [review]
Bug 15326: (follow-up) Hide RSS feed if no news items

If there are pages but no news items showing on the OPAC, the RSS feed container
should not show.

Sponsored-by: Horowhenua Libraries Trust

Signed-off-by: Lisette Scheer <lisettePalouse+Koha@gmail.com>

Signed-off-by: Lisette Scheer <lisettePalouse+Koha@gmail.com>