Bug 12060: remove extraneous tags from header.inc

By correcting the indentation, it became more apparent the two
markup errors (stray </li> and </div> tags) that were generated
by pasting the page source of
   PROTOCOL://STAFFCLIENT/cgi-bin/koha/tools/holidays.pl
into http://validator.w3.org/check

TEST PLAN
---------
1) Home -> Tools -> Calendar in the staff client
2) In another tab open http://validator.w3.org/check
3) Select Validate by Direct Input
4) In the staff client, view the page source
5) Copy the page source to the Validation text box in the
    other tab.
6) Click the 'Check' button.
   -- There will be 3 errors.
7) Apply the patch.
8) Refresh the staff client page.
9) Copy the revised page source into the validation text box.
10) click the 'Check' button.
    -- There will be 1 error.
11) Run the koha qa test tool.

NOTE: This error is not in the intended file to fix.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
git diff --color -w HEAD^ reveals, that only a </li> and a </div>
are removed by this patch, all other changes are whitespace.
Passes all tests and QA script.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 30c431b..5a7188b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,91 +1,89 @@
-    <div id="header" class="navbar navbar-static-top">
-        <div class="navbar-inner">
-            <ul id="toplevelmenu" class="nav">
-                [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
-                [% IF ( CAN_user_borrowers ) %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
-                [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">Search</a></li>[% END %]
-                [% IF ( intranetbookbag ) %]
-                    <li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
-                [% END %]
-                [% IntranetNav %]
-                <li class="dropdown">
+<div id="header" class="navbar navbar-static-top">
+    <div class="navbar-inner">
+        <ul id="toplevelmenu" class="nav">
+            [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
+            [% IF ( CAN_user_borrowers ) %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">Search</a></li>[% END %]
+            [% IF ( intranetbookbag ) %]
+            <li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
+            [% END %]
+            [% IntranetNav %]
+            <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                            <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
-                            [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
-                            <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
-                            [% END %]
-                            [% IF ( CAN_user_acquisition ) %]
-                            <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
-                            [% END %]
-                            <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-                            [% IF ( CAN_user_serials ) %]
-                            <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
-                            [% END %]
-                            [% IF ( UseCourseReserves ) %]
-                            <li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></li>
-                            [% END %]
-                            [% IF ( CAN_user_reports ) %]
-                            <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
-                            [% END %]
-                            [% IF ( CAN_user_tools ) %]
-                            <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
-                            [% END %]
-                            [% IF ( CAN_user_parameters ) %]
-                            <li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>
-                            [% END %]
-                            <li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
-                            </ul>
-                </li>
-            </ul>
-      <ul class="nav pull-right">
-        <li class="dropdown">
-          <a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">
-           [% IF ( loggedinusername ) %]
-              <span class="loggedinusername">
-                  [% loggedinusername %]
-              </span>
-              <span class="separator">|</span>
-              [% IF ( AutoLocation ) %]
-                <brand>
-                  [% LoginBranchname %]
-                </brand>
-              [% ELSE %]
-                <strong>
-                  [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
-                     NO LIBRARY SET
-                  [% ELSE %]
-                     [% LoginBranchname %]
-                  [% END %]
-                </strong>
-              [% END %]
-              <b class="caret"></b>
-          </a>
-          <ul class="dropdown-menu" role="menu" aria-labelledby="drop3">
-           [% IF ( IndependentBranches ) %]
-              [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
-                  <li>
-                     <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
-                  </li>
-              [% END %]
-           [% ELSE %]
-                  <li>
-                     <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
-                  </li>
-           [% END %]
-              <li>
-                  <a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
-              </li>
-           [% ELSE %]
-              You are not logged in |
-           [% END %]
-          </ul>
-          <li>
-         <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper">Help</a>
-          </li>
-        </li>
-      </ul>
-       </div>
-   </div>
-[% IF ( intranetbookbag ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]
+                <ul class="dropdown-menu">
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
+                    [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
+                    <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
+                    [% END %]
+                    [% IF ( CAN_user_acquisition ) %]
+                    <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
+                    [% END %]
+                    <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+                    [% IF ( CAN_user_serials ) %]
+                    <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+                    [% END %]
+                    [% IF ( UseCourseReserves ) %]
+                    <li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></li>
+                    [% END %]
+                    [% IF ( CAN_user_reports ) %]
+                    <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
+                    [% END %]
+                    [% IF ( CAN_user_tools ) %]
+                    <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
+                    [% END %]
+                    [% IF ( CAN_user_parameters ) %]
+                    <li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>
+                    [% END %]
+                    <li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
+                </ul>
+            </li>
+        </ul>
+        <ul class="nav pull-right">
+            <li class="dropdown">
+                <a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">
+                    [% IF ( loggedinusername ) %]
+                    <span class="loggedinusername">
+                        [% loggedinusername %]
+                    </span>
+                    <span class="separator">|</span>
+                    [% IF ( AutoLocation ) %]
+                    <brand>
+                        [% LoginBranchname %]
+                    </brand>
+                    [% ELSE %]
+                    <strong>
+                    [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
+                        NO LIBRARY SET
+                    [% ELSE %]
+                        [% LoginBranchname %]
+                    [% END %]
+                    </strong>
+                    [% END %]
+                    <b class="caret"></b>
+                </a>
+                <ul class="dropdown-menu" role="menu" aria-labelledby="drop3">
+                    [% IF ( IndependentBranches ) %]
+                        [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
+                    <li>
+                        <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
+                    </li>
+                        [% END %]
+                    [% ELSE %]
+                    <li>
+                        <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
+                    </li>
+                    [% END %]
+                    <li>
+                        <a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
+                    </li>
+                    [% ELSE %]
+                    You are not logged in |
+                    [% END %]
+                </ul>
+            <li>
+                <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper">Help</a>
+            </li>
+        </ul>
+    </div>
+    [% IF ( intranetbookbag ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]
 </div>