diff --git a/util/db-mysql.sql b/util/db-mysql.sql index ccc1eb36..13eeb395 100644 --- a/util/db-mysql.sql +++ b/util/db-mysql.sql @@ -362,6 +362,7 @@ create table if not exists `customer_settings` ( `domain` varchar(255) not null unique, `branding_text` varchar(255) default null, `branding_url` varchar(255) default null, + `branding_logo` varchar(255) default null, `support_link` varchar(255) default null, `colour` varchar(255) default null ) Engine=InnoDB; diff --git a/util/db-upgrade-0.1.23-vs-0.1.24.sql b/util/db-upgrade-0.1.23-vs-0.1.24.sql index 1709aa70..bcc9230f 100644 --- a/util/db-upgrade-0.1.23-vs-0.1.24.sql +++ b/util/db-upgrade-0.1.23-vs-0.1.24.sql @@ -18,6 +18,7 @@ create table if not exists `customer_settings` ( `domain` varchar(255) not null unique, `branding_text` varchar(255) default null, `branding_url` varchar(255) default null, + `branding_logo` varchar(255) default null, `support_link` varchar(255) default null, `colour` varchar(255) default null ) Engine=InnoDB; diff --git a/webui/config.php b/webui/config.php index 3453018d..dd45cfdb 100644 --- a/webui/config.php +++ b/webui/config.php @@ -16,8 +16,11 @@ $config['PILERGETD_PASSWORD'] = ''; $config['BRANDING_TEXT'] = ''; $config['BRANDING_URL'] = ''; +$config['BRANDING_LOGO'] = ''; $config['SUPPORT_LINK'] = ''; +$config['SHOW_COMPANY_LINK'] = 1; + $config['DEFAULT_LANG'] = 'en'; $config['THEME'] = 'default'; diff --git a/webui/model/saas/customer.php b/webui/model/saas/customer.php index 1634ca85..55f019c2 100644 --- a/webui/model/saas/customer.php +++ b/webui/model/saas/customer.php @@ -7,7 +7,7 @@ class ModelSaasCustomer extends Model $data = array( 'branding_text' => BRANDING_TEXT, 'branding_url' => BRANDING_URL, - 'branding_logo' => SITE_LOGO_SM, + 'branding_logo' => BRANDING_LOGO, 'support_link' => SUPPORT_LINK, 'colour' => '' ); diff --git a/webui/view/theme/default/templates/audit/helper.tpl b/webui/view/theme/default/templates/audit/helper.tpl index 7242ce85..6d153e2e 100644 --- a/webui/view/theme/default/templates/audit/helper.tpl +++ b/webui/view/theme/default/templates/audit/helper.tpl @@ -43,7 +43,7 @@ - + 0) { ?> 0) { ?> diff --git a/webui/view/theme/default/templates/common/layout-audit.tpl b/webui/view/theme/default/templates/common/layout-audit.tpl index d1f73057..a4816a93 100644 --- a/webui/view/theme/default/templates/common/layout-audit.tpl +++ b/webui/view/theme/default/templates/common/layout-audit.tpl @@ -35,52 +35,76 @@ -
-
- +
-
+
- - - + -
-
+
+ + + + + +
+
-
-
-
+
+
+
-
-
-
-
+
-
- -
-
-
- - - -
+
-
+
-
+
+ +
+
+
+ +
+
+ + + + + +
+ + + +
+ +
+ +
+ + + + + + -
diff --git a/webui/view/theme/default/templates/common/layout-search.tpl b/webui/view/theme/default/templates/common/layout-search.tpl index df0912f2..f5f4076a 100644 --- a/webui/view/theme/default/templates/common/layout-search.tpl +++ b/webui/view/theme/default/templates/common/layout-search.tpl @@ -25,7 +25,7 @@ - + diff --git a/webui/view/theme/default/templates/common/menu.tpl b/webui/view/theme/default/templates/common/menu.tpl index 5314812f..90835d83 100644 --- a/webui/view/theme/default/templates/common/menu.tpl +++ b/webui/view/theme/default/templates/common/menu.tpl @@ -66,7 +66,7 @@