misc: add in-site episode management for animators

aircox/admin/diffusion.py

@@ -30,9 +30,9 @@ class DiffusionAdmin(DiffusionBaseAdmin, admin.ModelAdmin):
 
     end_date.short_description = _("end")
 
-    list_display = ("episode", "start", "end", "type", "initial")
+    list_display = ("episode", "start_date", "end_date", "type", "initial")
     list_filter = ("type", "start", "program")
-    list_editable = ("type", "start", "end")
+    list_editable = ("type",)
     ordering = ("-start", "id")
 
     fields = ("type", "start", "end", "initial", "program", "schedule")

aircox/admin/page.py

@@ -50,9 +50,7 @@ class BasePageAdmin(admin.ModelAdmin):
     change_form_template = "admin/aircox/page_change_form.html"
 
     def cover_thumb(self, obj):
-        if obj.cover and obj.cover.thumbnails:
+        return mark_safe('<img src="{}"/>'.format(obj.cover.icons["64"])) if obj.cover else ""
-            return mark_safe('<img src="{}"/>'.format(obj.cover.icons["64"]))
-        return ""
 
     def get_changeform_initial_data(self, request):
         data = super().get_changeform_initial_data(request)
@@ -97,7 +95,6 @@ class PageAdmin(BasePageAdmin):
 @admin.register(StaticPage)
 class StaticPageAdmin(BasePageAdmin):
     list_display = BasePageAdmin.list_display + ("attach_to",)
-    list_editable = BasePageAdmin.list_editable + ("attach_to",)
     fieldsets = deepcopy(BasePageAdmin.fieldsets)
 
     fieldsets[1][1]["fields"] += ("attach_to",)

aircox/filters.py

@@ -10,7 +10,7 @@ class PageFilters(filters.FilterSet):
     class Meta:
         model = Page
         fields = {
-            "category__id": ["in", "exact"],
+            "category__id": ["in"],
             "pub_date": ["exact", "gte", "lte"],
         }
 

aircox/migrations/0015_alter_schedule_timezone_alter_staticpage_attach_to.py

@@ -1,641 +0,0 @@
-# Generated by Django 4.2.1 on 2023-11-24 21:11
-
-import aircox.models.schedule
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("aircox", "0014_alter_schedule_timezone"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="schedule",
-            name="timezone",
-            field=models.CharField(
-                choices=[
-                    ("Africa/Abidjan", "Africa/Abidjan"),
-                    ("Africa/Accra", "Africa/Accra"),
-                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
-                    ("Africa/Algiers", "Africa/Algiers"),
-                    ("Africa/Asmara", "Africa/Asmara"),
-                    ("Africa/Asmera", "Africa/Asmera"),
-                    ("Africa/Bamako", "Africa/Bamako"),
-                    ("Africa/Bangui", "Africa/Bangui"),
-                    ("Africa/Banjul", "Africa/Banjul"),
-                    ("Africa/Bissau", "Africa/Bissau"),
-                    ("Africa/Blantyre", "Africa/Blantyre"),
-                    ("Africa/Brazzaville", "Africa/Brazzaville"),
-                    ("Africa/Bujumbura", "Africa/Bujumbura"),
-                    ("Africa/Cairo", "Africa/Cairo"),
-                    ("Africa/Casablanca", "Africa/Casablanca"),
-                    ("Africa/Ceuta", "Africa/Ceuta"),
-                    ("Africa/Conakry", "Africa/Conakry"),
-                    ("Africa/Dakar", "Africa/Dakar"),
-                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
-                    ("Africa/Djibouti", "Africa/Djibouti"),
-                    ("Africa/Douala", "Africa/Douala"),
-                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
-                    ("Africa/Freetown", "Africa/Freetown"),
-                    ("Africa/Gaborone", "Africa/Gaborone"),
-                    ("Africa/Harare", "Africa/Harare"),
-                    ("Africa/Johannesburg", "Africa/Johannesburg"),
-                    ("Africa/Juba", "Africa/Juba"),
-                    ("Africa/Kampala", "Africa/Kampala"),
-                    ("Africa/Khartoum", "Africa/Khartoum"),
-                    ("Africa/Kigali", "Africa/Kigali"),
-                    ("Africa/Kinshasa", "Africa/Kinshasa"),
-                    ("Africa/Lagos", "Africa/Lagos"),
-                    ("Africa/Libreville", "Africa/Libreville"),
-                    ("Africa/Lome", "Africa/Lome"),
-                    ("Africa/Luanda", "Africa/Luanda"),
-                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
-                    ("Africa/Lusaka", "Africa/Lusaka"),
-                    ("Africa/Malabo", "Africa/Malabo"),
-                    ("Africa/Maputo", "Africa/Maputo"),
-                    ("Africa/Maseru", "Africa/Maseru"),
-                    ("Africa/Mbabane", "Africa/Mbabane"),
-                    ("Africa/Mogadishu", "Africa/Mogadishu"),
-                    ("Africa/Monrovia", "Africa/Monrovia"),
-                    ("Africa/Nairobi", "Africa/Nairobi"),
-                    ("Africa/Ndjamena", "Africa/Ndjamena"),
-                    ("Africa/Niamey", "Africa/Niamey"),
-                    ("Africa/Nouakchott", "Africa/Nouakchott"),
-                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
-                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
-                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
-                    ("Africa/Timbuktu", "Africa/Timbuktu"),
-                    ("Africa/Tripoli", "Africa/Tripoli"),
-                    ("Africa/Tunis", "Africa/Tunis"),
-                    ("Africa/Windhoek", "Africa/Windhoek"),
-                    ("America/Adak", "America/Adak"),
-                    ("America/Anchorage", "America/Anchorage"),
-                    ("America/Anguilla", "America/Anguilla"),
-                    ("America/Antigua", "America/Antigua"),
-                    ("America/Araguaina", "America/Araguaina"),
-                    ("America/Argentina/Buenos_Aires", "America/Argentina/Buenos_Aires"),
-                    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
-                    ("America/Argentina/ComodRivadavia", "America/Argentina/ComodRivadavia"),
-                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
-                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
-                    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
-                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
-                    ("America/Argentina/Rio_Gallegos", "America/Argentina/Rio_Gallegos"),
-                    ("America/Argentina/Salta", "America/Argentina/Salta"),
-                    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
-                    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
-                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
-                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
-                    ("America/Aruba", "America/Aruba"),
-                    ("America/Asuncion", "America/Asuncion"),
-                    ("America/Atikokan", "America/Atikokan"),
-                    ("America/Atka", "America/Atka"),
-                    ("America/Bahia", "America/Bahia"),
-                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
-                    ("America/Barbados", "America/Barbados"),
-                    ("America/Belem", "America/Belem"),
-                    ("America/Belize", "America/Belize"),
-                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
-                    ("America/Boa_Vista", "America/Boa_Vista"),
-                    ("America/Bogota", "America/Bogota"),
-                    ("America/Boise", "America/Boise"),
-                    ("America/Buenos_Aires", "America/Buenos_Aires"),
-                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
-                    ("America/Campo_Grande", "America/Campo_Grande"),
-                    ("America/Cancun", "America/Cancun"),
-                    ("America/Caracas", "America/Caracas"),
-                    ("America/Catamarca", "America/Catamarca"),
-                    ("America/Cayenne", "America/Cayenne"),
-                    ("America/Cayman", "America/Cayman"),
-                    ("America/Chicago", "America/Chicago"),
-                    ("America/Chihuahua", "America/Chihuahua"),
-                    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
-                    ("America/Coral_Harbour", "America/Coral_Harbour"),
-                    ("America/Cordoba", "America/Cordoba"),
-                    ("America/Costa_Rica", "America/Costa_Rica"),
-                    ("America/Creston", "America/Creston"),
-                    ("America/Cuiaba", "America/Cuiaba"),
-                    ("America/Curacao", "America/Curacao"),
-                    ("America/Danmarkshavn", "America/Danmarkshavn"),
-                    ("America/Dawson", "America/Dawson"),
-                    ("America/Dawson_Creek", "America/Dawson_Creek"),
-                    ("America/Denver", "America/Denver"),
-                    ("America/Detroit", "America/Detroit"),
-                    ("America/Dominica", "America/Dominica"),
-                    ("America/Edmonton", "America/Edmonton"),
-                    ("America/Eirunepe", "America/Eirunepe"),
-                    ("America/El_Salvador", "America/El_Salvador"),
-                    ("America/Ensenada", "America/Ensenada"),
-                    ("America/Fort_Nelson", "America/Fort_Nelson"),
-                    ("America/Fort_Wayne", "America/Fort_Wayne"),
-                    ("America/Fortaleza", "America/Fortaleza"),
-                    ("America/Glace_Bay", "America/Glace_Bay"),
-                    ("America/Godthab", "America/Godthab"),
-                    ("America/Goose_Bay", "America/Goose_Bay"),
-                    ("America/Grand_Turk", "America/Grand_Turk"),
-                    ("America/Grenada", "America/Grenada"),
-                    ("America/Guadeloupe", "America/Guadeloupe"),
-                    ("America/Guatemala", "America/Guatemala"),
-                    ("America/Guayaquil", "America/Guayaquil"),
-                    ("America/Guyana", "America/Guyana"),
-                    ("America/Halifax", "America/Halifax"),
-                    ("America/Havana", "America/Havana"),
-                    ("America/Hermosillo", "America/Hermosillo"),
-                    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
-                    ("America/Indiana/Knox", "America/Indiana/Knox"),
-                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
-                    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
-                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
-                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
-                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
-                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
-                    ("America/Indianapolis", "America/Indianapolis"),
-                    ("America/Inuvik", "America/Inuvik"),
-                    ("America/Iqaluit", "America/Iqaluit"),
-                    ("America/Jamaica", "America/Jamaica"),
-                    ("America/Jujuy", "America/Jujuy"),
-                    ("America/Juneau", "America/Juneau"),
-                    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
-                    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
-                    ("America/Knox_IN", "America/Knox_IN"),
-                    ("America/Kralendijk", "America/Kralendijk"),
-                    ("America/La_Paz", "America/La_Paz"),
-                    ("America/Lima", "America/Lima"),
-                    ("America/Los_Angeles", "America/Los_Angeles"),
-                    ("America/Louisville", "America/Louisville"),
-                    ("America/Lower_Princes", "America/Lower_Princes"),
-                    ("America/Maceio", "America/Maceio"),
-                    ("America/Managua", "America/Managua"),
-                    ("America/Manaus", "America/Manaus"),
-                    ("America/Marigot", "America/Marigot"),
-                    ("America/Martinique", "America/Martinique"),
-                    ("America/Matamoros", "America/Matamoros"),
-                    ("America/Mazatlan", "America/Mazatlan"),
-                    ("America/Mendoza", "America/Mendoza"),
-                    ("America/Menominee", "America/Menominee"),
-                    ("America/Merida", "America/Merida"),
-                    ("America/Metlakatla", "America/Metlakatla"),
-                    ("America/Mexico_City", "America/Mexico_City"),
-                    ("America/Miquelon", "America/Miquelon"),
-                    ("America/Moncton", "America/Moncton"),
-                    ("America/Monterrey", "America/Monterrey"),
-                    ("America/Montevideo", "America/Montevideo"),
-                    ("America/Montreal", "America/Montreal"),
-                    ("America/Montserrat", "America/Montserrat"),
-                    ("America/Nassau", "America/Nassau"),
-                    ("America/New_York", "America/New_York"),
-                    ("America/Nipigon", "America/Nipigon"),
-                    ("America/Nome", "America/Nome"),
-                    ("America/Noronha", "America/Noronha"),
-                    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
-                    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
-                    ("America/North_Dakota/New_Salem", "America/North_Dakota/New_Salem"),
-                    ("America/Nuuk", "America/Nuuk"),
-                    ("America/Ojinaga", "America/Ojinaga"),
-                    ("America/Panama", "America/Panama"),
-                    ("America/Pangnirtung", "America/Pangnirtung"),
-                    ("America/Paramaribo", "America/Paramaribo"),
-                    ("America/Phoenix", "America/Phoenix"),
-                    ("America/Port-au-Prince", "America/Port-au-Prince"),
-                    ("America/Port_of_Spain", "America/Port_of_Spain"),
-                    ("America/Porto_Acre", "America/Porto_Acre"),
-                    ("America/Porto_Velho", "America/Porto_Velho"),
-                    ("America/Puerto_Rico", "America/Puerto_Rico"),
-                    ("America/Punta_Arenas", "America/Punta_Arenas"),
-                    ("America/Rainy_River", "America/Rainy_River"),
-                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
-                    ("America/Recife", "America/Recife"),
-                    ("America/Regina", "America/Regina"),
-                    ("America/Resolute", "America/Resolute"),
-                    ("America/Rio_Branco", "America/Rio_Branco"),
-                    ("America/Rosario", "America/Rosario"),
-                    ("America/Santa_Isabel", "America/Santa_Isabel"),
-                    ("America/Santarem", "America/Santarem"),
-                    ("America/Santiago", "America/Santiago"),
-                    ("America/Santo_Domingo", "America/Santo_Domingo"),
-                    ("America/Sao_Paulo", "America/Sao_Paulo"),
-                    ("America/Scoresbysund", "America/Scoresbysund"),
-                    ("America/Shiprock", "America/Shiprock"),
-                    ("America/Sitka", "America/Sitka"),
-                    ("America/St_Barthelemy", "America/St_Barthelemy"),
-                    ("America/St_Johns", "America/St_Johns"),
-                    ("America/St_Kitts", "America/St_Kitts"),
-                    ("America/St_Lucia", "America/St_Lucia"),
-                    ("America/St_Thomas", "America/St_Thomas"),
-                    ("America/St_Vincent", "America/St_Vincent"),
-                    ("America/Swift_Current", "America/Swift_Current"),
-                    ("America/Tegucigalpa", "America/Tegucigalpa"),
-                    ("America/Thule", "America/Thule"),
-                    ("America/Thunder_Bay", "America/Thunder_Bay"),
-                    ("America/Tijuana", "America/Tijuana"),
-                    ("America/Toronto", "America/Toronto"),
-                    ("America/Tortola", "America/Tortola"),
-                    ("America/Vancouver", "America/Vancouver"),
-                    ("America/Virgin", "America/Virgin"),
-                    ("America/Whitehorse", "America/Whitehorse"),
-                    ("America/Winnipeg", "America/Winnipeg"),
-                    ("America/Yakutat", "America/Yakutat"),
-                    ("America/Yellowknife", "America/Yellowknife"),
-                    ("Antarctica/Casey", "Antarctica/Casey"),
-                    ("Antarctica/Davis", "Antarctica/Davis"),
-                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
-                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
-                    ("Antarctica/Mawson", "Antarctica/Mawson"),
-                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
-                    ("Antarctica/Palmer", "Antarctica/Palmer"),
-                    ("Antarctica/Rothera", "Antarctica/Rothera"),
-                    ("Antarctica/South_Pole", "Antarctica/South_Pole"),
-                    ("Antarctica/Syowa", "Antarctica/Syowa"),
-                    ("Antarctica/Troll", "Antarctica/Troll"),
-                    ("Antarctica/Vostok", "Antarctica/Vostok"),
-                    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
-                    ("Asia/Aden", "Asia/Aden"),
-                    ("Asia/Almaty", "Asia/Almaty"),
-                    ("Asia/Amman", "Asia/Amman"),
-                    ("Asia/Anadyr", "Asia/Anadyr"),
-                    ("Asia/Aqtau", "Asia/Aqtau"),
-                    ("Asia/Aqtobe", "Asia/Aqtobe"),
-                    ("Asia/Ashgabat", "Asia/Ashgabat"),
-                    ("Asia/Ashkhabad", "Asia/Ashkhabad"),
-                    ("Asia/Atyrau", "Asia/Atyrau"),
-                    ("Asia/Baghdad", "Asia/Baghdad"),
-                    ("Asia/Bahrain", "Asia/Bahrain"),
-                    ("Asia/Baku", "Asia/Baku"),
-                    ("Asia/Bangkok", "Asia/Bangkok"),
-                    ("Asia/Barnaul", "Asia/Barnaul"),
-                    ("Asia/Beirut", "Asia/Beirut"),
-                    ("Asia/Bishkek", "Asia/Bishkek"),
-                    ("Asia/Brunei", "Asia/Brunei"),
-                    ("Asia/Calcutta", "Asia/Calcutta"),
-                    ("Asia/Chita", "Asia/Chita"),
-                    ("Asia/Choibalsan", "Asia/Choibalsan"),
-                    ("Asia/Chongqing", "Asia/Chongqing"),
-                    ("Asia/Chungking", "Asia/Chungking"),
-                    ("Asia/Colombo", "Asia/Colombo"),
-                    ("Asia/Dacca", "Asia/Dacca"),
-                    ("Asia/Damascus", "Asia/Damascus"),
-                    ("Asia/Dhaka", "Asia/Dhaka"),
-                    ("Asia/Dili", "Asia/Dili"),
-                    ("Asia/Dubai", "Asia/Dubai"),
-                    ("Asia/Dushanbe", "Asia/Dushanbe"),
-                    ("Asia/Famagusta", "Asia/Famagusta"),
-                    ("Asia/Gaza", "Asia/Gaza"),
-                    ("Asia/Harbin", "Asia/Harbin"),
-                    ("Asia/Hebron", "Asia/Hebron"),
-                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
-                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
-                    ("Asia/Hovd", "Asia/Hovd"),
-                    ("Asia/Irkutsk", "Asia/Irkutsk"),
-                    ("Asia/Istanbul", "Asia/Istanbul"),
-                    ("Asia/Jakarta", "Asia/Jakarta"),
-                    ("Asia/Jayapura", "Asia/Jayapura"),
-                    ("Asia/Jerusalem", "Asia/Jerusalem"),
-                    ("Asia/Kabul", "Asia/Kabul"),
-                    ("Asia/Kamchatka", "Asia/Kamchatka"),
-                    ("Asia/Karachi", "Asia/Karachi"),
-                    ("Asia/Kashgar", "Asia/Kashgar"),
-                    ("Asia/Kathmandu", "Asia/Kathmandu"),
-                    ("Asia/Katmandu", "Asia/Katmandu"),
-                    ("Asia/Khandyga", "Asia/Khandyga"),
-                    ("Asia/Kolkata", "Asia/Kolkata"),
-                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
-                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
-                    ("Asia/Kuching", "Asia/Kuching"),
-                    ("Asia/Kuwait", "Asia/Kuwait"),
-                    ("Asia/Macao", "Asia/Macao"),
-                    ("Asia/Macau", "Asia/Macau"),
-                    ("Asia/Magadan", "Asia/Magadan"),
-                    ("Asia/Makassar", "Asia/Makassar"),
-                    ("Asia/Manila", "Asia/Manila"),
-                    ("Asia/Muscat", "Asia/Muscat"),
-                    ("Asia/Nicosia", "Asia/Nicosia"),
-                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
-                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
-                    ("Asia/Omsk", "Asia/Omsk"),
-                    ("Asia/Oral", "Asia/Oral"),
-                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
-                    ("Asia/Pontianak", "Asia/Pontianak"),
-                    ("Asia/Pyongyang", "Asia/Pyongyang"),
-                    ("Asia/Qatar", "Asia/Qatar"),
-                    ("Asia/Qostanay", "Asia/Qostanay"),
-                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
-                    ("Asia/Rangoon", "Asia/Rangoon"),
-                    ("Asia/Riyadh", "Asia/Riyadh"),
-                    ("Asia/Saigon", "Asia/Saigon"),
-                    ("Asia/Sakhalin", "Asia/Sakhalin"),
-                    ("Asia/Samarkand", "Asia/Samarkand"),
-                    ("Asia/Seoul", "Asia/Seoul"),
-                    ("Asia/Shanghai", "Asia/Shanghai"),
-                    ("Asia/Singapore", "Asia/Singapore"),
-                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
-                    ("Asia/Taipei", "Asia/Taipei"),
-                    ("Asia/Tashkent", "Asia/Tashkent"),
-                    ("Asia/Tbilisi", "Asia/Tbilisi"),
-                    ("Asia/Tehran", "Asia/Tehran"),
-                    ("Asia/Tel_Aviv", "Asia/Tel_Aviv"),
-                    ("Asia/Thimbu", "Asia/Thimbu"),
-                    ("Asia/Thimphu", "Asia/Thimphu"),
-                    ("Asia/Tokyo", "Asia/Tokyo"),
-                    ("Asia/Tomsk", "Asia/Tomsk"),
-                    ("Asia/Ujung_Pandang", "Asia/Ujung_Pandang"),
-                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
-                    ("Asia/Ulan_Bator", "Asia/Ulan_Bator"),
-                    ("Asia/Urumqi", "Asia/Urumqi"),
-                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
-                    ("Asia/Vientiane", "Asia/Vientiane"),
-                    ("Asia/Vladivostok", "Asia/Vladivostok"),
-                    ("Asia/Yakutsk", "Asia/Yakutsk"),
-                    ("Asia/Yangon", "Asia/Yangon"),
-                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
-                    ("Asia/Yerevan", "Asia/Yerevan"),
-                    ("Atlantic/Azores", "Atlantic/Azores"),
-                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
-                    ("Atlantic/Canary", "Atlantic/Canary"),
-                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
-                    ("Atlantic/Faeroe", "Atlantic/Faeroe"),
-                    ("Atlantic/Faroe", "Atlantic/Faroe"),
-                    ("Atlantic/Jan_Mayen", "Atlantic/Jan_Mayen"),
-                    ("Atlantic/Madeira", "Atlantic/Madeira"),
-                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
-                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
-                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
-                    ("Atlantic/Stanley", "Atlantic/Stanley"),
-                    ("Australia/ACT", "Australia/ACT"),
-                    ("Australia/Adelaide", "Australia/Adelaide"),
-                    ("Australia/Brisbane", "Australia/Brisbane"),
-                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
-                    ("Australia/Canberra", "Australia/Canberra"),
-                    ("Australia/Currie", "Australia/Currie"),
-                    ("Australia/Darwin", "Australia/Darwin"),
-                    ("Australia/Eucla", "Australia/Eucla"),
-                    ("Australia/Hobart", "Australia/Hobart"),
-                    ("Australia/LHI", "Australia/LHI"),
-                    ("Australia/Lindeman", "Australia/Lindeman"),
-                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
-                    ("Australia/Melbourne", "Australia/Melbourne"),
-                    ("Australia/NSW", "Australia/NSW"),
-                    ("Australia/North", "Australia/North"),
-                    ("Australia/Perth", "Australia/Perth"),
-                    ("Australia/Queensland", "Australia/Queensland"),
-                    ("Australia/South", "Australia/South"),
-                    ("Australia/Sydney", "Australia/Sydney"),
-                    ("Australia/Tasmania", "Australia/Tasmania"),
-                    ("Australia/Victoria", "Australia/Victoria"),
-                    ("Australia/West", "Australia/West"),
-                    ("Australia/Yancowinna", "Australia/Yancowinna"),
-                    ("Brazil/Acre", "Brazil/Acre"),
-                    ("Brazil/DeNoronha", "Brazil/DeNoronha"),
-                    ("Brazil/East", "Brazil/East"),
-                    ("Brazil/West", "Brazil/West"),
-                    ("CET", "CET"),
-                    ("CST6CDT", "CST6CDT"),
-                    ("Canada/Atlantic", "Canada/Atlantic"),
-                    ("Canada/Central", "Canada/Central"),
-                    ("Canada/Eastern", "Canada/Eastern"),
-                    ("Canada/Mountain", "Canada/Mountain"),
-                    ("Canada/Newfoundland", "Canada/Newfoundland"),
-                    ("Canada/Pacific", "Canada/Pacific"),
-                    ("Canada/Saskatchewan", "Canada/Saskatchewan"),
-                    ("Canada/Yukon", "Canada/Yukon"),
-                    ("Chile/Continental", "Chile/Continental"),
-                    ("Chile/EasterIsland", "Chile/EasterIsland"),
-                    ("Cuba", "Cuba"),
-                    ("EET", "EET"),
-                    ("EST", "EST"),
-                    ("EST5EDT", "EST5EDT"),
-                    ("Egypt", "Egypt"),
-                    ("Eire", "Eire"),
-                    ("Etc/GMT", "Etc/GMT"),
-                    ("Etc/GMT+0", "Etc/GMT+0"),
-                    ("Etc/GMT+1", "Etc/GMT+1"),
-                    ("Etc/GMT+10", "Etc/GMT+10"),
-                    ("Etc/GMT+11", "Etc/GMT+11"),
-                    ("Etc/GMT+12", "Etc/GMT+12"),
-                    ("Etc/GMT+2", "Etc/GMT+2"),
-                    ("Etc/GMT+3", "Etc/GMT+3"),
-                    ("Etc/GMT+4", "Etc/GMT+4"),
-                    ("Etc/GMT+5", "Etc/GMT+5"),
-                    ("Etc/GMT+6", "Etc/GMT+6"),
-                    ("Etc/GMT+7", "Etc/GMT+7"),
-                    ("Etc/GMT+8", "Etc/GMT+8"),
-                    ("Etc/GMT+9", "Etc/GMT+9"),
-                    ("Etc/GMT-0", "Etc/GMT-0"),
-                    ("Etc/GMT-1", "Etc/GMT-1"),
-                    ("Etc/GMT-10", "Etc/GMT-10"),
-                    ("Etc/GMT-11", "Etc/GMT-11"),
-                    ("Etc/GMT-12", "Etc/GMT-12"),
-                    ("Etc/GMT-13", "Etc/GMT-13"),
-                    ("Etc/GMT-14", "Etc/GMT-14"),
-                    ("Etc/GMT-2", "Etc/GMT-2"),
-                    ("Etc/GMT-3", "Etc/GMT-3"),
-                    ("Etc/GMT-4", "Etc/GMT-4"),
-                    ("Etc/GMT-5", "Etc/GMT-5"),
-                    ("Etc/GMT-6", "Etc/GMT-6"),
-                    ("Etc/GMT-7", "Etc/GMT-7"),
-                    ("Etc/GMT-8", "Etc/GMT-8"),
-                    ("Etc/GMT-9", "Etc/GMT-9"),
-                    ("Etc/GMT0", "Etc/GMT0"),
-                    ("Etc/Greenwich", "Etc/Greenwich"),
-                    ("Etc/UCT", "Etc/UCT"),
-                    ("Etc/UTC", "Etc/UTC"),
-                    ("Etc/Universal", "Etc/Universal"),
-                    ("Etc/Zulu", "Etc/Zulu"),
-                    ("Europe/Amsterdam", "Europe/Amsterdam"),
-                    ("Europe/Andorra", "Europe/Andorra"),
-                    ("Europe/Astrakhan", "Europe/Astrakhan"),
-                    ("Europe/Athens", "Europe/Athens"),
-                    ("Europe/Belfast", "Europe/Belfast"),
-                    ("Europe/Belgrade", "Europe/Belgrade"),
-                    ("Europe/Berlin", "Europe/Berlin"),
-                    ("Europe/Bratislava", "Europe/Bratislava"),
-                    ("Europe/Brussels", "Europe/Brussels"),
-                    ("Europe/Bucharest", "Europe/Bucharest"),
-                    ("Europe/Budapest", "Europe/Budapest"),
-                    ("Europe/Busingen", "Europe/Busingen"),
-                    ("Europe/Chisinau", "Europe/Chisinau"),
-                    ("Europe/Copenhagen", "Europe/Copenhagen"),
-                    ("Europe/Dublin", "Europe/Dublin"),
-                    ("Europe/Gibraltar", "Europe/Gibraltar"),
-                    ("Europe/Guernsey", "Europe/Guernsey"),
-                    ("Europe/Helsinki", "Europe/Helsinki"),
-                    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
-                    ("Europe/Istanbul", "Europe/Istanbul"),
-                    ("Europe/Jersey", "Europe/Jersey"),
-                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
-                    ("Europe/Kiev", "Europe/Kiev"),
-                    ("Europe/Kirov", "Europe/Kirov"),
-                    ("Europe/Kyiv", "Europe/Kyiv"),
-                    ("Europe/Lisbon", "Europe/Lisbon"),
-                    ("Europe/Ljubljana", "Europe/Ljubljana"),
-                    ("Europe/London", "Europe/London"),
-                    ("Europe/Luxembourg", "Europe/Luxembourg"),
-                    ("Europe/Madrid", "Europe/Madrid"),
-                    ("Europe/Malta", "Europe/Malta"),
-                    ("Europe/Mariehamn", "Europe/Mariehamn"),
-                    ("Europe/Minsk", "Europe/Minsk"),
-                    ("Europe/Monaco", "Europe/Monaco"),
-                    ("Europe/Moscow", "Europe/Moscow"),
-                    ("Europe/Nicosia", "Europe/Nicosia"),
-                    ("Europe/Oslo", "Europe/Oslo"),
-                    ("Europe/Paris", "Europe/Paris"),
-                    ("Europe/Podgorica", "Europe/Podgorica"),
-                    ("Europe/Prague", "Europe/Prague"),
-                    ("Europe/Riga", "Europe/Riga"),
-                    ("Europe/Rome", "Europe/Rome"),
-                    ("Europe/Samara", "Europe/Samara"),
-                    ("Europe/San_Marino", "Europe/San_Marino"),
-                    ("Europe/Sarajevo", "Europe/Sarajevo"),
-                    ("Europe/Saratov", "Europe/Saratov"),
-                    ("Europe/Simferopol", "Europe/Simferopol"),
-                    ("Europe/Skopje", "Europe/Skopje"),
-                    ("Europe/Sofia", "Europe/Sofia"),
-                    ("Europe/Stockholm", "Europe/Stockholm"),
-                    ("Europe/Tallinn", "Europe/Tallinn"),
-                    ("Europe/Tirane", "Europe/Tirane"),
-                    ("Europe/Tiraspol", "Europe/Tiraspol"),
-                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
-                    ("Europe/Uzhgorod", "Europe/Uzhgorod"),
-                    ("Europe/Vaduz", "Europe/Vaduz"),
-                    ("Europe/Vatican", "Europe/Vatican"),
-                    ("Europe/Vienna", "Europe/Vienna"),
-                    ("Europe/Vilnius", "Europe/Vilnius"),
-                    ("Europe/Volgograd", "Europe/Volgograd"),
-                    ("Europe/Warsaw", "Europe/Warsaw"),
-                    ("Europe/Zagreb", "Europe/Zagreb"),
-                    ("Europe/Zaporozhye", "Europe/Zaporozhye"),
-                    ("Europe/Zurich", "Europe/Zurich"),
-                    ("Factory", "Factory"),
-                    ("GB", "GB"),
-                    ("GB-Eire", "GB-Eire"),
-                    ("GMT", "GMT"),
-                    ("GMT+0", "GMT+0"),
-                    ("GMT-0", "GMT-0"),
-                    ("GMT0", "GMT0"),
-                    ("Greenwich", "Greenwich"),
-                    ("HST", "HST"),
-                    ("Hongkong", "Hongkong"),
-                    ("Iceland", "Iceland"),
-                    ("Indian/Antananarivo", "Indian/Antananarivo"),
-                    ("Indian/Chagos", "Indian/Chagos"),
-                    ("Indian/Christmas", "Indian/Christmas"),
-                    ("Indian/Cocos", "Indian/Cocos"),
-                    ("Indian/Comoro", "Indian/Comoro"),
-                    ("Indian/Kerguelen", "Indian/Kerguelen"),
-                    ("Indian/Mahe", "Indian/Mahe"),
-                    ("Indian/Maldives", "Indian/Maldives"),
-                    ("Indian/Mauritius", "Indian/Mauritius"),
-                    ("Indian/Mayotte", "Indian/Mayotte"),
-                    ("Indian/Reunion", "Indian/Reunion"),
-                    ("Iran", "Iran"),
-                    ("Israel", "Israel"),
-                    ("Jamaica", "Jamaica"),
-                    ("Japan", "Japan"),
-                    ("Kwajalein", "Kwajalein"),
-                    ("Libya", "Libya"),
-                    ("MET", "MET"),
-                    ("MST", "MST"),
-                    ("MST7MDT", "MST7MDT"),
-                    ("Mexico/BajaNorte", "Mexico/BajaNorte"),
-                    ("Mexico/BajaSur", "Mexico/BajaSur"),
-                    ("Mexico/General", "Mexico/General"),
-                    ("NZ", "NZ"),
-                    ("NZ-CHAT", "NZ-CHAT"),
-                    ("Navajo", "Navajo"),
-                    ("PRC", "PRC"),
-                    ("PST8PDT", "PST8PDT"),
-                    ("Pacific/Apia", "Pacific/Apia"),
-                    ("Pacific/Auckland", "Pacific/Auckland"),
-                    ("Pacific/Bougainville", "Pacific/Bougainville"),
-                    ("Pacific/Chatham", "Pacific/Chatham"),
-                    ("Pacific/Chuuk", "Pacific/Chuuk"),
-                    ("Pacific/Easter", "Pacific/Easter"),
-                    ("Pacific/Efate", "Pacific/Efate"),
-                    ("Pacific/Enderbury", "Pacific/Enderbury"),
-                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
-                    ("Pacific/Fiji", "Pacific/Fiji"),
-                    ("Pacific/Funafuti", "Pacific/Funafuti"),
-                    ("Pacific/Galapagos", "Pacific/Galapagos"),
-                    ("Pacific/Gambier", "Pacific/Gambier"),
-                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
-                    ("Pacific/Guam", "Pacific/Guam"),
-                    ("Pacific/Honolulu", "Pacific/Honolulu"),
-                    ("Pacific/Johnston", "Pacific/Johnston"),
-                    ("Pacific/Kanton", "Pacific/Kanton"),
-                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
-                    ("Pacific/Kosrae", "Pacific/Kosrae"),
-                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
-                    ("Pacific/Majuro", "Pacific/Majuro"),
-                    ("Pacific/Marquesas", "Pacific/Marquesas"),
-                    ("Pacific/Midway", "Pacific/Midway"),
-                    ("Pacific/Nauru", "Pacific/Nauru"),
-                    ("Pacific/Niue", "Pacific/Niue"),
-                    ("Pacific/Norfolk", "Pacific/Norfolk"),
-                    ("Pacific/Noumea", "Pacific/Noumea"),
-                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
-                    ("Pacific/Palau", "Pacific/Palau"),
-                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
-                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
-                    ("Pacific/Ponape", "Pacific/Ponape"),
-                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
-                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
-                    ("Pacific/Saipan", "Pacific/Saipan"),
-                    ("Pacific/Samoa", "Pacific/Samoa"),
-                    ("Pacific/Tahiti", "Pacific/Tahiti"),
-                    ("Pacific/Tarawa", "Pacific/Tarawa"),
-                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
-                    ("Pacific/Truk", "Pacific/Truk"),
-                    ("Pacific/Wake", "Pacific/Wake"),
-                    ("Pacific/Wallis", "Pacific/Wallis"),
-                    ("Pacific/Yap", "Pacific/Yap"),
-                    ("Poland", "Poland"),
-                    ("Portugal", "Portugal"),
-                    ("ROC", "ROC"),
-                    ("ROK", "ROK"),
-                    ("Singapore", "Singapore"),
-                    ("Turkey", "Turkey"),
-                    ("UCT", "UCT"),
-                    ("US/Alaska", "US/Alaska"),
-                    ("US/Aleutian", "US/Aleutian"),
-                    ("US/Arizona", "US/Arizona"),
-                    ("US/Central", "US/Central"),
-                    ("US/East-Indiana", "US/East-Indiana"),
-                    ("US/Eastern", "US/Eastern"),
-                    ("US/Hawaii", "US/Hawaii"),
-                    ("US/Indiana-Starke", "US/Indiana-Starke"),
-                    ("US/Michigan", "US/Michigan"),
-                    ("US/Mountain", "US/Mountain"),
-                    ("US/Pacific", "US/Pacific"),
-                    ("US/Samoa", "US/Samoa"),
-                    ("UTC", "UTC"),
-                    ("Universal", "Universal"),
-                    ("W-SU", "W-SU"),
-                    ("WET", "WET"),
-                    ("Zulu", "Zulu"),
-                ],
-                default=aircox.models.schedule.current_timezone_key,
-                help_text="timezone used for the date",
-                max_length=100,
-                verbose_name="timezone",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="staticpage",
-            name="attach_to",
-            field=models.SmallIntegerField(
-                blank=True,
-                choices=[
-                    (0, "Home page"),
-                    (1, "Diffusions page"),
-                    (2, "Logs page"),
-                    (3, "Programs list"),
-                    (4, "Episodes list"),
-                    (5, "Articles list"),
-                    (6, "Publications list"),
-                ],
-                help_text="display this page content to related element",
-                null=True,
-                verbose_name="attach to",
-            ),
-        ),
-    ]

