Added export contacts (csv)

Interface optimizations

dev/Styles/Contacts.less

@@ -5,10 +5,10 @@
 
 	.control-group {
 		.control-label.fix-width {
-			width: 90px;
+			width: 50px;
 		}
 		.controls.fix-width {
-			margin-left: 110px;
+			margin-left: 70px;
 		}
 	}
 

dev/Styles/Layout.less

@@ -106,40 +106,17 @@ html.ssm-state-desktop {
 	#rl-sub-right {
 		left: 400px;
 	}
-}
-
-html.ssm-state-tablet {
-
-	#rl-left {
-		width: 160px;
-	}
-
-	#rl-right {
-		left: 160px;
-	}
-
-	#rl-sub-left {
-		width: 350px;
-
-		.messageList .inputSearch {
-			width: 220px;
-		}
-	}
-
-	#rl-sub-right {
-		left: 350px;
-	}
 
 	.b-compose.modal {
-		width: 800px;
+		width: 1000px;
 	}
 
 	.b-contacts-content.modal {
-		width: 800px;
+		width: 1000px;
 	}
 }
 
-html.ssm-state-mobile {
+html.ssm-state-tablet, html.ssm-state-mobile {
 
 	#rl-left {
 		width: 155px;
@@ -162,11 +139,52 @@ html.ssm-state-mobile {
 	}
 
 	.b-compose.modal {
-		width: 800px;
+		width: 700px;
 	}
 
 	.b-contacts-content.modal {
-		width: 800px;
+		width: 600px;
+	}
+
+	.b-contacts-content.modal {
+		.b-list-toopbar, .b-list-content, .b-list-footer-toopbar {
+			width: 150px;
+		}
+		.b-list-toopbar .e-search {
+			width: 125px;
+		}
+		.b-view-content {
+			left: 150px;
+		}
+		.contactValueInput {
+			width: 200px;
+		}
+	}
+}
+
+html.ssm-state-tablet {
+
+	.b-compose.modal {
+		width: 700px;
+	}
+
+	.b-contacts-content.modal {
+		width: 700px;
+	}
+
+	.b-contacts-content.modal {
+		.b-list-toopbar, .b-list-content, .b-list-footer-toopbar {
+			width: 200px;
+		}
+		.b-list-toopbar .e-search {
+			width: 175px;
+		}
+		.b-view-content {
+			left: 200px;
+		}
+		.contactValueInput {
+			width: 250px;
+		}
 	}
 }
 

dev/Styles/Scroll.less

@@ -6,9 +6,9 @@
 	width: 100%;
 	height: 2px;
 	z-index: 102;
-	-webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.8);
-	-moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.8);
-	box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.8);
+	-webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.5);
+	-moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.5);
+	box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.5);
 }
 
 .nano:before {

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

@@ -176,6 +176,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 				'Name' => PropertyType::FULLNAME,
 				'FullName' => PropertyType::FULLNAME,
 				'DisplayName' => PropertyType::FULLNAME,
+				'GivenName' => PropertyType::FULLNAME,
 				'First' => PropertyType::FIRST_NAME,
 				'FirstName' => PropertyType::FIRST_NAME,
 				'Middle' => PropertyType::MIDDLE_NAME,
@@ -183,9 +184,14 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 				'Last' => PropertyType::LAST_NAME,
 				'LastName' => PropertyType::LAST_NAME,
 				'Suffix' => PropertyType::NAME_SUFFIX,
+				'NameSuffix' => PropertyType::NAME_SUFFIX,
+				'Prefix' => PropertyType::NAME_PREFIX,
+				'NamePrefix' => PropertyType::NAME_PREFIX,
+				'ShortName' => PropertyType::NICK_NAME,
 				'NickName' => PropertyType::NICK_NAME,
 				'BusinessFax' => array(PropertyType::PHONE, 'Work,Fax'),
 				'BusinessFax2' => array(PropertyType::PHONE, 'Work,Fax'),
+				'BusinessFax3' => array(PropertyType::PHONE, 'Work,Fax'),
 				'BusinessPhone' => array(PropertyType::PHONE, 'Work'),
 				'BusinessPhone2' => array(PropertyType::PHONE, 'Work'),
 				'BusinessPhone3' => array(PropertyType::PHONE, 'Work'),
@@ -193,6 +199,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 				'CompanyMainPhone' => array(PropertyType::PHONE, 'Work'),
 				'HomeFax' => array(PropertyType::PHONE, 'Home,Fax'),
 				'HomeFax2' => array(PropertyType::PHONE, 'Home,Fax'),
+				'HomeFax3' => array(PropertyType::PHONE, 'Home,Fax'),
 				'HomePhone' => array(PropertyType::PHONE, 'Home'),
 				'HomePhone2' => array(PropertyType::PHONE, 'Home'),
 				'HomePhone3' => array(PropertyType::PHONE, 'Home'),
@@ -206,6 +213,9 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 				'Email' => array(PropertyType::EMAIl, 'Home'),
 				'Email2' => array(PropertyType::EMAIl, 'Home'),
 				'Email3' => array(PropertyType::EMAIl, 'Home'),
+				'HomeEmail' => array(PropertyType::EMAIl, 'Home'),
+				'HomeEmail2' => array(PropertyType::EMAIl, 'Home'),
+				'HomeEmail3' => array(PropertyType::EMAIl, 'Home'),
 				'EmailAddress' => array(PropertyType::EMAIl, 'Home'),
 				'Email2Address' => array(PropertyType::EMAIl, 'Home'),
 				'Email3Address' => array(PropertyType::EMAIl, 'Home'),

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

@@ -266,22 +266,162 @@ class Contact
 	}
 
 	/**
-	 * @todo
 	 * @return string
 	 */
-	public function ToCsvHeader()
+	public function ToCsv($bWithHeader = false)
 	{
-		return '';
-	}
+		$aData = array();
+		if ($bWithHeader)
+		{
+			$aData[] = array(
+				'Title', 'First Name', 'Middle Name', 'Last Name', 'Nick Name', 'Display Name',
+				'Company', 'Department', 'Job Title', 'Office Location',
+				'E-mail Address', 'Notes', 'Web Page', 'Birthday',
+				'Other Email', 'Other Phone', 'Other Mobile', 'Mobile Phone',
+				'Home Email',		'Home Phone',		'Home Fax',
+				'Home Street',		'Home City',		'Home State',		'Home Postal Code',			'Home Country',
+				'Business Email',	'Business Phone',	'Business Fax',
+				'Business Street',	'Business City',	'Business State',	'Business Postal Code',		'Business Country'
+			);
+		}
+
+		$aValues = array(
+			'',		// 0	'Title',
+			'',		// 1	'First Name',
+			'',		// 2	'Middle Name',
+			'',		// 3	'Last Name',
+			'',		// 4	'Nick Name',
+			'',		// 5	'Display Name',
+			'',		// 6	'Company',
+			'',		// 7	'Department',
+			'',		// 8	'Job Title',
+			'',		// 9	'Office Location',
+			'',		// 10	'E-mail Address',
+			'',		// 11	'Notes',
+			'',		// 12	'Web Page',
+			'',		// 13	'Birthday',
+			'',		// 14	'Other Email',
+			'',		// 15	'Other Phone',
+			'',		// 16	'Other Mobile',
+			'',		// 17	'Mobile Phone',
+			'',		// 18	'Home Email',
+			'',		// 19	'Home Phone',
+			'',		// 20	'Home Fax',
+			'',		// 21	'Home Street',
+			'',		// 22	'Home City',
+			'',		// 23	'Home State',
+			'',		// 24	'Home Postal Code',
+			'',		// 25	'Home Country',
+			'',		// 26	'Business Email',
+			'',		// 27	'Business Phone',
+			'',		// 28	'Business Fax',
+			'',		// 29	'Business Street',
+			'',		// 30	'Business City',
+			'',		// 31	'Business State',
+			'',		// 32	'Business Postal Code',
+			''		// 33	'Business Country'
+		);
 
