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

(-)a/installer/data/mysql/atomicupdate/sysprefs_Bug12528.sql (+3 lines)
Line 0 Link Here
1
INSERT INTO systempreferences ( variable, value, options, explanation,type ) VALUES
2
('OPACEnhancedMessagingPreferences', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo')
3
;
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 270-275 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
270
('OPACdefaultSortOrder','dsc','asc|dsc|za|az','Specify the default sort order','Choice'),
270
('OPACdefaultSortOrder','dsc','asc|dsc|za|az','Specify the default sort order','Choice'),
271
('OPACdidyoumean',NULL,NULL,'Did you mean? configuration for the OPAC. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
271
('OPACdidyoumean',NULL,NULL,'Did you mean? configuration for the OPAC. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
272
('OPACDisplay856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','Choice'),
272
('OPACDisplay856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','Choice'),
273
('OPACEnhancedMessagingPreferences', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'),
273
('OpacExportOptions','bibtex,dc,marcxml,marc8,utf8,marcstd,mods,ris,isbd','','Define export options available on OPAC detail page.','multiple'),
274
('OpacExportOptions','bibtex,dc,marcxml,marc8,utf8,marcstd,mods,ris,isbd','','Define export options available on OPAC detail page.','multiple'),
274
('OPACFallback', 'prog', 'bootstrap|prog', 'Define the fallback theme for the OPAC interface.', 'Themes'),
275
('OPACFallback', 'prog', 'bootstrap|prog', 'Define the fallback theme for the OPAC interface.', 'Themes'),
275
('OpacFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','free'),
276
('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 (+7 lines)
Lines 153-158 Patrons: Link Here
153
               yes: Do
153
               yes: Do
154
               no: "Don't"
154
               no: "Don't"
155
         - charge a fee when a patron changes to a category with an enrollment fee.
155
         - charge a fee when a patron changes to a category with an enrollment fee.
156
     -
157
         - pref: OPACEnhancedMessagingPreferences
158
           choices:
159
               yes: Show
160
               no: "Don't show"
161
         - "patron messaging setting on the OPAC (NOTE: EnhancedMessagingPreferences must be enabled)."
162
156
    "Norwegian patron database":
163
    "Norwegian patron database":
157
     -
164
     -
158
         - pref: NorwegianPatronDBEnable
165
         - pref: NorwegianPatronDBEnable
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc (-6 / +8 lines)
Lines 77-88 Link Here
77
            [% END %]
77
            [% END %]
78
78
79
            [% IF ( EnhancedMessagingPreferences ) %]
79
            [% IF ( EnhancedMessagingPreferences ) %]
80
                [% IF ( messagingview ) %]
80
                [% IF Koha.Preference( 'OPACEnhancedMessagingPreferences' ) %]
81
                    <li class="active">
81
                    [% IF ( messagingview ) %]
82
                [% ELSE %]
82
                        <li class="active">
83
                    <li>
83
                    [% ELSE %]
84
                [% END %]
84
                        <li>
85
                <a href="/cgi-bin/koha/opac-messaging.pl">your messaging</a></li>
85
                    [% END %]
86
                    <a href="/cgi-bin/koha/opac-messaging.pl">your messaging</a></li>
87
                 [% END %]
86
            [% END %]
88
            [% END %]
87
89
88
            [% IF Koha.Preference( 'virtualshelves' ) == 1 %]
90
            [% IF Koha.Preference( 'virtualshelves' ) == 1 %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-2 / +6 lines)
Lines 22-27 Link Here
22
                </div>
22
                </div>
23
            </div>
23
            </div>
24
            <div class="span10">
24
            <div class="span10">
25
                [% IF Koha.Preference( 'OPACEnhancedMessagingPreferences' )  %]
25
                <div id="usermessaging">
26
                <div id="usermessaging">
26
                    <h3>Your messaging settings</h3>
27
                    <h3>Your messaging settings</h3>
27
                    [% IF ( settings_updated ) %]
28
                    [% IF ( settings_updated ) %]
Lines 129-135 Link Here
129
                        </fieldset>
130
                        </fieldset>
130
                    </form>
131
                    </form>
131
                </div> <!-- / #usermessaging -->
132
                </div> <!-- / #usermessaging -->
132
            </div> <!-- / .span10 -->
133
                [% ELSE %]
134
                    <h4>You are not allowed to call this page directly</h4>
135
                    <span> To report this problem, you can <a href="mailto:[% admin %]">email the Koha Administrator</a>.</span>
136
                [% END %]
137
           </div> <!-- / .span10 -->
133
        </div> <!-- / .row-fluid -->
138
        </div> <!-- / .row-fluid -->
134
    </div> <!-- / .container-fluid -->
139
    </div> <!-- / .container-fluid -->
135
</div> <!-- / .main -->
140
</div> <!-- / .main -->
136
- 

Return to bug 12528