@@ -, +, @@ pages - In Patrons, perform any search which will return multiple results. Confirm that the "select all" and "clear all" links work as expected. Font Awesome icons have been added to these links. In the left-hand sidebar, change any of the filters and click the "Clear" button. The form (and your search results) should reset. - Open the 'Set permissions' page for any patron. Checking any permission with sub-permissions should correctly expand the tree and select all sub-permissions. The reverse should also work. Also changed in this file: The "Inconsistency detected" alert has been reformatted to make it translatable. - View the detail page for a patron with one or more restrictions. Clicking the "View restrictions" link at the top of the page should jump you to and activate the restrictions tab. - View the 'Notices' tab for a patron who has been sent one or more notices. Click any notice title to expand the notice. Clicking the "resend" button should resend the notice. - Create a new patron with the same first and last name as an existing patron. This should trigger a duplicate warning message. Click the "View existing record" link to trigger a pop-up window with a patron detail brief view. In this window an "email" class has been added to the primary and secondary email lines so that long email addresses don't overlap the second column of data. Confirm that clicking the "close" button in this window closes the window. The changes to staff-global.css are included in this patch to prevent the close button from having an incorrect color change on hover. --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 6 +++++- .../prog/en/modules/members/member-flags.tt | 23 ++++++++++++++-------- .../prog/en/modules/members/member.tt | 18 ++++++++++++++--- .../prog/en/modules/members/moremember-brief.tt | 6 +++--- .../prog/en/modules/members/moremember.tt | 5 ++++- .../prog/en/modules/members/notices.tt | 4 +++- 6 files changed, 45 insertions(+), 17 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -2427,12 +2427,16 @@ a.disabled { } .close:hover { - color: #538200; + color: inherit; filter: inherit; font-size: inherit; opacity: inherit; } +a.close:hover { + color: #538200; +} + /* Redefine a new style for Bootstrap's class "close" since we use that already */ /* Use × */ .alert .closebtn{position:relative;top:-2px;right:-21px;line-height:20px;} --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt @@ -12,7 +12,7 @@ // Enforce Superlibrarian Privilege Mutual Exclusivity if($('input[id="flag-0"]:checked').length){ if ($('input[name="flag"]:checked').length > 1){ - alert('Inconsistency Detected!\n\nThe superlibrarian privilege is mutually exclusive of other privileges, as it includes them all.\n\nThis patron\'s privileges will now be reset to include only superlibrarian.'); + alert(_("Inconsistency detected! The superlibrarian privilege is mutually exclusive of other privileges, as it includes them all. This patron's privileges will now be reset to include only superlibrarian.")); } $('input[name="flag"]').each(function() { @@ -39,10 +39,17 @@ } }); + $(".flag").on("change",function(){ + if( $(this).hasClass("parent") ){ + toggleChildren(this); + } else { + toggleParent(this); + } + }); + }); - - -