-	/**
-	 * @todo
-	 * @return string
-	 */
-	public function ToCsvLine()
-	{
 		$this->UpdateDependentValues();
-		return '';
+
+		foreach ($this->Properties as /* @var $oProperty \RainLoop\Providers\AddressBook\Classes\Property */ &$oProperty)
+		{
+			$iIndex = -1;
+			if ($oProperty)
+			{
+				$aUpperTypes = $oProperty->TypesUpperAsArray();
+				switch ($oProperty->Type)
+				{
+					case PropertyType::FULLNAME:
+						$iIndex = 5;
+						break;
+					case PropertyType::NICK_NAME:
+						$iIndex = 4;
+						break;
+					case PropertyType::FIRST_NAME:
+						$iIndex = 1;
+						break;
+					case PropertyType::LAST_NAME:
+						$iIndex = 3;
+						break;
+					case PropertyType::MIDDLE_NAME:
+						$iIndex = 2;
+						break;
+					case PropertyType::EMAIl:
+						switch (true)
+						{
+							case \in_array('OTHER', $aUpperTypes):
+								$iIndex = 14;
+								break;
+							case \in_array('WORK', $aUpperTypes):
+								$iIndex = 26;
+								break;
+							default:
+								$iIndex = 18;
+								break;
+						}
+						break;
+					case PropertyType::PHONE:
+						switch (true)
+						{
+							case \in_array('OTHER', $aUpperTypes):
+								$iIndex = 15;
+								break;
+							case \in_array('WORK', $aUpperTypes):
+								$iIndex = 27;
+								break;
+							case \in_array('MOBILE', $aUpperTypes):
+								$iIndex = 17;
+								break;
+							default:
+								$iIndex = 19;
+								break;
+						}
+						break;
+					case PropertyType::WEB_PAGE:
+						$iIndex = 12;
+						break;
+					case PropertyType::NOTE:
+						$iIndex = 11;
+						break;
+				}
+
+				if (-1 < $iIndex)
+				{
+					$aValues[$iIndex] = $oProperty->Value;
+				}
+			}
+		}
+
+		// subfix
+		if (empty($aValues[10]))  // 'E-mail Address'
+		{
+			if (!empty($aValues[18]))
+			{
+				$aValues[10] = $aValues[18];
+			}
+			else if (!empty($aValues[26]))
+			{
+				$aValues[10] = $aValues[26];
+			}
+			else if (!empty($aValues[14]))
+			{
+				$aValues[10] = $aValues[14];
+			}
+		}
+
+		$aData[] = \array_map(function ($sValue) {
+			$sValue = \trim($sValue);
+			return \preg_match('/[\r\n,"]/', $sValue) ? '"'.\str_replace('"', '""', $sValue).'"' : $sValue;
+		}, $aValues);
+
+		$sResult = '';
+		foreach ($aData as $aSubData)
+		{
+			$sResult .= \implode(',', $aSubData)."\r\n";
+		}
+
+		return $sResult;
 	}
 
 	/**

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

@@ -90,6 +90,14 @@ class Property
 		return $aResult;
 	}
 
+	/**
+	 * @return array
+	 */
+	public function TypesUpperAsArray()
+	{
+		return \array_map('strtoupper', $this->TypesAsArray());
+	}
+
 	public function UpdateDependentValues()
 	{
 		$this->Value = \trim($this->Value);

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

@@ -379,7 +379,7 @@ class PdoAddressBook
 		}
 
 		$bVcf = 'vcf' === $sType;
-		$bCsvHeader = false;
+		$bCsvHeader = true;
 
 		$aDatabaseSyncData = $this->prepearDatabaseSyncData($iUserID);
 		if (\is_array($aDatabaseSyncData) && 0 < \count($aDatabaseSyncData))
@@ -397,13 +397,8 @@ class PdoAddressBook
 						}
 						else
 						{
-							if (!$bCsvHeader)
-							{
-								$bCsvHeader = true;
-								echo $oContact->ToCsvHeader();
-							}
-							
-							echo $oContact->ToCsvLine();
+							echo $oContact->ToCsv($bCsvHeader);
+							$bCsvHeader = false;
 						}
 					}
 				}

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

@@ -20,21 +20,22 @@
 					<ul class="dropdown-menu g-ui-menu" role="menu" aria-labelledby="contacts-more-dropdown-id">
 						<li class="e-item" role="presentation">
 							<a class="e-link menuitem" href="#" tabindex="-1" data-bind="initDom: importUploaderButton">
-								<i data-bind="css: {'icon-list-add': !contacts.importing(), 'icon-spinner animated': contacts.importing}"></i>
+								<i data-bind="css: {'icon-import': !contacts.importing(), 'icon-spinner animated': contacts.importing}"></i>
 								&nbsp;&nbsp;
 								<span class="i18n" data-i18n-text="CONTACTS/BUTTON_IMPORT"></span>
 							</a>
 						</li>
-<!--						<li class="e-item" role="presentation" data-bind="visible: allowExport" >
+						<li class="divider" role="presentation" data-bind="visible: allowExport"></li>
+						<li class="e-item" role="presentation" data-bind="visible: allowExport">
 							<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: exportCsv">
-								<i data-bind="css: {'icon-download': !contacts.exportingCsv(), 'icon-spinner animated': contacts.exportingCsv}"></i>
+								<i data-bind="css: {'icon-export': !contacts.exportingCsv(), 'icon-spinner animated': contacts.exportingCsv}"></i>
 								&nbsp;&nbsp;
 								<span class="i18n" data-i18n-text="CONTACTS/BUTTON_EXPORT_CSV"></span>
 							</a>
-						</li>-->
+						</li>
 						<li class="e-item" role="presentation" data-bind="visible: allowExport" >
 							<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: exportVcf">
