diff --git a/webui/config.php b/webui/config.php index 67efc04..78befbd 100644 --- a/webui/config.php +++ b/webui/config.php @@ -21,6 +21,7 @@ $config['BRANDING_TEXT_COLOUR'] = ''; $config['BRANDING_FAVICON'] = ''; $config['SUPPORT_LINK'] = ''; +$config['TITLE_PREFIX'] = ''; $config['BOOTSTRAP_THEME'] = '-cosmo'; diff --git a/webui/controller/login/login.php b/webui/controller/login/login.php index 4037520..7e15339 100644 --- a/webui/controller/login/login.php +++ b/webui/controller/login/login.php @@ -33,6 +33,7 @@ } $this->data['title'] = $this->data['text_login']; + $this->data['title_prefix'] = TITLE_PREFIX; if($this->request->server['REQUEST_METHOD'] == 'POST' && $this->validate() == true) { diff --git a/webui/controller/login/logout.php b/webui/controller/login/logout.php index c7274d0..6b4f05c 100644 --- a/webui/controller/login/logout.php +++ b/webui/controller/login/logout.php @@ -8,7 +8,7 @@ $this->id = "content"; $this->template = "login/logout.tpl"; - $this->layout = "common/layout"; + $this->layout = "common/layout-empty"; $request = Registry::get('request'); @@ -16,7 +16,8 @@ $this->load->model('user/auth'); - $this->document->title = $this->data['text_logout']; + $this->data['title'] = $this->data['text_logout']; + $this->data['title_prefix'] = TITLE_PREFIX; if(ENABLE_SAAS == 1) { $this->load->model('saas/customer'); diff --git a/webui/view/theme/default/templates/health/worker.tpl b/webui/view/theme/default/templates/health/worker.tpl index 1d768a1..ad5fab7 100644 --- a/webui/view/theme/default/templates/health/worker.tpl +++ b/webui/view/theme/default/templates/health/worker.tpl @@ -65,7 +65,12 @@ - . . + + . + : , : + . + + @@ -76,14 +81,6 @@ - - - - : , : - - - - diff --git a/webui/view/theme/default/templates/login/login.tpl b/webui/view/theme/default/templates/login/login.tpl index a68da3c..1c76946 100644 --- a/webui/view/theme/default/templates/login/login.tpl +++ b/webui/view/theme/default/templates/login/login.tpl @@ -2,7 +2,7 @@ - <?php print $title; ?> + <?php if($title_prefix) { print $title_prefix; ?> | <?php } ?><?php print $title; ?> diff --git a/webui/view/theme/default/templates/login/logout.tpl b/webui/view/theme/default/templates/login/logout.tpl index 17778b2..c096ab5 100644 --- a/webui/view/theme/default/templates/login/logout.tpl +++ b/webui/view/theme/default/templates/login/logout.tpl @@ -1 +1,47 @@ -

.

+ + + + + <?php if($title_prefix) { print $title_prefix; ?> | <?php } ?><?php print $title; ?> + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ +

+

.

+ +
+ + + + +
+ + + diff --git a/webui/view/theme/mobile/templates/health/worker.tpl b/webui/view/theme/mobile/templates/health/worker.tpl index f7ca191..6f5e788 100644 --- a/webui/view/theme/mobile/templates/health/worker.tpl +++ b/webui/view/theme/mobile/templates/health/worker.tpl @@ -77,7 +77,12 @@
-
. .
+
+ . + : , : + . + +
@@ -133,13 +138,6 @@
- -
-
-
: , :
-
- - diff --git a/webui/view/theme/mobile/templates/login/login.tpl b/webui/view/theme/mobile/templates/login/login.tpl index 7162a55..31071d4 100644 --- a/webui/view/theme/mobile/templates/login/login.tpl +++ b/webui/view/theme/mobile/templates/login/login.tpl @@ -2,7 +2,7 @@ - <?php print $title; ?> + <?php if($title_prefix) { print $title_prefix; ?> | <?php } ?><?php print $title; ?> diff --git a/webui/view/theme/mobile/templates/login/logout.tpl b/webui/view/theme/mobile/templates/login/logout.tpl index 17778b2..03f3056 100644 --- a/webui/view/theme/mobile/templates/login/logout.tpl +++ b/webui/view/theme/mobile/templates/login/logout.tpl @@ -1 +1,44 @@ -

.

+ + + + + <?php if($title_prefix) { print $title_prefix; ?> | <?php } ?><?php print $title; ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

.

+ +
+ +
+ + +