From d04e74d97b5218475d32e109fa4fd4b4953f4c06 Mon Sep 17 00:00:00 2001
From: Slava Kyrachevsky <slava.deb@gmail.com>
Date: Mon, 10 Jul 2017 17:02:19 +0300
Subject: [PATCH] conference subscripbe button change color + modal fix

---
 static/mailing_settings/css/main.css                         | 1 -
 templates/client/exposition/exposition_detail.html           | 2 +-
 templates/client/includes/conference/conference_partner.html | 2 +-
 templates/client/popups/event_news_subscribe.html            | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/static/mailing_settings/css/main.css b/static/mailing_settings/css/main.css
index 275f6cab..cb9249da 100644
--- a/static/mailing_settings/css/main.css
+++ b/static/mailing_settings/css/main.css
@@ -958,7 +958,6 @@ a.themes_trigger{
     height:64px;
     font: 30px/58px 'pf_dindisplay_proregular', Arial, Helvetica, sans-serif;
     text-align:center;
-    text-transform:uppercase;
     color:#fff;
     width:100%;
     cursor:pointer;
diff --git a/templates/client/exposition/exposition_detail.html b/templates/client/exposition/exposition_detail.html
index dc751a94..2fdbee7a 100644
--- a/templates/client/exposition/exposition_detail.html
+++ b/templates/client/exposition/exposition_detail.html
@@ -496,7 +496,7 @@
                     $main_image = $('.exposition_main_image');
 
                 $recommended
-                    .insertBefore($text.find('>*').eq(-2))
+                    .insertBefore($text.find('>*').eq(-3))
                     .show();
 
                 if ($main_image.data('background')) {
diff --git a/templates/client/includes/conference/conference_partner.html b/templates/client/includes/conference/conference_partner.html
index c904f107..fe99a0a7 100644
--- a/templates/client/includes/conference/conference_partner.html
+++ b/templates/client/includes/conference/conference_partner.html
@@ -109,7 +109,7 @@
                     <a class="button blue icon-photo" href="{{ event.get_permanent_url }}photo/">{% trans 'фото' %}</a>
                 {% endif %}
             </div>
-            <div class="ib-add"><a class="button pw-open blue2" href="#pw-event-news-subscribe"><i class="fa fa-at"></i> {% trans 'Напомнить о выставке' %}</a></div>
+            <div class="ib-add"><a class="button pw-open green" href="#pw-event-news-subscribe"><i class="fa fa-at"></i> {% trans 'Напомнить о событии' %}</a></div>
         </div>
 
         <hr />
diff --git a/templates/client/popups/event_news_subscribe.html b/templates/client/popups/event_news_subscribe.html
index 8bec8d82..3a7e68c2 100644
--- a/templates/client/popups/event_news_subscribe.html
+++ b/templates/client/popups/event_news_subscribe.html
@@ -10,7 +10,7 @@
             <p id="success" style="display: none;">
                 {% trans 'Вы были успешно подписаны!' %}
             </p>
-            <form id="event-news-subscribe-form" method="post" class="pw-form"  action=".{# url 'events:subscribe' object.event_type object.url #}">
+            <form id="event-news-subscribe-form" method="post" class="pw-form"  action="{% if object %}{% url 'events:subscribe' object.event_type object.url %}{% else %}.{% endif %}">
                 {% csrf_token %}
                 {% if not user.is_authenticated or not user.contact_set.exists %}
                     <div class="pwf-line">