From b8d6c435d2ae15f4a45622f40463092c229fdde5 Mon Sep 17 00:00:00 2001 From: bkfox Date: Mon, 14 Nov 2016 13:35:15 +0100 Subject: [PATCH] fix bugs on signals --- LICENSE | 0 Manifest.in | 0 README.md | 0 __init__.py | 0 aircox/README.md | 0 aircox/admin.py | 2 +- aircox/apps.py | 0 aircox/connector.py | 0 aircox/controllers.py | 0 aircox/locale/fr/LC_MESSAGES/django.po | 0 aircox/management/__init__.py | 0 aircox/management/commands/__init__.py | 0 .../management/commands/diffusions_monitor.py | 0 aircox/management/commands/import_playlist.py | 0 aircox/management/commands/sounds_monitor.py | 0 .../commands/sounds_quality_check.py | 0 aircox/management/commands/streamer.py | 0 aircox/signals.py | 5 +++ aircox/static/aircox/css/layout.css | 0 aircox/templates/aircox/config/liquidsoap.liq | 0 .../aircox/controllers/base_site.html | 0 .../templates/aircox/controllers/monitor.html | 0 .../templates/aircox/controllers/stats.html | 20 ++++++----- aircox/urls.py | 0 aircox/utils.py | 0 aircox_cms/__init__.py | 0 aircox_cms/admin.py | 0 aircox_cms/apps.py | 0 aircox_cms/forms.py | 0 aircox_cms/locale/fr/LC_MESSAGES/django.po | 0 .../management/commands/programs_to_cms.py | 0 aircox_cms/models.py | 0 aircox_cms/sections.py | 31 +++++++++++------- aircox_cms/signals.py | 19 +++++------ aircox_cms/static/aircox_cms/css/cms.css | 0 aircox_cms/static/aircox_cms/css/layout.css | 0 aircox_cms/static/aircox_cms/css/theme.css | 0 .../static/aircox_cms/images/LICENSE.TXT | 0 aircox_cms/static/aircox_cms/images/README.md | 0 aircox_cms/static/aircox_cms/images/add.png | Bin aircox_cms/static/aircox_cms/images/clock.png | Bin .../static/aircox_cms/images/comments.png | Bin .../static/aircox_cms/images/facebook.png | Bin aircox_cms/static/aircox_cms/images/feed.png | Bin aircox_cms/static/aircox_cms/images/gplus.png | Bin aircox_cms/static/aircox_cms/images/grow.png | Bin aircox_cms/static/aircox_cms/images/home.png | Bin aircox_cms/static/aircox_cms/images/list.png | Bin .../static/aircox_cms/images/listen.png | Bin .../static/aircox_cms/images/loading.png | Bin aircox_cms/static/aircox_cms/images/mail.png | Bin .../static/aircox_cms/images/on_air.png | Bin aircox_cms/static/aircox_cms/images/pause.png | Bin aircox_cms/static/aircox_cms/images/play.png | Bin .../static/aircox_cms/images/search.png | Bin aircox_cms/static/aircox_cms/images/share.png | Bin .../static/aircox_cms/images/tiles_large.png | Bin .../static/aircox_cms/images/tumblr.png | Bin .../static/aircox_cms/images/twitter.png | Bin aircox_cms/static/aircox_cms/js/player.js | 0 aircox_cms/static/aircox_cms/js/utils.js | 0 .../templates/aircox_cms/base_site.html | 0 .../templates/aircox_cms/dated_list_page.html | 0 .../templates/aircox_cms/diffusion_page.html | 0 .../aircox_cms/dynamic_list_page.html | 0 .../templates/aircox_cms/event_page.html | 0 .../templates/aircox_cms/program_page.html | 0 .../templates/aircox_cms/publication.html | 0 .../aircox_cms/sections/section_item.html | 0 .../aircox_cms/sections/section_link.html | 0 .../sections/section_link_list.html | 0 .../aircox_cms/sections/section_list.html | 0 .../sections/section_logs_list.html | 0 .../aircox_cms/sections/section_player.html | 0 .../sections/section_publication_info.html | 0 .../sections/section_search_field.html | 0 .../sections/section_timetable.html | 0 .../aircox_cms/snippets/comments.html | 0 .../aircox_cms/snippets/date_list.html | 0 .../aircox_cms/snippets/date_list_item.html | 0 .../templates/aircox_cms/snippets/list.html | 0 .../aircox_cms/snippets/list_item.html | 0 .../templates/aircox_cms/snippets/player.html | 0 .../aircox_cms/snippets/sound_list_item.html | 0 aircox_cms/templatetags/aircox_cms.py | 0 aircox_cms/tests.py | 0 aircox_cms/utils.py | 0 aircox_cms/views.py | 0 aircox_cms/wagtail_hooks.py | 0 data/logo.png | Bin data/logo.svg | 0 docs/technicians.md | 0 instance/__init__.py | 0 instance/base_settings.py | 1 + instance/dev.py | 0 instance/prod.py | 0 instance/sample_settings.py | 0 instance/urls.py | 1 + instance/wsgi.py | 0 notes.md | 0 requirements.txt | 0 scripts/nginx_aircox | 0 setup.py | 0 103 files changed, 47 insertions(+), 32 deletions(-) mode change 100644 => 100755 LICENSE mode change 100644 => 100755 Manifest.in mode change 100644 => 100755 README.md mode change 100644 => 100755 __init__.py mode change 100644 => 100755 aircox/README.md mode change 100644 => 100755 aircox/apps.py mode change 100644 => 100755 aircox/connector.py mode change 100644 => 100755 aircox/controllers.py mode change 100644 => 100755 aircox/locale/fr/LC_MESSAGES/django.po mode change 100644 => 100755 aircox/management/__init__.py mode change 100644 => 100755 aircox/management/commands/__init__.py mode change 100644 => 100755 aircox/management/commands/diffusions_monitor.py mode change 100644 => 100755 aircox/management/commands/import_playlist.py mode change 100644 => 100755 aircox/management/commands/sounds_monitor.py mode change 100644 => 100755 aircox/management/commands/sounds_quality_check.py mode change 100644 => 100755 aircox/management/commands/streamer.py mode change 100644 => 100755 aircox/signals.py mode change 100644 => 100755 aircox/static/aircox/css/layout.css mode change 100644 => 100755 aircox/templates/aircox/config/liquidsoap.liq mode change 100644 => 100755 aircox/templates/aircox/controllers/base_site.html mode change 100644 => 100755 aircox/templates/aircox/controllers/monitor.html mode change 100644 => 100755 aircox/templates/aircox/controllers/stats.html mode change 100644 => 100755 aircox/urls.py mode change 100644 => 100755 aircox/utils.py mode change 100644 => 100755 aircox_cms/__init__.py mode change 100644 => 100755 aircox_cms/admin.py mode change 100644 => 100755 aircox_cms/apps.py mode change 100644 => 100755 aircox_cms/forms.py mode change 100644 => 100755 aircox_cms/locale/fr/LC_MESSAGES/django.po mode change 100644 => 100755 aircox_cms/management/commands/programs_to_cms.py mode change 100644 => 100755 aircox_cms/models.py mode change 100644 => 100755 aircox_cms/sections.py mode change 100644 => 100755 aircox_cms/signals.py mode change 100644 => 100755 aircox_cms/static/aircox_cms/css/cms.css mode change 100644 => 100755 aircox_cms/static/aircox_cms/css/layout.css mode change 100644 => 100755 aircox_cms/static/aircox_cms/css/theme.css mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/LICENSE.TXT mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/README.md mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/add.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/clock.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/comments.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/facebook.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/feed.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/gplus.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/grow.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/home.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/list.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/listen.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/loading.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/mail.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/on_air.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/pause.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/play.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/search.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/share.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/tiles_large.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/tumblr.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/images/twitter.png mode change 100644 => 100755 aircox_cms/static/aircox_cms/js/player.js mode change 100644 => 100755 aircox_cms/static/aircox_cms/js/utils.js mode change 100644 => 100755 aircox_cms/templates/aircox_cms/base_site.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/dated_list_page.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/diffusion_page.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/dynamic_list_page.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/event_page.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/program_page.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/publication.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/sections/section_item.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/sections/section_link.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/sections/section_link_list.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/sections/section_list.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/sections/section_logs_list.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/sections/section_player.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/sections/section_publication_info.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/sections/section_search_field.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/sections/section_timetable.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/snippets/comments.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/snippets/date_list.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/snippets/date_list_item.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/snippets/list.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/snippets/list_item.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/snippets/player.html mode change 100644 => 100755 aircox_cms/templates/aircox_cms/snippets/sound_list_item.html mode change 100644 => 100755 aircox_cms/templatetags/aircox_cms.py mode change 100644 => 100755 aircox_cms/tests.py mode change 100644 => 100755 aircox_cms/utils.py mode change 100644 => 100755 aircox_cms/views.py mode change 100644 => 100755 aircox_cms/wagtail_hooks.py mode change 100644 => 100755 data/logo.png mode change 100644 => 100755 data/logo.svg mode change 100644 => 100755 docs/technicians.md mode change 100644 => 100755 instance/__init__.py mode change 100644 => 100755 instance/base_settings.py mode change 100644 => 100755 instance/dev.py mode change 100644 => 100755 instance/prod.py mode change 100644 => 100755 instance/sample_settings.py mode change 100644 => 100755 instance/urls.py mode change 100644 => 100755 instance/wsgi.py mode change 100644 => 100755 notes.md mode change 100644 => 100755 requirements.txt mode change 100644 => 100755 scripts/nginx_aircox mode change 100644 => 100755 setup.py diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/Manifest.in b/Manifest.in old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/__init__.py b/__init__.py old mode 100644 new mode 100755 diff --git a/aircox/README.md b/aircox/README.md old mode 100644 new mode 100755 diff --git a/aircox/admin.py b/aircox/admin.py index 7f99478..b2c5fc0 100755 --- a/aircox/admin.py +++ b/aircox/admin.py @@ -81,7 +81,7 @@ class ProgramAdmin(NameableAdmin): schedule.boolean = True schedule.short_description = _("Schedule") - list_display = ('id', 'name', 'active', 'schedule', 'sync') + list_display = ('id', 'name', 'active', 'schedule', 'sync', 'station') fields = NameableAdmin.fields + [ 'active', 'station','sync' ] inlines = [ ScheduleInline, StreamInline ] diff --git a/aircox/apps.py b/aircox/apps.py old mode 100644 new mode 100755 diff --git a/aircox/connector.py b/aircox/connector.py old mode 100644 new mode 100755 diff --git a/aircox/controllers.py b/aircox/controllers.py old mode 100644 new mode 100755 diff --git a/aircox/locale/fr/LC_MESSAGES/django.po b/aircox/locale/fr/LC_MESSAGES/django.po old mode 100644 new mode 100755 diff --git a/aircox/management/__init__.py b/aircox/management/__init__.py old mode 100644 new mode 100755 diff --git a/aircox/management/commands/__init__.py b/aircox/management/commands/__init__.py old mode 100644 new mode 100755 diff --git a/aircox/management/commands/diffusions_monitor.py b/aircox/management/commands/diffusions_monitor.py old mode 100644 new mode 100755 diff --git a/aircox/management/commands/import_playlist.py b/aircox/management/commands/import_playlist.py old mode 100644 new mode 100755 diff --git a/aircox/management/commands/sounds_monitor.py b/aircox/management/commands/sounds_monitor.py old mode 100644 new mode 100755 diff --git a/aircox/management/commands/sounds_quality_check.py b/aircox/management/commands/sounds_quality_check.py old mode 100644 new mode 100755 diff --git a/aircox/management/commands/streamer.py b/aircox/management/commands/streamer.py old mode 100644 new mode 100755 diff --git a/aircox/signals.py b/aircox/signals.py old mode 100644 new mode 100755 index a2def84..5bb87a9 --- a/aircox/signals.py +++ b/aircox/signals.py @@ -12,6 +12,7 @@ import aircox.utils as utils @receiver(post_save, sender=models.Schedule) def schedule_post_saved(sender, instance, created, *args, **kwargs): + # TODO: case instance.program has changed if not instance.program.sync: return @@ -19,8 +20,12 @@ def schedule_post_saved(sender, instance, created, *args, **kwargs): if not initial or not instance.changed(['date','duration', 'frequency']): return + if not initial.get('date') or not initial.get('duration') or not initial.get('frequency'): + return + # old schedule and timedelta old_sched = models.Schedule( + program = instance.program, date = initial['date'], duration = initial['duration'], frequency = initial['frequency'], diff --git a/aircox/static/aircox/css/layout.css b/aircox/static/aircox/css/layout.css old mode 100644 new mode 100755 diff --git a/aircox/templates/aircox/config/liquidsoap.liq b/aircox/templates/aircox/config/liquidsoap.liq old mode 100644 new mode 100755 diff --git a/aircox/templates/aircox/controllers/base_site.html b/aircox/templates/aircox/controllers/base_site.html old mode 100644 new mode 100755 diff --git a/aircox/templates/aircox/controllers/monitor.html b/aircox/templates/aircox/controllers/monitor.html old mode 100644 new mode 100755 diff --git a/aircox/templates/aircox/controllers/stats.html b/aircox/templates/aircox/controllers/stats.html old mode 100644 new mode 100755 index 0b45b46..d0b8b45 --- a/aircox/templates/aircox/controllers/stats.html +++ b/aircox/templates/aircox/controllers/stats.html @@ -1,12 +1,14 @@ -{% extends "aircox/controllers/base_site.html" %} +{% extends "admin/base_site.html" %} +{# {% extends "aircox/controllers/base_site.html" %} #} {% load i18n %} {% block title %} -

