Merge branch 'master' into sunburnt

[wolnelektury.git] / apps / wolnelektury_core / templates / main_page.html

diff --git a/apps/wolnelektury_core/templates/main_page.html b/apps/wolnelektury_core/templates/main_page.html
index 2947a2f..6b7c46a 100755 (executable)
--- a/apps/wolnelektury_core/templates/main_page.html
+++ b/apps/wolnelektury_core/templates/main_page.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

+{% load static from staticfiles %}

 {% load cache chunks i18n catalogue_tags infopages_tags social_tags %}
 
 
 {% load cache chunks i18n catalogue_tags infopages_tags social_tags %}
 
 


@@ -6,9 +7,12 @@
 {% block ogtitle %}{% trans "Wolne Lektury internet library" %}{% endblock %}
 
 {% block body %}
 {% block ogtitle %}{% trans "Wolne Lektury internet library" %}{% endblock %}
 
 {% block body %}

-
-    <div id="big-cite">
-        {% cite_promo %}
+    <div id="big-cite"{% if cite.image %}
+        style="
+            background-image: url('{{ cite.image.url }}');
+            background-position: 50% {{ cite.image_shift|default_if_none:50 }}%;
+        "{% endif %} >
+        {% render_cite cite %}

     </div>
 
     {% spaceless %}
     </div>
 
     {% spaceless %}


@@ -35,8 +39,9 @@
 
     <div class="infopages-box">
         <h2><span class='mono'>{% trans "News" %}</span></h2>
 
     <div class="infopages-box">
         <h2><span class='mono'>{% trans "News" %}</span></h2>

+       {# 135 is the id of new publications category of our master blog. perhaps this URL should go to settings. #}

         {% cache 1800 latest-blog-posts %}
         {% cache 1800 latest-blog-posts %}

-            {% latest_blog_posts "http://nowoczesnapolska.org.pl/category/wolne-lektury/feed/" %}
+            {% latest_blog_posts "http://nowoczesnapolska.org.pl/feed/?cat=-135" %}

         {% endcache %}
     </div>
 
         {% endcache %}
     </div>
 


@@ -47,7 +52,6 @@
         <ul>
             <li><a href="{% url suggest %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
             <!--li><a href="http://turniej.wolnelektury.pl">Turniej Elektrybałtów</a></li-->
         <ul>
             <li><a href="{% url suggest %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
             <!--li><a href="http://turniej.wolnelektury.pl">Turniej Elektrybałtów</a></li-->

-            <li><a href="{% url lesmianator %}">Leśmianator</a></li>

             <li><a href="{% url reporting_catalogue_pdf %}">
                        {% trans "Download the catalogue in PDF format." %}
                </a></li>
             <li><a href="{% url reporting_catalogue_pdf %}">
                        {% trans "Download the catalogue in PDF format." %}
                </a></li>


@@ -55,6 +59,10 @@
             <li><a href="{% url suggest_publishing %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
             <li><a href="{% url publish_plan %}">{% trans "Publishing plan" %}</a></li>
             <li><a href="{% url api %}">API</a></li>
             <li><a href="{% url suggest_publishing %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
             <li><a href="{% url publish_plan %}">{% trans "Publishing plan" %}</a></li>
             <li><a href="{% url api %}">API</a></li>

+            <li><a href="{% url oaipmh %}">OAI-PMH</a></li>
+            <li><a href="{% url lesmianator %}">Leśmianator</a></li>
+            <li><a href="http://polski.wolnelektury.pl">Materiały do nauki j. polskiego</a></li>
+            

         </ul>
     </div>
 
         </ul>
     </div>
 


@@ -67,9 +75,13 @@
 
         <div class="social-links">
             <a href="http://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268"
 
         <div class="social-links">
             <a href="http://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268"

-                title='Wolne Lektury @ Facebook'>f</a>
+                title='Wolne Lektury @ Facebook'>
+                <img src="{% static "img/social/f.png" %}" />
+            </a>

             <a href="http://nk.pl/profile/30441509"
             <a href="http://nk.pl/profile/30441509"

-                title='Wolne Lektury @ NK'>nk</a>
+                title='Wolne Lektury @ NK'>
+                <img src="{% static "img/social/nk.png" %}" />
+            </a>

         </div>
     </div>
 
         </div>
     </div>
 


@@ -81,8 +93,19 @@
 
 {% block add_footer %}
 <p>{% trans "Image used:" %} 
 
 {% block add_footer %}
 <p>{% trans "Image used:" %} 

-<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>.
+{% if cite.image %}
+    {% 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 %}
+    {% if cite.image_license_link %}<a href="{{ cite.image_license_link }}">{% endif %}
+    {{ cite.image_license }}
+    {% if cite.image_license_link %}</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 %}

 </p>
 {% endblock %}
 </p>
 {% endblock %}