From 498a5581aa232c2ee1f191f5210a182141f25cfd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 31 Jan 2013 10:36:20 -0500 Subject: [PATCH] Bug 9616 - Replace YUI menu on patrons page with Bootstrap Content-Type: text/plain; charset="utf-8" This patch converts the toolbar include file used to create the "New patron" menu to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any page which uses patron-toolbar.inc (members-home.pl or circulation.pl after searching for a non-existent patron). Button and menu should look correct and work correctly with the AddPatronLists preference in both states. --- .../intranet-tmpl/prog/en/css/staff-global.css | 8 +- .../prog/en/includes/patron-toolbar.inc | 86 ++++---------------- 2 files changed, 17 insertions(+), 77 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index c0b759c..eac01f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -2401,7 +2401,6 @@ video { border-color : #ADADAD #ADADAD #949494; } -<<<<<<< HEAD .btn-small .caret { margin-top : .6em; @@ -2415,8 +2414,6 @@ video { background-position:-3px -166px; } -======= ->>>>>>> Bug 9420 [Revised] Work on Bootstrap for Koha #toolbar .btn, #toolbar .dropdown-menu { font-size: 13px; @@ -2428,11 +2425,8 @@ a.btn:visited{ .dropdown-menu li { list-style: none outside none; } -<<<<<<< HEAD + [class^="icon-"],[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings-koha.png");} -======= -[class^="icon-"],[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings.png");} ->>>>>>> Bug 9420 [Revised] Work on Bootstrap for Koha .icon-white,.nav-tabs>.active>a>[class^="icon-"],.nav-tabs>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings-white.png");} a.disabled { color : #999999; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc index 4a9b715..374d388 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc @@ -1,73 +1,19 @@ [% UNLESS ( no_add ) %] -
- - +
+
+ + +
[% END %] \ No newline at end of file -- 1.7.9.5