retrieve original vertigo params, update themes

diff --git a/.gitmodules b/.gitmodules
index 0792dad91176dc8c5434ff7b7fea7b8ff0543dd0..63bd79e3fdca642632b09c567e19b506a07d28dc 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -23,3 +23,6 @@
 [submodule "lib/mezzanine-organization"]
        path = lib/mezzanine-organization
        url = https://github.com/Ircam-Web/mezzanine-organization.git
+[submodule "var"]
+       path = var
+       url = git+ssh://git@git.forge.ircam.fr/vertigo-data.git

diff --git a/app/local_settings.py b/app/local_settings.py
index 620762fe4660029129235ad9a0b6dbc8884dc48e..1cba93329ec2f62dd62173d90bdd49c61b5acb1f 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -25,9 +25,37 @@ from datetime import datetime, date
 
 DEBUG = True if os.environ.get('DEBUG') == 'True' else False
 
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2016-2017 Ircam
+# Copyright (c) 2016-2017 Guillaume Pellerin
+# Copyright (c) 2016-2017 Emilie Zawadzki
+
+# This file is part of mezzanine-organization.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import os
+from django.utils.translation import ugettext_lazy as _
+from datetime import datetime, date
+
+DEBUG = True if os.environ.get('DEBUG') == 'True' else False
+
+
 ADMINS = (
     ('Guillaume Pellerin', 'guillaume.pellerin@ircam.fr'),
-    ('Emilie Zawadzki', 'emilie.zawadzki@ircam.fr'),
+    ('David Palomares', 'd.palomares@libelium.com'),
 )
 
 # Make these unique, and don't share it with anybody.
@@ -36,12 +64,13 @@ NEVERCACHE_KEY = "m)u^%r@uh#r3wu0&$=#$1ogx)uy4hv93^2lt%c3@xi=^gifoj8paozijdihaze
 
 EMAIL_HOST = 'smtp.ircam.fr'
 EMAIL_PORT = '25'
-DEFAULT_FROM_EMAIL = 'cri-dev@ircam.fr'
-DEFAULT_TO_EMAIL = 'cri-dev@ircam.fr'
-EMAIL_SUBJECT_PREFIX = "[IRCAM]"
+SERVER_EMAIL = 'no-reply-vertigo@ircam.fr'
+DEFAULT_FROM_EMAIL = 'Vertigo@iuk.fraunhofer.de'
+DEFAULT_TO_EMAIL = 'Vertigo@iuk.fraunhofer.de'
+EMAIL_SUBJECT_PREFIX = "[VERTIGO]"
 
-SITE_TITLE = 'IRCAM'
-SITE_TAGLINE = 'IRCAM'
+SITE_TITLE = 'VERTIGO'
+SITE_TAGLINE = 'VERTIGO'
 
 EVENT_DOMAIN = "//eve.ircam.fr"
 EVENT_SHOP_URL = EVENT_DOMAIN+"/pub.php/event/%d/edit"
@@ -52,6 +81,8 @@ EVENT_CONFIRMATION_URL = EVENT_DOMAIN+"/pub.php/cart/done?transaction_id=%s"
 FIGGO_API_URL_PROD='https://ircam.ilucca.net/'
 FIGGO_API_HEADER_AUTH='Lucca application=bd6d5481-40eb-414b-9135-434e12749223'
 
-# HOST_THEMES = [
-#     ('manifeste.ircam.fr', 'themes.base'),
-# ]
+HOST_THEMES = [
+    ('vertigo.ircam.fr', 'organization_themes.vertigo-themes.vertigo_ircam_fr'),
+    ('vertigo.starts.eu', 'organization_themes.vertigo-themes.vertigo_starts_eu'),
+    ('www.starts.eu', 'organization_themes.vertigo-themes.www_starts_eu'),
+]

diff --git a/app/settings.py b/app/settings.py
index a3d29470f546d0e362238e63a074975c9cdf3b94..5942922b2d5e7ba6b63ff8d4c101820ee5b50415 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -149,7 +149,7 @@ LANGUAGES = (
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
 SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"
 
-SITE_ID = 1
+SITE_ID = 3
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
@@ -219,7 +219,9 @@ ROOT_URLCONF = "urls"
 
 INSTALLED_APPS = [
     "organization_themes",
-    "organization_themes.ircam-www-theme",
+    "organization_themes.vertigo-themes.vertigo_ircam_fr",
+    "organization_themes.vertigo-themes.vertigo_starts_eu",
+    "organization_themes.vertigo-themes.www_starts_eu",
     "modeltranslation",
     "dal",
     "dal_select2",

diff --git a/var b/var
new file mode 160000 (submodule)
index 0000000..747179d
--- /dev/null
+++ b/var
@@ -0,0 +1 @@
+Subproject commit 747179d0d00e30e036af23f5a158e4c5e22c1b1e