Added contact toolbar

dev/Styles/Contacts.less

@@ -1,5 +1,5 @@
 
-@contacts-popup-left-width: 250px;
+@contacts-popup-left-width: 220px;
 
 .b-contacts-content {
 
@@ -61,13 +61,13 @@
 		.b-list-toolbar {
 			padding: 0;
 			height: 45px;
-			text-align: center;
+			text-align: right;
 			width: @contacts-popup-left-width;
 			.box-shadow(inset 0 -1px 0 #ccc);
 
 			.e-search {
 				margin-top: 7px;
-				width: @contacts-popup-left-width - 25;
+				width: @contacts-popup-left-width - 20;
 			}
 		}
 
@@ -238,10 +238,33 @@
 				}
 			}
 		}
+		
+		.b-view-content-toolbar {
+			background-color: #f5f5f5;
+			padding: 7px;
+			position: absolute;
+			top: 0;
+			right: 0;
+			left: @contacts-popup-left-width;
+			height: 31px;
+			text-align: center;
+			.box-shadow(inset 0 -1px 0 #ccc);
+
+			.button-save-contact {
+				&.no-disabled.dirty {
+					color: #51a351;
+					font-weight: bold;
+				}
+			}
+
+			&.read-only .button-save-contact {
+				display: none;
+			}
+		}
 
 		.b-view-content {
 			position: absolute;
-			top: 0;
+			top: 45px;
 			bottom: 60px;
 			left: @contacts-popup-left-width;
 			right: 0;
@@ -251,6 +274,7 @@
 			background-color: #fff;
 			border-left: 1px solid #ddd;
 
+
 			.content {
 				-webkit-overflow-scrolling: touch;
 			}
@@ -367,27 +391,10 @@
 			}
 
 			.e-share-sign {
-				position: absolute;
-				top: 60px;
-				right: 20px;
-				cursor: pointer;
-			}
-
-			.button-save-contact {
 				position: absolute;
 				top: 20px;
 				right: 20px;
-
+				cursor: pointer;
-				&.no-disabled.dirty {
-					color: #51a351;
-					font-weight: bold;
-				}
-			}
-
-			.button-add-prop {
-				position: absolute;
-				top: 60px;
-				right: 20px;
 			}
 
 			&.read-only {
@@ -398,10 +405,6 @@
 				.e-share-sign {
 					display: none;
 				}
-				
-				.button-save-contact {
-					display: none;
-				}
 			}
 		}
 	}

dev/Styles/Layout.less

