profile pages bugs - css bugs

templates/client/includes/company/company_edit.html

@@ -204,7 +204,7 @@
 					<div class="add_link_text_text">адрес компании <b>+15</b></div>
 				</div>
 				<div class="ic-tel p-editable editable-wrap hidden required">
-					<span id="static-address-value" class="static-value">{{ address_form.address_inf.value }}</span>
+					<span id="static-address-value" class="static-value address">{{ address_form.address_inf.value }}&nbsp;</span>
 					<div class="edit-wrap">
 						<a class="e-btn" href="#">{% trans 'редактировать' %}</a>
 						<div class="e-form">
@@ -425,7 +425,7 @@
 							<div class="add_link_text_text">{% trans 'сайт' %} <b>+5</b></div>
 						</div>
 						<div class="ic-site p-editable editable-wrap hidden">
-							<a id="static-web-page-value" class="icon-ext-link static-value" href="{{ web_page_form.web_page.value }}" target="_blank">
+							<a id="static-web-page-value" class="icon-ext-link static-value website" href="{{ web_page_form.web_page.value }}" target="_blank">
 								{{ web_page_form.web_page.value }}
 							</a>
 
@@ -539,7 +539,7 @@
 					<div class="p-editable ic-tel editable-wrap hidden">
 
 
-						<span id="static-description-value" class="static-value">{{ description_form.description.value }}</span>
+						<span id="static-description-value" class="static-value">{{ description_form.description.value }}&nbsp;</span>
 
 						<div class="edit-wrap">
 

templates/client/static_client/css/main.css

@@ -6203,12 +6203,6 @@ dl.add-info dd ul li {
 	margin-bottom: 3px;
 }
 
-.i-additional p {
-	margin: 0 0 30px 0;
-}
-
-.i-statistics {}
-
 .i-statistics  > header {
 	font-family: 'dindisplay_pro', sans-serif;
 	padding-left: 120px;
@@ -12911,10 +12905,27 @@ hr + .rq-note {
 			background: #ff6600 url(../img/sprites.png) -136px -145px no-repeat;
 
 		}
+	.edit-profile .editable-wrap .static-value.website{
+		height: 27px !important;
+	}
+	.edit-profile .editable-wrap .static-value.address{
+
+		line-height: 28px;
+		height: 27px;
+		display: block;
+	}
+
 	.edit-profile .i-contacts .editable-wrap .static-value{
 		display: block;
 		height: 23px;
 	}
+	.edit-profile .editable-wrap > p {
+		display: block;
+		margin: 0;
+	}
+	.edit-profile .i-additional .editable-wrap > p{
+		height: 23px;
+	}
 	.edit-profile .editable-wrap:before{
 		display: none;
 	}

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

@@ -617,7 +617,6 @@ if (EXPO.company){
 					 * edit button
 					 */
 					$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
-						//$editables.removeClass(self.opt.formCurrentClass);
 						//close other active editable forms
 						var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
 							formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
@@ -631,8 +630,8 @@ if (EXPO.company){
 							if($(this).hasClass(self.opt.formCurrentClass)){
 								if(self.forms[formId].refrashable){
 
-									$description.removeClass('hidden');
-									$editable.removeClass(self.opt.formCurrentClass).addClass('hidden');
+									self.forms[formId].refreshState();
+									$editable.removeClass(EXPO.company.opt.formCurrentClass);
 								}else{
 									$editable.removeClass(self.opt.formCurrentClass);
 								}
@@ -647,12 +646,6 @@ if (EXPO.company){
 
 						}
 						$editable.addClass(self.opt.formCurrentClass);
-						//$editable.each(function() {
-						//	$(this).removeClass(self.opt.formCurrentClass);
-						//});
-						//$editable.toggleClass(self.opt.formCurrentClass);
-
-						// close editable form when user clicks outside
 						$(document).on('click.form', function(event) {
 							var targetObj = $(event.target);
 							if (targetObj.parents().filter('.e-form').length < 1) {

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

@@ -125,6 +125,7 @@ if (EXPO.profile){
 			refreshState: function () {
 				if($.trim( this.$staticValue.text()) == '' && this.$wrapper.length && this.refrashable){
 					this.$editable.addClass('hidden');
+					this.$editable.removeClass(EXPO.company.opt.formCurrentClass);
 					this.$description.removeClass('hidden');
 
 				}else if(this.$wrapper.length  && this.refrashable){
@@ -604,18 +605,35 @@ if (EXPO.profile){
 					 * edit button
 					 */
 					$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
-						$editables.removeClass(self.opt.formCurrentClass);
-						if(self.forms[formName].refrashable){
+						//close other active editable forms
+						var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
+							formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
+							$description = $wrapper.find('.'+self.opt.descriptionClass),
+							$editable = $wrapper.find('.'+self.opt.editableClass);
+						$editables.each(function () {
+							var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
+								formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
+								$description = $wrapper.find('.'+self.opt.descriptionClass),
+								$editable = $wrapper.find('.'+self.opt.editableClass);
+							if($(this).hasClass(self.opt.formCurrentClass)){
+								if(self.forms[formId].refrashable){
+
+									self.forms[formId].refreshState();
+									$editable.removeClass(EXPO.profile.opt.formCurrentClass);
+								}else{
+									$editable.removeClass(self.opt.formCurrentClass);
+								}
+
+							}
+						});
+
+						if(self.forms[formId].refrashable){
 							$editable.removeClass('hidden');
 							$description.addClass('hidden');
 						}else{
 
 						}
-						$editable.each(function() {
-							$(this).removeClass(self.opt.formCurrentClass);
-						});
-						$editable.toggleClass(self.opt.formCurrentClass);
-
+						$editable.addClass(self.opt.formCurrentClass);
 						$(document).on('click.form', function(event) {
 							var targetObj = $(event.target);
 							if (targetObj.parents().filter('.e-form').length < 1) {