[Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5006 - Invalid XHTML in record matching rules template

Chris Nighswonger cnighswonger at foundations.edu
Thu Jan 6 23:19:27 CET 2011


This patch does not apply cleanly to the 3.2.x branch. Please fix-up and
resubmit including [3.2.x] in the subject line.


cnighs at li24-93:~/koha.3.2.test (3.2.x)$ git cherry-pick -x -s 84205212b45
Automatic cherry-pick failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result with:

        git commit -c 84205212b45ebaef1969e688fea1eb544cee78f4

cnighs at li24-93:~/koha.3.2.test (3.2.x *+)$ git status
# On branch 3.2.x
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:
koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl

Kind Regards,
Chris


On Wed, Jan 5, 2011 at 3:26 AM, Nicole Engard
<nengard at bywatersolutions.com>wrote:

> From: Owen Leonard <oleonard at myacpl.org>
>
> - Rework JavaScript clone routines to use jQuery, to take
>  label "for" into account, to handle incrementing label,
>  and to properly place cloned blocks at the bottom of the group
> - Rework JavaScript delete routines to use jQuery, to take
>  block label numbers into account, and to show the "add"
>  link if you have deleted the last block.
> - Correcting markup which nests <div> inside <fieldset>
> - Ensuring labels' "for" attribute matches input IDs
> - Adding "required" style to required fields
>
> Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
> ---
>  .../intranet-tmpl/prog/en/css/staff-global.css     |    1 +
>  .../prog/en/modules/admin/matching-rules.tmpl      |  273
> ++++++++++----------
>  2 files changed, 135 insertions(+), 139 deletions(-)
>

<snip>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20110106/3d7b629a/attachment.htm>


More information about the Koha-patches mailing list