[Koha-patches] [PATCH] Bug 9616 - Replace YUI menu on patrons page with Bootstrap
Owen Leonard
oleonard at myacpl.org
Fri Feb 15 15:41:49 CET 2013
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 ) %]
-<div id="toolbar">
- <script type="text/javascript">
- //<![CDATA[
-
- // prepare DOM for YUI Toolbar
-
- $(document).ready(function() {
-[% IF ( AddPatronLists_categorycode ) %]
-[% ELSE %]
- $("#addchild").parent().remove();
- $("#addprofessional").parent().remove();
- $("#addorganisation").parent().remove();
- $("#addstaff").parent().remove();
- $("#addstatistical").parent().remove();
-[% END %]
- $("#newmenuc").empty();
- yuiToolbar();
- });
-
- // YUI Toolbar Functions
-
- function yuiToolbar() {
-
- var newmenu = [
-[% IF ( AddPatronLists_categorycode ) %]
-[% FOREACH categorie IN categories %]
-{ text: "[% categorie.description %]", url: "/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% categorie.categorycode %]" },
-[% END %]
-[% ELSE %]
- { text: _("Adult patron"), url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A" },
- { text: _("Child patron"), url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C" },
- { text: _("Professional patron"), url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P" },
- { text: _("Organization"), url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I" },
- { text: _("Staff"), url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=S" },
- { text: _("Statistical"), url: "/cgi-bin/koha/members/memberentry.pl?op=add&category_type=X" },
-[% END %]
- ]
-
- new YAHOO.widget.Button({
- type: "menu",
- label: _("New patron"),
- name: "newmenubutton",
- menu: newmenu,
- container: "newmenuc"
- });
-
- }
-
- //]]>
- </script>
- <ul class="toolbar">
- <li id="newmenuc">
- <form action="/cgi-bin/koha/members/memberentry.pl" method="get">
- <input type="hidden" name="op" value="add" />
- <label for="newcategorycode">New patron: </label><select name="categorycode" id="newcategorycode">
- [% IF ( AddPatronLists_categorycode ) %]
- [% FOREACH categorie IN categories %]<option value="[% categorie.categorycode %]">[% categorie.description %]</option>[% END %]
- [% ELSE %]
- <option value="A">Adult patron</option>
- <option value="C">Child patron</option>
- <option value="P">Professional patron</option>
- <option value="I">Organization</option>
- <option value="S">Staff</option>
- <option value="X">Statistical</option>
- [% END %]
- </select>
- <input type="submit" class="submit" value="Go" />
- </form>
- </li>
-</ul>
+<div id="toolbar" class="btn-toolbar">
+ <div class="btn-group">
+ <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New patron <span class="caret"></span></button>
+ <ul class="dropdown-menu">
+ [% IF ( AddPatronLists_categorycode ) %]
+ [% FOREACH categorie IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% categorie.categorycode %]">[% categorie.description %]</a></li>[% END %]
+ [% ELSE %]
+ <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A">Adult patron</a></li>
+ <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C">Child patron</a></li>
+ <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P">Professional patron</a></li>
+ <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I">Organization</a></li>
+ <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=S">Staff patron</a></li>
+ <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=X">Statistical patron</a></li>
+ [% END %]
+ </ul>
+ </div>
</div>
[% END %]
\ No newline at end of file
--
1.7.9.5
More information about the Koha-patches
mailing list