From 97fb897d5e3c9b1cfb415de154c1b972814633af Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Sun, 11 Aug 2013 11:44:49 +0200
Subject: [PATCH] minor gui enhancement

---
 webui/config.php                              |  1 +
 webui/controller/login/login.php              |  1 +
 webui/controller/login/logout.php             |  5 +-
 .../theme/default/templates/health/worker.tpl | 15 +++---
 .../theme/default/templates/login/login.tpl   |  2 +-
 .../theme/default/templates/login/logout.tpl  | 48 ++++++++++++++++++-
 .../theme/mobile/templates/health/worker.tpl  | 14 +++---
 .../theme/mobile/templates/login/login.tpl    |  2 +-
 .../theme/mobile/templates/login/logout.tpl   | 45 ++++++++++++++++-
 9 files changed, 110 insertions(+), 23 deletions(-)

diff --git a/webui/config.php b/webui/config.php
index 67efc045..78befbdf 100644
--- a/webui/config.php
+++ b/webui/config.php
@@ -21,6 +21,7 @@ $config['BRANDING_BACKGROUND_COLOUR'] = '';
 $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 40375207..7e153397 100644
--- a/webui/controller/login/login.php
+++ b/webui/controller/login/login.php
@@ -33,6 +33,7 @@ class ControllerLoginLogin extends Controller {
       }
 
       $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 c7274d09..6b4f05cd 100644
