From 795fb9e2712c4d8fde972322f456bd78e6128dbe Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 23 Feb 2017 16:47:49 +0100
Subject: [PATCH] Add themes modules plus custom base.html and page.html

---
 .bowerrc                                          |  2 +-
 app/settings.py                                   | 15 ++++++++++-----
 .../base}/templates/includes/social.html          |  0
 gulpfile.js                                       |  4 ++--
 lib/mezzanine-agenda                              |  2 +-
 var                                               |  2 +-
 6 files changed, 15 insertions(+), 10 deletions(-)
 rename app/{ => themes/base}/templates/includes/social.html (100%)

diff --git a/.bowerrc b/.bowerrc
index 1f0e23b7..52474432 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
 {
-    "directory" : "app/static/vendors"
+    "directory" : "app/themes/base/static/vendors"
 }
diff --git a/app/settings.py b/app/settings.py
index 81d5d7c5..5ad01844 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -193,10 +193,6 @@ STATIC_URL = "/static/"
 # STATIC_ROOT = os.path.join(PROJECT_ROOT, STATIC_URL.strip("/"))
 STATIC_ROOT = '/srv/static/'
 
-STATICFILES_DIRS = [
-    '/srv/app/static',
-]
-
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
@@ -216,6 +212,10 @@ ROOT_URLCONF = "urls"
 ################
 
 INSTALLED_APPS = [
+    "themes.base",
+    "themes.starts_eu",
+    'themes.vertigo_starts_eu',
+
     "modeltranslation",
     "dal",
     "dal_select2",
@@ -278,7 +278,6 @@ MIGRATION_MODULES = {
 
 TEMPLATES = [{'APP_DIRS': True,
                'BACKEND': 'django.template.backends.django.DjangoTemplates',
-               'DIRS': ('/srv/app/templates',),
                'OPTIONS': {'builtins': ['mezzanine.template.loader_tags'],
                            'context_processors': ('django.contrib.auth.context_processors.auth',
                                                   'django.contrib.messages.context_processors.messages',
@@ -305,6 +304,12 @@ if not DEBUG:
     TEMPLATES[0]['OPTIONS']['loaders'] = TEMPLATE_LOADERS_OPTIONS
     TEMPLATES[0]['APP_DIRS'] = False
 
+HOST_THEMES = [
+    ('starts.eu', 'starts_eu'),
+    ('vertigo.starts.eu', 'vertigo_starts_eu'),
+    ('vertigo.ircam.fr', 'base'),
+]
+
 # List of middleware classes to use. Order is important; in the request phase,
 # these middleware classes will be applied in the order given, and in the
 # response phase the middleware will be applied in reverse order.
diff --git a/app/templates/includes/social.html b/app/themes/base/templates/includes/social.html
similarity index 100%
rename from app/templates/includes/social.html
rename to app/themes/base/templates/includes/social.html
diff --git a/gulpfile.js b/gulpfile.js
index 12e2cec9..2f82b782 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -17,8 +17,8 @@ var gulp = require('gulp'),
     browserify = require('gulp-browserify'),
     sourcemaps = require('gulp-sourcemaps');
 
-var srcFolder = 'app/static/src/',
-    destFolder = 'app/static/'
+var srcFolder = 'app/themes/base/static/src/',
+    destFolder = 'app/themes/base/static/'
 
 gulp.task('copy-assets-img', function() {
     gulp.src([srcFolder + 'assets/img/**/*'])
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index a072d9a6..677c2fae 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit a072d9a6af89c14150df71544df53b7f77cf3bc8
+Subproject commit 677c2faeb8b46a52846d6663c7f4c1a3d9509e18
diff --git a/var b/var
index e35bbe73..78283cae 160000
--- a/var
+++ b/var
@@ -1 +1 @@
-Subproject commit e35bbe738e298a0fe37160f2c46cf16d42265ccb
+Subproject commit 78283cae2019601d70fb3cf55e626225f03435cd
-- 
2.39.5