Bug 31162: (QA follow-up) Use new WRAPPPERs and fix help link

This migrates the start page to the new page structure using WRAPPERs instead of includes. One visible problem before was the missing help link. Also makes sure the help link leads to the correct page :) Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2 years ago · 7734d0d7a0
2 changed files with 17 additions and 13 deletions
--- a/Koha/Manual.pm
+++ b/Koha/Manual.pm
@ -126,6 +126,7 @@ our $mapping = {
    'cataloguing/addbiblio'                    => '/cataloging.html#bibliographic-records',
    'cataloguing/addbooks'                     => '/cataloging.html',
    'cataloguing/additem'                      => '/cataloging.html#item-records',
+    'cataloguing/cataloging-home.pl'           => '/cataloging.html',
    'cataloguing/linkitem'                     => '/cataloging.html#adding-analytic-records',
    'cataloguing/merge'                        => '/cataloging.html#merging-records',
    'cataloguing/moveitem'                     => '/cataloging.html#moving-items',
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
@ -8,19 +8,22 @@
 </head>

 <body id="cat_cataloging-home" class="cat">
-    [% INCLUDE 'header.inc' %]
-    [% INCLUDE 'cataloging-search.inc' %]
-
-    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-        <ol>
-            <li>
-                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">Cataloging</a>
-            </li>
-        </ol>
-    </nav>
+    [% WRAPPER 'header.inc' %]
+        [% INCLUDE 'cataloging-search.inc' %]
+    [% END %]
+
+    [% WRAPPER 'sub-header.inc' %]
+        <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
+            <ol>
+                <li>
+                    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+                </li>
+                <li>
+                    <a href="#" aria-current="page">Cataloging</a>
+                </li>
+            </ol>
+        </nav>
+    [% END %]

    <div class="main container-fluid">
        <div class="row">