From fc2d2ca841c59d878592d815fbb72a767e85d582 Mon Sep 17 00:00:00 2001
From: Owen Leonard
Date: Wed, 20 Dec 2023 13:04:02 +0000
Subject: [PATCH] Bug 35584: Add missing licenses to about page
This patch adds license information to the about page which was missing
for several JavaScript libraries. The patch also makes a minor change to
CSS to improve alignment of content in the licenses tab.
One library, vis-timeline-graph2d.min.js, lacked the correct version
information in the source. This information has been added.
To test, apply the patch and rebuild the staff interface CSS.
- Go to the about page and open the "Licenses" tab.
- Confirm that the information looks correct.
Signed-off-by: David Nind
Signed-off-by: Pedro Amorim
Signed-off-by: Katrin Fischer
(cherry picked from commit 3ccf5843d26290a74ab3e2b1410aa2396bdb6aa3)
Signed-off-by: Fridolin Somers
---
.../vis-timeline/vis-timeline-graph2d.min.js | 4 +-
.../prog/css/src/staff-global.scss | 14 +++-
.../intranet-tmpl/prog/en/modules/about.tt | 78 ++++++++++++++++++-
3 files changed, 88 insertions(+), 8 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/lib/vis-timeline/vis-timeline-graph2d.min.js b/koha-tmpl/intranet-tmpl/lib/vis-timeline/vis-timeline-graph2d.min.js
index 4da8f58964..4948b78a94 100644
--- a/koha-tmpl/intranet-tmpl/lib/vis-timeline/vis-timeline-graph2d.min.js
+++ b/koha-tmpl/intranet-tmpl/lib/vis-timeline/vis-timeline-graph2d.min.js
@@ -4,8 +4,8 @@
*
* Create a fully customizable, interactive timeline with items and ranges.
*
- * @version 0.0.0-no-version
- * @date 2021-09-28T07:39:31.439Z
+ * @version 7.4.9
+ * @date 2021-06-05T17:20:46.148Z
*
* @copyright (c) 2011-2017 Almende B.V, http://almende.com
* @copyright (c) 2017-2019 visjs contributors, https://github.com/visjs
diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 99b2ad0d89..44b3fd1946 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -4161,10 +4161,16 @@ input.renew {
}
}
-.about h2 {
- border-bottom: 1px solid #BFD9B9;
- margin: .5em 0;
- padding: .5em .2em;
+.about {
+ h2 {
+ border-bottom: 1px solid #BFD9B9;
+ margin: .5em 0;
+ padding: .5em 0;
+
+ & + p {
+ margin-left: .5rem;
+ }
+ }
}
.columns-2 {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 3be8621f0c..9af3d05b90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -978,11 +978,21 @@
C3.js D3-based reusable chart library v0.4.11: MIT Licence
+ CSSLint
+
+ CSSLint v0.9.8: License
+
+
D3
D3 JavaScript library for visualizing data v3.5.17: ISC Licence
+ DataTables
+
+ DataTables v.1.10.18: MIT Licence
+
+
Day.js
Day.js v1.11.2: MIT License
@@ -998,6 +1008,15 @@
FamFamFam Silk icons: Creative Commons Attribution 2.5 License
+ FileSaver.js
+
+ FileSaver.js: MIT License
+
+ Flatpicker
+
+ Flatpickr v4.6.9: MIT License
+
+
Font Awesome
Font Awesome v6.3.0: Creative Commons Attribution 4.0 International License, SIL Open Font License Version 1.1, MIT License
@@ -1008,11 +1027,31 @@
Font Face Observer JavaScript library v2.0.3: BSD License
+ GreyBox
+
+ GreBox JavaScript Library v5.54: GNU Lesser General Public License, version 2.1
+
+
HC Sticky
HC Sticky JavaScript library v2.2.3: MIT License
+ Highlight
+
+ Highlight jQuery Plugin v5.0
+
+
+ HTMLHint
+
+ HTMLHint v0.9.12: MIT License
+
+
+ Humanized Messages
+
+ Humanized Messages v1.0
+
+
JavaScript Cookie
JavaScript Cookie v3.0.1: MIT License
@@ -1023,9 +1062,9 @@
Javascript Diff Algorithm: MIT License
- jQuery and jQuery UI
+ jQuery, jQuery Migrate, and jQuery UI
- jQuery v3.6.0, jQuery UI v1.13.2: MIT License
+ jQuery v3.6.0, jQuery Migrate, jQuery UI v1.13.2: MIT License
jQuery Bar Rating Plugin
@@ -1043,6 +1082,11 @@
jQuery insertAtCaret Plugin v1.0 by the phpMyAdmin development team: GNU General Public License
+ jQuery jEditable
+
+ jQuery jEditable: MIT Licence
+
+
jQuery Multiple Select Plugin
jQuery Multiple Select plugin v1.6.0: MIT License
@@ -1068,6 +1112,26 @@
JSZip JavaScript library v3.1.3: MIT License, GNU General Public License v3.0
+ jQuery UI Virtual Keyboard
+
+ jQuery UI Virtual Keyboard v1.30.1: MIT License and WTFPL v2
+
+
+ JS-YAML
+
+ JS-YAML v3.13.1: MIT License
+
+
+ JSHint
+
+ JSHint v2.9.7: MIT License
+
+
+ jsTree Plugin
+
+ jsTree jQuery Plugin v3.3.12: MIT License
+
+
kjua
kjua JavaScript library v0.6.0: MIT License
@@ -1108,6 +1172,11 @@
Select2 library v4.0.13: Apache License, Version 2.0 or GNU General Public License v2.0
+ Sortable
+
+ Sortable JavaScript Library v1.15.0: MIT Licence
+
+
TinyMCE WYSIWYG Editor
TinyMCE WYSIWYG editor v5.9.2: GNU Lesser General Public License v2.1
@@ -1118,6 +1187,11 @@
Verovio: GNU General Public License v3.0, GNU Lesser General Public License v3.0
+ Virtual Keyboard
+
+ Virtual Keyboard v1.30.1: MIT Licence
+
+
[% END # /WRAPPER tab_item licenses %]
[% WRAPPER tab_panel tabname= "translations" %]
--
2.20.1