profile pages bugs - editable fields

templates/client/includes/accounts/current_user.html

@@ -388,13 +388,11 @@
                             <div class="add_link_text_text">{% trans 'сайт' %} <b>+5</b></div>
                         </div>
                         <div class="ic-site p-editable editable-wrap hidden">
-                            {% if web_page_form.web_page.value %}
                             <a class="icon-ext-link static-value" id="static-web-page-value" href="{% if web_page_form.web_page.value %}{{ web_page_form.web_page.value }}{% else %}#{% endif %}" target="_blank">
                                 {% if web_page_form.web_page.value %}
                                 {{ web_page_form.web_page.value }}
                                 {% endif %}
                             </a>
-                            {% endif %}
 
                             <div class="edit-wrap">
                                 <a class="e-btn" href="#">{% trans 'редактировать' %}</a>

templates/client/static_client/css/main.css

@@ -12773,6 +12773,9 @@ hr + .rq-note {
 	}
 		.edit-profile .i-pict.p-editable img{
 			z-index: 0;
+		}
+		.my-companies-block{
+
 		}
 		.my-companies-block:after{
 			content: '';
@@ -12784,20 +12787,21 @@ hr + .rq-note {
 			font-family: 'dindisplay_pro', sans-serif;
 			font-size: 20px;
 			line-height: 23px;
-			margin-bottom: 30px;
+			margin-bottom: 10px;
 		}
 			.my-companies-block	.company{
 				display: block;
 				-moz-box-sizing: border-box;
 				box-sizing: border-box;
-				width: 25%;
+				width: 23%;
 				float: left;
+				margin-right: 2%;
+				margin-top: 20px;
 
 			}
 			/*добавить меньшую длину для разрешения меньше 1200*/
 				.my-companies-block	.company a{
 					display: block;
-					width: 180px;
 					margin-left: auto;
 					margin-right: auto;
 				}

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

@@ -105,6 +105,7 @@ if (EXPO.company){
 			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){
@@ -616,19 +617,42 @@ if (EXPO.company){
 					 * edit button
 					 */
 					$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
-						$editables.removeClass(self.opt.formCurrentClass);
+						//$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'),
+							$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){
+
+									$description.removeClass('hidden');
+									$editable.removeClass(self.opt.formCurrentClass).addClass('hidden');
+								}else{
+									$editable.removeClass(self.opt.formCurrentClass);
+								}
 
-						if(self.forms[formName].refrashable){
+							}
+						});
+
+						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);
+						//$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

@@ -418,7 +418,6 @@ if (EXPO.profile){
 	// methods
 		//инициализация общих свойств
 		that.init = function(options) {
-			// todo: убрать одновременное открытие форм
 			$.extend(this.lang, options.lang);
 			//options.lang = null;
 			$.extend(this.opt, options);