aircox/migrations/0016_alter_staticpage_attach_to.py

@@ -1,32 +0,0 @@
-# Generated by Django 4.2.1 on 2023-11-28 01:15
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("aircox", "0015_alter_schedule_timezone_alter_staticpage_attach_to"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="staticpage",
-            name="attach_to",
-            field=models.SmallIntegerField(
-                blank=True,
-                choices=[
-                    (0, "Home page"),
-                    (1, "Diffusions page"),
-                    (2, "Logs page"),
-                    (3, "Programs list"),
-                    (4, "Episodes list"),
-                    (5, "Articles list"),
-                    (6, "Publications list"),
-                    (7, "Podcasts list"),
-                ],
-                help_text="display this page content to related element",
-                null=True,
-                verbose_name="attach to",
-            ),
-        ),
-    ]

aircox/migrations/0017_alter_navitem_text_alter_staticpage_attach_to.py

@@ -1,36 +0,0 @@
-# Generated by Django 4.2.1 on 2023-12-12 16:58
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("aircox", "0016_alter_staticpage_attach_to"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="navitem",
-            name="text",
-            field=models.CharField(blank=True, max_length=64, null=True, verbose_name="title"),
-        ),
-        migrations.AlterField(
-            model_name="staticpage",
-            name="attach_to",
-            field=models.SmallIntegerField(
-                blank=True,
-                choices=[
-                    (0, "Home page"),
-                    (1, "Diffusions page"),
-                    (3, "Programs list"),
-                    (4, "Episodes list"),
-                    (5, "Articles list"),
-                    (6, "Publications list"),
-                    (7, "Podcasts list"),
-                ],
-                help_text="display this page content to related element",
-                null=True,
-                verbose_name="attach to",
-            ),
-        ),
-    ]

aircox/migrations/0018_alter_staticpage_attach_to.py

@@ -1,32 +0,0 @@
-# Generated by Django 4.2.1 on 2023-12-12 18:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("aircox", "0017_alter_navitem_text_alter_staticpage_attach_to"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="staticpage",
-            name="attach_to",
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ("", "Home Page"),
-                    ("timetable-list", "Timetable"),
-                    ("program-list", "Programs list"),
-                    ("episode-list", "Episodes list"),
-                    ("article-list", "Articles list"),
-                    ("page-list", "Publications list"),
-                    ("podcast-list", "Podcasts list"),
-                ],
-                help_text="display this page content to related element",
-                max_length=32,
-                null=True,
-                verbose_name="attach to",
-            ),
-        ),
-    ]

aircox/migrations/0019_merge_20240119_1022.py

@@ -1,12 +0,0 @@
-# Generated by Django 4.2.7 on 2024-01-19 09:22
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("aircox", "0015_program_editors"),
-        ("aircox", "0018_alter_staticpage_attach_to"),
-    ]
-
-    operations = []

aircox/models/article.py

@@ -8,7 +8,6 @@ __all__ = ("Article",)
 
 class Article(Page):
     detail_url_name = "article-detail"
-    template_prefix = "article"
 
     objects = ProgramChildQuerySet.as_manager()
 

aircox/models/diffusion.py

@@ -89,8 +89,6 @@ class Diffusion(Rerun):
     - stop: the diffusion has been manually stopped
     """
 
-    list_url_name = "timetable-list"
-
     objects = DiffusionQuerySet.as_manager()
 
     TYPE_ON_AIR = 0x00
@@ -129,6 +127,8 @@ class Diffusion(Rerun):
     #    help_text = _('use this input port'),
     # )
 
+    item_template_name = "aircox/widgets/diffusion_item.html"
+
     class Meta:
         verbose_name = _("Diffusion")
         verbose_name_plural = _("Diffusions")
@@ -192,11 +192,6 @@ class Diffusion(Rerun):
         now = tz.now()
         return self.type == self.TYPE_ON_AIR and self.start <= now and self.end >= now
 
-    @property
-    def is_today(self):
-        """True if diffusion is currently today."""
-        return self.start.date() == datetime.date.today()
-
     @property
     def is_live(self):
         """True if Diffusion is live (False if there are sounds files)."""

aircox/models/episode.py

@@ -10,29 +10,18 @@ from .program import ProgramChildQuerySet
 __all__ = ("Episode",)
 
 
-class EpisodeQuerySet(ProgramChildQuerySet):
-    def with_podcasts(self):
-        return self.filter(sound__is_public=True).distinct()
-
-
 class Episode(Page):
-    objects = EpisodeQuerySet.as_manager()
+    objects = ProgramChildQuerySet.as_manager()
     detail_url_name = "episode-detail"
-    list_url_name = "episode-list"
+    item_template_name = "aircox/widgets/episode_item.html"
-    template_prefix = "episode"
 
     @property
     def program(self):
-        return self.parent_subclass
+        return getattr(self.parent, "program", None)
-
-    @program.setter
-    def program(self, value):
-        self.parent = value
 
     @cached_property
     def podcasts(self):
         """Return serialized data about podcasts."""
-        from .sound import Sound
         from ..serializers import PodcastSerializer
 
         podcasts = [PodcastSerializer(s).data for s in self.sound_set.public().order_by("type")]
@@ -42,19 +31,16 @@ class Episode(Page):
         else:
             cover = None
 
-        archive_index = 1
         for index, podcast in enumerate(podcasts):
-            if podcast["type"] == Sound.TYPE_ARCHIVE:
-                if archive_index > 1:
-                    podcast["name"] = f"{self.title} - {archive_index}"
-                else:
-                    podcast["name"] = self.title
-
             podcasts[index]["cover"] = cover
             podcasts[index]["page_url"] = self.get_absolute_url()
             podcasts[index]["page_title"] = self.title
         return podcasts
 
+    @program.setter
+    def program(self, value):
+        self.parent = value
+
     class Meta:
         verbose_name = _("Episode")
         verbose_name_plural = _("Episodes")

aircox/models/log.py

@@ -9,7 +9,6 @@ from django.utils.translation import gettext_lazy as _
 from .diffusion import Diffusion
 from .sound import Sound, Track
 from .station import Station
-from .page import Renderable
 
 logger = logging.getLogger("aircox")
 
@@ -47,15 +46,13 @@ class LogQuerySet(models.QuerySet):
         return self.filter(track__isnull=not with_it)
 
 
-class Log(Renderable, models.Model):
+class Log(models.Model):
     """Log sounds and diffusions that are played on the station.
 
     This only remember what has been played on the outputs, not on each
     source; Source designate here which source is responsible of that.
     """
 
-    template_prefix = "log"
-
     TYPE_STOP = 0x00
     """Source has been stopped, e.g. manually."""
     # Rule: \/ diffusion != null \/ sound != null
@@ -163,17 +160,16 @@ class Log(Renderable, models.Model):
         object_list += [cls(obj) for obj in items]
 
     @classmethod
-    def merge_diffusions(cls, logs, diffs, count=None, diff_count=None, log_slice=None):
+    def merge_diffusions(cls, logs, diffs, count=None):
         """Merge logs and diffusions together.
 
         `logs` can either be a queryset or a list ordered by `Log.date`.
         """
+        # TODO: limit count
+        # FIXME: log may be iterable (in stats view)
         if isinstance(logs, models.QuerySet):
             logs = list(logs.order_by("-date"))
-        diffs = diffs.on_air().order_by("-start")
+        diffs = deque(diffs.on_air().before().order_by("-start"))
-        if diff_count:
-            diffs = diffs[:diff_count]
-        diffs = deque(diffs)
         object_list = []
 
         while True:
@@ -193,10 +189,7 @@ class Log(Renderable, models.Model):
                 len(logs),
             )
             if index is not None and index > 0:
-                if log_slice:
+                object_list += logs[:index]
-                    object_list += logs[: min(log_slice, index)]
-                else:
-                    object_list += logs[:index]
                 logs = logs[index:]
 
             if len(logs):

aircox/models/page.py

@@ -16,7 +16,6 @@ from model_utils.managers import InheritanceQuerySet
 from .station import Station
 
 __all__ = (
-    "Renderable",
     "Category",
     "PageQuerySet",
     "Page",
@@ -26,17 +25,7 @@ __all__ = (
 )
 
 
-headline_clean_re = re.compile(r"\n(\s| )+", re.MULTILINE)
+headline_re = re.compile(r"(<p>)?" r"(?P<headline>[^\n]{1,140}(\n|[^\.]*?\.))" r"(</p>)?")
-headline_re = re.compile(r"(?P<headline>([\S+]|\s+){1,240}\S+)", re.MULTILINE)
-
-
-class Renderable:
-    template_prefix = "page"
-    template_name = "aircox/widgets/{prefix}.html"
-
-    def get_template_name(self, widget):
-        """Return template name for the provided widget."""
-        return self.template_name.format(prefix=self.template_prefix, widget=widget)
 
 
 class Category(models.Model):
@@ -61,9 +50,6 @@ class BasePageQuerySet(InheritanceQuerySet):
     def trash(self):
         return self.filter(status=Page.STATUS_TRASH)
 
-    def by_last(self):
-        return self.order_by("-pub_date")
-
     def parent(self, parent=None, id=None):
         """Return pages having this parent."""
         return self.filter(parent=parent) if id is None else self.filter(parent__id=id)
@@ -74,7 +60,7 @@ class BasePageQuerySet(InheritanceQuerySet):
         return self.filter(title__icontains=q)
 
 
-class BasePage(Renderable, models.Model):
+class BasePage(models.Model):
     """Base class for publishable content."""
 
     STATUS_DRAFT = 0x00
@@ -116,14 +102,11 @@ class BasePage(Renderable, models.Model):
     objects = BasePageQuerySet.as_manager()
 
     detail_url_name = None
+    item_template_name = "aircox/widgets/page_item.html"
 
     class Meta:
         abstract = True
 
-    @property
-    def cover_url(self):
-        return self.cover_id and self.cover.url
-
     def __str__(self):
         return "{}".format(self.title or self.pk)
 
@@ -134,17 +117,12 @@ class BasePage(Renderable, models.Model):
             if count:
                 self.slug += "-" + str(count)
 
-        if self.parent:
+        if self.parent and not self.cover:
-            if self.parent == self:
+            self.cover = self.parent.cover
-                self.parent = None
-            if not self.cover:
-                self.cover = self.parent.cover
         super().save(*args, **kwargs)
 
     def get_absolute_url(self):
-        if self.is_published:
+        return reverse(self.detail_url_name, kwargs={"slug": self.slug}) if self.is_published else "#"
-            return reverse(self.detail_url_name, kwargs={"slug": self.slug})
-        return ""
 
     @property
     def is_draft(self):
@@ -160,28 +138,17 @@ class BasePage(Renderable, models.Model):
 
     @property
     def display_title(self):
-        if self.is_published:
+        if self.is_published():
             return self.title
-        return self.parent and self.parent.title or ""
+        return self.parent.display_title()
 
     @cached_property
-    def display_headline(self):
+    def headline(self):
-        if not self.content or not self.is_published:
+        if not self.content:
-            return self.parent and self.parent.display_headline or ""
-        content = bleach.clean(self.content, tags=[], strip=True)
-        content = headline_clean_re.sub("\n", content)
-        if content.startswith("\n"):
-            content = content[1:]
-        headline = headline_re.search(content)
-        if not headline:
             return ""
-
+        content = bleach.clean(self.content, tags=[], strip=True)
-        headline = headline.groupdict()["headline"]
+        headline = headline_re.search(content)
-        suffix = "<b>...</b>" if len(headline) < len(content) else ""
+        return mark_safe(headline.groupdict()["headline"]) if headline else ""
-
-        headline = headline.split("\n")[:3]
-        headline[-1] += suffix
-        return mark_safe("<br>".join(headline))
 
     @classmethod
     def get_init_kwargs_from(cls, page, **kwargs):
@@ -221,23 +188,6 @@ class Page(BasePage):
     )
 
     objects = PageQuerySet.as_manager()
-    detail_url_name = ""
-    list_url_name = "page-list"
-
-    @cached_property
-    def parent_subclass(self):
-        if self.parent_id:
-            return Page.objects.get_subclass(id=self.parent_id)
-        return None
-
-    def get_absolute_url(self):
-        if not self.is_published and self.parent_subclass:
-            return self.parent_subclass.get_absolute_url()
-        return super().get_absolute_url()
-
-    @classmethod
-    def get_list_url(cls, kwargs={}):
-        return reverse(cls.list_url_name, kwargs=kwargs)
 
     class Meta:
         verbose_name = _("Publication")
@@ -259,37 +209,45 @@ class StaticPage(BasePage):
 
     detail_url_name = "static-page-detail"
 
-    class Target(models.TextChoices):
+    ATTACH_TO_HOME = 0x00
-        NONE = "", _("None")
+    ATTACH_TO_DIFFUSIONS = 0x01
-        HOME = "home", _("Home Page")
+    ATTACH_TO_LOGS = 0x02
-        TIMETABLE = "timetable-list", _("Timetable")
+    ATTACH_TO_PROGRAMS = 0x03
-        PROGRAMS = "program-list", _("Programs list")
+    ATTACH_TO_EPISODES = 0x04
-        EPISODES = "episode-list", _("Episodes list")
+    ATTACH_TO_ARTICLES = 0x05
-        ARTICLES = "article-list", _("Articles list")
-        PAGES = "page-list", _("Publications list")
-        PODCASTS = "podcast-list", _("Podcasts list")
 
-    attach_to = models.CharField(
+    ATTACH_TO_CHOICES = (
+        (ATTACH_TO_HOME, _("Home page")),
+        (ATTACH_TO_DIFFUSIONS, _("Diffusions page")),
+        (ATTACH_TO_LOGS, _("Logs page")),
+        (ATTACH_TO_PROGRAMS, _("Programs list")),
+        (ATTACH_TO_EPISODES, _("Episodes list")),
+        (ATTACH_TO_ARTICLES, _("Articles list")),
+    )
+    VIEWS = {
+        ATTACH_TO_HOME: "home",
+        ATTACH_TO_DIFFUSIONS: "diffusion-list",
+        ATTACH_TO_LOGS: "log-list",
+        ATTACH_TO_PROGRAMS: "program-list",
+        ATTACH_TO_EPISODES: "episode-list",
+        ATTACH_TO_ARTICLES: "article-list",
+    }
+
+    attach_to = models.SmallIntegerField(
         _("attach to"),
-        choices=Target.choices,
+        choices=ATTACH_TO_CHOICES,
-        max_length=32,
         blank=True,
         null=True,
         help_text=_("display this page content to related element"),
     )
 
-    def get_related_view(self):
-        from ..views import attached
-
-        return self.attach_to and attached.get(self.attach_to) or None
-
     def get_absolute_url(self):
         if self.attach_to:
-            return reverse(self.attach_to)
+            return reverse(self.VIEWS[self.attach_to])
         return super().get_absolute_url()
 
 
-class Comment(Renderable, models.Model):
+class Comment(models.Model):
     page = models.ForeignKey(
         Page,
         models.CASCADE,
@@ -302,7 +260,7 @@ class Comment(Renderable, models.Model):
     date = models.DateTimeField(auto_now_add=True)
     content = models.TextField(_("content"), max_length=1024)
 
-    template_prefix = "comment"
+    item_template_name = "aircox/widgets/comment_item.html"
 
     @cached_property
     def parent(self):
@@ -310,7 +268,7 @@ class Comment(Renderable, models.Model):
         return Page.objects.select_subclasses().filter(id=self.page_id).first()
 
     def get_absolute_url(self):
-        return self.parent.get_absolute_url() + f"#comment-{self.pk}"
+        return self.parent.get_absolute_url()
 
     class Meta:
         verbose_name = _("Comment")
@@ -323,7 +281,7 @@ class NavItem(models.Model):
     station = models.ForeignKey(Station, models.CASCADE, verbose_name=_("station"))
     menu = models.SlugField(_("menu"), max_length=24)
     order = models.PositiveSmallIntegerField(_("order"))
-    text = models.CharField(_("title"), max_length=64, blank=True, null=True)
+    text = models.CharField(_("title"), max_length=64)
     url = models.CharField(_("url"), max_length=256, blank=True, null=True)
     page = models.ForeignKey(
         StaticPage,
@@ -342,21 +300,14 @@ class NavItem(models.Model):
     def get_url(self):
         return self.url if self.url else self.page.get_absolute_url() if self.page else None
 
-    def get_label(self):
-        if self.text:
-            return self.text
-        elif self.page:
-            return self.page.title
-
     def render(self, request, css_class="", active_class=""):
         url = self.get_url()
-        label = self.get_label()
         if active_class and request.path.startswith(url):
             css_class += " " + active_class
 
         if not url:
-            return label
+            return self.text
         elif not css_class:
-            return format_html('<a href="{}">{}</a>', url, label)
+            return format_html('<a href="{}">{}</a>', url, self.text)
         else:
-            return format_html('<a href="{}" class="{}">{}</a>', url, css_class, label)
+            return format_html('<a href="{}" class="{}">{}</a>', url, css_class, self.text)

aircox/models/program.py

@@ -64,7 +64,6 @@ class Program(Page):
 
     objects = ProgramQuerySet.as_manager()
     detail_url_name = "program-detail"
-    list_url_name = "program-list"
 
     @property
     def path(self):

aircox/models/schedule.py

@@ -42,7 +42,6 @@ class Schedule(Rerun):
         second_and_fourth = 0b001010, _("2nd and 4th {day} of the month")
         every = 0b011111, _("{day}")
         one_on_two = 0b100000, _("one {day} on two")
-        # every_weekday = 0b10000000 _("from Monday to Friday")
 
     date = models.DateField(
         _("date"),
@@ -72,10 +71,6 @@ class Schedule(Rerun):
         verbose_name = _("Schedule")
         verbose_name_plural = _("Schedules")
 
-    def __init__(self, *args, **kwargs):
-        self._initial = kwargs
-        super().__init__(*args, **kwargs)
-
     def __str__(self):
         return "{} - {}, {}".format(
             self.program.title,
@@ -115,28 +110,16 @@ class Schedule(Rerun):
         date = tz.datetime.combine(date, self.time)
         return date.replace(tzinfo=self.tz)
 
-    def dates_of_month(self, date, frequency=None, sched_date=None):
+    def dates_of_month(self, date):
-        """Return normalized diffusion dates of provided date's month.
+        """Return normalized diffusion dates of provided date's month."""
-
+        if self.frequency == Schedule.Frequency.ponctual:
-        :param Date date: date of the month to get dates from;
-        :param Schedule.Frequency frequency: frequency (defaults to ``self.frequency``)
-        :param Date sched_date: schedule start date (defaults to ``self.date``)
-        :return list of diffusion dates
-        """
-        if frequency is None:
-            frequency = self.frequency
-
-        if sched_date is None:
-            sched_date = self.date
-
-        if frequency == Schedule.Frequency.ponctual:
             return []
 
-        sched_wday = sched_date.weekday()
+        sched_wday, freq = self.date.weekday(), self.frequency
         date = date.replace(day=1)
 
         # last of the month
-        if frequency == Schedule.Frequency.last:
+        if freq == Schedule.Frequency.last:
             date = date.replace(day=calendar.monthrange(date.year, date.month)[1])
             date_wday = date.weekday()
 
@@ -151,42 +134,33 @@ class Schedule(Rerun):
         date_wday, month = date.weekday(), date.month
         date += tz.timedelta(days=(7 if date_wday > sched_wday else 0) - date_wday + sched_wday)
 
-        if frequency == Schedule.Frequency.one_on_two:
+        if freq == Schedule.Frequency.one_on_two:
             # - adjust date with modulo 14 (= 2 weeks in days)
             # - there are max 3 "weeks on two" per month
-            if (date - sched_date).days % 14:
+            if (date - self.date).days % 14:
                 date += tz.timedelta(days=7)
             dates = (date + tz.timedelta(days=14 * i) for i in range(0, 3))
         else:
-            dates = (date + tz.timedelta(days=7 * week) for week in range(0, 5) if frequency & (0b1 << week))
+            dates = (date + tz.timedelta(days=7 * week) for week in range(0, 5) if freq & (0b1 << week))
 
         return [self.normalize(date) for date in dates if date.month == month]
 
-    def diffusions_of_month(self, date, frequency=None, sched_date=None):
+    def diffusions_of_month(self, date):
         """Get episodes and diffusions for month of provided date, including
         reruns.
 
