Added knockoutjs components (step 1)

dev/App/Abstract.js

@@ -211,7 +211,16 @@
 	{
 		Events.pub('rl.bootstart');
 
-		var ssm = require('ssm');
+		var
+			ssm = require('ssm'),
+			ko = require('ko')
+		;
+
+		ko.components.register('SaveTrigger', require('Components/SaveTrigger'));
+		ko.components.register('Checkbox', require('Components/Checkbox'));
+		ko.components.register('Input', require('Components/Input'));
+		ko.components.register('Select', require('Components/Select'));
+		ko.components.register('TextArea', require('Components/TextArea'));
 
 		Utils.initOnStartOrLangChange(function () {
 			Utils.initNotificationLanguage();

dev/App/User.js

@@ -1355,17 +1355,38 @@
 					iContactsSyncInterval = 5 <= iContactsSyncInterval ? iContactsSyncInterval : 20;
 					iContactsSyncInterval = 320 >= iContactsSyncInterval ? iContactsSyncInterval : 320;
 
+					_.delay(function () {
+						self.contactsSync();
+					}, 10000);
+
+					_.delay(function () {
+						self.folderInformationMultiply(true);
+					}, 2000);
+
 					window.setInterval(function () {
 						self.contactsSync();
 					}, iContactsSyncInterval * 60000 + 5000);
 
+					if (Settings.capa(Enums.Capa.AdditionalAccounts) || Settings.capa(Enums.Capa.AdditionalIdentities))
+					{
+						self.accountsAndIdentities();
+					}
+
 					_.delay(function () {
-						self.contactsSync();
+						var sF = Data.currentFolderFullNameRaw();
+						if (Cache.getFolderInboxName() !== sF)
+						{
+							self.folderInformation(sF);
+						}
+					}, 1000);
+
+					_.delay(function () {
+						self.quota();
 					}, 5000);
 
 					_.delay(function () {
-						self.folderInformationMultiply(true);
+						Remote.appDelayStart(Utils.emptyFunction);
-					}, 500);
+					}, 35000);
 
 					Plugins.runHook('rl-start-user-screens');
 					Events.pub('rl.bootstart-user-screens');

dev/Common/Utils.js

@@ -1982,6 +1982,9 @@
 	Utils.reloadLanguage = function (sLanguage, fDone, fFail)
 	{
 		var iStart = Utils.microtime();
+
+		Globals.$html.addClass('rl-changing-language');
+
 		$.ajax({
 				'url': require('Common/Links').langLink(sLanguage),
 				'dataType': 'script',
@@ -1992,6 +1995,7 @@
 				_.delay(function () {
 					Utils.i18nReload();
 					(fDone || Utils.emptyFunction)();
+					Globals.$html.removeClass('rl-changing-language');
 				}, 500 < Utils.microtime() - iStart ? 1 : 500);
 			})
 		;

dev/Components/Abstract.js

@@ -0,0 +1,72 @@
+
+(function () {
+
+	'use strict';
+
+	var
+		_ = require('_'),
+		ko = require('ko'),
+
+		Utils = require('Common/Utils')
+	;
+
+	/**
+	 * @constructor
+	 */
+	function AbstractComponent()
+	{
+		this.disposable = [];
+	}
+
+	/**
+	 * @type {Array}
+	 */
+	AbstractComponent.prototype.disposable = [];
+
+	AbstractComponent.prototype.dispose = function ()
+	{
+		_.each(this.disposable, function (fFuncToDispose) {
+			if (fFuncToDispose && fFuncToDispose.dispose)
+			{
+				fFuncToDispose.dispose();
+			}
+		});
+	};
+
+	/**
+	 * @param {AbstractComponent} fClassObject
+	 * @param {string} sTemplateID
+	 * @return {Object}
+	 */
+	AbstractComponent.componentExportHelper = function (fClassObject, sTemplateID) {
+		return {
+			viewModel: {
+				createViewModel: function(oParams, oCmponentInfo) {
+
+					oParams = oParams || {};
+					oParams.element = null;
+
+					if (oCmponentInfo.element)
+					{
+						oParams.element = $(oCmponentInfo.element);
+
+						Utils.i18nToNode(oParams.element);
+
+						if (!Utils.isUnd(oParams.inline) && ko.unwrap(oParams.inline))
+						{
+							oParams.element.css('display', 'inline-block');
+						}
+					}
+
+					return new fClassObject(oParams);
+				}
+			},
+			template: {
+				element: sTemplateID
+			}
+		};
+	};
+
+	module.exports = AbstractComponent;
+
+}());

dev/Components/AbstractInput.js

@@ -0,0 +1,89 @@
+
+(function () {
+
+	'use strict';
+
+	var
+		_ = require('_'),
+		ko = require('ko'),
+
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+
+		AbstractComponent = require('Components/Abstract')
+	;
+
+	/**
+	 * @constructor
+	 *
+	 * @param {Object} oParams
+	 *
+	 * @extends AbstractComponent
+	 */
+	function AbstractInput(oParams) {
+
+		AbstractComponent.call(this);
+
+		this.value = oParams.value || '';
+		this.size = oParams.size || 0;
+		this.label = oParams.label || '';
+		this.enable = oParams.enable || true;
+		this.trigger = oParams.trigger && oParams.trigger.subscribe ? oParams.trigger : null;
+
+		this.labeled = !Utils.isUnd(oParams.label);
+		this.triggered = !Utils.isUnd(oParams.trigger) && !!this.trigger;
+
+		this.classForTrigger = ko.observable('');
+
+		this.className = ko.computed(function () {
+
+			var
+				iSize = ko.unwrap(this.size),
+				sSuffixValue = this.trigger ?
+					' ' + Utils.trim('settings-saved-trigger-input ' + this.classForTrigger()) : ''
+			;
+
+			return (0 < iSize ? 'span' + iSize : '') + sSuffixValue;
+
+		}, this);
+
+		if (!Utils.isUnd(oParams.width) && oParams.element)
+		{
+			oParams.element.find('input,select,textarea').css('width', oParams.width);
+		}
+
+		this.disposable.push(this.className);
+
+		if (this.trigger)
+		{
+			this.setTriggerState(this.trigger());
+
+			this.disposable.push(
+				this.trigger.subscribe(this.setTriggerState, this)
+			);
+		}
+	};
+
+	AbstractInput.prototype.setTriggerState = function (nValue)
+	{
+		switch (Utils.pInt(nValue))
+		{
+			case Enums.SaveSettingsStep.TrueResult:
+				this.classForTrigger('success');
+				break;
+			case Enums.SaveSettingsStep.FalseResult:
+				this.classForTrigger('error');
+				break;
+			default:
+				this.classForTrigger('');
+				break;
+		}
+	};
+
+	_.extend(AbstractInput.prototype, AbstractComponent.prototype);
+
+	AbstractInput.componentExportHelper = AbstractComponent.componentExportHelper;
+
+	module.exports = AbstractInput;
+
+}());

dev/Components/Checkbox.js

@@ -0,0 +1,38 @@
+
+(function () {
+
+	'use strict';
+
+	var
+		_ = require('_'),
+		ko = require('ko'),
+
+		AbstractComponent = require('Components/Abstract')
+	;
+
+	/**
+	 * @constructor
+	 *
+	 * @param {Object} oParams
+	 *
+	 * @extends AbstractComponent
+	 */
+	function CheckboxComponent(oParams) {
+
+		AbstractComponent.call(this);
+
+		this.value = oParams.value || ko.observable(false);
+		this.label = oParams.label || '';
+		this.inline = oParams.inline;
+	};
+
+	_.extend(CheckboxComponent.prototype, AbstractComponent.prototype);
+
+	CheckboxComponent.prototype.toggle = function() {
+		this.value(!this.value());
+	};
+
+	module.exports = AbstractComponent.componentExportHelper(
+		CheckboxComponent, 'CheckboxComponent');
+
+}());

dev/Components/Input.js

@@ -0,0 +1,50 @@
+
+(function () {
+
+	'use strict';
+
+	var
+		_ = require('_'),
+
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+
+		AbstractInput = require('Components/AbstractInput')
+	;
+
+	/**
+	 * @constructor
+	 *
+	 * @param {Object} oParams
+	 *
+	 * @extends AbstractInput
+	 */
+	function InputComponent(oParams) {
+
+		AbstractInput.call(this, oParams);
+
+		this.placeholder = oParams.placeholder || ''
+	};
+
+	InputComponent.prototype.setTriggerState = function (nValue)
+	{
+		switch (Utils.pInt(nValue))
+		{
+			case Enums.SaveSettingsStep.TrueResult:
+				this.classForTrigger('success');
+				break;
+			case Enums.SaveSettingsStep.FalseResult:
+				this.classForTrigger('error');
+				break;
+			default:
+				this.classForTrigger('');
+				break;
+		}
+	};
+
+	_.extend(InputComponent.prototype, AbstractInput.prototype);
+
+	module.exports = AbstractInput.componentExportHelper(
+		InputComponent, 'InputComponent');
+
+}());

dev/Components/SaveTrigger.js

@@ -0,0 +1,94 @@
+
+(function () {
+
+	'use strict';
+
+	var
+		_ = require('_'),
+
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+
+		AbstractComponent = require('Components/Abstract')
+	;
+
+	/**
+	 * @constructor
+	 *
+	 * @param {Object} oParams
+	 *
+	 * @extends AbstractComponent
+	 */
+	function SaveTriggerComponent(oParams) {
+
+		AbstractComponent.call(this);
+
+		this.element = oParams.element || null;
+		this.value = oParams.value && oParams.value.subscribe ? oParams.value : null;
+
+		if (this.element)
+		{
+			if (this.value)
+			{
+				this.element.css('display', 'inline-block');
+
+				if (oParams.verticalAlign)
+				{
+					this.element.css('vertical-align', oParams.verticalAlign);
+				}
+				
+				this.setState(this.value());
+
+				this.disposable.push(
+					this.value.subscribe(this.setState, this)
+				);
+			}
+			else
+			{
+				this.element.hide();
+			}
+		}
+	};
+
+	SaveTriggerComponent.prototype.setState = function (nValue)
+	{
+		switch (Utils.pInt(nValue))
+		{
+			case Enums.SaveSettingsStep.TrueResult:
+				this.element
+					.find('.animated,.error').hide().removeClass('visible')
+					.end()
+					.find('.success').show().addClass('visible')
+				;
+				break;
+			case Enums.SaveSettingsStep.FalseResult:
+				this.element
+					.find('.animated,.success').hide().removeClass('visible')
+					.end()
+					.find('.error').show().addClass('visible')
+				;
+				break;
+			case Enums.SaveSettingsStep.Animate:
+				this.element
+					.find('.error,.success').hide().removeClass('visible')
+					.end()
+					.find('.animated').show().addClass('visible')
+				;
+				break;
+			case Enums.SaveSettingsStep.Idle:
+			default:
+				this.element
+					.find('.animated').hide()
+					.end()
+					.find('.error,.success').removeClass('visible')
+				;
+				break;
+		}
+	};
+
+	_.extend(SaveTriggerComponent.prototype, AbstractComponent.prototype);
+
+	module.exports = AbstractComponent.componentExportHelper(
+		SaveTriggerComponent, 'SaveTriggerComponent');
+
+}());

dev/Components/Select.js

@@ -0,0 +1,37 @@
+
+(function () {
+
+	'use strict';
+
+	var
+		_ = require('_'),
+
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+
+		AbstractInput = require('Components/AbstractInput')
+	;
+
+	/**
+	 * @constructor
+	 *
+	 * @param {Object} oParams
+	 *
+	 * @extends AbstractInput
+	 */
+	function SelectComponent(oParams) {
+
+		AbstractInput.call(this, oParams);
+
+		this.options = oParams.options || '';
+
+		this.optionsText = oParams.optionsText || null;
+		this.optionsValue = oParams.optionsValue || null;
+	};
+
+	_.extend(SelectComponent.prototype, AbstractInput.prototype);
+
+	module.exports = AbstractInput.componentExportHelper(
+		SelectComponent, 'SelectComponent');
+
+}());

dev/Components/TextArea.js

@@ -0,0 +1,34 @@
+
+(function () {
+
+	'use strict';
+
+	var
+		_ = require('_'),
+
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+
+		AbstractInput = require('Components/AbstractInput')
+	;
+
+	/**
+	 * @constructor
+	 *
+	 * @param {Object} oParams
+	 *
+	 * @extends AbstractInput
+	 */
+	function TextAreaComponent(oParams) {
+
+		AbstractInput.call(this, oParams);
+
+		this.rows = oParams.rows || 5;
+	};
+
+	_.extend(TextAreaComponent.prototype, AbstractInput.prototype);
+
+	module.exports = AbstractInput.componentExportHelper(
+		TextAreaComponent, 'TextAreaComponent');
+
+}());

dev/External/ko.js

@@ -1,5 +1,5 @@
 
-(function (module, ko) {
+(function (ko) {
 
 	'use strict';
 
@@ -902,4 +902,4 @@
 
 	module.exports = ko;
 
-}(module, ko));
+}(ko));

dev/Screen/User/MailBox.js

@@ -102,32 +102,11 @@
 	MailBoxUserScreen.prototype.onStart = function ()
 	{
 		var
-			sInboxFolderName = Cache.getFolderInboxName(),
 			fResizeFunction = function () {
 				Utils.windowResize();
 			}
 		;
 
-		if (Settings.capa(Enums.Capa.AdditionalAccounts) || Settings.capa(Enums.Capa.AdditionalIdentities))
-		{
-			require('App/User').accountsAndIdentities();
-		}
-
-		_.delay(function () {
-			if (sInboxFolderName !== Data.currentFolderFullNameRaw())
-			{
-				require('App/User').folderInformation(sInboxFolderName);
-			}
-		}, 1000);
-
-		_.delay(function () {
-			require('App/User').quota();
-		}, 5000);
-
-		_.delay(function () {
-			Remote.appDelayStart(Utils.emptyFunction);
-		}, 35000);
-
 		Globals.$html.toggleClass('rl-no-preview-pane', Enums.Layout.NoPreview === Data.layout());
 
 		Data.folderList.subscribe(fResizeFunction);

dev/Settings/User/General.js

@@ -36,6 +36,13 @@
 		this.useCheckboxesInList = Data.useCheckboxesInList;
 		this.allowLanguagesOnSettings = Data.allowLanguagesOnSettings;
 
+		this.usePreviewPaneCheckbox = ko.computed({
+			read: this.usePreviewPane,
+			write: function (bValue) {
+				this.layout(bValue ? Enums.Layout.SidePreview : Enums.Layout.NoPreview);
+			}
+		}, this);
+
 		this.isDesktopNotificationsSupported = ko.computed(function () {
 			return Enums.DesktopNotifications.NotSupported !== Data.desktopNotificationsPermisions();
 		});

dev/Storage/User/Data.js

@@ -627,7 +627,7 @@
 
 		var
 			aResult = [],
-			iLimit = 10,
+			iLimit = 5,
 			iUtc = moment().unix(),
 			iTimeout = iUtc - 60 * 5,
 			aTimeouts = [],

dev/Styles/Layout.less

@@ -275,3 +275,6 @@ html.rl-ctrl-key-pressed {
 	background-image: none;
 	display: none;
 }
+
+/*html.rl-changing-language {
+}*/

rainloop/v/0.0.0/app/src/RainLoop/Actions.php

@@ -2427,6 +2427,7 @@ class Actions
 	 */
 	public function DoAdminSettingsUpdate()
 	{
+//		sleep(3);
 //		return $this->DefaultResponse(__FUNCTION__, false);
 
 		$this->IsAdminLoggined();

rainloop/v/0.0.0/app/src/RainLoop/Service.php

@@ -225,9 +225,11 @@ class Service
 			'AppleTouchLink' => $sStaticPrefix.'apple-touch-icon.png',
 			'AppCssLink' => $sStaticPrefix.'css/app'.($bAppCssDebug ? '' : '.min').'.css',
 			'BootJsLink' => $sStaticPrefix.'js/min/boot.js',
+			'ComponentsJsLink' => $sStaticPrefix.'js/'.($bAppJsDebug ? '' : 'min/').'components.js',
 			'LibJsLink' => $sStaticPrefix.'js/min/libs.js',
 			'EditorJsLink' => $sStaticPrefix.'ckeditor/ckeditor.js',
 			'OpenPgpJsLink' => $sStaticPrefix.'js/min/openpgp.min.js',
+			'AppJsCommonLink' => $sStaticPrefix.'js/'.($bAppJsDebug ? '' : 'min/').'common.js',
 			'AppJsLink' => $sStaticPrefix.'js/'.($bAppJsDebug ? '' : 'min/').($bAdmin ? 'admin' : 'app').'.js'
 		);
 
@@ -238,9 +240,11 @@ class Service
 			'{{BaseAppAppleTouchFile}}' => $aData['AppleTouchLink'],
 			'{{BaseAppMainCssLink}}' => $aData['AppCssLink'],
 			'{{BaseAppBootScriptLink}}' => $aData['BootJsLink'],
+			'{{BaseAppComponentsScriptLink}}' => $aData['ComponentsJsLink'],
 			'{{BaseAppLibsScriptLink}}' => $aData['LibJsLink'],
 			'{{BaseAppEditorScriptLink}}' => $aData['EditorJsLink'],
 			'{{BaseAppOpenPgpScriptLink}}' => $aData['OpenPgpJsLink'],
+			'{{BaseAppMainCommonScriptLink}}' => $aData['AppJsCommonLink'],
 			'{{BaseAppMainScriptLink}}' => $aData['AppJsLink'],
 			'{{BaseDir}}' => \in_array($aData['Language'], array('ar', 'he', 'ur')) ? 'rtl' : 'ltr'
 		);

rainloop/v/0.0.0/app/src/RainLoop/ServiceActions.php

@@ -442,6 +442,7 @@ class ServiceActions
 	 */
 	public function ServiceLang()
 	{
+//		sleep(2);
 		$sResult = '';
 		@\header('Content-Type: application/javascript; charset=utf-8');
 
@@ -1070,7 +1071,9 @@ class ServiceActions
 	 */
 	private function compileTemplates($bAdmin = false)
 	{
-		$sHtml = \RainLoop\Utils::CompileTemplates(APP_VERSION_ROOT_PATH.'app/templates/Views/'.($bAdmin ? 'Admin' : 'User'), $this->oActions).
+		$sHtml =
+			\RainLoop\Utils::CompileTemplates(APP_VERSION_ROOT_PATH.'app/templates/Views/Components', $this->oActions, 'Component').
+			\RainLoop\Utils::CompileTemplates(APP_VERSION_ROOT_PATH.'app/templates/Views/'.($bAdmin ? 'Admin' : 'User'), $this->oActions).
 			\RainLoop\Utils::CompileTemplates(APP_VERSION_ROOT_PATH.'app/templates/Views/Common', $this->oActions).
 			$this->oActions->Plugins()->CompileTemplate($bAdmin);
 

rainloop/v/0.0.0/app/src/RainLoop/Utils.php

@@ -245,10 +245,12 @@ class Utils
 
 	/**
 	 * @param string $sDirName
+	 * @param \RainLoop\Actions $oAction
+	 * @param string $sNameSuffix = ''
 	 *
 	 * @return string
 	 */
-	public static function CompileTemplates($sDirName, $oAction)
+	public static function CompileTemplates($sDirName, $oAction, $sNameSuffix = '')
 	{
 		$sResult = '';
 		if (\file_exists($sDirName))
@@ -257,7 +259,7 @@ class Utils
 
 			foreach ($aList as $sName)
 			{
-				$sTemplateName = \substr($sName, 0, -5);
+				$sTemplateName = \substr($sName, 0, -5).$sNameSuffix;
 				$sResult .= '<script id="'.\preg_replace('/[^a-zA-Z0-9]/', '', $sTemplateName).'" type="text/html" data-cfasync="false">'.
 					$oAction->ProcessTemplate($sTemplateName, \file_get_contents($sDirName.'/'.$sName)).'</script>';
 			}

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html

@@ -13,9 +13,15 @@
 				Page Title
 			</label>
 			<div class="controls">
-				<input type="text" class="span5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<div data-bind="component: {
-					data-bind="value: title, saveTrigger: title.trigger, enable: capa" />
+					name: 'Input',
-				<div data-bind="saveTrigger: title.trigger"></div>
+					params: {
+						value: title,
+						trigger: title.trigger,
+						size: 5,
+						enable: capa
+					}
+				}"></div>
 			</div>
 		</div>
 		<div class="control-group">
@@ -23,9 +29,15 @@
 				Loading Description
 			</label>
 			<div class="controls">
-				<input type="text" class="span5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<div data-bind="component: {
-					data-bind="value: loadingDesc, saveTrigger: loadingDesc.trigger, enable: capa" />
+					name: 'Input',
-				<div data-bind="saveTrigger: loadingDesc.trigger"></div>
+					params: {
+						value: loadingDesc,
+						trigger: loadingDesc.trigger,
+						size: 5,
+						enable: capa
+					}
+				}"></div>
 			</div>
 		</div>
 		<br />
@@ -37,9 +49,16 @@
 				Logo
 			</label>
 			<div class="controls">
-				<input type="text" class="span5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<div data-bind="component: {
-					placeholder="https://" data-bind="value: loginLogo, saveTrigger: loginLogo.trigger, enable: capa" />
+					name: 'Input',
-				<div data-bind="saveTrigger: loginLogo.trigger"></div>
+					params: {
+						value: loginLogo,
+						trigger: loginLogo.trigger,
+						placeholder: 'https://',
+						size: 5,
+						enable: capa
+					}
+				}"></div>
 			</div>
 		</div>
 		<div class="control-group">
@@ -47,18 +66,26 @@
 				Description
 			</label>
 			<div class="controls">
-				<input type="text" class="span5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<div data-bind="component: {
-					data-bind="value: loginDescription, saveTrigger: loginDescription.trigger, enable: capa" />
+					name: 'Input',
-				<div data-bind="saveTrigger: loginDescription.trigger"></div>
+					params: {
+						value: loginDescription,
+						trigger: loginDescription.trigger,
+						size: 5,
+						enable: capa
+					}
+				}"></div>
 			</div>
 		</div>
 <!--		<div class="control-group">
-			<label class="control-label"></label>
 			<div class="controls">
-				<label data-bind="click: function () { if (capa) { loginPowered(!loginPowered()); }}">
+				<div data-bind="component: {
-					<i data-bind="css: loginPowered() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Show "Powered by RainLoop" link
+					params: {
-				</label>
+						label: 'Show &quot;Powered by RainLoop&quot; link',
+						value: loginPowered
+					}
+				}"></div>
 			</div>
 		</div>-->
 		<div class="control-group">
@@ -66,8 +93,16 @@
 				Custom CSS
 			</label>
 			<div class="controls">
-				<textarea class="input-xxlarge" data-bind="value: loginCss, saveTrigger: loginCss.trigger, enable: capa" rows="7" spellcheck="true"></textarea>
+				<div data-bind="component: {
-				<div style="vertical-align: top;" data-bind="saveTrigger: loginCss.trigger"></div>
+					name: 'TextArea',
+					params: {
+						value: loginCss,
+						trigger: loginCss.trigger,
+						width: 530,
+						enable: capa,
+						rows: 7
+					}
+				}"></div>
 			</div>
 		</div>
 	</div>

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html

@@ -14,18 +14,14 @@
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { enableContacts(!enableContacts()); }">
+				<div data-bind="component: {
-					<i data-bind="css: enableContacts() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Enable contacts
+					params: { value: enableContacts, label: 'Enable contacts' }
-				</label>
+				}"></div>
-<!--				<label data-bind="click: function () { contactsSharing(!contactsSharing()); }">
+				<div data-bind="component: {
-					<i data-bind="css: contactsSharing() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Allow contacts sharing (disabled)
+					params: { value: contactsSync, label: 'Allow contacts sync (with external CardDAV server)' }
-				</label>-->
+				}"></div>
-				<label data-bind="click: function () { contactsSync(!contactsSync()); }">
-					<i data-bind="css: contactsSync() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
-					Allow contacts sync (with external CardDAV server)
-				</label>
 			</div>
 		</div>
 	</div>

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html

@@ -23,7 +23,11 @@
 						<span data-bind="css: 'flag flag-' + mainLanguage()" style=""></span>
 					</span>
 					<span class="flag-name" data-bind="text: mainLanguageFullName, click: selectLanguage"></span>
-					<div data-bind="saveTrigger: languageTrigger"></div>
+					&nbsp;&nbsp;
+					<div data-bind="component: {
+						name: 'SaveTrigger',
+						params: { value: languageTrigger }
+					}"></div>
 				</label>
 			</div>
 		</div>
