Bugzilla – Attachment 69597 Details for
Bug 19659
Move JS to the footer: Suggestions and tags
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19659: Move JS to the footer: Suggestions and tags
Bug-19659-Move-JS-to-the-footer-Suggestions-and-ta.patch (text/plain), 26.00 KB, created by
Josef Moravec
on 2017-12-07 08:22:28 UTC
(
hide
)
Description:
Bug 19659: Move JS to the footer: Suggestions and tags
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2017-12-07 08:22:28 UTC
Size:
26.00 KB
patch
obsolete
>From 6d94f80cfc8e18636cc5e906f15cdf19365acf0e Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 20 Nov 2017 18:05:14 +0000 >Subject: [PATCH] Bug 19659: Move JS to the footer: Suggestions and tags > >This patch modifies the staff client's suggestions and tags templates so >that JavaScript is included in the footer instead of the header. > >This patch adds a new JS file, acquisitions-menu.js, which will be added >to each template which has the Acquisitions sidebar menu (in this case, >suggestions). Highlighting of the current page in the sidebar menu will >be broken for pages which have not been modified to use this file. > >To test, apply the patch and test the JavaScript-driven features of >suggestions and tags pages: All button controls, DataTables >functionality, form validation, etc. > >Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >--- > .../prog/en/includes/acquisitions-menu.inc | 7 - > .../prog/en/modules/suggestion/suggestion.tt | 356 +++++++++++---------- > .../intranet-tmpl/prog/en/modules/tags/list.tt | 48 +-- > .../intranet-tmpl/prog/en/modules/tags/review.tt | 47 +-- > .../intranet-tmpl/prog/js/acquisitions-menu.js | 4 + > 5 files changed, 237 insertions(+), 225 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >index 6ebe510..8d46d87 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >@@ -1,10 +1,3 @@ >-<script type="text/javascript">//<![CDATA[ >- $(document).ready(function() { >- var path = location.pathname.substring(1); >- $('#navmenulist a[href$="/' + path + '"]').css('font-weight','bold'); >- }); >-//]]> >-</script> > <div id="navmenu"> > <div id="navmenulist"> > <h5>Acquisitions</h5> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 5a8ada6..f7e6fcc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -2,6 +2,7 @@ > [% USE AuthorisedValues %] > [% USE KohaDates %] > [% USE Price %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › > [% IF ( op_save ) %] >@@ -17,185 +18,17 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-[% INCLUDE 'calendar.inc' %] >-[% IF ( op == 'show' || op_else ) %] >-<script type="text/javascript"> >- // <![CDATA[ >- $(document).ready(function(){ >- $(".deletesuggestion").on("click",function(){ >- return confirm(_("Are you sure you want to delete this suggestion?")); >- }); >- }); >- // ]]> >-</script> >-[% END %] > [% IF ( op_else ) %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >-[% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<script type="text/javascript"> >-// <![CDATA[ >-/** >-* displayOther. >-* This function display the select or an textaera to write a reason. >-*/ >-function displayOther(id,show,hide){ >- $("#"+hide+id).hide(); >- $("#"+show+id).show(); >-} >-$(document).ready(function() { >- $('#suggestiontabs').tabs({ >- // Correct table sizing for tables hidden in tabs >- // http://www.datatables.net/examples/api/tabs_and_scrolling.html >- "activate": function(event, ui) { >- $( $.fn.dataTable.tables( true ) ).DataTable().columns.adjust(); >- } >- }); >- $(".sorted").dataTable($.extend(true, {}, dataTablesDefaults, { >- "aoColumnDefs": [ >- { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] }, >- { "sType": "anti-the", "aTargets" : [ "anti-the" ] } >- ], >- "sPaginationType": "four_button" >- })); >-[% FOREACH suggestion IN suggestions %] >-// functions for [% suggestion.suggestiontype %] interactions >- $("#CheckAll[% suggestion.suggestiontype %]").click(function(e){ >- $("#[% suggestion.suggestiontype %]t").checkCheckboxes(); >- e.preventDefault(); >- }); >- $("#UncheckAll[% suggestion.suggestiontype %]").click(function(e){ >- $("#[% suggestion.suggestiontype %]t").unCheckCheckboxes(); >- e.preventDefault(); >- }); >- $("#other_reason[% suggestion.suggestiontype %]").hide(); >- $("#reason[% suggestion.suggestiontype %]").change(function(){ >- if($(this).val() == "other"){ >- $(this).hide(); >- $("#other_reason[% suggestion.suggestiontype %]").show(); >- } >- }); >- $("#[% suggestion.suggestiontype %]delete").change(function(){ >- if(this.checked){ >- $("form[name='f[% suggestion.suggestiontype %]'] input[name=op]").attr("value","delete"); >- } else { >- $("form[name='f[% suggestion.suggestiontype %]'] input[name=op]").attr("value","change"); >- } >- }); >- >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% END %] >- $("a[href*=back]").click(function(){ >- var sid = $(this).attr("href").replace(/#back/,""); >- $("#reason"+sid).show().find("option[value='']").attr("selected","selected"); >- $("#other_reason"+sid).hide(); >- }); >- $("h4.local_collapse a").click(function(){ >- $(this).parent().parent().find("ol").toggle(); >- return false; >- }); >- // http://jqueryui.com/demos/datepicker/#date-range >- var dates = $( "#suggesteddate_from, #suggesteddate_to" ).datepicker({ >- changeMonth: true, >- numberOfMonths: 1, >- onSelect: function( selectedDate ) { >- var option = this.id == "suggesteddate_from" ? "minDate" : "maxDate", >- instance = $( this ).data( "datepicker" ); >- date = $.datepicker.parseDate( >- instance.settings.dateFormat || >- $.datepicker._defaults.dateFormat, >- selectedDate, instance.settings ); >- dates.not( this ).datepicker( "option", option, date ); >- } >- }); >- var datesMD = $( "#manageddate_from, #manageddate_to" ).datepicker({ >- changeMonth: true, >- numberOfMonths: 1, >- onSelect: function( selectedDate ) { >- var option = this.id == "manageddate_from" ? "minDate" : "maxDate", >- instance = $( this ).data( "datepicker" ); >- date = $.datepicker.parseDate( >- instance.settings.dateFormat || >- $.datepicker._defaults.dateFormat, >- selectedDate, instance.settings ); >- datesMD.not( this ).datepicker( "option", option, date ); >- } >- }); >- var datesAD = $( "#accepteddate_from, #accepteddate_to" ).datepicker({ >- changeMonth: true, >- numberOfMonths: 1, >- onSelect: function( selectedDate ) { >- var option = this.id == "accepteddate_from" ? "minDate" : "maxDate", >- instance = $( this ).data( "datepicker" ); >- date = $.datepicker.parseDate( >- instance.settings.dateFormat || >- $.datepicker._defaults.dateFormat, >- selectedDate, instance.settings ); >- datesAD.not( this ).datepicker( "option", option, date ); >- } >- }); >- >- $("form.update_suggestions").on("submit", function(e){ >- var form = this; >- var action_delete_selected = $(this).find("input[value='delete']").is(":checked"); >- if ( action_delete_selected ) { >- var suggestions_to_delete = $(this).find("input[name='edit_field']:checked"); >- if ( suggestions_to_delete.length == 0 ) { >- alert(_("Please select at least one suggestion to delete")); >- e.preventDefault(); >- return false; >- } else if ( suggestions_to_delete.length == 1 ) { >- if ( ! confirm(_("Are you sure you want to delete this suggestion?")) ) { >- e.preventDefault(); >- return false; >- } >- } else if ( suggestions_to_delete.length > 1 ) { >- if ( ! confirm(_("Are you sure you want to delete these suggestions?")) ) { >- e.preventDefault(); >- return false; >- } >- } >- } >- return true; >- }); >-}); >-// ]]> >-</script> >-<style type="text/css"> >-h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { display : none; } >-.overlay { top: 180px; left: 50%; position: absolute; margin-left: -100px; width: 200px; text-align: center; display: none; margin-top: -10px; background: #eeffd4; padding: .5em; color: #000; } .note { -moz-border-radius: 3px; border-radius:3px; background: transparent url("[% interface %]/[% theme %]/img/famfamfam/silk/comment.png") top left no-repeat; padding : 1px 3px 1px 18px; font-size : 90%; } >-</style>[% END %] >-[% IF ( op_save ) %] >- <script type="text/javascript"> >- // <![CDATA[ >- $(document).ready(function(){ >- calcNewsuggTotal(); >- $("#quantity,#price,#currency").on("change",function(){ >- calcNewsuggTotal(); >- }); >- >- [% IF other_reason %] >- $(".select-reason").hide(); >- $(".select-reason").find("option[value='other']").attr("selected","selected"); >- $("#other_reason").show(); >- [% ELSE %] >- $("#other_reason").hide(); >- [% END %] >- $(".select-reason").change(function(){ >- if($(this).val() == "other"){ >- $(this).hide(); >- $("#other_reason").show(); >- } >- }); >- $("a[href*=back]").click(function(){ >- $(".select-reason").show().find("option[value='']").attr("selected","selected"); >- $("#other_reason").hide(); >- }); >- }); >- // ]]> >- </script> >+[% IF ( op_else ) %] >+ <style type="text/css"> >+ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { display : none; } >+ .overlay { top: 180px; left: 50%; position: absolute; margin-left: -100px; width: 200px; text-align: center; display: none; margin-top: -10px; background: #eeffd4; padding: .5em; color: #000; } .note { -moz-border-radius: 3px; border-radius:3px; background: transparent url("[% interface %]/[% theme %]/img/famfamfam/silk/comment.png") top left no-repeat; padding : 1px 3px 1px 18px; font-size : 90%; } >+ </style> > [% END %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> > </head> >+ > <body id="acq_suggestion" class="acq"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] >@@ -912,5 +745,178 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > [% END %] > </div> > [% END %] >+ >+[% MACRO jsinclude BLOCK %] >+ [% INCLUDE 'calendar.inc' %] >+ [% IF ( op == 'show' || op_else ) %] >+ <script type="text/javascript"> >+ $(document).ready(function(){ >+ $(".deletesuggestion").on("click",function(){ >+ return confirm(_("Are you sure you want to delete this suggestion?")); >+ }); >+ }); >+ </script> >+ [% END %] >+ [% IF ( op_else ) %] >+ [% INCLUDE 'datatables.inc' %] >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+ <script type="text/javascript"> >+ /** >+ * displayOther. >+ * This function display the select or an textaera to write a reason. >+ */ >+ function displayOther(id,show,hide){ >+ $("#"+hide+id).hide(); >+ $("#"+show+id).show(); >+ } >+ $(document).ready(function() { >+ $('#suggestiontabs').tabs({ >+ // Correct table sizing for tables hidden in tabs >+ // http://www.datatables.net/examples/api/tabs_and_scrolling.html >+ "activate": function(event, ui) { >+ $( $.fn.dataTable.tables( true ) ).DataTable().columns.adjust(); >+ } >+ }); >+ $(".sorted").dataTable($.extend(true, {}, dataTablesDefaults, { >+ "aoColumnDefs": [ >+ { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] }, >+ { "sType": "anti-the", "aTargets" : [ "anti-the" ] } >+ ], >+ "sPaginationType": "four_button" >+ })); >+ [% FOREACH suggestion IN suggestions %] >+ // functions for [% suggestion.suggestiontype %] interactions >+ $("#CheckAll[% suggestion.suggestiontype %]").click(function(e){ >+ $("#[% suggestion.suggestiontype %]t").checkCheckboxes(); >+ e.preventDefault(); >+ }); >+ $("#UncheckAll[% suggestion.suggestiontype %]").click(function(e){ >+ $("#[% suggestion.suggestiontype %]t").unCheckCheckboxes(); >+ e.preventDefault(); >+ }); >+ $("#other_reason[% suggestion.suggestiontype %]").hide(); >+ $("#reason[% suggestion.suggestiontype %]").change(function(){ >+ if($(this).val() == "other"){ >+ $(this).hide(); >+ $("#other_reason[% suggestion.suggestiontype %]").show(); >+ } >+ }); >+ $("#[% suggestion.suggestiontype %]delete").change(function(){ >+ if(this.checked){ >+ $("form[name='f[% suggestion.suggestiontype %]'] input[name=op]").attr("value","delete"); >+ } else { >+ $("form[name='f[% suggestion.suggestiontype %]'] input[name=op]").attr("value","change"); >+ } >+ }); >+ >+ [% END %] >+ $("a[href*=back]").click(function(){ >+ var sid = $(this).attr("href").replace(/#back/,""); >+ $("#reason"+sid).show().find("option[value='']").attr("selected","selected"); >+ $("#other_reason"+sid).hide(); >+ }); >+ $("h4.local_collapse a").click(function(){ >+ $(this).parent().parent().find("ol").toggle(); >+ return false; >+ }); >+ // http://jqueryui.com/demos/datepicker/#date-range >+ var dates = $( "#suggesteddate_from, #suggesteddate_to" ).datepicker({ >+ changeMonth: true, >+ numberOfMonths: 1, >+ onSelect: function( selectedDate ) { >+ var option = this.id == "suggesteddate_from" ? "minDate" : "maxDate", >+ instance = $( this ).data( "datepicker" ); >+ date = $.datepicker.parseDate( >+ instance.settings.dateFormat || >+ $.datepicker._defaults.dateFormat, >+ selectedDate, instance.settings ); >+ dates.not( this ).datepicker( "option", option, date ); >+ } >+ }); >+ var datesMD = $( "#manageddate_from, #manageddate_to" ).datepicker({ >+ changeMonth: true, >+ numberOfMonths: 1, >+ onSelect: function( selectedDate ) { >+ var option = this.id == "manageddate_from" ? "minDate" : "maxDate", >+ instance = $( this ).data( "datepicker" ); >+ date = $.datepicker.parseDate( >+ instance.settings.dateFormat || >+ $.datepicker._defaults.dateFormat, >+ selectedDate, instance.settings ); >+ datesMD.not( this ).datepicker( "option", option, date ); >+ } >+ }); >+ var datesAD = $( "#accepteddate_from, #accepteddate_to" ).datepicker({ >+ changeMonth: true, >+ numberOfMonths: 1, >+ onSelect: function( selectedDate ) { >+ var option = this.id == "accepteddate_from" ? "minDate" : "maxDate", >+ instance = $( this ).data( "datepicker" ); >+ date = $.datepicker.parseDate( >+ instance.settings.dateFormat || >+ $.datepicker._defaults.dateFormat, >+ selectedDate, instance.settings ); >+ datesAD.not( this ).datepicker( "option", option, date ); >+ } >+ }); >+ >+ $("form.update_suggestions").on("submit", function(e){ >+ var form = this; >+ var action_delete_selected = $(this).find("input[value='delete']").is(":checked"); >+ if ( action_delete_selected ) { >+ var suggestions_to_delete = $(this).find("input[name='edit_field']:checked"); >+ if ( suggestions_to_delete.length == 0 ) { >+ alert(_("Please select at least one suggestion to delete")); >+ e.preventDefault(); >+ return false; >+ } else if ( suggestions_to_delete.length == 1 ) { >+ if ( ! confirm(_("Are you sure you want to delete this suggestion?")) ) { >+ e.preventDefault(); >+ return false; >+ } >+ } else if ( suggestions_to_delete.length > 1 ) { >+ if ( ! confirm(_("Are you sure you want to delete these suggestions?")) ) { >+ e.preventDefault(); >+ return false; >+ } >+ } >+ } >+ return true; >+ }); >+ }); >+ </script> >+ [% END %] >+ [% IF ( op_save ) %] >+ <script type="text/javascript"> >+ $(document).ready(function(){ >+ calcNewsuggTotal(); >+ $("#quantity,#price,#currency").on("change",function(){ >+ calcNewsuggTotal(); >+ }); >+ >+ [% IF other_reason %] >+ $(".select-reason").hide(); >+ $(".select-reason").find("option[value='other']").attr("selected","selected"); >+ $("#other_reason").show(); >+ [% ELSE %] >+ $("#other_reason").hide(); >+ [% END %] >+ $(".select-reason").change(function(){ >+ if($(this).val() == "other"){ >+ $(this).hide(); >+ $("#other_reason").show(); >+ } >+ }); >+ $("a[href*=back]").click(function(){ >+ $(".select-reason").show().find("option[value='']").attr("selected","selected"); >+ $("#other_reason").hide(); >+ }); >+ }); >+ </script> >+ [% END %] >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu.js"></script> >+[% END %] >+ > [% INCLUDE 'intranet-bottom.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >index 798e252..61fd452 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -1,32 +1,12 @@ >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >-[% INCLUDE 'datatables.inc' %] >-<script type="text/javascript"> >-//<![CDATA[ >- $(document).ready(function() { >- $(".delete").click(function (event) { >- $(this).parent().parent().parent().addClass("selected"); >- var answer = confirm(_("Are you sure you want to remove the tag from this title?")); >- if (!answer){ >- $("tr").removeClass("selected"); >- event.preventDefault(); >- } >- }); >- $("#itemst").dataTable($.extend(true, {}, dataTablesDefaults, { >- "aoColumnDefs": [ >- { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, >- ], >- "aaSorting": [[ 0, "asc" ]], >- "sPaginationType": "four_button" >- })); >- }); >-//]]> >-</script> > <style type="text/css"> > tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : transparent; }</style> > </head> >+ > <body id="tags_list" class="tools"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] >@@ -94,4 +74,28 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > </ul> > </div> > </div> >+ >+[% MACRO jsinclude BLOCK %] >+ [% INCLUDE 'datatables.inc' %] >+ <script type="text/javascript"> >+ $(document).ready(function() { >+ $(".delete").click(function (event) { >+ $(this).parent().parent().parent().addClass("selected"); >+ var answer = confirm(_("Are you sure you want to remove the tag from this title?")); >+ if (!answer){ >+ $("tr").removeClass("selected"); >+ event.preventDefault(); >+ } >+ }); >+ $("#itemst").dataTable($.extend(true, {}, dataTablesDefaults, { >+ "aoColumnDefs": [ >+ { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, >+ ], >+ "aaSorting": [[ 0, "asc" ]], >+ "sPaginationType": "four_button" >+ })); >+ }); >+ </script> >+[% END %] >+ > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index ffb606d..989b451 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -1,28 +1,9 @@ > [% USE KohaDates %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Home › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >-[% INCLUDE 'datatables.inc' %] >-[% INCLUDE 'calendar.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/tags-review.js"></script> >-<script type="text/javascript"> >- var MSG_AJAX_APPROVE_FAILED = _("AJAX failed to approve tag: %s"); >- var MSG_AJAX_REJECTION_FAILED = _("AJAX failed to reject tag: %s"); >- var MSG_AJAX_TAG_PERMITTED = _("%s is permitted!"); >- var MSG_AJAX_TAG_PROHIBITED = _("%s is prohibited!"); >- var MSG_AJAX_TAG_UNCLASSIFIED = _("%s is neither permitted nor prohibited!"); >- var MSG_AJAX_ERROR = _("AJAX error (%s alert)"); >- var LABEL_SELECT_ALL = _("Select all"); >- var LABEL_CLEAR_ALL = _("Clear all"); >- var LABEL_SELECT_ALL_PENDING = _("Select all pending"); >- var LABEL_APPROVE = _("Approve"); >- var LABEL_APPROVED = _("Approved"); >- var LABEL_REJECT = _("Reject"); >- var LABEL_REJECTED = _("Rejected"); >- var LABEL_TESTING = _("Testing..."); >-</script> > <style type="text/css"> > .setlabel {width: 6em; font-family: courier; background-color:#E8E8E8;} > .rejected { color: #CC0033; } >@@ -31,6 +12,7 @@ > tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </style> > </head> >+ > <body id="tags_review" class="tools"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] >@@ -239,5 +221,28 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </form> > </div> > </div> >-[% INCLUDE 'intranet-bottom.inc' %] > >+[% MACRO jsinclude BLOCK %] >+ [% INCLUDE 'datatables.inc' %] >+ [% INCLUDE 'calendar.inc' %] >+ <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/tags-review.js"></script> >+ <script type="text/javascript"> >+ var MSG_AJAX_APPROVE_FAILED = _("AJAX failed to approve tag: %s"); >+ var MSG_AJAX_REJECTION_FAILED = _("AJAX failed to reject tag: %s"); >+ var MSG_AJAX_TAG_PERMITTED = _("%s is permitted!"); >+ var MSG_AJAX_TAG_PROHIBITED = _("%s is prohibited!"); >+ var MSG_AJAX_TAG_UNCLASSIFIED = _("%s is neither permitted nor prohibited!"); >+ var MSG_AJAX_ERROR = _("AJAX error (%s alert)"); >+ var LABEL_SELECT_ALL = _("Select all"); >+ var LABEL_CLEAR_ALL = _("Clear all"); >+ var LABEL_SELECT_ALL_PENDING = _("Select all pending"); >+ var LABEL_APPROVE = _("Approve"); >+ var LABEL_APPROVED = _("Approved"); >+ var LABEL_REJECT = _("Reject"); >+ var LABEL_REJECTED = _("Rejected"); >+ var LABEL_TESTING = _("Testing..."); >+ </script> >+[% END %] >+ >+[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js b/koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js >new file mode 100644 >index 0000000..49786b9 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js >@@ -0,0 +1,4 @@ >+$(document).ready(function() { >+ var path = location.pathname.substring(1); >+ $('#navmenulist a[href$="/' + path + '"]').css('font-weight','bold'); >+}); >\ No newline at end of file >-- >2.1.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=69597">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 19659
:
69240
|
69276
|
69285
| 69597