-        :param Date date: date of the month to get diffusions from;
-        :param Schedule.Frequency frequency: frequency (defaults to ``self.frequency``)
-        :param Date sched_date: schedule start date (defaults to ``self.date``)
         :returns: tuple([Episode], [Diffusion])
         """
         from .diffusion import Diffusion
         from .episode import Episode
 
-        if frequency is None:
+        if self.initial is not None or self.frequency == Schedule.Frequency.ponctual:
-            frequency = self.frequency
-
-        if sched_date is None:
-            sched_date = self.date
-
-        if self.initial is not None or frequency == Schedule.Frequency.ponctual:
             return [], []
 
         # dates for self and reruns as (date, initial)
-        reruns = [(rerun, rerun.date - sched_date) for rerun in self.rerun_set.all()]
+        reruns = [(rerun, rerun.date - self.date) for rerun in self.rerun_set.all()]
 
-        dates = {date: None for date in self.dates_of_month(date, frequency, sched_date)}
+        dates = {date: None for date in self.dates_of_month(date)}
         dates.update(
             (rerun.normalize(date.date() + delta), date) for date in list(dates.keys()) for rerun, delta in reruns
         )

aircox/models/signals.py

@@ -41,7 +41,7 @@ def user_default_groups(sender, instance, created, *args, **kwargs):
 
 @receiver(signals.post_save, sender=Page)
 def page_post_save(sender, instance, created, *args, **kwargs):
-    if not created and instance.cover and "raw" not in kwargs:
+    if not created and instance.cover:
         Page.objects.filter(parent=instance, cover__isnull=True).update(cover=instance.cover)
 
 
@@ -59,7 +59,7 @@ def program_post_save(sender, instance, created, *args, **kwargs):
 
 @receiver(signals.pre_save, sender=Schedule)
 def schedule_pre_save(sender, instance, *args, **kwargs):
-    if getattr(instance, "pk") is not None and "raw" not in kwargs:
+    if getattr(instance, "pk") is not None:
         instance._initial = Schedule.objects.get(pk=instance.pk)
 
 

aircox/static/aircox/core.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>Vue App</title>
+  <script defer src="js/chunk-vendors.js"></script><script defer src="js/chunk-common.js"></script><script defer src="js/core.js"></script><link href="css/chunk-vendors.css" rel="stylesheet"><link href="css/chunk-common.css" rel="stylesheet"></head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

aircox/static/aircox/js/admin.js

@@ -16,7 +16,7 @@
   \**********************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _assets_admin_scss__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./assets/admin.scss */ \"./src/assets/admin.scss\");\n/* harmony import */ var _index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.js */ \"./src/index.js\");\n/* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./app */ \"./src/app.js\");\n/* harmony import */ var _components__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./components */ \"./src/components/index.js\");\n/* harmony import */ var _track__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./track */ \"./src/track.js\");\n\n\n\n\n\nconst AdminApp = {\n  ..._app__WEBPACK_IMPORTED_MODULE_2__[\"default\"],\n  components: {\n    ..._app__WEBPACK_IMPORTED_MODULE_2__[\"default\"].components,\n    ..._components__WEBPACK_IMPORTED_MODULE_3__.admin\n  },\n  data() {\n    return {\n      ...super.data,\n      Track: _track__WEBPACK_IMPORTED_MODULE_4__[\"default\"]\n    };\n  }\n};\n/* harmony default export */ __webpack_exports__[\"default\"] = (AdminApp);\nwindow.App = AdminApp;\n\n//# sourceURL=webpack://aircox-assets/./src/admin.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _assets_styles_scss__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./assets/styles.scss */ \"./src/assets/styles.scss\");\n/* harmony import */ var _assets_admin_scss__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./assets/admin.scss */ \"./src/assets/admin.scss\");\n/* harmony import */ var _index_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.js */ \"./src/index.js\");\n/* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./app */ \"./src/app.js\");\n/* harmony import */ var _components__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./components */ \"./src/components/index.js\");\n/* harmony import */ var _track__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./track */ \"./src/track.js\");\n\n\n\n\n\n\nconst AdminApp = {\n  ..._app__WEBPACK_IMPORTED_MODULE_3__[\"default\"],\n  components: {\n    ..._app__WEBPACK_IMPORTED_MODULE_3__[\"default\"].components,\n    ..._components__WEBPACK_IMPORTED_MODULE_4__.admin\n  },\n  data() {\n    return {\n      ...super.data,\n      Track: _track__WEBPACK_IMPORTED_MODULE_5__[\"default\"]\n    };\n  }\n};\n/* harmony default export */ __webpack_exports__[\"default\"] = (AdminApp);\nwindow.App = AdminApp;\n\n//# sourceURL=webpack://aircox-assets/./src/admin.js?");
 
 /***/ }),
 

aircox/static/aircox/js/core.js

@@ -10,23 +10,13 @@
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
 
-/***/ "./src/public.js":
+/***/ "./src/core.js":
-/*!***********************!*\
+/*!*********************!*\
-  !*** ./src/public.js ***!
+  !*** ./src/core.js ***!
-  \***********************/
+  \*********************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _assets_public_scss__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./assets/public.scss */ \"./src/assets/public.scss\");\n/* harmony import */ var _index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.js */ \"./src/index.js\");\n/* harmony import */ var _app_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./app.js */ \"./src/app.js\");\n\n\n\n/* harmony default export */ __webpack_exports__[\"default\"] = (_app_js__WEBPACK_IMPORTED_MODULE_2__[\"default\"]);\nwindow.App = _app_js__WEBPACK_IMPORTED_MODULE_2__[\"default\"];\n\n//# sourceURL=webpack://aircox-assets/./src/public.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.js */ \"./src/index.js\");\n/* harmony import */ var _app_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./app.js */ \"./src/app.js\");\n\n\n/* harmony default export */ __webpack_exports__[\"default\"] = (_app_js__WEBPACK_IMPORTED_MODULE_1__[\"default\"]);\nwindow.App = _app_js__WEBPACK_IMPORTED_MODULE_1__[\"default\"];\n\n//# sourceURL=webpack://aircox-assets/./src/core.js?");
-
-/***/ }),
-
-/***/ "./src/assets/public.scss":
-/*!********************************!*\
-  !*** ./src/assets/public.scss ***!
-  \********************************/
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-eval("__webpack_require__.r(__webpack_exports__);\n// extracted by mini-css-extract-plugin\n\n\n//# sourceURL=webpack://aircox-assets/./src/assets/public.scss?");
 
 /***/ })
 
@@ -166,7 +156,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n// extracted by mini-css-extr
 /******/ 		// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 		// [resolve, reject, Promise] = chunk loading, 0 = chunk loaded
 /******/ 		var installedChunks = {
-/******/ 			"public": 0
+/******/ 			"core": 0
 /******/ 		};
 /******/
 /******/ 		// no chunk on demand loading
@@ -218,7 +208,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n// extracted by mini-css-extr
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
 /******/ 	// This entry module depends on other loaded chunks and execution need to be delayed
-/******/ 	var __webpack_exports__ = __webpack_require__.O(undefined, ["chunk-vendors","chunk-common"], function() { return __webpack_require__("./src/public.js"); })
+/******/ 	var __webpack_exports__ = __webpack_require__.O(undefined, ["chunk-vendors","chunk-common"], function() { return __webpack_require__("./src/core.js"); })
 /******/ 	__webpack_exports__ = __webpack_require__.O(__webpack_exports__);
 /******/
 /******/ })()

aircox/templates/accounts/profile.html

@@ -5,30 +5,15 @@
     {% block title %}{{ user.username }}{% endblock %}
 {% endblock %}
 
-{% block content-container %}
+{% block main %}
-<div class="container content page-content">
+  <h2 class="subtitle is-3">Mes émissions</h2>
-  <h2 class="subtitle">Mon Profil</h2>
-  {% translate "Username" %} : {{ user.username|title }}<br/>
-  <!-- Connexion: {{ user.last_login }} -->
-
-  <h2 class="subtitle is-1">Mes émissions</h2>
   {% if programs|length %}
   <ul>
   {% for p in programs %}
-  <li>{{ p.title }} :
+    <li>• <a href="{% url 'program-detail' slug=p.slug %}">{{ p.title }}</a></li>
-      &nbsp;
-      <a href="{% url 'program-detail' slug=p.slug %}">
-          <span title="{% translate 'View' %} {{ page }}">{% translate 'View' %}</span>
-      </a>
-      &nbsp;
-      <a href="{% url 'program-edit' pk=p.pk %}">
-          <span title="{% translate 'Edit' %} {{ page }}">{% translate 'Edit' %} </span>
-      </a>
-  </li>
   {% endfor %}
   </ul>
   {% else %}
   {% trans 'You are not listed as a program editor yet' %}
   {% endif %}
-</div>
 {% endblock %}

aircox/templates/admin/aircox/filters/date_filter.html

@@ -7,7 +7,7 @@
     <li>
         {% if choice.type %}
         <form method="GET" action="?{{ choice.query_string }}"
-                onsubmit="return this.{{ choice.name }}.value ? true : false">
+                onsubmit="return this.{{ choice.name }}.value ? true : false"">
             <label for="filter-{{ choice.name }}">{{ choice.label }}: </label>
             <input id="filter-{{ choice.name }}" type="{{ choice.type }}" name="{{ choice.name }}"
                 value="{{ choice.value }}" {{ choice.extra }}/>

aircox/templates/admin/aircox/playlist_inline.html

@@ -12,7 +12,6 @@
             :init-data="{% track_inline_data formset=formset %}"
             settings-url="{% url "api:user-settings" %}"
             data-prefix="{{ formset.prefix }}-">
-        {% comment %}
         <template #title>
             <h5 class="title is-4">{% trans "Playlist" %}</h5>
         </template>
@@ -80,7 +79,6 @@
         </template>
         {% endif %}
         {% endfor %}
-    {% endcomment %}
     </a-playlist-editor>
 </div>
 {% endwith %}

aircox/templates/admin/base.html

@@ -4,6 +4,7 @@
 <head>
     <title>{% block title %}{% endblock %}</title>
 
+    <!-- <link rel="stylesheet" type="text/css" href="{% static "aircox/vendor.css" %}"> -->
     <link rel="stylesheet" type="text/css" href="{% static "admin/css/base.css" %}">
     <link rel="stylesheet" type="text/css" href="{% static "aircox/css/chunk-common.css" %}"/>
     <link rel="stylesheet" type="text/css" href="{% static "aircox/css/chunk-vendors.css" %}"/>
@@ -32,26 +33,23 @@
     function vuePre(selector) {
         const elms = document.querySelectorAll(selector)
         for(const elm of elms) {
-            // elm.setAttribute('v-pre', "")
+            elm.setAttribute('v-pre', true)
-            elm.parentNode.setAttribute('v-pre', '')
         }
     }
 
     window.addEventListener('load', function() {
         {% block init-scripts %}
-        vuePre(".django-ckeditor-widget")
-        vuePre("fieldset")
-        window.source_ = document.body.innerHTML
         aircox.init(null, {
+            hotReload: false,
             {% if not init_app %}
-            initApp: false,
+            initBuilder: false,
             {% endif %}
             {% if init_el %}
             el: "{{ init_el }}",
             {% endif %}
         })
         {% endblock %}
-    }, true)
+    })
     </script>
 
 <!-- Container -->
@@ -73,7 +71,7 @@
                     </span>
                     <div class="navbar-dropdown is-boxed">
                         {% for diffusion in diffusions %}
-                        <a class="navbar-item {% if diffusion.is_now %}active{% endif %}" href="{% url "admin:aircox_episode_change" diffusion.episode.pk %}">
+                        <a class="navbar-item {% if diffusion.is_now %}has-background-primary{% endif %}" href="{% url "admin:aircox_episode_change" diffusion.episode.pk %}">
                             {{ diffusion.start|time }} |
                             {{ diffusion.episode.title }}
                         </a>

aircox/templates/admin/index.html

@@ -1,5 +1,5 @@
 {% extends "admin/index.html" %}
-{% load i18n thumbnail aircox %}
+{% load i18n thumbnail %}
 
 
 {% block app %}
@@ -12,11 +12,43 @@
                 <span>{% translate "Today" %}</span>
             </h1>
             {% if diffusions %}
-            <div class="card-grid">
+            <table class="table is-fullwidth is-striped">
-                {% for obj in diffusions %}
+                <tbody>
-                    {% page_widget "card" obj.episode diffusion=obj timetable=True admin=True tag_class="" %}
+                    {% for diffusion in diffusions %}
-                {% endfor %}
+                    {% with episode=diffusion.episode %}
-            </div>
+                    <tr {% if diffusion.is_now %}class="is-selected"{% endif %}>
+                        <td>{{ diffusion.start|time }} - {{ diffusion.end|time }}</td>
+                        <td><img src="{% thumbnail episode.cover 64x64 crop %}"/></td>
+                        <td>
+                            <a href="{% url "admin:aircox_episode_change" episode.pk %}">{{ episode.title }}</a>
+                            &nbsp;
+                            {% if diffusion.type == diffusion.TYPE_ON_AIR %}
+                            <span class="tag is-info">
+                                <span class="icon is-small">
+                                    {% if diffusion.is_live %}
+                                    <i class="fa fa-microphone"
+                                        title="{% translate "Live diffusion" %}"></i>
+                                    {% else %}
+                                    <i class="fa fa-music"
+                                        title="{% translate "Differed diffusion" %}"></i>
+                                    {% endif %}
+                                </span>
+                                &nbsp;
+                                {{ diffusion.get_type_display }}
+                            </span>
+                            {% elif diffusion.type == diffusion.TYPE_CANCEL %}
+                            <span class="tag is-danger">
+                                {{ diffusion.get_type_display }}</span>
+                            {% elif diffusion.type == diffusion.TYPE_UNCONFIRMED %}
+                            <span class="tag is-warning">
+                                {{ diffusion.get_type_display }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    {% endwith %}
+                    {% endfor %}
+                </tbody>
+            </table>
             {% else %}
             <div class="block has-text-centered">
                 {% trans "No diffusion is scheduled for today." %}
@@ -30,12 +62,10 @@
                 <span>{% translate "Latest comments" %}</span>
             </h1>
             {% if comments %}
-                {% for object in comments|slice:":5" %}
+            {% include "aircox/widgets/page_list.html" with object_list=comments with_title=True %}
-                {% page_widget "item" object with_title=True %}
+            <div class="has-text-centered">
-                {% endfor %}
+                <a href="{% url "admin:aircox_comment_changelist" %}" class="float-center">{% translate "All comments" %}</a>
-                <div class="has-text-centered">
+            </div>
-                    <a href="{% url "admin:aircox_comment_changelist" %}" class="float-center">{% translate "All comments" %}</a>
-                </div>
             {% else %}
             <p class="block has-text-centered">{% trans "No comment posted yet" %}</p>
             {% endif %}

aircox/templates/aircox/base.html

@@ -23,10 +23,9 @@ Usefull context:
         {% block assets %}
         <link rel="stylesheet" type="text/css" href="{% static "aircox/css/chunk-common.css" %}"/>
         <link rel="stylesheet" type="text/css" href="{% static "aircox/css/chunk-vendors.css" %}"/>
-        <link rel="stylesheet" type="text/css" href="{% static "aircox/css/public.css" %}"/>
         <script src="{% static "aircox/js/chunk-common.js" %}"></script>
         <script src="{% static "aircox/js/chunk-vendors.js" %}"></script>
-        <script src="{% static "aircox/js/public.js" %}"></script>
+        <script src="{% static "aircox/js/core.js" %}"></script>
         {% endblock %}
 
         <title>
@@ -48,102 +47,127 @@ Usefull context:
             })
         </script>
         <div id="app">
-            <div class="container navs">
+            {% block top-nav-container %}
-                {% block nav %}
+            <nav class="navbar has-shadow" role="navigation" aria-label="main navigation">
-                <nav class="nav primary" role="navigation" aria-label="main navigation">
+                <div class="container">
-                    {% block nav-primary %}
+                    <div class="navbar-brand">
-                    <a class="nav-brand" href="{% url "home" %}">
+                        <a href="/" title="{% translate "Home" %}" class="navbar-item">
-                        <img src="{{ station.logo.url }}">
+                            <img src="{{ station.logo.url }}" class="logo"/>
-                    </a>
-                    <a-switch class="button burger"
-                        el=".nav.primary .nav-menu" group="nav"
-                        aria-label="{% translate "Main menu" %}">
-                    </a-switch>
-                    <div class="nav-menu">
-                        {% block nav-primary-menu %}
-                        {% nav_items "top" css_class="nav-item" active_class="active" as items %}
-                        {% for item, render in items %}
-                        {{ render }}
-                        {% endfor %}
-                        {% if user.is_staff %}
-                        <a class="nav-item" href="{% url "admin:index" %}" target="new">
-                            {% translate "Admin" %}
-                        </a>
-                        {% endif %}
-                        {% if user.is_authenticated %}
-                        <a class="nav-item" href="{% url "profile" %}" target="new">
-                            {% translate "Profile" %}
-                        </a>
-                        <a class="nav-item" href="{% url 'logout' %}">
-                            <i title="{% translate 'disconnect' %}" class="fa fa-power-off"></i>
                         </a>
+                    </div>
+                    <div class="navbar-menu">
+                        <div class="navbar-start">
+                            {% block top-nav %}
+                            {% nav_items "top" css_class="navbar-item" active_class="is-active" as items %}
+                            {% for item, render in items %}
+                            {{ render }}
+                            {% endfor %}
+                            {% endblock %}
+                        </div>
+                        <div class="navbar-end">
+                            {% block top-nav-tools %}
+                            {% endblock %}
+
+                            {% block top-nav-end %}
+                            <div class="navbar-item">
+                                <form action="{% url 'page-list' %}" method="GET">
+                                    <div class="control has-icons-left">
+                                        <span class="icon is-small is-left">
+                                            <i class="fa fa-search"></i>
+                                        </span>
+                                        <input type="text" name="q" class="input"
+                                            placeholder="{% translate "Search" %}" />
+                                    </div>
+                                </form>
+                            </div>
+                            {% endblock %}
+
+                            {% if user.is_authenticated %}
+                                <div class="navbar-item">
+                                    <a href="{% url 'profile' %}">{{ user.username }}</a> &nbsp; <a href="{% url 'logout' %}"> <i class="fa fa-power-off"></i></a>
+                                </div>
+                            {% endif %}
+                        </div>
+                    </div>
+                </div>
+            </nav>
+            {% endblock %}
+
+            <div class="container">
+                <div class="columns is-desktop">
+                    <main class="column page">
+                        <header class="header">
+                            {% block header %}
+                            <h1 class="title is-1">
+                                {% block title %}
+                                {% if page and page.title %}
+                                {{ page.title }}
+                                {% endif %}
+                                {% endblock %}
+                            </h1>
+
+                            <h3 class="subtitle is-3">
+                                {% block subtitle %}{% endblock %}
+                            </h3>
+
+                            <div class="columns is-size-4">
+                            {% block header_nav %}
+                            <span class="column">
+                                {% block header_crumbs %}
+                                {% if parent %}
+                                <a href="{{ parent.get_absolute_url }}">
+                                     {{ parent.title }}</a></li>
+                                {% endif %}
+                                {% endblock %}
+                            </span>
+                            {% endblock %}
+                            </div>
+                            {% endblock %}
+                        </header>
+
+                        {% block main %}
+                            {% block content %}
+                            {% if page and page.content %}
+                            <section class="page-content mb-2">{{ page.content|safe }}</section>
+                            {% endif %}
+                            {% endblock %}
+                        {% endblock main %}
+                    </main>
+
+                    {% if has_sidebar %}
+                    {% comment %}Translators: main sidebar {% endcomment %}
+                    <aside class="column is-one-third-desktop">
+                        {# FIXME: block cover into sidebar one #}
+                        {% block cover %}
+                        {% if page and page.cover %}
+                        <img class="cover mb-4" src="{{ page.cover.url }}" class="cover"/>
                         {% endif %}
                         {% endblock %}
-                    </div>
-                    {% endblock %}
-                </nav>
 
-                {% block secondary-nav %}{% endblock %}
+                        {% with is_thin=True %}
-                {% endblock %}
+                        {% block sidebar %}
+                        {% if sidebar_object_list %}
+                        {% with object_list=sidebar_object_list %}
+                        {% with list_url=sidebar_list_url %}
+                        {% with has_headline=False %}
+                        <section>
+                            <h4 class="title is-4">
+                                {% block sidebar_title %}{% translate "Recently" %}{% endblock %}
+                            </h4>
+                            {% include "aircox/widgets/page_list.html" %}
+                        {% endwith %}
+                        {% endwith %}
+                        {% endwith %}
+                        {% endif %}
+                        </section>
+                        {% endblock %}
+                        {% endwith %}
+                    </aside>
+                    {% endif %}
+                </div>
             </div>
 
-            {% block main-container %}
+            <hr>
-            <main class="page">
-            {% block main %}
-                {% spaceless %}
-                {% block breadcrumbs-container %}
-                <div class="breadcrumbs container">
-                    {% block breadcrumbs %}{% endblock %}
-                </div>
-                {% endblock %}
-                {% endspaceless %}
-
-
-
-                {% block header-container %}
-                {% if page or cover or title %}
-                <header class="container header preview preview-header {% if cover %}has-cover{% endif %}">
-                    {% block header %}
-                    {% if cover %}
-                    <img src="{{ cover }}" class="header-cover">
-                    {% endif %}
-                    <div class="headings preview-card-headings">
-                    {% block headings %}
-                    <div>
-                        <h1 class="heading title is-1 {% block title-class %}{% endblock %}">{% block title %}{{ title|default:"" }}{% endblock %}</h1>
-                        {% include "aircox/edit-link.html" %}
-                    </div>
-                    <div>
-                        {% spaceless %}
-                        <span class="heading subtitle is-2">
-                        {% block subtitle %}
-                        {% if subtitle %}
-                            {{ subtitle }}
-                        {% endif %}
-                        {% endblock %}
-                        </span>
-                        {% endspaceless %}
-                        </span>
-                    </div>
-                    {% endblock %}
-                    </div>
-                {% endblock %}
-                </header>
-                {% endif %}
-                {% endblock %}
-
-                {% block content-container %}
-                {% if page and page.content %}
-                <div class="container content page-content">
-                    {% block content %}
-                        {{ page.content|safe }}
-                    {% endblock %}
-                </div>
-                {% endif %}
-                {% endblock %}
-            {% endblock %}
-            </main>
-            {% endblock %}
         </div>
         {% block player-container %}
         <div id="player">{% include "aircox/widgets/player.html" %}</div>

aircox/templates/aircox/basepage_detail.html

@@ -6,5 +6,3 @@
     —
     {{ station.name }}
 {% endblock %}
-
-{% block header %}{% if page %}{{ block.super }}{% endif %}{% endblock %}

aircox/templates/aircox/basepage_list.html

@@ -1,68 +1,86 @@
-{% extends "./base.html" %}
+{% extends "aircox/base.html" %}
 
 {% comment %}Display a list of BasePages{% endcomment %}
 {% load i18n aircox %}
 
 {% block head_title %}
     {% block title %}
-        {{ block.super }}
+        {% if not page or not page.title %}
+            {% if not parent %}{{ view.model|verbose_name:True|title }}
+            {% else %}
+            {% with parent.title as title %}
+            {% with model|default:"Publications"|verbose_name:True|capfirst as model %}
+            {% comment %}Translators: title when pages are filtered for a specific parent page, e.g.: Articles of My Incredible Show{% endcomment %}
+            {% blocktranslate %}{{ model }} of {{ title }}{% endblocktranslate %}
+            {% endwith %}
+            {% endwith %}
+            {% endif %}
+        {% else %}{{ block.super }}
+        {% endif %}
     {% endblock %}
     —
     {{ station.name }}
 {% endblock %}
 
-{% block main %}
+{% block main %}{{ block.super }}
-{{ block.super }}
 
-{% block list-container %}
+{% block before_list %}{% endblock %}
-<section class="container clear-both" role="list">
+
-{% block list %}
+<section role="list">
+{% block pages_list %}
 {% with has_headline=True %}
-    {% for object in object_list %}
+{% for object in object_list %}
-        {% block list_object %}
+{% block list_object %}
-            {% page_widget item_widget|default:"item" object %}
+{% include object.item_template_name|default:item_template_name %}
-        {% endblock %}
+{% endblock %}
-    {% empty %}
+{% empty %}
-        {% blocktranslate %}There is nothing published here...{% endblocktranslate %}
+{% blocktranslate %}There is nothing published here...{% endblocktranslate %}
-    {% endfor %}
+{% endfor %}
 {% endwith %}
 {% endblock %}
 </section>
 
-
-{% block list-pagination %}
 {% if is_paginated %}
 <hr/>
 {% update_query request.GET.copy page=None as GET %}
 {% with GET.urlencode as GET %}
-<nav class="nav-urls is-centered" role="pagination" aria-label="{% translate "pagination" %}">
+<nav class="pagination is-centered" role="pagination" aria-label="{% translate "pagination" %}">
-    <ul class="urls">
+    {% block pagination %}
-        {% if page_obj.has_previous %}
+    {% if page_obj.has_previous %}
+    <a href="?{{ GET }}&page={{ page_obj.previous_page_number }}" class="pagination-previous">
+    {% else %}
+    <a class="pagination-previous" disabled>
+    {% endif %}
         {% comment %}Translators: Bottom of the list, "previous page"{% endcomment %}
-        <a href="?{{ GET }}&page={{ page_obj.previous_page_number }}" class="left button"
+        {% translate "Previous" %}</a>
-            title="{% translate "Previous" %}"
-            aria-label="{% translate "Previous" %}">
-            <span class="icon"><i class="fa fa-chevron-left"></i></span>
-        </a>
-        {% endif %}
 
-        {% if page_obj.has_next %}
+    {% if page_obj.has_next %}
+    <a href="?{{ GET }}&page={{ page_obj.next_page_number }}" class="pagination-next">
+    {% else %}
+    <a class="pagination-next" disabled>
+    {% endif %}
         {% comment %}Translators: Bottom of the list, "Nextpage"{% endcomment %}
-        <a href="?{{ GET }}&page={{ page_obj.next_page_number }}" class="right button"
+        {% translate "Next" %}</a>
-                title="{% translate "Next" %}"
-                aria-label="{% translate "Next" %}">
-            <span class="icon"><i class="fa fa-chevron-right"></i></span>
-        </a>
-        {% endif %}
-    </ul>
 
+    <ul class="pagination-list">
+    {% for i in paginator.page_range %}
+        <li>
+            {% comment %}
+            <form action="?{{ GET }}">
+                {% for get in GET %}
+                <input type="hidden" name="{{ get.0 }}" value="{{ get.1 }}" />
+                {% endfor %}
+                <input type="number" name="page" value="{{ page_obj.number }}" />
+            </form>
+            {% endcomment %}
+            <a class="pagination-link {% if page_obj.number == i %}is-current{% endif %}"
+               href="?{{ GET }}&page={{ i }}">{{ i }}</a>
+        </li>
+    {% endfor %}
+    </ul>
+    {% endblock %}
 </nav>
 {% endwith %}
 {% endif %}
-{% endblock %}
 
 {% endblock %}
-
-
-</div>
-{% endblock %}

aircox/templates/aircox/diffusion_list.html

@@ -14,18 +14,16 @@
 
 {% block subtitle %}{{ date|date:"l d F Y" }}{% endblock %}
 
-{% block secondary-nav %}
+{% block before_list %}
-<nav class="nav secondary">
+{% with "diffusion-list" as url_name %}
-    {% include "./widgets/dates_menu.html" with url_name="diffusion-list" %}
+{% include "aircox/widgets/dates_menu.html" %}
-</nav>
+{% endwith %}
 {% endblock %}
 
 {% block pages_list %}
 {% with hide_schedule=True %}
-<section role="list" class="list">
+<section role="list">
-    {% for object in object_list %}
+    {% include 'aircox/widgets/diffusion_list.html' %}
-    {% page_widget "item" object.episode diffusion=object timetable=True %}
-    {% endfor %}
 </section>
 {% endwith %}
 {% endblock %}

aircox/templates/aircox/edit-link.html

@@ -1,20 +0,0 @@
-{% load aircox i18n %}
-{% block user-actions-container %}
-{% has_perm page page.program.change_permission_codename simple=True as can_edit %}
-{% if user.is_authenticated and can_edit %}
-{% with request.resolver_match.view_name as view_name %}
-   
-  {% if view_name in 'program-edit,bla' %}
-  <!--
-  <a href="{% url 'program-detail' page.slug %}" target="_self">
-      <span title="{% translate 'View' %} {{ page }}">{% translate 'View' %} 👁 </span>
-  </a>
-  -->
-  {% else %}
-  <a href="{% url view_name|edit_view page.pk %}" target="_self">
-      <span title="{% translate 'Edit' %} {{ page }}">{% translate 'Edit' %} 🖉  </span>
-  </a>
-  {% endif %}
-{% endwith %}
-{% endif %}
-{% endblock %}

aircox/templates/aircox/episode_detail.html

@@ -2,54 +2,92 @@
 {% comment %}List of a show's episodes for a specific{% endcomment %}
 {% load i18n aircox %}
 
+{% include "aircox/program_sidebar.html" %}
 
-{% block content-container %}
-{{ block.container }}
 
+{% block top-nav-tools %}
+{% has_perm page page.program.change_permission_codename simple=True as can_edit %}
+{% if can_edit %}
+<a class="navbar-item" href="{% url 'episode-edit' page.pk %}" target="_self">
+    <span class="icon is-small">
+        <i class="fa fa-pen"></i>
+    </span>&nbsp;
+    <span>{% translate "Edit" %}</span>
+</a>
+{% endif %}
+{% endblock %}
+
+
+{% block content %}
 <a-episode :page="{title: &quot;{{ page.title }}&quot;, podcasts: {{ object.podcasts|json }}}">
 <template v-slot="{podcasts,page}">
-    {{ block.super }}
+{{ block.super }}
 
-    {% if object.podcasts %}
+{% if object.podcasts %}
-    {% spaceless %}
+<section>
-    <section class="container no-border">
+    <a-playlist v-if="page" :set="podcasts"
-        <h3 class="title is-3">{% translate "Podcasts" %}</h3>
+        name="{{ page.title }}"
-        <a-playlist v-if="page" :set="podcasts"
+        list-class="menu-list" item-class="menu-item"
-            name="{{ page.title }}"
+        :player="player" :actions="['play']"
-            list-class="menu-list" item-class="menu-item"
+        @select="player.playItems('queue', $event.item)">
-            :player="player" :actions="['play']"
+        <template v-slot:header>
-            @select="player.playItems('queue', $event.item)">
+            <h4 class="title is-4">{% translate "Podcasts" %}</h4>
-        </a-playlist>
+        </template>
-    </section>
+    </a-playlist>
-    {% endspaceless %}
+    {% comment %}
-    {% endif %}
+    {% for object in podcasts %}
+    {% include "aircox/widgets/podcast_item.html" %}
+    {% endfor %}
+    {% endcomment %}
+</section>
+{% endif %}
 
-    {% if tracks %}
+{% if tracks %}
-    <section class="container">
+<section>
-        <h3 class="title is-3">{% translate "Playlist" %}</h3>
+    <h4 class="title is-4">{% translate "Playlist" %}</h4>
-        <table class="table is-hoverable is-fullwidth">
+    <ol>
-            <thead>
+        {% for track in tracks %}
-                <tr>
+        <li><span>{{ track.title }}</span>
-                    <th></th>
+            <span class="has-text-grey-dark has-text-weight-light">
-                    <th>{% translate "Artist" %}</th>
+            &mdash; {{ track.artist }}
-                    <th>{% translate "Title" %}</th>
+            {% if track.info %}(<i>{{ track.info }}</i>){% endif %}
-                    <th></th>
+            </span>
-            </thead>
+        </li>
-            <tbody>
+        {% endfor %}
-                {% for track in tracks %}
+    </ol>
-                <tr>
+</section>
-                    <td>{{ forloop.counter }}</td>
+{% endif %}
-                    <td>{{ track.artist }}</td>
-                    <td>{{ track.title }}</td>
-                    <td>{{ track.info|default:"" }}</td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </section>
-    {% endif %}
 
-
+</template></a-episode>
-</template>
+{% endblock %}
-</a-episode>
+
+{% block sidebar %}
+<section>
+    <h4 class="title is-4">{% translate "Diffusions" %}</h4>
+    <ul>
+    {% for diffusion in object.diffusion_set.all %}
+    <li>
+        {% with diffusion.start as start %}
+        {% with diffusion.end as end %}
+        <time datetime="{{ start }}">{{ start|date:"D. d F Y, H:i" }}</time>
+        &mdash;
+        <time datetime="{{ end }}">{{ end|date:"H:i" }}</time>
+        {% endwith %}
+        {% endwith %}
+
+        <small>
+            {% if diffusion.initial %}
+            {% with diffusion.initial.date as date %}
+            <span title="{% blocktranslate %}Rerun of {{ date }}{% endblocktranslate %}">
+                ({% translate "rerun" %})
+            </span>
+            {% endwith %}
+            {% endif %}
+        </small>
+        <br>
+    </li>
+    {% endfor %}
+    </ul>
+</section>
+{{ block.super }}
 {% endblock %}

aircox/templates/aircox/episode_form.html

@@ -9,22 +9,22 @@
 {% block init-scripts %}
 {% endblock %}
 
-{% block comments %}
+{% block top-nav-tools %}
+<a class="navbar-item" href="{% url 'episode-detail' object.slug %}" target="_self">
+    <span class="icon is-small">
+        <i class="fa fa-eye"></i>
+    </span>&nbsp;
+    <span>{% translate "View" %}</span>
+</a>
 {% endblock %}
 
-{% block content-container %}
+{% block main %}
-<section class="container">
 <form method="post" enctype="multipart/form-data">{% csrf_token %}
     <table>
         {{ form.as_table }}
         {% render_honeypot_field "website" %}
     </table>
     <br/>
-    {{ forms }}
-    <br/>
     <input type="submit" value="Update" class="button is-success">
 </form>
-
-
-</section>
 {% endblock %}

aircox/templates/aircox/errors/base.html

@@ -18,7 +18,7 @@
 {% endblock %}
 
 
-{% block content-container %}
+{% block content %}
 <article class="message is-danger">
     <div class="message-header">
         <p>{% block error_title %}{% trans "An error occurred" %}{% endblock %}</p>

aircox/templates/aircox/home.html

@@ -1,70 +1,85 @@
-{% extends "aircox/base.html" %}
+{% extends "aircox/page_list.html" %}
-{% load i18n aircox %}
+{% comment %}Home page{% endcomment %}
+{% load i18n %}
 
 {% block head_title %}{{ station.name }}{% endblock %}
 
-{% block title %}{% if page %}{{ block.super }}{% endif %}{% endblock %}
+{% block title %}
+{% if not page or not page.title %}{{ station.name }}
+{% else %}{{ block.super }}
+{% endif %}
+{% endblock %}
 
+{% block before_list %}{% endblock %}
 
-{% block breadcrumbs-container %}{% endblock %}
+{% block pages_list %}
-
+{% if page and page.content %}<hr/>{% endif %}
-{% block content-container %}
-{{ block.super }}
-
 {% if next_diffs %}
-<section class="container">
+<div class="columns">
-    <h2 class="title is-3 p-2">
+    {% with render_card=True %}
-        {% with station.name as station %}
+    {% for object in next_diffs %}
-            {% blocktrans %}Today on {{ station }}{% endblocktrans %}
+    {% with is_primary=object.is_now %}
-        {% endwith %}
+    <div class="column is-relative">
-    </h2>
+        <h4 class="card-super-title" title="{{ object.start }}">
-
+            {% if is_primary %}
-    <div class="mb-3">
+                <span class="fas fa-play"></span>
-    {% with next_diffs.0 as obj %}
+                <time datetime="{{ object.start }}">
-        {% page_widget "wide" obj.episode diffusion=obj timetable=True %}
+                    {% translate "Currently" %}
-    {% endwith %}
+                </time>
-    </div>
+            {% else %}
-
+                {{ object.start|date:"H:i" }}
-    <a-carousel section-class="card-grid">
-        {% for obj in next_diffs|slice:"1:" %}
-            {% if object != diffusion %}
-                {% page_widget "card" obj.episode diffusion=obj timetable=True %}
             {% endif %}
-        {% endfor %}
-    </a-carousel>
-</section>
-{% endif %}
 
-{% if logs %}
+            {% if object.episode.category %}
-<section class="container">
+            // {{ object.episode.category.title }}
-    <h2 class="title is-3 p-2">{% translate "It just happened" %}</h2>
+            {% endif %}
-    {% for object in logs %}
+        </h4>
-        {% include "./widgets/log.html" with widget="item" %}
+        {% include object.item_template_name %}
+    </div>
+    {% endwith %}
     {% endfor %}
-
+    {% endwith %}
-    <nav class="nav-urls">
+</div>
-        <a href="{% url "timetable-list" %}"
-            aria-label="{% translate "Show all program's for today" %}">
-            {% translate "Today" %}
-        </a>
-    </nav>
-</section>
 {% endif %}
 
-
+{% if object_list %}
-{% if podcasts %}
+<h4 class="title is-4">{% translate "Today" %}</h4>
-<section class="container">
+<section role="list">
-    <h2 class="title is-3 p-2">{% translate "Last podcasts" %}</h2>
+    {% include 'aircox/widgets/diffusion_list.html' %}
-    {% include "./widgets/carousel.html" with objects=podcasts url_name="podcast-list" url_label=_("All podcasts") %}
-</section>
-{% endif %}
-
-{% if publications %}
-<section class="container">
-    <h2 class="title is-3 p-2">{% translate "Last publications" %}</h2>
-    {% include "./widgets/carousel.html" with objects=publications url_name="page-list" url_label=_("All publications") %}
 </section>
 {% endif %}
 {% endblock %}
 
-{% block pages_list %}{% endblock %}
+{% block pagination %}
+<ul class="pagination-list">
+    <li>
+        <a href="{% url "page-list" %}" class="pagination-link"
+            aria-label="{% translate "Show all publication" %}">
+            {% translate "More publications..." %}
+        </a>
+    </li>
+</ul>
+{% endblock %}
+
+
+{% block sidebar %}
+<section>
+    <h4 class="title is-4">{% translate "Previously on air" %}</h4>
+    {% with has_cover=False %}
+    {% with logs as object_list %}
+    {% include "aircox/widgets/log_list.html" %}
+    {% endwith %}
+    {% endwith %}
+</section>
+
+<section>
+    <h4 class="title is-4">{% translate "Last publications" %}</h4>
+    {% with hide_schedule=True %}
+    {% with has_headline=False %}
+    {% for object in last_publications %}
+    {% include object.item_template_name|default:'aircox/widgets/page_item.html' %}
+    {% endfor %}
+    {% endwith %}
+    {% endwith %}
+</section>
+{% endblock %}

aircox/templates/aircox/log_list.html

@@ -15,31 +15,15 @@
 
 {% block subtitle %}{{ date|date:"l d F Y" }}{% endblock %}
 
-
+{% block before_list %}
-{% block secondary-nav %}
+{% with "log-list" as url_name %}
-<nav class="nav secondary">
+{% include "aircox/widgets/dates_menu.html" %}
-    {% include "./widgets/dates_menu.html" with url_name="log-list" %}
+{% endwith %}
-</nav>
 {% endblock %}
 
-
+{% block pages_list %}
-{% block pages_list_ %}
 <section>
     {# <h4 class="subtitle size-4">{{ date }}</h4> #}
     {% include "aircox/widgets/log_list.html" %}
 </section>
 {% endblock %}
-
-{% block pages_list %}
-{% with hide_schedule=True %}
-<section role="list" class="list">
-    {% for object in object_list %}
-    {% if object.episode %}
-        {% page_widget "item" object.episode diffusion=object timetable=True %}
-    {% else %}
-        {% page_widget "item" object timetable=True %}
-    {% endif %}
-    {% endfor %}
-</section>
-{% endwith %}
-{% endblock %}

aircox/templates/aircox/page_detail.html

@@ -6,83 +6,83 @@ Base template used to display a Page
 Context:
 - page: page
 - parent: parent page
-- related_objects: list of object to display as related publications
-- related_url: url to the full list of related_objects
 {% endcomment %}
 
-{% block breadcrumbs %}
+{% block header_crumbs %}
-{% if parent %}
+{{ block.super }}
-    {% include "./widgets/breadcrumbs.html" with page=parent %}
+{% if page.category %}
-    {% if page %}
+{% if parent %} / {% endif %} {{ page.category.title }}
-    <a href="{% url page.list_url_name parent_slug=parent.slug %}">
-        {{ page|verbose_name:True }}
-    </a>
-    {% endif %}
-{% elif page %}
-    {% include "./widgets/breadcrumbs.html" with page=page no_title=True %}
 {% endif %}
 {% endblock %}
 
+{% block top-nav-tools %}
+{% has_perm page "change" as can_edit %}
+{% if can_edit %}
+<a class="navbar-item" href="{{ page|admin_url:'change' }}"
+    target="new">
+    <span class="icon is-small">
+        <i class="fa fa-pen"></i>
+    </span>&nbsp;
+    <span>{% translate "Edit" %}</span>
+</a>
+{% endif %}
+{% endblock %}
 
 {% block main %}
 {{ block.super }}
 
-{% block related %}
-{% if related_objects %}
-<section class="container">
-    {% with models=object|verbose_name:True %}
-    <h3 class="title is-3">{% blocktranslate %}Related {{models}}{% endblocktranslate %}</h3>
-
-    {% include "./widgets/carousel.html" with objects=related_objects url_name=object.list_url_name url_category=object.category %}
-    {% endwith %}
-{% endif %}
-{% endblock %}
-
 {% block comments %}
-{% if comments %}
+{% if comments or comment_form %}
-<section class="container">
+<section class="mt-6">
-    <h2 class="title">{% translate "Comments" %}</h2>
+    <h4 class="title is-4">{% translate "Comments" %}</h4>
 
-    {% for object in comments %}
+    {% for comment in comments %}
-    <div id="comment-{{ object.pk }}">
+    <div class="media box">
-        {% page_widget "item" object %}
+        <div class="media-content">
+            <p>
+                <strong class="mr-2">{{ comment.nickname }}</strong>
+                <time datetime="{{ comment.date }}" title="{{ comment.date }}">
+                    <small>{{ comment.date|naturaltime }}</small>
+                </time>
+                <br>
+                {{ comment.content }}
+            </p>
+        </div>
     </div>
     {% endfor %}
-</section>
-{% endif %}
 
-{% if comment_form %}
+    {% if comment_form %}
-<section class="container">
-    <h2 class="title">{% translate "Post a comment" %}</h2>
     <form method="POST">
+        <h5 class="title is-5">{% translate "Post a comment" %}</h5>
         {% csrf_token %}
         {% render_honeypot_field "website" %}
 
-        <div class="field">
+        {% for field in comment_form %}
-            <div class="control">
+        <div class="field is-horizontal">
-                {{ comment_form.content }}
+            <div class="field-label is-normal">
+                <label class="label">
+                    {{ field.label_tag }}
+                </label>
+            </div>
+            <div class="field-body">
+                <div class="field">
+                    <p class="control is-expanded">{{ field }}</p>
+                    {% if field.errors %}
+                    <p class="help is-danger">{{ field.errors }}</p>
+                    {% endif %}
+                    {% if field.help_text %}
+                    <p class="help">{{ field.help_text|safe }}</p>
+                    {% endif %}
+                </div>
             </div>
         </div>
-
-        {% for field in comment_form %}
-        {% if field.name != "content" %}
-        <div class="field is-horizontal">
-            <label class="label">{{ field.label }}</label>
-            <div class="control">{{ field }}</div>
-        </div>
-        {% if field.errors %}
-        <p class="help is-danger">{{ field.errors }}</p>
-        {% endif %}
-        {% if field.help_text %}
-        <p class="help">{{ field.help_text|safe }}</p>
-        {% endif %}
-        {% endif %}
         {% endfor %}
-
         <div class="has-text-right">
-            <button type="submit" class="button">{% translate "Post comment" %}</button>
+            <button type="reset" class="button is-danger">{% translate "Reset" %}</button>
+            <button type="submit" class="button is-success">{% translate "Post comment" %}</button>
         </div>
     </form>
+    {% endif %}
 </section>
 {% endif %}
 

aircox/templates/aircox/page_list.html

@@ -2,60 +2,61 @@
 {% comment %}Display a list of Pages{% endcomment %}
 {% load i18n aircox %}
 
-{% block secondary-nav %}
+{% block before_list %}
-{% if not parent and categories %}
+{{ block.super }}
-<nav class="nav secondary">
+
-    <div class="nav-menu nav-categories">
+{% if view.has_filters and object_list %}
-        {% for cat in categories %}
+<form method="GET" action="" class="media">
-        <a class="nav-item{% if cat == category %} active{% endif %}"
+    <div class="media-content">
-            href="{% url request.resolver_match.url_name category_slug=cat.slug %}">
+        {% block filters %}
-            {{ cat.title }}
+        <div class="field is-horizontal">
-        </a>
+            <div class="field-label">
-        {% endfor %}
+                <label class="label">{% translate "Search" %}</label>
+            </div>
+            <div class="field-body">
+                <div class="field">
+                    <div class="control has-icons-left">
+                        <span class="icon is-small is-left">
+                            <i class="fa fa-search"></i>
+                        </span>
+                        <input class="input" type="text" name="q"
+                            value="{{ filterset_data.q }}"
+                            placeholder="{% translate "Search content" %}">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="field is-horizontal">
+            <div class="field-label">
+                <label class="label">{% translate "Categories" %}</label>
+            </div>
+            <div class="field-body">
+                <div class="field is-narrow">
+                    <div class="control">
+                        {% for label, value in categories %}
+                        <label class="checkbox">
+                            <input type="checkbox" class="checkbox" name="category__id__in"
+                                   value="{{ value }}"
+                                   {% if value in filterset_data.category__id__in %}checked{% endif %} />
+                            {{ label }}
+                        </label>
+                        {% endfor %}
+                    </div>
+                </div>
+            </div>
+        </div>
+        {% endblock %}
     </div>
-    <a-switch class="button burger"
+    <div class="media-right">
-        el=".nav-categories" group="nav" icon="fas fa-tags"
+        <div class="field is-grouped is-grouped-right">
-        aria-label="{% translate "Categories" %}">
+            <div class="control">
-    </a-switch>
+                <button class="button is-primary"/>{% translate "Apply" %}</button>
-</nav>
+            </div>
+            <div class="control">
+                <a href="?" class="button is-secondary">{% translate "Reset" %}</a>
+            </div>
+        </div>
+    </div>
+</form>
 {% endif %}
 {% endblock %}
-
-{% block title %}
-{% if parent %}{{ parent.title }}
-{% else %}{{ block.super }}
-{% endif %}
-{% endblock %}
-
-{% block header %}
-{% if page and not object %}
-    {% with page as object %}
-    {{ block.super }}
-    {% endwith %}
-{% else %}
-    {{ block.super }}
-{% endif %}
-{% endblock %}
-
-{% block breadcrumbs %}
-{% if parent and model.list_url_name %}
-    {% include "./widgets/breadcrumbs.html" with page=parent %}
-    <a href="{% url model.list_url_name %}">{{ model|verbose_name:True }}</a>
-{% elif page and model.list_url_name %}
-    <a href="{% url model.list_url_name %}">{{ page.title }}</a>
-    {% if category %}
-    <a href="{% url request.resolver_match.url_name category_slug=category.slug %}">
-        {{ category.title }}
-    </a>
-    {% endif %}
-{% else %}
-    <a href="{% url request.resolver_match.url_name %}">{{ model|verbose_name:True }}</a>
-    {% if category %}
-    <a href="{% url request.resolver_match.url_name category_slug=category.slug %}">
-        {{ category.title }}
-    </a>
-    {% endif %}
-{% endif %}
-{% endblock %}
-
-{% block content-container %}{% endblock %}

aircox/templates/aircox/program_detail.html

@@ -1,6 +1,19 @@
-{% extends "aircox/page_detail.html" %}
+{% extends "aircox/basepage_detail.html" %}
-{% comment %}Detail page of a show{% endcomment %}
+{% load static i18n humanize honeypot aircox %}
-{% load i18n aircox %}
+{% comment %}
+Base template used to display a Page
+
+Context:
+- page: page
+- parent: parent page
+{% endcomment %}
+
+{% block header_crumbs %}
+{{ block.super }}
+{% if page.category %}
+{% if parent %} / {% endif %} {{ page.category.title }}
+{% endif %}
+{% endblock %}
 
 {% block top-nav-tools %}
 {% has_perm page page.change_permission_codename simple=True as can_edit %}
@@ -14,52 +27,63 @@
 {% endif %}
 {% endblock %}
 
-{% block content-container %}
+{% block main %}
-{% with schedules=program.schedule_set.all %}
+{{ block.super }}
-{% if schedules %}
+
-<section class="container schedules">
+{% block comments %}
-    {% for schedule in schedules %}
+{% if comments or comment_form %}
-    <div class="schedule">
+<section class="mt-6">
-        <div class="heading">
+    <h4 class="title is-4">{% translate "Comments" %}</h4>
-            <span class="day">{{ schedule.get_frequency_display }}</span>
+
-            {% with schedule.start|date:"H:i" as start %}
+    {% for comment in comments %}
-            {% with schedule.end|date:"H:i" as end %}
+    <div class="media box">
-            <time datetime="{{ start }}">{{ start }}</time>
+        <div class="media-content">
-            &mdash;
+            <p>
-            <time datetime="{{ end }}">{{ end }}</time>
+                <strong class="mr-2">{{ comment.nickname }}</strong>
-            {% endwith %}
+                <time datetime="{{ comment.date }}" title="{{ comment.date }}">
-            {% endwith %}
+                    <small>{{ comment.date|naturaltime }}</small>
-            <small>
+                </time>
-                {% if schedule.is_rerun %}
+                <br>
-                {% with schedule.initial.date as date %}
+                {{ comment.content }}
-                <span title="{% blocktranslate %}Rerun of {{ date }}{% endblocktranslate %}">
+            </p>
-                    ({% translate "Rerun" %})
-                </span>
-                {% endwith %}
-                {% endif %}
-            </small>
         </div>
     </div>
     {% endfor %}
-</section>
-{% endif %}
-{% endwith %}
 
-{{ block.super }}
+    {% if comment_form %}
+    <form method="POST">
+        <h5 class="title is-5">{% translate "Post a comment" %}</h5>
+        {% csrf_token %}
+        {% render_honeypot_field "website" %}
 
-{% if episodes %}
+        {% for field in comment_form %}
-<section class="container">
+        <div class="field is-horizontal">
-    <h3 class="title is-3">{% translate "Last Episodes" %}</h3>
+            <div class="field-label is-normal">
-    {% include "./widgets/carousel.html" with objects=episodes url_name="episode-list" url_parent=object url_label=_("All episodes") %}
+                <label class="label">
-</section>
+                    {{ field.label_tag }}
-{% endif %}
+                </label>
-
+            </div>
-
+            <div class="field-body">
-{% if articles %}
+                <div class="field">
-<section class="container">
+                    <p class="control is-expanded">{{ field }}</p>
-    <h3 class="title is-3">{% translate "Last Articles" %}</h3>
+                    {% if field.errors %}
-    {% include "./widgets/carousel.html" with objects=articles url_name="article-list" url_parent=object url_label=_("All articles") %}
+                    <p class="help is-danger">{{ field.errors }}</p>
+                    {% endif %}
+                    {% if field.help_text %}
+                    <p class="help">{{ field.help_text|safe }}</p>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+        {% endfor %}
+        <div class="has-text-right">
+            <button type="reset" class="button is-danger">{% translate "Reset" %}</button>
+            <button type="submit" class="button is-success">{% translate "Post comment" %}</button>
+        </div>
+    </form>
+    {% endif %}
 </section>
 {% endif %}
 
 {% endblock %}
+{% endblock %}

aircox/templates/aircox/program_form.html

@@ -1,4 +1,4 @@
-{% extends "aircox/page_detail.html" %}
+{% extends "aircox/basepage_detail.html" %}
 {% load static i18n humanize honeypot aircox %}
 
 
@@ -9,12 +9,16 @@
 {% block init-scripts %}
 {% endblock %}
 
-{% block comments %}
+{% block top-nav-tools %}
+<a class="navbar-item" href="{% url 'program-detail' object.slug %}" target="_self">
+    <span class="icon is-small">
+        <i class="fa fa-eye"></i>
+    </span>&nbsp;
+    <span>{% translate "View" %}</span>
+</a>
 {% endblock %}
 
-{% block content-container %}
+{% block main %}
-<section class="container">
-<div>
 <form method="post" enctype="multipart/form-data">{% csrf_token %}
     <table>
         {{ form.as_table }}
@@ -23,6 +27,4 @@
     <br/>
     <input type="submit" value="Update" class="button is-success">
 </form>
-</div>
-</section>
 {% endblock %}

aircox/templates/aircox/program_sidebar.html

@@ -0,0 +1,6 @@
+
+{% block sidebar_title %}
+{% with program.title as program %}
+{% blocktranslate %}Recently on {{ program }}{% endblocktranslate %}
+{% endwith %}
+{% endblock %}

aircox/templates/aircox/timetable_list.html

@@ -1,27 +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 %}
-<nav class="nav secondary">
-    {% include "./widgets/dates_menu.html" with url_name=view.redirect_date_url %}
-</nav>
-{% endblock %}
-
-
-{% block breadcrumbs %}
-{{ block.super }}
-<a href="{% url "timetable-list" date=date %}">{{ date|date:"l d F Y" }}</a>
-{% endblock %}
-
-{% block list %}
-{% for object in object_list %}
-{% if object.episode %}
-    {% page_widget "item" object.episode diffusion=object timetable=True %}
-{% else %}
-    {% page_widget "item" object timetable=True %}
-{% endif %}
-{% endfor %}
-{% endblock %}

aircox/templates/aircox/widgets/article.html

@@ -1,4 +0,0 @@
-{% extends "./page.html" %}
-{% load humanize %}
-
-{% block subtitle %}{{ object.pub_date.date }}{% endblock %}

aircox/templates/aircox/widgets/basepage_item.html

@@ -11,48 +11,63 @@ Context variables:
 - is_thin (=False): if True, smaller cover and display less info
 {% endcomment %}
 
-{% block outer %}
+{% if render_card %}
-<article class="preview preview-item{% if is_primary %}is-primary{% endif %}{% block card_class %}{% endblock %}">
+<article class="card {% if is_primary %}is-primary{% endif %}">
-    {% block inner %}
+    <header class="card-image">
-    <header class="headings"
+        <a href="{{ object.get_absolute_url }}">
-        style="background-image: url({{ object.cover.url }})">
+            <figure class="image is-4by3">
-    {% block headings %}
+                <img src="{% thumbnail object.cover|default:station.default_cover 480x480 %}">
-        <div>
+            </figure>
-            <span class="heading subtitle">{% block subtitle %}{% endblock %}</span>
+        </a>
-        </div>
-    {% endblock %}
     </header>
-
+    <div class="card-header">
-    <div class="">
+        <h4 class="title">
-        <div>
+            <a href="{{ object.get_absolute_url }}">
-            <h2 class="heading title">{% block title %}{% endblock %}</h2>
+                {% block card_title %}{{ object.title }}{% endblock %}
-        </div>
-
-        <summary class="heading-container">
-            {% block content %}
-            {% if content and with_content %}
-            {% autoescape off %}
-                {{ content|striptags|truncatewords:64|linebreaks }}
-            {% endautoescape %}
-            {% endif %}
-            {% endblock %}
-        </summary>
-
-        <div class="actions">
-        {% block actions %}
-            <a class="button float-right" href="{{ object.get_absolute_url|escape }}">
-                <span class="icon">
-                    <i class="fas fa-external-link"></i>
-                </span>
-                <label>{% translate "More infos" %}</label>
             </a>
-        {% endblock %}
+        </h4>
-        </div>
     </div>
-    {% endblock %}
+</article>
 
-    {% if with_container %}
+
+{% else %}
+<article class="media item {% block css %}{% endblock%}">
+    {% if has_cover|default_if_none:True %}
+    <div class="media-left">
+        {% if is_thin %}
+        <img src="{% thumbnail object.cover|default:station.default_cover 64x64 crop=scale %}"
+            class="cover is-tiny">
+        {% else %}
+        <img src="{% thumbnail object.cover|default:station.default_cover 128x128 crop=scale %}"
+            class="cover is-small">
+        {% endif %}
     </div>
     {% endif %}
+    <div class="media-content">
+        <h5 class="title is-5 has-text-weight-normal">
+            {% block title %}
+            {% if object.is_published %}
+            <a href="{{ object.get_absolute_url }}">{{ object.title }}</a>
+            {% else %}
+            {{ object.title }}
+            {% endif %}
+            {% endblock %}
+        </h5>
+        <div class="subtitle is-6 has-text-weight-light">
+            {% block subtitle %}
+            {% if object.category %}{{ object.category.title }}{% endif %}
+            {% endblock %}
+        </div>
+
+        {% if has_headline|default_if_none:True %}
+        <div class="headline">
+        {% block headline %}{{ object.headline }}{% endblock %}
+        </div>
+        {% endif %}
+    </div>
+
+    {% if not no_actions %}
+    {% block actions %}{% endblock %}
+    {% endif %}
 </article>
-{% endblock %}
+{% endif %}

aircox/templates/aircox/widgets/breadcrumbs.html

@@ -1,15 +0,0 @@
-{% load aircox %}
-
-<a href="{% url page.list_url_name %}">
-    {{ page|verbose_name:True }}
-</a>
-{% if page.category and not no_cat %}
-<a href="{% url page.list_url_name category_slug=page.category.slug %}">
-    {{ page.category.title }}
-</a>
-{% endif %}
-{% if not no_title %}
-<a href="{{ page.get_absolute_url }}">
-    {{ page.title|truncatechars:24 }}
-</a>
-{% endif %}

aircox/templates/aircox/widgets/card.html

@@ -1,19 +0,0 @@
-{% extends "./preview.html" %}
-{% load i18n %}
-
-{% block tag-class %}{{ block.super }} preview-card{% endblock %}
-{% block tag-extra %}
-    {{ block.super }}
-    {% if cover %}
-    style="background-image: url({{ cover }});"
-    {% endif %}
-{% endblock %}
-{% block headings-class %}{{ block.super }} preview-card-headings{% endblock %}
-
-
-{% block inner %}
-{% block headings-container %}
-    {{ block.super }}
-    {% block actions-container %}{{ block.super }}{% endblock %}
-{% endblock %}
-{% endblock %}

aircox/templates/aircox/widgets/carousel.html

@@ -1,28 +0,0 @@
-{% load aircox %}
-{% comment %}
-Context:
-- objects: list of objects to display
-- url_name: url name to show the full list
-- url_parent: parent page for the full list
-- url_label: label of url button
-{% endcomment %}
-
-<a-carousel section-class="card-grid">
-    {% for object in objects %}
-    {% page_widget "card" object %}
-    {% endfor %}
-</a-carousel>
-
-{% if url_name %}
-<nav class="nav-urls">
-    {% if url_parent %}
-    <a href="{% url url_name parent_slug=url_parent.slug %}">
-    {% elif url_category %}
-    <a href="{% url url_name category_slug=url_category.slug %}">
-    {% else %}
-    <a href="{% url url_name %}">
-    {% endif %}
-    {{ url_label|default:_("Show all") }}
-    </a>
-</nav>
-{% endif %}

aircox/templates/aircox/widgets/comment.html

@@ -1,50 +0,0 @@
-{% extends "./page.html" %}
-{% load i18n humanize aircox %}
-
-{% block tag-class %}{{ block.super }} comment{% endblock %}
-
-{% block outer %}
-{% if with_title %}
-    {% with url=object.get_absolute_url %}
-        {{ block.super }}
-        {{ block.super }}
-    {% endwith %}
-{% else %}
-    {{ block.super }}
-    {{ block.super }}
-{% endif %}
-{% endblock %}
-
-
-{% block title %}
-    {{ object.nickname }} — {{ object.date }}
-{% endblock %}
-
-{% block subtitle %}
-{% if with_title %}
-    {{ object.parent.title }}
-{% endif %}
-{% endblock %}
-
-
-{% block content %}{{ object.content }}{% endblock %}
-
-{% block actions %}
-{{ block.super }}
-
-{% if request.user.is_staff %}
-<a href="{% url "admin:aircox_comment_change" object.pk %}" class="button"
-   title="{% trans "Edit comment" %}"
-   aria-label="{% trans "Edit comment" %}">
-    <span class="fa fa-edit"></span>
-</a>
-<a class="button is-danger"
-   title="{% trans "Delete comment" %}"
-   aria-label="{% trans "Delete comment" %}"
-   href="{% url "admin:aircox_comment_delete" object.pk %}">
-    <span class="fa fa-trash-alt"></span>
-</a>
-
-{# <a href="mailto:{{ object.email }}">{{ object.nickname }}</a> #}
-{% endif %}
-{% endblock %}

aircox/templates/aircox/widgets/dates_menu.html

@@ -11,33 +11,36 @@ An empty date results to a title or a separator
 {% endcomment %}
 {% load i18n %}
 
-<a-switch class="button burger"
+<div class="media" role="menu"
-    el=".nav-dates" icon="far fa-calendar" group="nav"
+        aria-label="{% translate "pick a date" %}">
-    aria-label="{% translate "Dates" %}">
+    <div class="media-content">
-</a-switch>
+        <div class="tabs is-toggle">
+            <ul>
+                {% for day in dates %}
+                <li class="{% if day == date %}is-active{% endif %}">
+                    <a href="{% url url_name date=day %}">
+                        {{ day|date:"D. d" }}
+                    </a>
+                </li>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
 
-<div class="nav-menu nav-dates">
+    <div class="media-right">
-    {% for day in dates %}
+        <form action="{% url url_name %}" method="GET" class="navbar-body"
-    <a href="{% url url_name date=day %}" class="nav-item {% if day == date %}active{% endif %}">
+                aria-label="{% translate "Jump to date" %}">
-        {{ day|date:"l d" }}
+            <div class="field has-addons">
-    </a>
+                <div class="control has-icons-left">
-    {% endfor %}
+                    <span class="icon is-small is-left"><span class="far fa-calendar"></span></span>
-
+                    <input type="{{ date_input|default:"date" }}" class="input date"
-    <a-dropdown class="nav-item align-right flex-grow-0 dropdown is-right"
+                           name="date" value="{{ date|date:"Y-m-d" }}">
-            content-class="dropdown-menu"
+                </div>
-            button-tag="span" button-class="dropdown-trigger"
+                <div class="control">
-            button-icon-open="fa-solid fa-plus" button-icon-close="fa-solid fa-minus">
+                    {% comment %}Translators: form button to select a date{% endcomment %}
-        <template #default>
+                    <button class="button is-primary">{% translate "Go" %}</button>
-            <div class="dropdown-content">
-                <div class="dropdown-item">
-                    <h4>{% translate "Pick a date" %}</h4>
-                    <v-calendar mode="date" borderless
-                        :initial-page="{month: {{date.month}}, year: {{date.year}}}"
-                        @dayclick="(event) => window.aircox.pickDate({% url url_name %}, event)"
-                        color="yellow"
-                        />
                 </div>
             </div>
-        </template>
+        </form>
-    </a-dropdown>
+    </div>
 </div>

aircox/templates/aircox/widgets/diffusion_list.html

@@ -3,4 +3,19 @@ Context:
 - object_list: object list
 - date: date for list
 {% endcomment %}
-{% load aircox %}
+<table id="timetable{% if date %}-{{ date|date:"Y-m-d" }}{% endif %}" class="timetable">
+    {% for diffusion in object_list %}
+    <tr class="{% if diffusion.is_now %}has-background-primary{% endif %}">
+        <td class="pr-2 pb-2">
+            <time datetime="{{ diffusion.start|date:"c" }}">
+            {{ diffusion.start|date:"H:i" }} - {{ diffusion.end|date:"H:i" }}
+            </time>
+        </td>
+        <td class="pb-2">
+            {% with diffusion.episode as object %}
+            {% include "aircox/widgets/episode_item.html" %}
+            {% endwith %}
+        </td>
+    </tr>
+    {% endfor %}
+</table>

aircox/templates/aircox/widgets/episode.html

@@ -1,68 +0,0 @@
-{% extends "./page.html" %}
-{% load i18n humanize aircox %}
-
-{% block outer %}
-{% with diffusion.is_now as is_active %}
-    {% if admin %}
-        {% with object|admin_url:"change" as url %}
-        {{ block.super }}
-        {% endwith %}
-    {% else %}
-        {{ block.super }}
-    {% endif %}
-{% endwith %}
-{% endblock %}
-
-{% block subtitle %}
-{% if diffusion %}
-    {% if timetable %}
-        {{ diffusion.start|date:"H:i" }}
-        —
-        {{ diffusion.end|date:"H:i" }}
-    {% else %}
-        {{ diffusion.start|naturalday }},
-        {{ diffusion.start|date:"H:i" }}
-    {% endif %}
-{% else %}
-    {{ block.super }}
-{% endif %}
-{% endblock %}
-
-
-{% block actions %}
-{{ block.super }}
-
-{% if admin and diffusion %}
-    {% if diffusion.type == diffusion.TYPE_ON_AIR %}
-    <span class="tag is-info">
-        <span class="icon is-small">
-            {% if diffusion.is_live %}
-            <i class="fa fa-microphone"
-                title="{% translate "Live diffusion" %}"></i>
-            {% else %}
-            <i class="fa fa-music"
-                title="{% translate "Differed diffusion" %}"></i>
-            {% endif %}
-        </span>
-        &nbsp;
-        {{ diffusion.get_type_display }}
-    </span>
-    {% elif diffusion.type == diffusion.TYPE_CANCEL %}
-    <span class="tag is-danger">
-        {{ diffusion.get_type_display }}</span>
-    {% elif diffusion.type == diffusion.TYPE_UNCONFIRMED %}
-    <span class="tag is-warning">
-        {{ diffusion.get_type_display }}</span>
-    {% endif %}
-{% endif %}
-
-{% if object.sound_set.count %}
-<button class="button action" @click="player.playButtonClick($event)"
-        data-sounds="{{ object.podcasts|json }}">
-    <span class="icon is-small">
-        <span class="fas fa-play"></span>
-    </span>
-    <label>{% translate "Listen" %}</label>
-</button>
-{% endif %}
-{% endblock %}

aircox/templates/aircox/widgets/episode_item.html

@@ -1,41 +1,51 @@
-{% extends "./basepage_item.html" %}
+{% extends "aircox/widgets/page_item.html" %}
-{% load i18n humanize %}
+{% comment %}
+List item for an episode.
+
+Context variables:
+- object: episode
+- diffusion: episode's diffusion
+- hide_schedule: if True, do not display start time
+{% endcomment %}
+
+{% load i18n easy_thumbnails_tags aircox %}
 
 {% block title %}
 {% if not object.is_published and object.program.is_published %}
-    <a href="{{ object.program.get_absolute_url }}">
+<a href="{{ object.program.get_absolute_url }}">
-        {{ object.program.title }}
+    {{ object.program.title }}
-    </a>
+    {% if diffusion %}
+    &mdash;
+    {{ diffusion.start|date:"d F" }}
+    {% endif %}
+</a>
 {% else %}
-    {{ block.super }}
+{{ block.super }}
 {% endif %}
 {% endblock %}
 
-{% block class %}
-{% if object.is_now %}is-active{% endif %}
-{% endblock %}
-
 {% block subtitle %}
+{{ block.super }}
+
 {% if diffusion %}
-    {{ diffusion.start|naturalday }},
+    {% if not hide_schedule %}
-    {{ diffusion.start|date:"g:i" }}
+    {% if object.category %}&mdash;{% endif %}
-{% else %}
+    <time datetime="{{ diffusion.start|date:"c" }}" title="{{ diffusion.start }}">
-    {{ block.super }}
+          {{ diffusion.start|date:"d M, H:i" }}
-{% endif %}
+    </time>
-{% endblock %}
+    {% endif %}
 
-
+    {% if diffusion.initial %}
-{% block actions %}
+    {% with diffusion.initial.date as date %}
-{% if object.sound_set.public.count %}
+    <span title="{% blocktranslate %}Rerun of {{ date }}{% endblocktranslate %}">
-<button class="button" @click="player.playButtonClick($event)"
+        {% translate "(rerun)" %}
-        data-sounds="{{ object.podcasts|json }}">
-    <span class="icon is-small">
-        <span class="fas fa-play"></span>
     </span>
-</button>
+    {% endwith %}
+    {% endif %}
 {% endif %}
 {% endblock %}
 
+
 {% block actions %}
 {% has_perm page object.program.change_permission_codename simple=True as can_edit %}
 {% if can_edit %}

aircox/templates/aircox/widgets/item.html

@@ -1,42 +0,0 @@
-{% extends "./preview.html" %}
-{% load i18n aircox %}
-
-{% block tag-class %}{{ block.super }} list-item is-fullwidth{% endblock %}
-
-{% block headings %}
-<a href="{{ url|escape }}" class="heading title {% block title-class %}{% endblock %}">
-    {% block title %}{{ title|default:"" }}{% endblock %}
-</a>
-<span class="heading subtitle {% block subtitle-class %}{% endblock %}">
-    {% block subtitle %}{{ subtitle|default:"" }}{% endblock %}
-</span>
-{% endblock %}
-
-{% block inner %}
-{% block headings-container %}{{ block.super }}{% endblock %}
-{% block content-container %}
-<div class="media">
-    {% if object.cover %}
-    <a href="{{ object.get_absolute_url }}"
-        class="media-left preview-cover small"
-        style="background-image: url({{ object.cover.url }})">
-    </a>
-    {% endif %}
-    <div class="media-content">
-        <section class="content">
-            {% block content %}
-            {% if content and with_content %}
-            {% autoescape off %}
-                {{ content|striptags|linebreaks }}
-            {% endautoescape %}
-            {% endif %}
-            {% endblock %}
-        </section>
-
-        {% block actions-container %}
-        {{ block.super }}
-        {% endblock %}
-    </div>
-{% endblock %}
-
-{% endblock %}

aircox/templates/aircox/widgets/log_item.html

@@ -11,10 +11,12 @@ for design review.
 
 {% endcomment %}
 
-{% block outer %}
 {% if object|is_diffusion %}
-    {% page_widget widget object.episode diffusion=object %}
+    {% with object as diffusion %}
+    {% include "aircox/widgets/diffusion_item.html" %}
+    {% endwith %}
 {% else %}
-    {% include "./track_item.html" with object=object.track log=object %}
+    {% with object.track as object %}
+    {% include "aircox/widgets/track_item.html" %}
+    {% endwith %}
 {% endif %}
-{% endblock %}

aircox/templates/aircox/widgets/log_list.html

@@ -0,0 +1,30 @@
+{% comment %}
+Render list of logs (as widget).
+
+Context:
+- object_list: list of logs to display
+- is_thin: if True, hide some information in order to fit in a thin container
+{% endcomment %}
+{% load aircox %}
+
+{% with True as hide_schedule %}
+<table class="table is-striped is-hoverable is-fullwidth" role="list">
+    {% for object in object_list %}
+    <tr {% if object|is_diffusion and object.is_now %}class="is-selected"{% endif %}>
+        <td>
+            {% if object|is_diffusion %}
+            <time datetime="{{ object.start }}" title="{{ object.start }}">
+                {{ object.start|date:"H:i" }}
+                {% if not is_thin %} - {{ object.end|date:"H:i" }}{% endif %}
+            </time>
+            {% else %}
+            <time datetime="{{ object.date }}" title="{{ object.date }}">
+                {{ object.date|date:"H:i" }}
+            </time>
+            {% endif %}
+        </td>
+        <td>{% include "aircox/widgets/log_item.html" %}</td>
+    </tr>
+    {% endfor %}
+</table>
+{% endwith %}

aircox/templates/aircox/widgets/page.html

@@ -1,36 +0,0 @@
-{% extends widget_template %}
-{% load i18n aircox %}
-
-
-{% block outer %}
-{% with cover|default:object.cover_url as cover %}
-    {% if admin %}
-        {% with object|admin_url:"change" as url %}
-        {{ block.super }}
-        {% endwith %}
-    {% else %}
-        {% with url|default:object.get_absolute_url as url %}
-        {{ block.super }}
-        {% endwith %}
-    {% endif %}
-{% endwith %}
-{% endblock %}
-
-
-{% block title %}
-{% if title %}
-    {{ block.super }}
-{% elif object %}
-    {{ object.display_title }}
-{% endif %}
-{% endblock %}
-
-
-{% block content %}
-{% if content %}
-    {{ content }}
-{% elif object %}
-    {{ block.super }}
-    {{ object.display_headline }}
-{% endif %}
-{% endblock %}

aircox/templates/aircox/widgets/page_card.html

@@ -1,13 +0,0 @@
-{% extends widget|default:"./card.html" %}
-
-{% block outer %}
-{% if object %}
-    {% with content=object.get_display_excerpt() %}
-    {% with title=object.get_display_title() %}
-    {{ block.super }}
-    {% endwith %}
-    {% endwith %}
-{% else %}
-    {{ block.super }}
-{% endif %}
-{% endblock %}

aircox/templates/aircox/widgets/page_item.html

@@ -3,11 +3,3 @@
 {% block card_title %}
 {% block title %}{{ block.super }}{% endblock %}
 {% endblock %}
-
-{% block card_subtitle %}
-{% block subtitle %}{{ block.super }}{% endblock %}
-{% endblock %}
-
-{% block card_class %}
-{% block class %}{{ block.super }}{% endblock %}
-{% endblock %}

aircox/templates/aircox/widgets/page_list.html

@@ -5,10 +5,10 @@ Context:
 - object_list: object list
 - list_url: url to complete list page
 {% endcomment %}
-{% load i18n aircox %}
+{% load i18n %}
 
 {% for object in object_list %}
-{% page_widget "item" object %}
+{% include object.item_template_name %}
 {% endfor %}
 
 {% if list_url %}

aircox/templates/aircox/widgets/player.html

@@ -5,7 +5,7 @@ The audio player
 
 <br>
 
-<div class="is-fullwidth is-fixed-bottom is-paddingless player-container"
+<div class="box is-fullwidth is-fixed-bottom is-paddingless player"
     role="{% translate "player" %}"
     aria-description="{% translate "Audio player used to listen to the radio and podcasts" %}">
     <noscript>
@@ -22,27 +22,24 @@ The audio player
             :live-args="{% player_live_attr %}"
             button-title="{% translate "Play or pause audio" %}">
         <template v-slot:content="{ loaded, live, current }">
-            <h4 v-if="loaded" class="title">
+            <h4 v-if="loaded" class="title is-4">
-                <a v-if="current?.data?.page_url" :href="current.data.page_url">
+                [[ loaded.name ]]
-                    [[ loaded.name ]]
-                </a>
-                <template v-else>[[ loaded.name ]]</template>
             </h4>
             <h4 v-else-if="current && current.data.type == 'track'"
-                class="title" aria-description="{% translate "Track currently on air" %}">
+                class="title is-4" aria-description="{% translate "Track currently on air" %}">
-                <span class="has-text-info is-size-3 mr-3">&#9836;</span>
+                <span class="has-text-info is-size-3">&#9836;</span>
                 <span>[[ current.data.title ]]</span>
                 <span class="has-text-grey-dark has-text-weight-light">
                 &mdash; [[ current.data.artist ]]
                 <i v-if="current.data.info">([[ current.data.info ]])</i>
                 </span>
             </h4>
-            <h4 v-else-if="live && current && current.data.type == 'diffusion'"
+            <div v-else-if="live && current && current.data.type == 'diffusion'">
-                class="title"
+                <h4 class="title is-4" aria-description="{% translate "Diffusion currently on air" %}">
-                aria-description="{% translate "Diffusion currently on air" %}">
+                    <a :href="current.data.url">[[ current.data.title ]]</a>
-                    <a :href="current.data.url" v-if="current.data.url">[[ current.data.title ]]</a>
-                    <template v-else>[[ current.data.title ]]</template>
                 </h4>
+                <div class="">[[ current.data.info ]]</div>
+            </div>
             <h4 v-else class="title is-4" aria-description="{% translate "Currently playing" %}">
                 {{ request.station.name }}
             </h4>

aircox/templates/aircox/widgets/preview.html

@@ -1,55 +0,0 @@
-{% load i18n %}
-{% comment %}
-Content related context:
-- object: object to display
-- cover: cover
-- title: title
-- subtitle: subtitle
-- content: content to display
-
-Styling related context:
-- is_active: add "active" css class
-- is_small: add "small" css class
-- is_tiny: add "tiny" css class
-- tag
-- tag_class: css class to set to main tag
-- tag_extra: extra tag attributes
-
-{% endcomment %}
-
-{% block outer %}
-<{{ tag|default:"article" }} class="preview {% if not cover %}no-cover {% endif %}{% if is_active %}active {% endif %}{% block tag-class %}{{ tag_class|default:"" }} {% endblock %}" {% block tag-extra %}{% endblock %}>
-{% block inner %}
-    {% block headings-container %}
-    <header class="headings{% block headings-class %}{% endblock %}"{% block headings-tag-extra %}{% endblock %}>
-    {% block headings %}
-        <div>
-            <a href="{{ url|escape }}" class="heading title {% block title-class %}{% endblock %}"{% if title %} title="{{ title|escape }}"{% endif %}>{% block title %}{{ title|default:"" }}{% endblock %}</a>
-        </div>
-        <div>
-            <span class="heading subtitle {% block subtitle-class %}{% endblock %}">{% block subtitle %}{{ subtitle|default:"" }}{% endblock %}</span>
-        </div>
-    {% endblock %}
-    </header>
-    {% endblock %}
-
-    {% block content-container %}
-    <section class="content headings-container">
-        {% block content %}
-        {% if content and with_content %}
-        {% autoescape off %}
-            {{ content|striptags|linebreaks }}
-        {% endautoescape %}
-        {% endif %}
-        {% endblock %}
-    </section>
-    {% endblock %}
-
-    {% block actions-container %}
-    <div class="actions">
-        {% block actions %}{% endblock %}
-    </div>
-    {% endblock %}
-{% endblock %}
-</{{ tag|default:"article" }}>
-{% endblock %}

aircox/templates/aircox/widgets/track_item.html

@@ -5,18 +5,9 @@ Context:
 - object: track to render
 {% endcomment %}
 
-<span class="content mr-2">
+<span class="has-text-info is-size-5">&#9836;</span>
-    <span class="icon highlight-color-2 m-2">
+<span>{{ object.title }}</span>
-        <i class="fas fa-music"></i>
+<span class="has-text-grey-dark has-text-weight-light">
-    </span>
+&mdash; {{ object.artist }}
-    {% if log %}
+{% if object.info %}(<i>{{ object.info }}</i>){% endif %}
-    <span>{{ log.date|date:"H:i" }} &mdash; </span>
-    {% endif %}
-    <span class="has-text-weight-bold">{{ object.title }}</span>
-    {% if object.artist and object.artist != object.title %}
-    <span>
-    &mdash; {{ object.artist }}
-    {% if object.info %}(<i>{{ object.info }}</i>){% endif %}
-    </span>
-    {% endif %}
 </span>

aircox/templates/aircox/widgets/wide.html

@@ -1,20 +0,0 @@
-{% extends "./preview.html" %}
-{% load i18n %}
-
-{% block tag-class %}{{ block.super }} preview-wide{% endblock %}
-{% block headings-class %}{{ block.super }} preview-card-headings{% endblock %}
-{% block headings-tag-extra %}
-    {{ block.super }}
-    {% if cover %}
-    style="background-image: url({{ cover }});"
-    {% endif %}
-{% endblock %}
-
-
-{% block inner %}
-{% block headings-container %}{{ block.super }}{% endblock %}
-<div class="is-flex-direction-column">
-    {% block content-container %}{{ block.super }}{% endblock %}
-    {% block actions-container %}{{ block.super }}{% endblock %}
-</div>
-{% endblock %}

aircox/templates/registration/login.html

@@ -1,8 +1,8 @@
 {% extends "aircox/base.html" %}
 {% load i18n aircox %}
 
-{% block content-container %}
+{% block main %}
-<div class="container content page-content">
+
 <h2>{% trans "Log in" %}</h2>
 <br/>
 <form method="post" action="{% url 'login' %}">
@@ -11,8 +11,10 @@
   {{ form.as_table }}
   </table>
   <br/>
-  <button class="button" type="submit">{% trans "Log in" %}</button>
+  <button type="submit">{% trans "Log in" %}</button>
   <input type="hidden" name="next" value="{{ next }}">
 </form>
-</div>
+
+{{ block.super }}
+
 {% endblock %}

aircox/templatetags/aircox.py

@@ -3,41 +3,14 @@ import random
 
 from django import template
 from django.contrib.admin.templatetags.admin_urls import admin_urlname
-from django.template.loader import render_to_string
 from django.urls import reverse
 
 from aircox.models import Diffusion, Log
 
-
 random.seed()
 register = template.Library()
 
 
-@register.filter(name="admin_url")
-def admin_url(obj, action):
-    meta = obj._meta
-    return reverse(f"admin:{meta.app_label}_{meta.model_name}_{action}", args=[obj.id])
-
-
-@register.simple_tag(name="page_widget", takes_context=True)
-def do_page_widget(context, widget, object, dir="aircox/widgets", **ctx):
-    """Render widget for the provided page and context."""
-    ctx["request"] = context["request"]
-    ctx["object"] = object
-    ctx["widget"] = widget
-    if object.pk and not ctx.get("tag_id"):
-        model = type(object)._meta.model_name
-        ctx["tag_id"] = f"{widget}_{model}_{object.pk}"
-    ctx["widget_template"] = f"{dir}/{widget}.html"
-    return render_to_string(object.get_template_name(widget), ctx)
-
-
-@register.filter(name="page_template")
-def do_page_template(self, page, component):
-    """For a provided page object and component name, return template name."""
-    return page.get_template(component)
-
-
 @register.filter(name="admin_url")
 def do_admin_url(obj, arg, pass_id=True):
     """Reverse admin url for object."""
@@ -59,12 +32,10 @@ def do_get_tracks(obj):
 @register.simple_tag(name="has_perm", takes_context=True)
 def do_has_perm(context, obj, perm, user=None, simple=False):
     """Return True if ``user.has_perm('[APP].[perm]_[MODEL]')``"""
-    if not obj:
-        return
     if user is None:
         user = context["request"].user
     if simple:
-        return user.has_perm("aircox.{}".format(perm)) or user.is_superuser
+        return user.has_perm("aircox.{}".format(perm))
     else:
         return user.has_perm("{}.{}_{}".format(obj._meta.app_label, perm, obj._meta.model_name))
 
@@ -98,25 +69,13 @@ def do_player_live_attr(context):
 @register.simple_tag(name="nav_items", takes_context=True)
 def do_nav_items(context, menu, **kwargs):
     """Render navigation items for the provided menu name."""
-    if not getattr(context["request"], "station"):
-        return []
     station, request = context["station"], context["request"]
     return [(item, item.render(request, **kwargs)) for item in station.navitem_set.filter(menu=menu)]
 
 
-@register.filter(name="nav_active")
-def do_nav_active(obj, request):
-    if request.path.startswith(obj.get_url()):
-        return True
-    return False
-
-
 @register.simple_tag(name="update_query")
 def do_update_query(obj, **kwargs):
-    """Replace provided querydict's values with **kwargs.
+    """Replace provided querydict's values with **kwargs."""
-
-    Values set to ``None`` will be dropped.
-    """
     for k, v in kwargs.items():
         if v is not None:
             obj[k] = list(v) if hasattr(v, "__iter__") else [v]
@@ -129,11 +88,4 @@ def do_update_query(obj, **kwargs):
 def do_verbose_name(obj, plural=False):
     """Return model's verbose name (singular or plural) or `obj` if it is a
     string (can act for default values)."""
-    if isinstance(obj, str):
+    return obj if isinstance(obj, str) else obj._meta.verbose_name_plural if plural else obj._meta.verbose_name
-        return obj
-    return obj._meta.verbose_name_plural if plural else obj._meta.verbose_name
-
-
-@register.filter(name="edit_view")
-def do_edit_view(obj):
-    return "%s-edit" % obj.split("-")[0]

aircox/tests/test_program.py

@@ -16,10 +16,10 @@ def test_edit_program(user, client, program):
     client.force_login(user)
     response = client.get(reverse("program-detail", kwargs={"slug": program.slug}))
     assert response.status_code == 200
-    assert "🖉 ".encode() not in response.content
+    assert b"fa-pen" not in response.content
     user.groups.add(program.editors)
     response = client.get(reverse("program-detail", kwargs={"slug": program.slug}))
-    assert "🖉 ".encode() in response.content
+    assert b"fa-pen" in response.content
     assert b"foobar" not in response.content
     response = client.post(reverse("program-edit", kwargs={"pk": program.pk}), {"content": "foobar"})
     response = client.get(reverse("program-detail", kwargs={"slug": program.slug}))

aircox/tests/views/test_base.py

@@ -1,5 +1,6 @@
 import pytest
 
+from django.urls import reverse
 
 from aircox import models
 from aircox.test import Interface
@@ -36,14 +37,28 @@ class TestBaseView:
     def test_station(self, base_view, station):
         assert base_view.station == station
 
+    @pytest.mark.django_db
+    def test_get_sidebar_queryset(self, base_view, pages, published_pages):
+        query = base_view.get_sidebar_queryset().values_list("id", flat=True)
+        page_ids = {r.id for r in published_pages}
+        assert set(query) == page_ids
+
+    @pytest.mark.django_db
+    def test_get_sidebar_url(self, base_view):
+        assert base_view.get_sidebar_url() == reverse("page-list")
+
     @pytest.mark.django_db
     def test_get_context_data(self, base_view, station, published_pages):
+        base_view.has_sidebar = True
+        base_view.get_sidebar_queryset = lambda: published_pages
         context = base_view.get_context_data()
         assert context == {
             "view": base_view,
-            "station": station,
             "page": None,  # get_page() returns None
-            "audio_streams": station.streams,
+            "has_sidebar": base_view.has_sidebar,
+            "has_filters": False,
+            "sidebar_object_list": published_pages[: base_view.list_count],
+            "sidebar_list_url": base_view.get_sidebar_url(),
             "model": base_view.model,
         }
 

aircox/urls.py

@@ -38,52 +38,36 @@ api = [
 urls = [
     path("", views.HomeView.as_view(), name="home"),
     path("api/", include((api, "aircox"), namespace="api")),
-    # ---- ---- objects views
+    # path('', views.PageDetailView.as_view(model=models.Article),
-    # ---- articles
+    #     name='home'),
     path(
         _("articles/"),
         views.ArticleListView.as_view(model=models.Article),
         name="article-list",
     ),
-    path(
-        _("articles/c/<slug:category_slug>/"), views.ArticleListView.as_view(model=models.Article), name="article-list"
-    ),
     path(
         _("articles/<slug:slug>/"),
         views.ArticleDetailView.as_view(),
         name="article-detail",
     ),
-    # ---- episodes
     path(_("episodes/"), views.EpisodeListView.as_view(), name="episode-list"),
-    path(_("episodes/c/<slug:category_slug>/"), views.EpisodeListView.as_view(), name="episode-list"),
     path(
         _("episodes/<slug:slug>/"),
         views.EpisodeDetailView.as_view(),
         name="episode-detail",
     ),
-   path(
+    path(_("week/"), views.DiffusionListView.as_view(), name="diffusion-list"),
-        _("episode/<pk>/edit/"),
-        views.EpisodeUpdateView.as_view(),
-        name="episode-edit",
-    ),
-    path(_("podcasts/"), views.PodcastListView.as_view(), name="podcast-list"),
-    path(_("podcasts/c/<slug:category_slug>/"), views.PodcastListView.as_view(), name="podcast-list"),
-    # ---- timetable
-    path(_("timetable/"), views.TimeTableView.as_view(), name="timetable-list"),
     path(
-        _("timetable/<date:date>/"),
+        _("week/<date:date>/"),
-        views.TimeTableView.as_view(),
+        views.DiffusionListView.as_view(),
-        name="timetable-list",
+        name="diffusion-list",
     ),
-    # ---- pages
+    path(_("logs/"), views.LogListView.as_view(), name="log-list"),
+    path(_("logs/<date:date>/"), views.LogListView.as_view(), name="log-list"),
+    # path('<page_path:path>', views.route_page, name='page'),
     path(
         _("publications/"),
-        views.PageListView.as_view(model=models.Page, attach_to_value=models.StaticPage.Target.PAGES),
+        views.PageListView.as_view(model=models.Page),
-        name="page-list",
-    ),
-    path(
-        _("publications/c/<slug:category_slug>"),
-        views.PageListView.as_view(model=models.Page, attach_to_value=models.StaticPage.Target.PAGES),
         name="page-list",
     ),
     path(
@@ -102,33 +86,42 @@ urls = [
         ),
         name="static-page-detail",
     ),
-    # ---- programs
     path(_("programs/"), views.ProgramListView.as_view(), name="program-list"),
-    path(_("programs/c/<slug:category_slug>/"), views.ProgramListView.as_view(), name="program-list"),
     path(
         _("programs/<slug:slug>/"),
         views.ProgramDetailView.as_view(),
         name="program-detail",
     ),
-    path(_("programs/<slug:parent_slug>/articles/"), views.ArticleListView.as_view(), name="article-list"),
-    path(_("programs/<slug:parent_slug>/podcasts/"), views.PodcastListView.as_view(), name="podcast-list"),
-    path(_("programs/<slug:parent_slug>/episodes/"), views.EpisodeListView.as_view(), name="episode-list"),
-    path(_("programs/<slug:parent_slug>/diffusions/"), views.DiffusionListView.as_view(), name="diffusion-list"),
     path(
         _("program/<pk>/edit/"),
         views.ProgramUpdateView.as_view(),
         name="program-edit",
     ),
+    path(
+        _("episode/<pk>/edit/"),
+        views.EpisodeUpdateView.as_view(),
+        name="episode-edit",
+    ),
+    path(
+        _("programs/<slug:parent_slug>/episodes/"),
+        views.EpisodeListView.as_view(),
+        name="episode-list",
+    ),
+    path(
+        _("programs/<slug:parent_slug>/articles/"),
+        views.ArticleListView.as_view(),
+        name="article-list",
+    ),
+    path(
+        _("programs/<slug:parent_slug>/publications/"),
+        views.ProgramPageListView.as_view(),
+        name="program-page-list",
+    ),
     path(
         "errors/no-station",
         views.errors.NoStationErrorView.as_view(),
         name="errors-no-station",
     ),
-    path(
-        _("program/<slug:parent_slug>/publications"),
-        views.PageListView.as_view(model=models.Page, attach_to_value=models.StaticPage.Target.PAGES),
-        name="page-list",
-    ),
     path("gestion/", views.profile, name="profile"),
     path("accounts/profile/", views.profile, name="profile"),
 ]

aircox/views/__init__.py

@@ -1,8 +1,8 @@
 from . import admin, errors
 from .article import ArticleDetailView, ArticleListView
 from .base import BaseAPIView, BaseView
-from .diffusion import DiffusionListView, TimeTableView
+from .diffusion import DiffusionListView
-from .episode import EpisodeDetailView, EpisodeListView, PodcastListView, EpisodeUpdateView
+from .episode import EpisodeDetailView, EpisodeListView, EpisodeUpdateView
 from .home import HomeView
 from .log import LogListAPIView, LogListView
 from .page import (
@@ -28,10 +28,8 @@ __all__ = (
     "BaseAPIView",
     "BaseView",
     "DiffusionListView",
-    "TimeTableView",
     "EpisodeDetailView",
     "EpisodeListView",
-    "PodcastListView",
     "EpisodeUpdateView",
     "HomeView",
     "LogListAPIView",
@@ -46,15 +44,4 @@ __all__ = (
     "ProgramPageDetailView",
     "ProgramPageListView",
     "ProgramUpdateView",
-    "attached",
 )
-
-
-attached = {}
-
-for key in __all__:
-    view = globals().get(key)
-    if key == "attached":
-        continue
-    if attach := getattr(view, "attach_to_value", None):
-        attached[attach] = view

aircox/views/article.py

@@ -5,6 +5,7 @@ __all__ = ["ArticleDetailView", "ArticleListView"]
 
 
 class ArticleDetailView(PageDetailView):
+    has_sidebar = True
     model = Article
 
     def get_sidebar_queryset(self):
@@ -16,4 +17,4 @@ class ArticleListView(PageListView):
     model = Article
     has_headline = True
     parent_model = Program
-    attach_to_value = StaticPage.Target.ARTICLES
+    attach_to_value = StaticPage.ATTACH_TO_ARTICLES

aircox/views/base.py

@@ -2,14 +2,18 @@ from django.http import HttpResponseRedirect
 from django.urls import reverse
 from django.views.generic.base import ContextMixin, TemplateResponseMixin
 
+from ..models import Page
 
 __all__ = ("BaseView", "BaseAPIView")
 
 
 class BaseView(TemplateResponseMixin, ContextMixin):
-    header_template_name = "aircox/widgets/header.html"
+    has_sidebar = True
-    related_count = 4
+    """Show side navigation."""
-    related_carousel_count = 8
+    has_filters = False
+    """Show filters nav."""
+    list_count = 5
+    """Item count for small lists displayed on page."""
 
     @property
     def station(self):
@@ -18,52 +22,31 @@ class BaseView(TemplateResponseMixin, ContextMixin):
     # def get_queryset(self):
     #    return super().get_queryset().station(self.station)
 
-    def get_nav_menu(self):
+    def get_sidebar_queryset(self):
-        menu = []
+        """Return a queryset of items to render on the side nav."""
-        for item in self.station.navitem_set.all():
+        return Page.objects.select_subclasses().published().order_by("-pub_date")
-            try:
-                if item.page:
-                    view = item.page.get_related_view()
-                    secondary = view and view.get_secondary_nav()
-                else:
-                    secondary = None
-                menu.append((item, secondary))
-            except:
-                import traceback
 
-                traceback.print_exc()
+    def get_sidebar_url(self):
-                raise
+        return reverse("page-list")
-        return menu
-
-    def get_secondary_nav(self):
-        return None
-
-    def get_related_queryset(self):
-        """Return a queryset of related pages or None."""
-        return None
-
-    def get_related_url(self):
-        """Return an url to the list of related pages."""
-        return None
 
     def get_page(self):
         return None
 
     def get_context_data(self, **kwargs):
         kwargs.setdefault("page", self.get_page())
-        kwargs.setdefault("header_template_name", self.header_template_name)
+        kwargs.setdefault("has_filters", self.has_filters)
+
+        has_sidebar = kwargs.setdefault("has_sidebar", self.has_sidebar)
+        if has_sidebar and "sidebar_object_list" not in kwargs:
+            sidebar_object_list = self.get_sidebar_queryset()
+            if sidebar_object_list is not None:
+                kwargs["sidebar_object_list"] = sidebar_object_list[: self.list_count]
+                kwargs["sidebar_list_url"] = self.get_sidebar_url()
 
         if "model" not in kwargs:
             model = getattr(self, "model", None) or hasattr(self, "object") and type(self.object)
             kwargs["model"] = model
 
-        page = kwargs.get("page")
-        if page:
-            kwargs["title"] = page.display_title
-            kwargs["cover"] = page.cover and page.cover.url
-
-        if "nav_menu" not in kwargs:
-            kwargs["nav_menu"] = self.get_nav_menu()
         return super().get_context_data(**kwargs)
 
     def dispatch(self, *args, **kwargs):

aircox/views/diffusion.py

@@ -1,55 +1,30 @@
 import datetime
 
-from django.urls import reverse
 from django.views.generic import ListView
 
-from aircox.models import Diffusion, Log, StaticPage
+from aircox.models import Diffusion, StaticPage
 from .base import BaseView
 from .mixins import AttachedToMixin, GetDateMixin
 
-__all__ = ("DiffusionListView", "TimeTableView")
+__all__ = ("DiffusionListView",)
 
 
-class BaseDiffusionListView(AttachedToMixin, BaseView, ListView):
+class DiffusionListView(GetDateMixin, AttachedToMixin, BaseView, ListView):
-    model = Diffusion
-    queryset = Diffusion.objects.on_air().order_by("-start")
-
-
-class DiffusionListView(BaseDiffusionListView):
     """View for timetables."""
 
     model = Diffusion
-
+    has_filters = True
-
+    redirect_date_url = "diffusion-list"
-class TimeTableView(GetDateMixin, BaseDiffusionListView):
+    attach_to_value = StaticPage.ATTACH_TO_DIFFUSIONS
-    model = Diffusion
-    redirect_date_url = "timetable-list"
-    attach_to_value = StaticPage.Target.TIMETABLE
-    template_name = "aircox/timetable_list.html"
 
     def get_date(self):
         date = super().get_date()
         return date if date is not None else datetime.date.today()
 
-    def get_logs(self, date):
-        return Log.objects.on_air().date(self.date).filter(track__isnull=False)
-
     def get_queryset(self):
-        return super().get_queryset().date(self.date)
+        return super().get_queryset().date(self.date).order_by("start")
 
-    @classmethod
+    def get_context_data(self, **kwargs):
-    def get_secondary_nav(cls):
-        date = datetime.date.today()
-        start = date - datetime.timedelta(days=date.weekday())
-        dates = [start + datetime.timedelta(days=i) for i in range(0, 7)]
-        return tuple((date.strftime("%A %d"), reverse("timetable-list", kwargs={"date": date})) for date in dates)
-
-    def get_context_data(self, object_list=None, **kwargs):
         start = self.date - datetime.timedelta(days=self.date.weekday())
         dates = [start + datetime.timedelta(days=i) for i in range(0, 7)]
-
+        return super().get_context_data(date=self.date, dates=dates, **kwargs)
-        if object_list is None:
-            logs = self.get_logs(self.date)
-            object_list = Log.merge_diffusions(logs, self.object_list)
-        object_list = list(reversed(object_list))
-        return super().get_context_data(date=self.date, dates=dates, object_list=object_list, **kwargs)

aircox/views/episode.py

@@ -1,13 +1,11 @@
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.forms import ModelForm, FileField
-from django.forms.models import modelformset_factory
 from django.urls import reverse
 
 from ckeditor.fields import RichTextField
 from filer.models.filemodels import File
 
 from aircox.controllers.sound_file import SoundFile
-from aircox.models import Track
 
 from ..filters import EpisodeFilters
 from ..models import Episode, Program, StaticPage
@@ -15,12 +13,9 @@ from .page import PageListView
 from .program import ProgramPageDetailView, BaseProgramMixin
 from .page import PageUpdateView
 
-
 __all__ = (
     "EpisodeDetailView",
     "EpisodeListView",
-    "PodcastListView",
-    "EpisodeUpdateView",
 )
 
 
@@ -32,25 +27,14 @@ class EpisodeDetailView(ProgramPageDetailView):
             kwargs["tracks"] = self.object.track_set.order_by("position")
         return super().get_context_data(**kwargs)
 
-    def get_related_queryset(self):
-        return (
-            self.get_queryset().parent(self.object.parent).exclude(pk=self.object.pk).published().order_by("-pub_date")
-        )
-
-    def get_related_url(self):
-        return reverse("episode-list", kwargs={"parent_slug": self.object.parent.slug})
-
 
 class EpisodeListView(PageListView):
     model = Episode
     filterset_class = EpisodeFilters
+    item_template_name = "aircox/widgets/episode_item.html"
+    has_headline = True
     parent_model = Program
-    attach_to_value = StaticPage.Target.EPISODES
+    attach_to_value = StaticPage.ATTACH_TO_EPISODES
-
-
-class PodcastListView(EpisodeListView):
-    attach_to_value = StaticPage.Target.PODCASTS
-    queryset = Episode.objects.published().with_podcasts().order_by("-pub_date")
 
 
 class EpisodeForm(ModelForm):
@@ -84,12 +68,3 @@ class EpisodeUpdateView(UserPassesTestMixin, BaseProgramMixin, PageUpdateView):
 
     def get_success_url(self):
         return reverse("episode-detail", kwargs={"slug": self.get_object().slug})
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        formset = modelformset_factory(Track, fields=["title", "artist"])
-        context["forms"] = formset(queryset=Track.objects.filter(episode=self.object))
-        return context
-
-    # def post(self, request, *args, **kwargs):
-    # def form_valid(self, formset,day_form):

aircox/views/home.py

@@ -1,53 +1,43 @@
-from datetime import date, datetime, timedelta
+from datetime import date
 
 from django.utils import timezone as tz
 from django.views.generic import ListView
 
-from ..models import Diffusion, Episode, Log, Page, StaticPage
+from ..models import Diffusion, Log, Page, StaticPage
 from .base import BaseView
-from .mixins import AttachedToMixin
 
 
-class HomeView(AttachedToMixin, BaseView, ListView):
+class HomeView(BaseView, ListView):
     template_name = "aircox/home.html"
-    attach_to_value = StaticPage.Target.HOME
     model = Diffusion
-    queryset = Diffusion.objects.on_air().select_related("episode").order_by("-start")
+    attach_to_value = StaticPage.ATTACH_TO_HOME
-
+    queryset = Diffusion.objects.on_air().select_related("episode")
-    publications_queryset = Page.objects.select_subclasses().published().order_by("-pub_date")
+    logs_count = 5
-    podcasts_queryset = Episode.objects.published().with_podcasts().order_by("-pub_date")
+    publications_count = 5
+    has_filters = False
 
     def get_queryset(self):
-        now = datetime.now()
+        return super().get_queryset().date(date.today())
-        return super().get_queryset().after(now - timedelta(hours=24)).before(now).order_by("-start")
 
     def get_logs(self, diffusions):
         today = date.today()
+        logs = Log.objects.on_air().date(today).filter(track__isnull=False)
         # diffs = Diffusion.objects.on_air().date(today)
-        object_list = self.object_list
+        return Log.merge_diffusions(logs, diffusions, self.logs_count)
-        diffs = list(object_list[: self.related_count])
-        logs = Log.objects.on_air().filter(track__isnull=False)
-        if diffs:
-            min_date = diffs[-1].start - timedelta(hours=1)
-            logs = logs.after(min_date)
-        else:
-            logs = logs.date(today)
-        return Log.merge_diffusions(logs, object_list, diff_count=self.related_count)
 
     def get_next_diffs(self):
         now = tz.now()
-        query = Diffusion.objects.on_air().select_related("episode")
+        current_diff = Diffusion.objects.on_air().now(now).first()
-        current_diff = query.now(now).first()
+        next_diffs = Diffusion.objects.on_air().after(now)
-        next_diffs = query.after(now)
         if current_diff:
-            diffs = [current_diff] + list(next_diffs.exclude(pk=current_diff.pk)[:9])
+            diffs = [current_diff] + list(next_diffs.exclude(pk=current_diff.pk)[:2])
         else:
-            diffs = next_diffs[: self.related_carousel_count]
+            diffs = next_diffs[:3]
         return diffs
 
-    def get_publications(self):
+    def get_last_publications(self):
         # note: with postgres db, possible to use distinct()
-        qs = self.publications_queryset.all()
+        qs = Page.objects.select_subclasses().published().order_by("-pub_date")
         parents = set()
         items = []
         for publication in qs:
@@ -55,25 +45,13 @@ class HomeView(AttachedToMixin, BaseView, ListView):
             if parent_id is not None and parent_id in parents:
                 continue
             items.append(publication)
-            if len(items) == self.related_count:
+            if len(items) == self.publications_count:
                 break
         return items
 
-    def get_podcasts(self):
-        return self.podcasts_queryset.all()[: self.related_carousel_count]
-
     def get_context_data(self, **kwargs):
-        next_diffs = self.get_next_diffs()
+        context = super().get_context_data(**kwargs)
-        current_diff = next_diffs and next_diffs[0]
+        context["logs"] = self.get_logs(context["object_list"])
-
+        context["next_diffs"] = self.get_next_diffs()
-        kwargs.update(
+        context["last_publications"] = self.get_last_publications()[:5]
-            {
+        return context
-                "object": current_diff.episode,
-                "diffusion": current_diff,
-                "logs": self.get_logs(self.object_list),
-                "next_diffs": next_diffs,
-                "publications": self.get_publications(),
-                "podcasts": self.get_podcasts(),
-            }
-        )
-        return super().get_context_data(**kwargs)

aircox/views/log.py

@@ -6,12 +6,12 @@ from django.views.decorators.cache import cache_page
 from django.views.generic import ListView
 from rest_framework.generics import ListAPIView
 
-from ..models import Diffusion, Log
+from ..models import Diffusion, Log, StaticPage
 from ..serializers import LogInfo, LogInfoSerializer
 from .base import BaseAPIView, BaseView
 from .mixins import AttachedToMixin, GetDateMixin
 
-__all__ = ("LogListMixin", "LogListView", "LogListAPIView")
+__all__ = ["LogListMixin", "LogListView"]
 
 
 class LogListMixin(GetDateMixin):
@@ -37,8 +37,7 @@ class LogListMixin(GetDateMixin):
         )
 
     def get_diffusions_queryset(self):
-        qs = Diffusion.objects.station(self.station).on_air().filter(start__lte=tz.now()).before()
+        qs = Diffusion.objects.station(self.station).on_air().filter(start__lte=tz.now())
-
         return (
             qs.date(self.date)
             if self.date is not None
@@ -63,6 +62,8 @@ class LogListView(AttachedToMixin, BaseView, LogListMixin, ListView):
     `request.GET`, defaults to today)."""
 
     redirect_date_url = "log-list"
