Bug 30952: Staff interface redesign (header)

What this patch does:
- change the navigation bar style
- change the breadcrumbs style
- change the "last borrower" link style
- move the search bar inside the navigation bar
- move the help link to the same row as the breadcrumbs

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.js

@@ -4,7 +4,7 @@
 
 /*!
  * Bootstrap v3.4.1 (https://getbootstrap.com/)
- * Copyright 2011-2021 Twitter, Inc.
+ * Copyright 2011-2022 Twitter, Inc.
  * Licensed under the MIT license
  */
 

koha-tmpl/intranet-tmpl/lib/bootstrap/config.json

@@ -140,7 +140,7 @@
     "@container-md": "@container-desktop",
     "@container-large-desktop": "(1140px + @grid-gutter-width)",
     "@container-lg": "@container-large-desktop",
-    "@navbar-height": "20px",
+    "@navbar-height": "50px",
     "@navbar-margin-bottom": "0",
     "@navbar-border-radius": "0",
     "@navbar-padding-horizontal": ".3em",

koha-tmpl/intranet-tmpl/prog/css/src/_header.scss

@@ -0,0 +1,245 @@
+#header {
+    .navbar-nav li a {
+        line-height: 40px;
+        overflow: hidden;
+        color: #FFFFFF;
+
+        &:hover, &:active {
+            border-bottom: 1px 5px #FFFFFF;
+        }
+    }
+
+    .dropdown-menu {
+        background-color: rgb(53, 44, 46);
+
+        li a {
+            &:hover, &:focus {
+                background-color: transparent;
+                text-decoration: underline;
+            }
+        }
+    }
+
+}
+
+#logo {
+    display: flex;
+    align-items: center;
+
+    img {
+        height: 80%;
+    }
+}
+
+#toplevelmenu {
+    background-color: transparent;
+    box-shadow: none;
+    position: relative;
+    left: 0;
+    top: 0;
+}
+
+#header_search {
+    border-radius: 28px;
+    display: flex;
+
+    .residentsearch {
+        padding: 0;
+        border: 0;
+        background-color: transparent;
+        display: none;
+
+        &:first-of-type {
+            display: block;
+        }
+    }
+
+    > ul {
+        padding: 0;
+        margin: 0;
+        order: -1;
+        border-radius: 16px 0 0 16px;
+        padding-left: 16px;
+        background-color: #418940;
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        color: white;
+
+        li {
+            background: transparent;
+            border: 0;
+            border-radius: 0;
+
+            background-color: transparent;
+            border: 0;
+            border-bottom-width: 0;
+            padding-bottom: 0;
+            margin: 0;
+
+            a {
+                color: #FFF;
+                font-size: .9em;
+                padding: 0 .5em;
+            }
+        }
+    }
+    .ui-state-hover, .ui-state-active {
+        a {
+            i {
+                border-bottom: 2px solid #FFFFFF;
+                padding-bottom: 2px;
+            }
+        }
+    }
+
+    form {
+        display: flex;
+        position: relative;
+    }
+
+    .form-title {
+        padding: 0 .8em;
+        background-image: linear-gradient(to right, #418940, #71B443);
+        border-radius: 0 16px 16px 0;
+        display: flex;
+        align-items: center;
+        z-index: 2;
+        white-space: nowrap;
+
+        label {
+            color: white;
+            font-weight: bold;
+        }
+    }
+
+    .form-content {
+        background-color: white;
+        margin-left: -16px;
+        padding-left: 16px;
+        border-radius: 0 16px 16px 0;
+        position: relative;
+        z-index: 1;
+        white-space: nowrap;
+        display: flex;
+
+        input[type="text"] {
+            border: 0;
+            box-shadow: unset;
+            background-color: transparent;
+        }
+
+        select {
+            margin: 0;
+            background-color: transparent;
+            border: 0;
+            box-shadow: unset;
+            max-width: 15em;
+        }
+    }
+
+    .form-extra-content {
+        left: 0;
+        right: 0;
+        position: absolute;
+        top: 31px;
+        background-color: #352C2E;
+        padding: 1em;
+        border-radius: 0 0 16px 16px;
+        z-index: 1;
+        display: none;
+
+        label {
+            color: white;
+        }
+
+        .form-control {
+            display: block;
+            width: 100%;
+        }
+    }
+
+    .form-extra-content-toggle {
+        opacity: .5;
+
+        &:hover {
+            opacity: 1;
+        }
+    }
+
+    input[type="submit"], button[type="submit"] {
+        height: 31px;
+        background-color: #71B443;
+        color: white;
+        border: 0;
+        text-shadow: unset;
+        border-radius: 0 16px 16px 0;
+        margin-left: -16px;
+        padding-left: calc(16px + .5em);
+    }
+
+    input[type="button"], button {
+        height: 31px;
+        border: 0;
+        text-shadow: unset;
+
+        &:active {
+            box-shadow: unset;
+        }
+    }
+}
+
+#logged-in-menu {
+    position: relative;
+    left: 0;
+    top: 0;
+    height: 50px;
+
+    &:hover {
+        text-decoration: none;
+    }
+}
+
+.loggedinusername {
+    bottom: 5px;
+    text-decoration: none;
+    position: relative;
+    float: right;
+    right: 0;
+    height: 20px;
+    width: 100%;
+}
+
+.logged-in-branch-name {
+    position: relative;
+    right: 0;
+    height: 20px;
+    top: 10px;
+    width: 100%;
+
+    &:hover {
+        text-decoration: underline;
+    }
+}
+
+#lastborrower-window {
+    display: none;
+    background-image: linear-gradient(to left, #418940, #71B443);
+    box-shadow: 1px 1px 1px 0 #999;
+    color: #FFFFFF;
+    padding: .2em;
+    border-radius: 5px 5px 5px 5px;
+
+    > * {
+        padding: 0 .4em;
+    }
+}
+
+#lastborrower-remove {
+    cursor: pointer;
+    border-left: 1px solid #fff;
+}
+
+#lastborrowerlink {
+    color: #FFFFFF;
+}

koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss

@@ -335,26 +335,6 @@ h1 {
     font-weight: bold;
 }
 
-#logo {
-    background: transparent url("../img/koha-logo-medium.png") no-repeat 50% 50%;
-    border: 0 none;
-    margin: 2rem 1rem;
-    padding: 0;
-    width: 180px;
-
-    a {
-        border: 0;
-        cursor: pointer;
-        display: block;
-        height: 0 !important;
-        margin: 0;
-        overflow: hidden;
-        padding: 44px 0 0;
-        text-decoration: none;
-        width: 180px;
-    }
-}
-
 h2 {
     font-size: 146.5%;
     font-weight: bold;
@@ -628,13 +608,6 @@ ol {
     }
 }
 
-
-.gradient {
-    background-image: linear-gradient(to bottom, rgb(230, 240, 242) 1%, rgb(255, 255, 255) 99%);
-    align-items: flex-start;
-    display: flex;
-}
-
 .cart-controls {
     border-top: 1px solid #E8E8E8;
     padding: 7px 0;
@@ -1092,8 +1065,13 @@ details[open] {
     width: 150px;
 }
 
-#breadcrumbs {
-    background-color: #E6F0F2;
+#sub-header {
+    display: flex;
+    justify-content: space-between;
+}
+
+#breadcrumbs, #shortcut {
+    background-color: transparent;
     clear: both;
     margin: 0;
     padding: .8em .5em .8em 10px;
@@ -1320,88 +1298,6 @@ div {
     }
 }
 
-#header_search {
-    background-position: .5em .5em;
-    background-repeat: no-repeat;
-    float: left;
-    margin: .3em 0 .5em;
-
-    input {
-        &[type="submit"] {
-            border-radius: 3px;
-            padding: .2em .8em;
-        }
-    }
-
-    div {
-        &.residentsearch {
-            border: 0;
-            border-bottom: 1px solid #85CA11;
-            padding: 0 0 .2em;
-        }
-    }
-
-    select {
-        max-width: 12em
-    }
-
-    ul {
-        &.ui-tabs-nav {
-            margin-left: 1em;
-            padding-top: 0;
-
-            li {
-                &.ui-state-default {
-                    background: transparent none;
-                    border: 0;
-                    top: 0;
-
-                    a {
-                        padding: .3em .6em;
-                    }
-                }
-
-                &.ui-tabs-active {
-                    background-color: #FFFFF1;
-                    border: 1px solid #85CA11;
-                    border-top-width: 0;
-                    top: -2px;
-
-                    a {
-                        text-decoration: none;
-                    }
-                }
-            }
-        }
-    }
-
-    .ui-corner-top {
-        border-radius: 0 0 4px 4px;
-    }
-
-    > div,
-    > ul {
-        display: none;
-
-        > li {
-            display: none;
-
-            &:first-of-type {
-                display: block;
-            }
-        }
-
-        &:first-of-type {
-            display: block;
-        }
-    }
-
-    .head-searchbox {
-        font-size: 1.3em;
-        width: 30em;
-    }
-}
-
 #reserves,
 #checkouts {
     border: 1px solid #B9D8D9;
@@ -3230,69 +3126,45 @@ video {
 }
 
 nav {
-    background: #E6F0F2 none;
     border: 0;
+    display: block;
 
     &.breadcrumb {
-        background-color: #E6F0F2;
-        clear: both;
+        background-color: transparent;
         margin: 0;
-        padding: .8em .5em .8em 10px;
-        position: relative;
 
         ol {
             margin: 0;
             padding-left: 0;
             list-style: none;
-        }
 
-        li {
-            display: inline;
+            li {
+                display: inline;
+                color : #418940;
+                font-style: italic;
 
-            &+li::before {
-                background: transparent url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0iY3VycmVudENvbG9yIiBjbGFzcz0iYmkgYmktY2hldnJvbi1yaWdodCI+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNNy4zNyAwbDUuMzUgNy4zYy4yLjIuMi41MSAwIC43bC01LjM4IDhoLTQuMmw1LjY0LTguMzVMMy4xMy4wMXoiLz48L3N2Zz4=") 50% 50% no-repeat;
-                background-size: 8px;
-                content: '';
-                display: inline-block;
-                height: .8em;
-                width: .8em;
-            }
+                &+li::before {
+                    content: '/';
+                    display: inline-block;
+                    height: .8em;
+                    width: .8em;
+                }
 
+                a:link, a:active, a:hover, a:focus {
+                    padding: .6em .3em;
+                }
+            }
         }
 
         [aria-current="page"] {
-            color: #000;
-            font-weight: 700;
+            color: #696969;
             text-decoration: none;
         }
     }
-
-
 }
 
