Contacts improvements (Added URL and Nickname fields)

dev/Common/Enums.js

@@ -296,6 +296,8 @@ Enums.ContactPropertyType = {
 	'Phone': 31,
 	'Web': 32,
 
+	'Birthday': 40,
+
 	'Facebook': 90,
 	'Skype': 91,
 	'GitHub': 92,

dev/Models/ContactPropertyModel.js

@@ -22,4 +22,9 @@ function ContactPropertyModel(iType, sTypeStr, sValue, bFocused, sPlaceholder)
 		var sPlaceholder = this.placeholder();
 		return sPlaceholder ? Utils.i18n(sPlaceholder) : '';
 	}, this);
+
+	this.largeValue = ko.computed(function () {
+		return Enums.ContactPropertyType.Note === this.type();
+	}, this);
+
 }

dev/Styles/Contacts.less

@@ -255,7 +255,7 @@
 				-webkit-overflow-scrolling: touch;
 			}
 
-			.contactValueStatic {
+			.contactValueStatic, .contactValueLargeStatic, .contactValueTextAreaStatic {
 				height: 20px;
 				line-height: 20px;
 				font-size: 18px;
@@ -266,11 +266,11 @@
 			}
 			
 			&.read-only {
-				.contactValueStatic {
+				.contactValueStatic, .contactValueLargeStatic, .contactValueTextAreaStatic {
 					display: inline-block;
 				}
 
-				.contactValueInput {
+				.contactValueInput, .contactValueInputLarge, .contactValueTextArea {
 					display: none;
 				}
 			}
@@ -303,12 +303,12 @@
 				color: #aaa;
 			}
 
-			.contactValueStatic {
+			.contactValueStatic, .contactValueLargeStatic, .contactValueTextAreaStatic {
 				font-size: 18px;
 				display: none;
 			}
 
-			.contactValueInput {
+			.contactValueInput, .contactValueInputLarge, .contactValueTextArea {
 				.box-shadow(none);
 				border-color: #fff;
 				font-size: 18px;
@@ -337,6 +337,14 @@
 					color: #ddd;
 				}
 			}
+			
+			.contactValueTextArea {
+				width: 300px;
+			}
+
+			.contactValueInputLarge {
+				width: 400px;
+			}
 
 			.hasError {
 				.contactValueInput {
@@ -376,6 +384,12 @@
 				}
 			}
 
+			.button-add-prop {
+				position: absolute;
+				top: 60px;
+				right: 20px;
+			}
+
 			&.read-only {
 				.e-read-only-sign {
 					display: inline-block;

dev/Styles/Layout.less

@@ -85,7 +85,7 @@ html.ssm-state-desktop-large {
 	}
 
 	.b-contacts-content.modal {
-		width: 800px;
+		width: 900px;
 	}
 }
 
@@ -112,7 +112,7 @@ html.ssm-state-desktop {
 	}
 
 	.b-contacts-content.modal {
-		width: 800px;
+		width: 900px;
 	}
 }
 
@@ -169,7 +169,7 @@ html.ssm-state-tablet {
 	}
 
 	.b-contacts-content.modal {
-		width: 700px;
+		width: 800px;
 	}
 
 	.b-contacts-content.modal {

dev/Styles/_BootstrapFix.less

@@ -175,6 +175,18 @@ html.rgba.textshadow {
           border-bottom-right-radius: @btnBorderRadius;
 }
 
+.dropdown.colored-toggle.open .btn.dropdown-toggle {
+	color: #BD362F;
+
+	.caret {
+		border-top-color: #BD362F;
+	}
+
+	[class^="icon-"]:before {
+		color: #BD362F;
+	}
+}
+
 textarea, input[type="text"], input[type="password"], input[type="email"], input[type="search"] {
 
 	border: @rlInputBorderSize solid @inputBorder;

dev/ViewModels/PopupsContactsViewModel.js

@@ -47,8 +47,30 @@ function PopupsContactsViewModel()
 	this.viewSaveTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 
 	this.viewPropertiesNames = this.viewProperties.filter(function(oProperty) {
-		return -1 < Utils.inArray(oProperty.type(), [Enums.ContactPropertyType.FirstName, Enums.ContactPropertyType.LastName]);
+		return -1 < Utils.inArray(oProperty.type(), [
+			Enums.ContactPropertyType.FirstName, Enums.ContactPropertyType.LastName
+		]);
 	});
+
+	this.viewPropertiesOther = this.viewProperties.filter(function(oProperty) {
+		return -1 < Utils.inArray(oProperty.type(), [
+			Enums.ContactPropertyType.Note
+		]);
+	});
+	
+	this.viewPropertiesOther = ko.computed(function () {
+
+		var aList = _.filter(this.viewProperties(), function (oProperty) {
+			return -1 < Utils.inArray(oProperty.type(), [
+				Enums.ContactPropertyType.Nick
+			]);
+		});
+
+		return _.sortBy(aList, function (oProperty) {
+			return oProperty.type();
+		});
+
+	}, this);
 	
 	this.viewPropertiesEmails = this.viewProperties.filter(function(oProperty) {
 		return Enums.ContactPropertyType.Email === oProperty.type();
@@ -94,6 +116,13 @@ function PopupsContactsViewModel()
 		return '' === Utils.trim(oProperty.value()) && !bF;
 	});
 
+	this.viewPropertiesOtherEmptyAndOnFocused = ko.computed(function () {
+		return _.filter(this.viewPropertiesOther(), function (oProperty) {
+			var bF = oProperty.focused();
+			return '' === Utils.trim(oProperty.value()) && !bF;
+		});
+	}, this);
+
 	this.viewPropertiesEmailsEmptyAndOnFocused.subscribe(function(aList) {
 		fFastClearEmptyListHelper(aList);
 	});
@@ -106,6 +135,10 @@ function PopupsContactsViewModel()
 		fFastClearEmptyListHelper(aList);
 	});
 
+	this.viewPropertiesOtherEmptyAndOnFocused.subscribe(function(aList) {
+		fFastClearEmptyListHelper(aList);
+	});
+
 	this.viewSaving = ko.observable(false);
 
 	this.useCheckboxesInList = RL.data().useCheckboxesInList;
@@ -314,11 +347,44 @@ function PopupsContactsViewModel()
 
 Utils.extendAsViewModel('PopupsContactsViewModel', PopupsContactsViewModel);
 
+PopupsContactsViewModel.prototype.getPropertyPlceholder = function (sType)
+{
+	var sResult = '';
+	switch (sType)
+	{
+		case Enums.ContactPropertyType.LastName:
+			sResult = 'CONTACTS/PLACEHOLDER_ENTER_LAST_NAME';
+			break;
+		case Enums.ContactPropertyType.FirstName:
+			sResult = 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME';
+			break;
+		case Enums.ContactPropertyType.Nick:
+			sResult = 'CONTACTS/PLACEHOLDER_ENTER_NICK_NAME';
+			break;
+	}
+
+	return sResult;
+};
+
 PopupsContactsViewModel.prototype.addNewProperty = function (sType, sTypeStr)
 {
-	var oItem = new ContactPropertyModel(sType, sTypeStr || '', '');
+	this.viewProperties.push(new ContactPropertyModel(sType, sTypeStr || '', '', true, this.getPropertyPlceholder(sType)));
-	oItem.focused(true);
+};
-	this.viewProperties.push(oItem);
+
+PopupsContactsViewModel.prototype.addNewOrFocusProperty = function (sType, sTypeStr)
+{
+	var oItem = _.find(this.viewProperties(), function (oItem) {
+		return sType === oItem.type();
+	});
+
+	if (oItem)
+	{
+		oItem.focused(true);
+	}
+	else
+	{
+		this.addNewProperty(sType, sTypeStr);
+	}
 };
 
 PopupsContactsViewModel.prototype.addNewEmail = function ()
@@ -336,6 +402,25 @@ PopupsContactsViewModel.prototype.addNewWeb = function ()
 	this.addNewProperty(Enums.ContactPropertyType.Web);
 };
 
+PopupsContactsViewModel.prototype.addNewNickname = function ()
+{
+	this.addNewOrFocusProperty(Enums.ContactPropertyType.Nick);
+};
+
+PopupsContactsViewModel.prototype.addNewNotes = function ()
+{
+	this.addNewOrFocusProperty(Enums.ContactPropertyType.Note);
+};
+
+PopupsContactsViewModel.prototype.addNewBirthday = function ()
+{
+	this.addNewOrFocusProperty(Enums.ContactPropertyType.Birthday);
+};
+
+//PopupsContactsViewModel.prototype.addNewAddress = function ()
+//{
+//};
+
 PopupsContactsViewModel.prototype.exportVcf = function ()
 {
 	RL.download(RL.link().exportContactsVcf());
@@ -507,8 +592,11 @@ PopupsContactsViewModel.prototype.populateViewContact = function (oContact)
 		this.viewReadOnly(!!oContact.readOnly);
 	}
 
-	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, '', sLastName, false, 'CONTACTS/PLACEHOLDER_ENTER_LAST_NAME'));
+	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, '', sLastName, false,
-	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.FirstName, '', sFirstName, !oContact, 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME'));
+		this.getPropertyPlceholder(Enums.ContactPropertyType.LastName)));
+
+	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.FirstName, '', sFirstName, !oContact,
+		this.getPropertyPlceholder(Enums.ContactPropertyType.FirstName)));
 	
 	this.viewID(sId);
 	this.viewProperties([]);

package.json

@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.6.6",
-	"release": "911",
+	"release": "913",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "Gruntfile.js",

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

@@ -2465,6 +2465,15 @@ class Actions
 				$oImapClient->Disconnect();
 				$bImapResult = true;
 			}
