Merge branch 'reflow'

Conflicts:
	apps/catalogue/templates/catalogue/menu.html
	src/catalogue/management/commands/importbooks.py
	src/catalogue/templatetags/catalogue_tags.py
	src/catalogue/urls.py
	wolnelektury/settings/static.py

diff --git a/apps/catalogue/templates/catalogue/menu.html b/apps/catalogue/templates/catalogue/menu.html
new file mode 100644 (file)
index 0000000..e2212ca
--- /dev/null
+++ b/apps/catalogue/templates/catalogue/menu.html
@@ -0,0 +1,39 @@
+
+<a id="show-menu" href="{% url 'catalogue' %}">
+    <span class="long">{% trans "Catalogue of the library" %}</span>
+    <span class="short">{% trans "Catalogue" %}</span>
+</a>
+<ul id="menu">
+    {% for category, name, hash in categories %}
+       <li class="hidden-box-wrapper menu">
+               <a href="{% url 'catalogue' %}#{{ hash }}" class="hidden-box-trigger menu load-menu">{{ name }}</a>
+               <div class="hidden-box" id="menu-{{ category }}">
+            <img src="{% static "img/indicator.gif" %}" alt="{% trans "Please wait…" %}" />
+        </div>
+       </li>
+    {% endfor %}
+
+       <li class="hidden-box-wrapper menu">
+               <a href="{% url 'catalogue' %}#kolekcje" class="hidden-box-trigger menu load-menu">{% trans "Collections" %}</a>
+               <div class="hidden-box" id="menu-collections">
+            <img src="{% static "img/indicator.gif" %}" alt="{% trans "Please wait…" %}" />
+        </div>
+       </li>
+
+       <li class="menu">
+               <a href="{% url 'book_list' %}" class="menu">{% trans "All books" %}</a>
+       </li>
+       <li class="menu">
+               <a href="{% url 'audiobook_list' %}" class="menu">{% trans "Audiobooks" %}</a>
+       </li>
+       <li class="menu">
+               <a href="{% url 'daisy_list' %}" class="menu">{% trans "DAISY" %}</a>
+       </li>
+       <li class="menu">
+               <a href="{% url 'picture_list_thumb' %}" class="menu">
+                       <span class='mono'>{% trans "Gallery" %}</span></a>
+       </li>
+
+</ul>
+
+{% endspaceless %}

diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
new file mode 100644 (file)
index 0000000..81e15f8
--- /dev/null
+++ b/wolnelektury/settings/static.py
@@ -0,0 +1,174 @@
+from os import path
+from .paths import PROJECT_DIR
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = path.join(PROJECT_DIR, '../media/')
+STATIC_ROOT = path.join(PROJECT_DIR, '../static/')
+SEARCH_INDEX = path.join(PROJECT_DIR, '../search_index/')
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
+MEDIA_URL = '/media/'
+STATIC_URL = '/static/'
+
+# CSS and JavaScript file groups
+
+PIPELINE = {
+    'STYLESHEETS': {
+    'main': {
+        # styles both for mobile and for big screen
+        'source_filenames': [
+            'css/jquery.countdown.css',
+
+            'sponsors/css/sponsors.css',
+
+            'uni_form/uni-form.css',
+            'uni_form/default.uni-form.css',
+
+            'css/ui-lightness/jquery-ui-1.8.16.custom.css',
+
+            'scss/main.scss',
+        ],
+        'output_filename': 'css/compressed/main.css',
+    },
+    'book': {
+        'source_filenames': [
+            'css/master.book.css',
+        ],
+        'output_filename': 'css/compressed/book.css',
+    },
+    'book_text': {
+        'source_filenames': [
+            'scss/book_text.scss',
+            'css/new.book.css',
+
+            'css/master.picture.css',
+        ],
+        'output_filename': 'css/compressed/book_text.css',
+    },
+    'picture': {
+        'source_filenames': [
+            'css/master.book.css',
+            'css/master.picture.css',
+        ],
+        'output_filename': 'css/compressed/picture.css',
+    },
+    'player': {
+        'source_filenames': [
+            'jplayer/jplayer.blue.monday.css',
+            'player/player.css',
+        ],
+        'output_filename': 'css/compressed/player.css',
+    },
+    'simple': {
+        'source_filenames': ('css/simple.css',),
+        'output_filename': 'css/compressed/simple.css',
+    },
+    'widget': {
+        'source_filenames': ('scss/widget.scss',),
+        'output_filename': 'css/compressed/widget.css',
+    },
+    },
+    'JAVASCRIPT': {
+    'base': {
+        'source_filenames': (
+            'js/contrib/jquery.cycle.min.js',
+            'js/contrib/jquery.jqmodal.js',
+            'js/contrib/jquery.form.js',
+            'js/contrib/jquery.countdown.js', 'js/contrib/jquery.countdown-pl.js',
+            'js/contrib/jquery.countdown-de.js', 'js/contrib/jquery.countdown-uk.js',
+            'js/contrib/jquery.countdown-es.js', 'js/contrib/jquery.countdown-lt.js',
+            'js/contrib/jquery.countdown-ru.js', 'js/contrib/jquery.countdown-fr.js',
+
+            'js/contrib/jquery-ui-1.8.16.custom.min.js',
+
+            'js/locale.js',
+            'js/dialogs.js',
+            'js/base.js',
+            'pdcounter/pdcounter.js',
+            'sponsors/js/sponsors.js',
+            'player/openplayer.js',
+            'js/search.js',
+            'funding/funding.js',
+
+            'uni_form/uni-form.js',
+            ),
+        'output_filename': 'js/base.min.js',
+    },
+    'player': {
+        'source_filenames': [
+            'jplayer/jquery.jplayer.min.js',
+            'jplayer/jplayer.playlist.min.js',
+            'player/player.js',
+        ],
+        'output_filename': 'js/player.min.js',
+    },
+    'book': {
+        'source_filenames': [
+            'js/contrib/jquery.eventdelegation.js',
+            'js/contrib/jquery.scrollto.js',
+            'js/contrib/jquery.highlightfade.js',
+            'js/book_text/other.js',
+            'js/book.js',
+
+            'js/contrib/raphael-min.js',
+            'js/contrib/progressSpin.min.js',
+            'js/picture.js',
+        ],
+        'output_filename': 'js/book.min.js',
+    },
+    'book_text': {
+        'source_filenames': [
+            'js/contrib/jquery.form.js',
+            'js/contrib/jquery.jqmodal.js',
+            'js/book_text/*.js',
+            'js/locale.js',
+            'js/dialogs.js',
+
+            'js/contrib/jquery.highlightfade.js',
+            'js/contrib/raphael-min.js',
+            'player/openplayer.js',
+            'js/contrib/progressSpin.min.js',
+            'js/picture.js',
+        ],
+        'output_filename': 'js/book_text.js',
+    },
+    'book_ie': {
+        'source_filenames': ('js/contrib/ierange-m2.js',),
+        'output_filename': 'js/book_ie.min.js',
+    },
+    'widget': {
+        'source_filenames': (
+            'js/contrib/jquery.js',
+            'js/contrib/jquery-ui-1.8.16.custom.min.js',
+            'js/search.js',
+            'js/widget_run.js',
+        ),
+        'output_filename': 'js/widget.min.js',
+    },
+    },
+    'CSS_COMPRESSOR': None,
+    'JS_COMPRESSOR': 'pipeline.compressors.jsmin.JSMinCompressor',
+    'COMPILERS': (
+        'pipeline.compilers.sass.SASSCompiler',
+        # We could probably use PySCSS instead,
+        # but they have some serious problems, like:
+        # https://github.com/Kronuz/pyScss/issues/166 (empty list syntax)
+        # https://github.com/Kronuz/pyScss/issues/258 (bad @media order)
+        #'pyscss_compiler.PySCSSCompiler',
+    )
+}
+
+STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage'
+
+#PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
+#PIPELINE_PYSCSS_ARGUMENTS = ''
+
+
+STATICFILES_FINDERS = [
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'pipeline.finders.PipelineFinder',
+]