fix sign, add map link

diff --git a/app/sandbox/local_settings.py b/app/sandbox/local_settings.py
index 4f7634e8fef329dd1b0b3ca93d679ac30cd0d410..e5bbffa4f14151a279a3b960af9d1f9502bfdce0 100644 (file)
--- a/app/sandbox/local_settings.py
+++ b/app/sandbox/local_settings.py
@@ -87,3 +87,5 @@ ADMIN_MENU_ORDER = (
 )
 
 SEARCH_MODEL_CHOICES = ()
+
+RATINGS_ACCOUNT_REQUIRED = True

diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index 1a9d6a4e36805f5e6a53a97acf8e0f7889cfb8a2..0722dc77a72457bdc76fdba18f3dc8cab10b395b 100644 (file)
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -88,7 +88,9 @@
             Get Directions
         </a>
     </p>
-    {% google_static_map event 900 300 15 %}
+    <a href="{{ event|google_nav_url }}" target="_blank" class="">
+     {% google_static_map event 900 300 15 %}
+    </a/>
 </div>
 {% endeditable %}
 {% endblock %}
@@ -108,6 +110,7 @@
 {% endif %}
 {% endblock %}
 
+{% comment %}
 {% block event_detail_rating %}
 <div class="panel panel-default rating">
     <div class="panel-body">
@@ -115,6 +118,7 @@
     </div>
 </div>
 {% endblock %}
+{% endcomment %}
 
 {% block event_detail_sharebuttons %}
 {% set_short_url_for event %}

diff --git a/conf/dev.yml b/conf/dev.yml
index ed43f7fc45b0184e5d36abf00219548d8fdcffa2..ba774ceca0151719cd664bb66b79654abcc4dfe4 100644 (file)
--- a/conf/dev.yml
+++ b/conf/dev.yml
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2015 IRCAM
+# Copyright (c) 2015 Guillaume Pellerin <guillaume.pellerin@ircam.fr>
 
 # Manifeste is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,6 +23,5 @@ app:
   command: /bin/sh deploy/start_app.sh --runserver
   volumes:
     - ./app/:/srv/app
-    - ./lib/mezzanine-agenda/:/srv/lib/mezzanine-agenda  
   ports:
     - "9010:8000"

diff --git a/docker-compose.yml b/docker-compose.yml
index 202bae261448586e2852475ef2ef740aa57841ad..9df06a3c56c2bde136f6a19a00508ace71432dc8 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2015 IRCAM
+# Copyright (c) 2015 Guillaume Pellerin <guillaume.pellerin@ircam.fr>
 
 # Manifeste is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -49,8 +49,7 @@ app:
     - "8000"
   links:
     - db
-    # - pgdb
-
+    
 nginx:
   image: nginx
   ports:

diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 22aef2e326a7e62d650c68928f726e88468e3e2d..e445d26eb34d9c3c390391406c6ccb9f6d1380c1 160000 (submodule)
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 22aef2e326a7e62d650c68928f726e88468e3e2d
+Subproject commit e445d26eb34d9c3c390391406c6ccb9f6d1380c1