From f7a46d6d80abee30ffd1ff3919d70d278faae61a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 3 Nov 2020 18:00:57 +0000 Subject: [PATCH] Bug 26727: (follow-up) More markup corrections This patch makes more markup changes to the templates previously modified in order to try to arrive at some agreeable solutions. - In the value_builder EXAMPLE template, the

is unnecessary and is removed. Also removed is the script "type" attribute and obsolete CDATA markers. - In the article request template an unnecessary

is removed. - In the merge patrons template the submit button is now in a

as is consistent with other forms. - In the MARC modifications template I've added
s around each "line" in the form to add the line break, along with some CSS to add margins. - The submit button is now inside a
and the "Cancel" link now has the "cancel" class. Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit d5d736909ccd24b38e90e89b1484da73972d8645) Signed-off-by: Lucas Gass (cherry picked from commit 45c29bbccf624a210f79ab6294df97038fb2bd29) Signed-off-by: Aleisha Amohia --- .../cataloguing/value_builder/EXAMPLE.tt | 6 +- .../prog/en/modules/circ/request-article.tt | 1 - .../prog/en/modules/members/merge-patrons.tt | 14 +- .../tools/marc_modification_templates.tt | 142 ++++++++++-------- 4 files changed, 86 insertions(+), 77 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt index c2323f2c3b..6431c3faf9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt @@ -10,7 +10,7 @@

Hi, you are looking at the result of launching the EXAMPLE plugin.

I received this from you:

-

+

I will pass back what you type here, if you press OK.

@@ -19,8 +19,7 @@

- [% INCLUDE 'popup-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt index 7167f1892b..3824c8ddb3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt @@ -90,7 +90,6 @@
Place article request from [% biblio.title | html %] for [% patron.firstname | html %] [% patron.surname | html %] ( [% patron.cardnumber | html %] ) -

  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt index 2bf7794110..dbb712c61d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt @@ -81,14 +81,14 @@ - [% FOREACH p IN patrons %] - - [% END %] - -
    +
    + [% FOREACH p IN patrons %] + + [% END %] + + +
    - - [% ELSE %]
    Error: Two or more patrons need to be selected for merging
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt index 1630b1dc0b..adc0f5bee6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt @@ -5,9 +5,17 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › MARC modification templates [% INCLUDE 'doc-head-close.inc' %] - +[% FILTER collapse %] + +[% END %] @@ -182,84 +190,88 @@ Add a new action - - - - + + + + + + - - - field(s) - - -
- + + - + + + + +
+ + +
+ +
+ + + + + Cancel +
-- 2.39.5