+    has_filters = True
+    attach_to_value = StaticPage.ATTACH_TO_LOGS
 
     def get_date(self):
         date = super().get_date()

aircox/views/mixins.py

@@ -44,16 +44,16 @@ class ParentMixin:
     parent = None
     """Parent page object."""
 
-    def get_parent(self, request, **kwargs):
+    def get_parent(self, request, *args, **kwargs):
         if self.parent_model is None or self.parent_url_kwarg not in kwargs:
             return
 
         lookup = {self.parent_field: kwargs[self.parent_url_kwarg]}
         return get_object_or_404(self.parent_model.objects.select_related("cover"), **lookup)
 
-    def dispatch(self, request, *args, **kwargs):
+    def get(self, request, *args, **kwargs):
-        self.parent = self.get_parent(request, **kwargs)
+        self.parent = self.get_parent(request, *args, **kwargs)
-        return super().dispatch(request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)
 
     def get_queryset(self):
         if self.parent is not None:
@@ -61,10 +61,9 @@ class ParentMixin:
         return super().get_queryset()
 
     def get_context_data(self, **kwargs):
-        parent = kwargs.setdefault("parent", self.parent)
+        self.parent = kwargs.setdefault("parent", self.parent)
-
+        if self.parent is not None:
-        if parent is not None:
+            kwargs.setdefault("cover", self.parent.cover)
-            kwargs.setdefault("cover", parent.cover.url)
         return super().get_context_data(**kwargs)
 
 