@@ -32,28 +36,47 @@
 				Theme
 			</label>
 			<div class="controls">
-				<select class="span2" data-bind="options: themesOptions, value: mainTheme, optionsText: 'optText', optionsValue: 'optValue', saveTrigger: themeTrigger"></select>
+				<div data-bind="component: {
-				<div data-bind="saveTrigger: themeTrigger"></div>
+					name: 'Select',
+					params: {
+						options: themesOptions,
+						value: mainTheme,
+						trigger: themeTrigger,
+						optionsText: 'optText',
+						optionsValue: 'optValue',
+						size: 2
+					}
+				}"></div>
 			</div>
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { allowLanguagesOnSettings(!allowLanguagesOnSettings()); }">
+				<div data-bind="component: {
-					<i data-bind="css: allowLanguagesOnSettings() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Allow language selection on settings screen
+					params: {
-				</label>
+						label: 'Allow language selection on settings screen',
-				<label data-bind="click: function () { capaThemes(!capaThemes()); }">
+						value: allowLanguagesOnSettings
-					<i data-bind="css: capaThemes() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					}
-					Allow theme selection on settings screen
+				}"></div>
-				</label>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'Allow theme selection on settings screen',
+						value: capaThemes
+					}
+				}"></div>
 			</div>
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label class="inline" data-bind="click: function () { capaGravatar(!capaGravatar()); }">
+				<div data-bind="component: {
-					<i data-bind="css: capaGravatar() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Allow Gravatar
+					params: {
-				</label>
+						label: 'Allow Gravatar',
+						value: capaGravatar,
+						inline: true
+					}
+				}"></div>
 				(<a class="g-ui-link" href="http://en.gravatar.com/" target="_blank">http://en.gravatar.com/</a>)
 			</div>
 		</div>
@@ -66,8 +89,15 @@
 				size limit
 			</label>
 			<div class="controls">
-				<input class="span1" type="text" maxlength="3" data-bind="value: mainAttachmentLimit, saveTrigger: attachmentLimitTrigger" /> MB
+				<div data-bind="component: {
-				<div data-bind="saveTrigger: attachmentLimitTrigger"></div>
+					name: 'Input',
+					params: {
+						label: 'MB',
+						value: mainAttachmentLimit,
+						trigger: attachmentLimitTrigger,
+						size: 1
+					}
+				}"></div>
 				<br />
 				<br />
 				<span class="well well-small" data-bind="visible: '' !== uploadDataDesc">
