summaryrefslogtreecommitdiff
path: root/design/templates
diff options
context:
space:
mode:
Diffstat (limited to 'design/templates')
-rw-r--r--design/templates/admin/insert_images.html24
-rwxr-xr-x[-rw-r--r--]design/templates/admin/links/link/change_form.html0
-rw-r--r--design/templates/details/resume.html2
3 files changed, 13 insertions, 13 deletions
diff --git a/design/templates/admin/insert_images.html b/design/templates/admin/insert_images.html
index f9a2fa6..4841f50 100644
--- a/design/templates/admin/insert_images.html
+++ b/design/templates/admin/insert_images.html
@@ -102,20 +102,20 @@ $(function(){
<button id="add_id_image" onClick="window.parent.open('/admin/photos/luximage/add/?_to_field=id&amp;_popup=1')">Upload Image
<img src="/static/admin/img/icon-addlink.svg" alt="Add">
</button>
- <div class="up-wrapper">{% for image in images %}
+ <div class="up-wrapper">{% for object in object_list %}
<div class="item-wrapper">
- <figure class="item" >
- <img src="{% get_image_by_size image 'tn' %}" />
- <figcaption>{{image.id}} - {{image.title}} {% if image.caption %}&ndash; {{image.caption}}{%endif%}</figcaption>
+ <figure class="item" >
+ <img src="{% if object.get_type == "LuxImage" %}{% get_image_by_size object 'tn' %}{%else%}{{object.video_poster.url}}{%endif%}" />
+ <figcaption>{{object.id}} - {{object.title}} {% if object.caption %}&ndash; {{object.caption}}{%endif%}</figcaption>
</figure>
- <ul class="actions">{%if image.is_video %}
- <li><a data-is-video="true" data-src="{{image.get_video_base_url}}" data-id="{{image.id}}" data-class="vid" class="insert" href="">Insert video</a>{%else%}
- <li><a data-src="{% get_image_by_size image 'admin_insert' %}" data-id="{{image.id}}" data-class="picwide" class="insert" href="">full width</a></li>
- <li><a data-src="{% get_image_by_size image 'admin_insert' %}" data-id="{{image.id}}" data-class="picfull" class="insert" href="">column width</a></li>
- <li><a data-src="{% get_image_by_size image 'admin_insert' %}" data-id="{{image.id}}" data-class="picwide" data-caption="true" class="insert" href="">full width cap</a></li>
- <li><a data-src="{% get_image_by_size image 'admin_insert' %}" data-id="{{image.id}}" data-class="picfull" data-caption="true" class="insert" href="">column width cap</a></li>
- <li><a data-src="{% get_image_by_size image 'admin_insert' %}" data-id="{{image.id}}" data-class="cluster pic" class="insert" href="">cluster</a></li>
- <li><a href="/admin/photos/luximage/{{image.pk}}/change/">Edit Image</a></li>{%endif%}
+ <ul class="actions">{%if object.get_type == "LuxVideo" %}
+ <li><a data-is-video="true" data-src="{{object.image.url}}" data-id="{{object.id}}" data-class="vid" class="insert" href="">Insert video</a>{%else%}
+ <li><a data-src="{% get_image_by_size object 'admin_insert' %}" data-id="{{object.id}}" data-class="picwide" class="insert" href="">full width</a></li>
+ <li><a data-src="{% get_image_by_size object 'admin_insert' %}" data-id="{{object.id}}" data-class="picfull" class="insert" href="">column width</a></li>
+ <li><a data-src="{% get_image_by_size object 'admin_insert' %}" data-id="{{object.id}}" data-class="picwide" data-caption="true" class="insert" href="">full width cap</a></li>
+ <li><a data-src="{% get_image_by_size object 'admin_insert' %}" data-id="{{object.id}}" data-class="picfull" data-caption="true" class="insert" href="">column width cap</a></li>
+ <li><a data-src="{% get_image_by_size object 'admin_insert' %}" data-id="{{object.id}}" data-class="cluster pic" class="insert" href="">cluster</a></li>
+ <li><a href="/admin/photos/luximage/{{object.pk}}/change/">Edit Image</a></li>{%endif%}
</ul>
</div>
{% endfor %}
diff --git a/design/templates/admin/links/link/change_form.html b/design/templates/admin/links/link/change_form.html
index aa1769f..aa1769f 100644..100755
--- a/design/templates/admin/links/link/change_form.html
+++ b/design/templates/admin/links/link/change_form.html
diff --git a/design/templates/details/resume.html b/design/templates/details/resume.html
index c36f986..5c47b2c 100644
--- a/design/templates/details/resume.html
+++ b/design/templates/details/resume.html
@@ -12,7 +12,7 @@
<main role="main">
<article role="main">
<h1>{{object.title|safe|smartypants|widont}}</h1>
- <p>This article was published in {{object.publisher}}, you can view <a href="{{object.url}}">the original</a> there, complete with graphics, comments and other fun stuff.</p>
+ <p><i>This article was published in {{object.publisher}}, you can view <a href="{{object.url}}">the original</a> there, complete with graphics, comments and other fun stuff.</i></p>
<div class="post--article" style="margin-top: 3em">
{{object.body_html|safe|smartypants|widont}}
</div>