Add grammar to tags. Also: respect custom tag slugs on publishing.

[wolnelektury.git] / src / infopages / views.py

diff --git a/src/infopages/views.py b/src/infopages/views.py
index d5dee76..5c19e72 100644 (file)
--- a/src/infopages/views.py
+++ b/src/infopages/views.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render, get_object_or_404

 from django.template import RequestContext, Template, TemplateSyntaxError
 
 from infopages.models import InfoPage
 from django.template import RequestContext, Template, TemplateSyntaxError
 
 from infopages.models import InfoPage


@@ -10,6 +9,9 @@ from infopages.models import InfoPage
 
 def infopage(request, slug):
     page = get_object_or_404(InfoPage, slug=slug)
 
 def infopage(request, slug):
     page = get_object_or_404(InfoPage, slug=slug)

+
+    new_layout = request.EXPERIMENTS['layout']
+    

     rc = RequestContext(request)
     try:
         left_column = Template(page.left_column).render(rc)
     rc = RequestContext(request)
     try:
         left_column = Template(page.left_column).render(rc)


@@ -19,7 +21,15 @@ def infopage(request, slug):
     try:
         right_column = Template(page.right_column).render(rc)
     except TemplateSyntaxError:
     try:
         right_column = Template(page.right_column).render(rc)
     except TemplateSyntaxError:

-        left_column = ''
+        right_column = ''

 
 

-    return render_to_response('infopages/infopage.html', locals(),
-                context_instance=RequestContext(request))
+    return render(
+        request,
+        'infopages/2022/infopage.html' if new_layout.value else 'infopages/infopage.html',
+        {
+            'page': page,
+            'left_column': left_column,
+            'right_column': right_column,
+            'active_menu_item': f'info:{slug}',
+        }
+    )