-.navbar-collapse {
-    background: #E6F0F2 none;
-    box-shadow: none;
-}
-
-.navbar-nav {
-    li {
-        list-style: none;
-
-        &.open {
-            li {
-                a {
-                    font-weight: normal;
-                }
-            }
-        }
-
-        a {
-            font-weight: bold;
-            padding-bottom: .4em;
-            padding-top: .4em;
-        }
-    }
+.navbar {
+    background-color: #352C2E;
 }
 
 .nav .open > a,
@@ -3305,7 +3177,9 @@ nav {
 .nav > li > a:hover,
 .nav > li > a:focus {
     background-color: transparent;
-    text-decoration: none;
+    padding: .4em 15px;
+    color: #fff;
+    text-decoration: underline 2px;
 }
 
 .pagination {
@@ -4098,16 +3972,6 @@ input.renew {
     }
 }
 
-#patron_search {
-    #filters {
-        display: none;
-    }
-
-    .address {
-        font-size: 100%;
-    }
-}
-
 #fixedlengthbuilderaction {
     border: 3px solid #E6F0F2;
     left: 80%;
@@ -4380,15 +4244,17 @@ input.renew {
 }
 
 .loggedin-menu-label {
-    color: #777;
+    color: #FFFFFF;
     font-size: 12px;
     line-height: 1.42857143;
     padding: 4px 12px;
     white-space: nowrap;
 
     span {
-        color: #000;
+        color: #FFFFFF;
         font-weight: bold;
+        left: 15px;
+        top: 0;
     }
 
     &.divider {
@@ -4396,31 +4262,26 @@ input.renew {
     }
 }
 
-.lastborrower {
-    background-color: #E6F0F2;
-    border: 1px solid #95C6D0;
+#lastborrower-window {
+    display: none;
+    background-image: linear-gradient(to left, #418940, #71B443);
     box-shadow: 1px 1px 1px 0 #999;
-    color: #CC0000;
-    margin: .4em 0;
-    padding: .3em .5em .3em .5em;
-}
+    color: #FFFFFF;
+    padding: .2em;
+    border-radius: 5px 5px 5px 5px;
 
-#lastborrower-ref {
-    border-radius: 5px 0px 0px 5px;
-    float: left;
+    > * {
+        padding: 0 .4em;
+    }
 }
 
 #lastborrower-remove {
-    border-radius: 0px 5px 5px 0px;
     cursor: pointer;
-    float: right;
+    border-left: 1px solid #fff;
 }
 
-#lastborrower-window {
-    display: none;
-    position: absolute;
-    right: 5px;
-    top: 0px;
+#lastborrowerlink {
+    color: #FFFFFF;
 }
 
 /* ==== MODULE LINKS - Start ==== */
@@ -4603,12 +4464,6 @@ input.renew {
     }
 }
 
-.header-menu-link {
-    display: none;
-    font-weight: bold;
-    padding: .4em .6em;
-}
-
 #user-menu {
     position: absolute;
     right: 5px;
@@ -4727,6 +4582,8 @@ div .suggestion_note {
     margin: .5em;
 }
 
+@import "header";
+
 @media (min-width: 200px) {
 
 }
@@ -4765,8 +4622,7 @@ div .suggestion_note {
     }
 
     #header {
-        background-color: #FFF;
-        border: 1px solid #CCC;
+        background-color: #352C2E;
         margin-bottom: 1em;
 
         a {
@@ -4814,10 +4670,6 @@ div .suggestion_note {
         flex-direction: column;
     }
 
-    #logo {
-        margin: 1rem;
-    }
-
     #marcPreview {
         margin: 0;
         width: auto;
@@ -4830,8 +4682,7 @@ div .suggestion_note {
     #user-menu {
         .open {
             .dropdown-menu {
-                background-color: #FFF;
-                border: 1px solid #ccc;
+                background-color: #352c35;
                 position: absolute;
             }
         }

koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc

@@ -1,32 +1,48 @@
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Acquisitions Resident Search Box -->
-<div id="header_search">
-<div id="supplier_search" class="residentsearch">
-    <label class="tip" for="supplier">Search vendors:</label>
+<!-- Begin Acquisitions Resident Search Box -->
+
+<div id="header_search" class="navbar-form navbar-left">
+    <div id="supplier_search" class="residentsearch">
         <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
-           <input type="text" size="25" name="supplier" id="supplier" class="focus" />
-            <input type="submit" class="submit" value="Submit" /></form>
-</div>
+            <span class="form-title">
+                <label class="control-label">Vendor search</label>
+            </span>
+            <span class="form-content">
+                <input type="text" name="supplier" id="supplier" class="head-searchbox form-control" placeholder="Search vendors" />
+            </span>
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
+
     <div id="orders_search" class="residentsearch">
-	<p class="tip">Search orders:</p>
+        <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
+            <span class="form-title">
+                <label class="control-label">Orders search</label>
+            </span>
+            <span class="form-content">
+                <input type="text" id="title" class="form-control" placeholder="Title" name="title" size="13" value="[% title | html %]" />
+                <input type="text" id="searchsupplier" class="form-control" placeholder="Vendor" name="name" size="13" value="[% name | html %]" />
+                <button type="button" class="form-extra-content-toggle"><i class="fa fa-sliders"></i></button>
+                <input type="hidden" id="do_search" name="do_search" value="do" />
+            </span>
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
 
-		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
-        <label for="title">Title: </label> <input type="text" id="title" name="title" size="15" value="[% title | html %]" />
-        <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name | html %]" />
-        <input type="hidden" id="do_search" name="do_search" value="do" />
-        <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span>
-        <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span>
-    <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a>
-    <p id="filters" style="display:none">
-      <label for="basket">Basket: </label><input type="text" name="basket" id="basket" />
-      <label for="booksellerinvoicenumber">Invoice number: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
-    </p>
-	</form>
+            <div class="form-extra-content">
+                <div>
+                    <label for="basket" class="control-label">Basket</label>
+                    <input type="text" class="form-control" placeholder="Basket" name="basket" id="basket" />
+                </div>
+                <div>
+                    <label for="booksellerinvoicenumber" class="control-label">Basket</label>
+                    <input type="text" class="form-control" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
+                </div>
+            </div>
+        </form>
     </div>
-			<ul id="tabtriggers">
-            <li><a href="#supplier_search">Vendor search</a></li>
-            <li><a href="#orders_search">Orders search</a></li>
-            </ul>
+
+    <ul>
+        <li><a title="Vendor search" href="#supplier_search"><i class="fa fa-upload"></i></a></li>
+        <li><a title="Orders search" href="#orders_search"><i class="fa fa-download"></i></a></li>
+    </ul>
 </div><!-- /header_search -->
-</div><!-- /gradient -->
-<!-- End Acquisitions Resident Search Box -->
+
+<!-- End Main page Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc

@@ -1,53 +1,17 @@
-<div class="gradient">
-    <div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div>
+<!-- Begin main page resident search box -->
+<div id="header_search" class="navbar-form navbar-left">
 
-    <!-- Begin main page resident search box -->
-    <div id="header_search">
-        [% INCLUDE 'patron-search-box.inc' %]
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-            <div id="checkin_search" class="residentsearch">
-                <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
-                <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-                    <input type="text" name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
-                    <input value="Submit" class="submit" type="submit" />
-                </form>
-            </div>
-            <div id="renew_search" class="residentsearch">
-                <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
-                <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-                    <input type="text" class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
-                    <input value="Submit" class="submit" type="submit" />
-                </form>
-            </div>
-        [% END %]
+    [% INCLUDE 'patron-search-box.inc' %]
+    [% INCLUDE 'checkin-search-box.inc' %]
+    [% INCLUDE 'renew-search-box.inc' %]
+    [% INCLUDE 'member-search-box.inc' %]
 
-        [% IF CAN_user_borrowers_edit_borrowers %]
-            <div id="patron_search" class="residentsearch">
-                <label class="tip" for="searchmember">Enter patron card number or partial name:</label>
-                <form action="/cgi-bin/koha/members/member.pl" method="post">
-                    <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text" />
-                    <input type="hidden" name="quicksearch" value="1" />
-                    <input value="Submit" class="submit" type="submit" />
-                </form>
-            </div>
-        [% END %]
+    <ul>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
+        [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a title="Search patrons" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %]
+    </ul>
+</div><!-- /#header_search -->
 
-        <ul>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-                <li><a class="keep_text" href="#circ_search">Check out</a></li>
-            [% END %]
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-                <li><a class="keep_text" href="#checkin_search">Check in</a></li>
-            [% END %]
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-                <li><a class="keep_text" href="#renew_search">Renew</a></li>
-            [% END %]
-            [% IF CAN_user_borrowers_edit_borrowers %]
-                <li><a class="keep_text" href="#patron_search">Search patrons</a></li>
-            [% END %]
-        </ul>
-
-    </div><!-- /#header_search -->
-    <!-- End advanced search page resident search box -->
-
-</div><!-- /.gradient -->
+<!-- End advanced search page resident search box -->

koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc

@@ -1,235 +1,182 @@
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div>
 <!-- Begin Authorities Resident Search Box -->