aircox/views/page.py

@@ -2,12 +2,11 @@ from django.http import Http404, HttpResponse
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, ListView
 from django.views.generic.edit import UpdateView
-from django.urls import reverse
 from honeypot.decorators import check_honeypot
 
 from ..filters import PageFilters
 from ..forms import CommentForm
-from ..models import Comment, Category
+from ..models import Comment
 from ..utils import Redirect
 from .base import BaseView
 from .mixins import AttachedToMixin, FiltersMixin, ParentMixin
@@ -20,76 +19,34 @@ __all__ = [
 ]
 
 
-class BasePageMixin:
+class BasePageListView(AttachedToMixin, ParentMixin, BaseView, ListView):
-    category = None
-
-    def get_category(self, page, **kwargs):
-        if page:
-            if getattr(page, "category_id", None):
-                return page.category
-            if page.parent_id:
-                return self.get_category(page.parent_subclass)
-        if slug := self.kwargs.get("category_slug"):
-            return Category.objects.get(slug=slug)
-        return None
-
-    def get_context_data(self, *args, **kwargs):
-        kwargs.setdefault("category", self.category)
-        return super().get_context_data(*args, **kwargs)
-
-
-class BasePageListView(AttachedToMixin, BasePageMixin, ParentMixin, BaseView, ListView):
     """Base view class for BasePage list."""
 
     template_name = "aircox/basepage_list.html"