+			catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
+			{
+				$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
+				$sImapErrorDesc = $oException->getSocketMessage();
+				if (empty($sImapErrorDesc))
+				{
+					$sImapErrorDesc = $oException->getMessage();
+				}
+			}
 			catch (\Exception $oException)
 			{
 				$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
@@ -2482,6 +2491,15 @@ class Actions
 				$oSmtpClient->Disconnect();
 				$bSmtpResult = true;
 			}
+			catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
+			{
+				$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
+				$sSmtpErrorDesc = $oException->getSocketMessage();
+				if (empty($sSmtpErrorDesc))
+				{
+					$sSmtpErrorDesc = $oException->getMessage();
+				}
+			}
 			catch (\Exception $oException)
 			{
 				$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);

rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php

@@ -220,6 +220,9 @@ class Contact
 					case PropertyType::NICK_NAME:
 						$oVCard->NICKNAME = $oProperty->Value;
 						break;
+					case PropertyType::NOTE:
+						$oVCard->NOTE = $oProperty->Value;
+						break;
 					case PropertyType::FIRST_NAME:
 						$sFirstName = $oProperty->Value;
 						break;
@@ -511,11 +514,11 @@ class Contact
 				$aProperties[] = new Property(PropertyType::NICK_NAME, $sValue);
 			}
 
-//			if (isset($oVCard->NOTE) && '' !== \trim($oVCard->NOTE))
+			if (isset($oVCard->NOTE) && '' !== \trim($oVCard->NOTE))
-//			{
+			{
-//				$sValue = $this->getPropertyValueHelper($oVCard->NOTE, $bOldVersion);
+				$sValue = $this->getPropertyValueHelper($oVCard->NOTE, $bOldVersion);
-//				$aProperties[] = new Property(PropertyType::NOTE, $sValue);
+				$aProperties[] = new Property(PropertyType::NOTE, $sValue);
-//			}
+			}
 
 			if (isset($oVCard->N))
 			{

rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php

@@ -21,6 +21,8 @@ class PropertyType
 //	const MOBILE = 32;
 //	const FAX = 33;
 	const WEB_PAGE = 32;
+	
+	const BIRTHDAY = 40;
 
 	const FACEBOOK = 90;
 	const SKYPE = 91;

rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php

@@ -923,7 +923,7 @@ class PdoAddressBook
 		$iUserID = $this->getUserId($sEmail);
 
 		$sTypes = implode(',', array(
-			PropertyType::EMAIl, PropertyType::FIRST_NAME, PropertyType::LAST_NAME
+			PropertyType::EMAIl, PropertyType::FIRST_NAME, PropertyType::LAST_NAME, PropertyType::NICK_NAME
 		));
 
 		$sSql = 'SELECT id_contact, id_prop, prop_type, prop_value FROM rainloop_ab_properties '.
@@ -961,9 +961,14 @@ class PdoAddressBook
 						$aIdContacts[$iIdContact] = $iIdContact;
 						$aIdProps[$iIdProp] = $iIdProp;
 
-						if (\in_array($iType, array(PropertyType::LAST_NAME, PropertyType::FIRST_NAME)))
+						if (\in_array($iType, array(PropertyType::LAST_NAME, PropertyType::FIRST_NAME, PropertyType::NICK_NAME)))
 						{
-							$aContactAllAccess[$iIdContact] = $iIdContact;
+							if (!isset($aContactAllAccess[$iIdContact]))
+							{
+								$aContactAllAccess[$iIdContact] = array();
+							}
+
+							$aContactAllAccess[$iIdContact][] = $iType;
 						}
 					}
 				}
@@ -977,7 +982,7 @@ class PdoAddressBook
 				$oStmt->closeCursor();
 				
 				$sTypes = \implode(',', array(
-					PropertyType::EMAIl, PropertyType::FIRST_NAME, PropertyType::LAST_NAME
+					PropertyType::EMAIl, PropertyType::FIRST_NAME, PropertyType::LAST_NAME, PropertyType::NICK_NAME
 				));
 
 				$sSql = 'SELECT id_prop, id_contact, prop_type, prop_value FROM rainloop_ab_properties '.
@@ -990,6 +995,7 @@ class PdoAddressBook
 					if (\is_array($aFetch) && 0 < \count($aFetch))
 					{
 						$aNames = array();
+						$aNicks = array();
 						$aEmails = array();
 
 						foreach ($aFetch as $aItem)
@@ -1000,7 +1006,11 @@ class PdoAddressBook
 								$iIdProp = (int) $aItem['id_prop'];
 								$iType = (int) $aItem['prop_type'];
 
-								if (\in_array($iType, array(PropertyType::LAST_NAME, PropertyType::FIRST_NAME)))
+								if (PropertyType::NICK_NAME === $iType)
+								{
+									$aNicks[$iIdContact] = $aItem['prop_value'];
+								}
+								else if (\in_array($iType, array(PropertyType::LAST_NAME, PropertyType::FIRST_NAME)))
 								{
 									if (!isset($aNames[$iIdContact]))
 									{
@@ -1024,12 +1034,28 @@ class PdoAddressBook
 
 						foreach ($aEmails as $iId => $aItems)
 						{
-							$aNameItem = isset($aNames[$iId]) && \is_array($aNames[$iId]) ? $aNames[$iId] : array('', '');
+							if (isset($aContactAllAccess[$iId]))
-							$sNameItem = \trim($aNameItem[0].' '.$aNameItem[1]);
-
-							foreach ($aItems as $sEmail)
 							{
-								$aResult[] = array($sEmail, $sNameItem);
+								$bName = \in_array(PropertyType::FIRST_NAME, $aContactAllAccess[$iId]) || \in_array(PropertyType::LAST_NAME, $aContactAllAccess[$iId]);
+								$bNick = \in_array(PropertyType::NICK_NAME, $aContactAllAccess[$iId]);
+								
+								$aNameItem = isset($aNames[$iId]) && \is_array($aNames[$iId]) ? $aNames[$iId] : array('', '');
+								$sNameItem = \trim($aNameItem[0].' '.$aNameItem[1]);
+								
+								$sNickItem = isset($aNicks[$iId]) ? $aNicks[$iId] : '';
+
+								foreach ($aItems as $sEmail)
+								{
+									if ($bName)
+									{
+										$aResult[] = array($sEmail, $sNameItem);
+									}
+									
+									if ($bNick)
+									{
+										$aResult[] = array($sEmail, $sNickItem);
+									}
+								}
 							}
 						}
 					}

rainloop/v/0.0.0/app/templates/Views/MailMessageList.html

@@ -9,7 +9,7 @@
 					</a>
 				</div>
 				<div class="btn-group">&nbsp;</div>
-				<div class="btn-group dropdown" data-bind="registrateBootstrapDropdown: true, openDropdownTrigger: moveDropdownTrigger">
+				<div class="btn-group dropdown colored-toggle" data-bind="registrateBootstrapDropdown: true, openDropdownTrigger: moveDropdownTrigger">
 					<a id="move-dropdown-id" href="#" tabindex="-1" class="btn btn-dark-disabled-border dropdown-toggle buttonMove" data-toggle="dropdown" data-tooltip-placement="bottom" data-bind="command: moveCommand, tooltip: 'MESSAGE_LIST/BUTTON_MOVE_TO'">
 						<i class="icon-folder"></i>
 						&nbsp;&nbsp;
@@ -40,7 +40,7 @@
 					</a>
 				</div>
 				<div class="btn-group">&nbsp;</div>
-				<div class="btn-group dropdown" data-bind="registrateBootstrapDropdown: true, openDropdownTrigger: moreDropdownTrigger">
+				<div class="btn-group dropdown colored-toggle" data-bind="registrateBootstrapDropdown: true, openDropdownTrigger: moreDropdownTrigger">
 					<a id="more-list-dropdown-id" class="btn btn-dark-disabled-border dropdown-toggle buttonMore" href="#" tabindex="-1" data-toggle="dropdown" data-tooltip-placement="bottom" data-bind="tooltip: 'MESSAGE_LIST/BUTTON_MORE'">
 						<i class="icon-list"></i>
 					</a>

rainloop/v/0.0.0/app/templates/Views/MailMessageView.html

@@ -38,7 +38,7 @@
 					</a>
 				</div>
 				<div class="btn-group">&nbsp;</div>
-				<div class="btn-group dropdown" data-bind="registrateBootstrapDropdown: true, openDropdownTrigger: moreDropdownTrigger">
+				<div class="btn-group dropdown colored-toggle" data-bind="registrateBootstrapDropdown: true, openDropdownTrigger: moreDropdownTrigger">
 					<a id="more-view-dropdown-id" class="btn btn-dark-disabled-border dropdown-toggle buttonMore" href="#" tabindex="-1" data-toggle="dropdown" data-tooltip-placement="bottom" data-bind="command: messageVisibilityCommand, tooltip: 'MESSAGE/BUTTON_MORE'">
 						<i class="icon-list"></i>
 					</a>

rainloop/v/0.0.0/app/templates/Views/PopupsCompose.html

@@ -107,7 +107,7 @@
 										<span class="i18n" data-i18n-text="COMPOSE/ATTACH_DROP_FILES_DESC"></span>
 									</div>
 									<div class="pull-right">
-										<div class="btn-group pull-right">
+										<div class="btn-group dropdown colored-toggle pull-right">
 											<a class="btn dropdown-toggle buttonMore" data-toggle="dropdown">
 												<i class="icon-list"></i>
 											</a>

rainloop/v/0.0.0/app/templates/Views/PopupsContacts.html

@@ -27,7 +27,7 @@
 					</a>
 				</div>
 
-				<div class="btn-group dropdown" data-bind="registrateBootstrapDropdown: true">
+				<div class="btn-group dropdown colored-toggle" data-bind="registrateBootstrapDropdown: true">
 					<a id="contacts-more-dropdown-id" class="btn dropdown-toggle buttonMore" href="#" tabindex="-1" data-toggle="dropdown">
 						<i data-bind="css: {'icon-list': !contacts.importing() && !contacts.syncing(),
 							'icon-spinner animated': contacts.importing() || contacts.syncing()}"></i>
@@ -128,12 +128,30 @@
 									<label class="control-label remove-padding-top fix-width">
 										<i class="icon-user iconsize24"></i>
 									</label>
-									<div class="controls fix-width" data-bind="foreach: viewPropertiesNames">
+									<div class="controls fix-width">
-										<div class="property-line">
+										<div data-bind="foreach: viewPropertiesNames">
-											<span class="contactValueStatic" data-bind="text: value" />
+											<div class="property-line">
-											<input type="text" class="contactValueInput" placeholder=""
+												<span class="contactValueStatic" data-bind="text: value" />
-												autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+												<input type="text" class="contactValueInput" placeholder=""
-												data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}" />
+													autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+													data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}" />
+											</div>
+										</div>
+										<div data-bind="visible: 0 < viewPropertiesOther().length, foreach: viewPropertiesOther">
+											<div class="property-line">
+												<!-- ko if: !largeValue() -->
+												<span class="contactValueStatic" data-bind="text: value" />
+												<input type="text" class="contactValueInput" placeholder=""
+													autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+													data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}" />
+												<!-- /ko -->
+												<!-- ko if: largeValue -->
+												<span class="contactValueTextAreaStatic" data-bind="text: value" />
+												<textarea class="contactValueTextArea" placeholder=""
+													autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+													data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}"></textarea>
+												<!-- /ko -->
+											</div>
 										</div>
 									</div>
 								</div>