@@ -84,14 +114,20 @@
 		<br />
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { capaAdditionalAccounts(!capaAdditionalAccounts()); }">
+				<div data-bind="component: {
-					<i data-bind="css: capaAdditionalAccounts() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Allow additional accounts
+					params: {
-				</label>
+						label: 'Allow additional accounts',
-				<label data-bind="click: function () { capaAdditionalIdentities(!capaAdditionalIdentities()); }">
+						value: capaAdditionalAccounts
-					<i data-bind="css: capaAdditionalIdentities() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					}
-					Allow additional identities
+				}"></div>
-				</label>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'Allow additional identities',
+						value: capaAdditionalIdentities
+					}
+				}"></div>
 			</div>
 		</div>
 	</div>

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsLogin.html

@@ -8,26 +8,31 @@
 				Default Domain
 			 </label>
 			<div class="controls">
-				<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<div data-bind="component: {
-					data-bind="value: defaultDomain, saveTrigger: defaultDomainTrigger" />
+					name: 'Input',
-				<div data-bind="saveTrigger: defaultDomainTrigger"></div>
+					params: {
+						value: defaultDomain,
+						trigger: defaultDomainTrigger,
+						size: 3
+					}
+				}"></div>
 			</div>
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { determineUserDomain(!determineUserDomain()); }">
+				<div data-bind="component: {
-					<i data-bind="css: determineUserDomain() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Try to determine user domain
+					params: { value: determineUserDomain, label: 'Try to determine user domain' }
-				</label>
+				}"></div>
 				<br />