-								<i data-bind="css: {'icon-download': !contacts.exportingVcf(), 'icon-spinner animated': contacts.exportingVcf}"></i>
+								<i data-bind="css: {'icon-export': !contacts.exportingVcf(), 'icon-spinner animated': contacts.exportingVcf}"></i>
 								&nbsp;&nbsp;
 								<span class="i18n" data-i18n-text="CONTACTS/BUTTON_EXPORT_VCARD"></span>
 							</a>

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 {
@@ -1498,7 +1498,13 @@ table {
 .icon-cloud-down:before {
   content: "\e068";
 }
-
+.icon-import:before {
+  content: "\e069";
+}
+.icon-export:before {
+  content: "\e06a";
+}
+
 /** initial setup **/
 .nano {
 /*
@@ -1615,7 +1621,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;
@@ -1980,7 +1986,7 @@ img.mfp-img {
   right: 0;
   padding-top: 0; }
 
-
+
 
 /* overlay at start */
 .mfp-fade.mfp-bg {
@@ -2026,7 +2032,7 @@ img.mfp-img {
   -moz-transform: translateX(50px);
   transform: translateX(50px);
 }
-
+
 .simple-pace {
 	-webkit-pointer-events: none;
 	pointer-events: none;
@@ -2097,7 +2103,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;
@@ -2165,7 +2171,7 @@ img.mfp-img {
 	box-shadow:none;
 }
 .inputosaurus-input-hidden { display:none; }
-
+
 .flag-wrapper {
 	width: 24px;
 	height: 16px;
@@ -2209,7 +2215,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;
@@ -7023,47 +7029,79 @@ html.ssm-state-desktop #rl-sub-left {
 html.ssm-state-desktop #rl-sub-right {
   left: 400px;
 }
-html.ssm-state-tablet #rl-left {
-  width: 160px;
+html.ssm-state-desktop .b-compose.modal {
+  width: 1000px;
 }
-html.ssm-state-tablet #rl-right {
-  left: 160px;
-}
-html.ssm-state-tablet #rl-sub-left {
-  width: 350px;
-}
-html.ssm-state-tablet #rl-sub-left .messageList .inputSearch {
-  width: 220px;
-}
-html.ssm-state-tablet #rl-sub-right {
-  left: 350px;
-}
-html.ssm-state-tablet .b-compose.modal {
-  width: 800px;
-}
-html.ssm-state-tablet .b-contacts-content.modal {
-  width: 800px;
+html.ssm-state-desktop .b-contacts-content.modal {
+  width: 1000px;
 }
+html.ssm-state-tablet #rl-left,
 html.ssm-state-mobile #rl-left {
   width: 155px;
 }
+html.ssm-state-tablet #rl-right,
 html.ssm-state-mobile #rl-right {
   left: 155px;
 }
+html.ssm-state-tablet #rl-sub-left,
 html.ssm-state-mobile #rl-sub-left {
   width: 310px;
 }
+html.ssm-state-tablet #rl-sub-left .messageList .inputSearch,
 html.ssm-state-mobile #rl-sub-left .messageList .inputSearch {
   width: 200px;
 }
+html.ssm-state-tablet #rl-sub-right,
 html.ssm-state-mobile #rl-sub-right {
   left: 310px;
 }
+html.ssm-state-tablet .b-compose.modal,
 html.ssm-state-mobile .b-compose.modal {
-  width: 800px;
+  width: 700px;
 }
+html.ssm-state-tablet .b-contacts-content.modal,
 html.ssm-state-mobile .b-contacts-content.modal {
-  width: 800px;
+  width: 600px;
+}
+html.ssm-state-tablet .b-contacts-content.modal .b-list-toopbar,
+html.ssm-state-mobile .b-contacts-content.modal .b-list-toopbar,
+html.ssm-state-tablet .b-contacts-content.modal .b-list-content,
+html.ssm-state-mobile .b-contacts-content.modal .b-list-content,
+html.ssm-state-tablet .b-contacts-content.modal .b-list-footer-toopbar,
+html.ssm-state-mobile .b-contacts-content.modal .b-list-footer-toopbar {
+  width: 150px;
+}
+html.ssm-state-tablet .b-contacts-content.modal .b-list-toopbar .e-search,
+html.ssm-state-mobile .b-contacts-content.modal .b-list-toopbar .e-search {
+  width: 125px;
+}
+html.ssm-state-tablet .b-contacts-content.modal .b-view-content,
+html.ssm-state-mobile .b-contacts-content.modal .b-view-content {
+  left: 150px;
+}
+html.ssm-state-tablet .b-contacts-content.modal .contactValueInput,
+html.ssm-state-mobile .b-contacts-content.modal .contactValueInput {
+  width: 200px;
+}
+html.ssm-state-tablet .b-compose.modal {
+  width: 700px;
+}
+html.ssm-state-tablet .b-contacts-content.modal {
+  width: 700px;
+}
+html.ssm-state-tablet .b-contacts-content.modal .b-list-toopbar,
+html.ssm-state-tablet .b-contacts-content.modal .b-list-content,
+html.ssm-state-tablet .b-contacts-content.modal .b-list-footer-toopbar {
+  width: 200px;
+}
+html.ssm-state-tablet .b-contacts-content.modal .b-list-toopbar .e-search {
+  width: 175px;
+}
+html.ssm-state-tablet .b-contacts-content.modal .b-view-content {
+  left: 200px;
+}
+html.ssm-state-tablet .b-contacts-content.modal .contactValueInput {
+  width: 250px;
 }
 html.rl-left-panel-disabled #rl-left {
   width: 5px !important;
@@ -7115,9 +7153,9 @@ html.rl-no-preview-pane #rl-right .ui-resizable-handle {
   width: 100%;
   height: 2px;
   z-index: 102;