@@ -143,19 +143,10 @@ html.ssm-state-tablet, html.ssm-state-mobile {
 	}
 
 	.b-contacts-content.modal {
-		width: 600px;
+		width: 700px;
 	}
 
 	.b-contacts-content.modal {
-		.b-list-toolbar, .b-list-content, .b-list-footer-toolbar {
-			width: 150px;
-		}
-		.b-list-toolbar .e-search {
-			width: 125px;
-		}
-		.b-view-content {
-			left: 150px;
-		}
 		.contactValueInput {
 			width: 200px;
 		}
@@ -173,15 +164,6 @@ html.ssm-state-tablet {
 	}
 
 	.b-contacts-content.modal {
-		.b-list-toolbar, .b-list-content, .b-list-footer-toolbar {
-			width: 200px;
-		}
-		.b-list-toolbar .e-search {
-			width: 175px;
-		}
-		.b-view-content {
-			left: 200px;
-		}
 		.contactValueInput {
 			width: 250px;
 		}

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

@@ -116,6 +116,52 @@
 					<!-- ko template: { name: 'Pagenator', data: contactsPagenator } --><!-- /ko -->
 				</div>
 			</div>
+			<div class="b-view-content-toolbar btn-toolbar" data-bind="css: {'read-only': viewReadOnly}">
+				<div class="btn-group pull-right dropdown colored-toggle button-add-prop" data-bind="visible: !emptySelection(), 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" style="text-align: left" 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 class="btn-group pull-right">&nbsp;</div>
+				<div class="btn-group pull-right">
+					<button class="btn button-save-contact" data-bind="visible: !emptySelection(), command: saveCommand, css: {'dirty': watchDirty}">
+						<i data-bind="css: {'icon-ok': !viewSaving(), 'icon-spinner animated': viewSaving()}"></i>
+						&nbsp;&nbsp;
+						<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>
+			</div>
 			<div class="b-view-content" data-bind="nano: true, css: {'read-only': viewReadOnly}">
 				<div class="content g-scrollbox">
 					<div class="content-wrapper">
@@ -213,48 +259,7 @@
 								<i class="icon-lock iconsize24" data-tooltip-placement="left" data-bind="tooltip: 'CONTACTS/LABEL_READ_ONLY'"></i>
 							</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>
-								&nbsp;&nbsp;
-								<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/static/js/boot.js

@@ -1,6 +1,6 @@
 /*! See http://www.JSON.org/js.html */
 var JSON;JSON||(JSON={}),function(){function str(a,b){var c,d,e,f,g=gap,h,i=b[a];i&&typeof i=="object"&&typeof i.toJSON=="function"&&(i=i.toJSON(a)),typeof rep=="function"&&(i=rep.call(b,a,i));switch(typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i)return"null";gap+=indent,h=[];if(Object.prototype.toString.apply(i)==="[object Array]"){f=i.length;for(c=0;c<f;c+=1)h[c]=str(c,i)||"null";e=h.length===0?"[]":gap?"[\n"+gap+h.join(",\n"+gap)+"\n"+g+"]":"["+h.join(",")+"]",gap=g;return e}if(rep&&typeof rep=="object"){f=rep.length;for(c=0;c<f;c+=1)d=rep[c],typeof d=="string"&&(e=str(d,i),e&&h.push(quote(d)+(gap?": ":":")+e))}else for(d in i)Object.hasOwnProperty.call(i,d)&&(e=str(d,i),e&&h.push(quote(d)+(gap?": ":":")+e));e=h.length===0?"{}":gap?"{\n"+gap+h.join(",\n"+gap)+"\n"+g+"}":"{"+h.join(",")+"}",gap=g;return e}}function quote(a){escapable.lastIndex=0;return escapable.test(a)?'"'+a.replace(escapable,function(a){var b=meta[a];return typeof b=="string"?b:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function f(a){return a<10?"0"+a:a}"use strict",typeof Date.prototype.toJSON!="function"&&(Date.prototype.toJSON=function(a){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(a){return this.valueOf()});var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;typeof JSON.stringify!="function"&&(JSON.stringify=function(a,b,c){var d;gap="",indent="";if(typeof c=="number")for(d=0;d<c;d+=1)indent+=" ";else typeof c=="string"&&(indent=c);rep=b;if(b&&typeof b!="function"&&(typeof b!="object"||typeof b.length!="number"))throw new Error("JSON.stringify");return str("",{"":a})}),typeof JSON.parse!="function"&&(JSON.parse=function(text,reviver){function walk(a,b){var c,d,e=a[b];if(e&&typeof e=="object")for(c in e)Object.hasOwnProperty.call(e,c)&&(d=walk(e,c),d!==undefined?e[c]=d:delete e[c]);return reviver.call(a,b,e)}var j;text=String(text),cx.lastIndex=0,cx.test(text)&&(text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver=="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")})}();
-/*! RainLoop Simple Pace v1.0 (c) 2013 RainLoop Team; Licensed under MIT */
+/*! RainLoop Simple Pace v1.0 (c) 2013 RainLoop Team; Licensed under MIT */
 !function(a){function b(){var b=this;b.el=null,b.done=!1,b.progress=0,b.addInterval=0,b.addSpeed=3,b.stopProgress=100,b.interval=a.setInterval(function(){var c=b.build();c&&a.clearInterval(b.interval)},100)}if(b.prototype.startAddInterval=function(){var b=this;b.stopAddInterval(),b.addInterval=a.setInterval(function(){0<b.progress&&b.stopProgress>b.progress&&b.add(b.addSpeed)},500)},b.prototype.stopAddInterval=function(){a.clearInterval(this.addInterval),this.addInterval=0},b.prototype.build=function(){if(null===this.el){var a=document.querySelector("body");a&&(this.el=document.createElement("div"),this.el.className="simple-pace simple-pace-active",this.el.innerHTML='<div class="simple-pace-progress"><div class="simple-pace-progress-inner"></div></div><div class="simple-pace-activity"></div>',a.firstChild?a.insertBefore(this.el,a.firstChild):a.appendChild(this.el))}return this.el},b.prototype.reset=function(){return this.progress=0,this.render()},b.prototype.update=function(b){var c=a.parseInt(b,10);return c>this.progress&&(this.progress=c,this.progress=100<this.progress?100:this.progress,this.progress=0>this.progress?0:this.progress),this.render()},b.prototype.add=function(b){return this.progress+=a.parseInt(b,10),this.progress=100<this.progress?100:this.progress,this.progress=0>this.progress?0:this.progress,this.render()},b.prototype.setSpeed=function(a,b){this.addSpeed=a,this.stopProgress=b||100},b.prototype.render=function(){var b=this.build();b&&b.children&&b.children[0]&&b.children[0].setAttribute("style","width:"+this.progress+"%"),100!==this.progress||this.done?100>this.progress&&this.done?(this.done=!1,this.startAddInterval(),b.className=b.className.replace("simple-pace-inactive",""),b.className+=" simple-pace-inactive"):100>this.progress&&!this.done&&0===this.addInterval&&this.startAddInterval():(this.done=!0,this.stopAddInterval(),a.setTimeout(function(){b.className=b.className.replace("simple-pace-active",""),b.className+=" simple-pace-inactive"},500))},!a.SimplePace){var c=new b;a.SimplePace={sleep:function(){c.setSpeed(2,95)},set:function(a){c.update(a)},add:function(a){c.add(a)}}}}(window);
-/*! RainLoop Top Driver v1.0 (c) 2013 RainLoop Team; Licensed under MIT */
+/*! RainLoop Top Driver v1.0 (c) 2013 RainLoop Team; Licensed under MIT */
 !function(a,b){function c(){}c.prototype.s=a.sessionStorage,c.prototype.t=a.top||a,c.prototype.getHash=function(){var a=null;if(this.s)a=this.s.getItem("__rlA")||null;else if(this.t){var c=this.t.name&&b&&"{"===this.t.name.toString().substr(0,1)?b.parse(this.t.name.toString()):null;a=c?c.__rlA||null:null}return a},c.prototype.setHash=function(){var c=a.rainloopAppData,d=null;this.s?this.s.setItem("__rlA",c&&c.AuthAccountHash?c.AuthAccountHash:""):this.t&&b&&(d={},d.__rlA=c&&c.AuthAccountHash?c.AuthAccountHash:"",this.t.name=b.stringify(d))},c.prototype.clearHash=function(){this.s?this.s.setItem("__rlA",""):this.t&&(this.t.name="")},a._rlhh=new c,a.__rlah=function(){return a._rlhh?a._rlhh.getHash():null},a.__rlah_set=function(){a._rlhh&&a._rlhh.setHash()},a.__rlah_clear=function(){a._rlhh&&a._rlhh.clearHash()}}(window,window.JSON);