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

(-)a/installer/data/mysql/atomicupdate/sysprefs_Bug12528.sql (-1 / +1 lines)
Lines 1-2 Link Here
1
INSERT INTO systempreferences ( value, variable, options, explanation,type )
1
INSERT INTO systempreferences ( value, variable, options, explanation,type )
2
select value ,'OPACEnhancedMessagingPreferences', NULL, 'If ON, allows patrons to select to receive additional messages about items due or nearly due.', 'YesNo' from systempreferences where variable='EnhancedMessagingPreferences';
2
select value ,'EnhancedMessagingPreferencesOPAC', NULL, 'If ON, allows patrons to select to receive additional messages about items due or nearly due.', 'YesNo' from systempreferences where variable='EnhancedMessagingPreferences';
(-)a/installer/data/mysql/sysprefs.sql (-1 / +2 lines)
Lines 138-143 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
138
('EnableOpacSearchHistory','1','YesNo','Enable or disable opac search history',''),
138
('EnableOpacSearchHistory','1','YesNo','Enable or disable opac search history',''),
139
('EnableSearchHistory','0','','Enable or disable search history','YesNo'),
139
('EnableSearchHistory','0','','Enable or disable search history','YesNo'),
140
('EnhancedMessagingPreferences','0','','If ON, allows patrons to select to receive additional messages about items due or nearly due.','YesNo'),
140
('EnhancedMessagingPreferences','0','','If ON, allows patrons to select to receive additional messages about items due or nearly due.','YesNo'),
141
('EnhancedMessagingPreferencesOPAC',1, 'Show the patrons messaging preferences page in the OPAC', NULL, 'YesNo'),
141
('expandedSearchOption','0',NULL,'If ON, set advanced search to be expanded by default','YesNo'),
142
('expandedSearchOption','0',NULL,'If ON, set advanced search to be expanded by default','YesNo'),
142
('ExpireReservesMaxPickUpDelay','0','','Enabling this allows holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay','YesNo'),
143
('ExpireReservesMaxPickUpDelay','0','','Enabling this allows holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay','YesNo'),
143
('ExpireReservesMaxPickUpDelayCharge','0',NULL,'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, than a borrower whose waiting hold has expired will be charged this amount.','free'),
144
('ExpireReservesMaxPickUpDelayCharge','0',NULL,'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, than a borrower whose waiting hold has expired will be charged this amount.','free'),
Lines 289-295 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
289
('OPACdefaultSortOrder','dsc','asc|dsc|za|az','Specify the default sort order','Choice'),
290
('OPACdefaultSortOrder','dsc','asc|dsc|za|az','Specify the default sort order','Choice'),
290
('OPACdidyoumean','',NULL,'Did you mean? configuration for the OPAC. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
291
('OPACdidyoumean','',NULL,'Did you mean? configuration for the OPAC. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
291
('OPACDisplay856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','Choice'),
292
('OPACDisplay856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','Choice'),
292
('OPACEnhancedMessagingPreferences', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'),
293
('EnhancedMessagingPreferencesOPAC', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'),
293
('OpacExportOptions','bibtex,dc,marcxml,marc8,utf8,marcstd,mods,ris,isbd','','Define export options available on OPAC detail page.','multiple'),
294
('OpacExportOptions','bibtex,dc,marcxml,marc8,utf8,marcstd,mods,ris,isbd','','Define export options available on OPAC detail page.','multiple'),
294
('OPACFallback', 'prog', 'bootstrap|prog', 'Define the fallback theme for the OPAC interface.', 'Themes'),
295
('OPACFallback', 'prog', 'bootstrap|prog', 'Define the fallback theme for the OPAC interface.', 'Themes'),
295
('OpacFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','free'),
296
('OpacFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','free'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-2 / +2 lines)
Lines 54-60 Patrons: Link Here
54
           choices:
54
           choices:
55
               yes: Allow
55
               yes: Allow
56
               no: "Don't allow"
56
               no: "Don't allow"
57
         - "Staff to manage which notices patrons will receive and when they will receive them. Note: this only applies to courtesy notices. To manage if patrons have also access to these settings, use OPACEnhancedMessagingPreferences."
57
         - "Staff to manage which notices patrons will receive and when they will receive them. Note: this only applies to courtesy notices. To manage if patrons have also access to these settings, use EnhancedMessagingPreferencesOPAC."
58
     -
58
     -
59
         - pref: ExtendedPatronAttributes
59
         - pref: ExtendedPatronAttributes
60
           choices:
60
           choices:
Lines 160-166 Patrons: Link Here
160
               no: "Don't"
160
               no: "Don't"
161
         - charge a fee when a patron changes to a category with an enrollment fee.
161
         - charge a fee when a patron changes to a category with an enrollment fee.
162
     -
162
     -
163
         - pref: OPACEnhancedMessagingPreferences
163
         - pref: EnhancedMessagingPreferencesOPAC
164
           choices:
164
           choices:
165
               yes: Show
165
               yes: Show
166
               no: "Don't show"
166
               no: "Don't show"
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc (-1 / +1 lines)
Lines 77-83 Link Here
77
            [% END %]
77
            [% END %]
78
78
79
            [% IF ( EnhancedMessagingPreferences ) %]
79
            [% IF ( EnhancedMessagingPreferences ) %]
80
                [% IF Koha.Preference( 'OPACEnhancedMessagingPreferences' ) %]
80
                [% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) %]
81
                    [% IF ( messagingview ) %]
81
                    [% IF ( messagingview ) %]
82
                        <li class="active">
82
                        <li class="active">
83
                    [% ELSE %]
83
                    [% ELSE %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-2 / +1 lines)
Lines 22-28 Link Here
22
                </div>
22
                </div>
23
            </div>
23
            </div>
24
            <div class="span10">
24
            <div class="span10">
25
                [% IF Koha.Preference( 'OPACEnhancedMessagingPreferences' )  %]
25
                [% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' )  %]
26
                <div id="usermessaging">
26
                <div id="usermessaging">
27
                    <h3>Your messaging settings</h3>
27
                    <h3>Your messaging settings</h3>
28
                    [% IF ( settings_updated ) %]
28
                    [% IF ( settings_updated ) %]
29
- 

Return to bug 12528