Statistics of the stations

+{% trans "Statistics of the stations" %} {% endblock %} {% block content %} -
+
+

{% trans "Statistics of the stations" %}

{# TODO here #}
@@ -58,10 +60,10 @@ {% endfor %} - {{ stats.date|date:'d/m/Y' }} - {% trans "Total" %} + {{ stats.date|date:'d/m/Y' }} + {% trans "Total" %} {# TODO: translation block #} - + {% with stats.items|length as items_count %} {% with stats.count as tracks_count %} {% blocktrans %} @@ -69,11 +71,11 @@ {% endblocktrans %} {% endwith %} {% endwith %} - - {% for tag, count, average in stats.tags %} + + {% for tag, count, average in stats.tags %} {{ tag }}: {{ average|floatformat }}% ({{ count }})
{% endfor %} - + diff --git a/aircox/urls.py b/aircox/urls.py old mode 100644 new mode 100755 diff --git a/aircox/utils.py b/aircox/utils.py old mode 100644 new mode 100755 diff --git a/aircox_cms/__init__.py b/aircox_cms/__init__.py old mode 100644 new mode 100755 diff --git a/aircox_cms/admin.py b/aircox_cms/admin.py old mode 100644 new mode 100755 diff --git a/aircox_cms/apps.py b/aircox_cms/apps.py old mode 100644 new mode 100755 diff --git a/aircox_cms/forms.py b/aircox_cms/forms.py old mode 100644 new mode 100755 diff --git a/aircox_cms/locale/fr/LC_MESSAGES/django.po b/aircox_cms/locale/fr/LC_MESSAGES/django.po old mode 100644 new mode 100755 diff --git a/aircox_cms/management/commands/programs_to_cms.py b/aircox_cms/management/commands/programs_to_cms.py old mode 100644 new mode 100755 diff --git a/aircox_cms/models.py b/aircox_cms/models.py old mode 100644 new mode 100755 diff --git a/aircox_cms/sections.py b/aircox_cms/sections.py old mode 100644 new mode 100755 index ce04ef4..21585ec --- a/aircox_cms/sections.py +++ b/aircox_cms/sections.py @@ -202,13 +202,29 @@ class ListBase(models.Model): ], heading=_('sorting')) ] + def __get_related(self, qs): + related = self.related and self.related.specific + + if self.siblings: + qs = qs.sibling_of(related) + else: + qs = qs.descendant_of(related) + + date = related.date if hasattr(related, 'date') else \ + related.first_published_at + if self.date_filter == self.DateFilter.before_related: + qs = qs.filter(date__lt = date) + elif self.date_filter == self.DateFilter.after_related: + qs = qs.filter(date__gte = date) + return qs + + def get_queryset(self): """ Get queryset based on the arguments. This class is intended to be reusable by other classes if needed. """ from aircox_cms.models import Publication - related = self.related and self.related.specific # model if self.model: @@ -218,18 +234,9 @@ class ListBase(models.Model): qs = qs.live().not_in_menu() # related - if related: - if self.siblings: - qs = qs.sibling_of(related) - else: - qs = qs.descendant_of(related) + if self.related: + qs = self.__get_related(qs) - date = related.date if hasattr(related, 'date') else \ - related.first_published_at - if self.date_filter == self.DateFilter.before_related: - qs = qs.filter(date__lt = date) - elif self.date_filter == self.DateFilter.after_related: - qs = qs.filter(date__gte = date) # date date = tz.now() if self.date_filter == self.DateFilter.previous: diff --git a/aircox_cms/signals.py b/aircox_cms/signals.py old mode 100644 new mode 100755 index 7d88d01..6bbc70f --- a/aircox_cms/signals.py +++ b/aircox_cms/signals.py @@ -83,7 +83,7 @@ def station_post_saved(sender, instance, created, *args, **kwargs): section.add_item(sections.SectionList( count = 15, url_text = _('All programs'), - model = ContentType.objects.get_for_model(ProgramPage), + model = ContentType.objects.get_for_model(models.ProgramPage), related = programs, )) @@ -131,12 +131,10 @@ def program_post_saved(sender, instance, created, *args, **kwargs): @receiver(pre_delete, sender=aircox.Program) def program_post_deleted(sender, instance, *args, **kwargs): - if not instance.page.count() or ( - instance.page.first().specific.body or - Page.objects.descendant_of(instance).count() - ): - return - instance.page.delete() + for page in instance.page.all(): + if page.specific.body or Page.objects.descendant_of(page).count(): + continue + page.delete() @receiver(post_save, sender=aircox.Diffusion) @@ -153,8 +151,9 @@ def diffusion_post_saved(sender, instance, created, *args, **kwargs): @receiver(pre_delete, sender=aircox.Program) def diffusion_post_deleted(sender, instance, *args, **kwargs): - if not instance.page.count() or instance.page.first().specific.body: - return - instance.page.delete() + for page in instance.page.all(): + if page.specific.body or Page.objects.descendant_of(page).count(): + continue + page.delete() diff --git a/aircox_cms/static/aircox_cms/css/cms.css b/aircox_cms/static/aircox_cms/css/cms.css old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/css/layout.css b/aircox_cms/static/aircox_cms/css/layout.css old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/css/theme.css b/aircox_cms/static/aircox_cms/css/theme.css old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/LICENSE.TXT b/aircox_cms/static/aircox_cms/images/LICENSE.TXT old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/README.md b/aircox_cms/static/aircox_cms/images/README.md old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/add.png b/aircox_cms/static/aircox_cms/images/add.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/clock.png b/aircox_cms/static/aircox_cms/images/clock.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/comments.png b/aircox_cms/static/aircox_cms/images/comments.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/facebook.png b/aircox_cms/static/aircox_cms/images/facebook.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/feed.png b/aircox_cms/static/aircox_cms/images/feed.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/gplus.png b/aircox_cms/static/aircox_cms/images/gplus.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/grow.png b/aircox_cms/static/aircox_cms/images/grow.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/home.png b/aircox_cms/static/aircox_cms/images/home.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/list.png b/aircox_cms/static/aircox_cms/images/list.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/listen.png b/aircox_cms/static/aircox_cms/images/listen.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/loading.png b/aircox_cms/static/aircox_cms/images/loading.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/mail.png b/aircox_cms/static/aircox_cms/images/mail.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/on_air.png b/aircox_cms/static/aircox_cms/images/on_air.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/pause.png b/aircox_cms/static/aircox_cms/images/pause.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/play.png b/aircox_cms/static/aircox_cms/images/play.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/search.png b/aircox_cms/static/aircox_cms/images/search.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/share.png b/aircox_cms/static/aircox_cms/images/share.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/tiles_large.png b/aircox_cms/static/aircox_cms/images/tiles_large.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/tumblr.png b/aircox_cms/static/aircox_cms/images/tumblr.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/images/twitter.png b/aircox_cms/static/aircox_cms/images/twitter.png old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/js/player.js b/aircox_cms/static/aircox_cms/js/player.js old mode 100644 new mode 100755 diff --git a/aircox_cms/static/aircox_cms/js/utils.js b/aircox_cms/static/aircox_cms/js/utils.js old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/base_site.html b/aircox_cms/templates/aircox_cms/base_site.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/dated_list_page.html b/aircox_cms/templates/aircox_cms/dated_list_page.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/diffusion_page.html b/aircox_cms/templates/aircox_cms/diffusion_page.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/dynamic_list_page.html b/aircox_cms/templates/aircox_cms/dynamic_list_page.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/event_page.html b/aircox_cms/templates/aircox_cms/event_page.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/program_page.html b/aircox_cms/templates/aircox_cms/program_page.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/publication.html b/aircox_cms/templates/aircox_cms/publication.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/sections/section_item.html b/aircox_cms/templates/aircox_cms/sections/section_item.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/sections/section_link.html b/aircox_cms/templates/aircox_cms/sections/section_link.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/sections/section_link_list.html b/aircox_cms/templates/aircox_cms/sections/section_link_list.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/sections/section_list.html b/aircox_cms/templates/aircox_cms/sections/section_list.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/sections/section_logs_list.html b/aircox_cms/templates/aircox_cms/sections/section_logs_list.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/sections/section_player.html b/aircox_cms/templates/aircox_cms/sections/section_player.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/sections/section_publication_info.html b/aircox_cms/templates/aircox_cms/sections/section_publication_info.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/sections/section_search_field.html b/aircox_cms/templates/aircox_cms/sections/section_search_field.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/sections/section_timetable.html b/aircox_cms/templates/aircox_cms/sections/section_timetable.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/snippets/comments.html b/aircox_cms/templates/aircox_cms/snippets/comments.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/snippets/date_list.html b/aircox_cms/templates/aircox_cms/snippets/date_list.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/snippets/date_list_item.html b/aircox_cms/templates/aircox_cms/snippets/date_list_item.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/snippets/list.html b/aircox_cms/templates/aircox_cms/snippets/list.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/snippets/list_item.html b/aircox_cms/templates/aircox_cms/snippets/list_item.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/snippets/player.html b/aircox_cms/templates/aircox_cms/snippets/player.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templates/aircox_cms/snippets/sound_list_item.html b/aircox_cms/templates/aircox_cms/snippets/sound_list_item.html old mode 100644 new mode 100755 diff --git a/aircox_cms/templatetags/aircox_cms.py b/aircox_cms/templatetags/aircox_cms.py old mode 100644 new mode 100755 diff --git a/aircox_cms/tests.py b/aircox_cms/tests.py old mode 100644 new mode 100755 diff --git a/aircox_cms/utils.py b/aircox_cms/utils.py old mode 100644 new mode 100755 diff --git a/aircox_cms/views.py b/aircox_cms/views.py old mode 100644 new mode 100755 diff --git a/aircox_cms/wagtail_hooks.py b/aircox_cms/wagtail_hooks.py old mode 100644 new mode 100755 diff --git a/data/logo.png b/data/logo.png old mode 100644 new mode 100755 diff --git a/data/logo.svg b/data/logo.svg old mode 100644 new mode 100755 diff --git a/docs/technicians.md b/docs/technicians.md old mode 100644 new mode 100755 diff --git a/instance/__init__.py b/instance/__init__.py old mode 100644 new mode 100755 diff --git a/instance/base_settings.py b/instance/base_settings.py old mode 100644 new mode 100755 index 0983590..a8e2526 --- a/instance/base_settings.py +++ b/instance/base_settings.py @@ -32,6 +32,7 @@ except: # Application definition INSTALLED_APPS = ( + 'jet', 'wagtail.wagtailforms', 'wagtail.wagtailredirects', 'wagtail.wagtailembeds', diff --git a/instance/dev.py b/instance/dev.py old mode 100644 new mode 100755 diff --git a/instance/prod.py b/instance/prod.py old mode 100644 new mode 100755 diff --git a/instance/sample_settings.py b/instance/sample_settings.py old mode 100644 new mode 100755 diff --git a/instance/urls.py b/instance/urls.py old mode 100644 new mode 100755 index 2d3cfee..42bf530 --- a/instance/urls.py +++ b/instance/urls.py @@ -26,6 +26,7 @@ import aircox.urls urlpatterns = [ + url(r'^jet/', include('jet.urls', 'jet')), url(r'^admin/', include(admin.site.urls)), url(r'^aircox/', include(aircox.urls.urls)), diff --git a/instance/wsgi.py b/instance/wsgi.py old mode 100644 new mode 100755 diff --git a/notes.md b/notes.md old mode 100644 new mode 100755 diff --git a/requirements.txt b/requirements.txt old mode 100644 new mode 100755 diff --git a/scripts/nginx_aircox b/scripts/nginx_aircox old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py old mode 100644 new mode 100755