diff --git a/src/wolnelektury/templates/2022/footer.html b/src/wolnelektury/templates/2022/footer.html index 33368a670..8c3de260d 100644 --- a/src/wolnelektury/templates/2022/footer.html +++ b/src/wolnelektury/templates/2022/footer.html @@ -3,27 +3,27 @@

ul. MarszaÅkowska 84/92 lok. 125
00-514 Warszawa

- Wolne Lektury to projekt prowadzony przez fundacjÄ Nowoczesna Polska.
+ Wolne Lektury to projekt prowadzony przez fundacjÄ Nowoczesna Polska.
Hosting: ICM.

- Strona biblioteki Wolne Lektury powstaÅa dziÄki dofinansowaniu ze ÅrodkÃ³w Ministra Kultury i Dziedzictwa Narodowego - pochodzÄcych z Funduszu Promocji Kultury â paÅstwowego funduszu celowego. + Strona biblioteki Wolne Lektury powstaÅa dziÄki dofinansowaniu ze ÅrodkÃ³w Ministra Kultury i Dziedzictwa Narodowego + pochodzÄcych z Funduszu Promocji Kultury â paÅstwowego funduszu celowego.

diff --git a/src/wolnelektury/templates/2022/header.html b/src/wolnelektury/templates/2022/header.html index 47db25d67..6c7ff1185 100644 --- a/src/wolnelektury/templates/2022/header.html +++ b/src/wolnelektury/templates/2022/header.html @@ -125,14 +125,4 @@

Zmieniamy siÄ!

- JeÅ¼eli to czytasz jesteÅ jednÄ z osÃ³b, ktÃ³rej prezentujemy nowy wyglÄd czÄÅci stron. - BÄdziemy bardzo! wdziÄczni za TwojÄ opiniÄ â moÅ¼esz nam jÄ przesÅaÄ tutaj. - JeÅ¼eli wolisz klasyczny wyglÄd - wystarczy, Å¼e klikniesz tutaj -

- -

+{% block under-menu %}{% endblock %} diff --git a/src/wolnelektury/templates/2022/main_page.html b/src/wolnelektury/templates/2022/main_page.html new file mode 100644 index 000000000..35149f3b6 --- /dev/null +++ b/src/wolnelektury/templates/2022/main_page.html @@ -0,0 +1,312 @@ +{% extends "2022/base.html" %} +{% load static %} +{% load thumbnail %} +{% load catalogue_tags %} +{% load social_tags %} +{% load sponsors %} + +{% block under-menu %} + {% comment %} +

+ +

+ + + + +

StanisÅaw Brzozowski

WstÄp do filozofii

+ +

+ + + + +

StanisÅaw Brzozowski

WstÄp do filozofii

+ + + + +

StanisÅaw Brzozowski

WstÄp do filozofii

+ + + + +

StanisÅaw Brzozowski

WstÄp do filozofii

+ + + + +

StanisÅaw Brzozowski

WstÄp do filozofii

+ + + + +

StanisÅaw Brzozowski

WstÄp do filozofii

+ + + + +

StanisÅaw Brzozowski

WstÄp do filozofii

+ {% endcomment %} +{% endblock %} + +{% block global-content %} +

+ {% if recommended_collection %} +

+ +

+ {% for book in recommended_collection.get_books %} + {% include 'catalogue/2022/book_box.html' %} + {% endfor %} +

+ {% endif %} + +

+ {% carousel_2022 'main_2022' %} +

+ Nasze ksiÄÅ¼ki sÄ dostÄpne dla tysiÄcy + dzieciakÃ³w dziÄki darowiznom od + osÃ³b takich jak Ty! +

+ DorzuÄ siÄ! +

+ Zapisz siÄ na nasz Newsletter! +

+ WeÅº udziaÅ +

+ +

+ {% for ambassador in ambassadors %} +

+ {% thumbnail ambassador.photo '100x100' crop="center" as ambphoto %} +

+ {% endthumbnail %} +

+ {{ ambassador.text }} +

+ {% endfor %} +

+ +

+ Wolne Lektury to lektury szkolne + i tysiÄce innych ksiÄÅ¼ek â za darmo + i bez rejestracji. +

Czytaj i sÅuchaj online, ÅciÄgaj na swÃ³j telefon lub komputer, dziel siÄ z innymi.

Dla uczennic i uczniÃ³w dodajemy przypisy, motywy literackie, biogramy i geotagowanie.

+ Dowiedz siÄ wiÄcej +

+ JesteÅmy czÄÅciÄ ruchu wolnej kultury! +

+ Dowiedz siÄ wiÄcej +

+ Jak budujemy najpopularniejszÄ bibliotekÄ online w Polsce +

+ Dowiedz siÄ wiÄcej +

+ + {% preview_ad_homepage %} + +

+ +

+ {% for book in last_published %} + {% include 'catalogue/2022/book_box.html' %} + {% endfor %} +

+ +

+ + + {% sponsor_page 'footer' %} + +

