From eeb6424401e4ab36f9bcdb017b36b2957a4e06f2 Mon Sep 17 00:00:00 2001
From: Radek Czajka <rczajka@rczajka.pl>
Date: Tue, 20 Jun 2023 14:13:01 +0200
Subject: [PATCH 1/1] Layout fixes

---
 .../picture/2022/picture_detail.html          | 37 +++++++++++++++++--
 .../static/2022/styles/layout/_books.scss     |  5 +++
 .../static/2022/styles/layout/_simple.scss    |  4 ++
 .../templates/forms/form_detail.html          | 15 +++-----
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/picture/templates/picture/2022/picture_detail.html b/src/picture/templates/picture/2022/picture_detail.html
index 2c897ae78..d9707c7af 100644
--- a/src/picture/templates/picture/2022/picture_detail.html
+++ b/src/picture/templates/picture/2022/picture_detail.html
@@ -1,4 +1,5 @@
 {% extends '2022/base.html' %}
+{% load i18n %}
 
 {% load chunks %}
 {% load static %}
@@ -16,12 +17,42 @@
 
 
   <main class="l-main">
-    <section class="l-section">
+    <section class="l-section lay-s-col-rev">
       <aside class="l-aside">
         <ul class="l-aside__info">
           <li><span>Epoka:</span> {% for tag in picture.epochs %}<a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a> {% endfor %}</li>
           <li><span>Rodzaj:</span> {% for tag in picture.kinds %}<a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a> {% endfor %}</li>
           <li><span>Gatunek:</span> {% for tag in picture.genres %}<a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a> {% endfor %}</li>
+          {% with extra_info=picture.get_extra_info_json %}
+            {% if extra_info.styles %}
+              <li>
+                <span>{% trans "Style" %}:</span>
+                {% for tag in extra_info.styles %}
+                  <a>{{ tag }}</a>
+                  {% if not forloop.last %}, {% endif %}
+                {% endfor %}
+              </li>
+            {% endif %}
+
+            {% if extra_info.medium %}
+              <li>
+                <span>{% trans "Medium" %}:</span>
+                <a>{{ extra_info.medium }}</a>
+              </li>
+            {% endif %}
+
+            {% if extra_info.original_dimensions %}
+              <li>
+                <span>{% trans "Dimensions" %}:</span>
+                <a>{{ extra_info.original_dimensions }}</a>
+              </li>
+            {% endif %}
+
+            <li>
+              <span>{% trans "Date" %}:</span>
+              <a>{{ extra_info.created_at }}</a>
+            </li>
+          {% endwith %}
 
         </ul>
       </aside>
@@ -48,7 +79,7 @@
           <div class="l-article__overlay" data-max-height="327" style="margin-top:30px;">
             {% thumbnail picture.image_file "850" upscale=0 as thumb %}
             <a href="{% url 'picture_viewer' picture.slug %}">
-              <img class="cover" src="{{ thumb.url }}" width="{{ thumb.width }}" height="{{ thumb.height }}" />
+              <img class="l-art__preview" src="{{ thumb.url }}" />
             </a>
     {% endthumbnail %}
           </div>
@@ -57,7 +88,7 @@
       </div>
     </section>
 
-    {% for author in picture.authors %}
+    {% for tag in picture.authors %}
       <section class="l-section">
         <div class="l-author">
           {% include 'catalogue/2022/author_box.html' %}
diff --git a/src/wolnelektury/static/2022/styles/layout/_books.scss b/src/wolnelektury/static/2022/styles/layout/_books.scss
index 51eaba1eb..e14adbfac 100644
--- a/src/wolnelektury/static/2022/styles/layout/_books.scss
+++ b/src/wolnelektury/static/2022/styles/layout/_books.scss
@@ -325,3 +325,8 @@
     color: #007880;
   }
 }
+
+
+.l-art__preview {
+    width: 100%;
+}
diff --git a/src/wolnelektury/static/2022/styles/layout/_simple.scss b/src/wolnelektury/static/2022/styles/layout/_simple.scss
index f87f97004..7797c9260 100644
--- a/src/wolnelektury/static/2022/styles/layout/_simple.scss
+++ b/src/wolnelektury/static/2022/styles/layout/_simple.scss
@@ -8,6 +8,10 @@
     flex-direction: column;
     align-items: center;
 
+    &.wide {
+        align-items: normal;
+    }
+    
     .white-box {
         // for legacy templates
         width: 100%;
diff --git a/src/wolnelektury/templates/forms/form_detail.html b/src/wolnelektury/templates/forms/form_detail.html
index 09e19e30a..32df9d05f 100644
--- a/src/wolnelektury/templates/forms/form_detail.html
+++ b/src/wolnelektury/templates/forms/form_detail.html
@@ -1,4 +1,4 @@
-{% extends form.base_template|default:request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
+{% extends form.base_template|default:"2022/base.html" %}
 {% load forms_builder_tags %}
 {% load title %}
 
@@ -6,11 +6,8 @@
   {% title form.title %}
 {% endblock %}
 
-{% block title %}{{ form.title }}{% endblock %}
-
-{% block annoy %}
-{% endblock %}
-
-{% block body %}
-   {% render_built_form form %}
-{% endblock %}
+{% block main %}
+  <div class="page-simple wide">
+    {% render_built_form form %}
+  </div>
+{% endblock main %}
-- 
2.20.1