fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 884be9d 76849e4)
Merge branch 'master' into rwd
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Fri, 10 Jan 2014 16:05:13 +0000 (17:05 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Fri, 10 Jan 2014 16:05:13 +0000 (17:05 +0100)
Conflicts:
apps/catalogue/templates/catalogue/book_short.html
apps/picture/templates/picture/picture_short.html
wolnelektury/settings/static.py

1  2 
apps/catalogue/models/book.py patch | diff1 | diff2 | blob | history
apps/catalogue/templates/catalogue/book_detail.html patch | diff1 | diff2 | blob | history
apps/catalogue/templates/catalogue/book_mini_box.html patch | diff1 | diff2 | blob | history
apps/catalogue/templates/catalogue/book_short.html patch | diff1 | diff2 | blob | history
apps/catalogue/templates/catalogue/viewer_base.html patch | diff1 | | blob | history

diff --cc apps/catalogue/models/book.py
Simple merge
diff --cc apps/catalogue/templates/catalogue/book_mini_box.html
index b5c7d97,74202fc..82038e7
--- 1/apps/catalogue/templates/catalogue/book_mini_box.html
--- 2/apps/catalogue/templates/catalogue/book_mini_box.html
+++ b/apps/catalogue/templates/catalogue/book_mini_box.html
@@@ -1,21 -1,9 +1,15 @@@
- {% load thumbnail %}
  <div class="book-mini-box">
 +    <div class="book-mini-box-inner">
 +    {% if with_link %}
      <a href="{{ book.get_absolute_url }}">
 +    {% endif %}
          {% if book.cover %}
-             <img src="
-                 {% thumbnail book.cover "139x193" as thumb %}
-                     {{ thumb.url }}
-                 {% empty %}
-                     {{ book.cover.url }}
-                 {% endthumbnail %}
-             " alt="{{ author_str }} – {{ book.title }}" class="cover" />
+             <img src="{{ book.cover_thumb.url }}"
+                 alt="{{ author_str }} – {{ book.title }}" class="cover" />
          {% endif %}
 +        {% if show_lang %}
 +            <span class="language" title="{{ book.language_name }}">{{ book.language_code }}</span>
 +        {% endif %}
          <div class="desc">
              <span class="mono author">{{ author_str }}</span>
              <span class="title">{{ book.title }}</span>
diff --cc apps/catalogue/templates/catalogue/book_short.html
index 98f9bf8,d697577..5757c6a
--- 1/apps/catalogue/templates/catalogue/book_short.html
--- 2/apps/catalogue/templates/catalogue/book_short.html
+++ b/apps/catalogue/templates/catalogue/book_short.html
@@@ -1,11 -1,18 +1,10 @@@
  {% load i18n %}
  {% load catalogue_tags social_tags %}
- {% load thumbnail %}
  <div class="{% block box-class %}book-box{% endblock %}">
 -<div class="book-box-inner" style="position: relative;">
 +<div class="book-box-inner">
 +<div class="book-left-column">
  
  
 -<div class="cover-area">
 -    {% if book.cover %}
 -        {% if main_link %}<a href="{{ main_link }}">{% endif %}
 -            <img src="{{ book.cover_thumb.url }}"
 -                alt="Cover" class="cover" />
 -        {% if main_link %}</a>{% endif %}
 -    {% endif %}
 -    {% block cover-area-extra %}{% endblock %}
 -</div>
  
  
  <div class="book-box-body">
@@@ -40,20 -47,6 +39,15 @@@
                        </div>
          </div>
  
-             <img src="
-                 {% thumbnail book.cover "139x193" as thumb %}
-                     {{ thumb.url }}
-                 {% empty %}
-                     {{ book.cover.url }}
-                 {% endthumbnail %}
-             " alt="Cover" class="cover" />
 +<div class="cover-area">
 +    {% if book.cover %}
 +        {% if main_link %}<a href="{{ main_link }}">{% endif %}
++            <img src="{{ book.cover_thumb.url }}"
++                alt="Cover" class="cover" />
 +        {% if main_link %}</a>{% endif %}
 +    {% endif %}
 +    {% block cover-area-extra %}{% endblock %}
 +</div>
          <div class="tags">
                {% spaceless %}
  
diff --cc apps/catalogue/templates/catalogue/viewer_base.html
index 1092ead,0000000..dccd4e8
mode 100644,000000..100644
--- 1/apps/catalogue/templates/catalogue/viewer_base.html
--- /dev/null
+++ b/apps/catalogue/templates/catalogue/viewer_base.html
@@@ -1,73 -1,0 +1,74 @@@
-         <script src="{% static "js/modernizr.custom.19652.js" %}"></script>
 +<!DOCTYPE html>
 +{% load i18n %}
 +{% load static from staticfiles %}
 +{% load compressed %}
 +<html class="no-js">
 +    <head>
 +        <meta charset="utf-8">
 +        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 +        <title>{% block title %}{% endblock %} :: {% trans "Wolne Lektury" %}</title>
 +        <link rel="icon" href="{% static "img/favicon.png" %}" type="image/x-icon" />
 +        {% compressed_css "book_text" %}
 +        {% block extrahead %}{% endblock %}
 +
 +    </head>
 +    <body id="{% block body-id %}reader{% endblock %}">
 +        <nav id="no-menu"><ul>
 +            <li><a href="#" id="menu-toggle-on"></a></li>
 +            {% block no-menu-extra %}{% endblock %}
 +        </ul></nav>
 +
 +        <nav id="menu"><ul>
 +            <li><a href="#" id="menu-toggle-off"></a></li>
 +
 +            <li><a href="/">
 +                <img src="{% static 'img/logo-neon.png' %}" width="80"
 +                    alt="Wolne Lektury"
 +                    title="Wolne Lektury">
 +            </a></li>
 +
 +            {% block menu %}
 +            {% endblock menu %}
 +
 +        </ul></nav>
 +
 +        {% block big-pane %}
 +        <div id="big-pane">
 +
 +        {% block main %}
 +        <article id="main-text">
 +            {% block main-text %}{% endblock %}
 +        </article>
 +        {% endblock main %}
 +        {% endblock big-pane %}
 +
 +
 +        <footer>
 +            {% block footer %}{% endblock %}
 +
 +            <div id="box-underlay"></div>
 +
 +            {# template #}
 +            <div id="ajaxable-window" class='dialog-window'>
 +                <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
 +                <div class="target">
 +                    <p><img src="{% static "img/indicator.gif" %}" alt="*"/> {% trans "Loading" %}</p>
 +                </div>
 +            </div>
 +        </footer>
 +
 +        </div>
 +
 +        <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
 +        {% block js-dependencies %}{% endblock %}
 +        <script type="text/javascript">
 +            var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
 +            var STATIC_URL = "{{ STATIC_URL }}";
 +        </script>
 +        {% compressed_js "book_text" %}
 +
++        {{ piwik_tag|safe }}
 +        {% block extrabody %}{% endblock %}
++        <script src="{% static "js/modernizr.custom.19652.js" %}"></script>
 +    </body>
 +</html>