upgrade django, update DB name

diff --git a/app/festival/management/commands/wait-for-db.py b/app/festival/management/commands/wait-for-db.py
index f55207c9a09579e2c56923aa87cd1cc469dba13c..e2bacf003a1c3eaacc5728640d5d2047b4232d37 100644 (file)
--- a/app/festival/management/commands/wait-for-db.py
+++ b/app/festival/management/commands/wait-for-db.py
@@ -10,7 +10,7 @@ class Command(BaseCommand):
     help = "wait for default DB connection"
 
     db_name = 'default'
-    N = 10
+    N = 20
 
     def handle(self, *args, **options):
         i = 0

diff --git a/app/local_settings.py b/app/local_settings.py
index 800a2655f677821862570a8149e8a248edcab31c..c6bf5b5ff5167d42e5b815a3d8b635676e11d98c 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -89,6 +89,8 @@ ADMIN_MENU_ORDER = (
         "festival.PageCategory",)),
 )
 
+GRAPPELLI_ADMIN_TITLE = 'IRCAM Admin'
+
 SEARCH_MODEL_CHOICES = ()
 
 RATINGS_ACCOUNT_REQUIRED = True

diff --git a/app/templates/includes/slider.html b/app/templates/includes/slider.html
new file mode 100644 (file)
index 0000000..6c6a887
--- /dev/null
+++ b/app/templates/includes/slider.html
@@ -0,0 +1,18 @@
+{% load i18n event_tags festival_tags mezzanine_tags %}
+<div class="hero__slider">
+    <ul id="lightSlider">
+        {% featured_events as events %}
+        {% for event in events %}
+          <li class="hero__slider__item" style="background-image: url({{ MEDIA_URL }}{% thumbnail event.featured_image_header 1920 0 %});">
+              <div class="hero__slider__infos">
+                <div class="container">
+                  <p class="hero__slider__name">
+                      <a href="{{ event.get_absolute_url }}">{{ event.title }}</a>
+                  </p>
+                  {% include "agenda/includes/event_metainfo_slider.html" %}
+                </div>
+              </div>
+          </li>
+        {% endfor %}
+    </ul>
+</div>

diff --git a/docker-compose.yml b/docker-compose.yml
index 6475806133845c9b0cd9043a4e7d3f2ca8ed0a1d..6099fbda2bdf9115960ecf108fcd3b49930d3df8 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,7 @@ db:
     - ./data/mysql/:/var/lib/mysql
   environment:
     - MYSQL_ROOT_PASSWORD=hyRob0otlaz4
-    - MYSQL_DATABASE=ircam
+    - MYSQL_DATABASE=ircam-www
     - MYSQL_USER=ircam
     - MYSQL_PASSWORD=Onukifsid7
 

diff --git a/requirements.txt b/requirements.txt
index 14380455c12a1e080c0ab292520e6c0fe3bef3f4..423e25ec77facbdf25b4dbef5ea881f80f26e7be 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ setuptools
 uwsgi
 watchdog
 mysqlclient
-Django==1.9.2
+Django==1.9.7
 mezzanine==4.1.0
 django-modeltranslation
 django-meta

diff --git a/scripts/backup_db.sh b/scripts/backup_db.sh
index a0660006b2aaee8229c51da4fe822674d80f3322..43b57a3fe26ae6bbb69652accac7952b24bb0671 100755 (executable)
--- a/scripts/backup_db.sh
+++ b/scripts/backup_db.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-mysqldump -hdb -uroot -phyRob0otlaz4 manifeste | gzip > /srv/backup/manifeste.sql.gz
+mysqldump -hdb -uroot -phyRob0otlaz4 ircam-www | gzip > /srv/backup/ircam-www.sql.gz
 echo "Backup done!"

diff --git a/scripts/restore_db.sh b/scripts/restore_db.sh
index 04a3f7254d3336fa059276c79062920984f71c14..559caac449e85c4897cb0d60f6f705d88ec88d93 100755 (executable)
--- a/scripts/restore_db.sh
+++ b/scripts/restore_db.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-gunzip < /srv/backup/manifeste.sql.gz | mysql -hdb -uroot -phyRob0otlaz4 manifeste
+gunzip < /srv/backup/ircam-www.sql.gz | mysql -hdb -uroot -phyRob0otlaz4 ircam-www
 echo "Restore done!"