-				<label data-bind="click: function () { allowLanguagesOnLogin(!allowLanguagesOnLogin()); }">
+				<div data-bind="component: {
-					<i data-bind="css: allowLanguagesOnLogin() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Allow language selection on login screen
+					params: { value: allowLanguagesOnLogin, label: 'Allow language selection on login screen' }
-				</label>
+				}"></div>
-				<label data-bind="click: function () { determineUserLanguage(!determineUserLanguage()); }">
+				<div data-bind="component: {
-					<i data-bind="css: determineUserLanguage() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Try to determine user language
+					params: { value: determineUserLanguage, label: 'Try to determine user language' }
-				</label>
+				}"></div>
 			</div>
 		</div>
 	</div>

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsPlugins.html

@@ -12,11 +12,10 @@
 	</div>
 
 	<div>
-		<label data-bind="click: function () { enabledPlugins(!enabledPlugins()); }">
+		<div data-bind="component: {
-			<i data-bind="css: enabledPlugins() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+			name: 'Checkbox',
-			&nbsp;&nbsp;
+			params: { value: enabledPlugins, label: 'Enable plugins' }
-			Enable plugins
+		}"></div>
-		</label>
 	</div>
 	<br />
 	<div class="row">

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html

@@ -5,40 +5,38 @@
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { capaTwoFactorAuth(!capaTwoFactorAuth()); }">
+				<div data-bind="component: {
-					<i data-bind="css: capaTwoFactorAuth() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					&nbsp;&nbsp;
+					params: { value: capaTwoFactorAuth, label: 'Allow 2-Step Verification (Google Authenticator)' }
-					Allow 2-Step Verification (Google Authenticator)
+				}"></div>
-				</label>
 			</div>
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { useLocalProxyForExternalImages(!useLocalProxyForExternalImages()); }">
+				<div data-bind="component: {
-					<i data-bind="css: useLocalProxyForExternalImages() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					&nbsp;&nbsp;
+					params: { value: useLocalProxyForExternalImages, label: 'Use local proxy for external images' }
-					Use local proxy for external images
+				}"></div>
-				</label>
 			</div>
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { capaOpenPGP(!capaOpenPGP()); }">
+				<div data-bind="component: {
-					<i data-bind="css: capaOpenPGP() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					&nbsp;&nbsp;
+					params: { value: capaOpenPGP, label: 'Allow OpenPGP', inline: true }
-					Allow OpenPGP
+				}"></div>
-					<span style="color:red">(beta)</span>
+				&nbsp;&nbsp;
-				</label>
+				<span style="color:red">(beta)</span>
 			</div>
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { verifySslCertificate(!verifySslCertificate()); }">
+				<div data-bind="component: {
-					<i data-bind="css: verifySslCertificate() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					&nbsp;&nbsp;
+					params: { value: verifySslCertificate, label: 'Require verification of SSL certificate used (IMAP/SMTP)', inline: true }
-					Require verification of SSL certificate used (IMAP/SMTP).
+				}"></div>
-					<span style="color:red">(beta)</span>
+				&nbsp;&nbsp;
-				</label>
+				<span style="color:red">(beta)</span>
 			</div>
 		</div>
 		<div class="control-group">

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSocial.html

