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

(-)a/installer/data/mysql/atomicupdate/bug_11584-add_UseWYSIWYGinSystemPreferences_syspref.sql (+1 lines)
Line 0 Link Here
1
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo');
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 473-478 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
473
('UseKohaPlugins','0','','Enable or disable the ability to use Koha Plugins.','YesNo'),
473
('UseKohaPlugins','0','','Enable or disable the ability to use Koha Plugins.','YesNo'),
474
('UseQueryParser','0',NULL,'If enabled, try to use QueryParser for queries.','YesNo'),
474
('UseQueryParser','0',NULL,'If enabled, try to use QueryParser for queries.','YesNo'),
475
('UseTransportCostMatrix','0','','Use Transport Cost Matrix when filling holds','YesNo'),
475
('UseTransportCostMatrix','0','','Use Transport Cost Matrix when filling holds','YesNo'),
476
('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo'),
476
('viewISBD','1','','Allow display of ISBD view of bibiographic records','YesNo'),
477
('viewISBD','1','','Allow display of ISBD view of bibiographic records','YesNo'),
477
('viewLabeledMARC','0','','Allow display of labeled MARC view of bibiographic records','YesNo'),
478
('viewLabeledMARC','0','','Allow display of labeled MARC view of bibiographic records','YesNo'),
478
('viewMARC','1','','Allow display of MARC view of bibiographic records','YesNo'),
479
('viewMARC','1','','Allow display of MARC view of bibiographic records','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt (-5 / +8 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Administration &rsaquo; System preferences</title>
3
<title>Koha &rsaquo; Administration &rsaquo; System preferences</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
Lines 134-144 Link Here
134
                    <select name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "choice" %]" multiple="multiple">
135
                    <select name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "choice" %]" multiple="multiple">
135
                        [% FOREACH CHOICE IN CHUNK.CHOICES %][% IF ( CHOICE.selected ) %]<option value="[% CHOICE.value %]" selected="selected">[% ELSE %]<option value="[% CHOICE.value %]">[% END %][% CHOICE.text %]</option>[% END %]
136
                        [% FOREACH CHOICE IN CHUNK.CHOICES %][% IF ( CHOICE.selected ) %]<option value="[% CHOICE.value %]" selected="selected">[% ELSE %]<option value="[% CHOICE.value %]">[% END %][% CHOICE.text %]</option>[% END %]
136
                    </select>
137
                    </select>
137
                    [% ELSIF ( CHUNK.type_textarea ) %]
138
                    [% ELSIF ( CHUNK.type_textarea ) || ( CHUNK.type_htmlarea )%]
138
					<a class="expand-textarea" style="display: none" href="#">Click to Edit</a>
139
                        [% IF ( CHUNK.type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %]
139
					<textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]" rows="10" cols="40">[% CHUNK.value %]</textarea>
140
                        <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %] mce" rows="20" cols="60">[% CHUNK.value %]</textarea>
140
                    [% ELSIF ( CHUNK.type_htmlarea ) %]
141
                        [% ELSE %]
141
					<textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %] mce" rows="20" cols="60">[% CHUNK.value %]</textarea>
142
                        <a class="expand-textarea" style="display: none" href="#">Click to Edit</a>
143
                        <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]" rows="10" cols="40">[% CHUNK.value %]</textarea>
144
                        [% END %]
142
                    [% ELSIF ( CHUNK.type_languages ) %]
145
                    [% ELSIF ( CHUNK.type_languages ) %]
143
                    <dl>
146
                    <dl>
144
                    [% FOREACH language IN CHUNK.languages %]
147
                    [% FOREACH language IN CHUNK.languages %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +1 lines)
Lines 663-669 Circulation: Link Here
663
        -
663
        -
664
            - "Include the following HTML in the Help page of the web-based self checkout system:"
664
            - "Include the following HTML in the Help page of the web-based self checkout system:"
665
            - pref: SelfCheckHelpMessage
665
            - pref: SelfCheckHelpMessage
666
              type: textarea
666
              type: htmlarea
667
              class: code
667
              class: code
668
        -
668
        -
669
            - pref: AutoSelfCheckAllowed
669
            - pref: AutoSelfCheckAllowed
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-11 / +11 lines)
Lines 203-234 OPAC: Link Here
203
        -
203
        -
204
            - "Show the following HTML in its own column on the main page of the OPAC:"
204
            - "Show the following HTML in its own column on the main page of the OPAC:"
205
            - pref: OpacMainUserBlock
205
            - pref: OpacMainUserBlock
206
              type: textarea
206
              type: htmlarea