@@ -145,7 +163,7 @@
 										<div data-bind="foreach: viewPropertiesEmails">
 											<div class="property-line">
 												<span class="contactValueStatic" data-bind="text: value" />
-												<input type="email" class="contactValueInput"
+												<input type="email" class="contactValueInput" placeholder=""
 													autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 													data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup'" />
 											</div>
@@ -153,7 +171,7 @@
 										<a href="javascript:void(0);" class="g-ui-link add-link i18n" data-bind="visible: !viewReadOnly(), click: addNewEmail" data-i18n-text="CONTACTS/LINK_ADD_EMAIL"></a>
 									</div>
 								</div>
-								<div class="control-group" data-bind="visible: !viewReadOnly() || 0 < viewPropertiesPhones().length">
+								<div class="control-group" data-bind="visible: 0 < viewPropertiesPhones().length">
 									<label class="control-label remove-padding-top fix-width">
 										<i class="icon-telephone iconsize24" data-tooltip-placement="left" data-bind="tooltip: 'CONTACTS/LABEL_PHONE'"></i>
 									</label>
@@ -161,12 +179,11 @@
 										<div data-bind="foreach: viewPropertiesPhones">
 											<div class="property-line">
 												<span class="contactValueStatic" data-bind="text: value" />
-												<input type="text" class="contactValueInput"
+												<input type="text" class="contactValueInput" placeholder=""
 													autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 													data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup'" />
 											</div>
 										</div>
-										<a href="javascript:void(0);" class="g-ui-link add-link i18n" data-bind="visible: !viewReadOnly(), click: addNewPhone" data-i18n-text="CONTACTS/LINK_ADD_PHONE"></a>
 									</div>
 								</div>
 								<div class="control-group" data-bind="visible: 0 < viewPropertiesWeb().length">
@@ -176,8 +193,8 @@
 									<div class="controls fix-width">
 										<div data-bind="foreach: viewPropertiesWeb">
 											<div class="property-line">
-												<span class="contactValueStatic" data-bind="text: value" />
+												<span class="contactValueLargeStatic" data-bind="text: value" />
-												<input type="text" class="contactValueInput"
+												<input type="text" class="contactValueInputLarge" placeholder="http://"
 													autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 													data-bind="value: value, hasFocus: focused, valueUpdate: 'keyup'" />
 											</div>
@@ -192,9 +209,9 @@
 								</div>
 							</div>
 							
-							<div class="e-read-only-sign">
+<!--							<div class="e-read-only-sign">
 								<i class="icon-lock iconsize24" data-tooltip-placement="left" data-bind="tooltip: 'CONTACTS/LABEL_READ_ONLY'"></i>
-							</div>
+							</div>-->
 
 							<button class="btn button-save-contact" data-bind="command: saveCommand, css: {'dirty': watchDirty}">
 								<i data-bind="css: {'icon-ok': !viewSaving(), 'icon-spinner animated': viewSaving()}"></i>
@@ -202,6 +219,42 @@
 								<span class="i18n" data-i18n-text="CONTACTS/BUTTON_CREATE_CONTACT" data-bind="visible: '' === viewID()"></span>
 								<span class="i18n" data-i18n-text="CONTACTS/BUTTON_UPDATE_CONTACT" data-bind="visible: '' !== viewID()"></span>
 							</button>
+
+							<div class="btn-group pull-right dropdown colored-toggle button-add-prop" data-bind="registrateBootstrapDropdown: true">
+								<a id="button-add-prop-dropdown-id" href="#" tabindex="-1" class="btn dropdown-toggle" data-toggle="dropdown">
+									<span class="i18n" data-i18n-text="CONTACTS/ADD_MENU_LABEL"></span>
+									&nbsp;&nbsp;
+									<span class="caret"></span>
+								</a>
+								<ul class="dropdown-menu g-ui-menu" tabindex="-1" role="menu" aria-labelledby="button-add-prop-dropdown-id">
+									<li class="e-item" role="presentation">
+										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewEmail">
+											<span class="i18n" data-i18n-text="CONTACTS/ADD_MENU_EMAIL"></span>
+										</a>
+									</li>
+									<li class="e-item" role="presentation">
+										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewPhone">
+											<span class="i18n" data-i18n-text="CONTACTS/ADD_MENU_PHONE"></span>
+										</a>
+									</li>
+									<li class="e-item" role="presentation">
+										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewWeb">
+											<span class="i18n" data-i18n-text="CONTACTS/ADD_MENU_URL"></span>
+										</a>
+									</li>
+									<li class="divider" role="presentation"></li>
+									<li class="e-item" role="presentation">
+										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewNickname">
+											<span class="i18n" data-i18n-text="CONTACTS/ADD_MENU_NICKNAME"></span>
+										</a>
+									</li>
+<!--									<li class="e-item" role="presentation">
+										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewAddress">
+											<span class="i18n" data-i18n-text="CONTACTS/ADD_MENU_ADDRESS"></span>
+										</a>
+									</li>-->
+								</ul>
+							</div>
 						</div>
 					</div>
 				</div>

rainloop/v/0.0.0/app/templates/Views/SystemDropDown.html

@@ -9,7 +9,7 @@
 			<div class="btn-group pull-right">
 				&nbsp;&nbsp;&nbsp;
 			</div>-->
-			<div class="btn-group pull-right dropdown" data-bind="registrateBootstrapDropdown: true, openDropdownTrigger: accountMenuDropdownTrigger">
+			<div class="btn-group pull-right dropdown colored-toggle" data-bind="registrateBootstrapDropdown: true, openDropdownTrigger: accountMenuDropdownTrigger">
 				<a id="top-system-dropdown-id" href="#" tabindex="-1" class="btn btn-ellipsis btn-block dropdown-toggle system-dropdown"
 					data-toggle="dropdown" data-tooltip-placement="left"
 					data-tooltip-class="tooltip-big" data-bind="tooltip2: emailTitle">

rainloop/v/0.0.0/langs/de.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Add an email address"
 LINK_ADD_PHONE = "Add a phone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Share"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/en.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Add an email address"
 LINK_ADD_PHONE = "Add a phone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Share"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/es.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Add an email address"
 LINK_ADD_PHONE = "Add a phone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Share"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/fr.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Ajouter une adresse email"
 LINK_ADD_PHONE = "Ajouter un numéro de téléphone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Entrez le nom à afficher"
 PLACEHOLDER_ENTER_LAST_NAME = "Entrez votre nom"
 PLACEHOLDER_ENTER_FIRST_NAME = "Entrez votre prénom"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Lire seulement"
 LABEL_SHARE = "Partager"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "Personne"
 BUTTON_SHARE_ALL = "Tout le monde"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/hu.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Adjunk meg e-mail címet"
 LINK_ADD_PHONE = "Adjunk meg telefonszámot"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Megosztás"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/is.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Add an email address"
 LINK_ADD_PHONE = "Add a phone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Share"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/it.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Aggiungi un'indirizzo email"
 LINK_ADD_PHONE = "Aggiungi un numero di telefono"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Inserisci il nome visualizzato"
 PLACEHOLDER_ENTER_LAST_NAME = "Inserisci il cognome"
 PLACEHOLDER_ENTER_FIRST_NAME = "Inserisci il nome"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Sola lettura"
 LABEL_SHARE = "Condividi"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "Nessuno"
 BUTTON_SHARE_ALL = "Tutti"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/ja-jp.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Add an email address"
 LINK_ADD_PHONE = "Add a phone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Share"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/ko-kr.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Add an email address"
 LINK_ADD_PHONE = "Add a phone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Share"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/lv.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Add an email address"
 LINK_ADD_PHONE = "Add a phone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Share"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/nl.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Add an email address"
 LINK_ADD_PHONE = "Add a phone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Share"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/no.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Legg til en e-postadresse"
 LINK_ADD_PHONE = "Legg til en telefon"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Share"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/pl.ini