@@ -11,21 +11,21 @@
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { googleEnable(!googleEnable()); }">
+				<div data-bind="component: {
-					<i data-bind="css: googleEnable() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Enable Google Integration
+					params: { value: googleEnable, label: 'Enable Google Integration' }
-				</label>
+				}"></div>
 				<div data-bind="visible: googleEnable">
 					<br />
 					<blockquote>
-						<label data-bind="click: function () { googleEnable.auth(!googleEnable.auth()); }">
+						<div data-bind="component: {
-							<i data-bind="css: googleEnable.auth() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+							name: 'Checkbox',
-							Authentication
+							params: { value: googleEnable.auth, label: 'Authentication' }
-						</label>
+						}"></div>
-						<label data-bind="click: function () { googleEnable.drive(!googleEnable.drive()); }" style="margin-top: 5px">
+						<div data-bind="component: {
-							<i data-bind="css: googleEnable.drive() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+							name: 'Checkbox',
-							Google Drive Integration (Compose view)
+							params: { value: googleEnable.drive, label: 'Google Drive Integration (Compose view)' }
-						</label>
+						}"></div>
 					</blockquote>
 				</div>
 			</div>
@@ -56,9 +56,15 @@
 				Api Key
 			</label>
 			<div class="controls">
-				<input type="text" class="span5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<div data-bind="component: {
-					data-bind="value: googleApiKey, saveTrigger: googleTrigger3, enable: googleEnable.drive" />
+					name: 'Input',
-				<div data-bind="saveTrigger: googleTrigger3"></div>
+					params: {
+						value: googleApiKey,
+						trigger: googleTrigger3,
+						size: 5,
+						enable: googleEnable.drive
+					}
+				}"></div>
 				<blockquote style="margin-top: 10px; margin-bottom: 0">
 					<p class="muted">
 						Required for Google Drive File Picker
