diff --git a/NOTICE b/NOTICE index 024a3bbcc..71dfcfa87 100644 --- a/NOTICE +++ b/NOTICE @@ -56,6 +56,10 @@ files and utilities for further information: MIT License https://getbootstrap.com/ + Duet Date Picker (app/webroot/js/duet-datepicker) + MIT License + https://github.com/duetds/date-picker + Guzzle (app/AvailablePlugin/GithubProvisioner/Vendor/guzzle) MIT License https://github.com/guzzle/guzzle @@ -68,16 +72,28 @@ files and utilities for further information: MIT License https://bitbucket.org/pellepim/jstimezonedetect - noty (app/webroot/js/jquery/noty) - MIT License - http://ned.im/noty + Material Icons (app/webroot/css/fonts/material-icons) + Apache 2.0 + https://fonts.google.com/icons?selected=Material+Icons + + Open Sans (app/webroot/css/fonts/opensans) + Apache 2.0 + https://fonts.google.com/specimen/Open+Sans PHP GitHub API 2.0 (app/AvailablePlugin/GithubProvisioner/Vendor/guzzle/guzzle) MIT License https://github.com/KnpLabs/php-github-api + Select 2 + MIT License + https://select2.org/ + Shibboleth Embedded Discovery Service (app/webroot/js/eds) Apache 2.0 https://shibboleth.net/products/embedded-discovery-service.html + + vuejs + MIT License + https://vuejs.org/ --------------------------------------------------------------------------- diff --git a/app/templates/element/badgeList.php b/app/templates/element/badgeList.php index 8c27a8991..4c4b3f66b 100644 --- a/app/templates/element/badgeList.php +++ b/app/templates/element/badgeList.php @@ -27,7 +27,7 @@ * 'color' => BadgeColorModeEnum::Blue, * 'outline' => false, * 'pill' => true, - * 'fa_class' => 'fa-key', + * 'icon' => 'material-icons-key', * ), * ); * @@ -48,13 +48,13 @@ foreach($vv_badge_list as $badge) { $badge_classes = []; - $fa_element = ""; + $icon = ""; if(isset($badge['pill']) && $badge['pill']) { $badge_classes[] = "rounded-pill"; } - if(!empty($badge['fa_class'])) { - $fa_element = ''; + if(!empty($badge['icon'])) { + $icon = '' . $badge["icon"] .''; } if(isset($badge['outline']) && $badge['outline']) { $badge_classes[] = "bg-outline-" . $badge['color']; @@ -69,7 +69,7 @@ // Print the Badge print $this->Html->tag( 'span', - $fa_element . $badge['text'], + $icon . $badge['text'], [ 'class' => 'mr-1 badge ' . implode(' ', $badge_classes), 'escape' => false, diff --git a/app/templates/element/menuTop.php b/app/templates/element/menuTop.php index fefd059ad..382d38f4e 100644 --- a/app/templates/element/menuTop.php +++ b/app/templates/element/menuTop.php @@ -38,7 +38,7 @@