-<div id="header_search" class="residentsearch">
-    <div id="mainmain_heading" class="residentsearch">
-    <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
-        <label class="tip" for="value_mainentry">Enter main heading ($a only):</label>
-        <input type="hidden" name="op" value="do_search" />
-        <input type="hidden" name="type" value="intranet" />
-        <select name="authtypecode" id="authtype_main_heading_a">
-        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
-        [% FOREACH authority_type IN authority_types %]
-            [% IF authority_type.authtypecode == authtypecode %]
-            <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option>
-            [% ELSE %]
-            <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option>
-            [% END %]
+
+[% BLOCK orderby %]
+    <div>
+        <label class="control-label">
+            Order by
+
+            <select name="orderby" class="form-control">
+                [% IF ( orderby == 'HeadingAsc' ) %]
+                <option value="HeadingAsc" selected="selected">Heading A-Z</option>
+                [% ELSE %]
+                <option value="HeadingAsc">Heading A-Z</option>
+                [% END %]
+                [% IF ( orderby == 'HeadingDsc' ) %]
+                <option value="HeadingDsc" selected="selected">Heading Z-A</option>
+                [% ELSE %]
+                <option value="HeadingDsc">Heading Z-A</option>
+                [% END %]
+                [% IF ( orderby == '' && op ) %]
+                <option value="" selected="selected">None</option>
+                [% ELSE %]
+                <option value="">None</option>
+                [% END %]
+            </select>
+        </label>
+    </div>
+[% END %]
+
+[% BLOCK operator %]
+    <div>
+        <label class="control-label">
+            Operator
+
+            <select name="operator" class="form-control">
+                [% IF ( operator == 'contains' ) %]
+                <option value="contains" selected="selected">contains</option>
+                [% ELSE %]
+                <option value="contains">contains</option>
+                [% END %]
+                [% IF ( operator == 'start' ) %]
+                <option value="start" selected="selected">starts with</option>
+                [% ELSE %]
+                <option value="start">starts with</option>
+                [% END %]
+                [% IF ( operator == 'exact' ) %]
+                <option value="exact" selected="selected">is exactly</option>
+                [% ELSE %]
+                <option value="exact">is exactly</option>
+                [% END %]
+            </select>
+        </label>
+    </div>
+[% END %]
+
+[% BLOCK authtype %]
+    <select name="authtypecode" class="form-control">
+    [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
+    [% FOREACH authority_type IN authority_types %]
+        [% IF authority_type.authtypecode == authtypecode %]
+        <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option>
+        [% ELSE %]
+        <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option>
         [% END %]
-        </select>
-        <input type="hidden" name="marclist" value="mainmainentry" />
-        <input type="hidden" name="and_or" value="and" />
-        <input type="hidden" name="excluding" value="" />
-        <select name="operator">
-            [% IF ( operator == 'contains' ) %]
-            <option value="contains" selected="selected">contains</option>
-            [% ELSE %]
-            <option value="contains">contains</option>
-            [% END %]
-            [% IF ( operator == 'start' ) %]
-            <option value="start" selected="selected">starts with</option>
-            [% ELSE %]
-            <option value="start">starts with</option>
-            [% END %]
-            [% IF ( operator == 'exact' ) %]
-            <option value="exact" selected="selected">is exactly</option>
-            [% ELSE %]
-            <option value="exact">is exactly</option>
-            [% END %]
-        </select>
-        <input id="value_mainentry" type="text" name="value" value="[% value | html %]" class="head-searchbox" />
-        <select name="orderby">
-            [% IF ( orderby == 'HeadingAsc' ) %]
-            <option value="HeadingAsc" selected="selected">Heading A-Z</option>
-            [% ELSE %]
-            <option value="HeadingAsc">Heading A-Z</option>
-            [% END %]
-            [% IF ( orderby == 'HeadingDsc' ) %]
-            <option value="HeadingDsc" selected="selected">Heading Z-A</option>
-            [% ELSE %]
-            <option value="HeadingDsc">Heading Z-A</option>
-            [% END %]
-            [% IF ( orderby == '' && op ) %]
-            <option value="" selected="selected">None</option>
-            [% ELSE %]
-            <option value="">None</option>
-            [% END %]
-        </select>
-        <input type="submit" class="submit" value="Submit" />
-    </form>
+    [% END %]
+    </select>
+[% END %]
+
+<div id="header_search" class="navbar-form navbar-left">
+    <div id="mainmain_heading" class="residentsearch">
+        <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
+            <input type="hidden" name="op" value="do_search" />
+            <input type="hidden" name="type" value="intranet" />
+            <input type="hidden" name="marclist" value="mainmainentry" />
+            <input type="hidden" name="and_or" value="and" />
+            <input type="hidden" name="excluding" value="" />
+
+            <span class="form-title">
+                <label class="control-label">Main heading ($a)</label>
+            </span>
+
+            <span class="form-content">
+                [% INCLUDE authtype %]
+                <input id="value_mainentry" class="form-control" type="text" name="value" value="[% value | html %]" placeholder="Search main heading ($a only)" />
+                <button type="button" class="form-extra-content-toggle"><i class="fa fa-sliders"></i></button>
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+
+            <span class="form-extra-content">
+                [% INCLUDE operator %]
+                [% INCLUDE orderby %]
+            </span>
+        </form>
     </div>
+
     <div id="main_heading" class="residentsearch">
-    <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
-        <label class="tip" for="value_mainheading">Enter main heading:</label>
-        <input type="hidden" name="op" value="do_search" />
-        <input type="hidden" name="type" value="intranet" />
-        <select name="authtypecode" id="authtype_main_heading">
-        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
-        [% FOREACH authority_type IN authority_types %]
-            [% IF authority_type.authtypecode == authtypecode %]
-            <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option>
-            [% ELSE %]
-            <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option>
-            [% END %]
-        [% END %]
-        </select>
-        <input type="hidden" name="marclist" value="mainentry" />
-        <input type="hidden" name="and_or" value="and" />
-        <input type="hidden" name="excluding" value="" />
-        <select name="operator">
-            [% IF ( operator == 'contains' ) %]
-            <option value="contains" selected="selected">contains</option>
-            [% ELSE %]
-            <option value="contains">contains</option>
-            [% END %]
-            [% IF ( operator == 'start' ) %]
-            <option value="start" selected="selected">starts with</option>
-            [% ELSE %]
-            <option value="start">starts with</option>
-            [% END %]
-            [% IF ( operator == 'exact' ) %]
-            <option value="exact" selected="selected">is exactly</option>
-            [% ELSE %]
-            <option value="exact">is exactly</option>
-            [% END %]
-        </select>
-        <input id="value_mainheading" type="text" name="value" value="[% value | html %]" class="head-searchbox" />
-        <select name="orderby">
-            [% IF ( orderby == 'HeadingAsc' ) %]
-            <option value="HeadingAsc" selected="selected">Heading A-Z</option>
-            [% ELSE %]
-            <option value="HeadingAsc">Heading A-Z</option>
-            [% END %]
-            [% IF ( orderby == 'HeadingDsc' ) %]
-            <option value="HeadingDsc" selected="selected">Heading Z-A</option>
-            [% ELSE %]
-            <option value="HeadingDsc">Heading Z-A</option>
-            [% END %]
-            [% IF ( orderby == '' && op ) %]
-            <option value="" selected="selected">None</option>
-            [% ELSE %]
-            <option value="">None</option>
-            [% END %]
-        </select>
-        <input type="submit" class="submit" value="Submit" />
-    </form>
+        <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
+            <input type="hidden" name="marclist" value="mainentry" />
+            <input type="hidden" name="and_or" value="and" />
+            <input type="hidden" name="excluding" value="" />
+            <input type="hidden" name="op" value="do_search" />
+            <input type="hidden" name="type" value="intranet" />
+
+            <span class="form-title">
+                <label class="control-label">Main heading</label>
+            </span>
+
+            <span class="form-content">
+                [% INCLUDE authtype %]
+                <input id="value_mainheading" class="form-control" type="text" name="value" value="[% value | html %]" placeholder="Search main heading" />
+                <button type="button" class="form-extra-content-toggle"><i class="fa fa-sliders"></i></button>
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+
+            <span class="form-extra-content">
+                [% INCLUDE operator %]
+                [% INCLUDE orderby %]
+            </span>
+        </form>
     </div>
+
     <div id="matchheading_search" class="residentsearch">
-    <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
-        <label class="tip" for="value_matchheading">Enter any heading:</label>
-        <input type="hidden" name="op" value="do_search" />
-        <input type="hidden" name="type" value="intranet" />
-        <select name="authtypecode" id="authtype_all_headings">
-        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
-        [% FOREACH authority_type IN authority_types %]
-            [% IF authority_type.authtypecode == authtypecode %]
-            <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option>
-            [% ELSE %]
-            <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option>
-            [% END %]
-        [% END %]
-        </select>
-        <input type="hidden" name="marclist" value="match" />
-        <select name="operator">
-            [% IF ( operator == 'contains' ) %]
-            <option value="contains" selected="selected">contains</option>
-            [% ELSE %]
-            <option value="contains">contains</option>
-            [% END %]
-            [% IF ( operator == 'start' ) %]
-            <option value="start" selected="selected">starts with</option>
-            [% ELSE %]
-            <option value="start">starts with</option>
-            [% END %]
-            [% IF ( operator == 'exact' ) %]
-            <option value="exact" selected="selected">is exactly</option>
-            [% ELSE %]
-            <option value="exact">is exactly</option>
-            [% END %]
-        </select>
-        <input id="value_matchheading" type="text" name="value" value="[% value | html %]" class="head-searchbox" />
-        <select name="orderby">
-            [% IF ( orderby == 'HeadingAsc' ) %]
-            <option value="HeadingAsc" selected="selected">Heading A-Z</option>
-            [% ELSE %]
-            <option value="HeadingAsc">Heading A-Z</option>
-            [% END %]
-            [% IF ( orderby == 'HeadingDsc' ) %]
-            <option value="HeadingDsc" selected="selected">Heading Z-A</option>
-            [% ELSE %]
-            <option value="HeadingDsc">Heading Z-A</option>
-            [% END %]
-            [% IF ( orderby == '' && op ) %]
-            <option value="" selected="selected">None</option>
-            [% ELSE %]
-            <option value="">None</option>
-            [% END %]
-         </select>
-         <input type="submit" class="submit" value="Submit" />
-    </form>
+        <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
+            <input type="hidden" name="op" value="do_search" />
+            <input type="hidden" name="type" value="intranet" />
+            <input type="hidden" name="marclist" value="match" />
+
+            <span class="form-title">
+                <label class="control-label">All headings</label>
+            </span>
+
+            <span class="form-content">
+                [% INCLUDE authtype %]
+                <input id="value_matchheading" class="form-control" type="text" name="value" value="[% value | html %]" placeholder="Search any heading" />
+                <button type="button" class="form-extra-content-toggle"><i class="fa fa-sliders"></i></button>
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+
+            <span class="form-extra-content">
+                [% INCLUDE operator %]
+                [% INCLUDE orderby %]
+            </span>
+        </form>
     </div>
+
     <div id="entire_record" class="residentsearch">
-    <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
-        <label class="tip" for="value_anywhere">Enter any authority field:</label>
-        <input type="hidden" name="op" value="do_search" />
-        <input type="hidden" name="type" value="intranet" />
-        <select name="authtypecode" id="authtype_entire_record">
-        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
-        [% FOREACH authority_type IN authority_types %]
-            [% IF authority_type.authtypecode == authtypecode %]
-            <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option>
-            [% ELSE %]
-            <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option>
-            [% END %]
-        [% END %]
-        </select>
-        <input type="hidden" name="marclist" value="all" />
-        <input type="hidden" name="and_or" value="and" />
-        <input type="hidden" name="excluding" value="" />
-        <select name="operator">
-            [% IF ( operator == 'contains' ) %]
-            <option value="contains" selected="selected">contains</option>
-            [% ELSE %]
-            <option value="contains">contains</option>
-            [% END %]
-            [% IF ( operator == 'start' ) %]
-            <option value="start" selected="selected">starts with</option>
-            [% ELSE %]
-            <option value="start">starts with</option>
-            [% END %]
-            [% IF ( operator == 'exact' ) %]
-            <option value="exact" selected="selected">is exactly</option>
-            [% ELSE %]
-            <option value="exact">is exactly</option>
-            [% END %]
-        </select>
-        <input id="value_anywhere" type="text" name="value" value="[% value | html %]" class="head-searchbox" />
-        <select name="orderby">
-            [% IF ( orderby == 'HeadingAsc' ) %]
-            <option value="HeadingAsc" selected="selected">Heading A-Z</option>
-            [% ELSE %]
-            <option value="HeadingAsc">Heading A-Z</option>
-            [% END %]
-            [% IF ( orderby == 'HeadingDsc' ) %]
-            <option value="HeadingDsc" selected="selected">Heading Z-A</option>
-            [% ELSE %]
-            <option value="HeadingDsc">Heading Z-A</option>
-            [% END %]
-            [% IF ( orderby == '' && op ) %]
-            <option value="" selected="selected">None</option>
-            [% ELSE %]
-            <option value="">None</option>
-            [% END %]
-        </select>
-        <input type="submit" class="submit" value="Submit" />
-    </form>
+        <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
+            <input type="hidden" name="op" value="do_search" />
+            <input type="hidden" name="type" value="intranet" />
+            <input type="hidden" name="marclist" value="all" />
+            <input type="hidden" name="and_or" value="and" />
+            <input type="hidden" name="excluding" value="" />
+
+            <span class="form-title">
+                <label class="control-label">Entire record</label>
+            </span>
+
+            <span class="form-content">
+                [% INCLUDE authtype %]
+                <input id="value_anywhere" class="form-control" type="text" name="value" value="[% value | html %]" placeholder="Search any authority field" />
+                <button type="button" class="form-extra-content-toggle"><i class="fa fa-sliders"></i></button>
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+
+            <span class="form-extra-content">
+                [% INCLUDE operator %]
+                [% INCLUDE orderby %]
+            </span>
+        </form>
     </div>
+
     <ul>
-        <li><a class="keep_text" href="#mainmain_heading">Search main heading ($a only)</a></li>
-        <li><a class="keep_text" href="#main_heading">Search main heading</a></li>
-        <li><a class="keep_text" href="#matchheading_search">Search all headings</a></li>
-        <li><a class="keep_text" href="#entire_record">Search entire record</a></li>
+        <li><a title="Search main heading ($a only)" href="#mainmain_heading"><i style="font-weight:bold">$a</i></a></li>
+        <li><a title="Search main heading" href="#main_heading"><i class="fa fa-header"></i></a></li>
+        <li><a title="Search all headings" href="#matchheading_search"><i class="fa fa-align-center"></i></a></li>
+        <li><a title="Search entire record" href="#entire_record"><i class="fa fa-folder-open-o"></i></a></li>
     </ul>
 </div><!-- /header_search -->
-</div><!-- /gradient -->
 <!-- End Authorities Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc

@@ -1,41 +1,43 @@
 [% USE Koha %]
 [% USE Branches %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Fund Admin Resident Search Box -->
-
-    <div id="header_search">
-        <div id="budgets_search" class="residentsearch">
-            <p class="tip">Search funds:</p>
-            <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
-                <label for="filter_budgetname">Fund code: </label><input class="query" type="text" name="filter_budgetname" id="filter_budgetname" size="20" value="[% filter_budgetname | html %]" />
-                <label for="filter_budgetbranch">Library: </label>
-                <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;">
-                    <option value=""></option>
-                        [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %]
-                            [% IF branchloo.selected %]
+<div id="header_search" class="navbar-form navbar-left">
+
+    <div id="budgets_search" class="residentsearch">
+        <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
+            <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
+
+            <span class="form-title">
+                <label class="control-label">Search funds</label>
+            </span>
+
+            <span class="form-content">
+                <select name="filter_budgetbranch" id="filter_budgetbranch" class="form-control">
+                    <option value="">All libraries</option>
+                    [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %]
+                        [% IF branchloo.selected %]
                             <option value="[% branchloo.branchcode | html %]" selected="selected">[% branchloo.branchname | html %]</option>
-                            [% ELSE %]
+                        [% ELSE %]
                             <option value="[% branchloo.branchcode | html %]" >[% branchloo.branchname | html %]</option>
-                            [% END %]
                         [% END %]
+                    [% END %]
                 </select>
-              <input type="hidden"  name="budget_period_id" value="[% budget_period_id | html %]" />
-              <input type="submit" class="submit" name="filter" value="Submit" />
-            </form>
-        </div>
-
-        [% INCLUDE 'patron-search-box.inc' %]
-        [% INCLUDE 'catalogue-search-box.inc' %]
-
-        <ul>
-            <li><a class="keep_text" href="#budgets_search">Search funds</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-                <li><a class="keep_text" href="#circ_search">Check out</a></li>
-            [% END %]
-            [% IF ( CAN_user_catalogue ) %]
-                <li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>
-            [% END %]
-        </ul>
+
+                <input class="query form-control" type="text" name="filter_budgetname" id="filter_budgetname" value="[% filter_budgetname | html %]" placeholder="Search funds" />
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
     </div>
-</div>
+
+    [% INCLUDE 'patron-search-box.inc' %]
+
+    [% INCLUDE 'catalogue-search-box.inc' %]
+
+    <ul>
+        <li><a title="Search funds" href="#budgets_search"><i class="fa fa-credit-card"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
+</div><!-- /header_search -->
+
 <!-- End Suggestions Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc

@@ -1,37 +1,16 @@
-[% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Catalogue Resident Search Box -->
-<div id="header_search">
+<div id="header_search" class="navbar-form navbar-left">
 
 [% INCLUDE 'patron-search-box.inc' %]
-
-[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-<div id="checkin_search" class="residentsearch">
-    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-        <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
-        <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" type="text" />
-
-        <input value="Submit" class="submit" type="submit" />
-    </form>
-</div>
-<div id="renew_search" class="residentsearch">
-    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-        <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
-        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
-        <input value="Submit" class="submit" type="submit" />
-    </form>
-</div>
-[% END %]
-
+[% INCLUDE 'checkin-search-box.inc' %]
+[% INCLUDE 'renew-search-box.inc' %]
 [% INCLUDE 'catalogue-search-box.inc' %]
 
 <ul>
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
 </ul>
 
 </div><!-- /header_search -->
-</div><!-- /gradient -->
 <!-- End Catalogue Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc

@@ -1,43 +1,35 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Cataloging Resident Search Box -->
-    <div id="header_search">
-        <div id="addbooks_search" class="residentsearch">
-            <form name="search" action="addbooks.pl">
-                <label class="tip" for="cat_search">Search the catalog and the reservoir:</label>
-                <input class="head-searchbox" type="text" name="q" id="cat_search" size="40" />
-                <input type="submit" class="submit" value="Submit" />
-            </form>
-        </div>
+[% PROCESS 'html_helpers.inc' %]
+[% PROCESS 'patronfields.inc' %]
+<!-- Begin Patrons Resident Search Box -->
 
-        [% INCLUDE 'patron-search-box.inc' %]
+<div id="header_search" class="navbar-form navbar-left">
 
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-        <div id="checkin_search" class="residentsearch">
-            <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-                <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
-                <input class="head-searchbox" type="text" name="barcode" id="ret_barcode" size="40" />
-                <input value="Submit" class="submit" type="submit" />
-            </form>
-        </div>
-        <div id="renew_search" class="residentsearch">
-            <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-                <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
-                <input class="head-searchbox" type="text" name="barcode" id="ren_barcode" size="40" />
-                <input value="Submit" class="submit" type="submit" />
-            </form>
-        </div>
-        [% END %]
+    <div id="addbooks_search" class="residentsearch">
+        <form name="search" action="addbooks.pl">
+            <span class="form-title">
+                <label class="control-label">Cataloging search</label>
+            </span>
 
-        [% INCLUDE 'catalogue-search-box.inc' %]
+            <span class="form-content">
+                <input class="head-searchbox form-control" type="text" name="q" id="cat_search" placeholder="Search the catalog and the reservoir" size="40" />
+            </span>
 
-        <ul>
-            <li><a class="keep_text" href="#addbooks_search">Cataloging search</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
-            <li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>
-        </ul>
-    </div><!-- /header_search -->
-</div><!-- /gradient -->
-<!-- End Cataloging Resident Search Box -->
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
+
+    [% INCLUDE 'patron-search-box.inc' %]
+    [% INCLUDE 'checkin-search-box.inc' %]
+    [% INCLUDE 'renew-search-box.inc' %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
+
+    <ul>
+        <li><a title="Cataloging search" href="#addbooks_search"><i class="fa fa-fw fa-search"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
+        <li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>
+    </ul>
+</div><!-- /header_search -->
+<!-- End Main page Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc

@@ -2,22 +2,27 @@
 [% IF ( CAN_user_catalogue ) %]
     <div id="catalog_search" class="residentsearch">
         <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            <label class="tip" for="search-form">Enter search keywords:</label>
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                [% INCLUDE 'search_indexes.inc' $header_pulldown = 1 %]
-            [% END %]
-            [% IF ( Koha.Preference('RetainCatalogSearchTerms') ) %]
-                <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox" />
-            [% ELSE %]
-                <input type="text" name="q" id="search-form" size="40" title="Enter the terms you wish to search for." class="query form-text head-searchbox" />
-            [% END %]
-            [% IF ( Koha.Preference('IntranetAddMastheadLibraryPulldown') ) %]
-                <select id="select_library" name="limit" style="margin-left:5px;">
-                    <option value="">All libraries</option>
-                    [% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all( selected => branch_limit ) %]
-                </select>
-            [% END %]
-            <input type="submit" value="Submit"  class="submit" />
+            <span class="form-title">
+                <label class="control-label">Search catalog</label>
+            </span>
+            <span class="form-content">
+                [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
+                    [% INCLUDE 'search_indexes.inc' $header_pulldown = 1 %]
+                [% END %]
+                [% IF ( Koha.Preference('RetainCatalogSearchTerms') ) %]
+                    <input type="text" name="q" id="search-form" size="20" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox" />
+                [% ELSE %]
+                    <input type="text" name="q" id="search-form" size="20" title="Enter the terms you wish to search for." class="query form-text head-searchbox" />
+                [% END %]
+
+                [% IF ( Koha.Preference('IntranetAddMastheadLibraryPulldown') ) %]
+                    <select id="select_library" name="limit" style="margin-left:5px;">
+                        <option value="">All libraries</option>
+                        [% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all( selected => branch_limit ) %]
+                    </select>
+                [% END %]
+            </span>
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
         </form>
     </div>
 [% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search-box.inc

@@ -0,0 +1,13 @@
+[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
+    <div id="checkin_search" class="residentsearch">
+        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
+            <span class="form-title">
+                <label class="control-label">Check in</label>
+            </span>
+            <span class="form-content">
+                <input name="barcode" id="ret_barcode" class="head-searchbox form-control" accesskey="r" type="text" placeholder="Scan a barcode to check in" size="40"/>
+            </span>
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
+[% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc

@@ -1,26 +1,17 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Checkin Resident Search Box -->
-<div id="header_search">
-[% INCLUDE 'patron-search-box.inc' %]
+<!-- Begin Main page Resident Search Box -->
 
-[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-<div id="renew_search" class="residentsearch">
-    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-        <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
-        <input class="head-searchbox" type="text" name="barcode" id="ren_barcode" size="40" />
-        <input value="Submit" class="submit" type="submit" />
-    </form>
-</div>
-[% END %]
+<div id="header_search" class="navbar-form navbar-left">
 
-[% INCLUDE 'catalogue-search-box.inc' %]
-<ul>
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-</ul>   
+    [% INCLUDE 'patron-search-box.inc' %]
+    [% INCLUDE 'renew-search-box.inc' %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
+
+    <ul>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
+</div><!-- /header_search -->
+<!-- End Main page Resident Search Box -->
 
-</div>
-</div><!-- /gradient -->
-<!-- End Checkin Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc

@@ -1,34 +1,18 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Circulation Resident Search Box -->
+<!-- Begin Main page Resident Search Box -->
+
+<div id="header_search" class="navbar-form navbar-left">
 
-<div id="header_search">
     [% INCLUDE 'patron-search-box.inc' %]
-[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-<div id="checkin_search" class="residentsearch">
-    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-        <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
-        <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" type="text" />
-        <input value="Submit" class="submit" type="submit" />
-    </form>
-</div>
-<div id="renew_search" class="residentsearch">
-    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-        <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
-        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
-        <input value="Submit" class="submit" type="submit" />
-    </form>
-</div>
-[% END %]
+    [% INCLUDE 'checkin-search-box.inc' %]
+    [% INCLUDE 'renew-search-box.inc' %]
     [% INCLUDE 'catalogue-search-box.inc' %]
 
-<ul>
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-</ul>   
-
-</div><!-- /header_search -->
-</div><!-- /gradient -->
-<!-- End Circulation Resident Search Box -->
+    <ul>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
+</div>
+<!-- End Main page Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc

@@ -1,23 +1,27 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Cities Resident Search Box -->
-<div id="header_search">
-	<div id="city_search" class="residentsearch">
-	<form action="[% script_name | html %]" method="post">
-        <label class="tip" for="city_name_filter">City search:</label>
-        <input class="head-searchbox" type="text" name="city_name_filter" id="city_name_filter" value="[% city_name_filter | html %]" size="40" />
-		<input type="submit" name="submit" value="OK" class="submit" />
-	</form>
-	</div>
+<div id="header_search" class="navbar-form navbar-left">
+    <div id="city_search" class="residentsearch">
+        <form action="[% script_name | html %]" method="post">
+            <span class="form-title">
+                <label class="control-label">Search cities</label>
+            </span>
+
+            <span class="form-content">
+                <input class="head-searchbox form-control" type="text" name="city_name_filter" id="city_name_filter" value="[% city_name_filter | html %]" placeholder="City search" />
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
 
     [% INCLUDE 'patron-search-box.inc' %]
+
     [% INCLUDE 'catalogue-search-box.inc' %]
 
-			<ul>
-            <li><a class="keep_text" href="#city_search">Search cities</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-			</ul>	
-</div>
+    <ul>
+        <li><a title="Search cities" href="#city_search"><i class="fa fa-building-o"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
 </div>
 <!-- End Cities Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc

@@ -1,24 +1,28 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Admin Resident Search Box -->
 
-<div id="header_search">
-	<div id="contract_description_search" class="residentsearch">
-	<form action="[% script_name | html %]" method="post">
-        <label class="tip" for="searchfield">Search by contract name or/and description:</label>
-        <input class="head-searchbox" type="text" name="searchfield" id="searchfield" size="40" value="[% searchfield | html %]" />
-		<input type="submit" class="submit" name="search" value="Search" />
-	</form>	
-	</div>
+<div id="header_search" class="navbar-form navbar-left">
+    <div id="contract_description_search" class="residentsearch">
+        <form action="[% script_name | html %]" method="post">
+            <span class="form-title">
+                <label class="control-label">Search contracts</label>
+            </span>
+
+            <span class="form-content">
+                <input class="head-searchbox form-control" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Search by contract name or/and description:" size="40"/>
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
 
     [% INCLUDE 'patron-search-box.inc' %]
+
     [% INCLUDE 'catalogue-search-box.inc' %]
 
-	<ul>
-            <li><a class="keep_text" href="#contract_description_search">Search contracts</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-	</ul>
+    <ul>
+        <li><a title="Search contracts" href="#contract_description_search"><i class="fa fa-pencil-square-o"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
 </div>
-</div><!-- /gradient -->
 <!-- End Patrons Admin Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc

@@ -1,21 +1,28 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Currencies Resident Search Box -->
-<div id="header_search">
-	<div id="currency_search" class="residentsearch">
+
+<div id="header_search" class="navbar-form navbar-left">
+    <div id="currency_search" class="residentsearch">
         <form action="[% script_name | html %]" method="post">
-            <label class="tip" for="description">Currencies search:</label>
-                <input class="head-searchbox" type="text" name="description" id="description" size="40" value="[% searchfield | html %]" />
-                <input type="submit" class="submit" name="search" value="Search" />
-        </form>	
-	</div>
+            <span class="form-title">
+                <label class="control-label">Search currencies</label>
+            </span>
+
+            <span class="form-content">
+                <input class="head-searchbox form-control" type="text" name="description" id="description" value="[% searchfield | html %]" placeholder="Currencies search" />
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
+
     [% INCLUDE 'patron-search-box.inc' %]
+
     [% INCLUDE 'catalogue-search-box.inc' %]
-			<ul>
-            <li><a class="keep_text" href="#currency_search">Search currencies</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-			</ul>	
+
+    <ul>
+        <li><a title="Search currencies" href="#currency_search"><i class="fa fa-dollar"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
 </div>
-</div><!-- /gradient -->
 <!-- End Currencies Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc

@@ -1,23 +1,27 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName|html %]</a></div><!-- Begin Desks Resident Search Box -->
-<div id="header_search">
-        <div id="desk_search" class="residentsearch">
+<div id="header_search" class="navbar-form navbar-left">
+    <div id="desk_search" class="residentsearch">
         <form action="[% script_name|html %]" method="post">
-            <label class="tip" for="desk_name">Desk search:</label>
-        <input class="head-searchbox" type="text" name="desk_name" id="desk_name" value="[% searchfield|html %]" size="40" />
-                <input type="submit" name="submit" value="OK" class="submit" />
+            <span class="form-title">
+                <label class="control-label">Search desks</label>
+            </span>
+
+            <span class="form-content">
+                <input class="head-searchbox form-control" type="text" name="desk_name" placeholder="Search desks" id="desk_name" value="[% searchfield|html %]" size="40" />
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
         </form>
-        </div>
+    </div>
 
     [% INCLUDE 'patron-search-box.inc' %]
+
     [% INCLUDE 'catalogue-search-box.inc' %]
 
-                        <ul>
-            <li><a class="keep_text" href="#desk_search">Search desks</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-                        </ul>
-</div>
+    <ul>
+        <li><a title="Search desks" href="#desk_search"><i class="fa fa-desktop"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
 </div>
 <!-- End Desks Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/header.inc

@@ -5,10 +5,12 @@
 [% USE Koha %]
 <nav class="navbar">
     <div class="navbar-header">
-        <a href="#" class="header-menu-link collapsed" data-toggle="collapse" data-target="#header" aria-expanded="false" aria-controls="header">
+        <a href="#" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#header" aria-expanded="false" aria-controls="header">
             <i class="fa fa-bars"></i> Menu
         </a>
+        <a id="logo" class="navbar-brand" href="/cgi-bin/koha/mainpage.pl"><img src="[% interface | html %]/[% theme | html %]/img/picto-koha.svg" alt="Koha"></a>
     </div>
+
     <div id="header" class="navbar-collapse collapse">
         <ul id="toplevelmenu" class="nav navbar-nav">
             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
@@ -23,11 +25,6 @@
                     <li><a href="/cgi-bin/koha/catalogue/itemsearch.pl">Item search</a></li>[% END %]
                 </ul>
             </li>
-            [% IF ( Koha.Preference('intranetbookbag') ) %]
-                <li>
-                    <a href="#" id="cartmenulink"><i class="fa fa-shopping-cart"></i>Cart<span id="basketcount"></span></a>
-                </li>
-            [% END %]
             [% Koha.Preference('IntranetNav') | $raw %]
             <li class="dropdown">
                 <a href="/cgi-bin/koha/mainpage.pl" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
@@ -68,7 +65,17 @@
                 </ul>
             </li>
         </ul>
-    </div>
+
+        [% content | $raw %]
+
+        <ul class="nav navbar-nav">
+            [% IF ( Koha.Preference('intranetbookbag') ) %]
+            <li>
+                <a href="#" id="cartmenulink"><i class="fa fa-shopping-cart"></i><span id="basketcount"></span></a>
+            </li>
+            [% END %]
+        </ul>
+
         <ul id="user-menu" class="nav navbar-nav navbar-right">
             [% IF ( loggedinusername ) %]
             <li class="dropdown">
@@ -79,7 +86,7 @@
                     <span id="logged-in-info-full">
                         [% SET is_superlibrarian = CAN_user_superlibrarian ? 'is_superlibrarian' : '' %]
                         <span class="loggedinusername [% is_superlibrarian | html %]">[% logged_in_user.userid | html %]</span>
-                        <span class="separator">|</span>
+
                         [% IF ( AutoLocation ) %]
                             <brand>
                                 [% Branches.GetLoggedInBranchname | html %]
@@ -198,21 +205,19 @@
                 </ul>
             </li>
             [% INCLUDE 'langmenu-staff-top.inc' %]
-            <li>
-                <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
-            </li>
+
             [% ELSE %]
             <li class="loggedout">
                 <span>
                     <a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>
                     <span class="separator">|</span>
-                    <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
                 </span>
             </li>
             [% END %]
         </ul>
+    </div>
+
 
-    [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
     [% IF ( Koha.Preference('intranetbookbag') ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]
 
 </nav>

koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc

@@ -1,44 +1,19 @@
-[% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Main page Resident Search Box -->
+<!-- Begin Main page Resident Search Box -->
 
-<div id="header_search">
+<div id="header_search" class="navbar-form navbar-left">
     [% INCLUDE 'patron-search-box.inc' %]
-[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-<div id="checkin_search" class="residentsearch">
-    <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
-    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-        <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" type="text" />
-        <input value="Submit" class="submit" type="submit" />
-    </form>
-</div>
-<div id="renew_search" class="residentsearch">
-    <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
-        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-            <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
-            <input value="Submit" class="submit" type="submit" />
-        </form>
-    </div>
-[% END %]
-
-[% IF CAN_user_borrowers_edit_borrowers %]
-<div id="patron_search" class="residentsearch">
-    <label class="tip" for="searchmember">Enter patron card number or partial name:</label>
-    <form action="/cgi-bin/koha/members/member.pl" method="post">
-        <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text" autocomplete="off" />
-        <input type="hidden" name="quicksearch" value="1" />
-        <input value="Submit" class="submit" type="submit" />
-    </form>
-</div>[% END %]
-[% INCLUDE 'catalogue-search-box.inc' %]
-<ul>
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
-    [% IF CAN_user_borrowers_edit_borrowers %]<li><a class="keep_text" href="#patron_search">Search patrons</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-</ul>
+    [% INCLUDE 'checkin-search-box.inc' %]
+    [% INCLUDE 'renew-search-box.inc' %]
+    [% INCLUDE 'member-search-box.inc' %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 
+    <ul>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
+        [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a title="Search patrons" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
 </div><!-- /header_search -->
-</div><!-- /gradient -->
+
 <!-- End Main page Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc

@@ -1,4 +1,4 @@
 <div id="lastborrower-window">
-    <div id="lastborrower-ref" class="lastborrower"><a id="lastborrowerlink" href="" title="">Last patron</a></div>
+    <div id="lastborrower-ref" class="lastborrower"><a id="lastborrowerlink" href="" title=""><i class="fa fa-arrow-right"></i> Last patron</a></div>
     <div id="lastborrower-remove" class="lastborrower"><i class="fa fa-remove"></i></div>
-</div>
+</div>

koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc

@@ -1,21 +1,28 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Notices Resident Search Box -->
-<div id="header_search">
-	<div id="notices_search" class="residentsearch">
-<form action="/cgi-bin/koha/tools/letter.pl" method="post">
-        <label class="tip" for="searchfield">Search existing notices:</label>
-        <input class="head-searchbox" type="text" name="searchfield" id="searchfield" size="40" value="" />
-                <input type="submit" class="submit" name="search" value="Search" />
-        </form>	
-	</div>
+
+<div id="header_search" class="navbar-form navbar-left">
+    <div id="notices_search" class="residentsearch">
+        <form action="/cgi-bin/koha/tools/letter.pl" method="post">
+            <span class="form-title">
+                <label class="control-label">Search notices</label>
+            </span>
+
+            <span class="form-content">
+                <input class="head-searchbox form-control" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices"/>
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
+
     [% INCLUDE 'patron-search-box.inc' %]
+
     [% INCLUDE 'catalogue-search-box.inc' %]
-			<ul>
-            <li><a class="keep_text" href="#notices_search">Search notices</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-			</ul>	
+
+    <ul>
+        <li><a title="Search notices" href="#notices_search"><i class="fa fa-commenting-o"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
 </div>
-</div><!-- /gradient -->
 <!-- End Notices Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc

@@ -12,11 +12,12 @@
 </head>
 
 <body id="rep_mana_search" class="rep">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'circ-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'circ-search.inc' %]
+[% END %]
 
 <div id="breadcrumbs">
-    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+    <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
     &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
     &rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a>
     &rsaquo; Mana Knowledge Base report search results

koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc

@@ -0,0 +1,85 @@
+[% USE Branches %]
+[% USE Koha %]
+[% PROCESS 'patronfields.inc' %]
+[% IF CAN_user_borrowers_edit_borrowers %]
+    <div id="patron_search" class="residentsearch">
+        <form method="post" action="/cgi-bin/koha/members/member.pl">
+            <input type="hidden" name="quicksearch" value="1" />
+
+            <span class="form-title">
+                <label class="control-label">Search patrons</label>
+            </span>
+
+            <span class="form-content">
+                [% IF ( Koha.Preference('RetainPatronsSearchTerms') ) %]
+                    <input name="searchmember" id="searchmember" class="head-searchbox form-control" type="text" placeholder="Enter patron card number or partial name" size="25" value="[% searchmember | html %]"/>
+                [% ELSE %]
+                    <input name="searchmember" id="searchmember" class="head-searchbox form-control" type="text" placeholder="Enter patron card number or partial name" size="25"/>
+                [% END %]
+
+                <button type="button" class="form-extra-content-toggle"><i class="fa fa-sliders"></i></button>
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+
+            <div class="form-extra-content">
+                <div>
+                    <label for="searchfieldstype" class="control-label">Search fields</label>
+                    <select name="searchfieldstype" id="searchfieldstype" class="form-control">
+                        [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,middle_name,surname,othernames,cardnumber,userid' %]
+                        [% default_fields = [ standard, 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
+                        [% search_options = default_fields.merge(standard.split(',')).unique %]
+                        [% FOREACH s_o IN search_options %]
+                            [% display_name = PROCESS patron_fields name=s_o %]
+                            [% NEXT IF !display_name.length %]
+                            [% IF searchfieldstype == s_o %]
+                                <option value="[% s_o | html %]">[% display_name | $raw %]</option>
+                            [% ELSE %]
+                                <option value="[% s_o | html %]">[% display_name | $raw %]</option>
+                            [% END %]
+                        [% END %]
+                    </select>
+                </div>
+
+                <div>
+                    <label for="searchtype" class="control-label">Search type</label>
+                    <select name="searchtype" id="searchtype" class="form-control">
+                    [% IF searchtype == 'start_with' %]
+                        <option value='start_with'>Starts with</option>
+                        <option value='contain'>Contains</option>
+                    [% ELSE %]
+                        <option value='start_with'>Starts with</option>
+                        <option value='contain'>Contains</option>
+                    [% END %]
+                    </select>
+                </div>
+
+                <div>
+                    [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %]
+                    <label for="branchcode" class="control-label">Library</label>
+                    <select name="branchcode_filter" id="branchcode" class="form-control">
+                        [% IF branches.size != 1 %]
+                        <option value="">Any</option>
+                        [% END %]
+                        [% PROCESS options_for_libraries libraries => branches %]
+                    </select>
+                </div>
+
+                <div>
+                    [% SET categories = Categories.all() %]
+                    <label for="categorycode" class="control-label">Category</label>
+                    <select name="categorycode_filter" id="categorycode" class="form-control">
+                        <option value="">Any</option>
+                        [% FOREACH category IN categories %]
+                            [% IF category.categorycode == categorycode_filter %]
+                                <option value="[% category.categorycode | html %]" selected="selected">[% category.description | html %]</option>
+                            [% ELSE %]
+                                <option value="[% category.categorycode | html %]">[% category.description | html %]</option>
+                            [% END %]
+                        [% END %]
+                    </select>
+                </div>
+            </div>
+        </form>
+    </div>
+[% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc

@@ -1,24 +1,20 @@
 [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
     <div id="circ_search" class="residentsearch">
-    <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
-    <label class="tip" for="findborrower">Enter patron card number or partial name:</label>
-    [% IF ( PatronAutoComplete ) %]
-    <div class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="head-searchbox" type="text" />
-                <input id="autocsubmit" type="submit" class="submit" value="Submit" />
-            [% IF ( stickyduedate ) %]
-                <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
-                <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
-            [% END %]
-        </div>
-	[% ELSE %]
-            <input id="findborrower" name="findborrower" size="40" class="head-searchbox" type="text" autocomplete="off" />
-            [% IF ( stickyduedate ) %]
-            <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
-            <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
-            [% END %]
-            <input value="Submit" class="submit" type="submit" />
-	[% END %]
-    </form>
-	</div>
-	[% END %]
+        <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
+            <span class="form-title">
+                <label class="control-label">Check out</label>
+            </span>
+
+            <span class="form-content">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="head-searchbox form-control" type="text" placeholder="Enter patron card number or partial name" size="40"/>
+
+                [% IF ( stickyduedate ) %]
+                    <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
+                    <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
+                [% END %]
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
+[% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc

@@ -1,115 +1,15 @@
-[% USE Koha %]
-[% USE Branches %]
-[% USE Categories %]
-[% USE raw %]
-[% PROCESS 'html_helpers.inc' %]
-[% PROCESS 'patronfields.inc' %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Resident Search Box -->
-<div id="header_search">
-    <div id="patron_search" class="residentsearch">
-    <form action="/cgi-bin/koha/members/member.pl" method="post">
-        <label class="tip" for="searchmember">Enter patron card number or partial name:</label>
-    <div class="autocomplete">
-        [% IF ( Koha.Preference('RetainPatronsSearchTerms') ) %]
-        <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox" name="searchmember" type="text" value="[% searchmember | html %]" autocomplete="off" />
-        [% ELSE %]
-        <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox" name="searchmember" type="text" autocomplete="off" />
-        [% END %]
-        <input type="hidden" name="quicksearch" value="1" />
-        <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
-        <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
-        <input value="Search" class="submit" type="submit" />
-    </div>
-
-
-
-    <div id="filters">
-        <p><label for="searchfieldstype">Search fields:</label>
-            <select name="searchfieldstype" id="searchfieldstype">
-              [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,middle_name,surname,othernames,cardnumber,userid' %]
-              [% default_fields = [ standard, 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
-              [% search_options = default_fields.merge(standard.split(',')).unique %]
-              [% FOREACH s_o IN search_options %]
-                  [% display_name = PROCESS patron_fields name=s_o %]
-                  [% NEXT IF !display_name.length %]
-                  [% IF searchfieldstype == s_o %]
-                      <option selected="selected" value="[% s_o | html %]">[% display_name | $raw %]</option>
-                  [% ELSE %]
-                      <option value="[% s_o | html %]">[% display_name | $raw %]</option>
-                  [% END %]
-              [% END %]
-            </select>
-        </p>
-        <p>
-            <label for="searchtype">Search type:</label>
-            <select name="searchtype" id="searchtype">
-              [% IF searchtype == 'start_with' %]
-                  <option selected="selected" value='start_with'>Starts with</option>
-                  <option value='contain'>Contains</option>
-              [% ELSE %]
-                  <option value='start_with'>Starts with</option>
-                  <option selected="selected" value='contain'>Contains</option>
-              [% END %]
-            </select>
-        </p>
-
-        <p>
-            <label for="branchcode">Library: </label>
-            [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %]
-            <select name="branchcode_filter" id="branchcode">
-                [% IF branches.size != 1 %]
-                  <option value="">Any</option>
-                [% END %]
-                [% PROCESS options_for_libraries libraries => branches %]
-            </select>
-        </p>
-
-        <p>
-            <label for="categorycode">Category: </label>
-            [% SET categories = Categories.all() %]
-            <select name="categorycode_filter" id="categorycode">
-                <option value="">Any</option>
-                [% FOREACH category IN categories %]
-                    [% IF category.categorycode == categorycode_filter %]
-                        <option value="[% category.categorycode | html %]" selected="selected">[% category.description | html %]</option>
-                    [% ELSE %]
-                        <option value="[% category.categorycode | html %]">[% category.description | html %]</option>
-                    [% END %]
-                [% END %]
-            </select>
-        </p>
-    </div>
-    </form>
-</div>
+<div id="header_search" class="navbar-form navbar-left">
+    [% INCLUDE 'member-search-box.inc' %]
     [% INCLUDE 'patron-search-box.inc' %]
-
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-    <div id="checkin_search" class="residentsearch">
-    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-        <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
-    <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" type="text" />
-    <input value="Submit" class="submit" type="submit" />
-    </form>
-    </div>
-        <div id="renew_search" class="residentsearch">
-            <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-                <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
-                <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
-                <input value="Submit" class="submit" type="submit" />
-            </form>
-        </div>
-    [% END %]
-
+    [% INCLUDE 'checkin-search-box.inc' %]
+    [% INCLUDE 'renew-search-box.inc' %]
     [% INCLUDE 'catalogue-search-box.inc' %]
 
     <ul>
-        <li><a class="keep_text" href="#patron_search">Search patrons</a></li>
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
-        [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
+        <li><a title="Search patrons" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
     </ul>
 </div><!-- /header_search -->
-</div><!-- /gradient -->
-<!-- End Patrons Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc

@@ -1,34 +1,28 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Admin Resident Search Box -->
-<div id="header_search">
-	<div id="patron_category_search" class="residentsearch">
-	<form action="[% script_name | html %]" method="post">
-        <label class="tip" for="description">Search by patron category name:</label>
-        <input class="head-searchbox" type="text" name="description" size="40" value="[% searchfield | html %]" />
-		<input type="submit" class="submit" name="search" value="Search" />
-	</form>	
-	</div>
+<div id="header_search" class="navbar-form navbar-left">
+
+    <div id="patron_category_search" class="residentsearch">
+        <form action="[% script_name | html %]" method="post">
+            <span class="form-title">
+                <label class="control-label">Search patron categories</label>
+            </span>
+
+            <span class="form-content">
+                <input class="head-searchbox form-control" type="text" name="description" value="[% searchfield | html %]" placeholder="Search by patron category name" />
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
+
     [% INCLUDE 'patron-search-box.inc' %]
-	[% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-                [% INCLUDE 'search_indexes.inc' %]
-            [% ELSE %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-            [% END %]
-            <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
-				<input type="submit" value="Submit"  class="submit" />
-		</form>
-	</div>[% END %]
 
-	<ul>
-            <li><a class="keep_text" href="#patron_category_search">Search patron categories</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-			</ul>	
-</div>
+    [% INCLUDE 'catalogue-search-box.inc' %]
+
+    <ul>
+        <li><a title="Search patron categories" href="#patron_category_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
 </div>
 <!-- End Patrons Admin Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc

@@ -1,22 +1,29 @@
-[% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div>
-<div id="header_search">
-	<div id="syspref_search" class="residentsearch">
-	    <form action="/cgi-bin/koha/admin/preferences.pl">
-            <label class="tip" for="searchfield">System preference search:</label>
-        <input type="hidden" name="tab" value="[% last_tab | html %]" />
-        <input type="hidden" name="op" value="search" />
-        <input class="head-searchbox" type="text" size="40" name="searchfield" id="searchfield" value="">
-        <input type="submit" class="submit" value="Search" />
-    </form>
-	</div>
+<div id="header_search" class="navbar-form navbar-left">
+    <div id="syspref_search" class="residentsearch">
+        <form action="/cgi-bin/koha/admin/preferences.pl">
+            <input type="hidden" name="tab" value="[% last_tab | html %]" />
+            <input type="hidden" name="op" value="search" />
+
+            <span class="form-title">
+                <label class="control-label">Search system preferences</label>
+            </span>
+
+            <span class="form-content">
+                <input class="head-searchbox form-control" type="text" name="searchfield" id="searchfield" value="" placeholder="System preference search">
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
+
     [% INCLUDE 'patron-search-box.inc' %]
+
     [% INCLUDE 'catalogue-search-box.inc' %]
-			<ul>
-            <li><a class="keep_text" href="#syspref_search">Search system preferences</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-			</ul>
-</div>
-</div>
+
+    <ul>
+        <li><a title="Search system preferences" href="#syspref_search"><i class="fa fa-fw fa-cogs"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
+</div><!-- /header_search -->
+<!-- End Main page Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/renew-search-box.inc

@@ -0,0 +1,13 @@
+[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
+    <div id="renew_search" class="residentsearch">
+        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
+            <span class="form-title">
+                <label class="control-label">Renew</label>
+            </span>
+            <span class="form-content">
+                <input name="barcode" id="ren_barcode" class="head-searchbox form-control" accesskey="r" type="text" placeholder="Scan a barcode to renew" size="40"/>
+            </span>
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
+    </div>
+[% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc

@@ -1,30 +1,39 @@
 [% USE Koha %]
-<div class="gradient">
-  <div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Serials Resident Search Box -->
-  <div id="header_search">
+<!-- Begin Main page Resident Search Box -->
+
+<div id="header_search" class="navbar-form navbar-left">
     <div id="subscription_search" class="residentsearch">
-    <p class="tip">Search subscriptions:</p>
-    <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
-      [% IF ( routing ) %]
-        <input type="hidden" name="routing" value="[% routing | html %]" />
-      [% END %]
-      <input type="hidden" name="searched" value="1" />
-      <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" />
-
-      [% IF (UNIMARC) %]
-        <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" />
-      [% END %]
-      <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" />
-      <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/serials/serials-search.pl">Advanced search</a>
-    </form>
+        <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
+            [% IF ( routing ) %]
+            <input type="hidden" name="routing" value="[% routing | html %]" />
+            [% END %]
+            <input type="hidden" name="searched" value="1" />
+
+            <span class="form-title">
+                <label class="control-label">Search subscriptions</label>
+            </span>
+
+            <span class="form-content">
+                <input type="text" class="form-control" placeholder="ISSN" size="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" />
+
+                [% IF (UNIMARC) %]
+                    <input type="text" class="form-control" placeholder="EAN" size="11" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" />
+                [% END %]
+
+                <input type="text" class="form-control" placeholder="Title" size="11" name="title_filter" id="title_filter" value="[% title_filter | html %]" />
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
+        </form>
     </div>
+
     [% INCLUDE 'patron-search-box.inc' %]
     [% INCLUDE 'catalogue-search-box.inc' %]
+
     <ul>
-      <li><a href="#subscription_search">Search subscriptions</a></li>
-      [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-      [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
+        <li><a title="Search subscriptions" href="#subscription_search"><i class="fa fa-book"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
     </ul>
-  </div><!-- /header_search -->
-</div><!-- /gradient -->
+</div><!-- /header_search -->
 <!-- End Serials Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc

@@ -0,0 +1,7 @@
+<nav id="shortcut" class="shortcut">
+    [% IF Koha.Preference('showLastPatron') %]
+        [% INCLUDE 'last-borrower.inc' %]
+    [% END %]
+
+    <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
+</nav>

koha-tmpl/intranet-tmpl/prog/en/includes/sub-header.inc

@@ -0,0 +1,5 @@
+[% USE raw %]
+<div id="sub-header">
+    [% content | $raw %]
+    [% INCLUDE 'shortcut.inc' %]
+</div>

koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc

@@ -1,26 +1,31 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Suggestions Resident Search Box -->
-<div id="header_search">
-	<div id="suggestions_search" class="residentsearch">
-    <p class="tip">Suggestions search:</p>
-	<form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
-    <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
-	<label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" size="10" value="[% title | html %]" />
-    <label for="searchauthor">Author:</label> <input type="text" id="searchauthor" name="author" size="10" value="[% author | html %]" />
-    <label for="searchpublishercode">Publisher:</label> <input type="text" id="searchpublishercode" name="publishercode" size="10" value="[% publishercode | html %]" />
-    <input type="submit" class="submit" value="Search" />
+<div id="header_search" class="navbar-form navbar-left">
+
+    <div id="suggestions_search" class="residentsearch">
+        <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
+            <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
+            <span class="form-title">
+                <label class="control-label">Search suggestions</label>
+            </span>
+
+            <span class="form-content">
+                <input type="text" id="searchtitle" class="head-searchbox form-control" placeholder="Title" name="title" size="10" value="[% title | html %]" />
+                <input type="text" id="searchauthor" class="head-searchbox form-control" placeholder="Author"  name="author" size="10" value="[% author | html %]" />
+                <input type="text" class="head-searchbox form-control" placeholder="Publisher" id="searchpublishercode" name="publishercode" size="10" value="[% publishercode | html %]" />
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
         </form>
-	</div>
+    </div>
 
     [% INCLUDE 'patron-search-box.inc' %]
+
     [% INCLUDE 'catalogue-search-box.inc' %]
 
-			<ul>
-            <li><a href="#suggestions_search">Search suggestions</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-            </ul>
+    <ul>
+        <li><a title="Search suggestions" href="#suggestions_search"><i class="fa fa-comment-o"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
 </div>
-</div><!-- /gradient -->
 <!-- End Suggestions Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc

@@ -1,23 +1,28 @@
 [% USE Koha %]
-<div class="gradient">
-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin z3950 Admin Resident Search Box -->
-<div id="header_search">
+<div id="header_search" class="navbar-form navbar-left">
+
     <div id="z3950_search" class="residentsearch">
-	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
-        <label class="tip" for="searchfield">Z39.50/SRU server search:</label>
-                <input class="head-searchbox" type="text" name="searchfield" id="searchfield" size="40" value="[% searchfield | html %]" />
-                <input type="submit" class="submit" name="search" value="Search" />
+        <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
+            <span class="form-title">
+                <label class="control-label">Search Z39.50/SRU servers</label>
+            </span>
+
+            <span class="form-content">
+                <input class="head-searchbox form-control" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search" />
+            </span>
+
+            <button type="submit"><i class="fa fa-arrow-right"></i></button>
         </form>
-	</div>
+    </div>
 
     [% INCLUDE 'patron-search-box.inc' %]
+
     [% INCLUDE 'catalogue-search-box.inc' %]
 
-			<ul>
-            <li><a class="keep_text" href="#z3950_search">Search Z39.50/SRU servers</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-			</ul>	
-</div>
+    <ul>
+        <li><a title="Search Z39.50/SRU servers" href="#z3950_search"><i style="font-weight:bold">Z39.50</i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><li><a title="Check out" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+    </ul>
 </div>
 <!-- End Members Resident Search Box -->

koha-tmpl/intranet-tmpl/prog/en/modules/about.tt

@@ -10,16 +10,18 @@
 [% INCLUDE 'header.inc' %]
 [% PROCESS 'about-team.inc' %]
 
+[% WRAPPER 'sub-header.inc' %]
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
         <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="#" aria-current="page">About Koha</a>
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt

@@ -11,19 +11,22 @@
 </head>
 
 <body id="acq_acqui-home" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="#" aria-current="page">Acquisitions</a>
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt

@@ -23,13 +23,15 @@
 </head>
 
 <body id="acq_addorderiso2709" class="acq">
-    [% INCLUDE 'header.inc' %]
+[% WRAPPER 'header.inc' %]
     [% INCLUDE 'acquisitions-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>
+                <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
             </li>
             <li>
                 <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -45,6 +47,7 @@
             </li>
         </ol>
     </nav>
+    [% END %]
 
     <div class="container-fluid">
         <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt

@@ -31,13 +31,15 @@
 </head>
 
 <body id="acq_basket" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -63,6 +65,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt

@@ -86,19 +86,21 @@
 
 </head>
 <body id="acq_basketgroup" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
         </li>
 
-[% IF ( grouping ) %]
+    [% IF ( grouping ) %]
         <li>
             <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
         </li>
@@ -110,10 +112,8 @@
                 Add basket group for [% booksellername | html %]
             </a>
         </li>
-    </ol>
-</nav>
 
-[% ELSE %]
+    [% ELSE %]
         <li>
             <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
         </li>
@@ -122,6 +122,7 @@
                 Basket grouping
             </a>
         </li>
+    [% END %]
     </ol>
 </nav>
 [% END %]

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt

@@ -15,13 +15,15 @@
 </head>
 
 <body id="acq_basketheader" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -46,6 +48,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt

@@ -15,13 +15,15 @@
 </head>
 
 <body id="acq_booksellers" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -33,6 +35,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt

@@ -6,10 +6,11 @@
 <body id="acq_cancelorder" class="acq">
 [% INCLUDE 'header.inc' %]
 
+[% WRAPPER 'sub-header.inc' %]
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
         <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -24,6 +25,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt

@@ -18,13 +18,15 @@ Acquisitions › Koha
 
 <body id="acq_duplicate_orders" class="acq">
 
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -44,6 +46,7 @@ Acquisitions &rsaquo; Koha
     [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt

@@ -4,13 +4,15 @@
 
 </head>
 <body id="acq_edi_ean" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -20,6 +22,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt

@@ -11,12 +11,14 @@
 </head>
 
 <body id="acq_edifactmsgs" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -26,6 +28,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt

@@ -1,16 +1,19 @@
+
 [% INCLUDE 'doc-head-open.inc' %]
 <title>EDIFACT message display &rsaquo; Acquisitions &rsaquo; Koha</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="acq_edifactmsgs" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -20,6 +23,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt

@@ -10,13 +10,15 @@
 </head>
 
 <body id="acq_histsearch" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -40,6 +42,7 @@
     [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt

@@ -8,14 +8,16 @@
 </head>
 
 <body id="acq_invoice_files" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -31,6 +33,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt

@@ -12,16 +12,18 @@
 </head>
 
 <body id="acq_invoice" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-search.inc' %]
+[% END %]
 
 [% SET readonly = NOT CAN_user_acquisition_edit_invoices %]
 
 
+[% WRAPPER 'sub-header.inc' %]
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
         <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -34,6 +36,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt

@@ -10,14 +10,16 @@
 </head>
 
 <body id="acq_invoices" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -27,6 +29,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt

@@ -11,14 +11,16 @@
 </head>
 
 <body id="acq_lateorders" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -28,6 +30,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt

@@ -12,10 +12,11 @@
 [% INCLUDE 'header.inc' %]
 
 
+[% WRAPPER 'sub-header.inc' %]
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
         <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a>
@@ -33,6 +34,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt

@@ -12,13 +12,15 @@
 
 <body id="acq_neworderempty" class="acq">
 
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -45,6 +47,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 [% INCLUDE 'blocking_errors.inc' %]
 

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt

@@ -1,17 +1,21 @@
+
+
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Duplicate warning &rsaquo; Basket [% basketno | html %] &rsaquo; Acquisitions &rsaquo; Koha</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="acq_neworderempty_duplicate" class="acq">
 
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -26,6 +30,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt

@@ -11,13 +11,15 @@
 </head>
 
 <body id="acq_newordersubscription" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -35,6 +37,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt

@@ -10,13 +10,15 @@
 </head>
 
 <body id="acq_newordersuggestion" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'suggestions-add-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'suggestions-add-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -34,6 +36,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt

@@ -11,14 +11,16 @@
 </head>
 
 <body id="acq_ordered" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -30,6 +32,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt

@@ -13,13 +13,15 @@
 </head>
 
 <body id="acq_orderreceive" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -36,6 +38,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt

@@ -18,13 +18,15 @@
 </head>
 
 <body id="acq_parcel" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -46,6 +48,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 
 <div class="main container-fluid">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt

@@ -8,13 +8,15 @@
 </head>
 
 <body id="acq_parcels" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -29,6 +31,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt

@@ -11,14 +11,16 @@
 </head>
 
 <body id="acq_spent" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -30,6 +32,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt

@@ -94,13 +94,15 @@
 </head>
 
 <body id="acq_supplier" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -131,6 +133,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt

@@ -9,13 +9,15 @@
 </head>
 
 <body id="acq_uncertainprice" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -38,6 +40,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt

@@ -40,13 +40,15 @@ tr.selected td {
 </head>
 
 <body id="acq_z3950_search" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'acquisitions-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'acquisitions-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -75,6 +77,7 @@ tr.selected td {
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
       [% IF ( opsearch ) %]

koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt

@@ -17,13 +17,15 @@
 [% show_searchable = searchable_tables.grep('^' _ tablename _ '$').size ? 1 : 0 %]
 
 <body id="ser_add_fields" class="ser">
-    [% INCLUDE 'header.inc' %]
+    [% WRAPPER 'header.inc' %]
     [% INCLUDE 'cat-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>
+                <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
             </li>
             <li>
                 <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -67,6 +69,7 @@
             [% END %]
         </ol>
     </nav>
+    [% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt

@@ -5,13 +5,15 @@
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="admin_admin-home" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="#" aria-current="page">
@@ -20,6 +22,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt

@@ -7,14 +7,16 @@
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="adveditor_shortcuts" class="admin">
-    [% INCLUDE 'header.inc' %]
+    [% WRAPPER 'header.inc' %]
     [% INCLUDE 'prefs-admin-search.inc' %]
+[% END %]
     [% PROCESS 'keyboard_shortcuts.inc' %]
 
+[% WRAPPER 'sub-header.inc' %]
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
         <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -24,6 +26,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt

@@ -72,17 +72,15 @@
 
 <body id="admin_aqbudgetperiods" class="admin">
 
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'budgets-admin-search.inc' %]
-
-<!-- ################################################################################# -->
-<!-- BREADCRUMBS -->
-<!-- ################################################################################# -->
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'budgets-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -168,6 +166,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt

@@ -12,13 +12,15 @@
 </head>
 
 <body id="admin_aqbudgets" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'budgets-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'budgets-admin-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>
+        <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
     </li>
     <li>
         <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -75,6 +77,7 @@
     [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt

@@ -18,13 +18,15 @@
 </head>
 
 <body id="acq_aqcontract" class="acq">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'contracts-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'contracts-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
@@ -94,6 +96,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt

@@ -10,13 +10,15 @@
 </head>
 
 <body id="admin_aqplan" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'budgets-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'budgets-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -32,6 +34,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt

@@ -8,13 +8,15 @@
 </head>
 
 <body id="admin_audio_alerts" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -26,6 +28,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt

@@ -7,13 +7,15 @@
 </head>
 
 <body id="admin_auth_subfields_structure" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -71,6 +73,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt

@@ -38,13 +38,15 @@ Authority MARC framework › Administration › Koha
 </head>
 
 <body id="admin_auth_tag_structure" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -159,6 +161,7 @@ Authority MARC framework &rsaquo; Administration &rsaquo; Koha
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt

@@ -38,13 +38,15 @@
 </head>
 
 <body id="admin_authorised_values" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -95,6 +97,7 @@
         [% END # /IF op == 'add_form' %]
     </ol>
 </nav> <!-- /#breadcrumbs -->
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt

@@ -16,13 +16,15 @@ Authority types › Administration › Koha
 </head>
 
 <body id="admin_authtypes" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -59,6 +61,7 @@ Authority types &rsaquo; Administration &rsaquo; Koha
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt

@@ -16,13 +16,15 @@
 </head>
 
 <body id="admin_background_jobs" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
 
     [% IF CAN_user_parameters_manage_background_jobs %]
@@ -48,6 +50,7 @@
     [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt

@@ -16,13 +16,15 @@ MARC frameworks › Administration › Koha
 </head>
 
     <body id="admin_biblio_framework" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -65,6 +67,7 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt

@@ -9,13 +9,15 @@
 </head>
 
 <body id="admin_branch_transfer_limits" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -27,6 +29,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt

@@ -20,13 +20,15 @@ Libraries › Administration › Koha
 </head>
 
 <body id="admin_branches" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -79,6 +81,7 @@ Libraries &rsaquo; Administration &rsaquo; Koha
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt

@@ -18,13 +18,15 @@ Cash registers › Administration › Koha
 </head>
 
 <body id="admin_cash_registers" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -66,6 +68,7 @@ Cash registers &rsaquo; Administration &rsaquo; Koha
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt

@@ -31,13 +31,15 @@
 </head>
 
 <body id="admin_categorie" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'patrons-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'patrons-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -101,6 +103,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt

@@ -7,13 +7,15 @@
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="admin_checkmarc" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -30,6 +32,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt

@@ -19,13 +19,15 @@
 </head>
 
 <body id="admin_cities" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'cities-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'cities-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -64,6 +66,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt

@@ -33,13 +33,15 @@ Classification sources › Administration › Koha
 </head>
 
 <body id="admin_classsources" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -97,6 +99,7 @@ Classification sources &rsaquo; Administration &rsaquo; Koha
 
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt

@@ -7,13 +7,15 @@
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="admin_clone-rules" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -28,6 +30,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt

@@ -174,12 +174,14 @@
 
 <body id="admin_tables" class="admin">
 
-    [% INCLUDE 'header.inc' %]
+    [% WRAPPER 'header.inc' %]
     [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -191,6 +193,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
     <div class="main container-fluid">
         <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt

@@ -19,13 +19,15 @@
 </head>
 
 <body id="admin_credit_types" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -54,6 +56,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt

@@ -13,13 +13,15 @@
 </head>
 
 <body id="admin_currency" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'currencies-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'currencies-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -56,6 +58,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt

@@ -17,13 +17,15 @@
 </head>
 
 <body id="admin_debit_types" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -52,6 +54,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt

@@ -19,13 +19,15 @@
 </head>
 
 <body id="admin_desks" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'desks-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'desks-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -64,6 +66,7 @@
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt

@@ -28,13 +28,15 @@
 </head>
 
 <body id="admin_didyoumean" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -46,6 +48,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt

@@ -17,13 +17,15 @@ EDI accounts › Administration › Koha
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="admin_edi_acct" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -66,6 +68,7 @@ EDI accounts &rsaquo; Administration &rsaquo; Koha
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt

@@ -16,13 +16,15 @@ Library EANs › Administration › Koha
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="admin_edi_ean" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -61,6 +63,7 @@ Library EANs &rsaquo; Administration &rsaquo; Koha
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt

@@ -45,13 +45,15 @@
 </head>
 
 <body id="admin_item_circulation_alerts" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -63,6 +65,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt

@@ -7,13 +7,15 @@
   [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="admin_itemssearchfields" class="admin">
-  [% INCLUDE 'header.inc' %]
-  [% INCLUDE 'prefs-admin-search.inc' %]
+  [% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+                <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
             </li>
             <li>
                 <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -38,6 +40,7 @@
             [% END %]
         </ol>
     </nav>
+    [% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt

@@ -8,13 +8,15 @@
 </head>
 
 <body id="admin_itemssearchfields" class="admin">
-  [% INCLUDE 'header.inc' %]
-  [% INCLUDE 'prefs-admin-search.inc' %]
+  [% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -26,6 +28,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt

@@ -47,13 +47,15 @@ Item types › Administration › Koha
 </head>
 
 <body id="admin_itemtypes" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -117,6 +119,7 @@ Item types &rsaquo; Administration &rsaquo; Koha
         [% END %]
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt

@@ -7,13 +7,15 @@
 </head>
 
 <body id="admin_koha2marclinks" class="admin">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'prefs-admin-search.inc' %]
+[% WRAPPER 'header.inc' %]
+    [% INCLUDE 'prefs-admin-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>
+            <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a>
         </li>
         <li>
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
@@ -23,6 +25,7 @@
         </li>
     </ol>
 </nav>
+[% END %]
 
 <div class="main container-fluid">
     <div class="row">