From ec52df60253dac8ca2eebbe4e0566f45b963103a Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Fri, 23 Jan 2015 08:22:28 -0500
Subject: [PATCH] Bug 13040 [QA Followup] - Fix koha-qa.pl issues

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../prog/en/includes/branch-selector.inc      |  7 ++++++-
 .../prog/en/modules/help/tools/export.tt      | 20 +++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc
index a5ce6119ba..f3aa11a4f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc
@@ -9,7 +9,12 @@ END %]
     <div class="branchgridrow">
     [% FOREACH branch IN branches %]
         <div class="branchgriditem">
-            <input id="branch_[% branch.value %]" type="checkbox" name="branch" value="[% branch.value %]"[% IF branch.selected || (selectall == 1) %] checked="checked" [% END %]/>
+            [% IF branch.selected || (selectall == 1) %]
+                <input id="branch_[% branch.value %]" type="checkbox" name="branch" value="[% branch.value %]" checked="checked" />
+            [% ELSE %]
+                <input id="branch_[% branch.value %]" type="checkbox" name="branch" value="[% branch.value %]" />
+            [% END %]
+
             <label for="branch_[% branch.value %]">[% branch.branchname %]</label>
         </div>
         [% IF loop.count() % 4 == 0 && !loop.last() %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
index 31a64c23dd..e0fd1fb0c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
@@ -13,24 +13,24 @@
 <ul>
     <li>Choose to limit your export by any one or more of the following options
 <ul>
-	<li>Limit to a bib number range</li>
-	<li>Limit to a specific item type</li>
-	<li>Limit to a specific set of libraries</li>
-	<li>Limit to a call number range</li>
-	<li>Limit to an acquisition date range</li>
+    <li>Limit to a bib number range</li>
+    <li>Limit to a specific item type</li>
+    <li>Limit to a specific set of libraries</li>
+    <li>Limit to a call number range</li>
+    <li>Limit to an acquisition date range</li>
 </ul>
 </li>
     <li>Next choose what to skip when exporting
 <ul>
-	<li>By default items will be exported, if you would like to only export bibliographic data, check the 'Don't export items' box</li>
-	<li>To limit your export only to items from the library you're logged in as, check the 'Remove non-local items' box</li>
-	<li>You can also choose what fields you don't want to export. This can be handy if you're sharing your data, you can remove all local fields before sending your data to another library</li>
+    <li>By default items will be exported, if you would like to only export bibliographic data, check the 'Don't export items' box</li>
+    <li>To limit your export only to items from the library you're logged in as, check the 'Remove non-local items' box</li>
+    <li>You can also choose what fields you don't want to export. This can be handy if you're sharing your data, you can remove all local fields before sending your data to another library</li>
 </ul>
 </li>
     <li>Finally choose the file type and file name
 <ul>
-	<li>Choose to export your data in marc or marcxml format</li>
-	<li>Choose the name you want your file to save as</li>
+    <li>Choose to export your data in marc or marcxml format</li>
+    <li>Choose the name you want your file to save as</li>
 </ul>
 </li>
     <li>Click 'Export bibliographic records'</li>