@@ -168,11 +168,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Dodaj adres email"
 LINK_ADD_PHONE = "Dodaj nr Tel"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Nazwa wyświetlana"
 PLACEHOLDER_ENTER_LAST_NAME = "Nazwisko"
 PLACEHOLDER_ENTER_FIRST_NAME = "Imię"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Tylko do odczytu"
 LABEL_SHARE = "Udostępnij kontakt"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "Nikomu"
 BUTTON_SHARE_ALL = "Wszystkim"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/pt-br.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Adicionar um endereço e-mail"
 LINK_ADD_PHONE = "Adicionar um telefone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Digite um nome público"
 PLACEHOLDER_ENTER_LAST_NAME = "Digite seu último nome"
 PLACEHOLDER_ENTER_FIRST_NAME = "Digite seu primeiro nome"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Ler somente"
 LABEL_SHARE = "Compartilhar"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "Ninguém"
 BUTTON_SHARE_ALL = "Todo mundo"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/pt-pt.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Adicionar um endereço e-mail"
 LINK_ADD_PHONE = "Adicionar um telefone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Digite um nome público"
 PLACEHOLDER_ENTER_LAST_NAME = "Digite seu último nome"
 PLACEHOLDER_ENTER_FIRST_NAME = "Digite seu primeiro nome"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Ler somente"
 LABEL_SHARE = "Compartilhar"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "Ninguém"
 BUTTON_SHARE_ALL = "Todo mundo"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/ro.ini

@@ -168,11 +168,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Adugă Mail nou"
 LINK_ADD_PHONE = "Adaugă un număr nou"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Introduceți numele complet"
 PLACEHOLDER_ENTER_LAST_NAME = "Prenume"
 PLACEHOLDER_ENTER_FIRST_NAME = "Nume"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Doar pentru citire"
 LABEL_SHARE = "Distribuie"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "Nimic"
 BUTTON_SHARE_ALL = "Toate"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/ru.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Сайт"
 LABEL_BIRTHDAY = "День рождения"
 LINK_ADD_EMAIL = "Добавьте адрес электронной почты"
 LINK_ADD_PHONE = "Добавьте телефон"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Введите полное имя"
 PLACEHOLDER_ENTER_LAST_NAME = "Введите имя"
 PLACEHOLDER_ENTER_FIRST_NAME = "Введите фамилию"
-LABEL_READ_ONLY = "Read only"
+PLACEHOLDER_ENTER_NICK_NAME = "Введите ник"
+LABEL_READ_ONLY = "Только чтение"
 LABEL_SHARE = "Поделиться"
+ADD_MENU_LABEL = "Добавить"
+ADD_MENU_NICKNAME = "Ник"
+ADD_MENU_NOTES = "Примечания"
+ADD_MENU_EMAIL = "Почту"
+ADD_MENU_PHONE = "Телефон"
+ADD_MENU_URL = "Сайт"
+ADD_MENU_ADDRESS = "Адрес"
+ADD_MENU_BIRTHDAY = "День рождения"
 BUTTON_SHARE_NONE = "Отменить"
 BUTTON_SHARE_ALL = "Всем"
 BUTTON_SYNC = "Синхронизация (CardDAV)"

rainloop/v/0.0.0/langs/sk.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Pridať emailovú adresu"
 LINK_ADD_PHONE = "Pridať telefón"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Zadajte Zobrazované meno"
 PLACEHOLDER_ENTER_LAST_NAME = "Zadajte Priezvisko"
 PLACEHOLDER_ENTER_FIRST_NAME = "Zadajte Meno"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Len pre čítanie"
 LABEL_SHARE = "Zdielať"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "Žiadne"
 BUTTON_SHARE_ALL = "Všetko"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/langs/zh-cn.ini

@@ -169,11 +169,21 @@ LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Birthday"
 LINK_ADD_EMAIL = "Add an email address"
 LINK_ADD_PHONE = "Add a phone"
+LINK_BIRTHDAY = "Birthday"
 PLACEHOLDER_ENTER_DISPLAY_NAME = "Enter display name"
 PLACEHOLDER_ENTER_LAST_NAME = "Enter last name"
 PLACEHOLDER_ENTER_FIRST_NAME = "Enter first name"
+PLACEHOLDER_ENTER_NICK_NAME = "Enter nickname"
 LABEL_READ_ONLY = "Read only"
 LABEL_SHARE = "Share"
+ADD_MENU_LABEL = "Add"
+ADD_MENU_NICKNAME = "Nickname"
+ADD_MENU_NOTES = "Notes"
+ADD_MENU_EMAIL = "Email"
+ADD_MENU_PHONE = "Phone"
+ADD_MENU_URL = "URL"
+ADD_MENU_ADDRESS = "Address"
+ADD_MENU_BIRTHDAY = "Birthday"
 BUTTON_SHARE_NONE = "None"
 BUTTON_SHARE_ALL = "Everyone"
 BUTTON_SYNC = "Synchronization (CardDAV)"

rainloop/v/0.0.0/static/css/app.css

@@ -637,7 +637,7 @@
 	border-radius: 8px;
 }
 
