@@ -, +, @@ MARC-related --- .../intranet-tmpl/prog/en/includes/admin-menu.inc | 16 +------- .../en/modules/admin/auth_subfields_structure.tt | 18 +++++---- .../prog/en/modules/admin/auth_tag_structure.tt | 30 ++++++++------- .../prog/en/modules/admin/authtypes.tt | 35 +++++++++-------- .../prog/en/modules/admin/biblio_framework.tt | 27 +++++++------ .../prog/en/modules/admin/checkmarc.tt | 5 +++ .../prog/en/modules/admin/fieldmapping.tt | 25 ++++++------ .../prog/en/modules/admin/koha2marclinks.tt | 27 +++++++------ .../en/modules/admin/marc_subfields_structure.tt | 8 +++- .../prog/en/modules/admin/marctagstructure.tt | 45 +++++++++++----------- koha-tmpl/intranet-tmpl/prog/js/admin-menu.js | 12 ++++++ 11 files changed, 138 insertions(+), 110 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/js/admin-menu.js --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc @@ -1,19 +1,5 @@ [% USE Koha %] - + + +[% MACRO jsinclude BLOCK %] + + +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -1,4 +1,5 @@ [% USE AuthorisedValues %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Authority MARC framework [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %] [% IF ( heading_modify_tag_p ) %]› [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] › Modify tag[% END %] @@ -7,20 +8,8 @@ [% 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() { - $("#table_authtagstructure").dataTable($.extend(true, {}, dataTablesDefaults, { - "aoColumnDefs": [ - { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, - ], - "sPaginationType": "four_button" - })); - }); -//]]> -</script> </head> + <body id="admin_auth_tag_structure" class="admin"> [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] @@ -242,4 +231,19 @@ [% INCLUDE 'admin-menu.inc' %] </div> </div> + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu.js"></script> + <script type="text/javascript"> + $(document).ready(function() { + $("#table_authtagstructure").dataTable($.extend(true, {}, dataTablesDefaults, { + "aoColumnDefs": [ + { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, + ], + "sPaginationType": "four_button" + })); + }); + </script> +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -1,3 +1,4 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Administration › Authority types [% IF op == 'add_form' %] @@ -8,22 +9,6 @@ [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] - @@ -186,4 +171,22 @@ [% INCLUDE 'admin-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + + +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -1,3 +1,4 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › MARC frameworks [% IF op == 'add_form' %] @@ -8,18 +9,8 @@ [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] - - - + [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] @@ -287,4 +278,18 @@ [% INCLUDE 'admin-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + + + +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt @@ -1,3 +1,4 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › MARC check [% IF ( total ) %] :[% total %] errors found[% ELSE %] : Configuration OK![% END %] @@ -276,4 +277,8 @@ [% INCLUDE 'admin-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt @@ -1,19 +1,7 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Keyword to MARC mapping [% INCLUDE 'doc-head-close.inc' %] - - - - @@ -85,4 +73,15 @@ $(document).ready(function() { [% INCLUDE 'admin-menu.inc' %] +[% MACRO jsinclude BLOCK %] + + +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt @@ -1,21 +1,10 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › [% IF ( add_form ) %] Koha to MARC mapping › Connect [% tablename %].[% kohafield %] to a MARC subfield[% END %] [% IF ( else ) %]Koha to MARC mapping [% tagfield %][% END %] [% INCLUDE 'doc-head-close.inc' %] - @@ -124,4 +113,18 @@ $(document).ready(function() { [% END %] + +[% MACRO jsinclude BLOCK %] + + +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -1,9 +1,10 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration ›[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC subfield structure › Edit MARC subfields constraints[% END %][% ELSE %] MARC subfield structure › [% action %][% END %][% END %] [% IF ( delete_confirm ) %] MARC subfield structure › Confirm deletion of subfield [% tagsubfield %][% END %][% IF ( delete_confirmed ) %] MARC subfield structure › Subfield deleted[% END %][% IF ( else ) %]MARC subfield structure[% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] @@ -312,4 +313,9 @@ [% INCLUDE 'admin-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + + +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -1,4 +1,5 @@ [% USE AuthorisedValues %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › [% IF ( add_form ) %]MARC frameworks › [% action %] [% searchfield %][% END %] @@ -7,29 +8,8 @@ [% IF ( else ) %]MARC frameworks[% END %] [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] - - - + [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] @@ -259,4 +239,25 @@ $(document).ready(function() { [% INCLUDE 'admin-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + + + +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js +++ a/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js @@ -0,0 +1,12 @@ +$(document).ready(function() { + var path = location.pathname.substring(1); + if (path == "cgi-bin/koha/admin/marctagstructure.pl" || path == "cgi-bin/koha/admin/marc_subfields_structure.pl") { + $('#navmenulist a[href$="/cgi-bin/koha/admin/biblio_framework.pl"]').css('font-weight','bold'); + } else if (path == "cgi-bin/koha/admin/auth_tag_structure.pl" || path == "cgi-bin/koha/admin/auth_subfields_structure.pl") { + $('#navmenulist a[href$="/cgi-bin/koha/admin/authtypes.pl"]').css('font-weight','bold'); + } else if (path == "cgi-bin/koha/admin/oai_set_mappings.pl") { + $('#navmenulist a[href$="/cgi-bin/koha/admin/oai_sets.pl"]').css('font-weight','bold'); + } else { + $('#navmenulist a[href$="/' + path + '"]').css('font-weight','bold'); + } +}); --