Add themes modules plus custom base.html and page.html

diff --git a/.bowerrc b/.bowerrc
index 1f0e23b784b868fb99e86463050136ec238ba1fa..52474432bd058fadc417d75a0f9dfdc85eb8857d 100644 (file)
--- 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 81d5d7c54f484fed0717bf6e22af140ad60ff116..5ad01844535d495f0c2bb28d04fdea80b1b863de 100644 (file)
--- 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/templates/includes/social.html
deleted file mode 100644 (file)
index 863a26f..0000000
--- a/app/templates/includes/social.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags organization_tags %}
-
-<div class="section container">
-       <div class="row">
-               <div class="col-sm-8 tac">
-                       <div class="section-title section-title--uppercase section-title--underline section-title--accent">
-                               {% trans "Instagram feed" %} <a class="fcw" href="https://www.instagram.com/explore/tags/ircam/" target="_blank">#ircam</a>
-                       </div>
-                       <div>
-                               {% include "includes/instagram.html" %}
-                       </div>
-               </div>
-               <div class="col-sm-6 col-sm-push-1 tac">
-                       <div class="section-title section-title--uppercase section-title--underline section-title--main">
-                               {% trans "Twitter feed" %}
-                       </div>
-                       <div>
-                               {% include "twitter/tweets.html" %}
-                       </div>
-               </div>
-       </div>
-</div>

diff --git a/app/themes/base/templates/includes/social.html b/app/themes/base/templates/includes/social.html
new file mode 100644 (file)
index 0000000..863a26f
--- /dev/null
+++ b/app/themes/base/templates/includes/social.html
@@ -0,0 +1,22 @@
+{% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags organization_tags %}
+
+<div class="section container">
+       <div class="row">
+               <div class="col-sm-8 tac">
+                       <div class="section-title section-title--uppercase section-title--underline section-title--accent">
+                               {% trans "Instagram feed" %} <a class="fcw" href="https://www.instagram.com/explore/tags/ircam/" target="_blank">#ircam</a>
+                       </div>
+                       <div>
+                               {% include "includes/instagram.html" %}
+                       </div>
+               </div>
+               <div class="col-sm-6 col-sm-push-1 tac">
+                       <div class="section-title section-title--uppercase section-title--underline section-title--main">
+                               {% trans "Twitter feed" %}
+                       </div>
+                       <div>
+                               {% include "twitter/tweets.html" %}
+                       </div>
+               </div>
+       </div>
+</div>

diff --git a/gulpfile.js b/gulpfile.js
index 12e2cec9cdc0203200ee3b9bf94c9ae6ead35d42..2f82b782423993e9575b31c1e74625c305bda16e 100644 (file)
--- 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 a072d9a6af89c14150df71544df53b7f77cf3bc8..677c2faeb8b46a52846d6663c7f4c1a3d9509e18 160000 (submodule)
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit a072d9a6af89c14150df71544df53b7f77cf3bc8
+Subproject commit 677c2faeb8b46a52846d6663c7f4c1a3d9509e18

diff --git a/var b/var
index e35bbe738e298a0fe37160f2c46cf16d42265ccb..78283cae2019601d70fb3cf55e626225f03435cd 160000 (submodule)
--- a/var
+++ b/var
@@ -1 +1 @@
-Subproject commit e35bbe738e298a0fe37160f2c46cf16d42265ccb
+Subproject commit 78283cae2019601d70fb3cf55e626225f03435cd