-
+
 /*! normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */
 
 /* =============================================================================
@@ -1142,7 +1142,7 @@ table {
     border-collapse: collapse;
     border-spacing: 0;
 }
-
+
 @charset "UTF-8";
 
 @font-face {
@@ -1507,7 +1507,7 @@ table {
 .icon-help:before {
   content: "\e06b";
 }
-
+
 /** initial setup **/
 .nano {
 /*
@@ -1624,7 +1624,7 @@ table {
 .nano > .pane2:hover > .slider2, .nano > .pane2.active > .slider2 {
 	background-color: rgba(0, 0, 0, 0.4);
 }
-
+
 /* Magnific Popup CSS */
 .mfp-bg {
   top: 0;
@@ -1989,7 +1989,7 @@ img.mfp-img {
   right: 0;
   padding-top: 0; }
 
-
+
 
 /* overlay at start */
 .mfp-fade.mfp-bg {
@@ -2035,7 +2035,7 @@ img.mfp-img {
   -moz-transform: translateX(50px);
   transform: translateX(50px);
 }
-
+
 .simple-pace {
 	-webkit-pointer-events: none;
 	pointer-events: none;
@@ -2106,7 +2106,7 @@ img.mfp-img {
 @keyframes simple-pace-stripe-animation {
 	0% { transform: none; transform: none; }
 	100% { transform: translate(-32px, 0); transform: translate(-32px, 0); }
-}
+}
 .inputosaurus-container {
 	background-color:#fff;
 	border:1px solid #bcbec0;
@@ -2174,7 +2174,7 @@ img.mfp-img {
 	box-shadow:none;
 }
 .inputosaurus-input-hidden { display:none; }
-
+
 .flag-wrapper {
 	width: 24px;
 	height: 16px;
@@ -2218,7 +2218,7 @@ img.mfp-img {
 .flag.flag-pt-br {background-position: -192px -11px}
 
 .flag.flag-cn, .flag.flag-zh-tw, .flag.flag-zh-cn, .flag.flag-zh-hk {background-position: -208px -22px}
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 .clearfix {
   *zoom: 1;
@@ -6388,6 +6388,15 @@ html.rgba.textshadow .btn.btn-primary {
   -moz-border-radius-bottomright: 3px;
   border-bottom-right-radius: 3px;
 }
+.dropdown.colored-toggle.open .btn.dropdown-toggle {
+  color: #BD362F;
+}
+.dropdown.colored-toggle.open .btn.dropdown-toggle .caret {
+  border-top-color: #BD362F;
+}
+.dropdown.colored-toggle.open .btn.dropdown-toggle [class^="icon-"]:before {
+  color: #BD362F;
+}
 textarea,
 input[type="text"],
 input[type="password"],
@@ -7021,7 +7030,7 @@ html.ssm-state-desktop-large .b-compose.modal {
   width: 1000px;
 }
 html.ssm-state-desktop-large .b-contacts-content.modal {
-  width: 800px;
+  width: 900px;
 }
 html.ssm-state-desktop #rl-left {
   width: 200px;
@@ -7039,7 +7048,7 @@ html.ssm-state-desktop .b-compose.modal {
   width: 1000px;
 }
 html.ssm-state-desktop .b-contacts-content.modal {
-  width: 800px;
+  width: 900px;
 }
 html.ssm-state-tablet #rl-left,
 html.ssm-state-mobile #rl-left {
@@ -7093,7 +7102,7 @@ html.ssm-state-tablet .b-compose.modal {
   width: 700px;
 }
 html.ssm-state-tablet .b-contacts-content.modal {
-  width: 700px;
+  width: 800px;
 }
 html.ssm-state-tablet .b-contacts-content.modal .b-list-toopbar,
 html.ssm-state-tablet .b-contacts-content.modal .b-list-content,
@@ -8600,7 +8609,9 @@ html.rl-message-fullscreen .messageView .b-content .buttonFull {
 .b-contacts-content.modal .b-view-content .content {
   -webkit-overflow-scrolling: touch;
 }
-.b-contacts-content.modal .b-view-content .contactValueStatic {
+.b-contacts-content.modal .b-view-content .contactValueStatic,
+.b-contacts-content.modal .b-view-content .contactValueLargeStatic,
+.b-contacts-content.modal .b-view-content .contactValueTextAreaStatic {
   height: 20px;
   line-height: 20px;
   font-size: 18px;
@@ -8609,10 +8620,14 @@ html.rl-message-fullscreen .messageView .b-content .buttonFull {
   color: #555;
   display: none;
 }
-.b-contacts-content.modal .b-view-content.read-only .contactValueStatic {
+.b-contacts-content.modal .b-view-content.read-only .contactValueStatic,
+.b-contacts-content.modal .b-view-content.read-only .contactValueLargeStatic,
+.b-contacts-content.modal .b-view-content.read-only .contactValueTextAreaStatic {
   display: inline-block;
 }
-.b-contacts-content.modal .b-view-content.read-only .contactValueInput {
+.b-contacts-content.modal .b-view-content.read-only .contactValueInput,
+.b-contacts-content.modal .b-view-content.read-only .contactValueInputLarge,
+.b-contacts-content.modal .b-view-content.read-only .contactValueTextArea {
   display: none;
 }
 .b-contacts-content.modal .b-view-content .b-contact-view-desc {
@@ -8638,11 +8653,15 @@ html.rl-message-fullscreen .messageView .b-content .buttonFull {
   font-size: 12px;
   color: #aaa;
 }
-.b-contacts-content.modal .b-view-content .contactValueStatic {
+.b-contacts-content.modal .b-view-content .contactValueStatic,
+.b-contacts-content.modal .b-view-content .contactValueLargeStatic,
+.b-contacts-content.modal .b-view-content .contactValueTextAreaStatic {
   font-size: 18px;
   display: none;
 }
-.b-contacts-content.modal .b-view-content .contactValueInput {
+.b-contacts-content.modal .b-view-content .contactValueInput,
+.b-contacts-content.modal .b-view-content .contactValueInputLarge,
+.b-contacts-content.modal .b-view-content .contactValueTextArea {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
@@ -8650,30 +8669,48 @@ html.rl-message-fullscreen .messageView .b-content .buttonFull {
   font-size: 18px;
   width: 300px;
 }
-.b-contacts-content.modal .b-view-content .contactValueInput:hover {
+.b-contacts-content.modal .b-view-content .contactValueInput:hover,
+.b-contacts-content.modal .b-view-content .contactValueInputLarge:hover,
+.b-contacts-content.modal .b-view-content .contactValueTextArea:hover {
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   border-color: #ccc;
 }
-.b-contacts-content.modal .b-view-content .contactValueInput:focus {
+.b-contacts-content.modal .b-view-content .contactValueInput:focus,
+.b-contacts-content.modal .b-view-content .contactValueInputLarge:focus,
+.b-contacts-content.modal .b-view-content .contactValueTextArea:focus {
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   border-color: #999;
 }
-.b-contacts-content.modal .b-view-content .contactValueInput::-webkit-input-placeholder {
+.b-contacts-content.modal .b-view-content .contactValueInput::-webkit-input-placeholder,
+.b-contacts-content.modal .b-view-content .contactValueInputLarge::-webkit-input-placeholder,
+.b-contacts-content.modal .b-view-content .contactValueTextArea::-webkit-input-placeholder {
   color: #ddd;
 }
-.b-contacts-content.modal .b-view-content .contactValueInput::-moz-placeholder {
+.b-contacts-content.modal .b-view-content .contactValueInput::-moz-placeholder,
+.b-contacts-content.modal .b-view-content .contactValueInputLarge::-moz-placeholder,
+.b-contacts-content.modal .b-view-content .contactValueTextArea::-moz-placeholder {
   color: #ddd;
 }
-.b-contacts-content.modal .b-view-content .contactValueInput:-moz-placeholder {
+.b-contacts-content.modal .b-view-content .contactValueInput:-moz-placeholder,
+.b-contacts-content.modal .b-view-content .contactValueInputLarge:-moz-placeholder,
+.b-contacts-content.modal .b-view-content .contactValueTextArea:-moz-placeholder {
   color: #ddd;
 }
-.b-contacts-content.modal .b-view-content .contactValueInput:-ms-input-placeholder {
+.b-contacts-content.modal .b-view-content .contactValueInput:-ms-input-placeholder,
+.b-contacts-content.modal .b-view-content .contactValueInputLarge:-ms-input-placeholder,
+.b-contacts-content.modal .b-view-content .contactValueTextArea:-ms-input-placeholder {
   color: #ddd;
 }
+.b-contacts-content.modal .b-view-content .contactValueTextArea {
+  width: 300px;
+}
+.b-contacts-content.modal .b-view-content .contactValueInputLarge {
+  width: 400px;
+}
 .b-contacts-content.modal .b-view-content .hasError .contactValueInput {
   color: #ee5f5b;
   border-color: #ee5f5b;
@@ -8704,6 +8741,11 @@ html.rl-message-fullscreen .messageView .b-content .buttonFull {
   color: #51a351;
   font-weight: bold;
 }
+.b-contacts-content.modal .b-view-content .button-add-prop {
+  position: absolute;
+  top: 60px;
+  right: 20px;
+}
 .b-contacts-content.modal .b-view-content.read-only .e-read-only-sign {
   display: inline-block;
 }

rainloop/v/0.0.0/static/js/admin.js

@@ -1,5 +1,5 @@
-/*! RainLoop Webmail Admin Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+/*! RainLoop Webmail Admin Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-(function (window, $, ko, crossroads, hasher, _) {
+(function (window, $, ko, crossroads, hasher, _) {
 
 'use strict';
 
@@ -75,14 +75,14 @@ var
 	$document = $(window.document),
 
 	NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null
-;
+;
 /*jshint onevar: false*/
 /**
  * @type {?AdminApp}
  */
 var RL = null;
 /*jshint onevar: true*/
-
+
 /**
  * @type {?}
  */
@@ -231,7 +231,7 @@ if (Globals.bAllowPdfPreview && navigator && navigator.mimeTypes)
 		return oType && 'application/pdf' === oType.type;
 	});
 }
-
+
 Consts.Defaults = {};
 Consts.Values = {};
 Consts.DataImages = {};
@@ -349,7 +349,7 @@ Consts.DataImages.UserDotPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA
  * @type {string}
  */
 Consts.DataImages.TranspPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII=';
-
+
 /**
  * @enum {string}
  */
@@ -646,6 +646,8 @@ Enums.ContactPropertyType = {
 	'Phone': 31,
 	'Web': 32,
 
+	'Birthday': 40,
+
 	'Facebook': 90,
 	'Skype': 91,
 	'GitHub': 92,
@@ -721,7 +723,7 @@ Enums.Notification = {
 	'UnknownNotification': 999,
 	'UnknownError': 999
 };
-
+
 Utils.trim = $.trim;
 Utils.inArray = $.inArray;
 Utils.isArray = _.isArray;
@@ -2459,7 +2461,7 @@ Utils.detectDropdownVisibility = _.debounce(function () {
 	Globals.dropdownVisibility(!!_.find(BootstrapDropdowns, function (oItem) {
 		return oItem.hasClass('open');
 	}));
-}, 50);
+}, 50);
 // Base64 encode / decode
 // http://www.webtoolkit.info/
  
@@ -2622,7 +2624,7 @@ Base64 = {
 	}
 };
 
-/*jslint bitwise: false*/
+/*jslint bitwise: false*/
 ko.bindingHandlers.tooltip = {
 	'init': function (oElement, fValueAccessor) {
 		if (!Globals.bMobileDevice)
@@ -3367,7 +3369,7 @@ ko.observable.fn.validateFunc = function (fFunc)
 	return this;
 };
 
-
+
 /**
  * @constructor
  */
@@ -3681,7 +3683,7 @@ LinkBuilder.prototype.socialFacebook = function ()
 {
 	return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : '');
 };
-
+
 /**
  * @type {Object}
  */
@@ -3775,7 +3777,7 @@ Plugins.settingsGet = function (sPluginSection, sName)
 };
 
 
-
+
 /**
  * @constructor
  */
@@ -3849,7 +3851,7 @@ CookieDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /**
  * @constructor
  */
@@ -3920,7 +3922,7 @@ LocalStorageDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /**
  * @constructor
  */
@@ -3963,7 +3965,7 @@ LocalStorage.prototype.get = function (iKey)
 {
 	return this.oDriver ? this.oDriver.get('p' + iKey) : null;
 };
-
+
 /**
  * @constructor
  */
@@ -3976,7 +3978,7 @@ KnoinAbstractBoot.prototype.bootstart = function ()
 {
 
 };
-
+
 /**
  * @param {string=} sPosition = ''
  * @param {string=} sTemplate = ''
@@ -4062,7 +4064,7 @@ KnoinAbstractViewModel.prototype.registerPopupEscapeKey = function ()
 		return true;
 	});
 };
-
+
 /**
  * @param {string} sScreenName
  * @param {?=} aViewModels = []
@@ -4138,7 +4140,7 @@ KnoinAbstractScreen.prototype.__start = function ()
 		this.oCross = oRoute;
 	}
 };
-
+
 /**
  * @constructor
  */
@@ -4536,7 +4538,7 @@ Knoin.prototype.bootstart = function ()
 };
 
 kn = new Knoin();
-
+
 /**
  * @param {string=} sEmail
  * @param {string=} sName
@@ -4900,7 +4902,7 @@ EmailModel.prototype.inputoTagLine = function ()
 {
 	return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email;
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5195,7 +5197,7 @@ PopupsDomainViewModel.prototype.clearForm = function ()
 	this.smtpAuth(true);
 	this.whiteList('');
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5332,7 +5334,7 @@ PopupsPluginViewModel.prototype.onBuild = function ()
 		}
 	}, this));
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5448,7 +5450,7 @@ PopupsActivateViewModel.prototype.validateSubscriptionKey = function ()
 {
 	var sValue = this.key();
 	return '' === sValue || !!/^RL[\d]+-[A-Z0-9\-]+Z$/.test(Utils.trim(sValue));
-};
+};
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5508,7 +5510,7 @@ PopupsLanguagesViewModel.prototype.changeLanguage = function (sLang)
 	RL.data().mainLanguage(sLang);
 	this.cancelCommand();
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5614,7 +5616,7 @@ PopupsAskViewModel.prototype.onBuild = function ()
 	}, this));
 };
 
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5701,7 +5703,7 @@ AdminLoginViewModel.prototype.onHide = function ()
 {
 	this.loginFocus(false);
 };
-
+
 /**
  * @param {?} oScreen
  *
@@ -5723,7 +5725,7 @@ AdminMenuViewModel.prototype.link = function (sRoute)
 {
 	return '#/' + sRoute;
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5748,7 +5750,7 @@ AdminPaneViewModel.prototype.logoutClick = function ()
 	RL.remote().adminLogout(function () {
 		RL.loginAndLogoutReload();
 	});
-};
+};
 /**
  * @constructor
  */
@@ -5848,7 +5850,7 @@ AdminGeneral.prototype.selectLanguage = function ()
 {
 	kn.showScreenPopup(PopupsLanguagesViewModel);
 };
-
+
 /**
  * @constructor
  */
@@ -5900,7 +5902,7 @@ AdminLogin.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /**
  * @constructor
  */
@@ -5969,7 +5971,7 @@ AdminBranding.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /**
  * @constructor
  */
@@ -6189,7 +6191,7 @@ AdminContacts.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /**
  * @constructor
  */
@@ -6278,7 +6280,7 @@ AdminDomains.prototype.onDomainListChangeRequest = function ()
 {
 	RL.reloadDomainList();
 };
-
+
 /**
  * @constructor
  */
@@ -6390,7 +6392,7 @@ AdminSecurity.prototype.phpInfoLink = function ()
 {
 	return RL.link().phpInfo();
 };
-
+
 /**
  * @constructor
  */
@@ -6506,7 +6508,7 @@ AdminSocial.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /**
  * @constructor
  */
@@ -6603,7 +6605,7 @@ AdminPlugins.prototype.onPluginDisableRequest = function (sResult, oData)
 
 	RL.reloadPluginList();
 };
-
+
 /**
  * @constructor
  */
@@ -6701,7 +6703,7 @@ AdminPackages.prototype.installPackage = function (oPackage)
 		RL.remote().packageInstall(this.requestHelper(oPackage, true), oPackage);
 	}
 };
-
+
 /**
  * @constructor
  */
@@ -6752,7 +6754,7 @@ AdminLicensing.prototype.licenseExpiredMomentValue = function ()
 {
 	var oDate = moment.unix(this.licenseExpired());
 	return oDate.format('LL') + ' (' + oDate.from(moment()) + ')';
-};
+};
 /**
  * @constructor
  */
@@ -6882,7 +6884,7 @@ AbstractData.prototype.populateDataOnStart = function()
 
 	this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
 };
-
+
 /**
  * @constructor
  * @extends AbstractData
@@ -6924,7 +6926,7 @@ _.extend(AdminDataStorage.prototype, AbstractData.prototype);
 AdminDataStorage.prototype.populateDataOnStart = function()
 {
 	AbstractData.prototype.populateDataOnStart.call(this);
-};
+};
 /**
  * @constructor
  */
@@ -7198,7 +7200,7 @@ AbstractAjaxRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
 		'Version': sVersion
 	});
 };
-
+
 /**
  * @constructor
  * @extends AbstractAjaxRemoteStorage
@@ -7443,7 +7445,7 @@ AdminAjaxRemoteStorage.prototype.adminPing = function (fCallback)
 {
 	this.defaultRequest(fCallback, 'AdminPing');
 };
-
+
 /**
  * @constructor
  */
@@ -7520,7 +7522,7 @@ AbstractCacheStorage.prototype.setEmailsPicsHashesData = function (oData)
 {
 	this.oEmailsPicsHashes = oData;
 };
-
+
 /**
  * @constructor
  * @extends AbstractCacheStorage
@@ -7531,7 +7533,7 @@ function AdminCacheStorage()
 }
 
 _.extend(AdminCacheStorage.prototype, AbstractCacheStorage.prototype);
-
+
 /**
  * @param {Array} aViewModels
  * @constructor
@@ -7709,7 +7711,7 @@ AbstractSettings.prototype.routes = function ()
 		['', oRules]
 	];
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractScreen
@@ -7724,7 +7726,7 @@ _.extend(AdminLoginScreen.prototype, KnoinAbstractScreen.prototype);
 AdminLoginScreen.prototype.onShow = function ()
 {
 	RL.setTitle('');
-};
+};
 /**
  * @constructor
  * @extends AbstractSettings
@@ -7744,7 +7746,7 @@ AdminSettingsScreen.prototype.onShow = function ()
 //	AbstractSettings.prototype.onShow.call(this);
 	
 	RL.setTitle('');
-};
+};
 /**
  * @constructor
  * @extends KnoinAbstractBoot
@@ -8080,7 +8082,7 @@ AbstractApp.prototype.bootstart = function ()
 
 	ssm.ready();
 };
-
+
 /**
  * @constructor
  * @extends AbstractApp
@@ -8319,7 +8321,7 @@ AdminApp.prototype.bootstart = function ()
  * @type {AdminApp}
  */
 RL = new AdminApp();
-
+
 $html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile');
 
 $window.keydown(Utils.killCtrlAandS).keyup(Utils.killCtrlAandS);
@@ -8370,9 +8372,9 @@ window['__RLBOOT'] = function (fCall) {
 		window['__RLBOOT'] = null;
 	});
 };
-
+
 if (window.SimplePace) {
 	window.SimplePace.add(10);
-}
+}
-
+
 }(window, jQuery, ko, crossroads, hasher, _));

rainloop/v/0.0.0/static/js/app.js

@@ -1,5 +1,5 @@
-/*! RainLoop Webmail Main Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+/*! RainLoop Webmail Main Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-(function (window, $, ko, crossroads, hasher, moment, Jua, _, ifvisible, key) {
+(function (window, $, ko, crossroads, hasher, moment, Jua, _, ifvisible, key) {
 
 'use strict';
 
@@ -75,7 +75,7 @@ var
 	$document = $(window.document),
 
 	NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null
-;
+;
 /*jshint onevar: false*/
 /**
  * @type {?RainLoopApp}
@@ -86,7 +86,7 @@ var
 	$proxyDiv = $('<div></div>')
 ;
 /*jshint onevar: true*/
-
+
 /**
  * @type {?}
  */
@@ -235,7 +235,7 @@ if (Globals.bAllowPdfPreview && navigator && navigator.mimeTypes)
 		return oType && 'application/pdf' === oType.type;
 	});
 }
-
+
 Consts.Defaults = {};
 Consts.Values = {};
 Consts.DataImages = {};
@@ -353,7 +353,7 @@ Consts.DataImages.UserDotPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA
  * @type {string}
  */
 Consts.DataImages.TranspPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII=';
-
+
 /**
  * @enum {string}
  */
@@ -650,6 +650,8 @@ Enums.ContactPropertyType = {
 	'Phone': 31,
 	'Web': 32,
 
+	'Birthday': 40,
+
 	'Facebook': 90,
 	'Skype': 91,
 	'GitHub': 92,
@@ -725,7 +727,7 @@ Enums.Notification = {
 	'UnknownNotification': 999,
 	'UnknownError': 999
 };
-
+
 Utils.trim = $.trim;
 Utils.inArray = $.inArray;
 Utils.isArray = _.isArray;
@@ -2463,7 +2465,7 @@ Utils.detectDropdownVisibility = _.debounce(function () {
 	Globals.dropdownVisibility(!!_.find(BootstrapDropdowns, function (oItem) {
 		return oItem.hasClass('open');
 	}));
-}, 50);
+}, 50);
 // Base64 encode / decode
 // http://www.webtoolkit.info/
  
