diff --git a/common_files/__init__.py b/common_files/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/common_files/admin.py b/common_files/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/common_files/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/common_files/apps.py b/common_files/apps.py new file mode 100644 index 0000000..fddedc1 --- /dev/null +++ b/common_files/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class CommonFilesConfig(AppConfig): + name = 'common_files' diff --git a/common_files/migrations/__init__.py b/common_files/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/common_files/models.py b/common_files/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/common_files/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/static/img/favicon.jpg b/common_files/static/common_files/img/favicon.jpg similarity index 100% rename from static/img/favicon.jpg rename to common_files/static/common_files/img/favicon.jpg diff --git a/static/img/header.jpg b/common_files/static/common_files/img/header.jpg similarity index 100% rename from static/img/header.jpg rename to common_files/static/common_files/img/header.jpg diff --git a/static/img/logo.jpg b/common_files/static/common_files/img/logo.jpg similarity index 100% rename from static/img/logo.jpg rename to common_files/static/common_files/img/logo.jpg diff --git a/static/vendor/appear.min.js b/common_files/static/common_files/vendor/appear.min.js similarity index 100% rename from static/vendor/appear.min.js rename to common_files/static/common_files/vendor/appear.min.js diff --git a/static/vendor/bootstrap.min.js b/common_files/static/common_files/vendor/bootstrap.min.js similarity index 100% rename from static/vendor/bootstrap.min.js rename to common_files/static/common_files/vendor/bootstrap.min.js diff --git a/static/vendor/bootstrap/css/bootstrap.css b/common_files/static/common_files/vendor/bootstrap/css/bootstrap.css similarity index 100% rename from static/vendor/bootstrap/css/bootstrap.css rename to common_files/static/common_files/vendor/bootstrap/css/bootstrap.css diff --git a/static/vendor/bootstrap/css/bootstrap.min.css b/common_files/static/common_files/vendor/bootstrap/css/bootstrap.min.css similarity index 100% rename from static/vendor/bootstrap/css/bootstrap.min.css rename to common_files/static/common_files/vendor/bootstrap/css/bootstrap.min.css diff --git a/static/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot b/common_files/static/common_files/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from static/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot rename to common_files/static/common_files/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/static/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg b/common_files/static/common_files/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from static/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg rename to common_files/static/common_files/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/static/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf b/common_files/static/common_files/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from static/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to common_files/static/common_files/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/static/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff b/common_files/static/common_files/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from static/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff rename to common_files/static/common_files/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/static/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/common_files/static/common_files/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from static/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to common_files/static/common_files/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/static/vendor/bootstrap/js/bootstrap.js b/common_files/static/common_files/vendor/bootstrap/js/bootstrap.js similarity index 100% rename from static/vendor/bootstrap/js/bootstrap.js rename to common_files/static/common_files/vendor/bootstrap/js/bootstrap.js diff --git a/static/vendor/bootstrap/js/bootstrap.min.js b/common_files/static/common_files/vendor/bootstrap/js/bootstrap.min.js similarity index 100% rename from static/vendor/bootstrap/js/bootstrap.min.js rename to common_files/static/common_files/vendor/bootstrap/js/bootstrap.min.js diff --git a/static/vendor/creative.css b/common_files/static/common_files/vendor/creative.css similarity index 100% rename from static/vendor/creative.css rename to common_files/static/common_files/vendor/creative.css diff --git a/static/vendor/creative.js b/common_files/static/common_files/vendor/creative.js similarity index 100% rename from static/vendor/creative.js rename to common_files/static/common_files/vendor/creative.js diff --git a/static/vendor/creative.min.css b/common_files/static/common_files/vendor/creative.min.css similarity index 100% rename from static/vendor/creative.min.css rename to common_files/static/common_files/vendor/creative.min.css diff --git a/static/vendor/creative.min.js b/common_files/static/common_files/vendor/creative.min.js similarity index 100% rename from static/vendor/creative.min.js rename to common_files/static/common_files/vendor/creative.min.js diff --git a/static/vendor/font-awesome/css/font-awesome.css b/common_files/static/common_files/vendor/font-awesome/css/font-awesome.css similarity index 100% rename from static/vendor/font-awesome/css/font-awesome.css rename to common_files/static/common_files/vendor/font-awesome/css/font-awesome.css diff --git a/static/vendor/font-awesome/css/font-awesome.min.css b/common_files/static/common_files/vendor/font-awesome/css/font-awesome.min.css similarity index 100% rename from static/vendor/font-awesome/css/font-awesome.min.css rename to common_files/static/common_files/vendor/font-awesome/css/font-awesome.min.css diff --git a/static/vendor/font-awesome/fonts/FontAwesome.otf b/common_files/static/common_files/vendor/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from static/vendor/font-awesome/fonts/FontAwesome.otf rename to common_files/static/common_files/vendor/font-awesome/fonts/FontAwesome.otf diff --git a/static/vendor/font-awesome/fonts/fontawesome-webfont.eot b/common_files/static/common_files/vendor/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from static/vendor/font-awesome/fonts/fontawesome-webfont.eot rename to common_files/static/common_files/vendor/font-awesome/fonts/fontawesome-webfont.eot diff --git a/static/vendor/font-awesome/fonts/fontawesome-webfont.svg b/common_files/static/common_files/vendor/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from static/vendor/font-awesome/fonts/fontawesome-webfont.svg rename to common_files/static/common_files/vendor/font-awesome/fonts/fontawesome-webfont.svg diff --git a/static/vendor/font-awesome/fonts/fontawesome-webfont.ttf b/common_files/static/common_files/vendor/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from static/vendor/font-awesome/fonts/fontawesome-webfont.ttf rename to common_files/static/common_files/vendor/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/static/vendor/font-awesome/fonts/fontawesome-webfont.woff b/common_files/static/common_files/vendor/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from static/vendor/font-awesome/fonts/fontawesome-webfont.woff rename to common_files/static/common_files/vendor/font-awesome/fonts/fontawesome-webfont.woff diff --git a/static/vendor/font-awesome/fonts/fontawesome-webfont.woff2 b/common_files/static/common_files/vendor/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from static/vendor/font-awesome/fonts/fontawesome-webfont.woff2 rename to common_files/static/common_files/vendor/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/static/vendor/font-awesome/less/animated.less b/common_files/static/common_files/vendor/font-awesome/less/animated.less similarity index 100% rename from static/vendor/font-awesome/less/animated.less rename to common_files/static/common_files/vendor/font-awesome/less/animated.less diff --git a/static/vendor/font-awesome/less/bordered-pulled.less b/common_files/static/common_files/vendor/font-awesome/less/bordered-pulled.less similarity index 100% rename from static/vendor/font-awesome/less/bordered-pulled.less rename to common_files/static/common_files/vendor/font-awesome/less/bordered-pulled.less diff --git a/static/vendor/font-awesome/less/core.less b/common_files/static/common_files/vendor/font-awesome/less/core.less similarity index 100% rename from static/vendor/font-awesome/less/core.less rename to common_files/static/common_files/vendor/font-awesome/less/core.less diff --git a/static/vendor/font-awesome/less/fixed-width.less b/common_files/static/common_files/vendor/font-awesome/less/fixed-width.less similarity index 100% rename from static/vendor/font-awesome/less/fixed-width.less rename to common_files/static/common_files/vendor/font-awesome/less/fixed-width.less diff --git a/static/vendor/font-awesome/less/font-awesome.less b/common_files/static/common_files/vendor/font-awesome/less/font-awesome.less similarity index 100% rename from static/vendor/font-awesome/less/font-awesome.less rename to common_files/static/common_files/vendor/font-awesome/less/font-awesome.less diff --git a/static/vendor/font-awesome/less/icons.less b/common_files/static/common_files/vendor/font-awesome/less/icons.less similarity index 100% rename from static/vendor/font-awesome/less/icons.less rename to common_files/static/common_files/vendor/font-awesome/less/icons.less diff --git a/static/vendor/font-awesome/less/larger.less b/common_files/static/common_files/vendor/font-awesome/less/larger.less similarity index 100% rename from static/vendor/font-awesome/less/larger.less rename to common_files/static/common_files/vendor/font-awesome/less/larger.less diff --git a/static/vendor/font-awesome/less/list.less b/common_files/static/common_files/vendor/font-awesome/less/list.less similarity index 100% rename from static/vendor/font-awesome/less/list.less rename to common_files/static/common_files/vendor/font-awesome/less/list.less diff --git a/static/vendor/font-awesome/less/mixins.less b/common_files/static/common_files/vendor/font-awesome/less/mixins.less similarity index 100% rename from static/vendor/font-awesome/less/mixins.less rename to common_files/static/common_files/vendor/font-awesome/less/mixins.less diff --git a/static/vendor/font-awesome/less/path.less b/common_files/static/common_files/vendor/font-awesome/less/path.less similarity index 100% rename from static/vendor/font-awesome/less/path.less rename to common_files/static/common_files/vendor/font-awesome/less/path.less diff --git a/static/vendor/font-awesome/less/rotated-flipped.less b/common_files/static/common_files/vendor/font-awesome/less/rotated-flipped.less similarity index 100% rename from static/vendor/font-awesome/less/rotated-flipped.less rename to common_files/static/common_files/vendor/font-awesome/less/rotated-flipped.less diff --git a/static/vendor/font-awesome/less/screen-reader.less b/common_files/static/common_files/vendor/font-awesome/less/screen-reader.less similarity index 100% rename from static/vendor/font-awesome/less/screen-reader.less rename to common_files/static/common_files/vendor/font-awesome/less/screen-reader.less diff --git a/static/vendor/font-awesome/less/stacked.less b/common_files/static/common_files/vendor/font-awesome/less/stacked.less similarity index 100% rename from static/vendor/font-awesome/less/stacked.less rename to common_files/static/common_files/vendor/font-awesome/less/stacked.less diff --git a/static/vendor/font-awesome/less/variables.less b/common_files/static/common_files/vendor/font-awesome/less/variables.less similarity index 100% rename from static/vendor/font-awesome/less/variables.less rename to common_files/static/common_files/vendor/font-awesome/less/variables.less diff --git a/static/vendor/font-awesome/scss/_animated.scss b/common_files/static/common_files/vendor/font-awesome/scss/_animated.scss similarity index 100% rename from static/vendor/font-awesome/scss/_animated.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_animated.scss diff --git a/static/vendor/font-awesome/scss/_bordered-pulled.scss b/common_files/static/common_files/vendor/font-awesome/scss/_bordered-pulled.scss similarity index 100% rename from static/vendor/font-awesome/scss/_bordered-pulled.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_bordered-pulled.scss diff --git a/static/vendor/font-awesome/scss/_core.scss b/common_files/static/common_files/vendor/font-awesome/scss/_core.scss similarity index 100% rename from static/vendor/font-awesome/scss/_core.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_core.scss diff --git a/static/vendor/font-awesome/scss/_fixed-width.scss b/common_files/static/common_files/vendor/font-awesome/scss/_fixed-width.scss similarity index 100% rename from static/vendor/font-awesome/scss/_fixed-width.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_fixed-width.scss diff --git a/static/vendor/font-awesome/scss/_icons.scss b/common_files/static/common_files/vendor/font-awesome/scss/_icons.scss similarity index 100% rename from static/vendor/font-awesome/scss/_icons.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_icons.scss diff --git a/static/vendor/font-awesome/scss/_larger.scss b/common_files/static/common_files/vendor/font-awesome/scss/_larger.scss similarity index 100% rename from static/vendor/font-awesome/scss/_larger.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_larger.scss diff --git a/static/vendor/font-awesome/scss/_list.scss b/common_files/static/common_files/vendor/font-awesome/scss/_list.scss similarity index 100% rename from static/vendor/font-awesome/scss/_list.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_list.scss diff --git a/static/vendor/font-awesome/scss/_mixins.scss b/common_files/static/common_files/vendor/font-awesome/scss/_mixins.scss similarity index 100% rename from static/vendor/font-awesome/scss/_mixins.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_mixins.scss diff --git a/static/vendor/font-awesome/scss/_path.scss b/common_files/static/common_files/vendor/font-awesome/scss/_path.scss similarity index 100% rename from static/vendor/font-awesome/scss/_path.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_path.scss diff --git a/static/vendor/font-awesome/scss/_rotated-flipped.scss b/common_files/static/common_files/vendor/font-awesome/scss/_rotated-flipped.scss similarity index 100% rename from static/vendor/font-awesome/scss/_rotated-flipped.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_rotated-flipped.scss diff --git a/static/vendor/font-awesome/scss/_screen-reader.scss b/common_files/static/common_files/vendor/font-awesome/scss/_screen-reader.scss similarity index 100% rename from static/vendor/font-awesome/scss/_screen-reader.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_screen-reader.scss diff --git a/static/vendor/font-awesome/scss/_stacked.scss b/common_files/static/common_files/vendor/font-awesome/scss/_stacked.scss similarity index 100% rename from static/vendor/font-awesome/scss/_stacked.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_stacked.scss diff --git a/static/vendor/font-awesome/scss/_variables.scss b/common_files/static/common_files/vendor/font-awesome/scss/_variables.scss similarity index 100% rename from static/vendor/font-awesome/scss/_variables.scss rename to common_files/static/common_files/vendor/font-awesome/scss/_variables.scss diff --git a/static/vendor/font-awesome/scss/font-awesome.scss b/common_files/static/common_files/vendor/font-awesome/scss/font-awesome.scss similarity index 100% rename from static/vendor/font-awesome/scss/font-awesome.scss rename to common_files/static/common_files/vendor/font-awesome/scss/font-awesome.scss diff --git a/static/vendor/jquery.easing.min.js b/common_files/static/common_files/vendor/jquery.easing.min.js similarity index 100% rename from static/vendor/jquery.easing.min.js rename to common_files/static/common_files/vendor/jquery.easing.min.js diff --git a/static/vendor/jquery.min.js b/common_files/static/common_files/vendor/jquery.min.js similarity index 100% rename from static/vendor/jquery.min.js rename to common_files/static/common_files/vendor/jquery.min.js diff --git a/static/vendor/scrollreveal.min.js b/common_files/static/common_files/vendor/scrollreveal.min.js similarity index 100% rename from static/vendor/scrollreveal.min.js rename to common_files/static/common_files/vendor/scrollreveal.min.js diff --git a/templates/base.html b/common_files/templates/common_files/base.html similarity index 71% rename from templates/base.html rename to common_files/templates/common_files/base.html index adb3e91..520e549 100644 --- a/templates/base.html +++ b/common_files/templates/common_files/base.html @@ -10,7 +10,7 @@ Musique fraternité - {% block titre %}{% endblock %} - {% include "include_head.html" %} + {% include "common_files/include_head.html" %} {% block extra_head %} {% endblock %} @@ -19,14 +19,14 @@ - {% include "navbar.html" %} + {% include "common_files/navbar.html" %} {% block contenu %} {% endblock %} - {% include "footer.html" %} + {% include "common_files/footer.html" %} - {% include "include_foot.html" %} + {% include "common_files/include_foot.html" %} diff --git a/templates/contact.html b/common_files/templates/common_files/contact.html similarity index 100% rename from templates/contact.html rename to common_files/templates/common_files/contact.html diff --git a/templates/footer.html b/common_files/templates/common_files/footer.html similarity index 100% rename from templates/footer.html rename to common_files/templates/common_files/footer.html diff --git a/common_files/templates/common_files/include_foot.html b/common_files/templates/common_files/include_foot.html new file mode 100644 index 0000000..f680910 --- /dev/null +++ b/common_files/templates/common_files/include_foot.html @@ -0,0 +1,14 @@ +{% load static %} + + + + + + + + + + + + + diff --git a/templates/include_head.html b/common_files/templates/common_files/include_head.html similarity index 86% rename from templates/include_head.html rename to common_files/templates/common_files/include_head.html index 793921f..25e7a60 100644 --- a/templates/include_head.html +++ b/common_files/templates/common_files/include_head.html @@ -8,7 +8,7 @@ - + @@ -17,4 +17,4 @@ - + diff --git a/templates/navbar.html b/common_files/templates/common_files/navbar.html similarity index 95% rename from templates/navbar.html rename to common_files/templates/common_files/navbar.html index 4d82a88..e32b563 100644 --- a/templates/navbar.html +++ b/common_files/templates/common_files/navbar.html @@ -7,7 +7,7 @@ Toggle navigation Menu - Logo + Logo diff --git a/common_files/tests.py b/common_files/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/common_files/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/common_files/views.py b/common_files/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/common_files/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/files/2016_09_puces_tract.pdf b/files/2016_09_puces_tract.pdf deleted file mode 100644 index 0e0cc7b..0000000 Binary files a/files/2016_09_puces_tract.pdf and /dev/null differ diff --git a/site_musique/settings/__init__.py b/site_musique/settings/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/site_musique/settings/base.py b/site_musique/settings/base.py index bdf4c12..d5501e7 100644 --- a/site_musique/settings/base.py +++ b/site_musique/settings/base.py @@ -31,6 +31,7 @@ ALLOWED_HOSTS = [] INSTALLED_APPS = [ 'site_statique.apps.SiteStatiqueConfig', 'timeline.apps.TimelineConfig', + 'common_files.apps.CommonFilesConfig', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -54,7 +55,6 @@ ROOT_URLCONF = 'site_musique.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, 'templates')], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -87,10 +87,7 @@ USE_TZ = True # https://docs.djangoproject.com/en/1.11/howto/static-files/ STATIC_URL = '/static/' - -STATICFILES_DIRS = [ - os.path.join(BASE_DIR, "static"), -] +STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' diff --git a/site_musique/wsgi.py b/site_musique/wsgi.py index c7cbc73..ab1fbe7 100644 --- a/site_musique/wsgi.py +++ b/site_musique/wsgi.py @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "site_musique.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "site_musique.settings.dev") application = get_wsgi_application() diff --git a/static/img/IllFest_2013_Corentin_Christophe.jpg b/site_statique/static/site_statique/IllFest_2013_Corentin_Christophe.jpg similarity index 100% rename from static/img/IllFest_2013_Corentin_Christophe.jpg rename to site_statique/static/site_statique/IllFest_2013_Corentin_Christophe.jpg diff --git a/static/img/direction.jpg b/site_statique/static/site_statique/direction.jpg similarity index 100% rename from static/img/direction.jpg rename to site_statique/static/site_statique/direction.jpg diff --git a/static/img/ecole.jpg b/site_statique/static/site_statique/ecole.jpg similarity index 100% rename from static/img/ecole.jpg rename to site_statique/static/site_statique/ecole.jpg diff --git a/static/img/galerie_ecole/01.jpg b/site_statique/static/site_statique/galerie_ecole/01.jpg similarity index 100% rename from static/img/galerie_ecole/01.jpg rename to site_statique/static/site_statique/galerie_ecole/01.jpg diff --git a/static/img/galerie_ecole/02.jpg b/site_statique/static/site_statique/galerie_ecole/02.jpg similarity index 100% rename from static/img/galerie_ecole/02.jpg rename to site_statique/static/site_statique/galerie_ecole/02.jpg diff --git a/static/img/galerie_ecole/03.jpg b/site_statique/static/site_statique/galerie_ecole/03.jpg similarity index 100% rename from static/img/galerie_ecole/03.jpg rename to site_statique/static/site_statique/galerie_ecole/03.jpg diff --git a/static/img/galerie_ecole/04.jpg b/site_statique/static/site_statique/galerie_ecole/04.jpg similarity index 100% rename from static/img/galerie_ecole/04.jpg rename to site_statique/static/site_statique/galerie_ecole/04.jpg diff --git a/static/img/harmonie.jpg b/site_statique/static/site_statique/harmonie.jpg similarity index 100% rename from static/img/harmonie.jpg rename to site_statique/static/site_statique/harmonie.jpg diff --git a/static/img/portfolio/thumbnails/1.jpg b/site_statique/static/site_statique/mosaique_accueil/1.jpg similarity index 100% rename from static/img/portfolio/thumbnails/1.jpg rename to site_statique/static/site_statique/mosaique_accueil/1.jpg diff --git a/static/img/portfolio/thumbnails/2.jpg b/site_statique/static/site_statique/mosaique_accueil/2.jpg similarity index 100% rename from static/img/portfolio/thumbnails/2.jpg rename to site_statique/static/site_statique/mosaique_accueil/2.jpg diff --git a/static/img/portfolio/thumbnails/3.jpg b/site_statique/static/site_statique/mosaique_accueil/3.jpg similarity index 100% rename from static/img/portfolio/thumbnails/3.jpg rename to site_statique/static/site_statique/mosaique_accueil/3.jpg diff --git a/static/img/portfolio/thumbnails/4.jpg b/site_statique/static/site_statique/mosaique_accueil/4.jpg similarity index 100% rename from static/img/portfolio/thumbnails/4.jpg rename to site_statique/static/site_statique/mosaique_accueil/4.jpg diff --git a/static/img/portfolio/thumbnails/5.jpg b/site_statique/static/site_statique/mosaique_accueil/5.jpg similarity index 100% rename from static/img/portfolio/thumbnails/5.jpg rename to site_statique/static/site_statique/mosaique_accueil/5.jpg diff --git a/static/img/portfolio/thumbnails/6.jpg b/site_statique/static/site_statique/mosaique_accueil/6.jpg similarity index 100% rename from static/img/portfolio/thumbnails/6.jpg rename to site_statique/static/site_statique/mosaique_accueil/6.jpg diff --git a/static/img/partenaires/04_credit_mutuel_2012.jpg b/site_statique/static/site_statique/partenaires/04_credit_mutuel_2012.jpg similarity index 100% rename from static/img/partenaires/04_credit_mutuel_2012.jpg rename to site_statique/static/site_statique/partenaires/04_credit_mutuel_2012.jpg diff --git a/static/img/partenaires/05_boulangerie_goetz2015_1.jpg b/site_statique/static/site_statique/partenaires/05_boulangerie_goetz2015_1.jpg similarity index 100% rename from static/img/partenaires/05_boulangerie_goetz2015_1.jpg rename to site_statique/static/site_statique/partenaires/05_boulangerie_goetz2015_1.jpg diff --git a/static/img/partenaires/Agence-culturelle-Grand-Est-rouge.jpg b/site_statique/static/site_statique/partenaires/Agence-culturelle-Grand-Est-rouge.jpg similarity index 100% rename from static/img/partenaires/Agence-culturelle-Grand-Est-rouge.jpg rename to site_statique/static/site_statique/partenaires/Agence-culturelle-Grand-Est-rouge.jpg diff --git a/static/img/partenaires/Bapst_2017-002.jpg b/site_statique/static/site_statique/partenaires/Bapst_2017-002.jpg similarity index 100% rename from static/img/partenaires/Bapst_2017-002.jpg rename to site_statique/static/site_statique/partenaires/Bapst_2017-002.jpg diff --git a/static/img/partenaires/Logo_Alsace_CD68.png b/site_statique/static/site_statique/partenaires/Logo_Alsace_CD68.png similarity index 100% rename from static/img/partenaires/Logo_Alsace_CD68.png rename to site_statique/static/site_statique/partenaires/Logo_Alsace_CD68.png diff --git a/static/img/partenaires/Meyenheim_logo.jpg b/site_statique/static/site_statique/partenaires/Meyenheim_logo.jpg similarity index 100% rename from static/img/partenaires/Meyenheim_logo.jpg rename to site_statique/static/site_statique/partenaires/Meyenheim_logo.jpg diff --git a/static/img/partenaires/Planetpizza_1-001.jpg b/site_statique/static/site_statique/partenaires/Planetpizza_1-001.jpg similarity index 100% rename from static/img/partenaires/Planetpizza_1-001.jpg rename to site_statique/static/site_statique/partenaires/Planetpizza_1-001.jpg diff --git a/static/img/partenaires/logo-couleur-CCCHR-e1423820301297.jpg b/site_statique/static/site_statique/partenaires/logo-couleur-CCCHR-e1423820301297.jpg similarity index 100% rename from static/img/partenaires/logo-couleur-CCCHR-e1423820301297.jpg rename to site_statique/static/site_statique/partenaires/logo-couleur-CCCHR-e1423820301297.jpg diff --git a/static/img/partenaires/vialis.jpg b/site_statique/static/site_statique/partenaires/vialis.jpg similarity index 100% rename from static/img/partenaires/vialis.jpg rename to site_statique/static/site_statique/partenaires/vialis.jpg diff --git a/static/img/salle.jpg b/site_statique/static/site_statique/salle.jpg similarity index 100% rename from static/img/salle.jpg rename to site_statique/static/site_statique/salle.jpg diff --git a/static/img/salle/01.jpg b/site_statique/static/site_statique/salle/01.jpg similarity index 100% rename from static/img/salle/01.jpg rename to site_statique/static/site_statique/salle/01.jpg diff --git a/static/img/trombone.gif b/site_statique/static/site_statique/trombone.gif similarity index 100% rename from static/img/trombone.gif rename to site_statique/static/site_statique/trombone.gif diff --git a/site_statique/templates/site_statique/direction.html b/site_statique/templates/site_statique/direction.html index 2862a9c..7d73654 100644 --- a/site_statique/templates/site_statique/direction.html +++ b/site_statique/templates/site_statique/direction.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "common_files/base.html" %} {% block description %}Direction de la musique de Meyenheim{% endblock %} @@ -9,7 +9,7 @@
- +
diff --git a/site_statique/templates/site_statique/ecole.html b/site_statique/templates/site_statique/ecole.html index 5c01241..8debb92 100644 --- a/site_statique/templates/site_statique/ecole.html +++ b/site_statique/templates/site_statique/ecole.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "common_files/base.html" %} {% block description %}Site de la musique de Meyenheim{% endblock %} @@ -6,7 +6,7 @@ {% load static %} {% block contenu %} -
+