-  -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.8);
-  -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.8);
-  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.8);
+  -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.5);
 }
 .nano:before {
   top: -2px;
@@ -8337,10 +8375,10 @@ html.rl-message-fullscreen .messageView .b-content .buttonFull {
   display: none;
 }
 .b-contacts-content .control-group .control-label.fix-width {
-  width: 90px;
+  width: 50px;
 }
 .b-contacts-content .control-group .controls.fix-width {
-  margin-left: 110px;
+  margin-left: 70px;
 }
 .b-contacts-content.modal {
   position: absolute;

rainloop/v/0.0.0/static/css/fonts/rainloop.svg

@@ -112,4 +112,6 @@
 <glyph unicode="&#57446;" d="M311 155l0-54c0-8-3-15-8-20-5-5-12-8-20-8l-54 0c-8 0-15 3-20 8-5 5-8 12-8 20l0 54c0 8 3 15 8 20 5 5 12 8 20 8l54 0c8 0 15-3 20-8 5-5 8-12 8-20z m0 147l0-55c0-8-3-14-8-20-5-5-12-8-20-8l-54 0c-8 0-15 3-20 8-5 6-8 12-8 20l0 55c0 7 3 14 8 19 5 5 12 8 20 8l54 0c8 0 15-3 20-8 5-5 8-12 8-19z m0 146l0-55c0-7-3-14-8-19-5-6-12-8-20-8l-54 0c-8 0-15 2-20 8-5 5-8 12-8 19l0 55c0 8 3 14 8 19 5 6 12 8 20 8l54 0c8 0 15-2 20-8 5-5 8-11 8-19z"/>
 <glyph unicode="&#57447;" d="M341 265c0 2 0 4-2 6l-94 94c-2 1-4 2-6 2-3 0-5-1-6-2l-94-94c-2-2-2-4-2-6 0-3 0-5 2-7 2-1 4-2 6-2l60 0 0-94c0-2 1-4 2-6 2-2 4-2 6-2l52 0c2 0 4 0 6 2 1 2 2 4 2 6l0 94 60 0c2 0 4 1 6 3 1 1 2 3 2 6z m171-77c0-29-10-53-30-73-20-20-44-30-72-30l-291 0c-32 0-61 12-84 35-23 24-35 52-35 85 0 23 6 44 19 64 12 19 29 34 50 44-1 5-1 9-1 11 0 38 14 70 40 97 27 26 59 40 97 40 28 0 53-8 76-23 23-16 40-36 50-62 13 11 28 17 44 17 19 0 35-7 49-20 13-14 20-30 20-49 0-13-4-26-11-37 23-5 42-17 57-36 15-18 22-39 22-63z"/>
 <glyph unicode="&#57448;" d="M341 247c0 3 0 5-2 7-2 1-4 2-6 2l-60 0 0 94c0 2-1 4-2 6-2 2-4 2-6 2l-52 0c-2 0-4 0-6-2-1-2-2-4-2-6l0-94-60 0c-2 0-4-1-6-3-2-1-2-3-2-6 0-2 0-4 2-6l94-94c1-1 3-2 6-2 2 0 4 1 6 2l94 94c1 2 2 4 2 6z m171-59c0-29-10-53-30-73-20-20-44-30-72-30l-291 0c-32 0-61 12-84 35-23 24-35 52-35 85 0 23 6 44 19 64 12 19 29 34 50 44-1 5-1 9-1 11 0 38 14 70 40 97 27 26 59 40 97 40 28 0 53-8 76-23 23-16 40-36 50-62 13 11 28 17 44 17 19 0 35-7 49-20 13-14 20-30 20-49 0-13-4-26-11-37 23-5 42-17 57-36 15-18 22-39 22-63z"/>
+<glyph unicode="&#57449;" d="M375 256c0-5-2-9-6-13l-155-155c-4-4-8-6-13-6-5 0-9 2-13 6-3 3-5 8-5 13l0 82-128 0c-5 0-9 2-13 5-4 4-5 8-5 13l0 110c0 5 1 9 5 13 4 3 8 5 13 5l128 0 0 82c0 5 2 10 5 13 4 4 8 6 13 6 5 0 9-2 13-6l155-155c4-4 6-8 6-13z m100 101l0-202c0-22-8-42-24-58-16-16-35-24-58-24l-91 0c-3 0-5 1-7 3-2 2-2 4-2 6 0 1-1 3-1 6 0 3 0 6 0 8 0 2 1 4 1 6 0 3 1 5 3 6 1 1 3 2 6 2l91 0c13 0 23 4 32 13 9 9 14 20 14 32l0 202c0 12-5 23-14 32-9 9-19 13-32 13l-89 0c0 0-1 0-3 1-2 0-4 0-4 0 0 1 0 1-2 2-1 1-2 2-2 3 0 1 0 2 0 3 0 1-1 3-1 6 0 3 0 6 0 8 0 2 1 4 1 6 0 3 1 5 3 6 1 1 3 2 6 2l91 0c23 0 42-8 58-24 16-16 24-36 24-58z"/>
+<glyph unicode="&#57450;" d="M201 101c0-1 0-3 0-6 1-3 1-6 1-8-1-2-1-4-1-6-1-3-2-5-3-6-2-1-4-2-6-2l-91 0c-23 0-42 8-59 24-16 16-24 36-24 58l0 202c0 22 8 42 24 58 17 16 36 24 59 24l91 0c2 0 5-1 6-3 2-2 3-4 3-6 0-1 0-3 0-6 1-3 1-6 1-8-1-2-1-4-1-6-1-3-2-5-3-6-2-1-4-2-6-2l-91 0c-13 0-24-4-33-13-9-9-13-20-13-32l0-202c0-12 4-23 13-32 9-9 20-13 33-13l89 0c0 0 1 0 3-1 2 0 3 0 3 0 0-1 1-1 3-2 1-1 2-2 2-3-1-1 0-2 0-3z m265 155c0-5-2-9-5-13l-156-155c-3-4-7-6-12-6-5 0-10 2-13 6-4 3-6 8-6 13l0 82-128 0c-5 0-9 2-13 5-3 4-5 8-5 13l0 110c0 5 2 9 5 13 4 3 8 5 13 5l128 0 0 82c0 5 2 10 6 13 3 4 8 6 13 6 5 0 9-2 12-6l156-155c3-4 5-8 5-13z"/>
 </font></defs></svg>

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 */
-(function (window, $, ko, crossroads, hasher, _) {
+/*! RainLoop Webmail Admin Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+(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}
  */
@@ -721,7 +721,7 @@ Enums.Notification = {
 	'UnknownNotification': 999,
 	'UnknownError': 999
 };
-
+
 Utils.trim = $.trim;
 Utils.inArray = $.inArray;
 Utils.isArray = _.isArray;
@@ -2459,7 +2459,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 +2622,7 @@ Base64 = {
 	}
 };
 
-/*jslint bitwise: false*/
+/*jslint bitwise: false*/
 ko.bindingHandlers.tooltip = {
 	'init': function (oElement, fValueAccessor) {
 		if (!Globals.bMobileDevice)
@@ -3329,7 +3329,7 @@ ko.observable.fn.validateFunc = function (fFunc)
 	return this;
 };
 
-
+
 /**
  * @constructor
  */
@@ -3643,7 +3643,7 @@ LinkBuilder.prototype.socialFacebook = function ()
 {
 	return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : '');
 };
-
+
 /**
  * @type {Object}
  */
@@ -3737,7 +3737,7 @@ Plugins.settingsGet = function (sPluginSection, sName)
 };
 
 
-
+
 /**
  * @constructor
  */
@@ -3811,7 +3811,7 @@ CookieDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /**
  * @constructor
  */
@@ -3882,7 +3882,7 @@ LocalStorageDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /**
  * @constructor
  */
@@ -3925,7 +3925,7 @@ LocalStorage.prototype.get = function (iKey)
 {
 	return this.oDriver ? this.oDriver.get('p' + iKey) : null;
 };
-
+
 /**
  * @constructor
  */
@@ -3938,7 +3938,7 @@ KnoinAbstractBoot.prototype.bootstart = function ()
 {
 
 };
-
+
 /**
  * @param {string=} sPosition = ''
  * @param {string=} sTemplate = ''
@@ -4024,7 +4024,7 @@ KnoinAbstractViewModel.prototype.registerPopupEscapeKey = function ()
 		return true;
 	});
 };
-
+
 /**
  * @param {string} sScreenName
  * @param {?=} aViewModels = []
@@ -4100,7 +4100,7 @@ KnoinAbstractScreen.prototype.__start = function ()
 		this.oCross = oRoute;
 	}
 };
-
+
 /**
  * @constructor
  */
@@ -4498,7 +4498,7 @@ Knoin.prototype.bootstart = function ()
 };
 
 kn = new Knoin();
-
+
 /**
  * @param {string=} sEmail
  * @param {string=} sName
@@ -4862,7 +4862,7 @@ EmailModel.prototype.inputoTagLine = function ()
 {
 	return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email;
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5128,7 +5128,7 @@ PopupsDomainViewModel.prototype.clearForm = function ()
 	this.smtpAuth(true);
 	this.whiteList('');
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5265,7 +5265,7 @@ PopupsPluginViewModel.prototype.onBuild = function ()
 		}
 	}, this));
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5381,7 +5381,7 @@ PopupsActivateViewModel.prototype.validateSubscriptionKey = function ()
 {
 	var sValue = this.key();
 	return '' === sValue || !!/^RL[\d]+-[A-Z0-9\-]+Z$/.test(Utils.trim(sValue));
-};
+};
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5441,7 +5441,7 @@ PopupsLanguagesViewModel.prototype.changeLanguage = function (sLang)
 	RL.data().mainLanguage(sLang);
 	this.cancelCommand();
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5547,7 +5547,7 @@ PopupsAskViewModel.prototype.onBuild = function ()
 	}, this));
 };
 
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5634,7 +5634,7 @@ AdminLoginViewModel.prototype.onHide = function ()
 {
 	this.loginFocus(false);
 };
-
+
 /**
  * @param {?} oScreen
  *
@@ -5656,7 +5656,7 @@ AdminMenuViewModel.prototype.link = function (sRoute)
 {
 	return '#/' + sRoute;
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -5681,7 +5681,7 @@ AdminPaneViewModel.prototype.logoutClick = function ()
 	RL.remote().adminLogout(function () {
 		RL.loginAndLogoutReload();
 	});
-};
+};
 /**
  * @constructor
  */
@@ -5781,7 +5781,7 @@ AdminGeneral.prototype.selectLanguage = function ()
 {
 	kn.showScreenPopup(PopupsLanguagesViewModel);
 };
-
+
 /**
  * @constructor
  */
@@ -5833,7 +5833,7 @@ AdminLogin.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /**
  * @constructor
  */
@@ -5902,7 +5902,7 @@ AdminBranding.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /**
  * @constructor
  */
@@ -6122,7 +6122,7 @@ AdminContacts.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /**
  * @constructor
  */
@@ -6211,7 +6211,7 @@ AdminDomains.prototype.onDomainListChangeRequest = function ()
 {
 	RL.reloadDomainList();
 };
-
+
 /**
  * @constructor
  */
@@ -6306,7 +6306,7 @@ AdminSecurity.prototype.phpInfoLink = function ()
 {
 	return RL.link().phpInfo();
 };
-
+
 /**
  * @constructor
  */
@@ -6422,7 +6422,7 @@ AdminSocial.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /**
  * @constructor
  */
@@ -6519,7 +6519,7 @@ AdminPlugins.prototype.onPluginDisableRequest = function (sResult, oData)
 
 	RL.reloadPluginList();
 };
