View | Details | Raw Unified | Return to bug 13613
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc (-12 / +12 lines)
Lines 56-79 Link Here
56
                 <input type="checkbox"
56
                 <input type="checkbox"
57
                 id="sms[% messaging_preference.message_attribute_id | html %]"
57
                 id="sms[% messaging_preference.message_attribute_id | html %]"
58
                 name="[% messaging_preference.message_attribute_id | html %]"
58
                 name="[% messaging_preference.message_attribute_id | html %]"
59
                 value="sms" checked="checked" disabled="disabled" />
59
                 value="sms" class="sms" checked="checked" disabled="disabled" />
60
              [% ELSE %]
60
              [% ELSE %]
61
                 <input type="checkbox"
61
                 <input type="checkbox"
62
                 id="sms[% messaging_preference.message_attribute_id | html %]"
62
                 id="sms[% messaging_preference.message_attribute_id | html %]"
63
                 name="[% messaging_preference.message_attribute_id | html %]"
63
                 name="[% messaging_preference.message_attribute_id | html %]"
64
                 value="sms" disabled="disabled" />
64
                 value="sms" class="sms" disabled="disabled" />
65
              [% END %]
65
              [% END %]
66
          [% ELSE %]
66
          [% ELSE %]
67
              [% IF ( messaging_preference.transports_sms ) %]
67
              [% IF ( messaging_preference.transports_sms ) %]
68
                 <input type="checkbox"
68
                 <input type="checkbox"
69
                 id="sms[% messaging_preference.message_attribute_id | html %]"
69
                 id="sms[% messaging_preference.message_attribute_id | html %]"
70
                 name="[% messaging_preference.message_attribute_id | html %]"
70
                 name="[% messaging_preference.message_attribute_id | html %]"
71
                 value="sms" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
71
                 value="sms" checked="checked" class="sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
72
              [% ELSE %]
72
              [% ELSE %]
73
                 <input type="checkbox"
73
                 <input type="checkbox"
74
                 id="sms[% messaging_preference.message_attribute_id | html %]"
74
                 id="sms[% messaging_preference.message_attribute_id | html %]"
75
                 name="[% messaging_preference.message_attribute_id | html %]"
75
                 name="[% messaging_preference.message_attribute_id | html %]"
76
                 value="sms" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
76
                 value="sms" class="sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
77
              [% END %]
77
              [% END %]
78
          [% END %]
78
          [% END %]
79
          </td>
79
          </td>
Lines 155-178 Link Here
155
                <input type="checkbox"
155
                <input type="checkbox"
156
                   id="email[% messaging_preference.message_attribute_id | html %]"
156
                   id="email[% messaging_preference.message_attribute_id | html %]"
157
                   name="[% messaging_preference.message_attribute_id | html %]"
157
                   name="[% messaging_preference.message_attribute_id | html %]"
158
                   value="email" checked="checked" disabled="disabled" />
158
                   value="email" class="email" checked="checked" disabled="disabled" />
159
              [% ELSE %]
159
              [% ELSE %]
160
                <input type="checkbox"
160
                <input type="checkbox"
161
                   id="email[% messaging_preference.message_attribute_id | html %]"
161
                   id="email[% messaging_preference.message_attribute_id | html %]"
162
                   name="[% messaging_preference.message_attribute_id | html %]"
162
                   name="[% messaging_preference.message_attribute_id | html %]"
163
                   value="email" disabled="disabled" />
163
                   value="email" class="email" disabled="disabled" />
164
              [% END %]
164
              [% END %]
165
          [% ELSE %]
165
          [% ELSE %]
166
              [% IF ( messaging_preference.transports_email ) %]
166
              [% IF ( messaging_preference.transports_email ) %]
167
            <input type="checkbox"
167
            <input type="checkbox"
168
                 id="email[% messaging_preference.message_attribute_id | html %]"
168
                 id="email[% messaging_preference.message_attribute_id | html %]"
169
                 name="[% messaging_preference.message_attribute_id | html %]"
169
                 name="[% messaging_preference.message_attribute_id | html %]"
170
                 value="email" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
170
                 value="email" checked="checked" class="email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
171
              [% ELSE %]
171
              [% ELSE %]
172
            <input type="checkbox"
172
            <input type="checkbox"
173
                 id="email[% messaging_preference.message_attribute_id | html %]"
173
                 id="email[% messaging_preference.message_attribute_id | html %]"
174
                 name="[% messaging_preference.message_attribute_id | html %]"
174
                 name="[% messaging_preference.message_attribute_id | html %]"
175
                 value="email" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
175
                 value="email" class="email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
176
              [% END %]
176
              [% END %]
177
          [% END %]
177
          [% END %]
178
      </td>
