@@ -, +, @@ "table_settings" as file name - Administration -> Libraries - Circulation -> Check out - Course reserves - Logged in patron -> "Your summary" -> Table settings' should be reflected in the corresponding page. --- .../prog/en/includes/columns_settings.inc | 6 --- .../prog/en/includes/table_settings.inc | 6 +++ .../prog/en/modules/acqui/acqui-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/duplicate_orders.tt | 2 +- .../prog/en/modules/acqui/histsearch.tt | 2 +- .../prog/en/modules/acqui/lateorders.tt | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 2 +- .../prog/en/modules/admin/authorised_values.tt | 2 +- .../prog/en/modules/admin/branches.tt | 2 +- .../prog/en/modules/admin/categories.tt | 2 +- .../prog/en/modules/admin/currency.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/cataloguing/additem.tt | 2 +- .../prog/en/modules/cataloguing/z3950_search.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +- .../prog/en/modules/circ/pendingreserves.tt | 2 +- .../prog/en/modules/circ/reserveratios.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 2 +- .../en/modules/course_reserves/course-details.tt | 2 +- .../en/modules/course_reserves/course-reserves.tt | 2 +- .../prog/en/modules/ill/ill-requests.tt | 2 +- .../prog/en/modules/members/boraccount.tt | 2 +- .../prog/en/modules/members/holdshistory.tt | 2 +- .../prog/en/modules/members/ill-requests.tt | 2 +- .../prog/en/modules/members/member.tt | 2 +- .../prog/en/modules/members/moremember.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/pay.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../prog/en/modules/patron_lists/list.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 2 +- .../prog/en/modules/reports/catalogue_stats.tt | 2 +- .../en/modules/reports/guided_reports_start.tt | 2 +- .../prog/en/modules/reports/itemslost.tt | 2 +- .../prog/en/modules/reports/orders_by_budget.tt | 2 +- .../prog/en/modules/reserve/request.tt | 2 +- .../prog/en/modules/serials/subscription-detail.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- .../prog/en/modules/tools/stockrotation.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +- .../js/{tablesettings.js => table_settings.js} | 0 .../bootstrap/en/includes/table_settings.inc | 6 +++ .../bootstrap/en/modules/opac-course-details.tt | 2 +- .../bootstrap/en/modules/opac-course-reserves.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- .../bootstrap/en/modules/opac-holdshistory.tt | 2 +- .../bootstrap/en/modules/opac-readingrecord.tt | 2 +- .../columns_settings.inc => js/table_settings.js} | 56 +++++++++++----------- 55 files changed, 89 insertions(+), 85 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/table_settings.inc rename koha-tmpl/intranet-tmpl/prog/js/{tablesettings.js => table_settings.js} (100%) create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/table_settings.inc rename koha-tmpl/opac-tmpl/bootstrap/{en/includes/columns_settings.inc => js/table_settings.js} (71%) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -1,6 +0,0 @@ -[% USE raw %] -[% USE Asset %] -[% USE TablesSettings %] - -[% Asset.js("js/tablesettings.js") | $raw %] - --- a/koha-tmpl/intranet-tmpl/prog/en/includes/table_settings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/table_settings.inc @@ -0,0 +1,6 @@ +[% USE raw %] +[% USE Asset %] +[% USE TablesSettings %] + +[% Asset.js("js/table_settings.js") | $raw %] + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -191,7 +191,7 @@ [% INCLUDE 'datatables.inc' %] [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] [% Asset.js("js/acquisitions-menu.js") | $raw %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] [% ELSIF op == 'list' %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -266,7 +266,7 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] [% INCLUDE 'select2.inc' %] [% Asset.js("js/cataloging.js") | $raw %] -[% INCLUDE 'columns_settings.inc' %] +[% INCLUDE 'table_settings.inc' %] [% Asset.js("js/browser.js") | $raw %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'str/cataloging_additem.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt @@ -234,7 +234,7 @@ [% END %] [% MACRO jsinclude BLOCK %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'z3950_search.inc' %] [% Asset.js("js/z3950_search.js") | $raw %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1103,7 +1103,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %] [% INCLUDE 'timepicker.inc' %] [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -242,7 +242,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] --