From c49d2f8a2562585ee4c57b52219b145dd364eb4b Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Wed, 18 Jun 2025 10:50:43 +0200 Subject: [PATCH] Bug 40160: Use HTTPS for links to community websites Some web-browsers now only allow HTTPS, we should change links in templates with SSL : https://schema.koha-community.org, https://wiki.koha-community.org ... Test plan : Just look patch to check http > https Signed-off-by: Owen Leonard --- installer/data/mysql/en/optional/sample_news.yml | 12 ++++++------ installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../prog/en/includes/guided-reports-view.inc | 6 +++--- .../en/modules/admin/preferences/acquisitions.pref | 2 +- .../prog/en/modules/admin/preferences/opac.pref | 10 +++++----- .../prog/en/modules/admin/preferences/patrons.pref | 10 +++++----- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +- .../prog/en/modules/reports/reports-home.tt | 6 +++--- .../opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-browser.tt | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/installer/data/mysql/en/optional/sample_news.yml b/installer/data/mysql/en/optional/sample_news.yml index 988d927005d..39432d9d7db 100644 --- a/installer/data/mysql/en/optional/sample_news.yml +++ b/installer/data/mysql/en/optional/sample_news.yml @@ -80,12 +80,12 @@ tables: content: - "Now that you've installed Koha, what's next? Here are some suggestions:" - "" - "" lang: "default" diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 09b8afd6fd8..53d9095bf4a 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -507,7 +507,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OPACFineNoRenewalsIncludeCredits','1',NULL,'If enabled the value specified in OPACFineNoRenewals should include any unapplied account credits in the calculation','YesNo'), ('OPACFinesTab','1','','If OFF the patron fines tab in the OPAC is disabled.','YesNo'), ('OPACFRBRizeEditions','0','','If ON, the OPAC will query one or more ISBN web services for associated ISBNs and display an Editions tab on the details pages','YesNo'), -('OpacHiddenItems','','','This syspref allows to define custom rules for hiding specific items at the OPAC. See http://wiki.koha-community.org/wiki/OpacHiddenItems for more information.','Textarea'), +('OpacHiddenItems','','','This syspref allows to define custom rules for hiding specific items at the OPAC. See https://wiki.koha-community.org/wiki/OpacHiddenItems for more information.','Textarea'), ('OpacHiddenItemsExceptions','',NULL,'List of borrower categories, separated by comma, that can see items otherwise hidden by OpacHiddenItems','Textarea'), ('OpacHiddenItemsHidesRecord','1','','Hide biblio record when all its items are hidden because of OpacHiddenItems','YesNo'), ('OpacHighlightedWords','1','','If Set, then queried words are higlighted in OPAC','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc index 4461581ba12..59e416f7b86 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc @@ -10,12 +10,12 @@
Useful resources
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref index 523c30b896b..7f1a8860956 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -9,7 +9,7 @@ Acquisitions: cataloguing: cataloging the record. - This is only the default behavior, and can be changed per-basket. - - - "The following database columns should be unique in an item:" + - "The following database columns should be unique in an item:" - pref: UniqueItemFields type: modalselect source: items diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 5441fd7e118..f15aad0b931 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -668,7 +668,7 @@ OPAC: type: textarea syntax: text/x-yaml class: code - - Define custom rules to hide specific items from search and view on the OPAC. How to write these rules is documented on the Koha wiki. + - Define custom rules to hide specific items from search and view on the OPAC. How to write these rules is documented on the Koha wiki. - - 'List of patron categories, that can see items otherwise hidden by OpacHiddenItems:' - pref: OpacHiddenItemsExceptions @@ -851,19 +851,19 @@ OPAC: - "days after account creation." - "
NOTE: This system preference requires the misc/cronjobs/cleanup_database.pl cronjob. Ask your system administrator to schedule it.
No patrons will be deleted if you set the pref to zero or make it empty." - - - "The following database columns must be filled in on the patron modification screen:" + - "The following database columns must be filled in on the patron modification screen:" - pref: PatronSelfModificationMandatoryField type: modalselect source: borrowers exclusions: password|cardnumber|dateexpiry|categorycode|sort1|sort2|opacnote|borrowernotes|gonenoaddress|lost|flags - - - "The following database columns must be filled in on the patron entry screen:" + - "The following database columns must be filled in on the patron entry screen:" - pref: PatronSelfRegistrationBorrowerMandatoryField type: modalselect source: borrowers exclusions: sort1|sort2|opacnote|borrowernotes|gonenoaddress|lost|flags - - - "The following database columns will not appear on the patron self-registration screen:" + - "The following database columns will not appear on the patron self-registration screen:" - pref: PatronSelfRegistrationBorrowerUnwantedField type: modalselect source: borrowers @@ -871,7 +871,7 @@ OPAC: inclusions: categorycode|dateexpiry - '
NOTE: preferred_name will be set to firstname if not included in the form.' - - - "The following database columns will not appear on the patron self-modification screen:" + - "The following database columns will not appear on the patron self-modification screen:" - pref: PatronSelfModificationBorrowerUnwantedField type: modalselect source: borrowers diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref index 90e041b2184..11c16a29402 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -211,7 +211,7 @@ Patrons: - pref: EmailFieldPrecedence class: multi - '
NOTE: All patron fields can be used, but to work correctly they must contain a valid email address or an empty string.' - - "Valid options are the database columns of the borrowers table, separated by | (pipe)." + - "Valid options are the database columns of the borrowers table, separated by | (pipe)." - "Example: email|emailpro|B_email" - - "When EmailFieldPrimary is set to 'selected addresses', send email to all valid email addresses in the selected fields:" @@ -274,14 +274,14 @@ Patrons: cron: (Deprecated) according to --send-notices cron switch Patron forms: - - - "The following database columns must be filled in on the patron entry screen:" + - "The following database columns must be filled in on the patron entry screen:" - pref: BorrowerMandatoryField type: modalselect source: borrowers exclusions: flags - 'NOTE: If autoMemberNum is enabled, the system preference BorrowerMandatoryField must not contain the field cardnumber.' - - - "The following database columns will not appear on the patron entry screen:" + - "The following database columns will not appear on the patron entry screen:" - pref: BorrowerUnwantedField type: modalselect source: borrowers @@ -311,7 +311,7 @@ Patrons: 0: "Don't" - store and display surnames in upper case. - - - "The following database columns:" + - "The following database columns:" - pref: PatronQuickAddFields type: modalselect source: borrowers @@ -337,7 +337,7 @@ Patrons: messaging: "Patron messaging preferences" - . - - - "The following database columns:" + - "The following database columns:" - pref: PatronDuplicateMatchingAddFields type: modalselect source: borrowers diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt index e46d7ad41a4..4a0a2109049 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -59,7 +59,7 @@ [% INCLUDE 'messages.inc' %]
-

Koha

+

Koha

[% SET StaffLoginInstructions = AdditionalContents.get( location => "StaffLoginInstructions", lang => lang ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt index 2d8517da1c0..b3430ea810b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt @@ -109,12 +109,12 @@
  • Average loan time
  • [% SET koha_version = Koha.Version %] [% IF koha_version.development %] -
  • Koha database schema
  • +
  • Koha database schema
  • [% ELSE %] -
  • Koha database schema
  • +
  • Koha database schema
  • [% END %] -
  • Koha reports library
  • +
  • Koha reports library
  • [% IF ( Koha.Preference('Mana') == 2 ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 065c89c4710..a7ba62716c3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -49,7 +49,7 @@ [% IF OpacKohaUrl %]