Merge branch 'overwrite-all' of https://github.com/felixhahnweilheim/…

…humhub-flex-theme into overwrite-all

Module.php

@@ -12,6 +12,7 @@
 class Module extends \humhub\components\Module
 {
     public $resourcesPath = 'resources';
+    public $defaultRoute = 'admin';
 
     public const FLEX_THEME_NAME = 'FlexTheme';
 

assets/AdminAssets.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace humhub\modules\flexTheme\assets;
+
+class AdminAssets extends \humhub\components\assets\AssetBundle
+{
+    public $publishOptions = [
+        'forceCopy' => false
+    ];
+
+    public $sourcePath = '@flex-theme/resources';
+
+    public $js = [
+        'js/flex-theme-admin.js',
+    ];
+}

docs/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## TBA
 - Fix #42: Division by zero (when trying to lighten white color)
 - Fix #43: Invalid faded color calculated from 3 digits base color
+- Enh #45: Add option to reset all colors of the current form
+- Enh #45: Add default route 'admin'
 
 ## 0.3.0 (14 february 2024)
 **NOTE** Files in themes/FlexTheme/css now need to be writable by the PHP process (see https://docs.humhub.org/docs/admin/installation/#file-permissions)

messages/am/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/an/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/ar/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/bg/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/br/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/ca/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/cs/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/cy/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/da/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/de/admin.php

@@ -29,10 +29,11 @@
     'WARNING' => 'WARNUNG',
     'Warning: Flex Theme is not active, settings on this page won\'t have any effect!' => 'Warnung: Flex Theme is nicht aktiv, Einstellungen auf dieser Seite haben keinen Effekt!',
     'Your settings will be overwritten!' => 'Ihre Einstellungen werden überschrieben!',
-    'Dark Mode' => '',
-    'Experimental' => '',
-    'File upload links' => '',
-    'Please use the module {darkmode} and select "HumHub (dark)".' => '',
-    'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
-    'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
+    'Dark Mode' => 'Dunkler Modus',
+    'Experimental' => 'Experimentell',
+    'File upload links' => 'Datei-Upload-Links',
+    'Please use the module {darkmode} and select "HumHub (dark)".' => 'Bitte nutze das Modul {darkmode} und wähle "HumHub (dark)" aus.',
+    'Reset all colors' => 'Alle Farben zurücksetzen',
+    'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => 'Einstellungen wurden mit Warnungen/Fehlern gespeichert. Bitte sieh in den Logs nach. (Administration > Information > Protokolle)',
+    'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => 'Zeige Datei-Upload-Optionen (Bild, Audio, Video...) als Buttons anstelle des Dropdown-Menüs.',
 ];

messages/el/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/es-419/admin.php

@@ -0,0 +1,39 @@
+<?php
+
+return [
+    '<strong>Flex Theme</strong> Configuration' => '',
+    'Advanced' => '',
+    'Background Colors' => '',
+    'Color for Like Icon' => '',
+    'Colors' => '',
+    'Dark Mode' => '',
+    'Default' => '',
+    'Experimental' => '',
+    'File upload links' => '',
+    'Flexible Theme for HumHub' => '',
+    'General Settings' => '',
+    'Import/Export' => '',
+    'Invalid Format' => '',
+    'JSON could not be converted!' => '',
+    'Like Icon' => '',
+    'Like Icon (already liked)' => '',
+    'Main Colors' => '',
+    'Must be a color in hexadecimal format, like "#00aaff" or "#FA0"' => '',
+    'Only icon' => '',
+    'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
+    'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
+    'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
+    'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
+    'Show topic menu in user profiles and spaces.' => '',
+    'Style of Comment Button' => '',
+    'Style of Like Button' => '',
+    'Text Colors' => '',
+    'Text and icon' => '',
+    'Text link' => '',
+    'There seem to be invalid values!' => '',
+    'Topic Menu' => '',
+    'WARNING' => '',
+    'Warning: Flex Theme is not active, settings on this page won\'t have any effect!' => '',
+    'Your settings will be overwritten!' => '',
+];

messages/es/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/et/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/eu/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/fa-IR/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/fi/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/fr/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/he/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/hr/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/ht/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/hu/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/id/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/it/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/ja/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/ko/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/lt/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/lv/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/nb-NO/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/nl/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/nn-NO/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/pl/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',

messages/pt-BR/admin.php

@@ -22,6 +22,7 @@
     'Only icon' => '',
     'Please go to Administration > Settings > Appearance and select "Flex Theme".' => '',
     'Please use the module {darkmode} and select "HumHub (dark)".' => '',
+    'Reset all colors' => '',
     'Settings were saved with warnings/errors. Please check the logging. (Administration > Information > Logging)' => '',
     'Show File Upload options (image, audio, video...) as buttons instead of dropdown.' => '',
     'Show topic menu in user profiles and spaces.' => '',