From ff57abdcaa7b3b1b3ac1551558db2da5a0dac5fc Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Thu, 19 Feb 2015 20:59:59 +0000
Subject: [PATCH] expo91-95 bugs

---
 templates/client/accounts/user.html              |  4 ++--
 .../client/includes/accounts/current_user.html   |  2 +-
 .../client/includes/accounts/simple_user.html    | 11 ++++++-----
 templates/client/static_client/css/main.css      | 16 ++++++++++++++++
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/templates/client/accounts/user.html b/templates/client/accounts/user.html
index 0e9cbe80..2dc37ce3 100644
--- a/templates/client/accounts/user.html
+++ b/templates/client/accounts/user.html
@@ -24,12 +24,12 @@
 {% block popup %}
 <div id="pw-reply" class="popup-window pw-reply">
     <header class="clearfix">
-        <div class="pw-title">{% trans 'Ответить' %}</div>
+        <div class="pw-title">{% trans 'Отправить сообщение' %}</div>
     </header>
     <div class="pw-body clearfix">
         <form class="pw-form" action="/send-to/{{ member.id }}/" method="post" id="send_message_form"> {% csrf_token %}
             <div class="pwf-line">
-                <label for="reply-msg">{% trans 'Сообщение' %}:</label>
+                <label for="reply_message">{% trans 'Текст сообщения' %}:</label>
                 <div class="pwf-field">
                     <input type="hidden" value="" id="reply_message">
                     {{ message_form.body }}
diff --git a/templates/client/includes/accounts/current_user.html b/templates/client/includes/accounts/current_user.html
index 886b7d5f..f6eab5b5 100644
--- a/templates/client/includes/accounts/current_user.html
+++ b/templates/client/includes/accounts/current_user.html
@@ -438,7 +438,7 @@
                         <div class="add_link_text_text">{% trans 'информацию о себе' %} <b>+10</b></div>
                     </div>
                     <div class="p-editable editable-wrap {% if about_form.about.value %}{% else %}hidden{% endif %}">
-                        <p id="static-about-value" class="static-value">{{ about_form.about.value|linebreaks }}</p>
+                        <div id="static-about-value" class="static-value">{{ about_form.about.value|linebreaks }}</div>
 
                         <div class="edit-wrap">
                             <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
diff --git a/templates/client/includes/accounts/simple_user.html b/templates/client/includes/accounts/simple_user.html
index 0034f788..644c9e18 100644
--- a/templates/client/includes/accounts/simple_user.html
+++ b/templates/client/includes/accounts/simple_user.html
@@ -42,9 +42,6 @@
 
                 <div class="i-contacts clearfix">
                     <div class="ic-buttons">
-                        {% if user.is_authenticated %}
-                        <a class="button icon-msg pw-open" href="#pw-reply">{% trans 'отправить сообщение' %}</a>
-                        {% endif %}
 
                         <ul class="soc-media-buttons">
                         {% if member.profile.facebook %}
@@ -68,7 +65,9 @@
                             </li>
                         {% endif %}
                         </ul>
-                    </div>
+						<a class="button icon-msg pw-open" href="#pw-reply">{% trans 'отправить сообщение' %}</a>
+
+					</div>
                     <div class="ic-links">
                     {% if member.profile.phone and member.profile.show_phone %}
                         <div class="ic-tel">
@@ -94,10 +93,11 @@
 
                 <div class="i-additional">
                     <div class="ia-title">{% trans 'О себе' %}:</div>
-                    {{ member.profile.about|safe }}
+                    {{ member.profile.about|safe|linebreaks }}
                 </div>
 
             </div>
+			{% if member.get_expositions_number > 0 or member.get_conferences_number > 0 or member.get_seminars_number > 0 %}
             <div class="i-statistics">
                 <header class="clearfix">
                     <div class="ish-title">{% trans 'Участие в событиях' %}</div>
@@ -118,5 +118,6 @@
                 <ul class="cat-list cl-exhibitions">
                 </ul>
             </div>
+			{% endif %}
         </div>
     </div>
\ No newline at end of file
diff --git a/templates/client/static_client/css/main.css b/templates/client/static_client/css/main.css
index 13129e2c..12515d7b 100644
--- a/templates/client/static_client/css/main.css
+++ b/templates/client/static_client/css/main.css
@@ -13138,6 +13138,22 @@ hr + .rq-note {
 	.outer-profile .i-info .i-title{
 		margin-bottom: 14px;
 	}
+	.outer-profile .i-contacts .ic-buttons{
+		margin-right: 0;
+		padding-left: 32px;
+	}
+	.outer-profile .i-contacts .ic-buttons .soc-media-buttons{
+		margin-top: 0;
+		margin-bottom: 16px;
+		padding-left: 8px;
+	}
+	.outer-profile .i-info .i-contacts{
+		margin-bottom: 24px;
+		margin-top: 24px;
+	}
+	.outer-profile .ic-tel{
+		margin-bottom: 14px;
+	}
 	.add_link_teg .tags{
 		display: inline-block;
 		font-size: 14px;