+    item_template_name = "aircox/widgets/page_item.html"
+    has_sidebar = True
 
     paginate_by = 30
     has_headline = True
 
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
-
     def get(self, *args, **kwargs):
-        self.category = self.get_category(self.parent)
         return super().get(*args, **kwargs)
 
     def get_queryset(self):
-        query = super().get_queryset().select_subclasses().published().select_related("cover")
+        return super().get_queryset().select_subclasses().published().select_related("cover")
-        if self.category:
-            query = query.filter(category=self.category)
-        return query
 
     def get_context_data(self, **kwargs):
+        kwargs.setdefault("item_template_name", self.item_template_name)
         kwargs.setdefault("has_headline", self.has_headline)
-        context = super().get_context_data(**kwargs)
+        return super().get_context_data(**kwargs)
-
-        parent = context.get("parent")
-        if not context.get("page"):
-            if not context.get("title"):
-                model = self.model._meta.verbose_name_plural
-                title = _("{model}")
-                context["title"] = title.format(model=model, parent=parent)
-
-            if not context.get("cover") and parent and parent.cover:
-                context["cover"] = parent.cover.url
-        return context
 
 
-class BasePageDetailView(BasePageMixin, BaseView, DetailView):
+class BasePageDetailView(BaseView, DetailView):
     """Base view class for BasePage."""
 
     template_name = "aircox/basepage_detail.html"
     context_object_name = "page"
