diff --git a/www/eproosystem.php b/www/eproosystem.php index 7a7a94ab..0dd40156 100644 --- a/www/eproosystem.php +++ b/www/eproosystem.php @@ -451,14 +451,14 @@ class erpooSystem extends Application 'link' => 'index.php?module=aufgaben&action=list', 'counter' => $this->erp->AnzahlOffeneAufgaben() ], - 'Wiedervorlage' => [ +/* 'Wiedervorlage' => [ 'link' => 'index.php?module=wiedervorlage&action=list', 'counter' => $resubmissionCount, - ], + ],*/ 'Kalender' => [ 'link' => 'index.php?module=kalender&action=list', 'counter' => $appointmentCount - ], + ] ]; /* $possibleUserItems['Apps'] = [ 'link'=> 'index.php?module=appstore&action=list&cmd=allapps' diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php index 395285f0..5e179917 100644 --- a/www/lib/class.erpapi.php +++ b/www/lib/class.erpapi.php @@ -7107,12 +7107,9 @@ title: 'Abschicken', $navarray['menu']['admin'][$menu]['sec'][] = array('Ein- und auslagern','lager','bucheneinlagern'); $navarray['menu']['admin'][$menu]['sec'][] = array('Zwischenlager','lager','buchenzwischenlager'); - - - $navarray['menu']['admin'][++$menu]['first'] = array('Administration','rechnung','list'); + $navarray['menu']['admin'][++$menu]['first'] = array('System','rechnung','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Einstellungen','einstellungen','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Online-Shops / Marktplätze','onlineshops','list'); - $navarray['menu']['admin'][$menu]['sec'][] = array('Backup','backup','list','recover','delete','reset'); //$navarray['menu']['admin'][$menu]['sec'][] = array('AppStore','appstore','list'); diff --git a/www/pages/content/einstellungen.tpl b/www/pages/content/einstellungen.tpl index 0b6351dc..5a0c27f8 100644 --- a/www/pages/content/einstellungen.tpl +++ b/www/pages/content/einstellungen.tpl @@ -106,16 +106,16 @@ + - + -
{|Prozessstarter|}{|Errorlog|} {|Lizenz|} {|Drucker|}{|Adapterbox|}
@@ -138,14 +138,14 @@ - + - +
{|Support|} {|API-Account|}{|Adapterbox|}
diff --git a/www/themes/new/images/sidebar/chat.svg b/www/themes/new/images/sidebar/chat.svg new file mode 100644 index 00000000..d3c7371e --- /dev/null +++ b/www/themes/new/images/sidebar/chat.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/www/themes/new/images/sidebar/system.svg b/www/themes/new/images/sidebar/system.svg new file mode 100644 index 00000000..552ea5d7 --- /dev/null +++ b/www/themes/new/images/sidebar/system.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/www/themes/new/templates/page.tpl b/www/themes/new/templates/page.tpl index ad06147b..f660520d 100644 --- a/www/themes/new/templates/page.tpl +++ b/www/themes/new/templates/page.tpl @@ -25,7 +25,7 @@ - + @@ -49,10 +49,9 @@ - - - - + + + diff --git a/www/themes/new/templates/popup_js.tpl b/www/themes/new/templates/popup_js.tpl index 3feae187..3ed518ba 100644 --- a/www/themes/new/templates/popup_js.tpl +++ b/www/themes/new/templates/popup_js.tpl @@ -50,8 +50,6 @@ - -