207
              class: code
207
              class: code
208
        -
208
        -
209
            - "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):"
209
            - "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):"
210
            - pref: OpacNav
210
            - pref: OpacNav
211
              type: textarea
211
              type: htmlarea
212
              class: code
212
              class: code
213
        -
213
        -
214
            - "Show the following HTML in the right hand column of the main page under the main login form:"
214
            - "Show the following HTML in the right hand column of the main page under the main login form:"
215
            - pref: OpacNavRight
215
            - pref: OpacNavRight
216
              type: textarea
216
              type: htmlarea
217
              class: code
217
              class: code
218
        -
218
        -
219
            - "Show the following HTML on the left hand column of the main page and patron account on the OPAC, after OpacNav, and before patron account links if available:"
219
            - "Show the following HTML on the left hand column of the main page and patron account on the OPAC, after OpacNav, and before patron account links if available:"
220
            - pref: OpacNavBottom
220
            - pref: OpacNavBottom
221
              type: textarea
221
              type: htmlarea
222
              class: code
222
              class: code
223
        -
223
        -
224
            - "Include the following HTML in the header of all pages in the OPAC:"
224
            - "Include the following HTML in the header of all pages in the OPAC:"
225
            - pref: opacheader
225
            - pref: opacheader
226
              type: textarea
226
              type: htmlarea
227
              class: code
227
              class: code
228
        -
228
        -
229
            - "Include the following HTML in the footer of all pages in the OPAC:"
229
            - "Include the following HTML in the footer of all pages in the OPAC:"
230
            - pref: opaccredits
230
            - pref: opaccredits
231
              type: textarea
231
              type: htmlarea
232
              class: code
232
              class: code
233
        -
233
        -
234
            - 'Include a "More Searches" box on the detail pages of items on the OPAC, with the following HTML (leave blank to disable):'
234
            - 'Include a "More Searches" box on the detail pages of items on the OPAC, with the following HTML (leave blank to disable):'
Lines 240-246 OPAC: Link Here
240
            - 'Include a "Links" column on the "my summary" and "my reading history" tabs when a user is logged in to the OPAC, with the following HTML (leave blank to disable):'
240
            - 'Include a "Links" column on the "my summary" and "my reading history" tabs when a user is logged in to the OPAC, with the following HTML (leave blank to disable):'
241
            - '<br />Note: The placeholders {BIBLIONUMBER}, {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.'
241
            - '<br />Note: The placeholders {BIBLIONUMBER}, {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.'
242
            - pref: OPACMySummaryHTML
242
            - pref: OPACMySummaryHTML
243
              type: textarea
243
              type: htmlarea
244
              class: code
244
              class: code
245
        -
245
        -
246
            - "Note to display on the patron summary page. This note only appears if the patron is logged in:"
246
            - "Note to display on the patron summary page. This note only appears if the patron is logged in:"
Lines 249-255 OPAC: Link Here
249
        -
249
        -
250
            - "Include the following HTML under the facets in OPAC search results:"
250
            - "Include the following HTML under the facets in OPAC search results:"
251
            - pref: OPACResultsSidebar
251
            - pref: OPACResultsSidebar
252
              type: textarea
252
              type: htmlarea
253
              class: code
253
              class: code
254
        -
254
        -
255
            - pref: OpacAddMastheadLibraryPulldown
255
            - pref: OpacAddMastheadLibraryPulldown
Lines 261-267 OPAC: Link Here
261
            - 'Display this HTML when no results are found for a search in the OPAC:'
261
            - 'Display this HTML when no results are found for a search in the OPAC:'
262
            - '<br />Note: You can insert placeholders {QUERY_KW} that will be replaced with the keywords of the query.'
262
            - '<br />Note: You can insert placeholders {QUERY_KW} that will be replaced with the keywords of the query.'
263
            - pref: OPACNoResultsFound
263
            - pref: OPACNoResultsFound
264
              type: textarea
264
              type: htmlarea
265
              class: code
265
              class: code
266
        -
266
        -
267
            - 'Display the URI in the 856u field as an image on: '
267
            - 'Display the URI in the 856u field as an image on: '
Lines 310-316 OPAC: Link Here
310
        -
310
        -
311
            - "Show the following HTML on the OPAC login form when a patron is not logged in:"
311
            - "Show the following HTML on the OPAC login form when a patron is not logged in:"
312
            - pref: NoLoginInstructions
312
            - pref: NoLoginInstructions
313
              type: textarea
313
              type: htmlarea
314
              class: code
314
              class: code
315
        -
315
        -
316
            - "Replace the search box at the top of OPAC pages with the following HTML:"
