Bugzilla – Attachment 77793 Details for
Bug 19817
Merge local and online documentations
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19817: Make the location of the manual configurable - KohaManualBaseURL
Bug-19817-Make-the-location-of-the-manual-configur.patch (text/plain), 4.09 KB, created by
Martin Renvoize (ashimema)
on 2018-08-14 15:13:08 UTC
(
hide
)
Description:
Bug 19817: Make the location of the manual configurable - KohaManualBaseURL
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-08-14 15:13:08 UTC
Size:
4.09 KB
patch
obsolete
>From 339b5fffbfa8ba3a8288f47e1e1d2673670b8dff Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 18 Dec 2017 16:21:25 -0300 >Subject: [PATCH] Bug 19817: Make the location of the manual configurable - > KohaManualBaseURL > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > help.pl | 7 +++++-- > installer/data/mysql/atomicupdate/bug_19817.sql | 2 ++ > installer/data/mysql/sysprefs.sql | 1 + > .../en/modules/admin/preferences/enhanced_content.pref | 8 ++++++++ > 4 files changed, 16 insertions(+), 2 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug_19817.sql > >diff --git a/help.pl b/help.pl >index f1a273cc55..0c500b6d8e 100755 >--- a/help.pl >+++ b/help.pl >@@ -36,9 +36,12 @@ if ( $help_version =~ m|^(\d+)\.(\d{2}).*$| ) { > $help_version = "$version.$major"; > } > >-# FIXME remote url must be a pref > # FIXME /en/ must be configurable (or guessed) >-our $base_url = 'http://koha-community.org/manual/' . $help_version . '/en/html'; >+my $KohaManualBaseURL = C4::Context->preference('KohaManualBaseURL') || 'http://koha-community.org/manual'; >+if ( $KohaManualBaseURL =~ m|^/| ) { >+ $KohaManualBaseURL = C4::Context->preference('staffClientBaseURL') . $KohaManualBaseURL; >+} >+our $base_url = $KohaManualBaseURL . '/' . $help_version . '/en/html'; > our $mapping = { > 'about' => '/14_plugins.html#about-koha', > 'acqui/acqui-home' => '/09_acquisitions.html', >diff --git a/installer/data/mysql/atomicupdate/bug_19817.sql b/installer/data/mysql/atomicupdate/bug_19817.sql >new file mode 100644 >index 0000000000..b2409ebbd6 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_19817.sql >@@ -0,0 +1,2 @@ >+INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) >+VALUES ('KohaManualBaseURL','http://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'); >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 4a62a26bb4..6d53d123ef 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -240,6 +240,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('itemBarcodeInputFilter','','whitespace|T-prefix|cuecat|libsuite8|EAN13','If set, allows specification of a item barcode input filter','Choice'), > ('itemcallnumber','082ab',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'), > ('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'), >+('KohaManualBaseURL','http://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'), > ('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'), > ('language','en',NULL,'Set the default language in the staff client.','Languages'), > ('LetterLog','1',NULL,'If ON, log all notices sent','YesNo'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref >index 81e96c6147..286589151b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref >@@ -396,3 +396,11 @@ Enhanced Content: > aws: Amazon Web Services > gb: Google Books > ol: Open Library >+ >+ Manual: >+ - >+ - Location of the Koha manual >+ - pref: KohaManualBaseURL >+ - You can specify the location of the Koha manual to use. By default it is http://koha-community.org/manual/ >+ - If starts with '/', the value of staffClientBaseURL will be used as a prefix. >+ - Note that it will be suffixed by the version / the language / the format (/17.11/en/html) >-- >2.18.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 19817
:
69807
|
69808
|
70131
|
70132
|
70133
|
73523
|
73524
|
73525
|
73526
|
73527
|
73651
|
73652
|
73872
|
73877
|
73931
|
73932
|
73933
|
73934
|
73935
|
73936
|
73937
|
73938
|
74567
|
74568
|
74569
|
74570
|
74571
|
74572
|
74573
|
74574
|
74644
|
74645
|
74646
|
74647
|
74648
|
74649
|
74650
|
74651
|
75370
|
75371
|
75372
|
75373
|
75374
|
75375
|
75376
|
75377
|
76151
|
76152
|
76153
|
76154
|
76155
|
76156
|
76157
|
76158
|
77791
|
77792
|
77793
|
77794
|
77795
|
77797
|
77798
|
77799
|
77932
|
77942
|
77943
|
77944
|
77945
|
77946
|
77947
|
77948
|
77949
|
77950
|
77951
|
78953
|
87238