From dea30fa2318de24a5e818ef05fce4b39dba20ada Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Mon, 2 May 2016 11:16:38 +0300
Subject: [PATCH] =?UTF-8?q?1329:=20=D0=AD=D1=82=D0=B0=D0=BF=20=E2=84=963?=
 =?UTF-8?q?=20-=20=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20"=D0=9E=D1=82?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D1=81=D0=BE=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                      |  6 +++
 README.md                                     |  8 ++++
 templates/client/accounts/user.html           | 47 ++++++++++---------
 .../client/includes/accounts/simple_user.html |  6 ++-
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index 866d7257..772dc2a0 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,12 @@ run-public:
 shell:
 	@PYTHONPATH=$(PYTHONPATH):. DJANGO_SETTINGS_MODULE=$(project_name).settings python manage.py shell
 
+solrrun:
+	/opt/solr/bin/solr start -p 8983
+
+solrstop:
+	/opt/solr/bin/solr stop -all
+
 makemessages:
 	-@ipython manage.py makemessages --all
 
diff --git a/README.md b/README.md
index c93b2e37..e1a702e1 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ python manage.py migrate company
 
 
 # solr setup
+```sh
 curl -LO https://archive.apache.org/dist/lucene/solr/4.10.4/solr-4.10.4.tgz
 tar -xzf solr-4.10.4.tgz
 sudo mv solr-4.10.4 /opt/solr-4.10.4
@@ -66,3 +67,10 @@ sudo useradd -d /opt/solr -s /sbin/false solr
 sudo chown solr:solr -R /opt/solr
 cd /opt/solr-4.10.4
 bin/solr start -p 8983
+```
+
+#
+```sh
+python manage.py migrate expobanner 0001 --fake
+python manage.py migrate expobanner
+```
diff --git a/templates/client/accounts/user.html b/templates/client/accounts/user.html
index bc860aec..3e61f9dd 100644
--- a/templates/client/accounts/user.html
+++ b/templates/client/accounts/user.html
@@ -10,7 +10,6 @@
 {% block page_title %}
 {% endblock %}
 
-
 {% block content_list %}
     {% if member.blocked %}
         {% include "client/includes/accounts/blocked_user.html" %}
@@ -23,30 +22,32 @@
     {% endif %}
 
 {% endblock %}
+
 {% if user.is_authenticated and not member.blocked %}
-{% block popup %}
-<div id="pw-reply" class="popup-window pw-reply">
-    <header class="clearfix">
-        <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_message">{% trans 'Текст сообщения' %}:</label>
-                <div class="pwf-field">
-                    <input type="hidden" value="" id="reply_message">
-                    {{ message_form.body }}
+    {% block popup %}
+    <div id="pw-reply" class="popup-window pw-reply">
+        <header class="clearfix">
+            <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_message">{% trans 'Текст сообщения' %}:</label>
+                    <div class="pwf-field">
+                        <input type="hidden" value="" id="reply_message">
+                        {{ message_form.body }}
+                    </div>
                 </div>
-            </div>
-            <div class="pwf-buttons-line">
-                <button type="submit" class="icon-check">{% trans 'отправить' %}</button>
-            </div>
-        </form>
+                <div class="pwf-buttons-line">
+                    <button type="submit" class="icon-check">{% trans 'отправить' %}</button>
+                </div>
+            </form>
+        </div>
     </div>
-</div>
 
-{% if request.user == member %}
-    {% include 'popups/create_company.html' with form=company_form %}
-{% endif %}
-{% endblock %}
+    {% if request.user == member %}
+        {% include 'popups/create_company.html' with form=company_form %}
+    {% endif %}
+
+    {% endblock %}
 {% endif %}
diff --git a/templates/client/includes/accounts/simple_user.html b/templates/client/includes/accounts/simple_user.html
index fb594bf4..79501505 100644
--- a/templates/client/includes/accounts/simple_user.html
+++ b/templates/client/includes/accounts/simple_user.html
@@ -67,8 +67,10 @@
                         {% endif %}
                         </ul>
 						{% if user.is_authenticated %}
-							<a class="button icon-msg pw-open" href="#pw-reply">{% trans 'отправить сообщение' %}</a>
-						{% endif %}
+                            <a class="button icon-msg pw-open" href="#pw-reply">{% trans 'отправить сообщение' %}</a>
+                        {% else %}
+							<a class="button icon-msg pw-open" href="#pw-reg">{% trans 'отправить сообщение' %}</a>
+                        {% endif %}
 					</div>
                     <div class="ic-links">
 						{% comment %}