From 6efaeea69bc73ce0a1e7b6285d9c40147fbda98a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 10 Jan 2020 20:01:35 +0000 Subject: [PATCH] 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 , 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. --- .../prog/en/modules/tools/cmspages.tt | 662 +++++++++++---------- 1 file changed, 338 insertions(+), 324 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt index 8ed52c10db..b55627bf18 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt @@ -6,7 +6,23 @@ [% SET link_opac_base = Koha.Preference( 'OPACBaseURL' ) %] [% SET link_opac = link_opac_base _ '/cgi-bin/koha/opac-cmspages.pl' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Koha › Tools › Pages + + Koha › Tools › Pages + [% IF ( form ) %] + [% IF ( id ) %] + › Edit page [% data.title | html %] + [% ELSE %] + › Add page + [% END %] + [% ELSIF ( view ) %] + [% IF ( cms_page.parent ) %] + [% FOREACH parent IN parent_list %] + › [% IF parent.id == cms_page.parent %][% parent.title_link | uri %][% END %] + [% END %] + [% END %] + › [% cms_page.title_link | html %] + [% END %] + [% INCLUDE 'doc-head-close.inc' %] @@ -17,7 +33,7 @@ Tools › [% IF ( form ) %] Pages › - [% IF ( id ) %]Edit page[% ELSE %]Add page[% END %] + [% IF ( id ) %]Edit page [% data.title | html %][% ELSE %]Add page[% END %] [% ELSIF ( view ) %] Pages › [% IF ( cms_page.parent ) %] @@ -40,336 +56,342 @@
[% END %] -
- - [% UNLESS ( link_opac_base ) %] -
- [% UNLESS ( link_opac_base ) %] - Warning: Preference OPACBaseURL not set, some links might not work!
- [% END %] - [% END %] - - [% UNLESS ( form || view ) %] - - [% END %] +
- [% IF ( failed_add ) %] -
- Failed to add page. Check that: -
    -
  • Your link title is unique
  • -
  • If specifying a parent page, the location is the same as your new page
  • -
-
- [% END %] + [% UNLESS ( link_opac_base ) %] +
+ Warning: Preference OPACBaseURL not set. Some links might not work! +
+ [% END %] - [% IF ( view ) %] -
-
-

Pages: [% cms_page.title | html %]

- [% IF ( cms_page.publish == 1 ) %] - [% cms_page.content | $raw %] - [% ELSE %] -
This page has not been published.
- [% cms_page.content | $raw %] + [% UNLESS ( form || view ) %] + [% END %] -
-
- [% IF ( pages ) %] -
+ + [% IF ( failed_add ) %] +
+ Failed to add page. Check that:
    -
  • Pages home
  • +
  • Your link title is unique
  • +
  • If specifying a parent page, the location is the same as your new page
-

Pages

- [% INCLUDE 'cms-pages-nav.inc' %] -
+
[% END %] -
-
- [% ELSIF ( form ) %] -
- - -
- Page -
    -
  1. - - -
  2. -
  3. - - + +
    + [% IF ( id ) %] + Edit page [% data.title | html %] [% ELSE %] - + Add page [% END %] - [% FOREACH branch IN branch_list %] - [% IF ( branch.branchcode == data.branchcode.branchcode ) %] - +
      +
    1. + + +
    2. +
    3. + + +
    4. +
    5. + + +
    6. +
    7. + + +
    8. +
    9. + + + Required +
    10. +
    11. + + +
    12. +
    13. + + [% IF ( data.sortorder ) %] + + [% ELSE %] + + [% END %] +
    14. +
    15. + + [% IF ( data.publish ) %] + + [% ELSE %] + + [% END %] +
    16. +
    17. + + +
    18. +
    +
    +
    + + Cancel +
    +
  4. + + [% ELSE # IF view / form %] + +

    Pages

    +
    +
    + + - -
  5. - - -
  6. -
  7. - - -
  8. -
  9. - - - Required -
  10. -
  11. - - -
  12. -
  13. - - [% IF ( data.sortorder ) %] - - [% ELSE %] - - [% END %] -
  14. -
  15. - - [% IF ( data.publish ) %] - - [% ELSE %] - - [% END %] -
  16. -
  17. - - -
  18. -
-
-
- - Cancel -
- - - [% ELSE # IF view / form %] + -

Pages

-
-
- - - - - - - - - - -
-
- - [% IF ( page_list.size ) %] -
-

Select all | Clear all

- - - - - - - - - - - - - - - - - [% FOREACH page IN page_list %] - - - - - - - +
 PublishedParentInterfaceLibraryLanguageNumberLink titlePage title 
- [% IF ( page.publish ) %] - Yes + + [% page.parent.title_link | html %] - [% SWITCH page.location %] - [% CASE "" %] - All - [% CASE "1" %] - Staff interface - [% CASE "2" %] - OPAC + [% END %] - - [% IF ( page.branchcode == "" ) %] - All + [% END %] + + + + - [% IF ( page.lang == "" ) %] - All - [% ELSE %] - [% FOREACH lang IN lang_list %] - [% IF ( lang.rfc4646_subtag == page.lang ) %] - [% lang.native_description | html %] ([% lang.rfc4646_subtag | html %]) - [% END %] - [% END %] + [% END %] + + + + + + + [% IF ( page_list.size ) %] +
+

Select all | Clear all

+ + + + + + + + + + + + + + + + + [% FOREACH page IN page_list %] + + + + + + + + + + + + [% END %] - - - - - - - [% END %] - -
 Link titlePage titlePublishedParentInterfaceLibraryLanguageNumber 
[% page.title_link | html %][% page.title | html %] + [% IF ( page.publish ) %] + Yes + [% ELSE %] + No + [% END %] + + [% page.parent.title_link | html %] + + [% SWITCH page.location %] + [% CASE "" %] + All + [% CASE "1" %] + Staff interface + [% CASE "2" %] + OPAC + [% END %] + + [% IF ( page.branchcode == "" ) %] + All + [% ELSE %] + [% page.branchcode.branchname | html %] + [% END %] + + [% IF ( page.lang == "" ) %] + All + [% ELSE %] + [% FOREACH lang IN lang_list %] + [% IF ( lang.rfc4646_subtag == page.lang ) %] + [% lang.native_description | html %] ([% lang.rfc4646_subtag | html %]) + [% END %] + [% END %] + [% END %] + [% page.sortorder | html %] +
+ + Actions + + +
+
[% page.sortorder | html %][% page.title_link | html %][% page.title | html %] -
- - Actions - - -
-
- -
- -
-
- [% ELSE %] -
- No pages exist. Create a new page? -
- [% END # IF page_list.size %] - [% END # IF view / form %] +
+ +
+ +
+ + [% ELSE %] +
+ No pages exist. Create a new page? +
+ [% END # IF page_list.size %] + [% END # IF view / form %] - - [% UNLESS ( form ) %] -
+ -
- -
- [% END %] - + [% UNLESS ( form ) %] + + +
+ +
+ [% END %] + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] @@ -379,6 +401,7 @@ [% END # jsinclude %] -- 2.11.0