@@ -73,10 +79,10 @@
 		<div data-bind="if: facebookSupported">
 			<div class="control-group">
 				<div class="controls">
-					<label data-bind="click: function () { facebookEnable(!facebookEnable()); }">
+					<div data-bind="component: {
-						<i data-bind="css: facebookEnable() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+						name: 'Checkbox',
-						Enable Facebook Integration (Authentication)
+						params: { value: facebookEnable, label: 'Enable Facebook Integration (Authentication)' }
-					</label>
+					}"></div>
 				</div>
 			</div>
 			<div class="control-group">
@@ -105,10 +111,10 @@
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { twitterEnable(!twitterEnable()); }">
+				<div data-bind="component: {
-					<i data-bind="css: twitterEnable() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Enable Twitter Integration (Authentication)
+					params: { value: twitterEnable, label: 'Enable Twitter Integration (Authentication)' }
-				</label>
+				}"></div>
 			</div>
 		</div>
 		<div class="control-group">
@@ -136,10 +142,10 @@
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { dropboxEnable(!dropboxEnable()); }">
+				<div data-bind="component: {
-					<i data-bind="css: dropboxEnable() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					Enable Dropbox Integration (Compose view)
+					params: { value: dropboxEnable, label: 'Enable Dropbox Integration (Compose view)' }
-				</label>
+				}"></div>
 			</div>
 		</div>
 		<div class="control-group">

