diff --git a/INSTALL.md b/INSTALL.md index 6afa5384b..386791fde 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -# Xenomporio installation +# OpenXE installation ## Place the installation files into a folder in /var/www/html/. @@ -6,17 +6,17 @@ e.g. Release 1.0: -`sudo wget https://github.com/xenomporio-org/Xenomporio/archive/refs/tags/V.1.0.zip` +`sudo wget https://github.com/openxe-org/OpenXE/archive/refs/tags/V.1.0.zip` `unzip V.1.0.zip` ## Set folder permissions: -`sudo chown www-data:www-data Xenomporio-V.1.0 -R` +`sudo chown www-data:www-data OpenXE-V.1.0 -R` ## Fire up the setup page in a browser -http://yourserverip/Xenomporio-V.1.0 (watch out, its case sensitive) +http://yourserverip/OpenXE-V.1.0 (watch out, its case sensitive) diff --git a/README.md b/README.md index 81c925de0..0e1c0c0ee 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # OpenXE - The free ERP -![Xenomporio overview](https://github.com/xenomporio-org/Xenomporio/blob/master/www/themes/new/images/login_screen_picture.jpg "Xenomporio") +![OpenXE overview](https://github.com/openxe-org/OpenXE/blob/master/www/themes/new/images/login_screen_picture.jpg "OpenXE") OpenXE ist eine umfassende webbasierte Anwendung zur Abwicklung aller kaufmännischen Prozesse. Zu den Funktionen gehören unter Anderem: @@ -23,7 +23,7 @@ Wir freuen uns über Eure Teilnahme, egal ob als stiller Mitleser oder aktiver U # Letzte Änderungen: Ticket System -Neu in [V.1.3](https://github.com/xenomporio-org/Xenomporio/releases/tag/V.1.3): +Neu in [V.1.3](https://github.com/openxe-org/OpenXE/releases/tag/V.1.3): Neuimplementierung des Xentral 20 Enterprise Ticketsystems mit vielen Verbesserungen, z.B.: - Anhänge werden auch bei ausgehenden Nachrichten gespeichert - Verbesserte Kommentarfunktion diff --git a/SERVER_INSTALL.md b/SERVER_INSTALL.md index 9546128da..569448739 100644 --- a/SERVER_INSTALL.md +++ b/SERVER_INSTALL.md @@ -129,7 +129,7 @@ installation should now be secure. Thanks for using MariaDB! ``` -## Create database for xenomporio +## Create database for openxe `mysql -u root -p` ``` @@ -141,13 +141,13 @@ Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others. Type 'help;' or '\h' for help. Type '\c' to clear the current input statement. -MariaDB [(none)]> CREATE DATABASE xenomporio; +MariaDB [(none)]> CREATE DATABASE openxe; Query OK, 1 row affected (0.001 sec) -MariaDB [(none)]> CREATE USER 'xenomporio'@'localhost' IDENTIFIED BY 'enteryourpasswordhere'; +MariaDB [(none)]> CREATE USER 'openxe'@'localhost' IDENTIFIED BY 'enteryourpasswordhere'; Query OK, 0 rows affected (0.015 sec) -MariaDB [(none)]> GRANT ALL PRIVILEGES ON xenomporio.* TO 'xenomporio'@'localhost' WITH GRANT OPTION; +MariaDB [(none)]> GRANT ALL PRIVILEGES ON openxe.* TO 'openxe'@'localhost' WITH GRANT OPTION; Query OK, 0 rows affected (0.012 sec) MariaDB [(none)]> FLUSH PRIVILEGES; @@ -159,7 +159,7 @@ Bye ``` You can test your database like this: -`mysql -u xenomporio -p` +`mysql -u openxe -p` ``` Enter password: @@ -176,7 +176,7 @@ MariaDB [(none)]> show databases; | Database | +--------------------+ | information_schema | -| xenomporio | +| openxe | +--------------------+ 2 rows in set (0.001 sec) @@ -185,4 +185,4 @@ Bye ``` ## --> Reset your server -Continue with [Xenomporio Installation](INSTALL.md) +Continue with [OpenXE Installation](INSTALL.md) diff --git a/classes/Core/DependencyInjection/Definition/FactoryMethodDefinition.php b/classes/Core/DependencyInjection/Definition/FactoryMethodDefinition.php index 971f77145..e43eb0952 100644 --- a/classes/Core/DependencyInjection/Definition/FactoryMethodDefinition.php +++ b/classes/Core/DependencyInjection/Definition/FactoryMethodDefinition.php @@ -23,7 +23,7 @@ public function __construct($callable, $shared = true) if (!is_callable($callable, false)) { /* - xenomporio + OpenXE-todo unknown compatibility issue commented out as hotfix diff --git a/classes/Core/ErrorHandler/ErrorPageData.php b/classes/Core/ErrorHandler/ErrorPageData.php index dcc16f42e..469d65dfa 100644 --- a/classes/Core/ErrorHandler/ErrorPageData.php +++ b/classes/Core/ErrorHandler/ErrorPageData.php @@ -20,7 +20,7 @@ final class ErrorPageData implements JsonSerializable public function __construct($exception, $title = null) { $this->exception = $exception; - $this->title = !empty($title) ? (string)$title : 'Xenomporio: Es ist ein unerwarteter Fehler aufgetreten!'; + $this->title = !empty($title) ? (string)$title : 'OpenXE: Es ist ein unerwarteter Fehler aufgetreten!'; } diff --git a/cronjobs/chat.php b/cronjobs/chat.php index 3c1485552..6010ecebd 100644 --- a/cronjobs/chat.php +++ b/cronjobs/chat.php @@ -421,7 +421,7 @@ function GetHtmlMessage($receipientName, $messageTotalCount, $messages = []) - [Xenomporio] Ungelesene Chat-Nachrichten + [OpenXE] Ungelesene Chat-Nachrichten -Xenomporio Installer -