-
+    has_filters = False
-    def get(self, *args, **kwargs):
-        return super().get(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        if self.object.cover:
-            kwargs.setdefault("cover", self.object.cover.url)
-        if self.object.title:
-            kwargs.setdefault("title", self.object.display_title)
-        return super().get_context_data(**kwargs)
 
     def get_queryset(self):
         return super().get_queryset().select_related("cover")
@@ -111,8 +68,6 @@ class BasePageDetailView(BasePageMixin, BaseView, DetailView):
             if redirect_url:
                 raise Redirect(redirect_url)
             raise Http404("%s not found" % self.model._meta.verbose_name)
-
-        self.category = self.get_category(obj)
         return obj
 
     def get_page(self):
@@ -124,6 +79,7 @@ class PageListView(FiltersMixin, BasePageListView):
 
     filterset_class = PageFilters
     template_name = None
+    has_filters = True
     categories = None
     filters = None
 
@@ -137,21 +93,15 @@ class PageListView(FiltersMixin, BasePageListView):
 
     def get_queryset(self):
         qs = super().get_queryset().select_related("category").order_by("-pub_date")
-        cat_ids = self.model.objects.published().values_list("category_id", flat=True)
-        self.categories = Category.objects.filter(id__in=cat_ids)
         return qs
 
-    @classmethod
-    def get_secondary_nav(cls):
-        cat_ids = cls.model.objects.published().values_list("category_id", flat=True)
-        categories = Category.objects.filter(id__in=cat_ids)
-        return tuple(
-            (category.title, reverse(cls.model.list_url_name, kwargs={"category_slug": category.slug}))
-            for category in categories
-        )
-
     def get_context_data(self, **kwargs):
-        kwargs["categories"] = self.categories
+        kwargs["categories"] = (
+            self.model.objects.published()
+            .filter(category__isnull=False)
+            .values_list("category__title", "category__id")
+            .distinct()
+        )
         return super().get_context_data(**kwargs)
 
 
@@ -160,6 +110,7 @@ class PageDetailView(BasePageDetailView):
 
     template_name = None
     context_object_name = "page"
+    has_filters = False
 
     def get_template_names(self):
         return super().get_template_names() + ["aircox/page_detail.html"]
@@ -171,15 +122,6 @@ class PageDetailView(BasePageDetailView):
         if self.object.allow_comments and "comment_form" not in kwargs:
             kwargs["comment_form"] = CommentForm()
         kwargs["comments"] = Comment.objects.filter(page=self.object).order_by("-date")
-
-        if self.object.parent_subclass:
-            kwargs["parent"] = self.object.parent_subclass
-
-        if "related_objects" not in kwargs:
-            related = self.get_related_queryset()
-            if related:
-                related = related[: self.related_count]
-            kwargs["related_objects"] = related
         return super().get_context_data(**kwargs)
 
     @classmethod

aircox/views/program.py

@@ -1,5 +1,3 @@
-import random
-
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.forms import ModelForm, ImageField
 from django.urls import reverse
@@ -7,8 +5,7 @@ from django.urls import reverse
 from ckeditor.fields import RichTextField
 from filer.models.imagemodels import Image
 
-
+from ..models import Page, Program, StaticPage
-from ..models import Article, Episode, Page, Program, StaticPage
 from .mixins import ParentMixin
 from .page import PageDetailView, PageListView, PageUpdateView
 
@@ -31,33 +28,12 @@ class BaseProgramMixin:
 class ProgramDetailView(BaseProgramMixin, PageDetailView):
     model = Program
 
-    def get_related_queryset(self):
-        queryset = (
-            self.get_queryset()
-            .filter(category_id=self.object.category_id)
-            .exclude(pk=self.object.pk)
-            .published()
-            .order_by("-pub_date")[:50]
-        )
-        return random.sample(list(queryset), min(len(queryset), self.related_count))
-
-    def get_related_url(self):
-        return reverse("program-list") + f"?category__id={self.object.category_id}"
-
-    def get_context_data(self, **kwargs):
-        episodes = Episode.objects.program(self.object).published().order_by("-pub_date")
-        podcasts = episodes.with_podcasts()
-        articles = Article.objects.parent(self.object).published().order_by("-pub_date")
-        return super().get_context_data(
-            articles=articles[: self.related_count],
-            episodes=episodes[: self.related_count],
-            podcasts=podcasts[: self.related_count],
-            **kwargs,
-        )
-
     def get_template_names(self):
         return super().get_template_names() + ["aircox/program_detail.html"]
 
+    def get_sidebar_queryset(self):
+        return super().get_sidebar_queryset().filter(parent=self.program)
+
 
 class ProgramForm(ModelForm):
     content = RichTextField()
@@ -92,10 +68,7 @@ class ProgramUpdateView(UserPassesTestMixin, BaseProgramMixin, PageUpdateView):
 
 class ProgramListView(PageListView):
     model = Program
-    attach_to_value = StaticPage.Target.PROGRAMS
+    attach_to_value = StaticPage.ATTACH_TO_PROGRAMS
-
-    def get_queryset(self):
-        return super().get_queryset().order_by("title")
 
 
 # FIXME: not used

aircox_streamer/templates/aircox_streamer/source_item.html

@@ -91,9 +91,9 @@
 
     <div class="column is-two-fifths">
         <h6 class="subtitle is-6 is-marginless">Metadata</h6>
-        <table class="table bg-transparent">
+        <table class="table has-background-transparent">
             <tbody>
-                <tr><th class="has-text-right ws-nowrap">
+                <tr><th class="has-text-right has-text-nowrap">
                     {% translate "Status" %}
                     </th>
                     <td :class="{'has-text-danger': source.isPlaying, 'has-text-warning': source.isPaused}">
@@ -103,7 +103,7 @@
                     </td>
                 </tr>
                 <tr v-if="source.data.air_time">
-                    <th class="has-text-right ws-nowrap">
+                    <th class="has-text-right has-text-nowrap">
                         {% translate "Air time" %}
                     </th><td>
                         <span class="far fa-clock"></span>
@@ -113,7 +113,7 @@
                         </time>
                     </td>
                 <tr v-if="source.remaining">
-                    <th class="has-text-right ws-nowrap">
+                    <th class="has-text-right has-text-nowrap">
                         {% translate "Time left" %}
                     </th><td>
                         <span class="far fa-hourglass"></span>
@@ -121,7 +121,7 @@
                     </td>
                 </tr>
                 <tr v-if="source.data.uri">
-                    <th class="has-text-right ws-nowrap">
+                    <th class="has-text-right has-text-nowrap">
                         {% translate "Data source" %}
                     </th><td>
                         <span class="far fa-play-circle"></span>

assets/package.json

@@ -10,10 +10,8 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.0.0",
-    "@popperjs/core": "^2.11.8",
     "core-js": "^3.8.3",
     "lodash": "^4.17.21",
-    "v-calendar": "^3.1.2",
     "vue": "^3.2.13"
   },
   "devDependencies": {
@@ -22,7 +20,7 @@
     "@vue/cli-plugin-babel": "~5.0.0",
     "@vue/cli-plugin-eslint": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
-    "bulma": "^0.9.4",
+    "bulma": "^0.9.3",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
     "sass": "^1.49.9",

assets/src/admin.js

@@ -1,3 +1,4 @@
+import './assets/styles.scss'
 import './assets/admin.scss'
 import './index.js'
 

assets/src/app.js

@@ -1,16 +1,9 @@
-import {Calendar, DatePicker} from 'v-calendar';
 import components from './components'
 
 const App = {
     el: '#app',
     delimiters: ['[[', ']]'],
-    components: {
+    components: {...components},
-        ...components,
-        ...{
-            VCalendar: Calendar,
-            VDatepicker: DatePicker
-        },
-    },
 
     computed: {
         player() { return window.aircox.player; },

assets/src/appBuilder.js

@@ -0,0 +1,139 @@
+import {createApp} from 'vue'
+
+/**
+ * Utility class used to handle Vue applications. It provides way to load
+ * remote application and update history.
+ */
+export default class Builder {
+    constructor(config={}) {
+        this.config = config
+        this.title = null
+        this.app = null
+        this.vm = null
+    }
+
+    /**
+     * Fetch app from remote and mount application.
+     */
+    fetch(url, {el='#app', ...options}={}) {
+        return fetch(url, options).then(response => response.text())
+            .then(content => {
+                let doc = new DOMParser().parseFromString(content, 'text/html')
+                let app = doc.querySelector(el)
+                content = app ? app.innerHTML : content
+                return this.mount({content, title: doc.title, reset:true, url })
+            })
+    }
+
+    /**
+     * Mount application, using `create_app` if required.
+     *
+     * @param {String} options.content: replace app container content with it
+     * @param {String} options.title: set DOM document title.
+     * @param {String} [options.el=this.config.el]: mount application on this element (querySelector argument)
+     * @param {Boolean} [reset=False]: if True, force application recreation.
+     * @return `app.mount`'s result.
+     */
+    mount({content=null, title=null, el=null, reset=false, props=null}={}) {
+        try {
+            this.unmount()
+
+            let config = this.config
+            if(el === null)
+                el = config.el
+            if(reset || !this.app)
+                this.app = this.createApp({title,content,el,...config}, props)
+
+            this.vm = this.app.mount(el)
+            window.scroll(0, 0)
+            return this.vm
+        } catch(error) {
+            this.unmount()
+            throw error
+        }
+    }
+
+    createApp({el, title=null, content=null, ...config}, props) {
+        const container = document.querySelector(el)
+        if(!container)
+            return
+        if(content)
+            container.innerHTML = content
+        if(title)
+            document.title = title
+        return createApp(config, props)
+    }
+
+    unmount() {
+        this.app && this.app.unmount()
+        this.app = null
+        this.vm = null
+    }
+
+    /**
+     * Enable hot reload: catch page change in order to fetch them and
+     * load page without actually leaving current one.
+     */
+    enableHotReload(node=null, historySave=true) {
+        if(historySave)
+            this.historySave(document.location, true)
+        node.addEventListener('click', event => this.pageChanged(event), true)
+        node.addEventListener('submit', event => this.pageChanged(event), true)
+        node.addEventListener('popstate', event => this.statePopped(event), true)
+    }
+
+    pageChanged(event) {
+        let submit = event.type == 'submit';
+        let target = submit || event.target.tagName == 'A'
+                        ? event.target : event.target.closest('a');
+        if(!target || target.hasAttribute('target'))
+            return;
+
+        let url = submit ? target.getAttribute('action') || ''
+                         : target.getAttribute('href');
+        let domain = window.location.protocol + '//' + window.location.hostname
+        let stay = (url === '' || url.startsWith('/') || url.startsWith('?') ||
+                    url.startsWith(domain)) && url.indexOf('wp-admin') == -1
+        if(url===null || !stay) {
+            return;
+        }
+
+        let options = {};
+        if(submit) {
+            let formData = new FormData(event.target);
+            if(target.method == 'get')
+                url += '?' + (new URLSearchParams(formData)).toString();
+            else
+                options = {...options, method: target.method, body: formData}
+        }
+        this.fetch(url, options).then(() => this.historySave(url))
+        event.preventDefault();
+        event.stopPropagation();
+    }
+
+    statePopped(event) {
+        const state = event.state
+        if(state && state.content)
+            // document.title = this.title;
+            this.historyLoad(state);
+    }
+
+    /// Save application state into browser history
+    historySave(url,replace=false) {
+        const el = document.querySelector(this.config.el)
+        const state = {
+            content: el.innerHTML,
+            title: document.title,
+        }
+
+        if(replace)
+            history.replaceState(state, '', url)
+        else
+            history.pushState(state, '', url)
+    }
+
+    /// Load application from browser history's state
+    historyLoad(state) {
+        return this.mount({ content: state.content, title: state.title })
+    }
+}

assets/src/assets/admin.scss

@@ -1,77 +1,5 @@
-@use "./vars";
-@use "./components";
-
-@import "~bulma/sass/utilities/_all.sass";
-@import "~bulma/sass/elements/button";
-@import "~bulma/sass/components/navbar";
-
-
-// enforce button usage inside custom application
-#player, .ax {
-    @include components.button;
-}
-
 
 .admin {
-
-    .navbar.has-shadow, .navbar.is-fixed-bottom.has-shadow {
-        box-shadow: 0em 0em 1em rgba(0,0,0,0.1);
-    }
-
-    a.navbar-item.is-active {
-        border-bottom: 1px grey solid;
-    }
-
-    .navbar {
-        & + .container {
-            margin-top: 1em;
-        }
-
-        .navbar-dropdown {
-            z-index: 2000;
-        }
-
-        .navbar-split {
-            margin: 0.2em 0em;
-            margin-right: 1em;
-            padding-right: 1em;
-            border-right: 1px vars.$grey-light solid;
-            display: inline-block;
-        }
-
-        form {
-            margin: 0em;
-            padding: 0em;
-        }
-
-        &.toolbar {
-            margin: 1em 0em;
-            background-color: transparent;
-            margin-bottom: 1em;
-
-            .title {
-                padding-right: 2em;
-                margin-right: 1em;
-                border-right: 1px vars.$grey-light solid;
-
-                font-size: vars.$text-size;
-                font-weight: vars.$weight-light;
-            }
-        }
-
-        .navbar-dropdown {
-            max-height: 40rem;
-            overflow-y: auto;
-
-            input {
-                z-index: 10000;
-                position: sticky;
-                top: 0;
-            }
-        }
-
-    }
-
     .navbar .navbar-brand {
         padding-right: 1em;
     }

assets/src/assets/common.scss

@@ -1,78 +0,0 @@
-@use "./vars" as v;
-@import "./vendor";
-@import "./helpers";
-
-//-- helpers/modifiers
-//-- forms
-input.half-field:not(:active):not(:hover) {
-    border: none;
-    background-color: rgba(0,0,0,0);
-    cursor: pointer;
-}
-
-
-//-- general
-:root {
-    --body-bg: #fff;
-    --text-color: black;
-    --disabled-color: #aaa;
-    --disabled-bg: #eee;
-
-    --highlight-color: rgba(255, 255, 0, 1);
-    --highlight-color-alpha: rgba(255, 255, 0, 0.7);
-    --highlight-color-grey: rgba(230, 230, 60, 1);
-    --highlight-color-2: rgb(0, 0, 254);
-    --highlight-color-2-alpha: rgb(0, 0, 254, 0.7);
-    --highlight-color-2-grey: rgba(50, 200, 200, 1);
-
-    --nav-primary-height: 3rem;
-    --nav-secondary-height: 2.5rem;
-    --nav-bg: var(--highlight-color);
-    --nav-fg: var(--highlight-color-2);
-    --nav-active-bg: var(--highlight-color-2);
-    --nav-active-fg: var(--highlight-color);
-    --nav-fs: 1rem;
-    --nav-2-fs: 0.8rem;
-
-    --button-fg: var(--text-color);
-    --button-bg: var(--highlight-color);
-    --button-hg-fg: var(--highlight-color-2);
-    --button-hg-bg: var(--highlight-color);
-    --button-active-fg: var(--highlight-color);
-    --button-active-bg: var(--highlight-color-2);
-}
-
-
-body {
-    font-size: 1.4em;
-    background-color: var(--body-bg);
-}
-
-
-@media screen and (max-width: v.$screen-wider) {
-    body { font-size: 1.2em; }
-}
-
-@media screen and (max-width: v.$screen-normal) {
-    body { font-size: 1em; }
-
-    :root {
-        --header-height: 20rem;
-    }
-}
-
-section > .toolbar {
-    background-color: rgba(0,0,0,0.05);
-    padding: 1em;
-    margin-bottom: 1.5em;
-}
-
-
-h1, h2, h3, h4, h5, h6, .heading, .title, .subtitle {
-    font-family: var(--heading-font-family);
-}
-
-
-.container:empty {
-    display: none;
-}

assets/src/assets/components.scss

@@ -1,669 +0,0 @@
-@use "vars" as v;
-
-:root {
-    --title-1-sz: 1.6rem;
-    --title-2-sz: 1.4rem;
-    --title-3-sz: 1.2rem;
-    --subtitle-1-sz: 1.6rem;
-    --subtitle-2-sz: 1.4rem;
-    --subtitle-3-sz: 1.2rem;
-
-    --heading-title-bg-color: rgba(255, 255, 0, 1);
-    --heading-bg-color: var(--highlight-color);
-    --heading-bg-highlight-color: var(--highlight-color-2);
-    --heading-font-family: default;
-
-    --preview-title-sz: #{v.$text-size-medium};
-    --preview-subtitle-sz: #{v.$text-size};
-    --preview-cover-size: 14rem;
-    --preview-cover-small-size: 10rem;
-    --preview-cover-tiny-size: 4rem;
-    --preview-wide-content-sz: #{v.$text-size-bigger};
-    --header-height: var(--preview-cover-size);
-
-    --a-carousel-p: #{v.$text-size-medium};
-    --a-carousel-ml: calc(#{v.$mp-4} - 0.5rem);
-    --a-carousel-gap: #{v.$mp-4};
-    --a-carousel-nav-x: -#{v.$mp-3e};
-
-    --a-progress-bg: transparent;
-    --a-progress-bar-bg: var(--highlight-color-2);
-    --a-progress-bar-color: var(--highlight-color);
-    --a-progress-bar-pd: #{v.$mp-2};
-
-    --a-playlist-header-bg: var(--highlight-color-2-alpha);
-    --a-playlist-header-fg: var(--highlight-color);
-    --a-playlist-title-sz: #{v.$text-size};
-    --a-playlist-title-pd: #{v.$mp-3};
-    --a-playlist-item-border: 1px var(--highlight-color-2) solid;
-
-    --a-sound-bg: var(--highlight-color-alpha);
-    --a-sound-hv-bg: var(--highlight-color);
-    --a-sound-playing-fg: var(--highlight-color-alpha);
-    --a-sound-hv-fg: var(--highlight-color-2);
-    --a-sound-text-sz: #{v.$text-size};
-
-    --a-player-url-fg: var(--highlight-color-2);
-    --a-player-panel-bg: var(--highlight-color);
-    --a-player-bar-height: var(--nav-primary-height);
-    --a-player-bar-bg: var(--highlight-color);
-    --a-player-bar-title-alone-sz: #{v.$text-size-medium};
-
-    --button-fg: var(--highlight-color-2);
-    --button-bg: var(--highlight-color);
-    --button-sec-bg: var(--highlight-color-alpha);
-    --button-hg-fg: var(--text-color);
-    --button-hg-bg: var(--highlight-color);
-    --button-active-fg: var(--highlight-color);
-    --button-active-bg: var(--highlight-color-2);
-}
-
-
-@media screen and (max-width: v.$screen-wide) {
-    :root {
-        --section-content-sz: 1rem;
-
-        --preview-title-sz: #{v.$text-size};
-        --preview-subtitle-sz: #{v.$text-size-smaller};
-        --preview-cover-size: 10rem;
-        --preview-cover-small-size: 6rem;
-        --preview-cover-tiny-size: 4rem;
-        --preview-wide-content-sz: #{v.$text-size};
-    }
-}
-
-// ---- headings
-.title, .header.preview .title {
-    &.is-1 { font-size: var(--title-1-sz); }
-    &.is-2 { font-size: var(--title-2-sz); }
-    &.is-3 { font-size: var(--title-3-sz); }
-}
-
-.subtitle, .header.preview .subtitle {
-    &.is-1 { font-size: var(--subtitle-1-sz); }
-    &.is-2 { font-size: var(--subtitle-2-sz); }
-    &.is-3 { font-size: var(--subtitle-3-sz); }
-}
-
-.heading {
-    display: inline-block;
-
-    &:not(:empty) {
-        background-color: var(--heading-bg-color);
-        padding: v.$mp-2;
-        margin-top: 0em !important;
-        vertical-align: top;
-
-        &.highlight, &.active,
-        .preview.active &,
-        {
-            background-color: var(--heading-bg-highlight-color);
-            color: var(--highlight-color);
-        }
-    }
-
-    &.title {
-        background-color: var(--heading-title-bg-color);
-    }
-}
-
-
-// ---- button
-@mixin button {
-    .button, a.button, button.button, .nav-urls a {
-        display: inline-block;
-        padding: v.$mp-2;
-        border: 1px var(--highlight-color-2-alpha) solid;
-        justify-content: center;
-        text-align: center;
-        // font-size: v.$text-size-medium;
-
-        color: var(--button-fg);
-        background-color: var(--button-bg);
-
-        &.secondary {
-            background-color: var(--button-sec-bg);
-        }
-
-        .icon {
-            vertical-align: middle;
-            &:not(:only-child) {
-                &:first-child { margin-right: v.$mp-3; }
-                &:last-child { margin-left: v.$mp-3 }
-            }
-        }
-
-
-        &:hover {
-            color: var(--button-hg-fg);
-            opacity: 1 !important;
-        }
-
-        &.active {
-            border-color: var(--highlight-color-alpha);
-            color: var(--button-active-fg);
-            background-color: var(--button-active-bg);
-
-            &:hover {
-                border-color: var(--highlight-color);
-                background-color: var(--highlight-color-2-alpha);
-                opacity: 1 !important;
-            }
-        }
-
-        &:not([disabled]), &:not(.disabled) {
-            cursor: pointer;
-        }
-
-        &[disabled], &.disabled {
-            background-color: var(--highlight-color-grey);
-            color: var(--highlight-color-2);
-            border-color: var(--highlight-color-2-alpha);
-        }
-
-        .dropdown-trigger {
-            border-radius: 1.5em;
-        }
-    }
-
-
-    .button-group, .nav {
-        .button {
-            border-radius: 0px;
-            background-color: transparent;
-            border-top: 0px;
-            border-bottom: 0px;
-            height: 100%;
-
-            &:not(:first-child) { border-left: 0px; }
-            &:last-child { border-right: 0px; }
-        }
-    }
-}
-
-
-// ---- preview
-.preview {
-    position: relative;
-    background-size: cover;
-
-    &.preview-item {
-        width: 100%;
-    }
-
-    // FIXME: remove
-    &.columns, .headings.columns {
-        margin-left: 0em;
-        margin-right: 0em;
-        .column { padding: 0em; }
-    }
-
-    .title, .title:not(:last-child) {
-        // second is bulma reset
-        font-weight: v.$weight-bold;
-        font-size: var(--preview-title-sz);
-        margin-bottom: unset;
-    }
-    .subtitle {
-        font-weight: v.$weight-bolder;
-        font-size: var(--preview-subtitle-sz);
-        margin-bottom: unset;
-    }
-    //.content, .actions {
-    //    font-size: v.$text-size-bigger;
-    //}
-
-    .headings {
-        background-size: cover;
-
-        > * { margin: 0em; }
-        .column { padding: 0em; }
-
-        a {
-            color: var(--text-color);
-        }
-    }
-
-    &.tiny {
-        .content {
-            font-size: v.$text-size;
-        }
-    }
-
-}
-
-
-@media screen and (max-width: v.$screen-small) {
-    .preview .content {
-        display: none;
-    }
-}
-
-
-.preview-cover {
-    background-size: cover;
-    background-color: transparent !important;
-    height: var(--preview-cover-size);
-    width: var(--preview-cover-size);
-    min-width: var(--preview-cover-size);
-
-    &.small, .preview.small & {
-        min-width: unset;
-        height: var(--preview-cover-small-size);
-        width: var(--preview-cover-small-size) !important;
-        min-width: var(--preview-cover-small-size);
-    }
-
-    &.tiny, .preview.tiny & {
-        min-width: unset;
-        height: var(--preview-cover-tiny-size);
-        width: var(--preview-cover-tiny-size) !important;
-        min-width: var(--preview-cover-tiny-size);
-    }
-}
-
-.preview-header {
-    width: 100%;
-
-    &:not(.no-cover) {
-        min-height: var(--header-height);
-    }
-
-    &.no-cover {
-        height: unset;
-    }
-
-    .headings {
-        padding-top: v.$mp-6;
-    }
-
-    .headings, > .container {
-        width: 100%;
-    }
-
-    > .container, {
-        height: 100%;
-    }
-}
-
-
-// ---- list
-.list-item {
-    width: 100%;
-
-    &:not(:first-child) {
-        margin-top: calc(v.$mp-4 / 2);
-    }
-
-    .headings {
-        display: flex;
-        flex-direction: row;
-        padding-top: 0em;
-        margin-bottom: v.$mp-2 !important;
-
-        .title {
-            flex-grow: 1;
-        }
-    }
-
-    .subtitle {
-        font-size: var(--preview-title-sz);
-        text-align: right;
-    }
-
-    .media-content {
-        display: flex;
-        flex-direction: column;
-
-        .list-item:not(.no-cover) & {
-            min-height: var(--preview-cover-small-size);
-        }
-
-        .content {
-            flex-grow: 1;
-            margin-bottom: auto;
-        }
-
-        .actions {
-            flex-grow: unset;
-            text-align: right;
-            margin-top: auto;
-        }
-    }
-}
-
-
-// ---- wide
-.preview-wide {
-    height: var(--preview-cover-size);
-    display: flex;
-
-    .headings {
-        height: var(--preview-cover-size)
-    }
-
-    &:not(.header) .headings {
-        box-shadow: 0em 0em 1em rgba(0,0,0,0.2);
-    }
-
-    & .headings {
-        width: var(--preview-cover-size);
-        min-width: var(--preview-cover-size);
-        flex-grow: 0;
-        margin-right: v.$mp-4;
-    }
-
-    & .content {
-        font-size: var(--preview-wide-content-sz);
-        flex-grow: 1;
-    }
-}
-
-
-// ---- card
-
-.preview-card {
-    padding: 0rem !important;
-
-    height: var(--preview-cover-size);
-    width: var(--preview-cover-size);
-
-    &.small {
-        height: var(--preview-cover-small-size);
-        width: var(--preview-cover-small-size);
-    }
-    &.tiny {
-        height: var(--preview-cover-tiny-size);
-        width: var(--preview-cover-tiny-size);
-    }
-
-    &:not(.header) {
-        box-shadow: 0em 0em 1em rgba(0,0,0,0.2);
-    }
-
-    .title {
-        max-height: calc( var(--preview-cover-size) / 2 );
-        overflow: hidden;
-    }
-
-    .card-grid & {
-        min-width: unset;
-    }
-
-    .actions {
-        position: absolute;
-        bottom: v.$mp-3;
-        right: v.$mp-3;
-
-        label {
-            display: none;
-        }
-    }
-}
-
-
-.card-headings, .preview-card-headings {
-    padding-top: v.$mp-3;
-
-    & > div:not(:last-child),
-    & .column > div {
-        margin-bottom: v.$mp-3;
-    }
-
-    preview-header:not(.no-cover) & .heading {
-        margin-bottom: v.$mp-3;
-    }
-
-}
-
-
-// ---- card grid
-.card-grid {
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
-    gap: v.$mp-4;
-}
-
-
-// ---- ---- Carousel
-.a-carousel {
-    margin-left: calc( 0rem - var(--a-carousel-ml));
-
-    .a-carousel-viewport {
-        padding: var(--a-carousel-p) 0;
-        padding-left: var(--a-carousel-ml);
-    }
-}
-
-.a-carousel-container {
-    width: 100%;
-    gap: var(--a-carousel-gap);
-    transition: margin-left 1s;
-
-    > * {
-        flex-shrink: 0;
-    }
-}
-
-.a-carousel-button-container {
-    button, .button {
-        z-index:1000;
-        position: absolute;
-        display: flex;
-        flex-direction: column;
-        top: 50%;
-
-        &.prev { left: var(--a-carousel-nav-x); }
-        &.next { right: var(--a-carousel-nav-x); }
-    }
-}
-
-
-// ---- ---- progress bar
-.a-progress {
-    display: flex;
-    flex-direction: row;
-    margin: 0em;
-    padding: 0em;
-
-    &:hover {
-        background-color: var(--a-progress-bg);
-    }
-
-    .a-progress-bar-container {
-        flex-grow: 1;
-        margin: 0em;
-    }
-
-    > time, .a-progress-bar {
-        height: 100%;
-        padding: var(--a-progress-bar-pd);
-    }
-
-    .a-progress-bar {
-        background-color: var(--a-progress-bar-bg);
-        color: var(--a-progress-bar-color)
-    }
-}
-
-
-// ---- ---- player
-// ---- playlist
-.playlist, .a-playlist {
-    .header {
-        display: flex;
-        flex-direction: row;
-
-        .title, .button {
-            background-color: var(--a-playlist-header-bg);
-            color: var(--a-playlist-header-fg);
-        }
-
-        .title {
-            font-size: var(--a-playlist-title-sz);
-            margin: 0;
-            padding: var(--a-playlist-title-pd);
-        }
-    }
-
-    li {
-        list-style: none;
-        border-bottom: var(--a-playlist-item-border);
-
-        &:last-child {
-            border-bottom: 0px;
-        }
-    }
-}
-
-// ---- sound item
-.a-sound-item {
-    display: flex;
-    align-items: center;
-    flex-direction: row;
-
-    height: 3rem;
-    background-color: var(--a-sound-bg);
-
-    &.playing, &.playing .label {
-        color: var(--a-sound-playing-fg) !important;
-    }
-
-    &:hover {
-        background-color: var(--a-sound-hv-bg);
-
-        .label {
-            color: var(--a-sound-hv-fg) !important;
-        }
-    }
-
-    .label:hover::before, &.playing .label::before {
-        content: "\f04b";
-        font-family: "Font Awesome 6 Free";
-        margin-right: v.$mp-3e;
-    }
-    &.playing .label:hover::before {
-        content: '';
-        margin: 0;
-    }
-
-
-    .headings > * {
-    }
-
-    .label {
-        cursor: pointer;
-
-        .icon {
-            padding: 0em v.$mp-3;
-        }
-
-        margin: 0em !important;
-        padding: v.$mp-3e;
-        font-size: var(--a-sound-text-sz);
-        font-family: var(--heading-font-family);
-    }
-
-    .button {
-        width: 3em;
-        font-size: var(--a-sound-text-sz);
-    }
-}
-
-
-// ---- player
-.player-container {
-    z-index: 1000000;
-}
-
-.a-player {
-    box-shadow: 0em -0.5em 0.5em rgba(0, 0, 0, 0.05);
-
-    a { color: var(--a-player-url-fg); }
-    .button {
-        color: var(--text-black);
-        &:hover { color: var(--button-fg); }
-    }
-}
-
-.a-player-panels {
-    background: var(--a-player-panel-bg);
-    height: 0%;
-    transition: height 1s;
-}
-.a-player-panels.is-open {
-    height: auto;
-}
-
-.a-player-panel {
-    padding-bottom: v.$mp-3;
-    max-height: 80%;
-    overflow-y: auto;
-
-    .a-sound-item:not(:hover) {
-        background-color: transparent;
-    }
-}
-
-.a-player-progress {
-    height: 0.4em;
-    overflow: hidden;
-
-    time { display: none; }
-
-    &:hover, .a-player-panels.is-open + & {
-        background: var(--a-player-bar-bg);
-        height: 2em;
-        time { display: unset; }
-    }
-}
-
-.a-player-bar {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    height: var(--a-player-bar-height);
-
-    border-top: 1px v.$grey-light solid;
-    background: var(--a-player-bar-bg);
-
-    > * { height: 100%; }
-
-    .cover { height: 100%; }
-    .title {
-        font-size: v.$text-size;
-        margin: 0em;
-
-        &:last-child {
-            font-size: var(--a-player-bar-title-alone-sz);
-        }
-    }
-
-    .button {
-        font-size: v.$text-size-medium;
-        height: 100%;
-        padding: v.$mp-2 !important;
-        min-width: calc(var(--a-player-bar-height) + v.$mp-2 * 2);
-        border-radius: 0px;
-        transition: background-color 0.5s;
-
-        &.open {
-            background-color: var(--highlight-color-2-alpha);
-            color: var(--highlight-color);
-        }
-    }
-}
-
-    .a-player-bar-content {
-        display: flex;
-        flex-direction: vertical;
-        align-items: center;
-        flex-grow: 1;
-        padding: 0 v.$mp-3;
-        border-right: 1px black solid;
-
-        .title {
-            max-height: calc( var(--a-player-bar-height) - v.$mp-3 );
-            overflow: hidden;
-        }
-    }

assets/src/assets/helpers.scss

@@ -1,74 +0,0 @@
-@use "./vars";
-
-.align-left { text-align: left; justify-content: left; }
-.align-right { text-align: right; justify-content: right; }
-
-.clear-left { clear: left !important }
-.clear-right { clear: right !important }
-.clear-both { clear: both !important }
-
-.d-inline { display: inline !important; }
-.d-block { display: block !important; }
-.d-inline-block { display: inline-block !important; }
-
-.push-right, .flex-push-right { margin-left: auto !important; }
-.push-bottom { margin-top: auto !important; }
-.flex-grow-0 { flex-grow: 0 !important; }
-
-.float-right { float: right }
-.float-left { float: left }
-
-.is-fullwidth { width: 100%; }
-.is-fullheight { height: 100%; }
-.is-fixed-bottom {
-    position: fixed;
-    bottom: 0;
-    margin-bottom: 0px;
-    border-radius: 0;
-}
-.is-borderless { border: none; }
-
-.overflow-hidden { overflow: hidden }
-.overflow-hidden.is-fullwidth { max-width: 100%; }
-
-.p-relative { position: relative !important }
-.p-absolute { position: absolute !important }
-.p-fixed { position: fixed !important }
-.p-sticky { position: sticky !important }
-.p-static { position: static !important }
-
-.height-full { height: 100%; }
-
-.ws-nowrap { white-space: nowrap; }
-.no-border { border: 0px !important; }
-
-
-*[draggable="true"] {
-    cursor: move;
-}
-
-
-// ---- animations
-@keyframes blink {
-    from { opacity: 1; }
-    to { opacity: 0.4; }
-}
-
-.blink { animation: 1s ease-in-out 3s infinite alternate blink; }
-.loading { animation: 1s ease-in-out 1s infinite alternate blink; }
-
-
-// -- colors
-.highlight-color { color: var(--highlight-color); }
-.highlight-color-2 { color: var(--highlight-color-2); }
-
-.bg-transparent { background-color: transparent; }
-
-.is-success {
-    background-color: vars.$green !important;
-    border-color: vars.$green-dark !important;
-}
-.is-danger {
-    background-color: vars.$red !important;
-    border-color: vars.$red-dark !important;
-}

assets/src/assets/public.scss

@@ -1,441 +0,0 @@
-@use "./vars" as v;
-@use "./components";
-
-@import "./vendor";
-
-
-// ---- main theme & layout
-.page {
-    padding-bottom: 5rem;
-
-    a {
-        color: var(--highlight-color-2);
-        text-decoration: none;
-
-        &:hover {
-            color: var(--text-color);
-        }
-    }
-
-
-    section.container {
-        margin-top: v.$mp-3;
-
-        > .title {
-            margin-top: unset;
-            padding-top: unset !important;
-            margin-bottom: v.$mp-4;
-            border-bottom: 1px solid black;
-        }
-
-        &:not(:last-child) {
-            margin-bottom: v.$mp-3;
-        }
-    }
-}
-
-
-
-// ---- components
-.dropdown-item {
-    font-size: unset !important
-}
-
-.vc-weekday-1, .vc-weekday-7 {
-    color: var(--highlight-color-2) !important;
-}
-
-
-.schedules {
-    padding-top: 0;
-    margin-bottom: calc(0rem - v.$mp-3) !important;
-}
-
-.schedule {
-    display: inline-block;
-    margin: v.$mp-3;
-    margin-left: 0rem;
-
-    .day {
-        font-weight: v.$weight-bold;
-        margin-right: v.$mp-3;
-    }
-}
-
-
-// -- buttons, forms
-@include components.button;
-
-.actions {
-    display: flex;
-    flex-direction: row;
-    gap: v.$mp-3;
-    justify-content: right;
-
-    &.no-label label {
-        display: none;
-    }
-
-    button, .action {
-        justify-content: center;
-        min-width: 2rem;
-
-        .not-selected { opacity: 0.6; }
-        .icon { margin: 0em !important; }
-        label { margin-left: v.$mp-2; }
-    }
-
-}
-
-.label, .textarea, .input, .select {
-    font-size: v.$text-size;
-}
-
-.field.is-horizontal {
-    display: flex;
-    flex-direction: horizontal;
-
-    .label { min-width: 7rem }
-    .control {
-        flex: 1;
-        > * {
-            width: 100%;
-        }
-
-    }
-}
-
-@media screen and (min-width: v.$screen-small) {
-    textarea {
-        height: calc( v.$text-size * 7 ) !important;
-    }
-}
-
-.navbar-item.active, .table tr.is-selected {
-    color: var(--highlight-color-2);
-    background-color: var(--highlight-color);
-}
-
-
-// -- headings
-.title {
-    text-transform: uppercase;
-
-    &.is-3 {
-        margin-top: v.$mp-3;
-    }
-
-}
-
-
-// ---- main navigation
-.navs {
-    position: relative;
-}
-
-.nav {
-    display: flex;
-    background-color: var(--nav-bg);
-
-    &:empty {
-        display: none;
-    }
-
-    .burger {
-        display: none;
-        background-color: var(--nav-bg);
-    }
-
-    .nav-item {
-        padding: v.$mp-2;
-        flex-grow: 1;
-        flex-shrink: 1;
-        text-align: center;
-
-        font-family: var(--heading-font-family);
-        text-transform: uppercase;
-
-        a, .button {
-            display: block;
-            width: 100%;
-        }
-
-        .icon:first-child, .icon + span {
-            text-align: center;
-            vertical-align: top;
-            display: inline-block;
-        }
-
-        &.active {
-            background-color: var(--nav-active-bg);
-            color: var(--nav-active-fg);
-        }
-    }
-
-    .nav-menu {
-        display: flex;
-        flex-grow: 1;
-        background-color: var(--nav-bg);
-
-
-        .dropdown-content {
-            font-size: v.$text-size;
-            min-width: 15rem;
-        }
-    }
-
-    &.primary {
-        height: var(--nav-primary-height);
-
-        .nav-menu {
-            flex-grow: 1;
-        }
-
-        .nav-brand {
-            display: inline-block;
-            padding: v.$mp-3;
-            flex-grow: 0;
-            flex-shrink: 1;
-
-            img {
-                height: 100%;
-            }
-        }
-
-        .nav-item {
-            font-size: var(--nav-fs);
-            font-weight: v.$weight-bold;
-            white-space: nowrap;
-        }
-    }
-
-    &.secondary {
-        background-color: var(--nav-bg);
-        //position: absolute;
-        //width: 100%;
-        //box-shadow: 0em 0.5em 0.5em rgba(0, 0, 0, 0.05);
-
-        justify-content: right;
-        //display: none;
-
-        .nav.primary:hover + &,
-        &:hover {
-            display: flex;
-            top: var(--nav-primary-height);
-            left: 0rem;
-        }
-
-        .nav-item {
-            font-size: var(--nav-2-fs);
-        }
-    }
-}
-
-// ---- breadcrumbs
-.breadcrumbs {
-    text-align: right;
-    padding: v.$mp-3 0rem;
-    padding-bottom: 0;
-    margin-bottom: 0;
-
-    &:empty { display: none; }
-
-    a + a {
-        padding-left: 0;
-
-        &:before {
-            content: "/";
-            margin: 0 v.$mp-2;
-        }
-    }
-}
-
-
-@media screen and (max-width: v.$screen-normal) {
-    .page {
-        margin-top: var(--nav-primary-height);
-    }
-
-    .navs {
-        z-index: 100000;
-        position: fixed;
-        display: flex;
-        left: 0;
-        right: 0;
-        top: 0;
-
-        .nav:first-child {
-            flex-grow: 1;
-        }
-
-        .nav + .nav {
-            flew-grow: 0 !important;
-        }
-    }
-
-    .nav {
-        justify-content: space-between;
-
-        .burger {
-            display: unset;
-            margin-left: auto;
-        }
-
-        .nav-menu {
-            display: block;
-            position: absolute;
-            left: 0;
-            top: 100%;
-            width: 100%;
-            box-shadow: 0em 0.5em 0.5em rgba(0,0,0,0.05);
-
-            .nav-item {
-                display: block;
-                font-weight: v.$weight-normal;
-
-                &:hover {
-                    background-color: var(--highlight-color-2-alpha);
-                    color: var(--highlight-color);
-                }
-            }
-        }
-
-        .nav-menu:not(.active) {
-            display: none !important
-        }
-    }
-}
-
-
-nav li {
-    list-style: none;
-
-    a, .button {
-        font-size: v.$text-size-medium;
-    }
-}
-
-
-.nav-urls {
-    display: flex;
-    flex-direction: row;
-
-    margin-top: v.$mp-3;
-    text-align: right;
-
-    > a:only-child {
-        margin-left: auto;
-    }
-
-    li {
-        list-style: none;
-    }
-
-    .urls {
-        flex-grow: 1;
-        display: flex;
-        flex-direction: row;
-        gap: v.$mp-3;
-        justify-content: center;
-
-        a:not(:last-child) {
-            margin-right: v.$mp-3;
-        }
-
-    }
-
-    .left {
-        flex-grow: 0;
-        text-align: left;
-    }
-
-    .right {
-        flex-grow: 0;
-        text-align: right;
-    }
-}
-
-// ---- page header
-.header {
-    &.preview-header {
-        //display: flex;
-        align-items: start;
-        gap: v.$mp-3;
-        min-height: unset;
-        padding-top: v.$mp-3 !important;
-
-    }
-
-    .headings {
-        width: unset;
-        flex-grow: 1;
-        padding-top: 0 !important;
-
-        display: flex;
-        flex-direction: column;
-    }
-
-    &.has-cover {
-        min-height: calc( var(--header-height) / 3 );
-    }
-}
-
-
-.header-cover:not(:only-child) {
-    float: right;
-    height: var(--header-height);
-    max-width: calc(var(--header-height) * 2);
-    margin: 0 0 v.$mp-4 v.$mp-4;
-}
-.header-cover:only-child {
-    with: 100%;
-}
-
-// ---- ---- detail
-.page-content {
-    margin-top: v.$mp-6;
-
-    &:not(:last-child) {
-        margin-bottom: v.$mp-6;
-    }
-}
-
-// ---- responsive
-body { font-size: 1.4em; }
-
-@media screen and (max-width: v.$screen-wide) {
-    body { font-size: 1em; }
-}
-
-@media screen and (max-width: v.$screen-normal) {
-    .page .container {
-        margin-left: v.$mp-4;
-        margin-right: v.$mp-4;
-    }
-}
-
-@media screen and (max-width: v.$screen-small) {
-    .page .container {
-        margin-left: v.$mp-2;
-        margin-right: v.$mp-2;
-    }
-
-    .container.header {
-        width: calc( 100% - v.$mp-2 );
-
-        .headings {
-            width: 100%;
-            clear: both;
-        }
-
-        .header-cover {
-            float: none;
-            width: 100%;
-            max-width: unset;
-            height: unset;
-            margin-left: 0rem;
-            margin-right: 0rem;
-        }
-    }
-
-}

assets/src/assets/styles.scss

@@ -0,0 +1,327 @@
+@charset "utf-8";
+
+@import "~bulma/sass/utilities/_all.sass";
+@import "~bulma/sass/components/dropdown.sass";
+
+$body-background-color: $light;
+$menu-item-hover-background-color: #dfdfdf;
+$menu-item-active-background-color: #d2d2d2;
+
+@import "~bulma";
+
+//-- helpers/modifiers
+.is-fullwidth { width: 100%; }
+.is-fullheight { height: 100%; }
+.is-fixed-bottom {
+    position: fixed;
+    bottom: 0;
+    margin-bottom: 0px;
+    border-radius: 0;
+}
+.is-borderless { border: none; }
+
+.has-text-nowrap {
+    white-space: nowrap;
+}
+
+.has-background-transparent {
+    background-color: transparent;
+}
+
+.is-opacity-light {
+    opacity: 0.7;
+    &:hover {
+        opacity: 1;
+    }
+}
+
+.float-right { float: right }
+.float-left { float: left }
+.overflow-hidden { overflow: hidden }
+.overflow-hidden.is-fullwidth { max-width: 100%; }
+
+
+*[draggable="true"] {
+    cursor: move;
+}
+
+//-- forms
+input.half-field:not(:active):not(:hover) {
+    border: none;
+    background-color: rgba(0,0,0,0);
+    cursor: pointer;
+}
+
+
+//-- animations
+@keyframes blink {
+    from { opacity: 1; }
+    to { opacity: 0.4; }
+}
+
+.blink {
+    animation: 1s ease-in-out 3s infinite alternate blink;
+}
+
+
+//-- navbar
+.navbar + .container {
+    margin-top: 1em;
+}
+
+.navbar.has-shadow, .navbar.is-fixed-bottom.has-shadow {
+    box-shadow: 0em 0em 1em rgba(0,0,0,0.1);
+}
+
+a.navbar-item.is-active {
+    border-bottom: 1px grey solid;
+}
+
+.navbar {
+    .navbar-dropdown {
+        z-index: 2000;
+    }
+
+    .navbar-split {
+        margin: 0.2em 0em;
+        margin-right: 1em;
+        padding-right: 1em;
+        border-right: 1px $grey-light solid;
+        display: inline-block;
+    }
+
+    form {
+        margin: 0em;
+        padding: 0em;
+    }
+
+    &.toolbar {
+        margin: 1em 0em;
+        background-color: transparent;
+        margin-bottom: 1em;
+
+        .title {
+            padding-right: 2em;
+            margin-right: 1em;
+            border-right: 1px $grey-light solid;
+
+            font-size: $size-5;
+            color: $text-light;
+            font-weight: $weight-light;
+        }
+    }
+}
+
+//-- cards
+.card {
+    .title {
+        a {
+            color: $dark;
+        }
+
+        padding: 0.2em;
+        font-size: $size-5;
+        font-weight: $weight-medium;
+    }
+
+    &.is-primary {
+        box-shadow: 0em 0em 0.5em $black
+    }
+}
+
+.card-super-title {
+    position: absolute;
+    z-index: 1000;
+    font-size: $size-6;
+    font-weight: $weight-bold;
+    padding: 0.2em;
+    top: 1em;
+    background-color: #ffffffc7;
+    max-width: 90%;
+
+    .fas {
+        padding: 0.1em;
+        font-size: 0.8em;
+    }
+}
+
+
+//-- page
+.page {
+    & > .cover {
+        float: right;
+        max-width: 45%;
+    }
+
+    .header {
+        margin-bottom: 1.5em;
+    }
+
+    .headline {
+        font-size: 1.4em;
+        padding: 0.2em 0em;
+    }
+
+    p { padding: 0.4em 0em; }
+    hr { background-color: $grey-light; }
+
+    .page-content {
+        h1 { font-size: $size-1; font-weight: bolder; margin-top:0.4em; margin-bottom:0.2em; }
+        h2 { font-size: $size-3; font-weight: bolder; margin-top:0.4em; margin-bottom:0.2em; }
+        h3 { font-size: $size-4; font-weight: bolder; margin-top:0.4em; margin-bottom:0.2em; }
+        h4 { font-size: $size-5; font-weight: bolder; margin-top:0.4em; margin-bottom:0.2em; }
+        h5 { font-size: $size-6; font-weight: bolder; margin-top:0.4em; margin-bottom:0.2em; }
+        h6 { font-size: $size-6; margin-top:0.4em; margin-bottom:0.2em; }
+    }
+}
+
+
+.media.item .headline {
+    line-height: 1.2em;
+    max-height: calc(1.2em * 3);
+    overflow: hidden;
+
+    & + .headline-overflow {
+        position: relative;
+        width: 100%;
+        height: 2em;
+        margin-top: -2em;
+    }
+
+    & + .headline-overflow:before {
+        content:'';
+        width:100%;
+        height:100%;
+        position:absolute;
+        left:0;
+        bottom:0;
+        background:linear-gradient(transparent 1em, $body-background-color);
+    }
+}
+
+
+//-- player
+.player {
+    z-index: 10000;
+    box-shadow: 0em 1.5em 2.5em rgba(0, 0, 0, 0.6);
+
+    .player-panels {
+        height: 0%;
+        transition: height 3s;
+    }
+    .player-panels.is-open {
+        height: auto;
+    }
+
+    .player-panel {
+        margin: 0.4em;
+        max-height: 80%;
+        overflow-y: auto;
+    }
+
+    .progress {
+        margin: 0em;
+        padding: 0em;
+        border-color: $info;
+        border-style: 'solid';
+    }
+
+    .player-bar {
+        border-top: 1px $grey-light solid;
+
+        > div {
+            height: 3.75em !important;
+        }
+
+        > .media-left:not(:last-child) {
+            margin-right: 0em;
+        }
+
+        > .media-cover {
+            border-left: 1px black solid;
+        }
+
+        .cover {
+            font-size: 1.5rem !important;
+            height: 2.5em !important;
+        }
+
+        > .media-content {
+            padding-top: 0.4em;
+            padding-left: 0.4em;
+        }
+
+        .button {
+            font-size: 1.5rem !important;
+            height: 100%;
+            padding: auto 0.2em !important;
+            min-width: 2.5em;
+            border-radius: 0px;
+            transition: background-color 1s;
+        }
+
+        .title {
+            margin: 0em;
+        }
+    }
+
+}
+
+//-- media
+.media {
+    .subtitle {
+        margin-bottom: 0.4em;
+    }
+    .media-content .headline {
+        font-size: 1em;
+        font-weight: 400;
+    }
+}
+
+//-- general
+body {
+    background-color: $body-background-color;
+}
+
+section > .toolbar {
+    background-color: rgba(0,0,0,0.05);
+    padding: 1em;
+    margin-bottom: 1.5em;
+}
+
+
+main {
+    .cover.is-small { width: 10em; }
+    .cover.is-tiny { height: 2em; }
+}
+
+
+aside {
+    & > section {
+        margin-bottom: 2em;
+    }
+
+    .cover.is-small { width: 10em; }
+    .cover.is-tiny { height: 2em; }
+
+    .media .subtitle {
+        font-size: 1em;
+    }
+}
+
+.sound-item {
+    .cover { height: 5em; }
+    .media-content a { padding: 0em; }
+    margin-bottom: 0.2em;
+}
+.sound-item .media-right .button {
+    margin-right: 0.2em;
+    min-width: 2.5em;
+    display: inline-block;
+}
+
+
+.timetable {
+    width: 100%;
+    border: none;
+}

assets/src/assets/vars.scss

@@ -1,53 +0,0 @@
-@charset "utf-8";
-
-$black: #000;
-$white: #fff;
-$red: #e00;
-$red-dark: #b00;
-$green: #0e0;
-$green-dark: #0b0;
-$grey-light: #ddd;
-
-$mp-1: 0.2rem;
-$mp-1e: 0.2em;
-$mp-2: 0.4rem;
-$mp-2e: 0.4em;
-$mp-3: 0.6rem;
-$mp-3e: 0.6em;
-$mp-4: 1.2rem;
-$mp-4e: 1.2em;
-$mp-5: 1.6rem;
-$mp-5e: 1.6em;
-$mp-6: 2rem;
-$mp-6e: 2em;
-$mp-7: 4rem;
-$mp-7e: 4em;
-
-$text-size-small: 0.6rem;
-$text-size-smaller: 0.8rem;
-$text-size: 1rem;
-$text-size-2: 1.2rem;
-$text-size-medium: 1.4rem;
-$text-size-bigger: 1.6rem;
-$text-size-big: 2rem;
-
-$h1-size: 40px;
-$h2-size: 32px;
-$h3-size: 28px;
-$h4-size: 24px;
-$h5-size: 20px;
-$h6-size: 14px;
-
-$weight-light: 100;
-$weight-lighter: 300;
-$weight-normal: 400;
-$weight-bolder: 500;
-$weight-bold: 700;
-
-$screen-very-small: 400px;
-//TODO: switch small & smaller
-$screen-small: 600px;
-$screen-smaller: 800px;
-$screen-normal: 1024px;
-$screen-wider: 1280px;
-$screen-wide: 1380px;

assets/src/assets/vendor.scss

@@ -1,32 +0,0 @@
-@import 'v-calendar/style.css';
-
-// ---- bulma
-$body-color: #000;
-$title-color: #000;
-
-
-@import "~bulma/sass/utilities/_all.sass";
-
-
-@import "~bulma/sass/base/_all";
-@import "~bulma/sass/components/dropdown";
-@import "~bulma/sass/components/media";
-@import "~bulma/sass/components/message";
-@import "~bulma/sass/components/modal";
-//@import "~bulma/sass/components/pagination";
-
-@import "~bulma/sass/form/_all";
-@import "~bulma/sass/grid/_all";
-@import "~bulma/sass/helpers/_all";
-@import "~bulma/sass/layout/_all";
-@import "~bulma/sass/elements/box";
-// @import "~bulma/sass/elements/button";
-@import "~bulma/sass/elements/container";
-@import "~bulma/sass/elements/content";
-@import "~bulma/sass/elements/icon";
-// @import "~bulma/sass/elements/image";
-// @import "~bulma/sass/elements/notification";
-// @import "~bulma/sass/elements/progress";
-@import "~bulma/sass/elements/table";
-@import "~bulma/sass/elements/tag";
-//@import "~bulma/sass/elements/title";

assets/src/components/ACarousel.vue

@@ -1,198 +0,0 @@
-<template>
-   <section class="a-carousel">
-        <nav class="a-carousel-button-container" v-if="showPrevButton">
-            <button :class="[buttonClass, 'prev']" aria-label="Go left" @click="prev">
-                <span class="icon">
-                    <i :class="leftButtonIcon"></i>
-                </span>
-            </button>
-        </nav>
-        <div class="a-carousel-button-container" v-if="showNextButton">
-            <button :class="[buttonClass, 'next']" aria-label="Go left" @click="next">
-                <span class="icon">
-                    <i :class="rightButtonIcon"></i>
-                </span>
-            </button>
-        </div>
-        <nav ref="viewport" class="a-carousel-viewport">
-            <section ref="container" :class="['a-carousel-container', containerClass]">
-                <slot name="default"></slot>
-            </section>
-        </nav>
-    </section>
-</template>
-<style scoped>
-.a-carousel {
-    width: 100%;
-    position: relative;
-}
-
-.a-carousel-viewport {
-    width: 100%;
-    overflow: hidden;
-}
-
-.a-carousel-container {
-    display: flex;
-    flex-direction: row;
-    align-items: left;
-}
-
-.a-carousel-container > * {
-    flex-shrink: 0;
-}
-
-</style>
-<script>
-import {ref} from 'vue'
-
-export default {
-    setup() {
-        return {
-            viewport: ref(null),
-            container: ref(null),
-        }
-    },
-
-    data() {
-        return {
-            cards: [],
-            index: 0,
-            refresh_: 0,
-        }
-    },
-
-    props: {
-        cardSelector: {type: String, default: ''},
-        containerClass: {type: String, default: ''},
-        buttonClass: {type: String, default: 'button'},
-        leftButtonIcon: {type: String, default: "fas fa-chevron-left"},
-        rightButtonIcon: {type: String, default: "fas fa-chevron-right"},
-    },
-
-    computed: {
-        card() { return this.cards()[this.index] },
-        showPrevButton() {
-            return this.index > 0
-        },
-        showNextButton() {
-            if(!this.cards || this.cards.length <= 1)
-                return false
-
-            let { count } = this.visibility
-            return (this.index + count) < this.cards.length
-        },
-
-        visibility() {
-            // force refresh on index
-            [this.index, this.refresh_]
-
-            if(!this.cards)
-                return {min: -1, max: -1, count: 0};
-
-            const vOff = this.offset(this.$refs.viewport)
-            var [min, max] = [-1, -1]
-            for(let at=0; at < this.cards.length; at++) {
-                const card = this.cards[at]
-                const cOff = this.offset(card)
-                const visible = vOff.min <= cOff.min && vOff.max >= cOff.max
-                if(visible) {
-                    if(min === -1)
-                        min = parseInt(at)
-                    max = parseInt(at)
-                }
-            }
-            if(max !== -1)
-                max++
-            return {
-                min, max,
-                count: (min !== -1) ? max-min : 0
-            }
-        },
-    },
-
-    methods: {
-        offset(el, parent=null) {
-            const rect = el.getBoundingClientRect()
-            const off = {min: rect.left, max: rect.right  }
-            if(parent === null)
-                return off
-
-            const pOff = this.offset(parent)
-            return {
-                min: off.min - pOff.min,
-                max: off.max - pOff.max,
-            }
-        },
-
-        getCards() {
-            if(!this.$refs.container)
-                return []
-            if(!this.cardSelector)
-                return this.$refs.container.children
-            return this.$refs.container.querySelectorAll(this.cardSelector)
-        },
-
-        selectIndex(index, relative=false) {
-            if(relative)
-                index = this.index + index
-
-            index = Math.min(this.cards.length, index)
-            const el = this.cards[index]
-            if(!el)
-                return null;
-            const elOff = this.offset(el, this.$refs.container)
-            this.$refs.container.style.marginLeft = `-${elOff.min}px`
-            this.index = index;
-            return el
-        },
-
-        next() {
-            this.refresh_++
-
-            if(!this.visibility.count)
-                return
-            let {count} = this.visibility
-            let at = Math.min(
-                count === 1 ? this.index+count : this.index+count-1,
-                this.cards.length-count
-            )
-            this.selectIndex(at)
-        },
-
-        prev() {
-            this.refresh_++
-
-            if(!this.visibility.count)
-                return
-            const {min, count} = this.visibility
-            let at = Math.max(0, min-count)
-            if(min < 0 || count <= 0)
-                return
-            this.selectIndex(at)
-        },
-
-        refresh() {
-            this.cards = this.getCards()
-            this.selectIndex(this.index)
-            this.refresh_++
-        }
-    },
-
-
-    mounted() {
-        this.observers = [
-            new MutationObserver(() => this.refresh()),
-            new ResizeObserver(() => this.refresh())
-        ]
-        this.observers[0].observe(this.$refs.container, {"childList": true})
-        this.observers[1].observe(this.$refs.container)
-        this.refresh()
-    },
-
-    unmounted() {
-        for(var observer of this.observers)
-            observer.disconnect()
-    }
-}
-</script>