Bugzilla – Attachment 72863 Details for
Bug 19874
Move template JavaScript to the footer: UNIMARC editor plugins, part 5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19874: Move template JavaScript to the footer: UNIMARC editor plugins, part 5
Bug-19874-Move-template-JavaScript-to-the-footer-U.patch (text/plain), 10.23 KB, created by
Biblibre Sandboxes
on 2018-03-14 13:42:33 UTC
(
hide
)
Description:
Bug 19874: Move template JavaScript to the footer: UNIMARC editor plugins, part 5
Filename:
MIME Type:
Creator:
Biblibre Sandboxes
Created:
2018-03-14 13:42:33 UTC
Size:
10.23 KB
patch
obsolete
>From 514808d5141602aed72d0a30e3bcb79a5ba3812f Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 22 Dec 2017 14:51:20 +0000 >Subject: [PATCH] Bug 19874: Move template JavaScript to the footer: UNIMARC > editor plugins, part 5 > >This patch updates yet more UNIMARC plugin templates so that >JavaScript is included in the footer following the same pattern as other >templates which have been modified to fix Bug 17858. > >To test you do not need a UNIMARC system. > >Apply the patch and for each plugin, configure a MARC subfield (e.g. >100$a) to use that plugin. > >From the MARC edit page, trigger the plugin and confirm that changes >made in the popup window are saved to the corresponding field in the >editor. > >- unimarc_field_125a.tt >- unimarc_field_125b.tt >- unimarc_field_126a.tt >- unimarc_field_126b.tt >- unimarc_field_127.tt > >Signed-off-by: delaye <stephane.delaye@biblibre.com> >--- > .../value_builder/unimarc_field_125a.tt | 25 +++++++------- > .../value_builder/unimarc_field_125b.tt | 25 ++++++++------ > .../value_builder/unimarc_field_126a.tt | 23 +++++++------ > .../value_builder/unimarc_field_126b.tt | 27 ++++++++------- > .../cataloguing/value_builder/unimarc_field_127.tt | 40 +++++++++++----------- > 5 files changed, 74 insertions(+), 66 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt >index 444da8d..10056b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt >@@ -1,7 +1,9 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>UNIMARC field 125a builder</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >+ > <body id="cat_unimarc_field_125a" class="cat" style="padding:1em;"> > <h3>UNIMARC field 125a builder</h3> > <form name="f_pop" action=""> >@@ -133,17 +135,16 @@ > <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset> > </form> > >-<script type="text/javascript"> >-//<![CDATA[ >- function report() { >- var doc = opener.document; >+[% MACRO jsinclude BLOCK %] >+ <script type="text/javascript"> >+ function report() { >+ var doc = opener.document; > var field = doc.getElementById("[% index %]"); >- field.value = document.f_pop.f1.value+document.f_pop.f2.value; >- window.close(); >- return false; >- } >-//]]> >-</script> >- >+ field.value = document.f_pop.f1.value+document.f_pop.f2.value; >+ window.close(); >+ return false; >+ } >+ </script> >+[% END %] > >-[% INCLUDE 'popup-bottom.inc' %] >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt >index 6bfa70a..feea0b1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt >@@ -1,7 +1,9 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>UNIMARC field 125b builder</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >+ > <body id="unimarc_field_125b" class="cat" style="padding:1em;"> > <h3>UNIMARC field 125b builder</h3> > <form name="f_pop" action=""> >@@ -125,17 +127,18 @@ > </table> > <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset> > </form> >-<script type="text/javascript"> >-//<![CDATA[ >- function report() { >- var doc = opener.document; >+ >+[% MACRO jsinclude BLOCK %] >+ <script type="text/javascript"> >+ function report() { >+ var doc = opener.document; > var field = doc.getElementById("[% index %]"); >- >+ > field.value = document.f_pop.f1.value; >- window.close(); >- return false; >- } >-//]]> >-</script> >+ window.close(); >+ return false; >+ } >+ </script> >+[% END %] > >-[% INCLUDE 'popup-bottom.inc' %] >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt >index 0e03751..253c899 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt >@@ -1,7 +1,9 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>UNIMARC field 126a builder</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >+ > <body id="cat_unimarc_field_126a" class="cat" style="padding:1em;"> > <h3>UNIMARC field 126a builder</h3> > <form name="f_pop" action=""> >@@ -1026,16 +1028,17 @@ > </table> > <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset> > </form> >-<script type="text/javascript"> >-//<![CDATA[ >- function report() { >- var doc = opener.document; >+ >+[% MACRO jsinclude BLOCK %] >+ <script type="text/javascript"> >+ function report() { >+ var doc = opener.document; > var field = doc.getElementById("[% index %]"); > field.value = document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value ; >- window.close(); >- return false; >- } >-//]]> >-</script> >+ window.close(); >+ return false; >+ } >+ </script> >+[% END %] > >-[% INCLUDE 'popup-bottom.inc' %] >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt >index 278007eb..075c633 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt >@@ -1,7 +1,9 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>UNIMARC field 126b builder</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >+ > <body id="cat_unimarc_field_126b" class="cat" style="padding:1em;"> > <h3>UNIMARC field 126b builder</h3> > <form name="f_pop" action=""> >@@ -169,19 +171,18 @@ > </table> > <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset> > </form> >-<script type="text/javascript"> >-//<![CDATA[ >- function report() { >- > >- var doc = opener.document; >+[% MACRO jsinclude BLOCK %] >+ <script type="text/javascript"> >+ function report() { >+ var doc = opener.document; > var field = doc.getElementById("[% index %]"); >- >- field.value = document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value ; >- self.close(); >- return false; >- } >-//]]> >-</script> > >-[% INCLUDE 'popup-bottom.inc' %] >+ field.value = document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value ; >+ self.close(); >+ return false; >+ } >+ </script> >+[% END %] >+ >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt >index 8f2f629..5e8adc2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt >@@ -1,7 +1,9 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>UNIMARC field 127 builder</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >+ > <body id="cat_unimarc_field_127" class="cat" style="padding:1em;"> > <h3>UNIMARC field 127 builder</h3> > <form name="f_pop" action=""> >@@ -23,28 +25,26 @@ > </table> > <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset> > </form> >-<script type="text/javascript"> >-//<![CDATA[ >- function report() { >-document.f_pop.f1.value=document.f_pop.f1.value+' '; >-document.f_pop.f2.value=document.f_pop.f2.value+' '; >-document.f_pop.f3.value=document.f_pop.f3.value+' '; >- > >+[% MACRO jsinclude BLOCK %] >+ <script type="text/javascript"> >+ function report() { >+ document.f_pop.f1.value=document.f_pop.f1.value+' '; >+ document.f_pop.f2.value=document.f_pop.f2.value+' '; >+ document.f_pop.f3.value=document.f_pop.f3.value+' '; > >-document.f_pop.f1.value=document.f_pop.f1.value.substring(0,2); >-document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2); >-document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2); >+ document.f_pop.f1.value=document.f_pop.f1.value.substring(0,2); >+ document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2); >+ document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2); > >- >- var doc = opener.document; >+ var doc = opener.document; > var field = doc.getElementById("[% index %]"); >- >- field.value = document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value; >- self.close(); >- return false; >- } >-//]]> >-</script> > >-[% INCLUDE 'popup-bottom.inc' %] >+ field.value = document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value; >+ self.close(); >+ return false; >+ } >+ </script> >+[% END %] >+ >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >\ No newline at end of file >-- >2.7.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=72863">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19874
:
70126
|
72863
|
73252