[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.05-98-g45c29bbccf

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 20.05.x has been updated
       via  45c29bbccf624a210f79ab6294df97038fb2bd29 (commit)
       via  5643d5432906776d34ea5a13296b0f607fcae306 (commit)
      from  2db5e8beb29e7ba2e438f0363a53f72c4cc49b80 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 45c29bbccf624a210f79ab6294df97038fb2bd29
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Nov 3 18:00:57 2020 +0000

    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 <p> is unnecessary and is
      removed. Also removed is the script "type" attribute and obsolete
      CDATA markers.
    - In the article request template an unnecessary <p> is removed.
    - In the merge patrons template the submit button is now in a <fieldset
      class="action"> as is consistent with other forms.
    - In the MARC modifications template I've added <div>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 <fieldset class="action"> and the
      "Cancel" link now has the "cancel" class.
    
    Signed-off-by: David Nind <david at davidnind.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d5d736909ccd24b38e90e89b1484da73972d8645)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 5643d5432906776d34ea5a13296b0f607fcae306
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sun Oct 18 16:30:24 2020 +0000

    Bug 26727: Fix <p/> appearing in the templates
    
    The self-closing p is not valid in HTML5:
    
    Error: Self-closing syntax (/>) used on a non-void HTML element.
    Ignoring the slash and treating as a start tag.
    
    To test:
    
    1)
    - Activate Article requests
    - Search for a record to place an article request on in staff
    - Look up the patron
    - Verify the article request form looks ok
    2)
    - Search for a list of patrons
    - Check 2 patrons and merge them using the button above the list
    - Verify the distance between the button and the table looks ok
    3)
    - Create a new MARC modification template
    - Create a new action
    - Verify the distances between the first and second line of form
      elements looks ok
    4)
    - Place a hold in staff
    - Click on the Suspend link in the holds table (not below)
    - Verify the modal looks ok
    
    Signed-off-by: David Nind <david at davidnind.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit bbf0d21284924d6b7529017fc78178b98242aaee)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 .../modules/cataloguing/value_builder/EXAMPLE.tt   |   6 +-
 .../prog/en/modules/circ/request-article.tt        |   1 -
 .../prog/en/modules/members/merge-patrons.tt       |  14 +-
 .../modules/tools/marc_modification_templates.tt   | 142 +++++++++++----------
 koha-tmpl/intranet-tmpl/prog/js/holds.js           |   2 +-
 5 files changed, 87 insertions(+), 78 deletions(-)


hooks/post-receive
-- 
main Koha release repository