Merge branch 'develop' of http://git.general-servers.com/expomap/expomap

emencia/django/newsletter/mailer.py

@@ -292,6 +292,10 @@ class NewsLetterSender(object):
                self.newsletter.mails_sent() >= \
                self.newsletter.mailing_list.expedition_set().count():
             self.newsletter.status = Newsletter.SENT
+
+        if self.announce and not self.expedition_list:
+            self.newsletter.status = Newsletter.SENT
+
         self.newsletter.save()
 
     @property

proj/urls.py

@@ -73,6 +73,12 @@ urlpatterns = patterns('',
     url(r'^', include('service.urls')),
     )
 if settings.DEBUG:
+    urlpatterns += patterns(
+        'django.views.static',
+        (r'media/(?P<path>.*)',
+        'serve',
+        {'document_root': settings.MEDIA_ROOT}), )
+
     import debug_toolbar
     urlpatterns += patterns('',
         url(r'^__debug__/', include(debug_toolbar.urls)),

templates/client/article/news.html

@@ -55,7 +55,7 @@
                         </span>
                     </a>
                     <h3><a href="{{ news.get_permanent_url }}" title="">{{ news.main_title }}</a></h3>
-                    <p>{{ news.preview }}</p>
+                    <p>{{ news.preview|safe }}</p>
                     <strong><span>{{ news.publish_date|date:"d E Y" }}</span>{% if news.get_event %}<a href="{{ news.get_event.get_permanent_url }}" title=""><b>{{ news.get_event.name }}</b></a><{% endif %}</strong>
                 </div>
                 <div class="clearfix"></div>

templates/client/includes/exposition/photo.html

@@ -61,7 +61,11 @@
 	{% include 'client/popups/photo.html' %}
 {% endblock %}
 {% block scripts %}
+{% comment %}
 <script src="{% static 'client/js_min/_modules/page.place.photo.min.js' %}"></script>
+{% endcomment %}
+<script src="{% static 'client/js/_modules/page.place.photo.js' %}"></script>
+
 
 <script>
 	//js module initialization

templates/client/static_client/js/_modules/page.place.photo.js

@@ -21,7 +21,7 @@ if (EXPO.placePhoto){
 			// object properties
 			var self = this;
 			this.currentId = undefined;
-			this.ajaxUrl = ajaxUrl;
+			this.ajaxUrl = location.protocol+'//'+location.hostname+(location.port ? ':'+location.port: '') + ajaxUrl;
 			//modal Window options
 			this.opt = {
 				gContainerId:containerId,