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

branding improvments

Browse Source
This commit is contained in:
SJ 2013-07-18 17:13:49 +02:00
parent 5e3651ac10
commit 5b6d7d60a1
8 changed files with 61 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
util/db-mysql.sql
View File

@ -362,6 +362,7 @@ create table if not exists `customer_settings` (
`domain` varchar(255) not null unique, `domain` varchar(255) not null unique,
`branding_text` varchar(255) default null, `branding_text` varchar(255) default null,
`branding_url` varchar(255) default null, `branding_url` varchar(255) default null,
`branding_logo` varchar(255) default null,
`support_link` varchar(255) default null, `support_link` varchar(255) default null,
`colour` varchar(255) default null `colour` varchar(255) default null
) Engine=InnoDB; ) Engine=InnoDB;

1
util/db-upgrade-0.1.23-vs-0.1.24.sql
View File

@ -18,6 +18,7 @@ create table if not exists `customer_settings` (
`domain` varchar(255) not null unique, `domain` varchar(255) not null unique,
`branding_text` varchar(255) default null, `branding_text` varchar(255) default null,
`branding_url` varchar(255) default null, `branding_url` varchar(255) default null,
`branding_logo` varchar(255) default null,
`support_link` varchar(255) default null, `support_link` varchar(255) default null,
`colour` varchar(255) default null `colour` varchar(255) default null
) Engine=InnoDB; ) Engine=InnoDB;

3
webui/config.php
View File

@ -16,8 +16,11 @@ $config['PILERGETD_PASSWORD'] = '';
$config['BRANDING_TEXT'] = ''; $config['BRANDING_TEXT'] = '';
$config['BRANDING_URL'] = ''; $config['BRANDING_URL'] = '';
$config['BRANDING_LOGO'] = '';
$config['SUPPORT_LINK'] = ''; $config['SUPPORT_LINK'] = '';
$config['SHOW_COMPANY_LINK'] = 1;
$config['DEFAULT_LANG'] = 'en'; $config['DEFAULT_LANG'] = 'en';
$config['THEME'] = 'default'; $config['THEME'] = 'default';

2
webui/model/saas/customer.php
View File

@ -7,7 +7,7 @@ class ModelSaasCustomer extends Model
$data = array( $data = array(
'branding_text' => BRANDING_TEXT, 'branding_text' => BRANDING_TEXT,
'branding_url' => BRANDING_URL, 'branding_url' => BRANDING_URL,
'branding_logo' => SITE_LOGO_SM, 'branding_logo' => BRANDING_LOGO,
'support_link' => SUPPORT_LINK, 'support_link' => SUPPORT_LINK,
'colour' => '' 'colour' => ''
); );

2
webui/view/theme/default/templates/audit/helper.tpl
View File

@ -43,7 +43,7 @@
<td class="auditcell ip"><?php print $message['ipaddr']; ?></td> <td class="auditcell ip"><?php print $message['ipaddr']; ?></td>
<td class="auditcell action"><?php print $actions[$message['action']]; ?></td> <td class="auditcell action"><?php print $actions[$message['action']]; ?></td>
<td class="auditcell description"><?php if($message['description'] != $message['shortdescription']) { ?><span title="<?php print $message['description']; ?>"><?php print $message['shortdescription']; ?></span><?php } else { print $message['description']; } ?></td> <td class="auditcell description"><?php if($message['description'] != $message['shortdescription']) { ?><span title="<?php print $message['description']; ?>"><?php print $message['shortdescription']; ?></span><?php } else { print $message['description']; } ?></td>
<td class="auditcell ref"><?php print $message['id']; ?></td> <td class="auditcell ref"><?php if(Registry::get('auditor_user') == 1 && $message['id'] > 0) { ?><a href="#" onclick="Piler.view_message(<?php print $message['id']; ?>);"><?php } ?><?php print $message['id']; ?><?php if(Registry::get('auditor_user') == 1 && $message['id'] > 0) { ?></a><?php } ?></td>
</tr> </tr>
<?php } } else { ?> <?php } } else { ?>

32
webui/view/theme/default/templates/common/layout-audit.tpl
View File

@ -35,6 +35,8 @@
<body onload="Piler.add_shortcuts();"> <body onload="Piler.add_shortcuts();">
<div id="messagebox1" class="audit audit-info"></div> <div id="messagebox1" class="audit audit-info"></div>
<div id="piler1" class="container"> <div id="piler1" class="container">
@ -58,23 +60,34 @@
</div> </div>
</div> </div>
<div id="mainscreen"> <div id="mainscreen">
<div id="mailleftcontainer"> <div id="mailleftcontainer">
</div> </div>
<div id="mailrightcontainer<?php if(ENABLE_FOLDER_RESTRICTIONS == 0) { ?>nofolder<?php } ?>"> <div id="mailrightcontainernofolder">
<div id="mailrightcontent"> <div id="mailrightcontent">
<div id="mailcontframe"> <div id="mailcontframe">
<div id="sspinner" class="alert alert-info lead"><i class="icon-spinner icon-spin icon-2x pull-left"></i><?php print $text_working; ?></div> <div id="sspinner" class="alert alert-info lead"><i class="icon-spinner icon-spin icon-2x pull-left"></i><?php print $text_working; ?></div>
<div id="resultscontainer" class="boxlistcontent"> <div id="resultscontainer" class="boxlistcontent">
<?php print $content; ?> <?php print $content; ?>
</div>
</div>
</div> <?php if(Registry::get('auditor_user') == 1) { ?>
</div>
<script type="text/javascript">
var mailviewsplit = new rcube_splitter({id:'splitter2', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h', relative: true, start: 341});
split.add_onload('mailviewsplit.init()');
</script>
<div id="mailpreviewframe"></div>
<?php } ?>
</div> </div>
@ -82,5 +95,16 @@
</div> </div>
<?php if(Registry::get('auditor_user') == 1) { ?>
<script type="text/javascript">
$(document).ready(function(){
split.init();
});
</script>
<?php } ?>
</body> </body>
</html> </html>

2
webui/view/theme/default/templates/common/layout-search.tpl
View File

@ -25,7 +25,7 @@
<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="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" 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"> <link rel="apple-touch-icon-precomposed" href="/view/theme/default/assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="/view/theme/default/assets/ico/favicon.png"> <link rel="shortcut icon" href="/view/theme/default/assets/ico/favicon.png" />
<script type="text/javascript" src="/view/javascript/jquery.min.js"></script> <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/jquery-ui-custom.min.js"></script>

2
webui/view/theme/default/templates/common/menu.tpl
View File

@ -66,7 +66,7 @@
</ul> </ul>
<ul class="nav pull-right"> <ul class="nav pull-right">
<li><a href="<?php print $settings['branding_url']; ?>" target="_blank" <?php if($settings['colour']) { ?>style="background: <?php print $settings['colour']; ?>;"<?php } ?>><i class="icon-phone"></i>&nbsp;<?php print $settings['branding_text']; ?></a></li> <?php if(SHOW_COMPANY_LINK == 1) { ?><li><a href="<?php print $settings['branding_url']; ?>" target="_blank"><i class="icon-phone"></i>&nbsp;<?php print $settings['branding_text']; ?></a></li><?php } ?>
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-user"></i>&nbsp;<?php if(isset($_SESSION['realname'])) { print $_SESSION['realname']; ?>&nbsp;<?php } ?><b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-user"></i>&nbsp;<?php if(isset($_SESSION['realname'])) { print $_SESSION['realname']; ?>&nbsp;<?php } ?><b class="caret"></b></a>