diff --git a/radiocampus/static/radiocampus/radiocampus.css b/radiocampus/static/radiocampus/radiocampus.css index 5c79582..e0b5e65 100644 --- a/radiocampus/static/radiocampus/radiocampus.css +++ b/radiocampus/static/radiocampus/radiocampus.css @@ -90,7 +90,7 @@ body.yellow.home #grandlogo img { content: url('/static/radiocampus/logos/logo-RC-bleu2.png'); } body.yellow .nav .nav-item.active { - color: #7E6B64 !important; + color: #738EF2 !important; } body.blue #grandlogo img, body.yellow #grandlogo img { width: 120px; @@ -150,7 +150,7 @@ a.heading.title:hover { display: none; } .nav.secondary .nav-item { - color: #7E6B64 !important; + color: black !important; } .nav-item:hover { opacity: 0.8; diff --git a/radiocampus/templates/aircox/home.html b/radiocampus/templates/aircox/home.html new file mode 100644 index 0000000..353bb09 --- /dev/null +++ b/radiocampus/templates/aircox/home.html @@ -0,0 +1,103 @@ +{% extends "aircox/page_list.html" %} +{% comment %}List of diffusions as a timetable{% endcomment %} +{% load i18n aircox humanize %} + +{% block subtitle %}{{ date|date:"l d F Y" }}{% endblock %} + +{% block secondary-nav %} + + + + +{% endblock %} + + +{% block breadcrumbs %} +{% endblock %} + + +{% block list-container %} +
+
+
+
+ +
+
+{% with list_class="radiocampus-grid" %} +{{ block.super }} +{% endwith %} +
+
+
+ +
+ +{% endblock %} + +{% block list %} +{% with object_list=object_list timetable=True %} +{% with widget|default:"item" as widget %} + + {% for object in object_list %} + {% if object.episode %} +
+ {% page_widget widget object.episode diffusion=object timetable=True %} +
+ {% else %} +
+
+ {% for obj in object %} + {% include "aircox/widgets/track_item.html" with object=obj.track log=obj timetable=True %} +
+ {% endfor %} +
+
+ {% endif %} + {% endfor %} + +{% endwith %} +{% endwith %} +{% endblock %} diff --git a/radiocampus/templates/aircox/home_timetable_list.html b/radiocampus/templates/aircox/home_timetable_list.html deleted file mode 100644 index f6decfd..0000000 --- a/radiocampus/templates/aircox/home_timetable_list.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "aircox/page_list.html" %} -{% comment %}List of diffusions as a timetable{% endcomment %} -{% load i18n aircox humanize %} - -{% block subtitle %}{{ date|date:"l d F Y" }}{% endblock %} - -{% block secondary-nav %} -{% endblock %} - - -{% block breadcrumbs %} -{% endblock %} - - -{% block list-container %} -
-
-
-
- -
- Aujourd'hui -
-{% with list_class="radiocampus-grid" %} -{{ block.super }} -{% endwith %} -
-
-{% endblock %} - -{% block list %} -{% include "./widgets/logs.html" with object_list=object_list timetable=True %} -{% endblock %} diff --git a/radiocampus/urls.py b/radiocampus/urls.py index 7d94977..bab3b3f 100755 --- a/radiocampus/urls.py +++ b/radiocampus/urls.py @@ -1,19 +1,3 @@ -"""Aircox URL Configuration. - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/1.8/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') -Including another URLconf - 1. Add an import: from blog import urls as blog_urls - 2. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls)) -""" -# from django.conf.urls.i18n import i18n_patterns from django.conf import settings from django.conf.urls.static import static from django.contrib import admin @@ -22,7 +6,7 @@ from django.urls import include, path import aircox.urls import aircox_streamer.urls -from radiocampus.views.diffusion import TimeTableView +from radiocampus.views import TimeTableView urlpatterns = [ *aircox.urls.urls, diff --git a/radiocampus/views.py b/radiocampus/views.py new file mode 100644 index 0000000..eab19ea --- /dev/null +++ b/radiocampus/views.py @@ -0,0 +1,7 @@ +from aircox.views.diffusion import TimeTableView as AircoxTimeTableView + +__all__ = "TimeTableView" + + +class TimeTableView(AircoxTimeTableView): + template_name = "aircox/home.html" diff --git a/radiocampus/views/diffusion.py b/radiocampus/views/diffusion.py deleted file mode 100644 index 6b9afe8..0000000 --- a/radiocampus/views/diffusion.py +++ /dev/null @@ -1,13 +0,0 @@ -from aircox.models import Diffusion, StaticPage -from aircox.views.page import attach -from aircox.views.diffusion import TimeTableView as AircoxTimeTableView - -__all__ = "TimeTableView" - - -@attach -class TimeTableView(AircoxTimeTableView): - model = Diffusion - redirect_date_url = "timetable-list" - attach_to_value = StaticPage.Target.TIMETABLE - template_name = "aircox/home_timetable_list.html"