-
+
 /**
  * @constructor
  */
@@ -6617,7 +6617,7 @@ AdminPackages.prototype.installPackage = function (oPackage)
 		RL.remote().packageInstall(this.requestHelper(oPackage, true), oPackage);
 	}
 };
-
+
 /**
  * @constructor
  */
@@ -6668,7 +6668,7 @@ AdminLicensing.prototype.licenseExpiredMomentValue = function ()
 {
 	var oDate = moment.unix(this.licenseExpired());
 	return oDate.format('LL') + ' (' + oDate.from(moment()) + ')';
-};
+};
 /**
  * @constructor
  */
@@ -6798,7 +6798,7 @@ AbstractData.prototype.populateDataOnStart = function()
 
 	this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
 };
-
+
 /**
  * @constructor
  * @extends AbstractData
@@ -6840,7 +6840,7 @@ _.extend(AdminDataStorage.prototype, AbstractData.prototype);
 AdminDataStorage.prototype.populateDataOnStart = function()
 {
 	AbstractData.prototype.populateDataOnStart.call(this);
-};
+};
 /**
  * @constructor
  */
@@ -7114,7 +7114,7 @@ AbstractAjaxRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
 		'Version': sVersion
 	});
 };
-
+
 /**
  * @constructor
  * @extends AbstractAjaxRemoteStorage
@@ -7359,7 +7359,7 @@ AdminAjaxRemoteStorage.prototype.adminPing = function (fCallback)
 {
 	this.defaultRequest(fCallback, 'AdminPing');
 };
-
+
 /**
  * @constructor
  */
@@ -7436,7 +7436,7 @@ AbstractCacheStorage.prototype.setEmailsPicsHashesData = function (oData)
 {
 	this.oEmailsPicsHashes = oData;
 };
-
+
 /**
  * @constructor
  * @extends AbstractCacheStorage
@@ -7447,7 +7447,7 @@ function AdminCacheStorage()
 }
 
 _.extend(AdminCacheStorage.prototype, AbstractCacheStorage.prototype);
-
+
 /**
  * @param {Array} aViewModels
  * @constructor
@@ -7625,7 +7625,7 @@ AbstractSettings.prototype.routes = function ()
 		['', oRules]
 	];
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractScreen
@@ -7640,7 +7640,7 @@ _.extend(AdminLoginScreen.prototype, KnoinAbstractScreen.prototype);
 AdminLoginScreen.prototype.onShow = function ()
 {
 	RL.setTitle('');
-};
+};
 /**
  * @constructor
  * @extends AbstractSettings
@@ -7660,7 +7660,7 @@ AdminSettingsScreen.prototype.onShow = function ()
 //	AbstractSettings.prototype.onShow.call(this);
 	
 	RL.setTitle('');
-};
+};
 /**
  * @constructor
  * @extends KnoinAbstractBoot
@@ -7996,7 +7996,7 @@ AbstractApp.prototype.bootstart = function ()
 
 	ssm.ready();
 };
-
+
 /**
  * @constructor
  * @extends AbstractApp
@@ -8235,7 +8235,7 @@ AdminApp.prototype.bootstart = function ()
  * @type {AdminApp}
  */
 RL = new AdminApp();
-
+
 $html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile');
 
 $window.keydown(Utils.killCtrlAandS).keyup(Utils.killCtrlAandS);
@@ -8286,9 +8286,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 */
-(function (window, $, ko, crossroads, hasher, moment, Jua, _, ifvisible, key) {
+/*! RainLoop Webmail Main Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+(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}
  */
@@ -725,7 +725,7 @@ Enums.Notification = {
 	'UnknownNotification': 999,
 	'UnknownError': 999
 };
-
+
 Utils.trim = $.trim;
 Utils.inArray = $.inArray;
 Utils.isArray = _.isArray;
@@ -2463,7 +2463,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 +2626,7 @@ Base64 = {
 	}
 };
 
-/*jslint bitwise: false*/
+/*jslint bitwise: false*/
 ko.bindingHandlers.tooltip = {
 	'init': function (oElement, fValueAccessor) {
 		if (!Globals.bMobileDevice)
@@ -3333,7 +3333,7 @@ ko.observable.fn.validateFunc = function (fFunc)
 	return this;
 };
 
-
+
 /**
  * @constructor
  */
@@ -3647,7 +3647,7 @@ LinkBuilder.prototype.socialFacebook = function ()
 {
 	return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : '');
 };
-
+
 /**
  * @type {Object}
  */
@@ -3741,7 +3741,7 @@ Plugins.settingsGet = function (sPluginSection, sName)
 };
 
 
-
+
 function NewHtmlEditorWrapper(oElement, fOnBlur, fOnReady, fOnModeChange)
 {
 	var self = this;
@@ -3961,7 +3961,7 @@ NewHtmlEditorWrapper.prototype.clear = function (bFocus)
 	this.setHtml('', bFocus);
 };
 
