Merge branch 'master' of ssh://luxagraf:/home/lxf/git/luxagraf

2 files changed, 43 insertions, 1 deletions

diff --git a/design/templates/archives/src_books.html b/design/templates/archives/src_books.html
index 1100750..f15d9ab 100644
--- a/design/templates/archives/src_books.html
+++ b/design/templates/archives/src_books.html
@@ -12,7 +12,7 @@
         <h1 class="hide">Books</h1>
        <div class="book-list"> {% for object in object_list %}
             <article class="book-list-item {% cycle "odd" "even" %} {% cycle "uno" "dos" "tres" %}" itemscope itemtype="http://schema.org/Book">
-                {% if object.image %}<div class="img-wrapper"><a href="{{object.get_absolute_url}}"><img itemprop="image" src="{{object.image.url}}" alt="cover art for {{object.title}}"/></a></div>{%endif%}
+                {% if object.image %}<div class="img-wrapper"><a href="{{object.get_absolute_url}}"><img itemprop="image" src="{{object.get_image_url}}" alt="cover art for {{object.title}}"/></a></div>{%endif%}
             <h2 itemprop="name"><a href="{{object.get_absolute_url}}">{{object.title|amp|smartypants|widont|safe}}</a></h2>
         </article>
         {% endfor %}</div>
diff --git a/design/templates/details/elliottvideos.html b/design/templates/details/elliottvideos.html
new file mode 100644
index 0000000..a91136c
--- /dev/null
+++ b/design/templates/details/elliottvideos.html
@@ -0,0 +1,42 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% block pagetitle %}Luxagraf | {{object.title}}{% endblock %}
+{% block extrahead %}
+<style>
+.vidwrap{
+    position: relative;
+    padding-bottom: 56.25%; /* 16:9 */
+    padding-top: 25px;
+    height: 0;
+}
+.vidwrap video,
+.vidwrap embed,  {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+
+@media only screen and (max-width : 960px) {
+    .vidwrap video {width: 100%;}
+}
+@media only screen and (min-width : 1024px) {}
+    .vidwrap video {max-width: 960px;}
+}
+
+</style>
+<meta name="robots" content="noindex, nofollow">
+{% endblock %}
+{% block metadescription %}{{object.metadescription}}{% endblock %}
+{%block htmlclass%}class="dark"{%endblock%}
+				
+{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+        <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
+        <li>{{object.title}}</li>
+    </ul>
+    <div role="main">
+        {{object.body_html|safe}}
+    </div>
+{% endblock %}