Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 9627 - Replace YUI buttons and menus on serials pages with Bootstrap

Browse source 
This patch converts the toolbar include file used by Serials pages to
Bootstrap, replacing YUI button and menu code with Bootstrap markup.

To test, view any page in serials/ which uses serials-toolbar.inc
(subscription-detail.pl, serials-home.pl, etc).
Buttons and menus should look correct and work correctly, including:

- New subscription
- Edit subscription
- Edit as new (duplicate)
- Delete subscription
- Renew
- Receive
- Close

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described. No errors.
For me it would be better to use icon-remove, because icon-remove-circle
shows a little cross, think that a bigger cross is more clear.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
I think there is a point in differentiating between closing and deleting,
so the icon-remove-circle is maybe not ideal, but the icon-remove
would falsely indicate a delete. Maybe we can find another icon that
expresses the functionality a bit better later on.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This commit is contained in:
Owen Leonard 2013-01-31 09:39:38 -05:00 committed by Jared Camins-Esakov
parent 2774064e94
commit aa3ff32c9d
1 changed files with 40 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
View file

@ -1,4 +1,4 @@
<div id="toolbar"><script type="text/javascript">
<script type="text/javascript">
//<![CDATA[
function confirm_close() {
@ -13,68 +13,34 @@
window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=reopen";
}
}
// prepare DOM for YUI Toolbar
$(document).ready(function() {
$("#editmenuc").empty();
$("#duplicate").parent().remove();
$("#delete").parent().remove();
$("#renewc").empty();
yuiToolbar();
$("#deletesub").click(function(){
confirm_deletion();
return false;
});
$("#reopen").click(function(){
confirm_reopen();
return false;
});
$("#close").click(function(){
confirm_close();
return false;
});
$("#renew").click(function(){
popup([% subscriptionid %]);
return false;
})
});
// YUI Toolbar Functions
function yuiToolbar() {
[% IF ( subscriptionid ) %]
var editmenu = [
[% IF ( CAN_user_serials_edit_subscription ) %]
{ text: _("Edit subscription"), [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]" },
[% END %]
[% IF ( CAN_user_serials_create_subscription ) %]
{ text: _("Edit as new (duplicate)"), [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]" },
[% END %]
[% IF ( CAN_user_serials_delete_subscription ) %]
{ text: _("Delete subscription"), [% IF ( cannotedit ) %]disabled: true, [% END %] onclick: {fn: confirm_deletion }}
[% END %]
];
[% END %]
new YAHOO.widget.Button("newsubscription");
[% IF ( subscriptionid ) %]
new YAHOO.widget.Button({
id: "renew",
type: "link",
href: "#",
label: _("Renew"),
container: "renewc",
onclick: {fn:function(){popup([% subscriptionid %])}}
});
[% IF ( subscriptionid ) %]
new YAHOO.widget.Button({
type: "menu",
label: _("Edit"),
name: "editmenubutton",
menu: editmenu,
container: "editmenuc"
});
[% END %]
new YAHOO.widget.Button("renew");
new YAHOO.widget.Button("receive");
new YAHOO.widget.Button("close");
new YAHOO.widget.Button("reopen");
[% END %]
}
//]]>
</script>
<ul class="toolbar">
<div id="toolbar" class="btn-toolbar">
[% IF ( CAN_user_serials_create_subscription ) %]
[% IF ( biblionumber_for_new_subscription ) %]
<li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]">New subscription</a></li>
<div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="icon-plus"></i> New subscription</a></div>
[% ELSE %]
<li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl">New subscription</a></li>
<div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="icon-plus"></i> New subscription</a></div>
[% END %]
[% END %]
@ -83,37 +49,43 @@ onclick: {fn:function(){popup([% subscriptionid %])}}
[% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
[% UNLESS ( cannotedit ) %]
<li id="editmenuc"><a id="edit" href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]">Edit</a></li>
<div class="btn-group">
<button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-pencil"></i> Edit <span class="caret"></span></button>
<ul class="dropdown-menu">
[% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
<li> [% END %]
<a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]">Edit subscription</a></li>
[% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
<li> [% END %]
<a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]">Edit as new (duplicate)</a></li>
[% IF ( CAN_user_serials_delete_subscription ) %]
[% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
<li> [% END %]
<a href="#" id="deletesub">Delete subscription</a></li>[% END %]
</ul>
</div>
[% END %]
[% END %]
[% IF ( CAN_user_serials_create_subscription ) %]
<li><a id="duplicate" href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]">Duplicate </a></li>
[% END %]
[% UNLESS ( cannotedit ) %]
[% UNLESS closed %]
[% IF ( CAN_user_serials_renew_subscription ) %]
<li id="renewc"><a id="renew" href="#" onclick="popup([% subscriptionid %])">Renew </a></li>
<div class="btn-group"><a id="renew" class="btn btn-small" href="#" onclick="popup([% subscriptionid %])"><i class="icon-refresh"></i> Renew</a></div>
[% END %]
[% END %]
[% IF ( CAN_user_serials_receive_serials ) %]
[% UNLESS closed %]
<li><a id="receive" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&amp;serstatus=1,3">Receive</a></li>
<div class="btn-group"><a id="receive" class="btn btn-small" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&amp;serstatus=1,3"><i class="icon-inbox"></i> Receive</a></div>
[% END %]
[% END %]
[% IF CAN_user_serials_edit_subscription %]
[% IF closed %]
<li><a id="reopen" href="javascript:confirm_reopen();">Reopen</a></li>
<div class="btn-group"><a id="reopen" class="btn btn-small" href="#">Reopen</a></div>
[% ELSE %]
<li><a id="close" href="javascript:confirm_close();">Close</a></li>
<div class="btn-group"><a id="close" class="btn btn-small" href="#"><i class="icon-remove-circle"></i> Close</a></div>
[% END %]
[% END %]
[% IF ( CAN_user_serials_delete_subscription ) %]
<li><a id="delete" href="javascript:confirm_deletion()">Delete</a></li>
[% END %]
[% END %]
[% END %]
[% END %]
</ul>
</div>