-
+
 /**
  * @constructor
  * @param {koProperty} oKoList
@@ -4669,7 +4669,7 @@ Selector.prototype.on = function (sEventName, fCallback)
 {
 	this.oCallbacks[sEventName] = fCallback;
 };
-
+
 /**
  * @constructor
  */
@@ -4743,7 +4743,7 @@ CookieDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /**
  * @constructor
  */
@@ -4814,7 +4814,7 @@ LocalStorageDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /**
  * @constructor
  */
@@ -4857,7 +4857,7 @@ LocalStorage.prototype.get = function (iKey)
 {
 	return this.oDriver ? this.oDriver.get('p' + iKey) : null;
 };
-
+
 /**
  * @constructor
  */
@@ -4870,7 +4870,7 @@ KnoinAbstractBoot.prototype.bootstart = function ()
 {
 
 };
-
+
 /**
  * @param {string=} sPosition = ''
  * @param {string=} sTemplate = ''
@@ -4956,7 +4956,7 @@ KnoinAbstractViewModel.prototype.registerPopupEscapeKey = function ()
 		return true;
 	});
 };
-
+
 /**
  * @param {string} sScreenName
  * @param {?=} aViewModels = []
@@ -5032,7 +5032,7 @@ KnoinAbstractScreen.prototype.__start = function ()
 		this.oCross = oRoute;
 	}
 };
-
+
 /**
  * @constructor
  */
@@ -5430,7 +5430,7 @@ Knoin.prototype.bootstart = function ()
 };
 
 kn = new Knoin();
-
+
 /**
  * @param {string=} sEmail
  * @param {string=} sName
@@ -5794,7 +5794,7 @@ EmailModel.prototype.inputoTagLine = function ()
 {
 	return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email;
 };
-
+
 /**
  * @constructor
  */
@@ -5911,7 +5911,7 @@ ContactModel.prototype.lineAsCcc = function ()
 
 	return aResult.join(' ');
 };
-
+
 /**
  * @param {number=} iType = Enums.ContactPropertyType.Unknown
  * @param {string=} sTypeStr = ''
@@ -5935,7 +5935,7 @@ function ContactPropertyModel(iType, sTypeStr, sValue, bFocused, sPlaceholder)
 		return sPlaceholder ? Utils.i18n(sPlaceholder) : '';
 	}, this);
 }
-
+
 /**
  * @constructor
  */
@@ -6171,7 +6171,7 @@ AttachmentModel.prototype.iconClass = function ()
 
 	return sClass;
 };
-
+
 /**
  * @constructor
  * @param {string} sId
@@ -6232,7 +6232,7 @@ ComposeAttachmentModel.prototype.initByUploadJson = function (oJsonAttachment)
 	}
 
 	return bResult;
-};
+};
 /**
  * @constructor
  */
@@ -7426,7 +7426,7 @@ MessageModel.prototype.flagHash = function ()
 	return [this.deleted(), this.unseen(), this.flagged(), this.answered(), this.forwarded(),
 		this.isReadReceipt()].join('');
 };
-
+
 /**
  * @constructor
  */
@@ -7758,7 +7758,7 @@ FolderModel.prototype.printableFullName = function ()
 {
 	return this.fullName.split(this.delimiter).join(' / ');
 };
-
+
 /**
  * @param {string} sEmail
  * @param {boolean=} bCanBeDelete = true
@@ -7779,7 +7779,7 @@ AccountModel.prototype.email = '';
 AccountModel.prototype.changeAccountLink = function ()
 {
 	return RL.link().change(this.email);
-};
+};
 /**
  * @param {string} sId
  * @param {string} sEmail
@@ -7815,7 +7815,7 @@ IdentityModel.prototype.formattedNameForEmail = function ()
 	var sName = this.name();
 	return '' === sName ? this.email() : '"' + Utils.quoteName(sName) + '" <' + this.email() + '>';
 };
-
+
 /**
  * @param {string} iIndex
  * @param {string} sGuID
@@ -7846,7 +7846,7 @@ OpenPgpKeyModel.prototype.user = '';
 OpenPgpKeyModel.prototype.email = '';
 OpenPgpKeyModel.prototype.armor = '';
 OpenPgpKeyModel.prototype.isPrivate = false;
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -7942,7 +7942,7 @@ PopupsFolderClearViewModel.prototype.onShow = function (oFolder)
 		this.selectedFolder(oFolder);
 	}
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -8052,7 +8052,7 @@ PopupsFolderCreateViewModel.prototype.onFocus = function ()
 {
 	this.folderName.focused(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -8165,7 +8165,7 @@ PopupsFolderSystemViewModel.prototype.onShow = function (iNotificationType)
 	this.notification(sNotification);
 };
 
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -9654,7 +9654,7 @@ PopupsComposeViewModel.prototype.triggerForResize = function ()
 	this.editorResizeThrottle();
 };
 
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10250,7 +10250,7 @@ PopupsContactsViewModel.prototype.onHide = function ()
 		oItem.checked(false);
 	});
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10386,7 +10386,7 @@ PopupsAdvancedSearchViewModel.prototype.onFocus = function ()
 {
 	this.fromFocus(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10503,7 +10503,7 @@ PopupsAddAccountViewModel.prototype.onBuild = function ()
 {
 	this.allowCustomLogin(!!RL.settingsGet('AllowCustomLogin'));
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10589,7 +10589,7 @@ PopupsAddOpenPgpKeyViewModel.prototype.onFocus = function ()
 {
 	this.key.focus(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10629,7 +10629,7 @@ PopupsViewOpenPgpKeyViewModel.prototype.onShow = function (oOpenPgpKey)
 		this.key(oOpenPgpKey.armor);
 	}
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10717,7 +10717,7 @@ PopupsGenerateNewOpenPgpKeyViewModel.prototype.onFocus = function ()
 {
 	this.email.focus(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -10957,7 +10957,7 @@ PopupsComposeOpenPgpViewModel.prototype.onShow = function (fCallback, sText, sFr
 	this.to(aRec);
 	this.text(sText);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11105,7 +11105,7 @@ PopupsIdentityViewModel.prototype.onFocus = function ()
 		this.email.focused(true);
 	}
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11165,7 +11165,7 @@ PopupsLanguagesViewModel.prototype.changeLanguage = function (sLang)
 	RL.data().mainLanguage(sLang);
 	this.cancelCommand();
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11219,7 +11219,7 @@ PopupsTwoFactorTestViewModel.prototype.onFocus = function ()
 {
 	this.code.focused(true);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11325,7 +11325,7 @@ PopupsAskViewModel.prototype.onBuild = function ()
 	}, this));
 };
 
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11370,7 +11370,7 @@ PopupsKeyboardShortcutsHelpViewModel.prototype.onBuild = function (oDom)
 		}
 	}, this));
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11682,7 +11682,7 @@ LoginViewModel.prototype.selectLanguage = function ()
 	kn.showScreenPopup(PopupsLanguagesViewModel);
 };
 
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11764,7 +11764,7 @@ AbstractSystemDropDownViewModel.prototype.onBuild = function ()
 		}
 	});
 };
-
+
 /**
  * @constructor
  * @extends AbstractSystemDropDownViewModel
@@ -11776,7 +11776,7 @@ function MailBoxSystemDropDownViewModel()
 }
 
 Utils.extendAsViewModel('MailBoxSystemDropDownViewModel', MailBoxSystemDropDownViewModel, AbstractSystemDropDownViewModel);
-
+
 /**
  * @constructor
  * @extends AbstractSystemDropDownViewModel
@@ -11788,7 +11788,7 @@ function SettingsSystemDropDownViewModel()
 }
 
 Utils.extendAsViewModel('SettingsSystemDropDownViewModel', SettingsSystemDropDownViewModel, AbstractSystemDropDownViewModel);
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -11981,7 +11981,7 @@ MailBoxFolderListViewModel.prototype.contactsClick = function ()
 		kn.showScreenPopup(PopupsContactsViewModel);
 	}
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -12875,7 +12875,7 @@ MailBoxMessageListViewModel.prototype.initUploaderForAppend = function ()
 	;
 
 	return !!oJua;
-};
+};
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -13539,7 +13539,7 @@ MailBoxMessageViewViewModel.prototype.readReceipt = function (oMessage)
 		RL.reloadFlagsCurrentMessageListAndMessageFromCache();
 	}
 };
-
+
 /**
  * @param {?} oScreen
  * 
@@ -13566,7 +13566,7 @@ SettingsMenuViewModel.prototype.backToMailBoxClick = function ()
 {
 	kn.setHash(RL.link().inbox());
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractViewModel
@@ -13599,7 +13599,7 @@ SettingsPaneViewModel.prototype.backToMailBoxClick = function ()
 {
 	kn.setHash(RL.link().inbox());
 };
-
+
 /**
  * @constructor
  */
