From: Aleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Fri, 21 Jun 2013 14:02:46 +0000 (+0200)
Subject: Merge branch 'master' into funding
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/5f176bb52a7a59bf88f5728e60a3a62e12fb3d54?ds=inline;hp=-c

Merge branch 'master' into funding
---

5f176bb52a7a59bf88f5728e60a3a62e12fb3d54
diff --combined apps/pdcounter/templates/pdcounter/author_detail.html
index 7ed5fa7b2,fc3bd5b8c..50eef63fb
--- a/apps/pdcounter/templates/pdcounter/author_detail.html
+++ b/apps/pdcounter/templates/pdcounter/author_detail.html
@@@ -1,10 -1,9 +1,10 @@@
  {% extends "base.html" %}
  {% load i18n %}
 +{% load time_tags %}
  
  {% block titleextra %}{{ author.name }}{% endblock %}
  
- {% block metadescription %}Licznik domeny publicznej: {{author.name}}.{% endblock %}
+ {% block metadescription %}{% trans "Public domain counter" %}: {{author.name}}.{% endblock %}
  
  {% block bodyid %}author-detail{% endblock %}
  
@@@ -37,11 -36,11 +37,11 @@@
              {% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this author's works." %}</p>
          {% else %}
              {% if author.in_pd %}
-                 <p>{% trans "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." %}</p>
+                 <p>{% trans "This author's works are in public domain and will be published on Internet library of Wolne Lektury soon." %}</p>
              {% else %}
                  <div>
                      <p>{% trans "This author's works will become part of public domain and will be allowed to be published without restrictions in" %}</p>
 -                    <div id='countdown' data-year='{{ pd_counter }}'></div>
 +                    <div class='countdown' data-until='{{ pd_counter|date_to_utc|utc_for_js }}'></div>
                      <p>{% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this author's works." %}</p>
                  </div>
              {% endif %}
diff --combined apps/pdcounter/templates/pdcounter/book_stub_detail.html
index af91fcbb6,40ddbd8ee..640d68ebe
--- a/apps/pdcounter/templates/pdcounter/book_stub_detail.html
+++ b/apps/pdcounter/templates/pdcounter/book_stub_detail.html
@@@ -1,10 -1,9 +1,10 @@@
  {% extends "base.html" %}
  {% load i18n %}
 +{% load time_tags %}
  
  {% block titleextra %}{{ book.title }}{% endblock %}
  
- {% block metadescription %}Licznik domeny publicznej: {{ book.title }}.{% endblock %}
+ {% block metadescription %}{% trans "Public domain counter" %}: {{ book.title }}.{% endblock %}
  
  {% block bodyid %}book-stub-detail{% endblock %}
  
@@@ -14,11 -13,11 +14,11 @@@
  	<div class="normal-text white-box">
  
      {% if book.in_pd %}
- 		<p>{% trans "This work is in public domain and will be published on Internet school library of Wolne Lektury soon." %}</p>
+ 		<p>{% trans "This work is in public domain and will be published on Internet library of Wolne Lektury soon." %}</p>
  	{% else %}
  	    {% if book.pd %}
  			<p>{% trans "This work will become part of public domain and will be allowed to be published without restrictions in" %}</p>
 -            <div id='countdown' data-year='{{ pd_counter }}'></div>
 +            <div class='countdown' data-until='{{ pd_counter|date_to_utc|utc_for_js }}'></div>
  			<p>{% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this work." %}</p>
  		{% else %}
  		    <p>{% trans "This work is copyrighted." %}
diff --combined apps/wolnelektury_core/static/css/main_page.css
index a53b9de5e,3761b9e22..4bf75ea23
--- a/apps/wolnelektury_core/static/css/main_page.css
+++ b/apps/wolnelektury_core/static/css/main_page.css
@@@ -10,7 -10,6 +10,7 @@@
  }
  #promo-box-header h2 {
      font-size: 1.3em;
 +    margin: 0;
  }
  #promo-box-body {
      border-bottom: 2px solid #efefef;
@@@ -46,11 -45,13 +46,15 @@@
      padding-top: 1.9em;
      height: 3.2em;
      padding-left: 1.9em;
 +    margin: 0;
 +    font-size: 1em;
  }
  .main-last span {
      font-size: 1.1em;
+     color: black;
+ }
+ .main-last span:after {
+     content: " >";
  }
  
  
