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;
@@ -338,6 +338,14 @@
 				}
 			}
 			
+			.contactValueTextArea {
+				width: 300px;
+			}
+
+			.contactValueInputLarge {
+				width: 400px;
+			}
+
 			.hasError {
 				.contactValueInput {
 					color: #ee5f5b;
@@ -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,9 +47,31 @@ 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 || '', '');
-	oItem.focused(true);
-	this.viewProperties.push(oItem);
+	this.viewProperties.push(new ContactPropertyModel(sType, sTypeStr || '', '', true, this.getPropertyPlceholder(sType)));
+};
+
+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.FirstName, '', sFirstName, !oContact, 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME'));
+	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, '', sLastName, false,
+		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))
-//			{
-//				$sValue = $this->getPropertyValueHelper($oVCard->NOTE, $bOldVersion);
-//				$aProperties[] = new Property(PropertyType::NOTE, $sValue);
-//			}
+			if (isset($oVCard->NOTE) && '' !== \trim($oVCard->NOTE))
+			{
+				$sValue = $this->getPropertyValueHelper($oVCard->NOTE, $bOldVersion);
+				$aProperties[] = new Property(PropertyType::NOTE, $sValue);
+			}
 
 			if (isset($oVCard->N))
 			{

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

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

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('', '');
-							$sNameItem = \trim($aNameItem[0].' '.$aNameItem[1]);
-
-							foreach ($aItems as $sEmail)
+							if (isset($aContactAllAccess[$iId]))
 							{
-								$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="property-line">
-											<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}" />
+									<div class="controls fix-width">
+										<div data-bind="foreach: viewPropertiesNames">
+											<div class="property-line">
+												<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}" />
+											</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" />
-												<input type="text" class="contactValueInput"
+												<span class="contactValueLargeStatic" data-bind="text: value" />
+												<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

@@ -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

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

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

@@ -650,6 +650,8 @@ Enums.ContactPropertyType = {
 	'Phone': 31,
 	'Web': 32,
 
+	'Birthday': 40,
+
 	'Facebook': 90,
 	'Skype': 91,
 	'GitHub': 92,
@@ -5973,6 +5975,11 @@ 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);
+
 }
 
 /**
@@ -9740,9 +9747,31 @@ 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 || '', '');
-	oItem.focused(true);
-	this.viewProperties.push(oItem);
+	this.viewProperties.push(new ContactPropertyModel(sType, sTypeStr || '', '', true, this.getPropertyPlceholder(sType)));
+};
+
+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.FirstName, '', sFirstName, !oContact, 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME'));
+	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, '', sLastName, false,
+		this.getPropertyPlceholder(Enums.ContactPropertyType.LastName)));
+
+	aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.FirstName, '', sFirstName, !oContact,
+		this.getPropertyPlceholder(Enums.ContactPropertyType.FirstName)));
 	
 	this.viewID(sId);
 	this.viewProperties([]);