From c7881d07723c25753e019b7ecba1a9590051fb93 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 9 Mar 2016 18:29:59 +0100 Subject: [PATCH] fix sign, add map link --- app/sandbox/local_settings.py | 2 ++ app/templates/agenda/event_detail.html | 6 +++++- conf/dev.yml | 3 +-- docker-compose.yml | 5 ++--- lib/mezzanine-agenda | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/sandbox/local_settings.py b/app/sandbox/local_settings.py index 4f7634e8..e5bbffa4 100644 --- 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 1a9d6a4e..0722dc77 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -88,7 +88,9 @@ Get Directions

- {% google_static_map event 900 300 15 %} + + {% google_static_map event 900 300 15 %} + {% endeditable %} {% endblock %} @@ -108,6 +110,7 @@ {% endif %} {% endblock %} +{% comment %} {% block event_detail_rating %}
@@ -115,6 +118,7 @@
{% endblock %} +{% endcomment %} {% block event_detail_sharebuttons %} {% set_short_url_for event %} diff --git a/conf/dev.yml b/conf/dev.yml index ed43f7fc..ba774cec 100644 --- a/conf/dev.yml +++ b/conf/dev.yml @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (c) 2015 IRCAM +# Copyright (c) 2015 Guillaume Pellerin # 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 202bae26..9df06a3c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (c) 2015 IRCAM +# Copyright (c) 2015 Guillaume Pellerin # 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 22aef2e3..e445d26e 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit 22aef2e326a7e62d650c68928f726e88468e3e2d +Subproject commit e445d26eb34d9c3c390391406c6ccb9f6d1380c1 -- 2.39.5