@@ -2626,7 +2628,7 @@ Base64 = {
 	}
 };
 
-/*jslint bitwise: false*/
+/*jslint bitwise: false*/
 ko.bindingHandlers.tooltip = {
 	'init': function (oElement, fValueAccessor) {
 		if (!Globals.bMobileDevice)
@@ -3371,7 +3373,7 @@ ko.observable.fn.validateFunc = function (fFunc)
 	return this;
 };
 
-
+
 /**
  * @constructor
  */
@@ -3685,7 +3687,7 @@ LinkBuilder.prototype.socialFacebook = function ()
 {
 	return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : '');
 };
-
+
 /**
  * @type {Object}
  */
@@ -3779,7 +3781,7 @@ Plugins.settingsGet = function (sPluginSection, sName)
 };
 
 
-
+
 function NewHtmlEditorWrapper(oElement, fOnBlur, fOnReady, fOnModeChange)
 {
 	var self = this;
@@ -3999,7 +4001,7 @@ NewHtmlEditorWrapper.prototype.clear = function (bFocus)
 	this.setHtml('', bFocus);
 };
 
-
+
 /**
  * @constructor
  * @param {koProperty} oKoList
@@ -4708,7 +4710,7 @@ Selector.prototype.on = function (sEventName, fCallback)
 {
 	this.oCallbacks[sEventName] = fCallback;
 };
-
+
 /**
  * @constructor
  */
@@ -4782,7 +4784,7 @@ CookieDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /**
  * @constructor
  */
@@ -4853,7 +4855,7 @@ LocalStorageDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /**
  * @constructor
  */
@@ -4896,7 +4898,7 @@ LocalStorage.prototype.get = function (iKey)
 {
 	return this.oDriver ? this.oDriver.get('p' + iKey) : null;
 };
-
+
 /**
  * @constructor
  */
@@ -4909,7 +4911,7 @@ KnoinAbstractBoot.prototype.bootstart = function ()
 {
 
 };