@@ -13759,7 +13759,7 @@ SettingsGeneral.prototype.selectLanguage = function ()
 {
 	kn.showScreenPopup(PopupsLanguagesViewModel);
 };
-
+
 /**
  * @constructor
  */
@@ -13809,7 +13809,7 @@ SettingsContacts.prototype.onBuild = function ()
 //{
 //
 //};
-
+
 /**
  * @constructor
  */
@@ -13890,7 +13890,7 @@ SettingsAccounts.prototype.deleteAccount = function (oAccountToRemove)
 		}
 	}
 };
-
+
 /**
  * @constructor
  */
@@ -13978,7 +13978,7 @@ SettingsIdentity.prototype.onBuild = function ()
 		
 	}, 50);
 };
-
+
 /**
  * @constructor
  */
@@ -14136,7 +14136,7 @@ SettingsIdentities.prototype.onBuild = function (oDom)
 		});
 
 	}, 50);
-};
+};
 /**
  * @constructor
  */
@@ -14286,7 +14286,7 @@ SettingsSecurity.prototype.onBuild = function ()
 	this.processing(true);
 	RL.remote().getTwoFactor(this.onResult);
 };
-
+
 /**
  * @constructor
  */
@@ -14353,7 +14353,7 @@ function SettingsSocialScreen()
 }
 
 Utils.addSettingsViewModel(SettingsSocialScreen, 'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
-
+
 /**
  * @constructor
  */
@@ -14458,7 +14458,7 @@ SettingsChangePasswordScreen.prototype.onChangePasswordResponse = function (sRes
 			Utils.getNotification(Enums.Notification.CouldNotSaveNewPassword));
 	}
 };
-
+
 /**
  * @constructor
  */
@@ -14653,7 +14653,7 @@ SettingsFolders.prototype.unSubscribeFolder = function (oFolder)
 	
 	oFolder.subScribed(false);
 };
-
+
 /**
  * @constructor
  */
@@ -14878,7 +14878,7 @@ SettingsThemes.prototype.initCustomThemeUploader = function ()
 	return false;
 };
 
-
+
 /**
  * @constructor
  */
@@ -14946,7 +14946,7 @@ SettingsOpenPGP.prototype.deleteOpenPgpKey = function (oOpenPgpKeyToRemove)
 			RL.reloadOpenPgpKeys();
 		}
 	}
-};
+};
 /**
  * @constructor
  */
@@ -15076,7 +15076,7 @@ AbstractData.prototype.populateDataOnStart = function()
 
 	this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
 };
-
+
 /**
  * @constructor
  * @extends AbstractData
@@ -16331,7 +16331,7 @@ WebMailDataStorage.prototype.findSelfPrivateKey = function (sPassword)
 {
 	return this.findPrivateKeyByEmail(this.accountEmail(), sPassword);
 };
-
+
 /**
  * @constructor
  */
@@ -16605,7 +16605,7 @@ AbstractAjaxRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
 		'Version': sVersion
 	});
 };
-
+
 /**
  * @constructor
  * @extends AbstractAjaxRemoteStorage
@@ -17395,7 +17395,7 @@ WebMailAjaxRemoteStorage.prototype.socialUsers = function (fCallback)
 	this.defaultRequest(fCallback, 'SocialUsers');
 };
 
-
+
 /**
  * @constructor
  */
@@ -17472,7 +17472,7 @@ AbstractCacheStorage.prototype.setEmailsPicsHashesData = function (oData)
 {
 	this.oEmailsPicsHashes = oData;
 };
-
+
 /**
  * @constructor
  * @extends AbstractCacheStorage
@@ -17790,7 +17790,7 @@ WebMailCacheStorage.prototype.storeMessageFlagsToCacheByFolderAndUid = function
 		this.setMessageFlagsToCache(sFolder, sUid, aFlags);
 	}
 };
-
+
 /**
  * @param {Array} aViewModels
  * @constructor
@@ -17968,7 +17968,7 @@ AbstractSettings.prototype.routes = function ()
 		['', oRules]
 	];
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractScreen
@@ -17983,7 +17983,7 @@ _.extend(LoginScreen.prototype, KnoinAbstractScreen.prototype);
 LoginScreen.prototype.onShow = function ()
 {
 	RL.setTitle('');
-};
+};
 /**
  * @constructor
  * @extends KnoinAbstractScreen
@@ -18154,7 +18154,7 @@ MailBoxScreen.prototype.routes = function ()
 		[/^([^\/]*)$/,  {'normalize_': fNormS}]
 	];
 };
-
+
 /**
  * @constructor
  * @extends AbstractSettings
@@ -18183,7 +18183,7 @@ SettingsScreen.prototype.onShow = function ()
 	RL.setTitle(this.sSettingsTitle);
 	RL.data().keyScope(Enums.KeyState.Settings);
 };
-
+
 /**
  * @constructor
  * @extends KnoinAbstractBoot
@@ -18519,7 +18519,7 @@ AbstractApp.prototype.bootstart = function ()
 
 	ssm.ready();
 };
-
+
 /**
  * @constructor
  * @extends AbstractApp
@@ -19801,7 +19801,7 @@ RainLoopApp.prototype.bootstart = function ()
  * @type {RainLoopApp}
  */
 RL = new RainLoopApp();
-
+
 $html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile');
 
 $window.keydown(Utils.killCtrlAandS).keyup(Utils.killCtrlAandS);
@@ -19852,9 +19852,9 @@ window['__RLBOOT'] = function (fCall) {
 		window['__RLBOOT'] = null;
 	});
 };
