diff --git a/.gitignore b/.gitignore index 18fc90d..240c4ae 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ pub/data/devices/*/firmware/* .idea/* composer.* CAcert.crt -pub/config.php \ No newline at end of file +pub/config.php +pub/bin/pages/pageThemeTest.php +pub/colors.html diff --git a/pub/bin/pages/pageDashboard.php b/pub/bin/pages/pageDashboard.php index e64fb16..0460a9e 100644 --- a/pub/bin/pages/pageDashboard.php +++ b/pub/bin/pages/pageDashboard.php @@ -37,32 +37,34 @@ function showCard($module_name, $page_name, $width = 3) -
- checkPermissions('customer-companies', 'RO', true)) { - showCard('customers', 'companies', '6'); - } +
+ checkPermissions('customer-companies', 'RO', true)) { + showCard('customers', 'companies', '6'); + } - if ($GLOBALS['modules_enabled']['servers'] && $API->checkPermissions('servers', 'RO', true)) { - showCard('servers', 'server_overview', '6'); - } + if ($GLOBALS['modules_enabled']['servers'] && $API->checkPermissions('servers', 'RO', true)) { + showCard('servers', 'server_overview', '6'); + } - if ($GLOBALS['modules_enabled']['office'] && $API->checkPermissions('ofice-stompjes', 'RO', true)) { - showCard('office', 'stompjeslist'); - } + if ($GLOBALS['modules_enabled']['office'] && $API->checkPermissions('ofice-stompjes', 'RO', true)) { + showCard('office', 'stompjeslist'); + } - if ($GLOBALS['modules_enabled']['autop']) { - showCard('autop', 'platforms'); - showCard('autop', 'vendors'); - showCard('autop', 'devices'); - showCard('autop', 'device_settings'); - showCard('autop', 'provisioning'); - showCard('autop', 'phonebooks'); - } + if ($GLOBALS['modules_enabled']['autop']) { + showCard('autop', 'platforms'); + showCard('autop', 'vendors'); + showCard('autop', 'devices'); + showCard('autop', 'device_settings'); + showCard('autop', 'provisioning'); + showCard('autop', 'phonebooks'); + } - if ($GLOBALS['modules_enabled']['portal-management']) { - showCard('portal-management', 'access_control'); - showCard('portal-management', 'systemconfig'); - } - ?> -
\ No newline at end of file + if ($GLOBALS['modules_enabled']['portal-management']) { + showCard('portal-management', 'access_control'); + showCard('portal-management', 'systemconfig'); + } + ?> +
+ + \ No newline at end of file diff --git a/pub/bin/php/Classes/pageBuilder.php b/pub/bin/php/Classes/pageBuilder.php index a8aa8a6..e25f225 100644 --- a/pub/bin/php/Classes/pageBuilder.php +++ b/pub/bin/php/Classes/pageBuilder.php @@ -71,7 +71,7 @@ class pageBuilder extends API pageHeadContent(); ?> - +
pageSidebarContent(); ?>
@@ -83,7 +83,6 @@ class pageBuilder extends API if (isset($jsScriptLoadData)) { $this->jsScriptLoadData = $jsScriptLoadData; } - ?>
@@ -111,35 +110,6 @@ class pageBuilder extends API - - - + + + + @@ -279,9 +211,9 @@ class pageBuilder extends API -
+