Previous diffusions; website styles; small templates change; VerboseFrequency

This commit is contained in:
bkfox
2015-10-13 16:04:36 +02:00
parent 0032e216b8
commit c69ef73a94
8 changed files with 117 additions and 63 deletions

View File

@ -2,6 +2,7 @@
body {
background-color: #F2F2F2;
font-family: "Myriad Pro",Calibri,Helvetica,Arial,sans-serif;
margin: 0 3em;
}
@ -11,7 +12,7 @@ h1, h2, h3 {
time {
font-size: 0.9em;
color: #616161;
color: #818181;
}
a {
@ -24,15 +25,15 @@ a:hover {
}
nav.menu {
/** Menu **/
.menu {
padding: 0.5em;
}
nav.menu_top {
.menu_top {
background-color: #212121;
color: #007EDF;
font-size: 1.1em;
box-shadow: 0em 0.2em 0.5em 0.1em black
}
@ -54,6 +55,31 @@ nav.menu {
z-index: -1;
}
.menu h1 {
font-size: 1.1em;
}
.menu .post_list {
font-size: 0.9em;
}
.menu .post_list h3 {
font-size: 1.0em;
display: inline;
}
.menu .post_list time {
margin: 0.2em;
}
/** Page **/
.page-container {
box-shadow: 0em 0.2em 0.5em 0.1em black;
margin-bottom: 2em;
}
.page {
width: 100%;
padding: 1.5em 0em;
@ -66,28 +92,28 @@ nav.menu {
}
.post_list {
main .post_list {
background-color: #F2F2F2;
box-shadow: inset 0.2em 0.2em 0.2em 0.01em black;
border: 1px #818181 dotted;
}
.post_list .post_item {
main .post_list .post_item {
min-height: 64px;
padding: 0.2em;
}
.post_list .post_item:hover {
main .post_list .post_item:hover {
}
.post_list h3 {
main .post_list h3 {
margin: 0.2em;
}
.post_list time {
main .post_list time {
float: right;
}
.post_list img {
main .post_list img {
float: left;
margin-right: 0.5em;
}

View File

@ -25,14 +25,15 @@ website = Website(
Menu(
position = 'top',
sections = [
Section(content = "Radio Campus le SITE")
Section(content = "Radio Campus le SITE"),
]
),
Menu(
position = 'left',
sections = [
Section(content = 'loool<br>blob')
Section(content = 'loool<br>blob'),
PreviousDiffusions(),
],
),
],

View File

@ -3,6 +3,7 @@ from django.template.loader import render_to_string
from django.views.generic import ListView
from django.views.generic import DetailView
from django.core import serializers
from django.utils import timezone as tz
from django.utils.translation import ugettext as _, ugettext_lazy
import aircox_programs.models as programs
@ -11,7 +12,6 @@ from aircox_cms.views import Sections
from website.models import *
class PlayListSection (Sections.List):
title = _('Playlist')
@ -22,7 +22,6 @@ class PlayListSection (Sections.List):
return [ Sections.List.Item(None, track.title, track.artist)
for track in tracks ]
class ScheduleSection (Sections.List):
title = _('Schedule')
@ -36,11 +35,34 @@ class ScheduleSection (Sections.List):
for sched in scheds
]
class EpisodesSection (Sections.Posts):
title = _('Episodes')
def get_object_list (self):
return Episode.objects.filter(related__program = self.object.pk)
return Episode.objects.filter(related__program = self.object.related.pk)
class PreviousDiffusions (Sections.Posts):
title = _('Previous Diffusions')
fields = ['title', 'time']
def get_object_list (self):
diffusions = programs.Diffusion.objects\
.filter(date__lt = tz.datetime.now())
episodes = []
for diffusion in diffusions:
if not diffusion.episode:
continue
post = Episode.objects.filter(related = diffusion.episode.pk)
if not post:
continue
post = post[0]
post.date = diffusion.date
episodes.append(post)
if len(episodes) == self.paginate_by:
break
return episodes