@@ -, +, @@ templates - In Global system preferences, change the value of any input or select and then click the "Cancel" link for that section. After confirming your choice, the page should reload with your changes reset. - In Circulation and fine rules, edit any existing rule. In the editing row, click the "Clear" button. The data for that rule should be cleared. - In Transport cost matrix, make any change to the matrix. Submitting the form should work correctly. - In MARC bibliographic framework, choose 'MARC structure' for any framework. - Checking or unchecking the 'Display only used tags/subfields' checkbox should reload the page and change the display according to your choice. - In Did you mean?, make changes to the existing configuration. - Clicking "Cancel" should reload the page and discard your changes. - Clicking "Save configuration" should correcly save your changes. - In SMS cellular providers, click to edit any existing provider. Clicking the "Cancel" link should cancel the editing process and return you to the list of providers. --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt | 10 +++++++++- .../intranet-tmpl/prog/en/modules/admin/marctagstructure.tt | 9 +++++++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt | 6 +++++- koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 6 +++++- koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt | 2 +- .../prog/en/modules/admin/transport-cost-matrix.tt | 5 ++++- koha-tmpl/intranet-tmpl/prog/js/sms_providers.js | 6 +++++- 7 files changed, 36 insertions(+), 8 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt @@ -29,6 +29,14 @@ .addClass( "ui-widget-header ui-corner-all" ) .end() .find( ".plugindesc" ); + $(".save-all").on("click",function(e){ + e.preventDefault(); + yesimeant(); + }); + $(".force_reload").on("click",function(e){ + e.preventDefault(); + window.location.reload(true); + }); }); function yesimeant() { @@ -93,7 +101,7 @@ Intranet [% PROCESS pluginlist plugins=INTRApluginlist type='intranet' %] -
Cancel
+
Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -19,6 +19,11 @@ $(document).ready(function() { ], "sPaginationType": "four_button" })); + $("#select_display").on("change",function(){ + var checked = $(this).prop("checked") ? 1: 0; + $.cookie('marctagstructure_selectdisplay', checked); + this.form.submit(); + }); }); //]]> @@ -174,9 +179,9 @@ $(document).ready(function() {

[% IF ( select_display ) %] - + [% ELSE %] - + [% END %]

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -25,6 +25,10 @@ countSelected: _("# of % selected"), noMatchesFound: _("No matches found") } ); + $(".force_reload").on("click",function(e){ + e.preventDefault(); + window.location.reload(true); + }); }); // This is here because of its dependence on template variables, everything else should go in js/pages/preferences.js - jpw var to_highlight = "[% searchfield |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; @@ -179,7 +183,7 @@ [% IF ( loop.last ) %][% END %] [% END %] [% END %] -
Cancel
+
Cancel
[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -101,6 +101,10 @@ $(document).ready(function() { $("#default-circulation-rules tr:last td:eq(1) select").prop('disabled', true); return false; }); + $(".clear_edit").on("click",function(e){ + e.preventDefault(); + clear_edit(); + }); }); //]]> @@ -347,7 +351,7 @@ for="tobranch">Clone these rules to: - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -90,7 +90,7 @@
- Cancel + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt @@ -51,6 +51,9 @@ $(document).ready(function(){ $("body").on("change",".disable_transport_cost",function(){ disable_transport_cost_chg(this); }); + $("#cost_matrix_form").on("submit",function(){ + return form_submit(this); + }); }) //]]> @@ -88,7 +91,7 @@ $(document).ready(function(){ [% END %] -
+
--- a/koha-tmpl/intranet-tmpl/prog/js/sms_providers.js +++ a/koha-tmpl/intranet-tmpl/prog/js/sms_providers.js @@ -20,6 +20,10 @@ $(document).ready(function() { delete_provider( providerid ); } }); + $(".cancel_edit").on("click",function(e){ + e.preventDefault(); + cancel_edit(); + }); }); function clear_form(){ @@ -70,4 +74,4 @@ function delete_provider( id, users ) { $("#id").val( id ); $("#sms_form").submit(); } -} +} --