Bugzilla – Attachment 72870 Details for
Bug 19878
Move template JavaScript to the footer: UNIMARC editor plugins, part 7
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19878: Move template JavaScript to the footer: UNIMARC editor plugins, part 7
Bug-19878-Move-template-JavaScript-to-the-footer-U.patch (text/plain), 26.93 KB, created by
Owen Leonard
on 2018-03-14 14:12:28 UTC
(
hide
)
Description:
Bug 19878: Move template JavaScript to the footer: UNIMARC editor plugins, part 7
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-03-14 14:12:28 UTC
Size:
26.93 KB
patch
obsolete
>From 91cce2ad229ff9c0a58087c21013dda547c100ce Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 2 Jan 2018 16:29:44 +0000 >Subject: [PATCH] Bug 19878: Move template JavaScript to the footer: UNIMARC > editor plugins, part 7 > >This patch updates the last of the 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_210c.tt >- unimarc_field_210c_bis.tt >- unimarc_field_225a.tt >- unimarc_field_225a_bis.tt >- unimarc_field_4XX.tt >- unimarc_field_700-4.tt >- unimarc_leader.tt >--- > .../value_builder/unimarc_field_210c.tt | 26 +-- > .../value_builder/unimarc_field_210c_bis.tt | 51 ++--- > .../value_builder/unimarc_field_225a.tt | 19 +- > .../value_builder/unimarc_field_225a_bis.tt | 55 ++--- > .../cataloguing/value_builder/unimarc_field_4XX.tt | 228 ++++++++++----------- > .../value_builder/unimarc_field_700-4.tt | 33 +-- > .../cataloguing/value_builder/unimarc_leader.tt | 31 +-- > 7 files changed, 222 insertions(+), 221 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt >index 043e700..31797ad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt >@@ -1,8 +1,10 @@ > [% PROCESS 'authorities-search-results.inc' %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>UNIMARC field 210c builder</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >+ > <body id="cat_unimarc_field_210c" class="cat" style="padding:1em;"> > <h3>UNIMARC field 210c builder</h3> > <h4>Search for authority type: EDITORS</h4> >@@ -77,17 +79,17 @@ > [% pagination_bar %] > </div> > [% END %] >-<script type="text/javascript"> >-//<![CDATA[ >-function report(summary) >-{ >- var doc = opener.document; >- var field = doc.getElementById('[% index %]'); > >- field.value = summary; >- self.close(); >-} >-//]]> >-</script> >+[% MACRO jsinclude BLOCK %] >+ <script type="text/javascript"> >+ function report(summary){ >+ var doc = opener.document; >+ var field = doc.getElementById('[% index %]'); >+ >+ field.value = summary; >+ self.close(); >+ } >+ </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_210c_bis.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt >index 3114d30..f48f993 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt >@@ -1,32 +1,12 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › UNIMARC field 210c builder</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> > #custom-doc { width:37.85em;*width:36.93em;min-width:492px; margin:auto; text-align:left; } > </style> >-<script type="text/javascript"> >-//<![CDATA[ >-$(document).ready(function(){ >- $( "#findvalue" ).autocomplete({ >- source: "/cgi-bin/koha/cataloguing/ysearch.pl?table=biblioitems&field=publishercode", >- minLength: 3, >- select: function( event, ui ) { >- $( "#findvalue" ).val( ui.item.fieldvalue ); >- return false; >- } >- }) >- .data( "ui-autocomplete" )._renderItem = function( ul, item ) { >- return $( "<li></li>" ) >- .data( "ui-autocomplete-item", item ) >- .append( "<a>" + item.fieldvalue + "</a>" ) >- .appendTo( ul ); >- }; >- >-}); >-//]]> >-</script> >- > </head> >+ > <body id="cat_unimarc_field_210c_bis" class="cat"> > > <div id="custom-doc" class="yui-t7"> >@@ -47,14 +27,37 @@ $(document).ready(function(){ > </div> > </div> > </div> >+ >+[% MACRO jsinclude BLOCK %] > <script type="text/javascript"> > function report() { >- var doc = opener.document; >+ var doc = opener.document; > var field = doc.getElementById("[% index %]"); > field.value = document.f_pop.findvalue.value; > > window.close(); > return false; > } >+ >+ $(document).ready(function(){ >+ $( "#findvalue" ).autocomplete({ >+ source: "/cgi-bin/koha/cataloguing/ysearch.pl?table=biblioitems&field=publishercode", >+ minLength: 3, >+ select: function( event, ui ) { >+ $( "#findvalue" ).val( ui.item.fieldvalue ); >+ return false; >+ } >+ }) >+ .data( "ui-autocomplete" )._renderItem = function( ul, item ) { >+ return $( "<li></li>" ) >+ .data( "ui-autocomplete-item", item ) >+ .append( "<a>" + item.fieldvalue + "</a>" ) >+ .appendTo( ul ); >+ }; >+ >+ }); >+ > </script> >-[% INCLUDE 'popup-bottom.inc' %] >\ No newline at end of file >+[% 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_225a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt >index e888db1..68a2ff2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt >@@ -1,7 +1,9 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>UNIMARC field 225a builder</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >+ > <body id="cat_unimarc_field_225a" class="cat" style="padding:1em;"> > <h3>UNIMARC field 225a builder</h3> > <div id="mainbloc"> >@@ -23,17 +25,18 @@ > <input type="submit" value="OK" class="button authority" /> > </form> > </div> >- >-<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.f2.value || document.f_pop.f1.value; > window.close(); > return false; > } >- //]]> >-</script> >+ </script> >+[% END %] > >-[% INCLUDE 'popup-bottom.inc' %] >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt >index c3fa550..7499cf4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt >@@ -1,3 +1,4 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › UNIMARC field 225a builder</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -9,8 +10,8 @@ > text-align:left; > } > </style> >- > </head> >+ > <body id="cat_unimarc_field_225a_bis" class="cat"> > > <div id="custom-doc" class="yui-t7"> >@@ -31,33 +32,33 @@ > </div> > </div> > >- <script> >- //<![CDATA[ >- $(document).ready(function(){ >- $("#findvalue").autocomplete({ >- source: "/cgi-bin/koha/cataloguing/ysearch.pl?table=biblioitems&field=collectiontitle", >- minLength: 3, >- select: function(event, ui) { >- $("#findvalue").val(ui.item.fieldvalue); >- return false; >- } >- }) >- .data("ui-autocomplete")._renderItem = function(ul, item) { >- return $("<li></li>") >- .data("ui-autocomplete-item", item) >- .append("<a>" + item.fieldvalue + "</a>") >- .appendTo(ul); >- }; >+[% MACRO jsinclude BLOCK %] >+ <script type="text/javascript"> >+ $(document).ready(function(){ >+ $("#findvalue").autocomplete({ >+ source: "/cgi-bin/koha/cataloguing/ysearch.pl?table=biblioitems&field=collectiontitle", >+ minLength: 3, >+ select: function(event, ui) { >+ $("#findvalue").val(ui.item.fieldvalue); >+ return false; >+ } >+ }) >+ .data("ui-autocomplete")._renderItem = function(ul, item) { >+ return $("<li></li>") >+ .data("ui-autocomplete-item", item) >+ .append("<a>" + item.fieldvalue + "</a>") >+ .appendTo(ul); >+ }; > >- $('form').submit(function() { >- var field = opener.document.getElementById("[% index %]"); >- field.value = $('#findvalue').val(); >+ $('form').submit(function() { >+ var field = opener.document.getElementById("[% index %]"); >+ field.value = $('#findvalue').val(); > >- window.close(); >- return false; >+ window.close(); >+ return false; >+ }); > }); >- }); >- //]]> >- </script> >+ </script> >+[% END %] > >-[% INCLUDE 'popup-bottom.inc' %] >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt >index b784c3a..95e70ab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt >@@ -1,118 +1,13 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › 4XX plugin</title> > [% INCLUDE 'doc-head-close.inc' %] >-[% IF ( fillinput ) %] >- <script type="text/javascript"> >- >- function go() { >- >- var index_start = "[% index %]"; >- var whichfield; >- try { >- whichfield = opener.opener.document.getElementById(index_start); >- } catch(e) { >- return; >- } >- >- // browse all its subfields >- >- var subfields = whichfield.parentNode.parentNode.getElementsByTagName('input'); >- >- var re = /^tag_\d*_code_/; >- for(var i=0, len = subfields.length ; i< len ; i++) { >- if(subfields[i].getAttribute('name').match(re)){ // it s a subfield >- var code = subfields[i]; >- var subfield = subfields[i+1]; >- >- if(code.value == '9'){ >- subfield.value = "[% subfield_value_9 |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == '0'){ >- subfield.value = "[% subfield_value_0 |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'a'){ >- subfield.value = "[% subfield_value_a |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'c'){ >- subfield.value = "[% subfield_value_c |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'd'){ >- subfield.value = "[% subfield_value_d |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'e'){ >- subfield.value = "[% subfield_value_e |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'h'){ >- subfield.value = "[% subfield_value_h |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'i'){ >- subfield.value = "[% subfield_value_i |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'l'){ >- subfield.value = "[% subfield_value_l |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'n'){ >- subfield.value = "[% subfield_value_n |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'o'){ >- subfield.value = "[% subfield_value_o |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'p'){ >- subfield.value = "[% subfield_value_p |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 't'){ >- subfield.value = "[% subfield_value_t |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'u'){ >- subfield.value = "[% subfield_value_u |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'v'){ >- subfield.value = "[% subfield_value_v |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'x'){ >- subfield.value = "[% subfield_value_x |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- if(code.value == 'y'){ >- subfield.value = "[% subfield_value_y |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >- } >- } >- } >- return false; >- } >- >- window.onload = go(); >- opener.close(); >- window.close(); >- //]]> >-</script> >- > </head> >-<body id="cat_unimarc_field_4XX" class="cat" style="padding:1em;"> >-<h3>UNIMARC field 4XX builder</h3> >-[% ELSE %] >- <script type="text/javascript"> >-//<![CDATA[ >-// document.getElementById('searchbox').focus(); >- >- function report(value2report) { >- if (document.f_pop.result.value.length==0) { >- document.f_pop.result.value = value2report; >- } else { >- document.f_pop.result.value = document.f_pop.result.value+'|'+value2report; >- } >- return true; >- } >- function finish() { >- opener.document.f.field_value[[% index %]].value= document.f_pop.result.value; >- self.close(); >- return false; >- } >- //]]> >-</script> > >-</head> > <body id="cat_unimarc_field_4XX" class="cat" style="padding:1em;"> >+ > <h3>UNIMARC field 4XX builder</h3> >+[% UNLESS ( fillinput ) %] > [% IF ( Search ) %] > <div id="UNIMARC_Field_4XX_search"> > <h2> Search on </h2> >@@ -193,9 +88,9 @@ > </td> > <td> > [% IF ( resul.biblionumber ) %] >- <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=[% index %]&biblionumber=[% resul.biblionumber %]&type=intranet&op=fillinput')">Choose</a> >+ <a href="#" class="btn btn-default btn-xs redirect_link" data-url="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=[% index %]&biblionumber=[% resul.biblionumber %]&type=intranet&op=fillinput">Choose</a> > [% ELSE %] >- <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=[% index %]&type=intranet&op=fillinput')">Clear field</a> >+ <a href="#" class="btn btn-default btn-xs redirect_link" data-url="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=[% index %]&type=intranet&op=fillinput">Clear field</a> > [% END %] > </td> > </tr> >@@ -230,17 +125,108 @@ > [% END %] > </p> > </div> >- >-<script type="text/javascript"> >-//<![CDATA[ >- function jumpfull(page){ >- window.open(page,'','fullscreen,scrollbars'); >- } >-//]]> >-</script> >- >- >+ > [% END %] > > [% END %] >-[% INCLUDE 'popup-bottom.inc' %] >+ >+[% MACRO jsinclude BLOCK %] >+ <script> >+ $(document).ready(function(){ >+ $(".redirect_link").on("click", function(e){ >+ e.preventDefault(); >+ var redirect_url = $(this).data("url"); >+ jumpfull( redirect_url ); >+ }); >+ }); >+ >+ function jumpfull(page){ >+ window.open(page,'','width=100,height=100,resizable=yes,toolbar=false,scrollbars=yes,top'); >+ } >+ </script> >+ [% IF ( fillinput ) %] >+ <script> >+ function go() { >+ var index_start = "[% index %]"; >+ var whichfield; >+ try { >+ whichfield = opener.opener.document.getElementById(index_start); >+ } catch(e) { >+ return; >+ } >+ >+ // browse all its subfields >+ >+ var subfields = whichfield.parentNode.parentNode.getElementsByTagName('input'); >+ >+ var re = /^tag_\d*_code_/; >+ for(var i=0, len = subfields.length ; i< len ; i++) { >+ if(subfields[i].getAttribute('name').match(re)){ // it s a subfield >+ var code = subfields[i]; >+ var subfield = subfields[i+1]; >+ >+ if(code.value == '9'){ >+ subfield.value = "[% subfield_value_9 |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == '0'){ >+ subfield.value = "[% subfield_value_0 |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'a'){ >+ subfield.value = "[% subfield_value_a |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'c'){ >+ subfield.value = "[% subfield_value_c |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'd'){ >+ subfield.value = "[% subfield_value_d |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'e'){ >+ subfield.value = "[% subfield_value_e |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'h'){ >+ subfield.value = "[% subfield_value_h |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'i'){ >+ subfield.value = "[% subfield_value_i |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'l'){ >+ subfield.value = "[% subfield_value_l |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'n'){ >+ subfield.value = "[% subfield_value_n |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'o'){ >+ subfield.value = "[% subfield_value_o |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'p'){ >+ subfield.value = "[% subfield_value_p |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 't'){ >+ subfield.value = "[% subfield_value_t |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'u'){ >+ subfield.value = "[% subfield_value_u |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'v'){ >+ subfield.value = "[% subfield_value_v |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'x'){ >+ subfield.value = "[% subfield_value_x |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ if(code.value == 'y'){ >+ subfield.value = "[% subfield_value_y |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ } >+ } >+ } >+ return false; >+ } >+ >+ window.onload = go(); >+ opener.close(); >+ window.close(); >+ </script> >+ >+ [% END %] >+[% 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_700-4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt >index e51ffda..948b143 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt >@@ -1,7 +1,9 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>UNIMARC field 700-4 builder</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >+ > <body id="cat_unimarc_field_700-4" class="cat" style="padding:1em;"> > <h3>UNIMARC field 700-4 builder</h3> > <p>Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.</p> >@@ -44,21 +46,22 @@ > </table> > <fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset> > </form> >-<script type="text/javascript"> >-//<![CDATA[ >- function report() { >- x = document.f_pop.f1.value.split(' - '); >- var doc = opener.document; >+ >+[% MACRO jsinclude BLOCK %] >+ <script type="text/javascript"> >+ function report() { >+ x = document.f_pop.f1.value.split(' - '); >+ var doc = opener.document; > var field = doc.getElementById("[% index %]"); >- >+ > field.value = x[0]; >- if ([% index2 %]>0) { >- opener.document.f.field_value[[% index2 %]].value= x[1]; >- } >- self.close(); >- return false; >- } >-//]]> >-</script> >+ if ([% index2 %] > 0) { >+ opener.document.f.field_value[[% index2 %]].value= x[1]; >+ } >+ self.close(); >+ return false; >+ } >+ </script> >+[% END %] > >-[% INCLUDE 'popup-bottom.inc' %] >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt >index 3720e96..aaa477c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt >@@ -1,7 +1,9 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>UNIMARC leader builder</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >+ > <body id="cat_unimarc_leader" class="cat" style="padding:1em;"> > <h3>UNIMARC leader builder</h3> > <form name="f_pop" action=""> >@@ -290,21 +292,22 @@ > </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.f5.value + >- document.f_pop.f6.value+ document.f_pop.f7.value+ >- document.f_pop.f8.value+ ' '+ >- document.f_pop.f17.value+ document.f_pop.f18.value+' 4500'; >- window.close(); >- return false; >- } >-//]]> >-</script> >+ document.f_pop.f6.value+ document.f_pop.f7.value+ >+ document.f_pop.f8.value+ ' '+ >+ document.f_pop.f17.value+ document.f_pop.f18.value+' 4500'; >+ window.close(); >+ return false; >+ } >+ </script> >+[% END %] > >-[% INCLUDE 'popup-bottom.inc' %] >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] > >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19878
:
70229
|
72870
|
72946
|
73254