rainloop/v/0.0.0/app/templates/Views/Components/Checkbox.html

@@ -0,0 +1,4 @@
+<label data-bind="click: toggle, css: {'inline': inline}">
+<i data-bind="css: value() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+&nbsp;<span class="i18n" data-bind="attr: {'data-i18n-text': label}"></span>
+</label>

rainloop/v/0.0.0/app/templates/Views/Components/Input.html

@@ -0,0 +1,14 @@
+<input class="i18n" type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" placeholder=""
+	data-bind="value: value, attr: {'data-i18n-placeholder': placeholder}, enable: enable, css: className" />
+<!-- ko if: labeled -->
+&nbsp;
+<span class="i18n" data-bind="attr: {'data-i18n-text': label}"></span>
+&nbsp;
+<!-- /ko -->
+<!-- ko if: triggered -->
+&nbsp;
+<div data-bind="component: {
+	name: 'SaveTrigger',
+	params: { value: trigger }
+}"></div>
+<!-- /ko -->

rainloop/v/0.0.0/app/templates/Views/Components/SaveTrigger.html

@@ -0,0 +1,3 @@
+<div class="settings-saved-trigger">
+<i class="icon-spinner animated"></i><i class="icon-remove error"></i><i class="icon-ok success"></i>
+</div>

rainloop/v/0.0.0/app/templates/Views/Components/Select.html

@@ -0,0 +1,13 @@
+<select data-bind="options: options, value: value, optionsText: optionsText, optionsValue: optionsValue, css: className"></select>
+<!-- ko if: labeled -->
+&nbsp;
+<span class="i18n" data-bind="attr: {'data-i18n-text': label}"></span>
+&nbsp;
+<!-- /ko -->
+<!-- ko if: triggered -->
+&nbsp;&nbsp;
+<div data-bind="component: {
+	name: 'SaveTrigger',
+	params: { value: trigger }
+}"></div>
+<!-- /ko -->

rainloop/v/0.0.0/app/templates/Views/Components/TextArea.html