-
+
 if (window.SimplePace) {
 	window.SimplePace.add(10);
-}
-
+}
+
 }(window, jQuery, ko, crossroads, hasher, moment, Jua, _, ifvisible, key));

vendors/fontastic/fonts/rainloop.svg

@@ -112,4 +112,6 @@
 <glyph unicode="&#57446;" d="M311 155l0-54c0-8-3-15-8-20-5-5-12-8-20-8l-54 0c-8 0-15 3-20 8-5 5-8 12-8 20l0 54c0 8 3 15 8 20 5 5 12 8 20 8l54 0c8 0 15-3 20-8 5-5 8-12 8-20z m0 147l0-55c0-8-3-14-8-20-5-5-12-8-20-8l-54 0c-8 0-15 3-20 8-5 6-8 12-8 20l0 55c0 7 3 14 8 19 5 5 12 8 20 8l54 0c8 0 15-3 20-8 5-5 8-12 8-19z m0 146l0-55c0-7-3-14-8-19-5-6-12-8-20-8l-54 0c-8 0-15 2-20 8-5 5-8 12-8 19l0 55c0 8 3 14 8 19 5 6 12 8 20 8l54 0c8 0 15-2 20-8 5-5 8-11 8-19z"/>
 <glyph unicode="&#57447;" d="M341 265c0 2 0 4-2 6l-94 94c-2 1-4 2-6 2-3 0-5-1-6-2l-94-94c-2-2-2-4-2-6 0-3 0-5 2-7 2-1 4-2 6-2l60 0 0-94c0-2 1-4 2-6 2-2 4-2 6-2l52 0c2 0 4 0 6 2 1 2 2 4 2 6l0 94 60 0c2 0 4 1 6 3 1 1 2 3 2 6z m171-77c0-29-10-53-30-73-20-20-44-30-72-30l-291 0c-32 0-61 12-84 35-23 24-35 52-35 85 0 23 6 44 19 64 12 19 29 34 50 44-1 5-1 9-1 11 0 38 14 70 40 97 27 26 59 40 97 40 28 0 53-8 76-23 23-16 40-36 50-62 13 11 28 17 44 17 19 0 35-7 49-20 13-14 20-30 20-49 0-13-4-26-11-37 23-5 42-17 57-36 15-18 22-39 22-63z"/>
 <glyph unicode="&#57448;" d="M341 247c0 3 0 5-2 7-2 1-4 2-6 2l-60 0 0 94c0 2-1 4-2 6-2 2-4 2-6 2l-52 0c-2 0-4 0-6-2-1-2-2-4-2-6l0-94-60 0c-2 0-4-1-6-3-2-1-2-3-2-6 0-2 0-4 2-6l94-94c1-1 3-2 6-2 2 0 4 1 6 2l94 94c1 2 2 4 2 6z m171-59c0-29-10-53-30-73-20-20-44-30-72-30l-291 0c-32 0-61 12-84 35-23 24-35 52-35 85 0 23 6 44 19 64 12 19 29 34 50 44-1 5-1 9-1 11 0 38 14 70 40 97 27 26 59 40 97 40 28 0 53-8 76-23 23-16 40-36 50-62 13 11 28 17 44 17 19 0 35-7 49-20 13-14 20-30 20-49 0-13-4-26-11-37 23-5 42-17 57-36 15-18 22-39 22-63z"/>
+<glyph unicode="&#57449;" d="M375 256c0-5-2-9-6-13l-155-155c-4-4-8-6-13-6-5 0-9 2-13 6-3 3-5 8-5 13l0 82-128 0c-5 0-9 2-13 5-4 4-5 8-5 13l0 110c0 5 1 9 5 13 4 3 8 5 13 5l128 0 0 82c0 5 2 10 5 13 4 4 8 6 13 6 5 0 9-2 13-6l155-155c4-4 6-8 6-13z m100 101l0-202c0-22-8-42-24-58-16-16-35-24-58-24l-91 0c-3 0-5 1-7 3-2 2-2 4-2 6 0 1-1 3-1 6 0 3 0 6 0 8 0 2 1 4 1 6 0 3 1 5 3 6 1 1 3 2 6 2l91 0c13 0 23 4 32 13 9 9 14 20 14 32l0 202c0 12-5 23-14 32-9 9-19 13-32 13l-89 0c0 0-1 0-3 1-2 0-4 0-4 0 0 1 0 1-2 2-1 1-2 2-2 3 0 1 0 2 0 3 0 1-1 3-1 6 0 3 0 6 0 8 0 2 1 4 1 6 0 3 1 5 3 6 1 1 3 2 6 2l91 0c23 0 42-8 58-24 16-16 24-36 24-58z"/>
+<glyph unicode="&#57450;" d="M201 101c0-1 0-3 0-6 1-3 1-6 1-8-1-2-1-4-1-6-1-3-2-5-3-6-2-1-4-2-6-2l-91 0c-23 0-42 8-59 24-16 16-24 36-24 58l0 202c0 22 8 42 24 58 17 16 36 24 59 24l91 0c2 0 5-1 6-3 2-2 3-4 3-6 0-1 0-3 0-6 1-3 1-6 1-8-1-2-1-4-1-6-1-3-2-5-3-6-2-1-4-2-6-2l-91 0c-13 0-24-4-33-13-9-9-13-20-13-32l0-202c0-12 4-23 13-32 9-9 20-13 33-13l89 0c0 0 1 0 3-1 2 0 3 0 3 0 0-1 1-1 3-2 1-1 2-2 2-3-1-1 0-2 0-3z m265 155c0-5-2-9-5-13l-156-155c-3-4-7-6-12-6-5 0-10 2-13 6-4 3-6 8-6 13l0 82-128 0c-5 0-9 2-13 5-3 4-5 8-5 13l0 110c0 5 2 9 5 13 4 3 8 5 13 5l128 0 0 82c0 5 2 10 6 13 3 4 8 6 13 6 5 0 9-2 12-6l156-155c3-4 5-8 5-13z"/>
 </font></defs></svg>

vendors/fontastic/icons-reference.html

@@ -465,6 +465,14 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
           <div data-icon="&#xe068;" class="icon"></div>
           <input type="text" readonly="readonly" value="&amp;#xe068;">
         </li>
+        <li>
+          <div data-icon="&#xe069;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe069;">
+        </li>
+        <li>
+          <div data-icon="&#xe06a;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe06a;">
+        </li>
       </ul>
       <h2>CSS mapping</h2>
       <ul class="glyphs css-mapping">
@@ -888,6 +896,14 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
           <div class="icon icon-cloud-down"></div>
           <input type="text" readonly="readonly" value="cloud-down">
         </li>
+        <li>
+          <div class="icon icon-import"></div>
+          <input type="text" readonly="readonly" value="import">
+        </li>
+        <li>
+          <div class="icon icon-export"></div>
+          <input type="text" readonly="readonly" value="export">
+        </li>
       </ul>
     </div><script type="text/javascript">
 (function() {

vendors/fontastic/styles.css

@@ -353,3 +353,9 @@
 .icon-cloud-down:before {
   content: "\e068";
 }
+.icon-import:before {
+  content: "\e069";
+}
+.icon-export:before {
+  content: "\e06a";
+}