]> git.koha-community.org Git - koha.git/commit
Bug 11179: (follow-up) apply fix to Boostrap theme
authorOwen Leonard <oleonard@myacpl.org>
Thu, 14 Nov 2013 20:41:02 +0000 (15:41 -0500)
committerFridolin Somers <fridolin.somers@biblibre.com>
Mon, 27 Jan 2014 12:55:03 +0000 (13:55 +0100)
commit29a4167ee81e1548469510544cfabf706b008b44
tree1f77b9d3d6630eed126b1bb89feadca51e9bd50c
parent0d87d93b283adbc2973c5c722c542bb6c1d23045
Bug 11179: (follow-up) apply fix to Boostrap theme

This follow-up applies the same fix to the Bootstrap theme. This patch
also includes the changes to item-status.inc in the Bootstrap theme
which were made to the prog theme in Bug 10820: display item status as
lost if item is both lost and on loan.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Bootstrap theme looking so nice. Also the patch works.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 78b73c3fffc6f5125a688e91582da92287fbbef2)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Conflicts:
koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt