fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 91f1ca9 a06e9d2)
Merge branch 'master' into production
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 11 Jun 2013 13:51:09 +0000 (15:51 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 11 Jun 2013 13:51:09 +0000 (15:51 +0200)
1  2 
apps/catalogue/templates/catalogue/book_text.html patch | diff1 | diff2 | blob | history
wolnelektury/settings/__init__.py patch | diff1 | diff2 | blob | history

diff --combined apps/catalogue/templates/catalogue/book_text.html
index 0860dec,aa2b392..362af1b
--- 1/apps/catalogue/templates/catalogue/book_text.html
--- 2/apps/catalogue/templates/catalogue/book_text.html
+++ b/apps/catalogue/templates/catalogue/book_text.html
@@@ -17,6 -17,7 +17,6 @@@
  
      </head>
      <body>
 -        {% include "annoy.html" %}
          <div id="menu">
              <ul>
                  <li><a class="menu" href="#toc">{% trans "Table of contents" %}</a></li>
@@@ -61,17 -62,6 +61,6 @@@
          <div id="header">
              <a href="/"><img src="{% static "img/logo-220.png" %}" alt="Wolne Lektury" /></a>
          </div>
-         <div id="themes">
-             <ol>
-                 {% for theme, fragments in book_themes %}
-                 <li>{{ theme }}:
-                     {% for fragment in fragments %}
-                         <a href="#m{{ fragment.anchor }}">{{ forloop.counter }}</a>
-                     {% endfor %}
-                 </li>
-                 {% endfor %}
-             </ol>
-         </div>
          {{ book.html_file.read|safe }}
          {{ piwik_tag|safe }}
      </body>
diff --combined wolnelektury/settings/__init__.py
index e5c7ece,1f0d1d2..caec10b
--- 1/wolnelektury/settings/__init__.py
--- 2/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@@ -26,7 -26,6 +26,6 @@@ TEMPLATE_CONTEXT_PROCESSORS = 
  )
  
  MIDDLEWARE_CLASSES = [
-     'django.middleware.cache.UpdateCacheMiddleware',
      'django.middleware.common.CommonMiddleware',
      'django.contrib.sessions.middleware.SessionMiddleware',
      'django.middleware.csrf.CsrfViewMiddleware',
@@@ -37,7 -36,6 +36,6 @@@
      'piwik.django.middleware.PiwikMiddleware',
      'maintenancemode.middleware.MaintenanceModeMiddleware',
      'django.middleware.common.CommonMiddleware',
-     'django.middleware.cache.FetchFromCacheMiddleware',
      'django.contrib.messages.middleware.MessageMiddleware',
      'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
  ]
@@@ -67,7 -65,6 +65,7 @@@ INSTALLED_APPS_OUR = 
      'waiter',
      'search',
      'oai',
 +    'libraries',
      ]
  
  INSTALLED_APPS_CONTRIB = [