From 54611a97d636238e9bba65e6d96690ac1446de09 Mon Sep 17 00:00:00 2001 From: Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> Date: Wed, 6 Jan 2016 19:59:46 +0100 Subject: renamed model field diff --git a/program/migrations/0002_host_always_visible.py b/program/migrations/0002_host_always_visible.py deleted file mode 100644 index a0f81ab..0000000 --- a/program/migrations/0002_host_always_visible.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('program', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='host', - name='always_visible', - field=models.BooleanField(default=False, verbose_name='Always visible'), - ), - ] diff --git a/program/migrations/0002_host_is_always_visible.py b/program/migrations/0002_host_is_always_visible.py new file mode 100644 index 0000000..9abf2bd --- /dev/null +++ b/program/migrations/0002_host_is_always_visible.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('program', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='host', + name='is_always_visible', + field=models.BooleanField(default=False, verbose_name='Is always visible'), + ), + ] diff --git a/program/templates/boxes/recommendation.html b/program/templates/boxes/recommendation.html new file mode 100644 index 0000000..d2bb7d2 --- /dev/null +++ b/program/templates/boxes/recommendation.html @@ -0,0 +1,40 @@ +<!doctype html> +<html> +<head> + <meta charset="utf-8"/> + <title>Recomendations box</title> +</head> +<body> + {% if recommendation_list %} + <dl id="recommendations" class="portlet program-box"> + <dt class="portletHeader">Programmhinweise</dt> + <dd class="portletItem"> + <table> + {% for item in recommendation_list %} + <tr> + <td class="start"> </td> + <td class="format bf-{{ item.show.broadcastformat.slug }}" + title="{{ item.show.broadcastformat.format }}"> </td> + <td class="show"> + {{ item.start|date:"d.m. H:i" }} - + {{ item.end|date:"H:i" }}<br /> + <h3> + <a href="{% url "timeslot-detail" item.id %}">{{ item.show.name }}</a> + </h3> + <p class="note-title"> + {% if item.note %} + {{ item.note.title }}<br /> + {% else %} + {{ item.show.broadcastformat.format }}<br /> + {% endif %} + <a href="{% url "timeslot-detail" item.id %}">[weiter]</a> + </p> + </td> + </tr> + {% endfor %} + </table> + </dd> + </dl> + {% endif %} +</body> +</html> diff --git a/program/templates/boxes/recommendations.html b/program/templates/boxes/recommendations.html deleted file mode 100644 index 2174654..0000000 --- a/program/templates/boxes/recommendations.html +++ /dev/null @@ -1,40 +0,0 @@ -<!doctype html> -<html> -<head> - <meta charset="utf-8"/> - <title>Recomendations box</title> -</head> -<body> - {% if recommendation_list %} - <dl id="recommendations" class="portlet program-box"> - <dt class="portletHeader">Programmhinweise</dt> - <dd class="portletItem"> - <table> - {% for item in recommendation_list %} - <tr> - <td class="start"> </td> - <td class="format bf-{{ item.show.broadcastformat.slug }}" - title="{{ item.show.broadcastformat.format }}"> </td> - <td class="show"> - {{ item.start|date:"d.m. H:i" }} - - {{ item.end|date:"H:i" }}<br /> - <h3> - <a href="{% url timeslot-detail item.id %}">{{ item.show.name }}</a> - </h3> - <p class="note-title"> - {% if item.note %} - {{ item.note.title }}<br /> - {% else %} - {{ item.show.broadcastformat.format }}<br /> - {% endif %} - <a href="{% url timeslot-detail item.id %}">[weiter]</a> - </p> - </td> - </tr> - {% endfor %} - </table> - </dd> - </dl> - {% endif %} -</body> -</html> diff --git a/program/templates/recommendation_list.html b/program/templates/recommendation_list.html new file mode 100644 index 0000000..3836a35 --- /dev/null +++ b/program/templates/recommendation_list.html @@ -0,0 +1,45 @@ +<html> +<head> + <title>Tipps — Radio Helsinki - Freies Radio Graz</title> +</head> +<body> + +<div id="content-main" class="recommendations"> + <h1>Programmhinweise</h1> + <div id="shows"> +{% for recommendation in recommendation_list %} + <div class="show recommendation bf-{{ recommendation.show.broadcastformat.slug }}"> + <div class="show-abbrevs"> + {% for si in recommendation.show.showinformation.all %} + <span title="{{ si.information }}" class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span> + {% endfor %} + {% for st in recommendation.show.showtopic.all %} + <span title="{{ st.topic }}" class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span> + {% endfor %} + {% for mf in recommendation.show.musicfocus.all %} + <span title="{{ mf.focus }}" class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span> + {% endfor %} + </div> + <div class="show-detail"> + <h4> + <a href="{% url "show-detail" recommendation.show.slug %}">{{ recommendation.show.name }}</a><br /> + vom {{ recommendation.start|date:"d.m. H:i" }}-{{ recommendation.end|date:"H:i" }} + </h4> + {% if recommendation.note %} + <h3 class="show-title"> + <a href="{% url "timeslot-detail" recommendation.id %}">{{ recommendation.note.title }}</a> + </h3> + <div class="note-content">{{ recommendation.note.content|safe}}</div> + {% else %} + <h3 class="show-title"> + <a href="{% url "timeslot-detail" recommendation.id %}">{{ recommendation.show.broadcastformat.format }}</a> + </h3> + {% endif %} + </div> + </div> +{% endfor %} + </div> +</div> + +</body> +</html> diff --git a/program/templates/recommendations.html b/program/templates/recommendations.html deleted file mode 100644 index ba9a719..0000000 --- a/program/templates/recommendations.html +++ /dev/null @@ -1,45 +0,0 @@ -<html> -<head> - <title>Tipps — Radio Helsinki - Freies Radio Graz</title> -</head> -<body> - -<div id="content-main" class="recommendations"> - <h1>Programmhinweise</h1> - <div id="shows"> -{% for item in recommendation_list %} - <div class="show recommendation bf-{{ item.show.broadcastformat.slug }}"> - <div class="show-abbrevs"> - {% for ab in item.show.showinformation.all %} - <span title="{{ab.information}}" class="abbrev si-{{ ab.abbrev }}"><span>{{ ab.abbrev }}</span></span> - {% endfor %} - {% for ab in item.show.showtopic.all %} - <span title="{{ab.topic}}" class="abbrev st-{{ ab.abbrev }}"><span>{{ ab.abbrev }}</span></span> - {% endfor %} - {% for ab in item.show.musicfocus.all %} - <span title="{{ab.focus}}" class="abbrev mf-{{ ab.abbrev }}"><span>{{ ab.abbrev }}</span></span> - {% endfor %} - </div> - <div class="show-detail"> - <h4> - <a href="{% url show-detail item.show.slug %}">{{ item.show.name }}</a><br /> - vom {{ item.start|date:"d.m. H:i" }}-{{ item.end|date:"H:i" }} - </h4> - {% if item.note %} - <h3 class="show-title"> - <a href="{% url timeslot-detail item.id %}">{{ item.note.title }}</a> - </h3> - <div class="note-content">{{ item.note.content|safe}}</div> - {% else %} - <h3 class="show-title"> - <a href="{% url timeslot-detail item.id %}">{{ item.show.broadcastformat.format }}</a> - </h3> - {% endif %} - </div> - </div> -{% endfor %} - </div> -</div> - -</body> -</html> -- cgit v0.10.2