Release glass style

RainLoop · RainLoop · commit 155f4b6df20d · 2016-09-15T23:34:30.000+03:00
diff --git a/dev/App/Abstract.js b/dev/App/Abstract.js
@@ -332,6 +332,11 @@ class AbstractApp extends AbstractBoot
 			leftPanelDisabled(false);
 		});
 
+		if (Settings.appSettingsGet('loginGlassStyle'))
+		{
+			$html.addClass('glass');
+		}
+
 		if (!mobile)
 		{
 			ssm.addState({
diff --git a/dev/Common/Cmd.js b/dev/Common/Cmd.js
@@ -3,7 +3,7 @@ import window from 'window';
 import $ from '$';
 import _ from '_';
 import ko from 'ko';
-import {$html, $body} from 'Common/Globals';
+import {$body} from 'Common/Globals';
 import {EventKeyCode, Magics} from 'Common/Enums';
 import {trim, inArray, changeTheme} from 'Common/Utils';
 import {reload as translatorReload} from 'Common/Translator';
@@ -40,43 +40,6 @@ function cmdHelp(cmds) {
 	return require('Html/Cmds/Help.html').replace('{{ commands }}', cmds.join(' '));
 }
 
-/**
- * @returns {void}
- */
-function initGlass() {
-	let state = null;
-	try {
-		if (window.localStorage && window.localStorage.setItem)
-		{
-			state = '1' === '' + window.localStorage.getItem('rl-labs-glass');
-		}
-	}
-	catch (e) {} // eslint-disable-line no-empty
-
-	if (null !== state)
-	{
-		$html.toggleClass('glass', !!state);
-	}
-}
-
-/**
- * @returns {string}
- */
-function cmdGlass() {
-	const state = !$html.hasClass('glass');
-
-	try {
-		if (window.localStorage && window.localStorage.setItem)
-		{
-			window.localStorage.setItem('rl-labs-glass', state ? '1' : '0');
-		}
-	}
-	catch (e) {} // eslint-disable-line no-empty
-
-	$html.toggleClass('glass', state);
-	return '';
-}
-
 /**
  * @returns {string}
  */
@@ -124,7 +87,7 @@ class CmdContoller
 
 	cmdHelper = ko.observable('');
 
-	cmds = ['help', 'version', 'glass', 'clear', 'theme', 'lang'];
+	cmds = ['help', 'version', 'clear', 'theme', 'lang'];
 	cmdsWithParameters = ['theme', 'lang'];
 
 	isAdmin = false;
@@ -205,9 +168,6 @@ class CmdContoller
 			case 'help':
 				result = cmdHelp(this.cmds);
 				break;
-			case 'glass':
-				result = cmdGlass();
-				break;
 			case 'v':
 			case 'version':
 				result = cmdVersion();
@@ -390,6 +350,3 @@ export function toggle()
 		}, Magics.Time50ms);
 	}
 }
-
-// init
-initGlass();
diff --git a/dev/Settings/Admin/Prem/Licensing.js b/dev/Settings/Admin/Prem/Licensing.js
@@ -1,5 +1,6 @@
 
 import ko from 'ko';
+import moment from 'moment';
 
 import {settingsGet} from 'Storage/Settings';
 import {showScreenPopup} from 'Knoin/Knoin';
@@ -60,7 +61,6 @@ class LicensingPremAdminSettings
 	 */
 	licenseExpiredMomentValue() {
 		const
-			moment = require('moment'),
 			time = this.licenseExpired(),
 			momentUnix = moment.unix(time);
 
diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
@@ -59,7 +59,7 @@
 		}
 
 		.wrapper {
-			padding: 40px 40px 12px 40px;
+			padding: 40px 40px 20px 40px;
 		}
 
 		#recaptcha_image img {
@@ -102,6 +102,12 @@
 			font-size: 17px;
 			line-height: 29px;
 			color: #999;
+
+			&.login-submit-icon{
+				font-size: 24px;
+				padding-top: 2px;
+				cursor: pointer;
+			}
 		}
 
 		.controls.error .add-on i, .control-group.error .add-on i {
diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less
@@ -174,6 +174,10 @@ html.rgba .g-ui-resizable-delimiter-highlight {
 	}
 }
 
+.display-none {
+	display: none;
+}
+
 .e-spinner {
 	display: none;
 }
diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js
@@ -36,7 +36,7 @@ import {view, command, ViewType, routeOff, showScreenPopup} from 'Knoin/Knoin';
 import {AbstractViewNext} from 'Knoin/AbstractViewNext';
 
 @view({
-	name: 'View/User/Login',
+	name: ['View/App/Login', 'View/User/Login'],
 	type: ViewType.Center,
 	templateID: 'Login'
 })
@@ -83,7 +83,6 @@ class LoginUserView extends AbstractViewNext
 
 		this.emailFocus = ko.observable(false);
 		this.passwordFocus = ko.observable(false);
