From c62bb1aeb7d447f94a88cf77b9afea2df2aaafa9 Mon Sep 17 00:00:00 2001
From: Liz Rea <liz@catalyst.net.nz>
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.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Sidebar displayed Ok. No errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc    | 6 +++++-
 .../prog/en/modules/labels/label-edit-batch.tt             | 5 ++++-
 .../prog/en/modules/labels/label-edit-layout.tt            | 3 +++
 .../prog/en/modules/labels/label-edit-profile.tt           | 7 +++++--
 .../prog/en/modules/labels/label-edit-template.tt          | 3 +++
 .../intranet-tmpl/prog/en/modules/labels/label-home.tt     | 3 +++
 .../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 b76f5a7aa7..5fa1219a05 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');
+        }
     });
 //]]>
 </script>
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 eaa358bd78..eb89d6e1bb 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' %]
     <div id="breadcrumbs">
-        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; 
+        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
         <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> &rsaquo;
         <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Batches</a> &rsaquo;
@@ -277,5 +277,8 @@
                             </div>
                         </div>
                 </div>
+            <div class="yui-b">
+              [% INCLUDE 'tools-menu.inc' %]
+            </div>
             </div>
     [% 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 fbc8372f48..017af77e34 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 @@
                     </form>
                 </div>
             </div>
+            <div class="yui-b">
+              [% INCLUDE 'tools-menu.inc' %]
+            </div>
         </div>
         [% 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 250e39a562..03d1a50b50 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 @@
                                             </li>
                                          </ol>
 										</fieldset>
-										
+
 										<fieldset class="rows"><legend>Offset:</legend>
 										<ol>
                                             <li>
@@ -120,7 +120,7 @@
                                             </li>
                                          </ol>
 										</fieldset>
-										
+
 										<fieldset class="rows"><legend>Creep:</legend>
 										<ol>
                                             <li>
@@ -142,5 +142,8 @@
                             </div>
                         </div>
                 </div>
+                <div class="yui-b">
+                  [% INCLUDE 'tools-menu.inc' %]
+                </div>
             </div>
             [% 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 3dacff87bd..e4fc9f940d 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 @@
                 </form>
             </div>
         </div>
+        <div class="yui-b">
+          [% INCLUDE 'tools-menu.inc' %]
+        </div>
     </div>
     [% 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 3d35bafaad..4744d9b2f9 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 @@
                     </div>
                 </div>
             </div>
+            <div class="yui-b">
+              [% INCLUDE 'tools-menu.inc' %]
+            </div>
         </div>
         [% 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 6a89aaf556..cadf54c21c 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 @@
                     </div>
                 </div>
             </div>
+        <div class="yui-b">
+          [% INCLUDE 'tools-menu.inc' %]
+        </div>
         </div>
     [% INCLUDE 'intranet-bottom.inc' %]
-- 
2.39.5