-
+
 /**
  * @param {string=} sPosition = ''
  * @param {string=} sTemplate = ''
@@ -4995,7 +4997,7 @@ KnoinAbstractViewModel.prototype.registerPopupEscapeKey = function ()
 		return true;
 	});
 };
-
+
 /**
  * @param {string} sScreenName
  * @param {?=} aViewModels = []
@@ -5071,7 +5073,7 @@ KnoinAbstractScreen.prototype.__start = function ()
 		this.oCross = oRoute;
 	}
 };
-
+
 /**
  * @constructor
  */
@@ -5469,7 +5471,7 @@ Knoin.prototype.bootstart = function ()
 };
 
 kn = new Knoin();
-
+
 /**
  * @param {string=} sEmail
  * @param {string=} sName
@@ -5833,7 +5835,7 @@ EmailModel.prototype.inputoTagLine = function ()
 {
 	return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email;
 };
-
+
 /**
  * @constructor
  */
@@ -5950,7 +5952,7 @@ ContactModel.prototype.lineAsCcc = function ()
 
 	return aResult.join(' ');
 };
-
+
 /**
  * @param {number=} iType = Enums.ContactPropertyType.Unknown
  * @param {string=} sTypeStr = ''
@@ -5973,8 +5975,13 @@ function ContactPropertyModel(iType, sTypeStr, sValue, bFocused, sPlaceholder)
 		var sPlaceholder = this.placeholder();
 		return sPlaceholder ? Utils.i18n(sPlaceholder) : '';
 	}, this);
+
+	this.largeValue = ko.computed(function () {
+		return Enums.ContactPropertyType.Note === this.type();
+	}, this);
+
 }
-
+
 /**
  * @constructor
  */
@@ -6210,7 +6217,7 @@ AttachmentModel.prototype.iconClass = function ()
 
 	return sClass;
 };
-
+
 /**
  * @constructor
  * @param {string} sId
@@ -6271,7 +6278,7 @@ ComposeAttachmentModel.prototype.initByUploadJson = function (oJsonAttachment)
 	}
 
 	return bResult;
-};
+};
 /**
  * @constructor
  */
@@ -7465,7 +7472,7 @@ MessageModel.prototype.flagHash = function ()
 	return [this.deleted(), this.unseen(), this.flagged(), this.answered(), this.forwarded(),
 		this.isReadReceipt()].join('');
 };
-
+
 /**
  * @constructor
  */
@@ -7797,7 +7804,7 @@ FolderModel.prototype.printableFullName = function ()
 {
 	return this.fullName.split(this.delimiter).join(' / ');
 };
-
+
 /**
  * @param {string} sEmail
  * @param {boolean=} bCanBeDelete = true
@@ -7818,7 +7825,7 @@ AccountModel.prototype.email = '';
 AccountModel.prototype.changeAccountLink = function ()
 {
 	return RL.link().change(this.email);
-};
+};
 /**
  * @param {string} sId
  * @param {string} sEmail
@@ -7854,7 +7861,7 @@ IdentityModel.prototype.formattedNameForEmail = function ()
 	var sName = this.name();
 	return '' === sName ? this.email() : '"' + Utils.quoteName(sName) + '" <' + this.email() + '>';
 };
-
+
 /**
  * @param {string} iIndex
  * @param {string} sGuID
@@ -7885,7 +7892,7 @@ OpenPgpKeyModel.prototype.user = '';
 OpenPgpKeyModel.prototype.email = '';
 OpenPgpKeyModel.prototype.armor = '';
 OpenPgpKeyModel.prototype.isPrivate = false;
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -7981,7 +7988,7 @@ PopupsFolderClearViewModel.prototype.onShow = function (oFolder)
 		this.selectedFolder(oFolder);
 	}
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -8091,7 +8098,7 @@ PopupsFolderCreateViewModel.prototype.onFocus = function ()
 {
 	this.folderName.focused(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -8204,7 +8211,7 @@ PopupsFolderSystemViewModel.prototype.onShow = function (iNotificationType)
 	this.notification(sNotification);
 };
 
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -9692,7 +9699,7 @@ PopupsComposeViewModel.prototype.triggerForResize = function ()
 	this.editorResizeThrottle();
 };
 
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -9740,8 +9747,30 @@ function PopupsContactsViewModel()
 	this.viewSaveTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 
 	this.viewPropertiesNames = this.viewProperties.filter(function(oProperty) {
-		return -1 < Utils.inArray(oProperty.type(), [Enums.ContactPropertyType.FirstName, Enums.ContactPropertyType.LastName]);
+		return -1 < Utils.inArray(oProperty.type(), [
+			Enums.ContactPropertyType.FirstName, Enums.ContactPropertyType.LastName
+		]);
 	});
+
+	this.viewPropertiesOther = this.viewProperties.filter(function(oProperty) {
+		return -1 < Utils.inArray(oProperty.type(), [
+			Enums.ContactPropertyType.Note
+		]);
+	});
+	
+	this.viewPropertiesOther = ko.computed(function () {
+
+		var aList = _.filter(this.viewProperties(), function (oProperty) {
+			return -1 < Utils.inArray(oProperty.type(), [
+				Enums.ContactPropertyType.Nick
+			]);
+		});
+
+		return _.sortBy(aList, function (oProperty) {
+			return oProperty.type();
+		});
+
+	}, this);
 	
 	this.viewPropertiesEmails = this.viewProperties.filter(function(oProperty) {
 		return Enums.ContactPropertyType.Email === oProperty.type();
@@ -9787,6 +9816,13 @@ function PopupsContactsViewModel()
 		return '' === Utils.trim(oProperty.value()) && !bF;
 	});
 
+	this.viewPropertiesOtherEmptyAndOnFocused = ko.computed(function () {
+		return _.filter(this.viewPropertiesOther(), function (oProperty) {
+			var bF = oProperty.focused();
+			return '' === Utils.trim(oProperty.value()) && !bF;
+		});
+	}, this);
+
 	this.viewPropertiesEmailsEmptyAndOnFocused.subscribe(function(aList) {
 		fFastClearEmptyListHelper(aList);
 	});
@@ -9799,6 +9835,10 @@ function PopupsContactsViewModel()
 		fFastClearEmptyListHelper(aList);
 	});
 
+	this.viewPropertiesOtherEmptyAndOnFocused.subscribe(function(aList) {
+		fFastClearEmptyListHelper(aList);
+	});
+
 	this.viewSaving = ko.observable(false);
 
 	this.useCheckboxesInList = RL.data().useCheckboxesInList;
@@ -10007,11 +10047,44 @@ function PopupsContactsViewModel()
 
 Utils.extendAsViewModel('PopupsContactsViewModel', PopupsContactsViewModel);
 
+PopupsContactsViewModel.prototype.getPropertyPlceholder = function (sType)
+{
+	var sResult = '';
+	switch (sType)
+	{
+		case Enums.ContactPropertyType.LastName:
+			sResult = 'CONTACTS/PLACEHOLDER_ENTER_LAST_NAME';
+			break;
+		case Enums.ContactPropertyType.FirstName:
+			sResult = 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME';
+			break;
+		case Enums.ContactPropertyType.Nick:
+			sResult = 'CONTACTS/PLACEHOLDER_ENTER_NICK_NAME';
+			break;
+	}
+
+	return sResult;
+};
+
 PopupsContactsViewModel.prototype.addNewProperty = function (sType, sTypeStr)
 {
-	var oItem = new ContactPropertyModel(sType, sTypeStr || '', '');
+	this.viewProperties.push(new ContactPropertyModel(sType, sTypeStr || '', '', true, this.getPropertyPlceholder(sType)));
-	oItem.focused(true);
+};
-	this.viewProperties.push(oItem);
+
+PopupsContactsViewModel.prototype.addNewOrFocusProperty = function (sType, sTypeStr)
+{
+	var oItem = _.find(this.viewProperties(), function (oItem) {
+		return sType === oItem.type();
+	});
+
+	if (oItem)
+	{
+		oItem.focused(true);
+	}
+	else
+	{
+		this.addNewProperty(sType, sTypeStr);
+	}
 };
 
 PopupsContactsViewModel.prototype.addNewEmail = function ()
@@ -10029,6 +10102,25 @@ PopupsContactsViewModel.prototype.addNewWeb = function ()
 	this.addNewProperty(Enums.ContactPropertyType.Web);
 };
 
+PopupsContactsViewModel.prototype.addNewNickname = function ()
+{
+	this.addNewOrFocusProperty(Enums.ContactPropertyType.Nick);
+};
+
+PopupsContactsViewModel.prototype.addNewNotes = function ()
+{
+	this.addNewOrFocusProperty(Enums.ContactPropertyType.Note);
+};
+
+PopupsContactsViewModel.prototype.addNewBirthday = function ()
+{
+	this.addNewOrFocusProperty(Enums.ContactPropertyType.Birthday);
+};
+
+//PopupsContactsViewModel.prototype.addNewAddress = function ()
+//{
+//};
+
 PopupsContactsViewModel.prototype.exportVcf = function ()
 {
 	RL.download(RL.link().exportContactsVcf());
@@ -10200,8 +10292,11 @@ PopupsContactsViewModel.prototype.populateViewContact = function (oContact)
 		this.viewReadOnly(!!oContact.readOnly);
 	}
 
-	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, '', sLastName, false, 'CONTACTS/PLACEHOLDER_ENTER_LAST_NAME'));
+	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, '', sLastName, false,
-	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.FirstName, '', sFirstName, !oContact, 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME'));
+		this.getPropertyPlceholder(Enums.ContactPropertyType.LastName)));
+
+	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.FirstName, '', sFirstName, !oContact,
+		this.getPropertyPlceholder(Enums.ContactPropertyType.FirstName)));
 	
 	this.viewID(sId);
 	this.viewProperties([]);
@@ -10306,7 +10401,7 @@ PopupsContactsViewModel.prototype.onHide = function ()
 		oItem.checked(false);
 	});
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10442,7 +10537,7 @@ PopupsAdvancedSearchViewModel.prototype.onFocus = function ()
 {
 	this.fromFocus(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10554,7 +10649,7 @@ PopupsAddAccountViewModel.prototype.onFocus = function ()
 {
 	this.emailFocus(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10640,7 +10735,7 @@ PopupsAddOpenPgpKeyViewModel.prototype.onFocus = function ()
 {
 	this.key.focus(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10680,7 +10775,7 @@ PopupsViewOpenPgpKeyViewModel.prototype.onShow = function (oOpenPgpKey)
 		this.key(oOpenPgpKey.armor);
 	}
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10768,7 +10863,7 @@ PopupsGenerateNewOpenPgpKeyViewModel.prototype.onFocus = function ()
 {
 	this.email.focus(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11008,7 +11103,7 @@ PopupsComposeOpenPgpViewModel.prototype.onShow = function (fCallback, sText, sFr
 	this.to(aRec);
 	this.text(sText);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11156,7 +11251,7 @@ PopupsIdentityViewModel.prototype.onFocus = function ()
 		this.email.focused(true);
 	}
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11216,7 +11311,7 @@ PopupsLanguagesViewModel.prototype.changeLanguage = function (sLang)
 	RL.data().mainLanguage(sLang);
 	this.cancelCommand();
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11270,7 +11365,7 @@ PopupsTwoFactorTestViewModel.prototype.onFocus = function ()
 {
 	this.code.focused(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11376,7 +11471,7 @@ PopupsAskViewModel.prototype.onBuild = function ()
 	}, this));
 };
 
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11421,7 +11516,7 @@ PopupsKeyboardShortcutsHelpViewModel.prototype.onBuild = function (oDom)
 		}
 	}, this));
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11733,7 +11828,7 @@ LoginViewModel.prototype.selectLanguage = function ()
 	kn.showScreenPopup(PopupsLanguagesViewModel);
 };
 
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11829,7 +11924,7 @@ AbstractSystemDropDownViewModel.prototype.onBuild = function ()
 		}
 	});
 };
-
+
 /**
  * @constructor
  * @extends AbstractSystemDropDownViewModel
@@ -11841,7 +11936,7 @@ function MailBoxSystemDropDownViewModel()
 }
 
 Utils.extendAsViewModel('MailBoxSystemDropDownViewModel', MailBoxSystemDropDownViewModel, AbstractSystemDropDownViewModel);
-
+
 /**
  * @constructor
  * @extends AbstractSystemDropDownViewModel
@@ -11853,7 +11948,7 @@ function SettingsSystemDropDownViewModel()
 }
 
 Utils.extendAsViewModel('SettingsSystemDropDownViewModel', SettingsSystemDropDownViewModel, AbstractSystemDropDownViewModel);
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -12046,7 +12141,7 @@ MailBoxFolderListViewModel.prototype.contactsClick = function ()
 		kn.showScreenPopup(PopupsContactsViewModel);
 	}
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -12934,7 +13029,7 @@ MailBoxMessageListViewModel.prototype.initUploaderForAppend = function ()
 	;
 
 	return !!oJua;
-};
+};
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -13598,7 +13693,7 @@ MailBoxMessageViewViewModel.prototype.readReceipt = function (oMessage)
 		RL.reloadFlagsCurrentMessageListAndMessageFromCache();
 	}
 };
-
+
 /**
  * @param {?} oScreen
  * 
@@ -13625,7 +13720,7 @@ SettingsMenuViewModel.prototype.backToMailBoxClick = function ()
 {
 	kn.setHash(RL.link().inbox());
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -13658,7 +13753,7 @@ SettingsPaneViewModel.prototype.backToMailBoxClick = function ()
 {
 	kn.setHash(RL.link().inbox());
 };
-
+
 /**
  * @constructor
  */
