expo-16 layout bugs

templates/client/blank.html

@@ -47,7 +47,7 @@ This template include basic anf main styles and js files,
                 blobClass:'error-blob',
                 containerClass:'validate-field'
             },
-            socialFormId:'social_form',
+            httpFormIds:['social_form','web_page_form'],
             seoLinksClass : 'link-encode',
             dataKey:'data-type',
             socialInputMask:['http://','https://']

templates/client/includes/company/company_edit.html

@@ -294,7 +294,7 @@
 							</div>
 							<div class="edit-wrap">
 								<div class="e-form">
-
+									<div class="edit-label"><span>&nbsp;</span></div>
 									<form class="clearfix update-profile-form" id="social_form" action="/company/update/social/{{ company.url }}/"  method="post">{% csrf_token %}
 
 										<div class="ef-body">
@@ -345,7 +345,6 @@
                 </div>
 
                 <div class="ic-links ic-links_indent dd_width_5">
-<!--!-->
 					<div class="form-item-wrap">
 						<div class="i-descr add_link_text add_link_text_medium">
 							<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
@@ -377,13 +376,12 @@
 						</div>
 					</div>
 
-<!--!-->
 					<div class="form-item-wrap">
 						<div class="i-descr add_link_text add_link_text_medium">
 							<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
 							<div class="add_link_text_text">{% trans 'email' %} <b>+15</b></div>
 						</div>
-						<div class="ic-tel p-editable editable-wrap hidden required">
+						<div class=" p-editable editable-wrap hidden required">
 
 							<div class="ic-mail add_indent ">
 								<a id="static-email-value" class="icon-mail static-value" href="mailto:{{ email_form.email.value }}">{{ email_form.email.value }}</a>
@@ -413,7 +411,6 @@
 					</div>
 
 
-<!--!-->
 					<div class="form-item-wrap">
 						<div class="i-descr add_link_text add_link_text_medium">
 							<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
@@ -456,7 +453,6 @@
 
             <div class="i-additional">
                 <div class="ia-title">{% trans 'Дополнительная информация' %}</div>
-<!--!-->
 				<div class="form-item-wrap">
 					<div class="i-descr add_link_text ">
 						<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
@@ -491,7 +487,6 @@
 						</div>
 					</div>
 				</div>
-<!--!-->
 				<div class="form-item-wrap">
 					<div class="i-descr add_link_text ">
 						<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
@@ -527,7 +522,6 @@
 						</div>
 					</div>
 				</div>
-<!--!-->
                 <div class="form-item-wrap">
 					<div class="i-descr add_link_text ">
 						<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>

templates/client/static_client/css/main.css

@@ -5979,7 +5979,7 @@ form.s-message {
 	font-size: 12px;
 	line-height: 16px;
 	color: #7e7e7e;
-	margin-bottom: 15px;
+	height: 27px;
 	font-family: Arial, sans-serif;
 }
 
@@ -6133,10 +6133,9 @@ form.s-message {
 }
 
 .ic-tel {
-	padding-top: 2px;
 	font-size: 20px;
 	line-height: 21px;
-	margin-bottom: 7px;
+	margin-bottom: 4px;
 }
 
 .i-additional {
@@ -12888,10 +12887,9 @@ hr + .rq-note {
 			background: #ff6600 url(../img/sprites.png) -136px -145px no-repeat;
 
 		}
-	.edit-profile .i-contacts .editable-wrap.pe-current .static-value{
+	.edit-profile .i-contacts .editable-wrap .static-value{
 		display: block;
 		height: 23px;
-		margin-bottom: 15px;
 	}
 	.edit-profile .editable-wrap:before{
 		display: none;

templates/client/static_client/js/_modules/block.common.js

@@ -187,12 +187,11 @@ if (EXPO.common){
 				validErrorClass = self.opt.staticValidation.errorClass,
 				validContainerClass = self.opt.staticValidation.containerClass,
 				$staticFields,
-				$socialForm,
 				blobClass =  self.opt.staticValidation.blobClass;
 
 			$(function () {
 				$staticFields = $('.'+validErrorClass);
-				$socialForm = $('#'+self.opt.socialFormId);
+
 				$('.'+addClass+', .'+remClass).on('click', function(event){
 					addText = self.opt.addCalendarText;
 					remText = self.opt.removeCalendarText;
@@ -232,33 +231,37 @@ if (EXPO.common){
 				/**
 				 *  "http://" placeholder for social profiles form on user and company "edit profiles" pages
 				 */
-				if($socialForm.length){
+				for(var i = 0; i < self.opt.httpFormIds.length; i++){
+					var $instance = $('#'+self.opt.httpFormIds[i]);
 
-					$('input:text', $socialForm).on('focus', function () {
-						var $this = $(this),
-							placeholder = self.opt.socialInputMask;
+					if($instance.length){
 
-						if($.trim($this.val()) == ''){
-							$this.val(placeholder[0]);
-						}
-					});
-					$('input:text', $socialForm).on('keypress', function () {
-						var $this = $(this),
-							placeholder = self.opt.socialInputMask;
+						$('input:text', $instance).on('focus', function () {
+							var $this = $(this),
+								placeholder = self.opt.socialInputMask;
 
-						if($.trim($this.val()) == ''){
-							$this.val(placeholder[0]);
-						}
-					});
-					$('input:text', $socialForm).on('blur', function () {
-						var $this = $(this),
-							placeholder = self.opt.socialInputMask;
-						for(var i =0; i< placeholder.length; i++){
-							if($.trim($this.val()) == placeholder[i]){
-								$this.val('');
+							if($.trim($this.val()) == ''){
+								$this.val(placeholder[0]);
 							}
-						}
-					});
+						});
+						$('input:text', $instance).on('keypress', function () {
+							var $this = $(this),
+								placeholder = self.opt.socialInputMask;
+
+							if($.trim($this.val()) == ''){
+								$this.val(placeholder[0]);
+							}
+						});
+						$('input:text', $instance).on('blur', function () {
+							var $this = $(this),
+								placeholder = self.opt.socialInputMask;
+							for(var i =0; i< placeholder.length; i++){
+								if($.trim($this.val()) == placeholder[i]){
+									$this.val('');
+								}
+							}
+						});
+					}
 				}
 				// seohide
 

templates/client/static_client/js/_modules/page.company.js

@@ -449,7 +449,7 @@ if (EXPO.company){
 
 				});
 				// предазгрузка активных тегов
-				//$('#'+self.opt.selectBox[2].id).attr('data-predifined','[{"id":"1128","text":"тег1"},{"id":"3365","text":"тег2"}]');
+				$('#'+self.opt.selectBox[2].id).attr('data-predifined','[{"id":"1128","text":"тег1"},{"id":"3365","text":"тег2"}]');
 				$('#'+self.opt.selectBox[2].id).select2({
 					placeholder: self.opt.selectBox[2].placeholder,
 					width: '368px',