316
            - "Replace the search box at the top of OPAC pages with the following HTML:"
Lines 682-688 OPAC: Link Here
682
        -
682
        -
683
            - "Display the following additional instructions for patrons who self register via the OPAC ( HTML is allowed ):"
683
            - "Display the following additional instructions for patrons who self register via the OPAC ( HTML is allowed ):"
684
            - pref: PatronSelfRegistrationAdditionalInstructions
684
            - pref: PatronSelfRegistrationAdditionalInstructions
685
              type: textarea
685
              type: htmlarea
686
              class: html
686
              class: html
687
    Advanced Search Options:
687
    Advanced Search Options:
688
        -
688
        -
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref (-1 / +7 lines)
Lines 38-44 Staff Client: Link Here
38
        -
38
        -
39
            - "Show the following HTML in its own column on the main page of the staff client:"
39
            - "Show the following HTML in its own column on the main page of the staff client:"
40
            - pref: IntranetmainUserblock
40
            - pref: IntranetmainUserblock
41
              type: textarea
41
              type: htmlarea
42
              class: code
42
              class: code
43
        -
43
        -
44
            - "Show the following HTML to the left of the More menu at the top of each page on the staff client (should be a list of links or blank):"
44
            - "Show the following HTML to the left of the More menu at the top of each page on the staff client (should be a list of links or blank):"
Lines 128-130 Staff Client: Link Here
128
                  yes: Enable
128
                  yes: Enable
129
                  no: Disable
129
                  no: Disable
130
            - item selection in record detail page.
130
            - item selection in record detail page.
131
        -
132
            - pref: UseWYSIWYGinSystemPreferences
133
              choices:
134
                  yes: Show
135
                  no: "Don't show"
136
            - WYSIWYG editor when editing certain HTML system preferences.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt (-10 / +13 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences &rsaquo; Data added[% END %]
3
<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences &rsaquo; Data added[% END %]
3
[% IF ( delete_confirm ) %] System preferences &rsaquo; [% searchfield %] &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</title>
4
[% IF ( delete_confirm ) %] System preferences &rsaquo; [% searchfield %] &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</title>
Lines 110-119 Link Here
110
                    <textarea id="value" name="value" cols="[% fieldlength %]">[% value |html %]</textarea>
111
                    <textarea id="value" name="value" cols="[% fieldlength %]">[% value |html %]</textarea>
111
                [% ELSIF ( type_upload ) %]
112
                [% ELSIF ( type_upload ) %]
112
                    <input type="file" name="value" />
113
                    <input type="file" name="value" />
113
                [% ELSIF ( type_htmlarea ) %]
114
                [% ELSIF ( type_textarea || type_htmlarea ) %]
114
                    <textarea class="mce" name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value |html %]</textarea>
115
                    [% IF ( type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %]
115
                [% ELSIF ( type_textarea ) %]
116
                        <textarea class="mce" name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value |html %]</textarea>
117
                    [% ELSE %]
116
                    <textarea name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value |html %]</textarea>
118
                    <textarea name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value |html %]</textarea>
119
                    [% END %]
117
                [% ELSIF ( type_choice ) %]
120
                [% ELSIF ( type_choice ) %]
118
                    <select name="value" id="value">
121
                    <select name="value" id="value">
119
                        [% FOREACH option IN options %]
122
                        [% FOREACH option IN options %]
Lines 337-348 Link Here
337
                [% IF ( loo.type_upload ) %]
340
                [% IF ( loo.type_upload ) %]
338
                <input type="file" name="value" value="[% loo.value |html %]" />
341
                <input type="file" name="value" value="[% loo.value |html %]" />
339
                [% END %]
342
                [% END %]
340
                [% IF ( loo.type_textarea ) %]
343
                [% IF ( loo.type_textarea ) || ( loo.type_htmlarea ) %]
341
                <a class="expand-textarea" style="display: none" href="#">Click to edit</a>
344
                    [% IF ( loo.type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %]
342
                <textarea name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
345
                        <textarea class="mce" name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
343
                [% END %]
346
                    [% ELSE %]
344
                [% IF ( loo.type_htmlarea ) %]
347
                        <a class="expand-textarea" style="display: none" href="#">Click to edit</a>
345
                <textarea class="mce" name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
348
                        <textarea name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
349
                    [% END %]
346
                [% END %]
350
                [% END %]
347
                [% IF ( loo.type_choice ) %]
351
                [% IF ( loo.type_choice ) %]
348
                <select name="value">
352
                <select name="value">
349
- 

Return to bug 11584