École de Musique
«Les notes de l’Ill»

@@ -101,7 +101,7 @@
- icone trombone + icone trombone

Les instruments enseignés sont

  • Le chant @@ -129,16 +129,16 @@
    - Illustration école de musique + Illustration école de musique
    - Illustration école de musique + Illustration école de musique
    - Illustration école de musique + Illustration école de musique
    - Illustration école de musique + Illustration école de musique
    @@ -153,5 +153,5 @@
- {% include "contact.html" with responsable="Nathalie ROHRBACH, Directrice" email="ecole@musique-meyenheim.fr" %} + {% include "common_files/contact.html" with responsable="Nathalie ROHRBACH, Directrice" email="ecole@musique-meyenheim.fr" %} {% endblock %} diff --git a/site_statique/templates/site_statique/harmonie.html b/site_statique/templates/site_statique/harmonie.html index 3f9895c..96fe3f8 100644 --- a/site_statique/templates/site_statique/harmonie.html +++ b/site_statique/templates/site_statique/harmonie.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "common_files/base.html" %} {% block description %}Site de la musique de Meyenheim{% endblock %} @@ -6,7 +6,7 @@ {% load static %} {% block contenu %} -
+

Harmonie intercommunale Centre Haut-Rhin
Des airs traditionnels ou classiques aux musiques actuelles

