s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 06:00:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'branding' into develop

Browse Source
This commit is contained in:
Xenomporio 2022-07-03 21:44:23 +02:00
commit 48d4540d04
7 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/eproosystem.php
View File

@ -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'

5
www/lib/class.erpapi.php
View File

@ -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');

8
www/pages/content/einstellungen.tpl
View File

@ -106,16 +106,16 @@
<table width="800" border="0" align="center">
<tr align="center">
<td width="25%"><a href="index.php?module=prozessstarter&action=list"><img src="./themes/[THEME]/images/einstellungen/Icons_dunkel_22.gif" border="0" width="30%"></a></td>
<td width="25%"><a href="index.php?module=logfile&action=list"><img src="./themes/[THEME]/images/einstellungen/Icons_dunkel_22.gif" border="0" width="30%"></a></td>
<td width="25%"><a href="index.php?module=welcome&action=info"><img src="./themes/[THEME]/images/einstellungen/Icons_dunkel_23.gif" border="0" width="30%"></a></td>
<td width="25%"><a href="index.php?module=drucker&action=list"><img src="./themes/[THEME]/images/einstellungen/Icons_dunkel_24.gif" border="0" width="30%"></a></td>
<td width="25%"><a href="index.php?module=adapterbox&action=list"><img src="./themes/[THEME]/images/einstellungen/Icons_dunkel_25.gif" border="0" width="30%"></a></td>
</tr>
<tr align="center">
<td><a href="index.php?module=prozessstarter&action=list">{|Prozessstarter|}</a></td>
<td><a href="index.php?module=prozessstarter&action=list">{|Errorlog|}</a></td>
<td><a href="index.php?module=welcome&action=info">{|Lizenz|}</a></td>
<td><a href="index.php?module=drucker&action=list">{|Drucker|}</a></td>
<td><a href="index.php?module=adapterbox&action=list">{|Adapterbox|}</a></td>
</tr>
</table>
<table width="800" border="0" align="center">
@ -138,14 +138,14 @@
<tr align="center">
<td width="25%"><a href="index.php?module=support&action=list"><img src="./themes/[THEME]/images/einstellungen/Icons_dunkel_23.gif" border="0" width="30%"></a></td>
<td width="25%"><a href="index.php?module=api_account&action=list"><img src="./themes/[THEME]/images/einstellungen/Icons_dunkel_25.gif" border="0" width="30%"></td>
<td width="25%" style="position:relative"></td>
<td width="25%"><a href="index.php?module=adapterbox&action=list"><img src="./themes/[THEME]/images/einstellungen/Icons_dunkel_25.gif" border="0" width="30%"></a></td>
<td width="25%" style="position:relative"></td>
</tr>
<tr align="center">
<td><a href="index.php?module=support&action=list">{|Support|}</a></td>
<td><a href="index.php?module=api_account&action=list">{|API-Account|}</a></td>
<td></td>
<td><a href="index.php?module=adapterbox&action=list">{|Adapterbox|}</a></td>
<td width="25%"></td>
</tr>
</table>

5
www/themes/new/images/sidebar/chat.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="18" height="16" viewBox="0 0 18 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6654 11.333C16.6654 11.7012 16.3669 11.9997 15.9987 11.9997H8.66536L5.9987 14.6663V11.9997H1.9987C1.63051 11.9997 1.33203 11.7012 1.33203 11.333V1.99967C1.33203 1.63148 1.63051 1.33301 1.9987 1.33301H15.9987C16.3669 1.33301 16.6654 1.63148 16.6654 1.99967V11.333Z" stroke="var(--header-icon-color, #76899F)" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M4.66406 8H13.3307" stroke="var(--header-icon-color, #76899F)" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M4.66406 4.66602H13.3307" stroke="var(--header-icon-color, #76899F)" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 763 B

8
www/themes/new/images/sidebar/system.svg Normal file
View File

@ -0,0 +1,8 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1.4375 2.9375C1.4375 2.10907 2.10907 1.4375 2.9375 1.4375H13.0625C13.8909 1.4375 14.5625 2.10907 14.5625 2.9375V13.0625C14.5625 13.8909 13.8909 14.5625 13.0625 14.5625H2.9375C2.10907 14.5625 1.4375 13.8909 1.4375 13.0625V2.9375Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M8.4375 10.1875H11.9375" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M4.0625 10.1875H5.8125" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.4375 10.1875C8.4375 10.9123 7.84999 11.4999 7.12519 11.5C6.4004 11.5001 5.81271 10.9127 5.8125 10.1879C5.81229 9.46309 6.39962 8.87532 7.12442 8.875C7.47261 8.87485 7.8066 9.01306 8.05287 9.25922C8.29914 9.50537 8.4375 9.8393 8.4375 10.1875V10.1875Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M9.3125 5.8125H4.0625" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9375 5.8125C11.9375 5.0877 11.35 4.50011 10.6252 4.5C9.9004 4.49989 9.31271 5.08731 9.3125 5.81211C9.31229 6.53691 9.89962 7.12468 10.6244 7.125C11.3494 7.125 11.9372 6.53747 11.9375 5.8125Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

9
www/themes/new/templates/page.tpl
View File

@ -25,7 +25,7 @@
<script type="text/javascript" src="./js/jquery.cookie.js" ></script>
<script type="text/javascript" src="./js/jquery-multidownload.js" ></script>
<script type="text/javascript" src="./js/jquery.loadingOverlay.js" ></script>
<script type="text/javascript" src="./js/lib/[VUEJS]"></script>
<script type="text/javascript" src="./js/lib/[VUEJS]"></script>
<link rel="stylesheet" type="text/css" href="./js/datatables/datatables.min.css"/>
<link rel="stylesheet" type="text/css" href="./themes/[THEME]/css/datatables_custom.css?v=3"/>
@ -49,10 +49,9 @@
<link rel="stylesheet" href="./themes/[THEME]/css/calendar.css?v=3">
<script type="text/javascript" src="./js/bootstrap.min.js" ></script>
<link rel="icon" type="image/png" sizes="32x32" href="./themes/new/images/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="./themes/new/images/favicon/favicon-16x16.png">
<meta name="msapplication-TileColor" content="#9f00a7">
<meta name="theme-color" content="#ffffff">
<link rel="icon" type="image/png" sizes="32x32" href="./themes/new/images/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="./themes/new/images/favicon/favicon-16x16.png">
<link rel="shortcut icon" href="./themes/new/images/favicon/favicon.ico">
<link type="text/css" href="./themes/[THEME]/css/start/jquery-ui-1.10.3.custom.css?v=4" rel="Stylesheet" />
<link href="./themes/[THEME]/css/colorPicker.css" rel="stylesheet" type="text/css" />

2
www/themes/new/templates/popup_js.tpl
View File

@ -50,8 +50,6 @@
<link id="favicon" rel="icon" href="./themes/new/images/favicon/favicon.ico" type="image/x-icon">
<link rel="icon" type="image/png" href="./themes/new/images/favicon/favicon-16x16.png" sizes="16x16">
<link rel="icon" type="image/png" href="./themes/new/images/favicon/favicon-32x32.png" sizes="32x32">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-navbutton-color" content="#ffffff">
<link type="text/css" href="./themes/[THEME]/css/start/jquery-ui-1.10.3.custom.css?v=3" rel="Stylesheet" />
<link href="./themes/[THEME]/css/colorPicker.css" rel="stylesheet" type="text/css" />