From 6d072c084ef59f62b4d4ff8f1dd345874abab4d7 Mon Sep 17 00:00:00 2001 From: bkfox Date: Tue, 13 Dec 2016 20:49:13 +0100 Subject: [PATCH] supervisord & cron with virtualenv --- aircox_cms/models.py | 2 +- aircox_cms/static/aircox_cms/css/layout.css | 1 - aircox_cms/static/aircox_cms/css/theme.css | 9 ++++++--- requirements.txt | 1 + scripts/cron_diffusions | 1 + scripts/supervisord_aircox | 4 +++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/aircox_cms/models.py b/aircox_cms/models.py index 0fbbd32..90e485a 100755 --- a/aircox_cms/models.py +++ b/aircox_cms/models.py @@ -283,8 +283,8 @@ class Publication(Page): content_panels = [ MultiFieldPanel([ FieldPanel('title'), - FieldPanel('body', classname='full'), FieldPanel('summary'), + FieldPanel('body', classname='full'), ], heading=_('Content')) ] promote_panels = [ diff --git a/aircox_cms/static/aircox_cms/css/layout.css b/aircox_cms/static/aircox_cms/css/layout.css index 9a552c5..3955a5c 100755 --- a/aircox_cms/static/aircox_cms/css/layout.css +++ b/aircox_cms/static/aircox_cms/css/layout.css @@ -376,7 +376,6 @@ ul.list { } .player .item:hover .button > img.cover { - /* display: none; */ opacity: 0.2; } diff --git a/aircox_cms/static/aircox_cms/css/theme.css b/aircox_cms/static/aircox_cms/css/theme.css index 01d2ef3..f648af9 100755 --- a/aircox_cms/static/aircox_cms/css/theme.css +++ b/aircox_cms/static/aircox_cms/css/theme.css @@ -108,14 +108,17 @@ main.detail { } main.detail > header h1.title { - width: calc(70% - 0.8em); - margin: 0em; + position: relative; padding: 0.4em; + margin: 0em; + margin-bottom: -2em; background-color: rgba(255,255,255,0.8); } main.detail > header img.cover { - width: 70%; + /*width: 70%;*/ + width: 100%; + margin: auto; vertical-align: middle; display: inline-block; } diff --git a/requirements.txt b/requirements.txt index b053c6b..cbf7e3b 100755 --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,4 @@ django-modelcluster=2.0 django-honeypot>=0.5.0 django-jet>=1.0.3 + diff --git a/scripts/cron_diffusions b/scripts/cron_diffusions index 648ccbf..3a31cc1 100755 --- a/scripts/cron_diffusions +++ b/scripts/cron_diffusions @@ -2,6 +2,7 @@ # aircox daily tasks: # - diffusions monitoring for the current month +export PATH="/srv/apps/aircox/venv/bin" /srv/apps/aircox/manage.py diffusions_monitor --update --clean --check # - diffusions monitoring for the next month /srv/apps/aircox/manage.py diffusions_monitor --update --next-month diff --git a/scripts/supervisord_aircox b/scripts/supervisord_aircox index 9657e82..f172f92 100755 --- a/scripts/supervisord_aircox +++ b/scripts/supervisord_aircox @@ -21,7 +21,7 @@ autostart = true autorestart = true stdout_logfile = /srv/apps/aircox/logs/server.log redirect_stderr = true -environment=AIRCOX_DEBUG="False" +environment=AIRCOX_DEBUG="False",PATH="/srv/apps/aircox/venv/bin" [program:aircox_sounds_monitor] command = /srv/apps/aircox/manage.py sounds_monitor -qsm @@ -31,6 +31,7 @@ autostart = true autorestart = true stdout_logfile = /srv/apps/aircox/logs/sounds_monitor.log redirect_stderr = true +environment=AIRCOX_DEBUG="False",PATH="/srv/apps/aircox/venv/bin" [program:aircox_controllers] command = /srv/apps/aircox/manage.py controllers -crm @@ -40,5 +41,6 @@ autostart = true autorestart = true stdout_logfile = /srv/apps/aircox/logs/controllers.log redirect_stderr = true +environment=AIRCOX_DEBUG="False",PATH="/srv/apps/aircox/venv/bin"