@@ -30,10 +30,10 @@

L’harmonie intercommunale est née de la réunion des harmonies de Meyenheim, Oberhergheim et Réguisheim mais est ouverte à tout musicien, notamment les jeunes musiciens après quelques années de pratiques mais aussi les adultes souhaitant reprendre une activité musicale après quelques années de pause.

L’Harmonie intercommunale est financée par la Communauté de Communes Centre Haut-Rhin.

- +
- {% include "contact.html" %} + {% include "common_files/contact.html" %} {% endblock %} diff --git a/site_statique/templates/site_statique/index.html b/site_statique/templates/site_statique/index.html index 4985c55..7ebf109 100644 --- a/site_statique/templates/site_statique/index.html +++ b/site_statique/templates/site_statique/index.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "common_files/base.html" %} {% block description %}Site de la musique de Meyenheim{% endblock %} @@ -43,8 +43,8 @@
- - + +
@@ -55,8 +55,8 @@
- - + +
@@ -67,8 +67,8 @@
- - + +
@@ -79,8 +79,8 @@
- - + +
@@ -91,8 +91,8 @@
- - + +
@@ -103,8 +103,8 @@
- - + +
@@ -118,6 +118,6 @@
- {% include "contact.html" %} + {% include "common_files/contact.html" %} {% endblock %} diff --git a/site_statique/templates/site_statique/partenaires.html b/site_statique/templates/site_statique/partenaires.html index 12fd653..51affdb 100644 --- a/site_statique/templates/site_statique/partenaires.html +++ b/site_statique/templates/site_statique/partenaires.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "common_files/base.html" %} {% block description %}Site de la musique de Meyenheim{% endblock %} @@ -37,14 +37,14 @@

