Minor fix for image info on main.

diff --git a/apps/social/templates/social/cite_info.html b/apps/social/templates/social/cite_info.html
index 4ee84d3..8f8e16d 100644 (file)
--- a/apps/social/templates/social/cite_info.html
+++ b/apps/social/templates/social/cite_info.html
@@ -4,15 +4,16 @@
     {% if cite.image_link %}<a href="{{ cite.image_link }}">{% endif %}
     {% if cite.image_title %}
         {{ cite.image_title }}{% else %}
     {% if cite.image_link %}<a href="{{ cite.image_link }}">{% endif %}
     {% if cite.image_title %}
         {{ cite.image_title }}{% else %}

-        untitled{% endif %}{% if cite.image_link %}</a>{% endif %},
-    {% if cite.image_author %}{{ cite.image_author }},{% endif %}
+       untitled{% endif %}{% if cite.image_link %}</a>{% endif %}{% if cite.image_author %}, 
+       {{ cite.image_author }}{% endif %}{% if cite.image_license %},

     {% if cite.image_license_link %}<a href="{{ cite.image_license_link }}">{% endif %}
     {{ cite.image_license }}
     {% if cite.image_license_link %}</a>{% endif %}
     {% if cite.image_license_link %}<a href="{{ cite.image_license_link }}">{% endif %}
     {{ cite.image_license }}
     {% if cite.image_license_link %}</a>{% endif %}

+    {% endif %}

 {% else %}
     <a href="http://www.flickr.com/photos/lou/430980641/">books about architecture</a>,
     saikofish@Flickr,
     <a href="http://creativecommons.org/licenses/by-nc-sa/2.0/">CC BY NC SA</a>.
 {% endif %}
 
 {% else %}
     <a href="http://www.flickr.com/photos/lou/430980641/">books about architecture</a>,
     saikofish@Flickr,
     <a href="http://creativecommons.org/licenses/by-nc-sa/2.0/">CC BY NC SA</a>.
 {% endif %}
 

-{% endspaceless %}
\ No newline at end of file
+{% endspaceless %}

diff --git a/apps/wolnelektury_core/templates/main_page.html b/apps/wolnelektury_core/templates/main_page.html
index 17dc2e6..f1450cb 100755 (executable)
--- a/apps/wolnelektury_core/templates/main_page.html
+++ b/apps/wolnelektury_core/templates/main_page.html
@@ -81,7 +81,7 @@
 
 {% block add_footer %}{% spaceless %}
 {{ cite_pk.if }}
 
 {% block add_footer %}{% spaceless %}
 {{ cite_pk.if }}

-    <p>{% trans "Image used:" %}</p>
+    <p>{% trans "Image used:" %}

     {% ssi_include 'social_cite_info' pk=cite_pk %}
     </p>
 {{ cite_pk.endif }}
     {% ssi_include 'social_cite_info' pk=cite_pk %}
     </p>
 {{ cite_pk.endif }}