From be2643d2954c8e4b67e8697c97f3aefdffb6b3fb Mon Sep 17 00:00:00 2001 From: Liz Rea Date: Thu, 19 Nov 2015 11:34:41 +1300 Subject: [PATCH] Bug 15211 - adding Tools section sidebar to label creator The label creator had a very sad sidebar, it needed to have the Tools area sidebar on it. To test: Click through all "New" pages, verify that the sidebar appears Click through all "Manage" pages, verify that the sidebar appears. Also verify that "Label creator" is bolded in the toolbar while the label creator is active. --- koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc | 6 +++++- koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt | 5 ++++- .../intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt | 3 +++ .../intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt | 7 +++++-- .../intranet-tmpl/prog/en/modules/labels/label-edit-template.tt | 3 +++ koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt | 3 +++ koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt | 3 +++ 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc index b76f5a7..5fa1219 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -6,7 +6,11 @@ if ( url.match(/\?(.+)$/) ) { params = "?" + RegExp.$1; } - $('#navmenulist a[href$="/' + path + params + '"]').css('font-weight','bold'); + if (path.indexOf("labels") >= 0 && path.indexOf("spine") < 0 ) { + $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').css('font-weight','bold'); + } else { + $('#navmenulist a[href$="/' + path + params + '"]').css('font-weight','bold'); + } }); //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt index 362ea8c..596489d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -158,7 +158,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] +
+ [% INCLUDE 'tools-menu.inc' %] +
[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt index fbc8372..017af77 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt @@ -206,5 +206,8 @@ +
+ [% INCLUDE 'tools-menu.inc' %] +
[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt index 250e39a..03d1a50 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt @@ -109,7 +109,7 @@ - +
Offset:
  1. @@ -120,7 +120,7 @@
- +
Creep:
  1. @@ -142,5 +142,8 @@ +
    + [% INCLUDE 'tools-menu.inc' %] +
    [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt index 3dacff8..e4fc9f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt @@ -178,5 +178,8 @@ +
    + [% INCLUDE 'tools-menu.inc' %] +
    [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt index 3d35baf..4744d9b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt @@ -26,5 +26,8 @@ +
    + [% INCLUDE 'tools-menu.inc' %] +
    [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt index 6a89aaf..cadf54c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt @@ -170,5 +170,8 @@ +
    + [% INCLUDE 'tools-menu.inc' %] +
    [% INCLUDE 'intranet-bottom.inc' %] -- 1.9.1