From 3ccf5843d26290a74ab3e2b1410aa2396bdb6aa3 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
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 <david@davidnind.com>
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../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 @@
                             <a href="https://c3js.org/">C3.js D3-based reusable chart library v0.4.11</a>: <a href="https://github.com/c3js/c3/blob/0.4.11/LICENSE">MIT Licence</a>
                         </p>
 
+                        <h2>CSSLint</h2>
+                        <p>
+                            <a href="">CSSLint v0.9.8</a>: <a href="https://github.com/CSSLint/csslint/blob/v0.9.8/LICENSE">License</a>
+                        </p>
+
                         <h2>D3</h2>
                         <p>
                             <a href="https://d3js.org/">D3 JavaScript library for visualizing data v3.5.17</a>: <a href="https://github.com/d3/d3/blob/v3.5.17/LICENSE">ISC Licence</a>
                         </p>
 
+                        <h2>DataTables</h2>
+                        <p>
+                            <a href="https://datatables.net/">DataTables v.1.10.18</a>: <a href="https://datatables.net/license/mit">MIT Licence</a>
+                        </p>
+
                         <h2>Day.js</h2>
                         <p>
                             <a href="https://day.js.org/">Day.js v1.11.2</a>: <a href="https://github.com/iamkun/dayjs/blob/v1.11.2/LICENSE">MIT License</a>
@@ -998,6 +1008,15 @@
                             <a href="https://web.archive.org/web/20221224123234/http://www.famfamfam.com/lab/icons/silk/">FamFamFam Silk icons</a>: <a href="https://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>
                         </p>
 
+                        <h2>FileSaver.js</h2>
+                        <p>
+                            <a href="https://github.com/eligrey/FileSaver.js">FileSaver.js</a>: <a href="https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md">MIT License</p>
+
+                        <h2>Flatpicker</h2>
+                        <p>
+                            <a href="https://flatpickr.js.org/">Flatpickr v4.6.9</a>: <a href="https://github.com/flatpickr/flatpickr/blob/v4.6.9/LICENSE.md">MIT License</a>
+                        </p>
+
                         <h2>Font Awesome</h2>
                         <p>
                             <a href="https://fontawesome.com/">Font Awesome v6.3.0</a>: <a href="https://github.com/FortAwesome/Font-Awesome/blob/6.3.0/LICENSE.txt">Creative Commons Attribution 4.0 International License, SIL Open Font License Version 1.1, MIT License </a>
@@ -1008,11 +1027,31 @@
                             <a href="https://github.com/bramstein/fontfaceobserver">Font Face Observer JavaScript library v2.0.3</a>: <a href="https://github.com/bramstein/fontfaceobserver/blob/v2.0.3/LICENSE">BSD License</a>
                         </p>
 
+                        <h2>GreyBox</h2>
+                        <p>
+                            <a href="https://web.archive.org/web/20160819153233/http://orangoo.com:80/labs/GreyBox">GreBox JavaScript Library v5.54</a>: <a href="https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU Lesser General Public License, version 2.1</a>
+                        </p>
+
                         <h2>HC Sticky</h2>
                         <p>
                             <a href="https://somewebmedia.github.io/hc-sticky/">HC Sticky JavaScript library v2.2.3</a>: <a href="https://github.com/somewebmedia/hc-sticky/blob/v2.2.3/LICENSE">MIT License</a>
                         </p>
 
+                        <h2>Highlight</h2>
+                        <p>
+                            <a href="https://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html">Highlight jQuery Plugin v5.0</a>
+                        </p>
+
+                        <h2>HTMLHint</h2>
+                        <p>
+                            <a href="https://htmlhint.com/">HTMLHint v0.9.12</a>: <a href="https://github.com/htmlhint/HTMLHint/blob/v0.9.12/LICENSE.md">MIT License</a>
+                        </p>
+
+                        <h2>Humanized Messages</h2>
+                        <p>
+                            <a href="https://code.google.com/archive/p/humanmsg/">Humanized Messages v1.0</a>
+                        </p>
+
                         <h2>JavaScript Cookie</h2>
                         <p>
                             <a href="https://github.com/js-cookie/js-cookie">JavaScript Cookie v3.0.1</a>: <a href="https://github.com/js-cookie/js-cookie/blob/v3.0.1/LICENSE">MIT License</a>
@@ -1023,9 +1062,9 @@
                             <a href="https://johnresig.com/projects/javascript-diff-algorithm/">Javascript Diff Algorithm</a>: <a href="https://opensource.org/license/mit/">MIT License</a>
                         </p>
 
-                        <h2>jQuery and jQuery UI</h2>
+                        <h2>jQuery, jQuery Migrate, and jQuery UI</h2>
                         <p>