178
      </td>
Lines 187-210 Link Here
187
                <input type="checkbox"
187
                <input type="checkbox"
188
                     id="digest[% messaging_preference.message_attribute_id | html %]"
188
                     id="digest[% messaging_preference.message_attribute_id | html %]"
189
                     value="[% messaging_preference.message_attribute_id | html %]"
189
                     value="[% messaging_preference.message_attribute_id | html %]"
190
                     name="digest" checked="checked" disabled="disabled" />
190
                     name="digest" class="digest" checked="checked" disabled="disabled" />
191
              [% ELSE %]
191
              [% ELSE %]
192
                <input type="checkbox"
192
                <input type="checkbox"
193
                     id="digest[% messaging_preference.message_attribute_id | html %]"
193
                     id="digest[% messaging_preference.message_attribute_id | html %]"
194
                     value="[% messaging_preference.message_attribute_id | html %]"
194
                     value="[% messaging_preference.message_attribute_id | html %]"
195
                     name="digest" disabled="disabled" />
195
                     name="digest" class="digest" disabled="disabled" />
196
              [% END %]
196
              [% END %]
197
          [% ELSE %]
197
          [% ELSE %]
198
              [% IF ( messaging_preference.digest ) %]
198
              [% IF ( messaging_preference.digest ) %]
199
                <input type="checkbox"
199
                <input type="checkbox"
200
                     id="digest[% messaging_preference.message_attribute_id | html %]"
200
                     id="digest[% messaging_preference.message_attribute_id | html %]"
201
                     value="[% messaging_preference.message_attribute_id | html %]"
201
                     value="[% messaging_preference.message_attribute_id | html %]"
202
                     name="digest" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
202
                     name="digest" checked="checked" class="digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
203
              [% ELSE %]
203
              [% ELSE %]
204
                <input type="checkbox"
204
                <input type="checkbox"
205
                     id="digest[% messaging_preference.message_attribute_id | html %]"
205
                     id="digest[% messaging_preference.message_attribute_id | html %]"
206
                     value="[% messaging_preference.message_attribute_id | html %]"
206
                     value="[% messaging_preference.message_attribute_id | html %]"
207
                     name="digest" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
207
                     name="digest" class="digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
208
              [% END %]
208
              [% END %]
209
          [% END %]
209
          [% END %]
210
      </td>
210
      </td>
(-)a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js (+31 lines)
Lines 47-50 $(document).ready(function(){ Link Here
47
                });
47
                });
48
        });
48
        });
49
    }
49
    }
50
51
    // At load time, we want digest disabled if no digest using transport is enabled
52
    $("#memberentry_messaging_prefs .email").each(function(){
53
        var rowid = $(this).attr("id");
54
        id = Number(rowid.replace("email",""));
55
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
56
            $("#digest"+id).attr("disabled", false);
57
        } else {
58
            $("#digest"+id).attr("disabled", true).prop("checked",false);
59
        }
60
    });
61
62
    // If user clears all digest using transports for a notice, disable digest checkbox
63
    $(".email").click(function(){
64
        var rowid = $(this).attr("id");
65
        id = Number(rowid.replace("email",""));
66
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
67
            $("#digest"+id).attr("disabled", false);
68
        } else {
69
            $("#digest"+id).attr("disabled", true);
70
        }
71
    });
72
    $(".sms").click(function(){
73
        var rowid = $(this).attr("id");
74
        id = Number(rowid.replace("sms",""));
75
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
76
            $("#digest"+id).attr("disabled", false);
77
        } else {
78
            $("#digest"+id).attr("disabled", true).prop("checked",false);
79
        }
80
    });
50
});
81
});
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-5 / +39 lines)
Lines 89-97 Link Here
89
                                                [% IF ( messaging_preference.transport_sms ) %]
89
                                                [% IF ( messaging_preference.transport_sms ) %]
90
                                                    <td class="selectcol">
90
                                                    <td class="selectcol">
91
                                                        [% IF ( messaging_preference.transports_sms ) %]
91
                                                        [% IF ( messaging_preference.transports_sms ) %]
92
                                                        <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" />
92
                                                        <input type="checkbox" class="sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" />
93
                                                        [% ELSE %]
93
                                                        [% ELSE %]
94
                                                            <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" />
94
                                                            <input type="checkbox" class="sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" />
95
                                                        [% END %]
95
                                                        [% END %]
96
                                                    </td>
96
                                                    </td>
97
                                                [% ELSE %]
97
                                                [% ELSE %]
Lines 103-113 Link Here
103
                                                    <td class="selectcol">
103
                                                    <td class="selectcol">
104
                                                        [% IF ( messaging_preference.transports_phone ) %]
