vernul pravki Nazara

Conflicts:
	templates/client/includes/company/company_object.html

templates/client/includes/accounts/simple_user.html

@@ -35,7 +35,7 @@
                 </div>
 
                 <div class="i-descr">
-                    {{ member.profile.about_company|safe|linebreaks }}
+                    {{ member.profile.about_company|safe }}
                 </div>
 
                 <hr />
@@ -69,7 +69,6 @@
                         {% endif %}
                         </ul>
                     </div>
-
                     <div class="ic-links">
                     {% if member.profile.phone and member.profile.show_phone %}
                         <div class="ic-tel">

templates/client/includes/company/company_edit.html

@@ -158,8 +158,7 @@
 					<div class="add_link_text_text">{% trans 'краткое описание компании' %} <b>+20</b></div>
 				</div>
 				<div class="i-position p-editable editable-wrap {% if spec_form.specialization %}{% else %}hidden{% endif %} required">
-					<span id="static-spec-value" class="static-value  min-height">{{ spec_form.specialization.value|linebreaks }}&nbsp;</span>
-
+					<span id="static-spec-value" class="static-value  min-height">{{ spec_form.specialization.value }}&nbsp;</span>
 					<div class="edit-wrap">
 						<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
 
@@ -278,7 +277,6 @@
 					<div class="form-item-wrap">
 						<div class="p-editable editable-wrap social">
 
-
 							<div class="i-descr add_link_text add_link_text_medium soc-media-indent">
 
 								<a class="e-btn social not-complete {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %} no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
@@ -612,10 +610,8 @@
 				</dl>
 				<!-- !!! -->
             </div>
-
 			<a rel="nofollow" id="profile-preview-btn" class="button profile-preview-btn"  href="javascript:void(0);" target="_blank">Предварительный просмотр <i class="fa fa-eye"></i></a>
 
-
         </div>
     </div>
 </div>
@@ -651,6 +647,7 @@
 		avatarImageClass:'user-avatar',
 		avatarInputId:"id_avatar",
 		noImageSrc:"{% static 'client/img/no-logo.png' %}",
+		previewBtnId:"profile-preview-btn",
 
 		// text and paths for dynamically rendered selectboxes
 		selectBox:[

templates/client/includes/company/company_object.html

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