summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorluxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f <luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f>2010-06-27 16:38:35 +0000
committerluxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f <luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f>2010-06-27 16:38:35 +0000
commit0d6f39f2aa7c3922c6a696b0a8b3a2e72b475c45 (patch)
treeac95e888409af8157da4154df60d1c0e391fcb6b /templates
parent514a1c9a35b7699d8b1738887a9e076d29a0743c (diff)
fixed some bugs and enabled the navigation buttons on the gallery slideshows
Diffstat (limited to 'templates')
-rw-r--r--templates/details/entry.html2
-rw-r--r--templates/details/photo_galleries.html13
2 files changed, 11 insertions, 4 deletions
diff --git a/templates/details/entry.html b/templates/details/entry.html
index db378a7..283c6af 100644
--- a/templates/details/entry.html
+++ b/templates/details/entry.html
@@ -44,7 +44,7 @@
{%if object.template_name == 3 %}<div class="clearfix"></div>{%endif%}
<section id="post-metadata">
<h4 class="hide">About {{object.title|smartypants|safe}}</h4>
- <p>Posted <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time>, from {{object.location.name|smartypants|safe}}, {%if object.location.state.country.name == 'United States'%}<a href="/maps/#{{object.location.state.slug}}" title="see other entries from {{object.location.state.name}}">{{object.location.state.name|smartypants|safe}}</a>{% else %}{{object.location.state.country.name}}{%endif%}.
+ <p>Posted <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time>, from {{object.location.name|smartypants|safe}}, {%if object.location.state.country.name == 'United States'%}<a href="/map/#{{object.location.state.country.slug}}" title="see other entries from {{object.location.state.name}}">{{object.location.state.name|smartypants|safe}}</a>{% else %}<a href="/map/#{{object.location.state.country.slug}}" title="view all entries from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endif%}.
Follow along on <a href="http://twitter.com/luxagraf" title="twitter" rel="me">Twitter</a> or by subscribing to the <a href="http://feeds.feedburner.com/luxagraf/blog" title="writing RSS 2.0 feed">RSS Feed</a>. For more about me, see the <a href="/about/" title="about luxagraf">about page</a>. To get in touch please use the <a href="/contact/" title="contact me">contact form</a> or leave a comment below.</p>
</section>
<section id="page-navigation">
diff --git a/templates/details/photo_galleries.html b/templates/details/photo_galleries.html
index 41a5976..a823d20 100644
--- a/templates/details/photo_galleries.html
+++ b/templates/details/photo_galleries.html
@@ -41,10 +41,9 @@
<script type="text/javascript" src="/media/js/jquery.js"></script>
<script type="text/javascript" src="/media/js/jquery.cycle.pack.js"></script>
<script type="text/javascript" src="/media/js/jquery.jcarousel.pack.js"></script>
- <script type="text/javascript" src="/media/js/slideshow.pack.js" ></script>
+ <script type="text/javascript" src="/media/js/slideshow.js" ></script>
<!-- if you'd like to see a non-packed version of my slideshow script, see this file: http://media.luxagraf.net/js/slideshow.js (requires jquery, jcarousel and cycle) -->
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-
</head>
<body>
<div id="wrapper">
@@ -53,11 +52,19 @@
<li><a href="/photos/" title="luxagraf photos">Photos</a> &rarr; </li>
<li>{{object.set_title}}</li>
</ul>
+ <div id="slideshow-controls">
+ <ul>
+ <li><a id="prev" href="#"> &larr; Previous</a></li>
+ <li><a id="play" href="#">▶</a></li>
+ <li><a id="next" href="#">Next &rarr;</a></li>
+ </ul>
+ </div>
+
<ul id="instructions">
<li>Hover image to pause,</li>
<li> &nbsp;&larr; &amp; &rarr; to navigate</li>
</ul>
-
+
<ul id="slides">
{%for photo in object.photos.all reversed %}
<li class="bigimg" id="{{photo.get_local_slideshow_url}}" style="height: {{photo.slideshowimage_height}}px; width:{{photo.slideshowimage_width}}px; margin-top:{{photo.slideshowimage_margintop}}px; margin-left:{{photo.slideshowimage_marginleft}}px;">