Bugzilla – Attachment 120081 Details for
Bug 13613
Don't allow digest to be selected without a digest-able transport selected
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13613: (follow-up) Add tooltip when disabled
Bug-13613-follow-up-Add-tooltip-when-disabled.patch (text/plain), 8.92 KB, created by
Nick Clemens (kidclamp)
on 2021-04-23 12:21:13 UTC
(
hide
)
Description:
Bug 13613: (follow-up) Add tooltip when disabled
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2021-04-23 12:21:13 UTC
Size:
8.92 KB
patch
obsolete
>From 4d0239fb11218c8a0731acb891a87b7f7140cffd Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 23 Apr 2021 12:20:07 +0000 >Subject: [PATCH] Bug 13613: (follow-up) Add tooltip when disabled > >This patch adds a tooltip to the digest checkboxes when disabled. > >When enabled the tooltip is hidden >--- > .../prog/en/includes/messaging-preference-form.inc | 8 ++++---- > .../intranet-tmpl/prog/js/messaging-preference-form.js | 14 ++++++++------ > .../opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 16 ++++++++-------- > 3 files changed, 20 insertions(+), 18 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc >index 9340384f7c..1d508565d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc >@@ -187,24 +187,24 @@ > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" class="pmp_digest" checked="checked" disabled="disabled" /> >+ name="digest" class="pmp_digest" checked="checked" disabled="disabled" data-toggle="tooltip" title="You must select a digestible transport to select digests" /> > [% ELSE %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" class="pmp_digest" disabled="disabled" /> >+ name="digest" class="pmp_digest" disabled="disabled" data-toggle="tooltip" title="You must select a digestible transport to select digests" /> > [% END %] > [% ELSE %] > [% IF ( messaging_preference.digest ) %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" checked="checked" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ name="digest" checked="checked" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-toggle="tooltip" title="You must select a digestible transport to select digests" /> > [% ELSE %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ name="digest" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-toggle="tooltip" title="You must select a digestible transport to select digests" /> > [% END %] > [% END %] > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js >index 0196d6e1b3..716019b8a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js >@@ -53,9 +53,9 @@ $(document).ready(function(){ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("email","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >- $("#digest"+id).attr("disabled", false); >+ $("#digest"+id).attr("disabled", false).tooltip('disable'); > } else { >- $("#digest"+id).attr("disabled", true).prop("checked",false); >+ $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); > } > }); > >@@ -64,18 +64,20 @@ $(document).ready(function(){ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("email","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >- $("#digest"+id).attr("disabled", false); >+ $("#digest"+id).attr("disabled", false).tooltip('disable'); > } else { >- $("#digest"+id).attr("disabled", true).prop("checked",false); >+ $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); > } > }); > $(".pmp_sms").click(function(){ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("sms","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >- $("#digest"+id).attr("disabled", false); >+ $("#digest"+id).attr("disabled", false).tooltip('disable'); > } else { >- $("#digest"+id).attr("disabled", true).prop("checked",false); >+ $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); > } > }); >+ >+// $('#memberentry_messaging_prefs [data-toggle="tooltip"][disabled]').tooltip(); > }); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >index 1420b2142a..c7ae5ec686 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >@@ -156,9 +156,9 @@ > [% IF ( messaging_preference.has_digest ) %] > <td class="selectcol"> > [% IF ( messaging_preference.digest ) %] >- <input type="checkbox" id="digest[% messaging_preference.message_attribute_id | html %]" value="[% messaging_preference.message_attribute_id | html %]" name="digest" checked="checked" /> >+ <input type="checkbox" id="digest[% messaging_preference.message_attribute_id | html %]" value="[% messaging_preference.message_attribute_id | html %]" name="digest" checked="checked" data-toggle="tooltip" title="You must select a digestible transport to select digests" /> > [% ELSE %] >- <input type="checkbox" id="digest[% messaging_preference.message_attribute_id | html %]" value="[% messaging_preference.message_attribute_id | html %]" name="digest" /> >+ <input type="checkbox" id="digest[% messaging_preference.message_attribute_id | html %]" value="[% messaging_preference.message_attribute_id | html %]" name="digest" data-toggle="tooltip" title="You must select a digestible transport to select digests" /> > [% END %] > </td> > [% ELSE %] >@@ -255,9 +255,9 @@ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("email","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >- $("#digest"+id).attr("disabled", false); >+ $("#digest"+id).attr("disabled", false).tooltip('disable'); > } else { >- $("#digest"+id).attr("disabled", true); >+ $("#digest"+id).attr("disabled", true).tooltip('enable'); > } > }); > >@@ -266,18 +266,18 @@ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("email","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >- $("#digest"+id).attr("disabled", false); >+ $("#digest"+id).attr("disabled", false).tooltip('disable'); > } else { >- $("#digest"+id).attr("disabled", true).prop("checked",false); >+ $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); > } > }); > $(".pmp_sms").click(function(){ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("sms","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >- $("#digest"+id).attr("disabled", false); >+ $("#digest"+id).attr("disabled", false).tooltip('disable'); > } else { >- $("#digest"+id).attr("disabled", true).prop("checked",false); >+ $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); > } > }); > }); >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 13613
:
35471
|
118379
|
118380
|
118381
|
118648
|
118742
|
119331
|
119332
|
119333
|
120081
|
120737
|
120738
|
120739
|
120740
|
120760
|
120838