Xenomporio Installer

+OpenXE Installer +

OpenXE Installer

{$html}

-Xenomporio is free open source software under AGPL-3.0 license, based on Xentral® by Xentral ERP Software GmbH.

+OpenXE is free open source software under AGPL-3.0 license, based on Xentral® by Xentral ERP Software GmbH.

"; } diff --git a/www/themes/new/css/styles.css b/www/themes/new/css/styles.css index 7e876f049..5bdf18ed9 100644 --- a/www/themes/new/css/styles.css +++ b/www/themes/new/css/styles.css @@ -223,11 +223,23 @@ html { padding-left: 25px; } +#sidebar .logo-index .sidebar_icon_logo{ + display: none; +} + #sidebar.collapsed .logo-index{ width: 55px; text-align: left; } +#sidebar.collapsed .logo-index .sidebar_logo { + display: none; +} + +#sidebar.collapsed .logo-index .sidebar_icon_logo { + display: block; +} + #sidebar .sidebar-list{ padding: 15px 0; } diff --git a/www/themes/new/images/favicon/favicon-16x16.png b/www/themes/new/images/favicon/favicon-16x16.png index d33ef1693..341b851be 100644 Binary files a/www/themes/new/images/favicon/favicon-16x16.png and b/www/themes/new/images/favicon/favicon-16x16.png differ diff --git a/www/themes/new/images/favicon/favicon-32x32.png b/www/themes/new/images/favicon/favicon-32x32.png index 0e8ffc557..60bb208b2 100644 Binary files a/www/themes/new/images/favicon/favicon-32x32.png and b/www/themes/new/images/favicon/favicon-32x32.png differ diff --git a/www/themes/new/images/favicon/favicon.ico b/www/themes/new/images/favicon/favicon.ico index caaa911d8..6525d7e85 100644 Binary files a/www/themes/new/images/favicon/favicon.ico and b/www/themes/new/images/favicon/favicon.ico differ diff --git a/www/themes/new/images/openxe_logo.svg b/www/themes/new/images/openxe_logo.svg new file mode 100644 index 000000000..9ff84b640 --- /dev/null +++ b/www/themes/new/images/openxe_logo.svg @@ -0,0 +1,92 @@ + +image/svg+xml + + + + + + + + + + + + + + + + diff --git a/www/themes/new/templates/loginpage.tpl b/www/themes/new/templates/loginpage.tpl index 31cd1c923..92e0d0dd9 100644 --- a/www/themes/new/templates/loginpage.tpl +++ b/www/themes/new/templates/loginpage.tpl @@ -3,7 +3,7 @@ - Xenomporio - Login + OpenXE - Login @@ -28,7 +28,7 @@
- Willkommen bei Xenomporio ERP.
+ Willkommen bei OpenXE ERP.
Bitte gib Deinen Benutzernamen und Passwort ein!

Achtung: Es werden gerade Wartungsarbeiten in Ihrem System (z.B. Update oder Backup) durch Ihre IT-Abteilung durchgeführt. Das System sollte in wenigen Minuten wieder erreichbar sein. Für Rückfragen wenden Sie sich bitte an Ihren Administrator.

@@ -37,11 +37,11 @@ [PAGE] diff --git a/www/themes/new/templates/passwortvergessenpage.tpl b/www/themes/new/templates/passwortvergessenpage.tpl index baf453f60..01f19887c 100644 --- a/www/themes/new/templates/passwortvergessenpage.tpl +++ b/www/themes/new/templates/passwortvergessenpage.tpl @@ -4,7 +4,7 @@ - Xenomporio - Passwort vergessen + OpenXE - Passwort vergessen @@ -18,7 +18,7 @@
- + @@ -26,7 +26,7 @@ [PAGE]
diff --git a/www/themes/new/templates/sidebar.tpl b/www/themes/new/templates/sidebar.tpl index d14c60d54..6c5f7d530 100644 --- a/www/themes/new/templates/sidebar.tpl +++ b/www/themes/new/templates/sidebar.tpl @@ -10,7 +10,7 @@
- + [SIDEBARLOGO] diff --git a/www/themes/new/templates/sidebar_icon_logo.svg b/www/themes/new/templates/sidebar_icon_logo.svg new file mode 100644 index 000000000..09a43ddba --- /dev/null +++ b/www/themes/new/templates/sidebar_icon_logo.svg @@ -0,0 +1,46 @@ + +image/svg+xml + + + + + + + diff --git a/www/themes/new/templates/sidebar_logo.svg b/www/themes/new/templates/sidebar_logo.svg index 77964121a..27a0e315b 100644 --- a/www/themes/new/templates/sidebar_logo.svg +++ b/www/themes/new/templates/sidebar_logo.svg @@ -1,417 +1,94 @@ + image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Xenomporio - - - - + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + + + + + + + + + + + + + + + diff --git a/www/update.tpl b/www/update.tpl index c262b9193..814d82442 100644 --- a/www/update.tpl +++ b/www/update.tpl @@ -13,7 +13,7 @@ -Xenomporio Update +OpenXE Update @@ -471,7 +471,7 @@ display:none;
-

Xenomporio Update

+

OpenXE Update

[PAGE] @@ -483,7 +483,7 @@ display:none;
Datenbank Update:
- +
@@ -867,7 +867,7 @@ display:none;