summaryrefslogtreecommitdiff
path: root/design
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2014-05-01 01:18:37 +0000
committerluxagraf <sng@luxagraf.net>2014-05-01 01:18:37 +0000
commit63662145af4487bc026e6cd906766a95817d46fb (patch)
tree8807cfb2559ea9d22043bc833492101fcb2aa9cb /design
parent79b3268e10706e1ea14d7ba1275a9744ce51cd3a (diff)
fixed Flickr issues and photo template settings
Diffstat (limited to 'design')
-rw-r--r--design/templates/admin/buttons.html1
-rw-r--r--design/templates/archives/writing_date.html26
-rw-r--r--design/templates/details/entry.html2
-rw-r--r--design/templates/details/gifs.html4
-rw-r--r--design/templates/details/photo_galleries.html2
5 files changed, 5 insertions, 30 deletions
diff --git a/design/templates/admin/buttons.html b/design/templates/admin/buttons.html
index 9bd6f00..d3a120f 100644
--- a/design/templates/admin/buttons.html
+++ b/design/templates/admin/buttons.html
@@ -50,6 +50,7 @@
<li class="item"><a href="/admin/build/build?id=feed">Build RSS Feed</a></li>
<li class="item"><a href="/admin/build/build?id=sitemap">Build Sitemap</a></li>
<li class="item"><a href="/admin/build/build?id=all">Build Entire Site</a></li>
+ <li class="item"><a href="/admin/build/build?id=scrapeflickr">Scrape Flickr</a></li>
</ul>
</div>
</div>
diff --git a/design/templates/archives/writing_date.html b/design/templates/archives/writing_date.html
deleted file mode 100644
index 67144b3..0000000
--- a/design/templates/archives/writing_date.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify %}
-{% load html5_datetime %}
-{% block pagetitle %}{{block.super}}: Archive{% endblock %}
-{% block bodyid %}id="archive"{%endblock%}
-{% block primary %}
-<p>How did you get here? You URL chopping maniac you. Right on.</p>
-
-<h1>{% if type == 'year' %}{{date}}, on luxagraf{%else%} Archive: {{date}} {% endif %}</h1>{% if type == 'year' %}
- <ul class="archive">{% regroup object_list by pub_date.month as entries_by_month %}{% for entries in entries_by_month %}
- <li><span>{{ entries.list.0.pub_date|date:"F Y" }}</span>
- <ul>{% for post in entries.list %}
- <li>
- <a href="{{post.get_absolute_url}}" title="{{post.title}}">{{post.title|smartypants|widont|safe }}</a>
- <time datetime="{{post.pub_date|html5_datetime}}">{{post.pub_date|date:"M d, Y"}}</time>
- </li> {% endfor %}
- </ul>
- </li>{% endfor %}
- </ul>{% else %}
- <ul class="archive">{% for post in object_list %}
- <li><a href="{{post.get_absolute_url}}" title="{{post.title}}">{{post.title|smartypants|widont|safe }}</a>
- <time datetime="{{post.pub_date|html5_datetime}}">{{post.pub_date|date:"M d, Y"}}</time>
- </li> {% endfor %}
- </ul>
- {% endif %}
-{% endblock%}
diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index bc23646..5784831 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -1,7 +1,7 @@
{% extends 'base.html' %}
{% load typogrify %}
-{% block pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}){% endblock %}
+{% block pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Writing{%comment%}{% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}{%endcomment%}{% endblock %}
{% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
{%block extrahead%}
diff --git a/design/templates/details/gifs.html b/design/templates/details/gifs.html
index 7dd8208..5519a89 100644
--- a/design/templates/details/gifs.html
+++ b/design/templates/details/gifs.html
@@ -74,10 +74,10 @@
</script>
</head>
<body id="home">
-<audio id="snd" preload="auto" loop autoplay autobuffer>
+{%if object.music_ogg %}<audio id="snd" preload="auto" loop autoplay autobuffer>
<source src="{{object.music_ogg.url}}" type="video/ogg"/>
<source src="{{object.music_mp3.url}}" />
-</audio>
+</audio>{%endif%}
<img id="giffy" src="{{object.gif.url}}" alt="{{object.title}}" />
</body>
</html>
diff --git a/design/templates/details/photo_galleries.html b/design/templates/details/photo_galleries.html
index a7eed95..cdaf2c2 100644
--- a/design/templates/details/photo_galleries.html
+++ b/design/templates/details/photo_galleries.html
@@ -6,7 +6,7 @@
{%block htmlclass%}class="black"{%endblock%}
-{% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
+{% block metadescription %}{{object.set_desc|truncatewords:30|smartypants|safe}}{% endblock %}
{%block bodyid%}class="image_gallery"{%endblock%}