Release glass style

This commit is contained in:
RainLoop Team 2016-09-15 23:34:30 +03:00
parent 7ffa5af91f
commit 155f4b6df2
12 changed files with 36 additions and 69 deletions

View file

@ -1455,6 +1455,7 @@ class Actions
'customLogoutLink' => $oConfig->Get('labs', 'custom_logout_link', ''),
'forgotPasswordLinkUrl' => \trim($oConfig->Get('login', 'forgot_password_link_url', '')),
'registrationLinkUrl' => \trim($oConfig->Get('login', 'registration_link_url', '')),
'loginGlassStyle' => (bool) $oConfig->Get('login', 'glass_style', true),
'jsHash' => \md5(\RainLoop\Utils::GetConnectionToken()),
'useImapThread' => (bool) $oConfig->Get('labs', 'use_imap_thread', false),
'useImapSubscribe' => (bool) $oConfig->Get('labs', 'use_imap_list_subscribe', true),

View file

@ -249,6 +249,8 @@ class Application extends \RainLoop\Config\AbstractConfig
'welcome_page' => array(false, ''),
'glass_style' => array(true, ''),
'forgot_password_link_url' => array('', ''),
'registration_link_url' => array('', ''),

View file

@ -26,12 +26,13 @@
style="padding-right: 35px;"
autocorrect="off" autocapitalize="off" spellcheck="false" data-i18n="[placeholder]LOGIN/LABEL_PASSWORD"
data-bind="textInput: password, disable: submitRequest" />
<span class="add-on">
<i class="icon-key"></i>
<span class="add-on" data-bind="command: submitCommand">
<i class="icon-key" data-bind="visible: '' === password()"></i>
<i class="icon-right-middle login-submit-icon" data-bind="visible: '' !== password()"></i>
</span>
</div>
</div>
<div class="controls">
<div class="controls controls-submit-wrp display-none">
<button type="submit" class="btn btn-large btn-block buttonLogin" data-bind="command: submitCommand">
<span data-i18n="LOGIN/BUTTON_LOGIN"></span>
</button>

View file

@ -44,8 +44,9 @@
style="padding-right: 35px;"
autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: password, hasFocus: passwordFocus, disable: submitRequest" data-i18n="[placeholder]LOGIN/LABEL_PASSWORD" />
<span class="add-on">
<i class="icon-key"></i>
<span class="add-on i18n" data-bind="command: submitCommand, tooltip: 'LOGIN/BUTTON_SIGN_IN'">
<i class="icon-key" data-bind="visible: '' === password()"></i>
<i class="icon-right-middle login-submit-icon" data-bind="visible: '' !== password()"></i>
</span>
</div>
</div>
@ -70,12 +71,12 @@
}"></div>
</div>
{{INCLUDE/BottomControlGroup/PLACE}}
<div class="controls">
<button type="submit" class="btn btn-large btn-block buttonLogin" data-bind="command: submitCommand, hasFocus: submitFocus">
<div class="controls controls-submit-wrp display-none">
<button type="submit" class="btn btn-large btn-block buttonLogin" data-bind="command: submitCommand">
<span class="i18n i18n-animation" data-i18n="LOGIN/BUTTON_SIGN_IN"></span>
</button>
</div>
<div class="controls clearfix" style="margin-bottom: 20px">
<div class="controls clearfix" style="margin-bottom: 10px">
<div class="pull-right social-buttons">
<a href="#" tabindex="-1" class="social-button" data-bind="visible: facebookLoginEnabled, command: facebookCommand, tooltip: 'LOGIN/TITLE_SIGN_IN_FACEBOOK'">
<i class="icon-facebook-alt"></i>