104
                                                        [% IF ( messaging_preference.transports_phone ) %]
105
                                                            <input type="checkbox"
105
                                                            <input type="checkbox"
106
                                                                   class="phone"
106
                                                                   id="phone[% messaging_preference.message_attribute_id | html %]"
107
                                                                   id="phone[% messaging_preference.message_attribute_id | html %]"
107
                                                                   name="[% messaging_preference.message_attribute_id | html %]"
108
                                                                   name="[% messaging_preference.message_attribute_id | html %]"
108
                                                                   value="phone" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
109
                                                                   value="phone" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
109
                                                        [% ELSE %]
110
                                                        [% ELSE %]
110
                                                            <input type="checkbox"
111
                                                            <input type="checkbox"
112
                                                                   class="phone"
111
                                                                   id="phone[% messaging_preference.message_attribute_id | html %]"
113
                                                                   id="phone[% messaging_preference.message_attribute_id | html %]"
112
                                                                   name="[% messaging_preference.message_attribute_id | html %]"
114
                                                                   name="[% messaging_preference.message_attribute_id | html %]"
113
                                                                   value="phone" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
115
                                                                   value="phone" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
Lines 122-132 Link Here
122
                                                <td class="selectcol">
124
                                                <td class="selectcol">
123
                                                [% IF ( messaging_preference.transports_itiva ) %]
125
                                                [% IF ( messaging_preference.transports_itiva ) %]
124
                                                <input type="checkbox"
126
                                                <input type="checkbox"
127
                                                            class="itiva"
125
                                                            id="itiva[% messaging_preference.message_attribute_id | html %]"
128
                                                            id="itiva[% messaging_preference.message_attribute_id | html %]"
126
                                                            name="[% messaging_preference.message_attribute_id | html %]"
129
                                                            name="[% messaging_preference.message_attribute_id | html %]"
127
                                                            value="itiva" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
130
                                                            value="itiva" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
128
                                                [% ELSE %]
131
                                                [% ELSE %]
129
                                                <input type="checkbox"
132
                                                <input type="checkbox"
133
                                                            class="itiva"
130
                                                            id="itiva[% messaging_preference.message_attribute_id | html %]"
134
                                                            id="itiva[% messaging_preference.message_attribute_id | html %]"
131
                                                            name="[% messaging_preference.message_attribute_id | html %]"
135
                                                            name="[% messaging_preference.message_attribute_id | html %]"
132
                                                            value="itiva" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
136
                                                            value="itiva" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
Lines 140-148 Link Here
140
                                            [% IF ( messaging_preference.transport_email ) %]
144
                                            [% IF ( messaging_preference.transport_email ) %]
141
                                                <td class="selectcol">
145
                                                <td class="selectcol">
142
                                                    [% IF ( messaging_preference.transports_email ) %]
146
                                                    [% IF ( messaging_preference.transports_email ) %]
143
                                                        <input type="checkbox" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
147
                                                        <input type="checkbox" class="email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
144
                                                    [% ELSE %]
148
                                                    [% ELSE %]
145
                                                        <input type="checkbox" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
149
                                                        <input type="checkbox" class="email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
146
                                                    [% END %]
150
                                                    [% END %]
147
                                                </td>
151
                                                </td>
148
                                            [% ELSE %]
152
                                            [% ELSE %]
Lines 255-260 Link Here
255
                }
259
                }
256
            });
260
            });
257
            $("#info_digests").tooltip();
261
            $("#info_digests").tooltip();
262
263
            // At load time, we want digest disabled if no digest using transport is enabled
264
            $(".email").each(function(){
265
                var rowid = $(this).attr("id");
266
                id = Number(rowid.replace("email",""));
267
                if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
268
                    $("#digest"+id).attr("disabled", false);
269
                } else {
270
                    $("#digest"+id).attr("disabled", true);
271
                }
272
            });
273
274
            // If user clears all digest using transports for a notice, disable digest checkbox
275
            $(".email").click(function(){
276
                var rowid = $(this).attr("id");
277
                id = Number(rowid.replace("email",""));
278
                if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
279
                    $("#digest"+id).attr("disabled", false);
280
                } else {
281
                    $("#digest"+id).attr("disabled", true).prop("checked",false);
282
                }
283
            });
284
            $(".sms").click(function(){
285
                var rowid = $(this).attr("id");
286
                id = Number(rowid.replace("sms",""));
287
                if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
288
                    $("#digest"+id).attr("disabled", false);
289
                } else {
290
                    $("#digest"+id).attr("disabled", true).prop("checked",false);
291
                }
292
            });
258
        });
293
        });
259
294
260
        function normalizeSMS(value){
295
        function normalizeSMS(value){
261
- 

Return to bug 13613