@@ -0,0 +1,9 @@
+<textarea class="i18n" rows="5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="true"
+	data-bind="value: value, enable: enable, attr: { rows: rows }, css: className"></textarea>
+<!-- ko if: triggered -->
+&nbsp;
+<div data-bind="component: {
+	name: 'SaveTrigger',
+	params: { value: trigger, verticalAlign: 'top' }
+}"></div>
+<!-- /ko -->

rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html

@@ -13,7 +13,11 @@
 						<span data-bind="css: 'flag flag-' + mainLanguage()" style=""></span>
 					</span>
 					<span class="flag-name" data-bind="text: mainLanguageFullName, click: selectLanguage"></span>
-					<div data-bind="saveTrigger: languageTrigger"></div>
+					&nbsp;&nbsp;
+					<div data-bind="component: {
+						name: 'SaveTrigger',
+						params: { value: languageTrigger }
+					}"></div>
 				</label>
 			</div>
 		</div>
@@ -43,38 +47,56 @@
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<select class="span2" data-bind="options: mainMessagesPerPageArray, value: mainMessagesPerPage, saveTrigger: mppTrigger" style="width: 70px;"></select>
+				<div data-bind="component: {
-				<span class="i18n help-inline" data-i18n-text="SETTINGS_GENERAL/LABEL_MESSAGE_PER_PAGE"></span>
+					name: 'Select',
-				<div data-bind="saveTrigger: mppTrigger"></div>
+					params: {
+						label: 'SETTINGS_GENERAL/LABEL_MESSAGE_PER_PAGE',
+						options: mainMessagesPerPageArray,
+						value: mainMessagesPerPage,
+						trigger: mppTrigger,
+						size: 2,
+						width: 70
+					}
+				}"></div>
 			</div>
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<label data-bind="click: function () { showImages(!showImages()); }">
+				<div data-bind="component: {
-					<i data-bind="css: showImages() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					name: 'Checkbox',
-					&nbsp;&nbsp;
+					params: {
-					<span class="i18n" data-i18n-text="SETTINGS_GENERAL/LABEL_SHOW_IMAGES"></span>
+						label: 'SETTINGS_GENERAL/LABEL_SHOW_IMAGES',
-				</label>
+						value: showImages
-				<label data-bind="click: function () { useCheckboxesInList(!useCheckboxesInList()); }">
+					}
-					<i data-bind="css: useCheckboxesInList() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+				}"></div>
-					&nbsp;&nbsp;
+				<div data-bind="component: {
-					<span class="i18n" data-i18n-text="SETTINGS_GENERAL/LABEL_USE_CHECKBOXES_IN_LIST"></span>
+					name: 'Checkbox',
-				</label>
+					params: {
-				<label data-bind="click: toggleLayout">
+						label: 'SETTINGS_GENERAL/LABEL_USE_CHECKBOXES_IN_LIST',
-					<i data-bind="css: usePreviewPane() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+						value: useCheckboxesInList
-					&nbsp;&nbsp;
+					}
-					<span class="i18n" data-i18n-text="SETTINGS_GENERAL/LABEL_USE_PREVIEW_PANE"></span>
+				}"></div>
-				</label>
+				<div data-bind="component: {
-				<label data-bind="visible: threading, click: function () { useThreads(!useThreads()); }">
+					name: 'Checkbox',
-					<i data-bind="css: useThreads() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+					params: {
-					&nbsp;&nbsp;
+						label: 'SETTINGS_GENERAL/LABEL_USE_PREVIEW_PANE',
-					<span class="i18n" data-i18n-text="SETTINGS_GENERAL/LABEL_USE_THREADS"></span>
+						value: usePreviewPaneCheckbox
-				</label>
+					}
-				<label data-bind="click: function () { replySameFolder(!replySameFolder()); }">
+				}"></div>
-					<i data-bind="css: replySameFolder() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
+				<div data-bind="visible: threading, component: {
-					&nbsp;&nbsp;
+					name: 'Checkbox',
-					<span class="i18n" data-i18n-text="SETTINGS_GENERAL/LABEL_REPLY_SAME_FOLDER"></span>
+					params: {
-				</label>
+						label: 'SETTINGS_GENERAL/LABEL_USE_THREADS',
+						value: useThreads
+					}
+				}"></div>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'SETTINGS_GENERAL/LABEL_REPLY_SAME_FOLDER',
+						value: replySameFolder
+					}
+				}"></div>
 			</div>
 		</div>
 	</div>

rainloop/v/0.0.0/app/templates/Views/User/SettingsThemes.html

@@ -2,7 +2,11 @@
 	<div class="form-horizontal">
 		<div class="legend">
 			<span class="i18n" data-i18n-text="SETTINGS_THEMES/LEGEND_THEMES"></span>
-			<div class="themeTrigger" data-bind="saveTrigger: themeTrigger"></div>
+			&nbsp;&nbsp;
+			<div data-bind="component: {
+				name: 'SaveTrigger',
+				params: { value: themeTrigger }
+			}"></div>
 		</div>
 	</div>
 	<div class="b-themes-list" data-bind="foreach: themesObjects">

webpack.config.js

@@ -13,6 +13,7 @@ module.exports = {
 		chunkFilename: '[chunkhash].chunk.js'
 	},
 	plugins: [
+//		new webpack.optimize.CommonsChunkPlugin('common.js'),
 		new webpack.optimize.OccurenceOrderPlugin()
 	],
 	resolve: {