@@ -13818,7 +13913,7 @@ SettingsGeneral.prototype.selectLanguage = function ()
 {
 	kn.showScreenPopup(PopupsLanguagesViewModel);
 };
-
+
 /**
  * @constructor
  */
@@ -13868,7 +13963,7 @@ SettingsContacts.prototype.onBuild = function ()
 //{
 //
 //};
-
+
 /**
  * @constructor
  */
@@ -13949,7 +14044,7 @@ SettingsAccounts.prototype.deleteAccount = function (oAccountToRemove)
 		}
 	}
 };
-
+
 /**
  * @constructor
  */
@@ -14037,7 +14132,7 @@ SettingsIdentity.prototype.onBuild = function ()
 		
 	}, 50);
 };
-
+
 /**
  * @constructor
  */
@@ -14195,7 +14290,7 @@ SettingsIdentities.prototype.onBuild = function (oDom)
 		});
 
 	}, 50);
-};
+};
 /**
  * @constructor
  */
@@ -14345,7 +14440,7 @@ SettingsSecurity.prototype.onBuild = function ()
 	this.processing(true);
 	RL.remote().getTwoFactor(this.onResult);
 };
-
+
 /**
  * @constructor
  */
@@ -14412,7 +14507,7 @@ function SettingsSocialScreen()
 }
 
 Utils.addSettingsViewModel(SettingsSocialScreen, 'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
-
+
 /**
  * @constructor
  */
@@ -14517,7 +14612,7 @@ SettingsChangePasswordScreen.prototype.onChangePasswordResponse = function (sRes
 			Utils.getNotification(Enums.Notification.CouldNotSaveNewPassword));
 	}
 };
-
+
 /**
  * @constructor
  */
@@ -14712,7 +14807,7 @@ SettingsFolders.prototype.unSubscribeFolder = function (oFolder)
 	
 	oFolder.subScribed(false);
 };
-
+
 /**
  * @constructor
  */
@@ -14937,7 +15032,7 @@ SettingsThemes.prototype.initCustomThemeUploader = function ()
 	return false;
 };
 
-
+
 /**
  * @constructor
  */
@@ -15005,7 +15100,7 @@ SettingsOpenPGP.prototype.deleteOpenPgpKey = function (oOpenPgpKeyToRemove)
 			RL.reloadOpenPgpKeys();
 		}
 	}
-};
+};
 /**
  * @constructor
  */
@@ -15135,7 +15230,7 @@ AbstractData.prototype.populateDataOnStart = function()
 
 	this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
 };
-
+
 /**
  * @constructor
  * @extends AbstractData
@@ -16390,7 +16485,7 @@ WebMailDataStorage.prototype.findSelfPrivateKey = function (sPassword)
 {
 	return this.findPrivateKeyByEmail(this.accountEmail(), sPassword);
 };
-
+
 /**
  * @constructor
  */
@@ -16664,7 +16759,7 @@ AbstractAjaxRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
 		'Version': sVersion
 	});
 };
-
+
 /**
  * @constructor
  * @extends AbstractAjaxRemoteStorage
@@ -17454,7 +17549,7 @@ WebMailAjaxRemoteStorage.prototype.socialUsers = function (fCallback)
 	this.defaultRequest(fCallback, 'SocialUsers');
 };
 
-
+
 /**
  * @constructor
  */
@@ -17531,7 +17626,7 @@ AbstractCacheStorage.prototype.setEmailsPicsHashesData = function (oData)
 {
 	this.oEmailsPicsHashes = oData;
 };
-
+
 /**
  * @constructor
  * @extends AbstractCacheStorage
@@ -17849,7 +17944,7 @@ WebMailCacheStorage.prototype.storeMessageFlagsToCacheByFolderAndUid = function
 		this.setMessageFlagsToCache(sFolder, sUid, aFlags);
 	}
 };
-
+
 /**
  * @param {Array} aViewModels
  * @constructor
@@ -18027,7 +18122,7 @@ AbstractSettings.prototype.routes = function ()
 		['', oRules]
 	];
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractScreen
@@ -18042,7 +18137,7 @@ _.extend(LoginScreen.prototype, KnoinAbstractScreen.prototype);
 LoginScreen.prototype.onShow = function ()
 {
 	RL.setTitle('');
-};
+};
 /**
  * @constructor
  * @extends KnoinAbstractScreen
@@ -18213,7 +18308,7 @@ MailBoxScreen.prototype.routes = function ()
 		[/^([^\/]*)$/,  {'normalize_': fNormS}]
 	];
 };
-
+
 /**
  * @constructor
  * @extends AbstractSettings
@@ -18242,7 +18337,7 @@ SettingsScreen.prototype.onShow = function ()
 	RL.setTitle(this.sSettingsTitle);
 	RL.data().keyScope(Enums.KeyState.Settings);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractBoot
@@ -18578,7 +18673,7 @@ AbstractApp.prototype.bootstart = function ()
 
 	ssm.ready();
 };
-
+
 /**
  * @constructor
  * @extends AbstractApp
@@ -19860,7 +19955,7 @@ RainLoopApp.prototype.bootstart = function ()
  * @type {RainLoopApp}
  */
 RL = new RainLoopApp();
-
+
 $html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile');
 
 $window.keydown(Utils.killCtrlAandS).keyup(Utils.killCtrlAandS);
@@ -19911,9 +20006,9 @@ window['__RLBOOT'] = function (fCall) {
 		window['__RLBOOT'] = null;
 	});
 };
-
+
 if (window.SimplePace) {
 	window.SimplePace.add(10);
-}
+}
-
+
 }(window, jQuery, ko, crossroads, hasher, moment, Jua, _, ifvisible, key));