Merged

templates/client/includes/company/company_edit.html

@@ -599,7 +599,7 @@
 
 						<dd class="static-value">
 							<span class="full-complete {% if description_form.description.value %}{% else %}hidden{% endif %}">
-								{% if description_form.description.value %}{{ description_form.description.value|linebreaks }}{% endif %}
+								{% if description_form.description.value %}{{ description_form.description.value }}{% endif %}
 							</span>
 							<span class="not-complete {% if description_form.description.value %}hidden{% else %}{% endif %}">
 								{% trans 'Не заполнено' %}<div class="add_link_text_text add_link_text"><b>+15</b></div>

templates/client/includes/company/company_object.html

@@ -112,7 +112,7 @@
                         {% endif %}
                         {% if company.description %}
                         <dt>{% trans 'О компании:' %}</dt>
-                        <dd>{{ company.description|safe|linebreaks }}</dd>
+                        <dd>{{ company.description|safe }}</dd>
                         {% endif %}
 
 					</dl>

templates/client/static_client/css/main.css

@@ -12165,6 +12165,9 @@ hr + .rq-note {
 	.right{
 		float: right;
 	}
+	.min-height{
+		min-height: 27px;
+	}
 
 
 
@@ -13172,7 +13175,22 @@ hr + .rq-note {
 	.company-preview .i-info .i-contacts .ic-buttons .soc-media-buttons{
 		margin-top: 12px;
 	}
-
+	.profile-preview-btn{
+		margin-top: 1em;
+		margin-bottom: 2em;
+	}
+	.company-preview .specialization, .edit-profile .specialization .static-value{
+		font-size: 13px;
+		font-weight: normal;
+		color: #7D7D7D;
+	}
+	.edit-profile .specialization{
+		padding-right: 200px;
+		margin-bottom: 1em;
+	}
+	.edit-profile .specialization .p-editable{
+		min-height: 27px;
+	}
 	/************************\
 	# about page /about/
 	\***********************/

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

@@ -482,8 +482,10 @@ if (EXPO.company){
 				this.formId = this.$form.attr("id");
 				if( $.trim(this.$input.val()) == ''){
 
-					this.$form.detach().appendTo(this.$initial);
-					this.$label.detach().appendTo(this.$initial);
+					//this.$form.detach().appendTo(this.$initial);
+					//this.$label.detach().appendTo(this.$initial);
+					this.$form.detach().appendTo(this.$editable);
+					this.$label.detach().appendTo(this.$editable);
 
 					this.$initial.removeClass("hidden");
 					this.$description.addClass("hidden");
@@ -804,6 +806,13 @@ if (EXPO.company){
 					}
 
 				});
+				/**
+				 * preview button
+				 */
+				$('#'+self.opt.previewBtnId).attr('href',window.location.href+"?logout=1");
+				//$('#'+self.opt.previewBtnId).on("click", function () {
+				//
+				//});
 
 
 			});