Nos partenaires

- - - - - - - - - + + + + + + + + +
{% endblock %} diff --git a/site_statique/templates/site_statique/salle.html b/site_statique/templates/site_statique/salle.html index b8e343a..3f83bfc 100644 --- a/site_statique/templates/site_statique/salle.html +++ b/site_statique/templates/site_statique/salle.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "common_files/base.html" %} {% block description %}Site de la musique de Meyenheim{% endblock %} @@ -6,7 +6,7 @@ {% load static %} {% block contenu %} -
+

La salle de l’association
pour tous vos évenements festifs

@@ -56,7 +56,7 @@
- Photo interieur salle + Photo interieur salle
@@ -69,5 +69,5 @@ - {% include "contact.html" with responsable="Céline TREHIOU" email="salle@musique-meyenheim.fr" adresse="Mme TREHIOU Céline
4 rue St Michel
68890 MEYENHEIM" %} + {% include "common_files/contact.html" with responsable="Céline TREHIOU" email="salle@musique-meyenheim.fr" adresse="Mme TREHIOU Céline
4 rue St Michel
68890 MEYENHEIM" %} {% endblock %} diff --git a/templates/include_foot.html b/templates/include_foot.html deleted file mode 100644 index c10ed3f..0000000 --- a/templates/include_foot.html +++ /dev/null @@ -1,14 +0,0 @@ -{% load static %} - - - - - - - - - - - - - diff --git a/static/timeline.css b/timeline/static/timeline/timeline.css similarity index 100% rename from static/timeline.css rename to timeline/static/timeline/timeline.css diff --git a/timeline/templates/timeline/evenements.html b/timeline/templates/timeline/evenements.html index 99f2f47..f26d125 100644 --- a/timeline/templates/timeline/evenements.html +++ b/timeline/templates/timeline/evenements.html @@ -1,196 +1,178 @@ +{% extends "common_files/base.html" %} + +{% block description %}Site de la musique de Meyenheim{% endblock %} + +{% block titre %}Évènements{% endblock %} + {% load static %} - - - +{% block extra_head %} + - - - - - - - Musique fraternité - Évènements - - {% include "include_head.html" %} - - - - - - - - - - {% include "navbar.html" %} + } - {% if liste_evenements %} + .timeline-body > a > img { + margin-left: auto; + margin-right: auto; + display: block; + margin-bottom: 15px; + } + + +{% endblock %} - {% for evenement in liste_evenements %} +{% block contenu %} + {% if liste_evenements %} - {% ifchanged evenement.annee evenement.evenement_passe %} + {% for evenement in liste_evenements %} - {% if not forloop.first %} - -
- - {% endif %} + {% ifchanged evenement.annee evenement.evenement_passe %} -
-
+ {% if not forloop.first %} + +
+
+ {% endif %} - {% ifchanged evenement.evenement_passe %} -
-

{{ evenement.evenement_passe | yesno:"Évènements passés, Evènements à venir" }}

-
- {% endifchanged %} +
+
- {% ifchanged evenement.annee evenement.evenement_passe %} -

{{ evenement.annee }}

- {% endifchanged %} + {% ifchanged evenement.evenement_passe %} +
+

{{ evenement.evenement_passe | yesno:"Évènements passés, Evènements à venir" }}

+
+ {% endifchanged %} -
    + {% ifchanged evenement.annee evenement.evenement_passe %} +

    {{ evenement.annee }}

    + {% endifchanged %} - {% endifchanged %} - -
  • -
    -
    -
    -

    {{ evenement.titre }}

    -

    {{ evenement.date }}
    - {{ evenement.heure_debut }} - {{ evenement.heure_fin }}
    - {{ evenement.lieu }}

    -
    -
    - {% if evenement.illustration_set.count > 1 %} - -
+

{{ evenement.description }}

- {% endif %} + + {% endwith %} + {% endif %} +
+
+ - {% endfor %} + {% if forloop.last %} + + +
+ {% endif %} - {% include "contact.html" %} - - {% include "footer.html" %} + {% endfor %} - {% include "include_foot.html" %} + {% endif %} - + if (items.length) { + function normalizeHeights() { + items.each(function() { //add heights to array + heights.push($(this).height()); + }); + tallest = Math.max.apply(null, heights); //cache largest value + items.each(function() { + $(this).css('min-height',tallest + 'px'); + }); + }; + normalizeHeights(); - - - + $(window).on('resize orientationchange', function () { + tallest = 0, heights.length = 0; //reset vars + items.each(function() { + $(this).css('min-height','0'); //reset min-height + }); + normalizeHeights(); //run it again + }); + } + })} + +{% endblock %}