From 04c6226a2a77dd34dfb8e663462c547135530ac5 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 28 Jun 2016 00:06:44 +0200 Subject: [PATCH] mv festival static dir to app --- app/magazine/models.py | 20 ++++++++++++++++++ app/organization/models.py | 20 ------------------ app/settings.py | 4 ++++ app/{festival => }/static/css/index.css | 0 .../font-awesome/fontawesome-webfont.eot | Bin .../font-awesome/fontawesome-webfont.woff | Bin .../font-awesome/fontawesome-webfont.woff2 | Bin .../interstate/interstate-bold-webfont.woff | Bin .../interstate/interstate-bold-webfont.woff2 | Bin .../interstate-extralight-webfont.eot | Bin .../interstate-extralight-webfont.svg | 0 .../interstate-extralight-webfont.ttf | Bin .../interstate-extralight-webfont.woff | Bin .../interstate-extralight-webfont.woff2 | Bin .../interstate/interstate-regular-webfont.eot | Bin .../interstate/interstate-regular-webfont.svg | 0 .../interstate/interstate-regular-webfont.ttf | Bin .../interstate-regular-webfont.woff | Bin .../interstate-regular-webfont.woff2 | Bin .../interstate/interstatelight-webfont.eot | Bin .../interstate/interstatelight-webfont.svg | 0 .../interstate/interstatelight-webfont.ttf | Bin .../interstate/interstatelight-webfont.woff | Bin .../interstate/interstatelight-webfont.woff2 | Bin .../interstate/interstatemono-lgt-webfont.eot | Bin .../interstate/interstatemono-lgt-webfont.svg | 0 .../interstate/interstatemono-lgt-webfont.ttf | Bin .../interstatemono-lgt-webfont.woff | Bin .../interstatemono-lgt-webfont.woff2 | Bin .../interstatemono-regular-webfont.eot | Bin .../interstatemono-regular-webfont.svg | 0 .../interstatemono-regular-webfont.ttf | Bin .../interstatemono-regular-webfont.woff | Bin .../interstatemono-regular-webfont.woff2 | Bin .../triplex/triplexserif-bold-webfont.eot | Bin .../triplex/triplexserif-bold-webfont.svg | 0 .../triplex/triplexserif-bold-webfont.ttf | Bin .../triplex/triplexserif-bold-webfont.woff | Bin .../triplex/triplexserif-light-webfont.eot | Bin .../triplex/triplexserif-light-webfont.svg | 0 .../triplex/triplexserif-light-webfont.ttf | Bin .../triplex/triplexserif-light-webfont.woff | Bin .../triplex/triplexserif-xbold-webfont.eot | Bin .../triplex/triplexserif-xbold-webfont.svg | 0 .../triplex/triplexserif-xbold-webfont.ttf | Bin .../triplex/triplexserif-xbold-webfont.woff | Bin .../static/img/MANZONI_DEF_avec.pdf | Bin app/{festival => }/static/img/bg.png | Bin app/{festival => }/static/img/bg@2X.png | Bin .../static/img/bg_manzoni--center.jpg | Bin .../static/img/bg_manzoni--full.jpg | Bin app/{festival => }/static/img/bg_manzoni.jpg | Bin app/{festival => }/static/img/controls.png | Bin app/{festival => }/static/img/favicon.png | Bin app/{festival => }/static/img/logo_cnrs.jpg | Bin app/{festival => }/static/img/logo_cnrs.png | Bin app/{festival => }/static/img/logo_inra.png | Bin .../static/img/logo_ircam_black.png | Bin .../static/img/logo_ircam_white.png | Bin .../static/img/logo_manifeste16_black.png | Bin .../static/img/logo_manifeste16_white.png | Bin app/{festival => }/static/img/logo_mmc.jpg | Bin app/{festival => }/static/img/logo_mmc.png | Bin app/{festival => }/static/img/logo_umpc.png | Bin app/{festival => }/static/img/logo_upmc.png | Bin app/{festival => }/static/js/index.js | 0 app/{festival => }/static/js/plugins.js | 0 .../static/js/plugins/instafeed.js | 0 .../static/js/plugins/lightslider.js | 0 .../static/js/plugins/masonry.js | 0 app/{festival => }/static/js/plugins/tabs.js | 0 app/{festival => }/static/js/tinymce_setup.js | 0 .../static/js/vendor/jquery.1.12.1.min.js | 0 .../static/js/vendor/modernizr.min.js | 0 .../static/scss/base/_buttons.scss | 0 .../static/scss/base/_defaults.scss | 0 .../static/scss/base/_forms.scss | 0 .../static/scss/base/_grid.scss | 0 .../static/scss/base/_layout.scss | 0 .../static/scss/base/_lists.scss | 0 .../static/scss/base/_tables.scss | 0 .../static/scss/base/_typography.scss | 0 .../static/scss/components/_breadcrumbs.scss | 0 .../scss/components/_embed-responsive.scss | 0 .../static/scss/components/_footers.scss | 0 .../static/scss/components/_headers.scss | 0 .../static/scss/components/_hero.scss | 0 .../static/scss/components/_media-object.scss | 0 .../static/scss/components/_menu-toggle.scss | 0 .../static/scss/components/_messages.scss | 0 .../static/scss/components/_pagination.scss | 0 .../static/scss/components/_sidebar.scss | 0 .../static/scss/components/_tags.scss | 0 .../scss/components/_utilities-forms.scss | 0 .../scss/components/_utilities-layout.scss | 0 .../static/scss/config/_variables-icons.scss | 0 .../static/scss/config/_variables.scss | 0 app/{festival => }/static/scss/index.scss | 0 .../static/scss/modules/artist-card.scss | 0 .../static/scss/modules/artist-detail.scss | 0 .../static/scss/modules/audio-player.scss | 0 .../static/scss/modules/bk-news.scss | 0 .../static/scss/modules/calendar.scss | 0 .../static/scss/modules/card.scss | 0 .../static/scss/modules/event-card.scss | 0 .../static/scss/modules/hero-slider.scss | 0 .../static/scss/modules/icons.scss | 0 .../static/scss/modules/location.scss | 0 .../static/scss/modules/pager.scss | 0 .../static/scss/modules/push-calendar.scss | 0 .../static/scss/modules/share-links.scss | 0 .../static/scss/modules/tabs.scss | 0 .../static/scss/modules/user.scss | 0 .../static/scss/modules/video-card.scss | 0 .../static/scss/pages/_home.scss | 0 .../static/scss/utils/_brands-colors.scss | 0 .../static/scss/utils/_colors.scss | 0 .../static/scss/utils/_font-stacks.scss | 0 .../static/scss/utils/_mixins.scss | 0 .../static/scss/vendors/_lightslider.scss | 0 .../static/scss/vendors/_normalize.scss | 0 etc/nginx.conf | 1 - 122 files changed, 24 insertions(+), 21 deletions(-) rename app/{festival => }/static/css/index.css (100%) rename app/{festival => }/static/fonts/font-awesome/fontawesome-webfont.eot (100%) rename app/{festival => }/static/fonts/font-awesome/fontawesome-webfont.woff (100%) rename app/{festival => }/static/fonts/font-awesome/fontawesome-webfont.woff2 (100%) rename app/{festival => }/static/fonts/interstate/interstate-bold-webfont.woff (100%) rename app/{festival => }/static/fonts/interstate/interstate-bold-webfont.woff2 (100%) rename app/{festival => }/static/fonts/interstate/interstate-extralight-webfont.eot (100%) rename app/{festival => }/static/fonts/interstate/interstate-extralight-webfont.svg (100%) rename app/{festival => }/static/fonts/interstate/interstate-extralight-webfont.ttf (100%) rename app/{festival => }/static/fonts/interstate/interstate-extralight-webfont.woff (100%) rename app/{festival => }/static/fonts/interstate/interstate-extralight-webfont.woff2 (100%) rename app/{festival => }/static/fonts/interstate/interstate-regular-webfont.eot (100%) rename app/{festival => }/static/fonts/interstate/interstate-regular-webfont.svg (100%) rename app/{festival => }/static/fonts/interstate/interstate-regular-webfont.ttf (100%) rename app/{festival => }/static/fonts/interstate/interstate-regular-webfont.woff (100%) rename app/{festival => }/static/fonts/interstate/interstate-regular-webfont.woff2 (100%) rename app/{festival => }/static/fonts/interstate/interstatelight-webfont.eot (100%) rename app/{festival => }/static/fonts/interstate/interstatelight-webfont.svg (100%) rename app/{festival => }/static/fonts/interstate/interstatelight-webfont.ttf (100%) rename app/{festival => }/static/fonts/interstate/interstatelight-webfont.woff (100%) rename app/{festival => }/static/fonts/interstate/interstatelight-webfont.woff2 (100%) rename app/{festival => }/static/fonts/interstate/interstatemono-lgt-webfont.eot (100%) rename app/{festival => }/static/fonts/interstate/interstatemono-lgt-webfont.svg (100%) rename app/{festival => }/static/fonts/interstate/interstatemono-lgt-webfont.ttf (100%) rename app/{festival => }/static/fonts/interstate/interstatemono-lgt-webfont.woff (100%) rename app/{festival => }/static/fonts/interstate/interstatemono-lgt-webfont.woff2 (100%) rename app/{festival => }/static/fonts/interstate/interstatemono-regular-webfont.eot (100%) rename app/{festival => }/static/fonts/interstate/interstatemono-regular-webfont.svg (100%) rename app/{festival => }/static/fonts/interstate/interstatemono-regular-webfont.ttf (100%) rename app/{festival => }/static/fonts/interstate/interstatemono-regular-webfont.woff (100%) rename app/{festival => }/static/fonts/interstate/interstatemono-regular-webfont.woff2 (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-bold-webfont.eot (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-bold-webfont.svg (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-bold-webfont.ttf (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-bold-webfont.woff (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-light-webfont.eot (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-light-webfont.svg (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-light-webfont.ttf (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-light-webfont.woff (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-xbold-webfont.eot (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-xbold-webfont.svg (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-xbold-webfont.ttf (100%) rename app/{festival => }/static/fonts/triplex/triplexserif-xbold-webfont.woff (100%) rename app/{festival => }/static/img/MANZONI_DEF_avec.pdf (100%) rename app/{festival => }/static/img/bg.png (100%) rename app/{festival => }/static/img/bg@2X.png (100%) rename app/{festival => }/static/img/bg_manzoni--center.jpg (100%) rename app/{festival => }/static/img/bg_manzoni--full.jpg (100%) rename app/{festival => }/static/img/bg_manzoni.jpg (100%) rename app/{festival => }/static/img/controls.png (100%) rename app/{festival => }/static/img/favicon.png (100%) rename app/{festival => }/static/img/logo_cnrs.jpg (100%) rename app/{festival => }/static/img/logo_cnrs.png (100%) rename app/{festival => }/static/img/logo_inra.png (100%) rename app/{festival => }/static/img/logo_ircam_black.png (100%) rename app/{festival => }/static/img/logo_ircam_white.png (100%) rename app/{festival => }/static/img/logo_manifeste16_black.png (100%) rename app/{festival => }/static/img/logo_manifeste16_white.png (100%) rename app/{festival => }/static/img/logo_mmc.jpg (100%) rename app/{festival => }/static/img/logo_mmc.png (100%) rename app/{festival => }/static/img/logo_umpc.png (100%) rename app/{festival => }/static/img/logo_upmc.png (100%) rename app/{festival => }/static/js/index.js (100%) rename app/{festival => }/static/js/plugins.js (100%) rename app/{festival => }/static/js/plugins/instafeed.js (100%) rename app/{festival => }/static/js/plugins/lightslider.js (100%) rename app/{festival => }/static/js/plugins/masonry.js (100%) rename app/{festival => }/static/js/plugins/tabs.js (100%) rename app/{festival => }/static/js/tinymce_setup.js (100%) rename app/{festival => }/static/js/vendor/jquery.1.12.1.min.js (100%) rename app/{festival => }/static/js/vendor/modernizr.min.js (100%) rename app/{festival => }/static/scss/base/_buttons.scss (100%) rename app/{festival => }/static/scss/base/_defaults.scss (100%) rename app/{festival => }/static/scss/base/_forms.scss (100%) rename app/{festival => }/static/scss/base/_grid.scss (100%) rename app/{festival => }/static/scss/base/_layout.scss (100%) rename app/{festival => }/static/scss/base/_lists.scss (100%) rename app/{festival => }/static/scss/base/_tables.scss (100%) rename app/{festival => }/static/scss/base/_typography.scss (100%) rename app/{festival => }/static/scss/components/_breadcrumbs.scss (100%) rename app/{festival => }/static/scss/components/_embed-responsive.scss (100%) rename app/{festival => }/static/scss/components/_footers.scss (100%) rename app/{festival => }/static/scss/components/_headers.scss (100%) rename app/{festival => }/static/scss/components/_hero.scss (100%) rename app/{festival => }/static/scss/components/_media-object.scss (100%) rename app/{festival => }/static/scss/components/_menu-toggle.scss (100%) rename app/{festival => }/static/scss/components/_messages.scss (100%) rename app/{festival => }/static/scss/components/_pagination.scss (100%) rename app/{festival => }/static/scss/components/_sidebar.scss (100%) rename app/{festival => }/static/scss/components/_tags.scss (100%) rename app/{festival => }/static/scss/components/_utilities-forms.scss (100%) rename app/{festival => }/static/scss/components/_utilities-layout.scss (100%) rename app/{festival => }/static/scss/config/_variables-icons.scss (100%) rename app/{festival => }/static/scss/config/_variables.scss (100%) rename app/{festival => }/static/scss/index.scss (100%) rename app/{festival => }/static/scss/modules/artist-card.scss (100%) rename app/{festival => }/static/scss/modules/artist-detail.scss (100%) rename app/{festival => }/static/scss/modules/audio-player.scss (100%) rename app/{festival => }/static/scss/modules/bk-news.scss (100%) rename app/{festival => }/static/scss/modules/calendar.scss (100%) rename app/{festival => }/static/scss/modules/card.scss (100%) rename app/{festival => }/static/scss/modules/event-card.scss (100%) rename app/{festival => }/static/scss/modules/hero-slider.scss (100%) rename app/{festival => }/static/scss/modules/icons.scss (100%) rename app/{festival => }/static/scss/modules/location.scss (100%) rename app/{festival => }/static/scss/modules/pager.scss (100%) rename app/{festival => }/static/scss/modules/push-calendar.scss (100%) rename app/{festival => }/static/scss/modules/share-links.scss (100%) rename app/{festival => }/static/scss/modules/tabs.scss (100%) rename app/{festival => }/static/scss/modules/user.scss (100%) rename app/{festival => }/static/scss/modules/video-card.scss (100%) rename app/{festival => }/static/scss/pages/_home.scss (100%) rename app/{festival => }/static/scss/utils/_brands-colors.scss (100%) rename app/{festival => }/static/scss/utils/_colors.scss (100%) rename app/{festival => }/static/scss/utils/_font-stacks.scss (100%) rename app/{festival => }/static/scss/utils/_mixins.scss (100%) rename app/{festival => }/static/scss/vendors/_lightslider.scss (100%) rename app/{festival => }/static/scss/vendors/_normalize.scss (100%) diff --git a/app/magazine/models.py b/app/magazine/models.py index bd4b2abe..8b53b52b 100644 --- a/app/magazine/models.py +++ b/app/magazine/models.py @@ -3,3 +3,23 @@ from __future__ import unicode_literals from django.db import models # Create your models here. + + +class Category(BaseNameModel): + """(Category description)""" + + class Meta: + verbose_name = _('category') + + def __unicode__(self): + return self.name + + +class Topic(BaseNameModel): + """(Topic description)""" + + class Meta: + verbose_name = _('topic') + + def __unicode__(self): + return self.name diff --git a/app/organization/models.py b/app/organization/models.py index 0d13ac18..cb75a72e 100644 --- a/app/organization/models.py +++ b/app/organization/models.py @@ -171,23 +171,3 @@ class Activity(models.Model): def __unicode__(self): return ' - '.join((self.person, self.role, self.date_begin, self.date_end)) - - -class Category(BaseNameModel): - """(Category description)""" - - class Meta: - verbose_name = _('category') - - def __unicode__(self): - return self.name - - -class Topic(BaseNameModel): - """(Topic description)""" - - class Meta: - verbose_name = _('topic') - - def __unicode__(self): - return self.name diff --git a/app/settings.py b/app/settings.py index 553bcc29..6408c00b 100644 --- a/app/settings.py +++ b/app/settings.py @@ -176,6 +176,10 @@ 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/" diff --git a/app/festival/static/css/index.css b/app/static/css/index.css similarity index 100% rename from app/festival/static/css/index.css rename to app/static/css/index.css diff --git a/app/festival/static/fonts/font-awesome/fontawesome-webfont.eot b/app/static/fonts/font-awesome/fontawesome-webfont.eot similarity index 100% rename from app/festival/static/fonts/font-awesome/fontawesome-webfont.eot rename to app/static/fonts/font-awesome/fontawesome-webfont.eot diff --git a/app/festival/static/fonts/font-awesome/fontawesome-webfont.woff b/app/static/fonts/font-awesome/fontawesome-webfont.woff similarity index 100% rename from app/festival/static/fonts/font-awesome/fontawesome-webfont.woff rename to app/static/fonts/font-awesome/fontawesome-webfont.woff diff --git a/app/festival/static/fonts/font-awesome/fontawesome-webfont.woff2 b/app/static/fonts/font-awesome/fontawesome-webfont.woff2 similarity index 100% rename from app/festival/static/fonts/font-awesome/fontawesome-webfont.woff2 rename to app/static/fonts/font-awesome/fontawesome-webfont.woff2 diff --git a/app/festival/static/fonts/interstate/interstate-bold-webfont.woff b/app/static/fonts/interstate/interstate-bold-webfont.woff similarity index 100% rename from app/festival/static/fonts/interstate/interstate-bold-webfont.woff rename to app/static/fonts/interstate/interstate-bold-webfont.woff diff --git a/app/festival/static/fonts/interstate/interstate-bold-webfont.woff2 b/app/static/fonts/interstate/interstate-bold-webfont.woff2 similarity index 100% rename from app/festival/static/fonts/interstate/interstate-bold-webfont.woff2 rename to app/static/fonts/interstate/interstate-bold-webfont.woff2 diff --git a/app/festival/static/fonts/interstate/interstate-extralight-webfont.eot b/app/static/fonts/interstate/interstate-extralight-webfont.eot similarity index 100% rename from app/festival/static/fonts/interstate/interstate-extralight-webfont.eot rename to app/static/fonts/interstate/interstate-extralight-webfont.eot diff --git a/app/festival/static/fonts/interstate/interstate-extralight-webfont.svg b/app/static/fonts/interstate/interstate-extralight-webfont.svg similarity index 100% rename from app/festival/static/fonts/interstate/interstate-extralight-webfont.svg rename to app/static/fonts/interstate/interstate-extralight-webfont.svg diff --git a/app/festival/static/fonts/interstate/interstate-extralight-webfont.ttf b/app/static/fonts/interstate/interstate-extralight-webfont.ttf similarity index 100% rename from app/festival/static/fonts/interstate/interstate-extralight-webfont.ttf rename to app/static/fonts/interstate/interstate-extralight-webfont.ttf diff --git a/app/festival/static/fonts/interstate/interstate-extralight-webfont.woff b/app/static/fonts/interstate/interstate-extralight-webfont.woff similarity index 100% rename from app/festival/static/fonts/interstate/interstate-extralight-webfont.woff rename to app/static/fonts/interstate/interstate-extralight-webfont.woff diff --git a/app/festival/static/fonts/interstate/interstate-extralight-webfont.woff2 b/app/static/fonts/interstate/interstate-extralight-webfont.woff2 similarity index 100% rename from app/festival/static/fonts/interstate/interstate-extralight-webfont.woff2 rename to app/static/fonts/interstate/interstate-extralight-webfont.woff2 diff --git a/app/festival/static/fonts/interstate/interstate-regular-webfont.eot b/app/static/fonts/interstate/interstate-regular-webfont.eot similarity index 100% rename from app/festival/static/fonts/interstate/interstate-regular-webfont.eot rename to app/static/fonts/interstate/interstate-regular-webfont.eot diff --git a/app/festival/static/fonts/interstate/interstate-regular-webfont.svg b/app/static/fonts/interstate/interstate-regular-webfont.svg similarity index 100% rename from app/festival/static/fonts/interstate/interstate-regular-webfont.svg rename to app/static/fonts/interstate/interstate-regular-webfont.svg diff --git a/app/festival/static/fonts/interstate/interstate-regular-webfont.ttf b/app/static/fonts/interstate/interstate-regular-webfont.ttf similarity index 100% rename from app/festival/static/fonts/interstate/interstate-regular-webfont.ttf rename to app/static/fonts/interstate/interstate-regular-webfont.ttf diff --git a/app/festival/static/fonts/interstate/interstate-regular-webfont.woff b/app/static/fonts/interstate/interstate-regular-webfont.woff similarity index 100% rename from app/festival/static/fonts/interstate/interstate-regular-webfont.woff rename to app/static/fonts/interstate/interstate-regular-webfont.woff diff --git a/app/festival/static/fonts/interstate/interstate-regular-webfont.woff2 b/app/static/fonts/interstate/interstate-regular-webfont.woff2 similarity index 100% rename from app/festival/static/fonts/interstate/interstate-regular-webfont.woff2 rename to app/static/fonts/interstate/interstate-regular-webfont.woff2 diff --git a/app/festival/static/fonts/interstate/interstatelight-webfont.eot b/app/static/fonts/interstate/interstatelight-webfont.eot similarity index 100% rename from app/festival/static/fonts/interstate/interstatelight-webfont.eot rename to app/static/fonts/interstate/interstatelight-webfont.eot diff --git a/app/festival/static/fonts/interstate/interstatelight-webfont.svg b/app/static/fonts/interstate/interstatelight-webfont.svg similarity index 100% rename from app/festival/static/fonts/interstate/interstatelight-webfont.svg rename to app/static/fonts/interstate/interstatelight-webfont.svg diff --git a/app/festival/static/fonts/interstate/interstatelight-webfont.ttf b/app/static/fonts/interstate/interstatelight-webfont.ttf similarity index 100% rename from app/festival/static/fonts/interstate/interstatelight-webfont.ttf rename to app/static/fonts/interstate/interstatelight-webfont.ttf diff --git a/app/festival/static/fonts/interstate/interstatelight-webfont.woff b/app/static/fonts/interstate/interstatelight-webfont.woff similarity index 100% rename from app/festival/static/fonts/interstate/interstatelight-webfont.woff rename to app/static/fonts/interstate/interstatelight-webfont.woff diff --git a/app/festival/static/fonts/interstate/interstatelight-webfont.woff2 b/app/static/fonts/interstate/interstatelight-webfont.woff2 similarity index 100% rename from app/festival/static/fonts/interstate/interstatelight-webfont.woff2 rename to app/static/fonts/interstate/interstatelight-webfont.woff2 diff --git a/app/festival/static/fonts/interstate/interstatemono-lgt-webfont.eot b/app/static/fonts/interstate/interstatemono-lgt-webfont.eot similarity index 100% rename from app/festival/static/fonts/interstate/interstatemono-lgt-webfont.eot rename to app/static/fonts/interstate/interstatemono-lgt-webfont.eot diff --git a/app/festival/static/fonts/interstate/interstatemono-lgt-webfont.svg b/app/static/fonts/interstate/interstatemono-lgt-webfont.svg similarity index 100% rename from app/festival/static/fonts/interstate/interstatemono-lgt-webfont.svg rename to app/static/fonts/interstate/interstatemono-lgt-webfont.svg diff --git a/app/festival/static/fonts/interstate/interstatemono-lgt-webfont.ttf b/app/static/fonts/interstate/interstatemono-lgt-webfont.ttf similarity index 100% rename from app/festival/static/fonts/interstate/interstatemono-lgt-webfont.ttf rename to app/static/fonts/interstate/interstatemono-lgt-webfont.ttf diff --git a/app/festival/static/fonts/interstate/interstatemono-lgt-webfont.woff b/app/static/fonts/interstate/interstatemono-lgt-webfont.woff similarity index 100% rename from app/festival/static/fonts/interstate/interstatemono-lgt-webfont.woff rename to app/static/fonts/interstate/interstatemono-lgt-webfont.woff diff --git a/app/festival/static/fonts/interstate/interstatemono-lgt-webfont.woff2 b/app/static/fonts/interstate/interstatemono-lgt-webfont.woff2 similarity index 100% rename from app/festival/static/fonts/interstate/interstatemono-lgt-webfont.woff2 rename to app/static/fonts/interstate/interstatemono-lgt-webfont.woff2 diff --git a/app/festival/static/fonts/interstate/interstatemono-regular-webfont.eot b/app/static/fonts/interstate/interstatemono-regular-webfont.eot similarity index 100% rename from app/festival/static/fonts/interstate/interstatemono-regular-webfont.eot rename to app/static/fonts/interstate/interstatemono-regular-webfont.eot diff --git a/app/festival/static/fonts/interstate/interstatemono-regular-webfont.svg b/app/static/fonts/interstate/interstatemono-regular-webfont.svg similarity index 100% rename from app/festival/static/fonts/interstate/interstatemono-regular-webfont.svg rename to app/static/fonts/interstate/interstatemono-regular-webfont.svg diff --git a/app/festival/static/fonts/interstate/interstatemono-regular-webfont.ttf b/app/static/fonts/interstate/interstatemono-regular-webfont.ttf similarity index 100% rename from app/festival/static/fonts/interstate/interstatemono-regular-webfont.ttf rename to app/static/fonts/interstate/interstatemono-regular-webfont.ttf diff --git a/app/festival/static/fonts/interstate/interstatemono-regular-webfont.woff b/app/static/fonts/interstate/interstatemono-regular-webfont.woff similarity index 100% rename from app/festival/static/fonts/interstate/interstatemono-regular-webfont.woff rename to app/static/fonts/interstate/interstatemono-regular-webfont.woff diff --git a/app/festival/static/fonts/interstate/interstatemono-regular-webfont.woff2 b/app/static/fonts/interstate/interstatemono-regular-webfont.woff2 similarity index 100% rename from app/festival/static/fonts/interstate/interstatemono-regular-webfont.woff2 rename to app/static/fonts/interstate/interstatemono-regular-webfont.woff2 diff --git a/app/festival/static/fonts/triplex/triplexserif-bold-webfont.eot b/app/static/fonts/triplex/triplexserif-bold-webfont.eot similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-bold-webfont.eot rename to app/static/fonts/triplex/triplexserif-bold-webfont.eot diff --git a/app/festival/static/fonts/triplex/triplexserif-bold-webfont.svg b/app/static/fonts/triplex/triplexserif-bold-webfont.svg similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-bold-webfont.svg rename to app/static/fonts/triplex/triplexserif-bold-webfont.svg diff --git a/app/festival/static/fonts/triplex/triplexserif-bold-webfont.ttf b/app/static/fonts/triplex/triplexserif-bold-webfont.ttf similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-bold-webfont.ttf rename to app/static/fonts/triplex/triplexserif-bold-webfont.ttf diff --git a/app/festival/static/fonts/triplex/triplexserif-bold-webfont.woff b/app/static/fonts/triplex/triplexserif-bold-webfont.woff similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-bold-webfont.woff rename to app/static/fonts/triplex/triplexserif-bold-webfont.woff diff --git a/app/festival/static/fonts/triplex/triplexserif-light-webfont.eot b/app/static/fonts/triplex/triplexserif-light-webfont.eot similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-light-webfont.eot rename to app/static/fonts/triplex/triplexserif-light-webfont.eot diff --git a/app/festival/static/fonts/triplex/triplexserif-light-webfont.svg b/app/static/fonts/triplex/triplexserif-light-webfont.svg similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-light-webfont.svg rename to app/static/fonts/triplex/triplexserif-light-webfont.svg diff --git a/app/festival/static/fonts/triplex/triplexserif-light-webfont.ttf b/app/static/fonts/triplex/triplexserif-light-webfont.ttf similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-light-webfont.ttf rename to app/static/fonts/triplex/triplexserif-light-webfont.ttf diff --git a/app/festival/static/fonts/triplex/triplexserif-light-webfont.woff b/app/static/fonts/triplex/triplexserif-light-webfont.woff similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-light-webfont.woff rename to app/static/fonts/triplex/triplexserif-light-webfont.woff diff --git a/app/festival/static/fonts/triplex/triplexserif-xbold-webfont.eot b/app/static/fonts/triplex/triplexserif-xbold-webfont.eot similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-xbold-webfont.eot rename to app/static/fonts/triplex/triplexserif-xbold-webfont.eot diff --git a/app/festival/static/fonts/triplex/triplexserif-xbold-webfont.svg b/app/static/fonts/triplex/triplexserif-xbold-webfont.svg similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-xbold-webfont.svg rename to app/static/fonts/triplex/triplexserif-xbold-webfont.svg diff --git a/app/festival/static/fonts/triplex/triplexserif-xbold-webfont.ttf b/app/static/fonts/triplex/triplexserif-xbold-webfont.ttf similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-xbold-webfont.ttf rename to app/static/fonts/triplex/triplexserif-xbold-webfont.ttf diff --git a/app/festival/static/fonts/triplex/triplexserif-xbold-webfont.woff b/app/static/fonts/triplex/triplexserif-xbold-webfont.woff similarity index 100% rename from app/festival/static/fonts/triplex/triplexserif-xbold-webfont.woff rename to app/static/fonts/triplex/triplexserif-xbold-webfont.woff diff --git a/app/festival/static/img/MANZONI_DEF_avec.pdf b/app/static/img/MANZONI_DEF_avec.pdf similarity index 100% rename from app/festival/static/img/MANZONI_DEF_avec.pdf rename to app/static/img/MANZONI_DEF_avec.pdf diff --git a/app/festival/static/img/bg.png b/app/static/img/bg.png similarity index 100% rename from app/festival/static/img/bg.png rename to app/static/img/bg.png diff --git a/app/festival/static/img/bg@2X.png b/app/static/img/bg@2X.png similarity index 100% rename from app/festival/static/img/bg@2X.png rename to app/static/img/bg@2X.png diff --git a/app/festival/static/img/bg_manzoni--center.jpg b/app/static/img/bg_manzoni--center.jpg similarity index 100% rename from app/festival/static/img/bg_manzoni--center.jpg rename to app/static/img/bg_manzoni--center.jpg diff --git a/app/festival/static/img/bg_manzoni--full.jpg b/app/static/img/bg_manzoni--full.jpg similarity index 100% rename from app/festival/static/img/bg_manzoni--full.jpg rename to app/static/img/bg_manzoni--full.jpg diff --git a/app/festival/static/img/bg_manzoni.jpg b/app/static/img/bg_manzoni.jpg similarity index 100% rename from app/festival/static/img/bg_manzoni.jpg rename to app/static/img/bg_manzoni.jpg diff --git a/app/festival/static/img/controls.png b/app/static/img/controls.png similarity index 100% rename from app/festival/static/img/controls.png rename to app/static/img/controls.png diff --git a/app/festival/static/img/favicon.png b/app/static/img/favicon.png similarity index 100% rename from app/festival/static/img/favicon.png rename to app/static/img/favicon.png diff --git a/app/festival/static/img/logo_cnrs.jpg b/app/static/img/logo_cnrs.jpg similarity index 100% rename from app/festival/static/img/logo_cnrs.jpg rename to app/static/img/logo_cnrs.jpg diff --git a/app/festival/static/img/logo_cnrs.png b/app/static/img/logo_cnrs.png similarity index 100% rename from app/festival/static/img/logo_cnrs.png rename to app/static/img/logo_cnrs.png diff --git a/app/festival/static/img/logo_inra.png b/app/static/img/logo_inra.png similarity index 100% rename from app/festival/static/img/logo_inra.png rename to app/static/img/logo_inra.png diff --git a/app/festival/static/img/logo_ircam_black.png b/app/static/img/logo_ircam_black.png similarity index 100% rename from app/festival/static/img/logo_ircam_black.png rename to app/static/img/logo_ircam_black.png diff --git a/app/festival/static/img/logo_ircam_white.png b/app/static/img/logo_ircam_white.png similarity index 100% rename from app/festival/static/img/logo_ircam_white.png rename to app/static/img/logo_ircam_white.png diff --git a/app/festival/static/img/logo_manifeste16_black.png b/app/static/img/logo_manifeste16_black.png similarity index 100% rename from app/festival/static/img/logo_manifeste16_black.png rename to app/static/img/logo_manifeste16_black.png diff --git a/app/festival/static/img/logo_manifeste16_white.png b/app/static/img/logo_manifeste16_white.png similarity index 100% rename from app/festival/static/img/logo_manifeste16_white.png rename to app/static/img/logo_manifeste16_white.png diff --git a/app/festival/static/img/logo_mmc.jpg b/app/static/img/logo_mmc.jpg similarity index 100% rename from app/festival/static/img/logo_mmc.jpg rename to app/static/img/logo_mmc.jpg diff --git a/app/festival/static/img/logo_mmc.png b/app/static/img/logo_mmc.png similarity index 100% rename from app/festival/static/img/logo_mmc.png rename to app/static/img/logo_mmc.png diff --git a/app/festival/static/img/logo_umpc.png b/app/static/img/logo_umpc.png similarity index 100% rename from app/festival/static/img/logo_umpc.png rename to app/static/img/logo_umpc.png diff --git a/app/festival/static/img/logo_upmc.png b/app/static/img/logo_upmc.png similarity index 100% rename from app/festival/static/img/logo_upmc.png rename to app/static/img/logo_upmc.png diff --git a/app/festival/static/js/index.js b/app/static/js/index.js similarity index 100% rename from app/festival/static/js/index.js rename to app/static/js/index.js diff --git a/app/festival/static/js/plugins.js b/app/static/js/plugins.js similarity index 100% rename from app/festival/static/js/plugins.js rename to app/static/js/plugins.js diff --git a/app/festival/static/js/plugins/instafeed.js b/app/static/js/plugins/instafeed.js similarity index 100% rename from app/festival/static/js/plugins/instafeed.js rename to app/static/js/plugins/instafeed.js diff --git a/app/festival/static/js/plugins/lightslider.js b/app/static/js/plugins/lightslider.js similarity index 100% rename from app/festival/static/js/plugins/lightslider.js rename to app/static/js/plugins/lightslider.js diff --git a/app/festival/static/js/plugins/masonry.js b/app/static/js/plugins/masonry.js similarity index 100% rename from app/festival/static/js/plugins/masonry.js rename to app/static/js/plugins/masonry.js diff --git a/app/festival/static/js/plugins/tabs.js b/app/static/js/plugins/tabs.js similarity index 100% rename from app/festival/static/js/plugins/tabs.js rename to app/static/js/plugins/tabs.js diff --git a/app/festival/static/js/tinymce_setup.js b/app/static/js/tinymce_setup.js similarity index 100% rename from app/festival/static/js/tinymce_setup.js rename to app/static/js/tinymce_setup.js diff --git a/app/festival/static/js/vendor/jquery.1.12.1.min.js b/app/static/js/vendor/jquery.1.12.1.min.js similarity index 100% rename from app/festival/static/js/vendor/jquery.1.12.1.min.js rename to app/static/js/vendor/jquery.1.12.1.min.js diff --git a/app/festival/static/js/vendor/modernizr.min.js b/app/static/js/vendor/modernizr.min.js similarity index 100% rename from app/festival/static/js/vendor/modernizr.min.js rename to app/static/js/vendor/modernizr.min.js diff --git a/app/festival/static/scss/base/_buttons.scss b/app/static/scss/base/_buttons.scss similarity index 100% rename from app/festival/static/scss/base/_buttons.scss rename to app/static/scss/base/_buttons.scss diff --git a/app/festival/static/scss/base/_defaults.scss b/app/static/scss/base/_defaults.scss similarity index 100% rename from app/festival/static/scss/base/_defaults.scss rename to app/static/scss/base/_defaults.scss diff --git a/app/festival/static/scss/base/_forms.scss b/app/static/scss/base/_forms.scss similarity index 100% rename from app/festival/static/scss/base/_forms.scss rename to app/static/scss/base/_forms.scss diff --git a/app/festival/static/scss/base/_grid.scss b/app/static/scss/base/_grid.scss similarity index 100% rename from app/festival/static/scss/base/_grid.scss rename to app/static/scss/base/_grid.scss diff --git a/app/festival/static/scss/base/_layout.scss b/app/static/scss/base/_layout.scss similarity index 100% rename from app/festival/static/scss/base/_layout.scss rename to app/static/scss/base/_layout.scss diff --git a/app/festival/static/scss/base/_lists.scss b/app/static/scss/base/_lists.scss similarity index 100% rename from app/festival/static/scss/base/_lists.scss rename to app/static/scss/base/_lists.scss diff --git a/app/festival/static/scss/base/_tables.scss b/app/static/scss/base/_tables.scss similarity index 100% rename from app/festival/static/scss/base/_tables.scss rename to app/static/scss/base/_tables.scss diff --git a/app/festival/static/scss/base/_typography.scss b/app/static/scss/base/_typography.scss similarity index 100% rename from app/festival/static/scss/base/_typography.scss rename to app/static/scss/base/_typography.scss diff --git a/app/festival/static/scss/components/_breadcrumbs.scss b/app/static/scss/components/_breadcrumbs.scss similarity index 100% rename from app/festival/static/scss/components/_breadcrumbs.scss rename to app/static/scss/components/_breadcrumbs.scss diff --git a/app/festival/static/scss/components/_embed-responsive.scss b/app/static/scss/components/_embed-responsive.scss similarity index 100% rename from app/festival/static/scss/components/_embed-responsive.scss rename to app/static/scss/components/_embed-responsive.scss diff --git a/app/festival/static/scss/components/_footers.scss b/app/static/scss/components/_footers.scss similarity index 100% rename from app/festival/static/scss/components/_footers.scss rename to app/static/scss/components/_footers.scss diff --git a/app/festival/static/scss/components/_headers.scss b/app/static/scss/components/_headers.scss similarity index 100% rename from app/festival/static/scss/components/_headers.scss rename to app/static/scss/components/_headers.scss diff --git a/app/festival/static/scss/components/_hero.scss b/app/static/scss/components/_hero.scss similarity index 100% rename from app/festival/static/scss/components/_hero.scss rename to app/static/scss/components/_hero.scss diff --git a/app/festival/static/scss/components/_media-object.scss b/app/static/scss/components/_media-object.scss similarity index 100% rename from app/festival/static/scss/components/_media-object.scss rename to app/static/scss/components/_media-object.scss diff --git a/app/festival/static/scss/components/_menu-toggle.scss b/app/static/scss/components/_menu-toggle.scss similarity index 100% rename from app/festival/static/scss/components/_menu-toggle.scss rename to app/static/scss/components/_menu-toggle.scss diff --git a/app/festival/static/scss/components/_messages.scss b/app/static/scss/components/_messages.scss similarity index 100% rename from app/festival/static/scss/components/_messages.scss rename to app/static/scss/components/_messages.scss diff --git a/app/festival/static/scss/components/_pagination.scss b/app/static/scss/components/_pagination.scss similarity index 100% rename from app/festival/static/scss/components/_pagination.scss rename to app/static/scss/components/_pagination.scss diff --git a/app/festival/static/scss/components/_sidebar.scss b/app/static/scss/components/_sidebar.scss similarity index 100% rename from app/festival/static/scss/components/_sidebar.scss rename to app/static/scss/components/_sidebar.scss diff --git a/app/festival/static/scss/components/_tags.scss b/app/static/scss/components/_tags.scss similarity index 100% rename from app/festival/static/scss/components/_tags.scss rename to app/static/scss/components/_tags.scss diff --git a/app/festival/static/scss/components/_utilities-forms.scss b/app/static/scss/components/_utilities-forms.scss similarity index 100% rename from app/festival/static/scss/components/_utilities-forms.scss rename to app/static/scss/components/_utilities-forms.scss diff --git a/app/festival/static/scss/components/_utilities-layout.scss b/app/static/scss/components/_utilities-layout.scss similarity index 100% rename from app/festival/static/scss/components/_utilities-layout.scss rename to app/static/scss/components/_utilities-layout.scss diff --git a/app/festival/static/scss/config/_variables-icons.scss b/app/static/scss/config/_variables-icons.scss similarity index 100% rename from app/festival/static/scss/config/_variables-icons.scss rename to app/static/scss/config/_variables-icons.scss diff --git a/app/festival/static/scss/config/_variables.scss b/app/static/scss/config/_variables.scss similarity index 100% rename from app/festival/static/scss/config/_variables.scss rename to app/static/scss/config/_variables.scss diff --git a/app/festival/static/scss/index.scss b/app/static/scss/index.scss similarity index 100% rename from app/festival/static/scss/index.scss rename to app/static/scss/index.scss diff --git a/app/festival/static/scss/modules/artist-card.scss b/app/static/scss/modules/artist-card.scss similarity index 100% rename from app/festival/static/scss/modules/artist-card.scss rename to app/static/scss/modules/artist-card.scss diff --git a/app/festival/static/scss/modules/artist-detail.scss b/app/static/scss/modules/artist-detail.scss similarity index 100% rename from app/festival/static/scss/modules/artist-detail.scss rename to app/static/scss/modules/artist-detail.scss diff --git a/app/festival/static/scss/modules/audio-player.scss b/app/static/scss/modules/audio-player.scss similarity index 100% rename from app/festival/static/scss/modules/audio-player.scss rename to app/static/scss/modules/audio-player.scss diff --git a/app/festival/static/scss/modules/bk-news.scss b/app/static/scss/modules/bk-news.scss similarity index 100% rename from app/festival/static/scss/modules/bk-news.scss rename to app/static/scss/modules/bk-news.scss diff --git a/app/festival/static/scss/modules/calendar.scss b/app/static/scss/modules/calendar.scss similarity index 100% rename from app/festival/static/scss/modules/calendar.scss rename to app/static/scss/modules/calendar.scss diff --git a/app/festival/static/scss/modules/card.scss b/app/static/scss/modules/card.scss similarity index 100% rename from app/festival/static/scss/modules/card.scss rename to app/static/scss/modules/card.scss diff --git a/app/festival/static/scss/modules/event-card.scss b/app/static/scss/modules/event-card.scss similarity index 100% rename from app/festival/static/scss/modules/event-card.scss rename to app/static/scss/modules/event-card.scss diff --git a/app/festival/static/scss/modules/hero-slider.scss b/app/static/scss/modules/hero-slider.scss similarity index 100% rename from app/festival/static/scss/modules/hero-slider.scss rename to app/static/scss/modules/hero-slider.scss diff --git a/app/festival/static/scss/modules/icons.scss b/app/static/scss/modules/icons.scss similarity index 100% rename from app/festival/static/scss/modules/icons.scss rename to app/static/scss/modules/icons.scss diff --git a/app/festival/static/scss/modules/location.scss b/app/static/scss/modules/location.scss similarity index 100% rename from app/festival/static/scss/modules/location.scss rename to app/static/scss/modules/location.scss diff --git a/app/festival/static/scss/modules/pager.scss b/app/static/scss/modules/pager.scss similarity index 100% rename from app/festival/static/scss/modules/pager.scss rename to app/static/scss/modules/pager.scss diff --git a/app/festival/static/scss/modules/push-calendar.scss b/app/static/scss/modules/push-calendar.scss similarity index 100% rename from app/festival/static/scss/modules/push-calendar.scss rename to app/static/scss/modules/push-calendar.scss diff --git a/app/festival/static/scss/modules/share-links.scss b/app/static/scss/modules/share-links.scss similarity index 100% rename from app/festival/static/scss/modules/share-links.scss rename to app/static/scss/modules/share-links.scss diff --git a/app/festival/static/scss/modules/tabs.scss b/app/static/scss/modules/tabs.scss similarity index 100% rename from app/festival/static/scss/modules/tabs.scss rename to app/static/scss/modules/tabs.scss diff --git a/app/festival/static/scss/modules/user.scss b/app/static/scss/modules/user.scss similarity index 100% rename from app/festival/static/scss/modules/user.scss rename to app/static/scss/modules/user.scss diff --git a/app/festival/static/scss/modules/video-card.scss b/app/static/scss/modules/video-card.scss similarity index 100% rename from app/festival/static/scss/modules/video-card.scss rename to app/static/scss/modules/video-card.scss diff --git a/app/festival/static/scss/pages/_home.scss b/app/static/scss/pages/_home.scss similarity index 100% rename from app/festival/static/scss/pages/_home.scss rename to app/static/scss/pages/_home.scss diff --git a/app/festival/static/scss/utils/_brands-colors.scss b/app/static/scss/utils/_brands-colors.scss similarity index 100% rename from app/festival/static/scss/utils/_brands-colors.scss rename to app/static/scss/utils/_brands-colors.scss diff --git a/app/festival/static/scss/utils/_colors.scss b/app/static/scss/utils/_colors.scss similarity index 100% rename from app/festival/static/scss/utils/_colors.scss rename to app/static/scss/utils/_colors.scss diff --git a/app/festival/static/scss/utils/_font-stacks.scss b/app/static/scss/utils/_font-stacks.scss similarity index 100% rename from app/festival/static/scss/utils/_font-stacks.scss rename to app/static/scss/utils/_font-stacks.scss diff --git a/app/festival/static/scss/utils/_mixins.scss b/app/static/scss/utils/_mixins.scss similarity index 100% rename from app/festival/static/scss/utils/_mixins.scss rename to app/static/scss/utils/_mixins.scss diff --git a/app/festival/static/scss/vendors/_lightslider.scss b/app/static/scss/vendors/_lightslider.scss similarity index 100% rename from app/festival/static/scss/vendors/_lightslider.scss rename to app/static/scss/vendors/_lightslider.scss diff --git a/app/festival/static/scss/vendors/_normalize.scss b/app/static/scss/vendors/_normalize.scss similarity index 100% rename from app/festival/static/scss/vendors/_normalize.scss rename to app/static/scss/vendors/_normalize.scss diff --git a/etc/nginx.conf b/etc/nginx.conf index 3f89e871..decdcff4 100644 --- a/etc/nginx.conf +++ b/etc/nginx.conf @@ -2,7 +2,6 @@ server_tokens off; server { listen 80; - server_name messiaen.ircam.fr nginx; charset utf-8; access_log /var/log/nginx/app-access.log; -- 2.39.5