+ +{% endblock %} diff --git a/src/wolnelektury/templatetags/switch_tag.py b/src/wolnelektury/templatetags/switch_tag.py deleted file mode 100644 index d4701ab7e..000000000 --- a/src/wolnelektury/templatetags/switch_tag.py +++ /dev/null @@ -1,138 +0,0 @@ -# Source: http://djangosnippets.org/snippets/967/ -# Author: adurdin -# Posted: August 13, 2008 -# -# -# We can use it based on djangosnippets Terms of Service: -# (http://djangosnippets.org/about/tos/) -# -# 2. That you grant any third party who sees the code you post -# a royalty-free, non-exclusive license to copy and distribute that code -# and to make and distribute derivative works based on that code. You may -# include license terms in snippets you post, if you wish to use -# a particular license (such as the BSD license or GNU GPL), but that -# license must permit royalty-free copying, distribution and modification -# of the code to which it is applied. - -from django import template -from django.template import Library, Node, VariableDoesNotExist - -register = Library() - - -@register.tag(name="switch") -def do_switch(parser, token): - """ - The ``{% switch %}`` tag compares a variable against one or more values in - ``{% case %}`` tags, and outputs the contents of the matching block. An - optional ``{% else %}`` tag sets off the default output if no matches - could be found:: - - {% switch result_count %} - {% case 0 %} - There are no search results. - {% case 1 %} - There is one search result. - {% else %} - Jackpot! Your search found {{ result_count }} results. - {% endswitch %} - - Each ``{% case %}`` tag can take multiple values to compare the variable - against:: - - {% switch username %} - {% case "Jim" "Bob" "Joe" %} - Me old mate {{ username }}! How ya doin? - {% else %} - Hello {{ username }} - {% endswitch %} - """ - bits = token.contents.split() - tag_name = bits[0] - if len(bits) != 2: - raise template.TemplateSyntaxError("'%s' tag requires one argument" % tag_name) - variable = parser.compile_filter(bits[1]) - - class BlockTagList(object): - # This is a bit of a hack, as it embeds knowledge of the behaviour - # of Parser.parse() relating to the "parse_until" argument. - def __init__(self, *names): - self.names = set(names) - - def __contains__(self, token_contents): - name = token_contents.split()[0] - return name in self.names - - # Skip over everything before the first {% case %} tag - parser.parse(BlockTagList('case', 'endswitch')) - - cases = [] - token = parser.next_token() - got_case = False - got_else = False - while token.contents != 'endswitch': - nodelist = parser.parse(BlockTagList('case', 'else', 'endswitch')) - - if got_else: - raise template.TemplateSyntaxError("'else' must be last tag in '%s'." % tag_name) - - contents = token.contents.split() - token_name, token_args = contents[0], contents[1:] - - if token_name == 'case': - tests = map(parser.compile_filter, token_args) - case = (tests, nodelist) - got_case = True - else: - # The {% else %} tag - case = (None, nodelist) - got_else = True - cases.append(case) - token = parser.next_token() - - if not got_case: - raise template.TemplateSyntaxError("'%s' must have at least one 'case'." % tag_name) - - return SwitchNode(variable, cases) - - -class SwitchNode(Node): - def __init__(self, variable, cases): - self.variable = variable - self.cases = cases - - def __repr__(self): - return "" - - def __iter__(self): - for tests, nodelist in self.cases: - for node in nodelist: - yield node - - def get_nodes_by_type(self, nodetype): - nodes = [] - if isinstance(self, nodetype): - nodes.append(self) - for tests, nodelist in self.cases: - nodes.extend(nodelist.get_nodes_by_type(nodetype)) - return nodes - - def render(self, context): - try: - value_missing = False - value = self.variable.resolve(context, True) - except VariableDoesNotExist: - no_value = True - value_missing = None - value = None - - for tests, nodelist in self.cases: - if tests is None: - return nodelist.render(context) - elif not value_missing: - for test in tests: - test_value = test.resolve(context, True) - if value == test_value: - return nodelist.render(context) - else: - return "" diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py index 872921602..eaec832bb 100644 --- a/src/wolnelektury/views.py +++ b/src/wolnelektury/views.py @@ -21,13 +21,23 @@ from django.views.decorators.cache import never_cache from ajaxable.utils import AjaxableFormView from ajaxable.utils import placeholdized from catalogue.models import Book, Collection, Tag, Fragment - +import club.models from social.utils import get_or_choose_cite from wolnelektury.forms import RegistrationForm, SocialSignupForm, WLAuthenticationForm +def main_page_2022(request): + ctx = {} + ctx['last_published'] = Book.objects.exclude(cover_clean='').filter(findable=True, parent=None).order_by('-created_at')[:10] + ctx['recommended_collection'] = Collection.objects.filter(listed=True, role='recommend').order_by('?').first() + ctx['ambassadors'] = club.models.Ambassador.objects.all().order_by('?') + return render(request, '2022/main_page.html', ctx) + @never_cache def main_page(request): + if request.EXPERIMENTS['layout'].value: + return main_page_2022(request) + ctx = { 'last_published': Book.objects.exclude(cover_thumb='').filter(findable=True, parent=None).order_by('-created_at')[:6], 'theme_books': [],

Prapremiera

+ {% for author in book.authors %} + {{ author }} + {% endfor %} +

{{ book.title }}

Zmieniamy siÄ!

Prapremiera

+ {% for author in book.authors %} + {{ author }} + {% endfor %} +

Zmieniamy siÄ!

Zmieniamy siÄ!

Czytaj dalej

Moja pÃ³Åka

{{ recommended_collection.title }}

+ Zapisz siÄ na nasz Newsletter! +

{{ ambassador.name }}

NowoÅci

BÄ dÅº na bieÅ¼Ä co

Zmieniamy siÄ!

Zmieniamy siÄ!

Moja pÃ³Åka

+ Zapisz siÄ na nasz Newsletter! +

NowoÅci

BÄdÅº na bieÅ¼Äco