-                            <a href="https://jquery.com/">jQuery v3.6.0</a>, <a href="https://jqueryui.com/">jQuery UI v1.13.2</a>: <a href="https://github.com/jquery/jquery/blob/3.6.0/LICENSE.txt">MIT License</a>
+                            <a href="https://jquery.com/">jQuery v3.6.0</a>, <a href="https://github.com/jquery/jquery-migrate">jQuery Migrate</a>, <a href="https://jqueryui.com/">jQuery UI v1.13.2</a>: <a href="https://github.com/jquery/jquery/blob/3.6.0/LICENSE.txt">MIT License</a>
                         </p>
 
                         <h2>jQuery Bar Rating Plugin</h2>
@@ -1043,6 +1082,11 @@
                             jQuery insertAtCaret Plugin v1.0 by the phpMyAdmin development team: <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU General Public License</a>
                         </p>
 
+                        <h2>jQuery jEditable</h2>
+                        <p>
+                            <a href="https://github.com/NicolasCARPi/jquery_jeditable">jQuery jEditable</a>: <a href="https://github.com/NicolasCARPi/jquery_jeditable/blob/master/LICENSE">MIT Licence</a>
+                        </p>
+
                         <h2>jQuery Multiple Select Plugin</h2>
                         <p>
                             <a href="https://multiple-select.wenzhixin.net.cn/">jQuery Multiple Select plugin v1.6.0</a>: <a href="https://github.com/wenzhixin/multiple-select/blob/1.6.0/LICENSE">MIT License</a>
@@ -1068,6 +1112,26 @@
                             <a href="https://stuk.github.io/jszip/">JSZip JavaScript library v3.1.3</a>: <a href="https://github.com/Stuk/jszip/blob/v3.1.3/LICENSE.markdown">MIT License, GNU General Public License v3.0</a>
                         </p>
 
+                        <h2>jQuery UI Virtual Keyboard</h2>
+                        <p>
+                            <a href="https://mottie.github.io/Keyboard/">jQuery UI Virtual Keyboard v1.30.1</a>: <a href="https://github.com/Mottie/Keyboard/blob/v1.30.1/LICENSE">MIT License and WTFPL v2</a>
+                        </p>
+
+                        <h2>JS-YAML</h2>
+                        <p>
+                            <a href="https://nodeca.github.io/js-yaml/">JS-YAML v3.13.1</a>: <a href="https://github.com/nodeca/js-yaml/blob/3.13.1/LICENSE">MIT License</a>
+                        </p>
+
+                        <h2>JSHint</h2>
+                        <p>
+                            <a href="">JSHint v2.9.7</a>: <a href="https://github.com/jshint/jshint/blob/2.9.7/LICENSE">MIT License</a>
+                        </p>
+
+                        <h2>jsTree Plugin</h2>
+                        <p>
+                            <a href="https://www.jstree.com/">jsTree jQuery Plugin v3.3.12</a>: <a href="https://github.com/vakata/jstree/blob/3.3.12/LICENSE-MIT">MIT License</a>
+                        </p>
+
                         <h2>kjua</h2>
                         <p>
                             <a href="https://larsjung.de/kjua/">kjua JavaScript library v0.6.0</a>: <a href="https://github.com/lrsjng/kjua/blob/v0.6.0/README.md">MIT License</a>
@@ -1108,6 +1172,11 @@
                             <a href="https://select2.github.io/select2/">Select2 library v4.0.13</a>: <a href="https://github.com/select2/select2/blob/4.0.13/LICENSE">Apache License, Version 2.0 or GNU General Public License v2.0</a>
                         </p>
 
+                        <h2>Sortable</h2>
+                        <p>
+                            <a href="https://sortablejs.github.io/Sortable/">Sortable JavaScript Library v1.15.0</a>: <a href="https://github.com/SortableJS/Sortable/blob/1.15.0/LICENSE">MIT Licence</a>
+                        </p>
+
                         <h2>TinyMCE WYSIWYG Editor</h2>
                         <p>
                             <a href="https://www.tiny.cloud/">TinyMCE WYSIWYG editor v5.9.2</a>: <a href="https://github.com/tinymce/tinymce/blob/5.9.2/LICENSE.TXT">GNU Lesser General Public License v2.1</a>
@@ -1118,6 +1187,11 @@
                             <a href="https://www.verovio.org/">Verovio</a>: <a href="https://github.com/rism-digital/verovio/blob/develop/COPYING">GNU General Public License v3.0</a>, <a href="https://github.com/rism-digital/verovio/blob/develop/COPYING.LESSER">GNU Lesser General Public License v3.0</a>
                         </p>
 
+                        <h2>Virtual Keyboard</h2>
+                        <p>
+                            <a href="https://mottie.github.io/Keyboard/index.html">Virtual Keyboard v1.30.1</a>: <a href="https://github.com/Mottie/Keyboard/blob/v1.30.1/LICENSE">MIT Licence</a>
+                        </p>
+
                     [% END # /WRAPPER tab_item licenses %]
 
                     [% WRAPPER tab_panel tabname= "translations" %]
-- 
2.39.5