--- a/webui/controller/login/logout.php
+++ b/webui/controller/login/logout.php
@@ -8,7 +8,7 @@ class ControllerLoginLogout extends Controller {
 
       $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 @@ class ControllerLoginLogout extends Controller {
 
       $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 1d768a1b..ad5fab7f 100644
--- a/webui/view/theme/default/templates/health/worker.tpl
+++ b/webui/view/theme/default/templates/health/worker.tpl
@@ -65,7 +65,12 @@
 
 				 <tr>
 					<th><?php print $text_periodic_purge; ?></th>
-					<td><span class="<?php if($options['enable_purge'] == 1) { ?>ok<?php } else { ?>error<?php } ?>"><?php if($options['enable_purge'] == 1) { print $text_enabled; ?>. <a href="<?php print HEALTH_URL; ?>&toggle_enable_purge"><?php print $text_disable; ?></a><?php } else { print $text_disabled; ?>. <a href="<?php print HEALTH_URL; ?>&toggle_enable_purge"><?php print $text_enable; ?></a><?php } ?> </span></td>
+					<td>
+                                           <span class="<?php if($options['enable_purge'] == 1) { ?>ok<?php } else { ?>error<?php } ?>"><?php if($options['enable_purge'] == 1) { print $text_enabled; ?>. <a href="<?php print HEALTH_URL; ?>&toggle_enable_purge"><?php print $text_disable; ?></a>
+                                              <?php if($purge_stat[0]) { print $text_last; ?>: <?php print $purge_stat[0]; ?>, <?php print $text_next; ?>:  <?php print $purge_stat[1]; } ?>
+                                           <?php } else { print $text_disabled; ?>. <a href="<?php print HEALTH_URL; ?>&toggle_enable_purge"><?php print $text_enable; ?></a><?php } ?>
+                                           </span>
+                                        </td>
 				 </tr>
 
                          <?php if($indexer_stat[0]) { ?>
@@ -76,14 +81,6 @@
                                  </tr>
                          <?php } ?>
 
-                         <?php if($purge_stat[0]) { ?>
-                                 <tr>
-                                        <th><?php print $text_periodic_purge; ?></th>
-                                        <td><?php print $text_last; ?>: <?php print $purge_stat[0]; ?>, <?php print $text_next; ?>:  <?php print $purge_stat[1]; ?></td>
-
-                                 </tr>
-                         <?php } ?>
-
 			 </table>
 		</div>
 				 
diff --git a/webui/view/theme/default/templates/login/login.tpl b/webui/view/theme/default/templates/login/login.tpl
index a68da3cb..1c769461 100644
--- a/webui/view/theme/default/templates/login/login.tpl
+++ b/webui/view/theme/default/templates/login/login.tpl
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title><?php print $title; ?></title>
+    <title><?php if($title_prefix) { print $title_prefix; ?> | <?php } ?><?php print $title; ?></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
     <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
diff --git a/webui/view/theme/default/templates/login/logout.tpl b/webui/view/theme/default/templates/login/logout.tpl
index 17778b21..c096ab55 100644
--- a/webui/view/theme/default/templates/login/logout.tpl
+++ b/webui/view/theme/default/templates/login/logout.tpl
@@ -1 +1,47 @@
-<p><?php print $text_logged_out; ?>. <a href="login.php" class="messagelink"><?php print $text_back; ?></a></p>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title><?php if($title_prefix) { print $title_prefix; ?> | <?php } ?><?php print $title; ?></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
+    <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
+    <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
+
+    <link href="/view/theme/default/assets/css/metro-bootstrap.css" rel="stylesheet">
+
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!-- original location: http://html5shim.googlecode.com/svn/trunk/html5.js -->
+    <!--[if lt IE 9]>
+      <script src="/view/theme/default/assets/js/html5.js"></script>
+    <![endif]-->
+
+    <!-- Fav and touch icons -->
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/view/theme/default/assets/ico/apple-touch-icon-144-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/view/theme/default/assets/ico/apple-touch-icon-114-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/view/theme/default/assets/ico/apple-touch-icon-72-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" href="/view/theme/default/assets/ico/apple-touch-icon-57-precomposed.png">
+    <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
+  </head>
+
+<body>
+
+<div id="piler1" class="container">
+
+   <div id="menu"></div>
+
+   <div id="main">
+
+      <h3><?php print $title; ?></h3>
+      <p><?php print $text_logged_out; ?>. <a href="login.php" class="messagelink"><?php print $text_back; ?></a></p>
+
+   </div> <!-- main -->
+
+   <div id="footer">
+</div>
+
+
+</div>
+
+</body>
+</html>
diff --git a/webui/view/theme/mobile/templates/health/worker.tpl b/webui/view/theme/mobile/templates/health/worker.tpl
index f7ca191d..6f5e7880 100644
--- a/webui/view/theme/mobile/templates/health/worker.tpl
+++ b/webui/view/theme/mobile/templates/health/worker.tpl
@@ -77,7 +77,12 @@
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_periodic_purge; ?></div>
-            <div class="cellhealthright"><span class="bold <?php if($options['enable_purge'] == 1) { ?>text-success<?php } else { ?>text-error<?php } ?>"><?php if($options['enable_purge'] == 1) { print $text_enabled; ?>. <a href="<?php print HEALTH_URL; ?>&toggle_enable_purge"><?php print $text_disable; ?></a><?php } else { print $text_disabled; ?>. <a href="<?php print HEALTH_URL; ?>&toggle_enable_purge"><?php print $text_enable; ?></a><?php } ?> </span></div>
+            <div class="cellhealthright">
+               <span class="bold <?php if($options['enable_purge'] == 1) { ?>text-success<?php } else { ?>text-error<?php } ?>"><?php if($options['enable_purge'] == 1) { print $text_enabled; ?>. <a href="<?php print HEALTH_URL; ?>&toggle_enable_purge"><?php print $text_disable; ?></a>
+               <?php if($purge_stat[0]) { print $text_last; ?>: <?php print $purge_stat[0]; ?>, <?php print $text_next; ?>:  <?php print $purge_stat[1]; } ?>
+               <?php } else { print $text_disabled; ?>. <a href="<?php print HEALTH_URL; ?>&toggle_enable_purge"><?php print $text_enable; ?></a><?php } ?>
+               </span>
+            </div>
          </div>
 
          <div class="row">
@@ -133,13 +138,6 @@
          </div>
       <?php } ?>
 
-      <?php if($purge_stat[0]) { ?>
-         <div class="row">
-            <div class="cellhealthleft"><?php print $text_periodic_purge; ?></div>
-            <div class="cellhealthright"><?php print $text_last; ?>: <?php print $purge_stat[0]; ?>, <?php print $text_next; ?>:  <?php print $purge_stat[1]; ?></div>
-         </div>
-      <?php } ?>
-
       </div>
 
 
diff --git a/webui/view/theme/mobile/templates/login/login.tpl b/webui/view/theme/mobile/templates/login/login.tpl
index 7162a55f..31071d40 100644
--- a/webui/view/theme/mobile/templates/login/login.tpl
+++ b/webui/view/theme/mobile/templates/login/login.tpl
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="hu" lang="hu">
 
 <head>
-   <title><?php print $title; ?></title>
+   <title><?php if($title_prefix) { print $title_prefix; ?> | <?php } ?><?php print $title; ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="en" />
    <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
diff --git a/webui/view/theme/mobile/templates/login/logout.tpl b/webui/view/theme/mobile/templates/login/logout.tpl
index 17778b21..03f30569 100644
--- a/webui/view/theme/mobile/templates/login/logout.tpl
+++ b/webui/view/theme/mobile/templates/login/logout.tpl
@@ -1 +1,44 @@
-<p><?php print $text_logged_out; ?>. <a href="login.php" class="messagelink"><?php print $text_back; ?></a></p>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="hu" lang="hu">
+
+<head>
+   <title><?php if($title_prefix) { print $title_prefix; ?> | <?php } ?><?php print $title; ?></title>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+   <meta http-equiv="Content-Language" content="en" />
+   <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
+   <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
+   <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
+   <meta name="rating" content="general" />
+   <meta name="robots" content="all" />
+
+   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+   <link href="/bootstrap/css/bootstrap<?php print BOOTSTRAP_THEME; ?>.min.css" rel="stylesheet" media="screen">
+   <link href="/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
+
+   <link rel="stylesheet" type="text/css" href="/view/theme/<?php print THEME; ?>/stylesheet/jquery-ui-custom.min.css" />
+   <link rel="stylesheet" type="text/css" href="/view/theme/<?php print THEME; ?>/stylesheet/style-<?php print THEME; ?>.css" />
+
+   <script type="text/javascript" src="/view/javascript/jquery.min.js"></script>
+   <script type="text/javascript" src="/view/javascript/jquery-ui-custom.min.js"></script>
+   <script type="text/javascript" src="/view/javascript/bootstrap.min.js"></script>
+   <script type="text/javascript" src="/view/javascript/rc-splitter.js"></script>
+   <script type="text/javascript" src="/view/javascript/piler.js"></script>
+
+   <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
+</head>
+
+<body class="loginpage">
+
+<div id="piler1" class="container">
+
+   <div id="logincontainer" class="container">
+
+      <p><?php print $text_logged_out; ?>. <a href="login.php" class="messagelink"><?php print $text_back; ?></a></p>
+
+   </div>
+
+</div>
+
+</body>
+</html>