Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow some branding settings

Browse source
This commit is contained in:
RainLoop Team 2015-02-19 02:14:22 +04:00
parent 91488dc365
commit a3f28b09f6
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1315,11 +1315,11 @@ class Actions
$aResult['AuthAccountHash'] = $sAuthAccountHash; $aResult['AuthAccountHash'] = $sAuthAccountHash;
} }
if ($this->PremType())
{
$aResult['Title'] = $oConfig->Get('webmail', 'title', ''); $aResult['Title'] = $oConfig->Get('webmail', 'title', '');
$aResult['LoadingDescription'] = $oConfig->Get('webmail', 'loading_description', ''); $aResult['LoadingDescription'] = $oConfig->Get('webmail', 'loading_description', '');
if ($this->PremType())
{
$aResult['LoginLogo'] = $oConfig->Get('branding', 'login_logo', ''); $aResult['LoginLogo'] = $oConfig->Get('branding', 'login_logo', '');
$aResult['LoginBackground'] = $oConfig->Get('branding', 'login_background', ''); $aResult['LoginBackground'] = $oConfig->Get('branding', 'login_background', '');
$aResult['LoginCss'] = $oConfig->Get('branding', 'login_css', ''); $aResult['LoginCss'] = $oConfig->Get('branding', 'login_css', '');
@ -3198,11 +3198,11 @@ class Actions
$this->setConfigFromParams($oConfig, 'DetermineUserLanguage', 'login', 'determine_user_language', 'bool'); $this->setConfigFromParams($oConfig, 'DetermineUserLanguage', 'login', 'determine_user_language', 'bool');
$this->setConfigFromParams($oConfig, 'DetermineUserDomain', 'login', 'determine_user_domain', 'bool'); $this->setConfigFromParams($oConfig, 'DetermineUserDomain', 'login', 'determine_user_domain', 'bool');
if ($this->HasOneOfActionParams(array('Title', 'LoadingDescription', 'LoginLogo', 'LoginBackground', 'LoginDescription', 'LoginCss', 'LoginPowered', 'UserLogo', 'UserCss')) && $this->PremType())
{
$this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string'); $this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string');
$this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string'); $this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string');
if ($this->HasOneOfActionParams(array('LoginLogo', 'LoginBackground', 'LoginDescription', 'LoginCss', 'LoginPowered', 'UserLogo', 'UserCss')) && $this->PremType())
{
$this->setConfigFromParams($oConfig, 'LoginLogo', 'branding', 'login_logo', 'string'); $this->setConfigFromParams($oConfig, 'LoginLogo', 'branding', 'login_logo', 'string');
$this->setConfigFromParams($oConfig, 'LoginBackground', 'branding', 'login_background', 'string'); $this->setConfigFromParams($oConfig, 'LoginBackground', 'branding', 'login_background', 'string');
$this->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string'); $this->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string');

30
rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
View file

@ -1,10 +1,5 @@
<div class="b-admin-branding"> <div class="b-admin-branding">
<div class="row" data-bind="visible: !capa()"> <div class="form-horizontal">
<div class="alert span8" style="margin-top: 10px;">
This functionality is available for <strong><a href="#/licensing">Premium</a></strong> subscribers.
</div>
</div>
<div class="form-horizontal" data-bind="css: {'disabled-form': !capa()}">
<div class="legend"> <div class="legend">
Branding Branding
</div> </div>
@ -18,8 +13,7 @@
params: { params: {
value: title, value: title,
trigger: title.trigger, trigger: title.trigger,
size: 5, size: 5
enable: capa
} }
}"></div> }"></div>
</div> </div>
@ -34,13 +28,14 @@
params: { params: {
value: loadingDesc, value: loadingDesc,
trigger: loadingDesc.trigger, trigger: loadingDesc.trigger,
size: 5, size: 5
enable: capa
} }
}"></div> }"></div>
</div> </div>
</div> </div>
</div>
<br /> <br />
<div class="form-horizontal" data-bind="css: {'disabled-form': !capa()}">
<div class="legend"> <div class="legend">
Login Login
</div> </div>
@ -104,7 +99,7 @@
params: { params: {
value: loginCss, value: loginCss,
trigger: loginCss.trigger, trigger: loginCss.trigger,
width: 530, width: 495,
enable: capa, enable: capa,
rows: 7 rows: 7
} }
@ -126,7 +121,8 @@
<div class="legend"> <div class="legend">
User User
</div> </div>
<!-- <div class="control-group"> <!--
<div class="control-group">
<label class="control-label"> <label class="control-label">
Logo Logo
</label> </label>
@ -142,7 +138,8 @@
} }
}"></div> }"></div>
</div> </div>
</div>--> </div>
-->
<div class="control-group"> <div class="control-group">
<label class="control-label"> <label class="control-label">
Custom CSS Custom CSS
@ -153,12 +150,17 @@
params: { params: {
value: userCss, value: userCss,
trigger: userCss.trigger, trigger: userCss.trigger,
width: 530, width: 495,
enable: capa, enable: capa,
rows: 7 rows: 7
} }
}"></div> }"></div>
</div> </div>
</div> </div>
<div class="row" data-bind="visible: !capa()">
<div class="alert span8" style="margin-top: 10px;">
This functionality is available for <strong><a href="#/licensing">Premium</a></strong> subscribers.
</div>
</div>
</div> </div>
</div> </div>