diff options
| author | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2016-01-06 18:59:46 (GMT) |
|---|---|---|
| committer | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2016-01-06 18:59:46 (GMT) |
| commit | 54611a97d636238e9bba65e6d96690ac1446de09 (patch) | |
| tree | 95e079cd3ccc5dd0eebcdcd2af0502729b1bba91 | |
| parent | 35bf6baf07aeca3b1ea085939b60497e10c9a71f (diff) | |
renamed model field
| -rw-r--r-- | program/migrations/0002_host_is_always_visible.py (renamed from program/migrations/0002_host_always_visible.py) | 4 | ||||
| -rw-r--r-- | program/templates/boxes/recommendation.html (renamed from program/templates/boxes/recommendations.html) | 4 | ||||
| -rw-r--r-- | program/templates/recommendation_list.html | 45 | ||||
| -rw-r--r-- | program/templates/recommendations.html | 45 |
4 files changed, 49 insertions, 49 deletions
diff --git a/program/migrations/0002_host_always_visible.py b/program/migrations/0002_host_is_always_visible.py index a0f81ab..9abf2bd 100644 --- a/program/migrations/0002_host_always_visible.py +++ b/program/migrations/0002_host_is_always_visible.py @@ -13,7 +13,7 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( model_name='host', - name='always_visible', - field=models.BooleanField(default=False, verbose_name='Always visible'), + name='is_always_visible', + field=models.BooleanField(default=False, verbose_name='Is always visible'), ), ] diff --git a/program/templates/boxes/recommendations.html b/program/templates/boxes/recommendation.html index 2174654..d2bb7d2 100644 --- a/program/templates/boxes/recommendations.html +++ b/program/templates/boxes/recommendation.html @@ -19,7 +19,7 @@ {{ 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> + <a href="{% url "timeslot-detail" item.id %}">{{ item.show.name }}</a> </h3> <p class="note-title"> {% if item.note %} @@ -27,7 +27,7 @@ {% else %} {{ item.show.broadcastformat.format }}<br /> {% endif %} - <a href="{% url timeslot-detail item.id %}">[weiter]</a> + <a href="{% url "timeslot-detail" item.id %}">[weiter]</a> </p> </td> </tr> 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> |