From fa61d445f267c5ed161c8e2f548f06ad81bf4219 Mon Sep 17 00:00:00 2001 From: SJ Date: Fri, 5 Apr 2013 11:16:07 +0200 Subject: [PATCH] webui merge fix --- webui/config.php | 4 +++- webui/controller/login/login.php | 2 +- webui/view/theme/orig/stylesheet/style-orig.css | 13 +------------ .../theme/orig/templates/common/layout-audit.tpl | 5 +++-- .../theme/orig/templates/common/layout-email.tpl | 5 +++-- .../theme/orig/templates/common/layout-search.tpl | 5 +++-- webui/view/theme/orig/templates/common/layout.tpl | 5 +++-- 7 files changed, 17 insertions(+), 22 deletions(-) diff --git a/webui/config.php b/webui/config.php index 6da11baf..c13763de 100644 --- a/webui/config.php +++ b/webui/config.php @@ -21,6 +21,9 @@ $config['SITE_URL'] = 'http://piler.yourdomain.com/'; $config['TIMEZONE'] = 'Europe/Budapest'; +$config['PROVIDED_BY'] = 'www.mailpiler.org'; +$config['SITE_KEYWORDS'] = 'piler email archiver'; +$config['SITE_DESCRIPTION'] = 'piler email archiver'; // authentication against an ldap directory (disabled by default) @@ -61,7 +64,6 @@ $config['GOOGLE_CLIENT_SECRET'] = 'xxxxxxxxxxxxx'; $config['GOOGLE_DEVELOPER_KEY'] = 'xxxxxxxxxxxx'; $config['GOOGLE_APPLICATION_NAME'] = 'piler enterprise email archiver'; -$config['PROVIDED_BY'] = 'Provided by piler'; $config['SITE_LOGO_LG'] = 'view/theme/default/assets/images/archive-logo-lg.png'; $config['SITE_LOGO_SM'] = 'view/theme/default/assets/images/archive-logo-sm.png'; $config['COMPATIBILITY'] = 'Which browsers are supported, etc'; diff --git a/webui/controller/login/login.php b/webui/controller/login/login.php index e702669b..e6466bb9 100644 --- a/webui/controller/login/login.php +++ b/webui/controller/login/login.php @@ -8,7 +8,7 @@ class ControllerLoginLogin extends Controller { $this->id = "content"; $this->template = "login/login.tpl"; - $this->layout = "common/layout"; + $this->layout = "common/layout-empty"; $request = Registry::get('request'); diff --git a/webui/view/theme/orig/stylesheet/style-orig.css b/webui/view/theme/orig/stylesheet/style-orig.css index 8d5df2c4..028a88b1 100644 --- a/webui/view/theme/orig/stylesheet/style-orig.css +++ b/webui/view/theme/orig/stylesheet/style-orig.css @@ -17,8 +17,6 @@ .aoq { height: 4px; padding: 11px 5px; width: 7px; background: url("/view/theme/orig/images/dark-grey-disclosure-arrow-down.png") no-repeat scroll center center transparent; } - /*#wrap { position: relative; margin: 0 auto; padding: 0; width: 1270px; background-color: white; border: 3px solid black; text-align: left; }*/ - #wrapemail { margin-left: 20px; background-color: white; width:200px; height: 300px; } .email { background-color: white; } @@ -56,10 +54,7 @@ #ss1 { display: table; border-collapse: collapse; margin: 0; padding: 0; margin-top: 10px; clear: both; } - /*#resultscontainer { float: left; width: 990px; padding: 0; padding-bottom: 5px; height: auto; margin-top: 0px; margin-bottom: 0px; border-top: 3px solid black; border-bottom: 3px solid black; overflow:auto; } - #resultscontainer.empty { border-bottom: 0px solid black; height: auto; overflow:auto; width: 990px; }*/ - - #results { float: left; width: 1140px; margin-top: 0px; margin-bottom: 0px; border-collapse: collapse; display: table; clear: both; } + #results { float: left; width: 100%; margin-top: 0px; margin-bottom: 0px; border-collapse: collapse; display: table; clear: both; } #mailpreviewframe { text-align: left; overflow:auto; } @@ -70,9 +65,6 @@ #sspinner { position: relative; width: 60%; border: 0px solid #999999; color: #000000; font-weight: bold; vertical-align: middle; text-align: left; padding: 15px; z-index: 1; display: none; margin: auto; margin-top: 150px; } - //.text { font: normal 12px Arial, sans-serif; font-weight: bold; text-align:left; width: 408px; } - //.autocompletetext { font: normal 12px Arial, sans-serif; font-style: italic; color: gray; font-weight: bold; text-align:left; width: 408px; } - .row { display: table-row; } .row.savedsearch { display: table-row; text-align: right; } .resultrow { display: table-row; height: 18px; font-style: italic; } @@ -88,8 +80,6 @@ .cell1 { display: table-cell; height: 25px; text-align: left; padding: 3px; font: bold 12px Arial, sans-serif; width: 80px; } .cell2 { display: table-cell; width: 410px; height: 15px; } - //.left { text-align: left; } - //.100px { width: 100px; } .top20px { margin-top: 20px; } .listarea { overflow:auto; height: 500px; } @@ -124,7 +114,6 @@ input[type=textarea] { height:80px; } - //input[type=checkbox].attachmenttype { margin: 0; vertical-align: middle; } input[type=checkbox].restorebox { margin: 0; vertical-align: middle; } input[type=checkbox].popup { margin: 0; vertical-align: middle; } diff --git a/webui/view/theme/orig/templates/common/layout-audit.tpl b/webui/view/theme/orig/templates/common/layout-audit.tpl index fc61cb69..cf1ac0db 100644 --- a/webui/view/theme/orig/templates/common/layout-audit.tpl +++ b/webui/view/theme/orig/templates/common/layout-audit.tpl @@ -5,8 +5,9 @@ <?php print $title; ?> - - + + + diff --git a/webui/view/theme/orig/templates/common/layout-email.tpl b/webui/view/theme/orig/templates/common/layout-email.tpl index bb5057af..3ff1ddd1 100644 --- a/webui/view/theme/orig/templates/common/layout-email.tpl +++ b/webui/view/theme/orig/templates/common/layout-email.tpl @@ -5,8 +5,9 @@ piler<?php if(isset($title) && $title) { ?> | <?php print $title; } ?> - - + + + diff --git a/webui/view/theme/orig/templates/common/layout-search.tpl b/webui/view/theme/orig/templates/common/layout-search.tpl index 4eeeec82..674190de 100644 --- a/webui/view/theme/orig/templates/common/layout-search.tpl +++ b/webui/view/theme/orig/templates/common/layout-search.tpl @@ -5,8 +5,9 @@ <?php print $title; ?> - - + + + diff --git a/webui/view/theme/orig/templates/common/layout.tpl b/webui/view/theme/orig/templates/common/layout.tpl index cc1cc864..898f1a61 100644 --- a/webui/view/theme/orig/templates/common/layout.tpl +++ b/webui/view/theme/orig/templates/common/layout.tpl @@ -5,8 +5,9 @@ piler | <?php print $title; ?> - - + + +