-		this.submitFocus = ko.observable(false);
 
 		this.email.subscribe(() => {
 			this.emailError(false);
@@ -335,7 +334,7 @@ class LoginUserView extends AbstractViewNext
 	onShowWithDelay() {
 		if ('' !== this.email() && '' !== this.password())
 		{
-			this.submitFocus(true);
+			this.passwordFocus(true);
 		}
 		else if ('' === this.email())
 		{
@@ -352,7 +351,6 @@ class LoginUserView extends AbstractViewNext
 	}
 
 	onHide() {
-		this.submitFocus(false);
 		this.emailFocus(false);
 		this.passwordFocus(false);
 	}
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1455,6 +1455,7 @@ public function AppDataSystem($bAdmin = false, $bMobile = false, $bMobileDevice
 			'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),
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -249,6 +249,8 @@ protected function defaultValues()
 
 				'welcome_page' => array(false, ''),
 
+				'glass_style' => array(true, ''),
+
 				'forgot_password_link_url' => array('', ''),
 				'registration_link_url' => array('', ''),
 
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -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>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/Login.html b/rainloop/v/0.0.0/app/templates/Views/User/Login.html
@@ -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>
diff --git a/tests/e2e/tests/login_test.js b/tests/e2e/tests/login_test.js
@@ -12,18 +12,10 @@ Scenario('login/page', function(I) {
 	I.see('Remember Me');
 });
 
-Scenario('login/empty-fields-error', function(I) {
-	I.fillField('.inputEmail', '');
-	I.fillField('.inputPassword', '');
-	I.click('.buttonLogin');
-	I.see('Remember Me');
-	I.seeElement('.controls.error');
-});
-
 Scenario('login/auth-error', function(I) {
 	I.fillField('.inputEmail', 'xxx');
 	I.fillField('.inputPassword', 'yyy');
-	I.click('.buttonLogin');
+	I.click('.login-submit-icon');
 	I.waitForVisible('.alertError', 3);
 	I.see('Authentication failed', '.alertError');
 });
diff --git a/tests/e2e/tests/main_test.js b/tests/e2e/tests/main_test.js
@@ -9,7 +9,7 @@ Before((I) => {
 	I.waitForElement('.e-powered', 10);
 	I.fillField('.inputEmail', cfg.user);
 	I.fillField('.inputPassword', cfg.pass);
-	I.click('.buttonLogin');
+	I.click('.login-submit-icon');
 	I.waitForText('test@rainloop.de', 10, '.accountPlace');
 	I.resizeWindow(1000, 1000);
 });

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`.wrapper {`
`62`		`- padding: 40px 40px 12px 40px;`
	`62`	`+ padding: 40px 40px 20px 40px;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`#recaptcha_image img {`
`@@ -102,6 +102,12 @@`
`102`	`102`	`font-size: 17px;`
`103`	`103`	`line-height: 29px;`
`104`	`104`	`color: #999;`
	`105`	`+`
	`106`	`+ &.login-submit-icon{`
	`107`	`+ font-size: 24px;`
	`108`	`+ padding-top: 2px;`
	`109`	`+ cursor: pointer;`
	`110`	`+ }`
`105`	`111`	`}`
`106`	`112`
`107`	`113`	`.controls.error .add-on i, .control-group.error .add-on i {`
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,10 @@ html.rgba .g-ui-resizable-delimiter-highlight {`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
	`177`	`+.display-none {`
	`178`	`+ display: none;`
	`179`	`+}`
	`180`	`+`
`177`	`181`	`.e-spinner {`
`178`	`182`	`display: none;`
`179`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import {view, command, ViewType, routeOff, showScreenPopup} from 'Knoin/Knoin';`
`36`	`36`	`import {AbstractViewNext} from 'Knoin/AbstractViewNext';`
`37`	`37`
`38`	`38`	`@view({`
`39`		`- name: 'View/User/Login',`
	`39`	`+ name: ['View/App/Login', 'View/User/Login'],`
`40`	`40`	`type: ViewType.Center,`
`41`	`41`	`templateID: 'Login'`
`42`	`42`	`})`
`@@ -83,7 +83,6 @@ class LoginUserView extends AbstractViewNext`
`83`	`83`
`84`	`84`	`this.emailFocus = ko.observable(false);`
`85`	`85`	`this.passwordFocus = ko.observable(false);`
`86`		`- this.submitFocus = ko.observable(false);`
`87`	`86`
`88`	`87`	`this.email.subscribe(() => {`
`89`	`88`	`this.emailError(false);`
`@@ -335,7 +334,7 @@ class LoginUserView extends AbstractViewNext`
`335`	`334`	`onShowWithDelay() {`
`336`	`335`	`if ('' !== this.email() && '' !== this.password())`
`337`	`336`	`{`
`338`		`- this.submitFocus(true);`
	`337`	`+ this.passwordFocus(true);`
`339`	`338`	`}`
`340`	`339`	`else if ('' === this.email())`
`341`	`340`	`{`
`@@ -352,7 +351,6 @@ class LoginUserView extends AbstractViewNext`
`352`	`351`	`}`
`353`	`352`
`354`	`353`	`onHide() {`
`355`		`- this.submitFocus(false);`
`356`	`354`	`this.emailFocus(false);`
`357`	`355`	`this.passwordFocus(false);`
`358`	`356`	`}`