Mercurial > public > madeira

changeset 105:afcbfe23f068

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bootstrap: videos updated.
author Brian Neal <bgneal@gmail.com>
date Thu, 17 Oct 2013 21:19:54 -0500
parents 82cda945e87d
children 846cda22d77c
files madeira/templates/core/navbar_tag.html madeira/templates/videos/collection_detail.html madeira/templates/videos/collection_list.html
diffstat 3 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/madeira/templates/core/navbar_tag.html	Thu Oct 17 20:34:42 2013 -0500
+++ b/madeira/templates/core/navbar_tag.html	Thu Oct 17 21:19:54 2013 -0500
@@ -26,7 +26,7 @@
                </ul>
             </li>
             <li><a href="{% url 'band-bio' %}">Bio</a></li>
-            <li class="dropdown{% if active_tab == "photos" or active_tab == "songs" or active_tab == "videos" %} active"{% endif %}">
+            <li class="dropdown{% if active_tab == "photos" or active_tab == "songs" or active_tab == "videos" %} active{% endif %}">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Media <b class="caret"></b></a>
                <ul class="dropdown-menu">
                   <li{% if active_tab == "photos" %} class="active"{% endif %}><a href="{% url 'band-photo_index' %}">Photos</a></li>
--- a/madeira/templates/videos/collection_detail.html	Thu Oct 17 20:34:42 2013 -0500
+++ b/madeira/templates/videos/collection_detail.html	Thu Oct 17 21:19:54 2013 -0500
@@ -1,19 +1,20 @@
 {% extends 'base.html' %}
+{% load core_tags %}
 {% block title %}The Madeira | Videos: {{ collection.title }}{% endblock %}
+{% block navblock %}{% navbar 'videos' %}{% endblock %}
 {% block content %}
 <h1>Madeira Videos: {{ collection.title }}</h1>
 <div>
 {{ collection.description|safe }}
 </div>
 
-<div align="center">
-<table cellspacing="3" cellpadding="2" border="0">
 {% for video in collection.video_set.all %}
-   <tr><th>{{ video.title }}</th><td>{{ video.embed_code|safe }}</td></tr>
+   <h2>{{ video.title }}</h2>
+   <div>{{ video.embed_code|safe }}</div>
 {% endfor %}
-</table>
-</div>
-<br />
-<center><a href="{% url 'videos-index' %}">Back to videos index</a></center>
-
+<hr>
+<p>
+<span class="glyphicon glyphicon-arrow-left"></span>
+<a href="{% url 'videos-index' %}">Back to videos index</a>
+</p>
 {% endblock %}
--- a/madeira/templates/videos/collection_list.html	Thu Oct 17 20:34:42 2013 -0500
+++ b/madeira/templates/videos/collection_list.html	Thu Oct 17 21:19:54 2013 -0500
@@ -1,5 +1,7 @@
 {% extends 'base.html' %}
+{% load core_tags %}
 {% block title %}The Madeira | Videos{% endblock %}
+{% block navblock %}{% navbar 'videos' %}{% endblock %}
 {% block content %}
 <h1>Madeira Videos</h1>
 <p>