bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-26 07:00:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

webui merge fix

Browse Source
This commit is contained in:
SJ 2013-04-05 11:16:07 +02:00
parent b428783ce9
commit fa61d445f2
7 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webui/config.php
View File

@ -21,6 +21,9 @@ $config['SITE_URL'] = 'http://piler.yourdomain.com/';
$config['TIMEZONE'] = 'Europe/Budapest'; $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) // authentication against an ldap directory (disabled by default)
@ -61,7 +64,6 @@ $config['GOOGLE_CLIENT_SECRET'] = 'xxxxxxxxxxxxx';
$config['GOOGLE_DEVELOPER_KEY'] = 'xxxxxxxxxxxx'; $config['GOOGLE_DEVELOPER_KEY'] = 'xxxxxxxxxxxx';
$config['GOOGLE_APPLICATION_NAME'] = 'piler enterprise email archiver'; $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_LG'] = 'view/theme/default/assets/images/archive-logo-lg.png';
$config['SITE_LOGO_SM'] = 'view/theme/default/assets/images/archive-logo-sm.png'; $config['SITE_LOGO_SM'] = 'view/theme/default/assets/images/archive-logo-sm.png';
$config['COMPATIBILITY'] = 'Which browsers are supported, etc'; $config['COMPATIBILITY'] = 'Which browsers are supported, etc';

2
webui/controller/login/login.php
View File

@ -8,7 +8,7 @@ class ControllerLoginLogin extends Controller {
$this->id = "content"; $this->id = "content";
$this->template = "login/login.tpl"; $this->template = "login/login.tpl";
$this->layout = "common/layout"; $this->layout = "common/layout-empty";
$request = Registry::get('request'); $request = Registry::get('request');

13
webui/view/theme/orig/stylesheet/style-orig.css
View File

@ -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; } .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; } #wrapemail { margin-left: 20px; background-color: white; width:200px; height: 300px; }
.email { background-color: white; } .email { background-color: white; }
@ -56,10 +54,7 @@
#ss1 { display: table; border-collapse: collapse; margin: 0; padding: 0; margin-top: 10px; clear: both; } #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; } #results { float: left; width: 100%; margin-top: 0px; margin-bottom: 0px; border-collapse: collapse; display: table; clear: both; }
#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; }
#mailpreviewframe { text-align: left; overflow:auto; } #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; } #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 { display: table-row; }
.row.savedsearch { display: table-row; text-align: right; } .row.savedsearch { display: table-row; text-align: right; }
.resultrow { display: table-row; height: 18px; font-style: italic; } .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; } .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; } .cell2 { display: table-cell; width: 410px; height: 15px; }
//.left { text-align: left; }
//.100px { width: 100px; }
.top20px { margin-top: 20px; } .top20px { margin-top: 20px; }
.listarea { overflow:auto; height: 500px; } .listarea { overflow:auto; height: 500px; }
@ -124,7 +114,6 @@
input[type=textarea] { height:80px; } 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].restorebox { margin: 0; vertical-align: middle; }
input[type=checkbox].popup { margin: 0; vertical-align: middle; } input[type=checkbox].popup { margin: 0; vertical-align: middle; }

5
webui/view/theme/orig/templates/common/layout-audit.tpl
View File

@ -5,8 +5,9 @@
<title><?php print $title; ?></title> <title><?php print $title; ?></title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="en" /> <meta http-equiv="Content-Language" content="en" />
<meta name="keywords" content="piler email archiver" /> <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
<meta name="description" content="piler email archiver" /> <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
<meta name="author" content="<?php print PROVIDED_BY; ?>" />
<meta name="rating" content="general" /> <meta name="rating" content="general" />
<meta name="robots" content="all" /> <meta name="robots" content="all" />

5
webui/view/theme/orig/templates/common/layout-email.tpl
View File

@ -5,8 +5,9 @@
<title>piler<?php if(isset($title) && $title) { ?> | <?php print $title; } ?></title> <title>piler<?php if(isset($title) && $title) { ?> | <?php print $title; } ?></title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="en" /> <meta http-equiv="Content-Language" content="en" />
<meta name="keywords" content="piler email archiver" /> <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
<meta name="description" content="piler email archiver" /> <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
<meta name="author" content="<?php print PROVIDED_BY; ?>" />
<meta name="rating" content="general" /> <meta name="rating" content="general" />
<meta name="robots" content="all" /> <meta name="robots" content="all" />

5
webui/view/theme/orig/templates/common/layout-search.tpl
View File

@ -5,8 +5,9 @@
<title><?php print $title; ?></title> <title><?php print $title; ?></title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="en" /> <meta http-equiv="Content-Language" content="en" />
<meta name="keywords" content="piler email archiver" /> <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
<meta name="description" content="piler email archiver" /> <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
<meta name="author" content="<?php print PROVIDED_BY; ?>" />
<meta name="rating" content="general" /> <meta name="rating" content="general" />
<meta name="robots" content="all" /> <meta name="robots" content="all" />

5
webui/view/theme/orig/templates/common/layout.tpl
View File

@ -5,8 +5,9 @@
<title>piler | <?php print $title; ?></title> <title>piler | <?php print $title; ?></title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="en" /> <meta http-equiv="Content-Language" content="en" />
<meta name="keywords" content="piler email archiver" /> <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
<meta name="description" content="piler email archiver" /> <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
<meta name="author" content="<?php print PROVIDED_BY; ?>" />
<meta name="rating" content="general" /> <meta name="rating" content="general" />
<meta name="robots" content="all" /> <meta name="robots" content="all" />