@@@ -66,8 -67,6 +70,8 @@@
      color: #017e85;
      height: 2.8em;
      padding-top: 2.5em;
 +    font-size: 1em;
 +    margin: 0;
  }
  .infopages-box h2 span {
      font-size: 1.1em;
diff --combined apps/wolnelektury_core/templates/superbase.html
index 0d1ffa6a7,3eaf96216..a338b97ff
--- a/apps/wolnelektury_core/templates/superbase.html
+++ b/apps/wolnelektury_core/templates/superbase.html
@@@ -2,7 -2,7 +2,7 @@@
  <html lang="{{ LANGUAGE_CODE }}" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
  	{% load cache compressed i18n %}
  	{% load static from staticfiles %}
 -    {% load catalogue_tags reporting_stats sponsor_tags %}
 +    {% load catalogue_tags funding_tags reporting_stats sponsor_tags %}
      <head>
          <meta charset="utf-8">
          <meta name="application-name" content="Wolne Lektury" />
@@@ -32,10 -32,9 +32,9 @@@
          {% endblock %}
      </head>
      <body id="{% block bodyid %}base{% endblock %}">
-         {% include "annoy.html" %}
  
          {% block bodycontent %}
 -
 +        {% funding link=1 closeable=1 add_class="funding-top-header" %}
  		<div id="header-bg"></div>
  
          <div id="header">
@@@ -121,8 -120,9 +120,8 @@@
          </div>
  
  
 -
          <div id="main-content">
 -
 +            
              <div id="nav-line">
                  {% catalogue_menu %}
  
diff --combined wolnelektury/settings/__init__.py
index 4300aafa5,caec10b82..8d7c00f82
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@@ -65,14 -65,9 +65,15 @@@ INSTALLED_APPS_OUR = 
      'waiter',
      'search',
      'oai',
 +    'funding',
-     'polls'
++    'polls',
+     'libraries',
      ]
  
 +GETPAID_BACKENDS = (
 +    'getpaid.backends.payu',
 +)
 +
  INSTALLED_APPS_CONTRIB = [
      # external
      'django.contrib.auth',
@@@ -93,9 -88,6 +94,9 @@@
      'djkombu',
      'honeypot',
      #'django_nose',
 +    'fnpdjango',
 +    'getpaid',
 +    'getpaid.backends.payu',
  
      #allauth stuff
      'uni_form',
diff --combined wolnelektury/settings/static.py
index e5bd333f6,2ed7b3887..a3ff42430
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@@ -30,14 -30,9 +30,12 @@@ PIPELINE_CSS = 
              'css/catalogue.css',
              'sponsors/css/sponsors.css',
              'css/auth.css',
 +            'funding/funding.scss',
 +            'polls/polls.scss',
 +            'css/form.scss',
  
              'css/social/shelf_tags.css',
              'css/ui-lightness/jquery-ui-1.8.16.custom.css',
- 
-             'css/annoy.css',
          ],
          'output_filename': 'css/compressed/all.css',
      },
@@@ -50,8 -45,6 +48,6 @@@
      'book': {
          'source_filenames': [
              'css/master.book.css',
- 
-             'css/annoy.css',
          ],
          'output_filename': 'css/compressed/book.css',
      },
@@@ -88,9 -81,6 +84,7 @@@ PIPELINE_JS = 
              'sponsors/js/sponsors.js',
              'player/openplayer.js',
              'js/search.js',
 +            'funding/funding.js',
-             
-             'js/annoy.js',
              ),
          'output_filename': 'js/base.min.js',
      },
@@@ -109,8 -99,6 +103,6 @@@
              'js/jquery.highlightfade.js',
              'js/book.js',
              'player/openplayer.js',
- 
-             'js/annoy.js',
          ],
          'output_filename': 'js/book.min.js',
      },
@@@ -124,9 -112,3 +116,9 @@@
  STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
  PIPELINE_CSS_COMPRESSOR = None
  PIPELINE_JS_COMPRESSOR = None
 +
 +PIPELINE_COMPILERS = (
 +    'pyscss_compiler.PySCSSCompiler',
 +)
 +PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
 +PIPELINE_PYSCSS_ARGUMENTS = ''
diff --combined wolnelektury/urls.py
index fd8ed63bf,e99b0816a..6c254519c
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@@ -35,8 -35,7 +35,9 @@@ urlpatterns += patterns(''
      url(r'^ludzie/', include('social.urls')),
      url(r'^uzytkownik/', include('allauth.urls')),
      url(r'^czekaj/', include('waiter.urls')),
 +    url(r'^wesprzyj/', include('funding.urls')),
 +    url(r'^ankieta/', include('polls.urls')),
+     url(r'^biblioteki', include('libraries.urls')),
  
      # Admin panel
      url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),