Merge branch 'stage6' of bitbucket.org:Bonus_05/expomap into stage6

static/mailing_settings/js/main.js

@@ -416,4 +416,7 @@ $(function () {
 
     $('.scroll-container').mCustomScrollbar();
 
+
+    if ($('#unsibscribed').length)
+        $.fancybox.open({href: '#unsibscribed'});
 });

templates/client/accounts/mailing_settings.html

@@ -178,9 +178,11 @@
                 {% include 'client/popups/mailing_settings_countries.html' %}
             </div>
 
-            <div id="unsibscribed_modal">
-                {% include 'client/popups/unsubscribed.html' %}
-            </div>
+            {% if not object.subscriber %}
+                <div id="unsibscribed_modal">
+                    {% include 'client/popups/unsubscribed.html' %}
+                </div>
+            {% endif %}
 		</div>
 
         <script src="https://cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.4/jquery.fancybox.pack.min.js" defer></script>
@@ -214,17 +216,17 @@
 //            };
         </script>
         <script src="{% static 'mailing_settings/js/main.js' %}" defer></script>
-        {% if not object.subscriber %}
-            <script>
-                $(document).ready(function() {
-                    var popupUnsibscribed = $('#unsibscribed');
-				    $.fancybox(popupUnsibscribed, fbPopupOptions);
-                });
-            </script>
+{#        {% if not object.subscriber %}#}
+{#            <script>#}
+{#                $(document).ready(function() {#}
+{#                    var popupUnsibscribed = $('#unsibscribed');#}
+{#				    $.fancybox(popupUnsibscribed, fbPopupOptions);#}
+{#                });#}
+{#            </script>#}
 {#            <div class="reversed" style="border-left: 5px solid #ff9900; padding: 8px 12px; background-color: #fff; font-size:17px; text-align: justify; margin-bottom: 10px">#}
 {#                {% trans "Вы не являетесь подписчиком. Чтобы подписаться, выберите интересующие Вас данные." %}#}
 {#            </div>#}
-        {% endif %}
+{#        {% endif %}#}
     </body>
 </html>