From 8557e2b7783d0ba7468e56ecfab17141dc2fbf19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Mon, 30 Dec 2024 11:59:56 +0100
Subject: [PATCH] Improve a bit the layout for descriptions

---
 ram/portal/static/css/main.css           |  9 +++++----
 ram/portal/templates/bookshelf/book.html |  7 ++++++-
 ram/portal/templates/rollingstock.html   | 14 ++++++++++++--
 ram/ram/__init__.py                      |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/ram/portal/static/css/main.css b/ram/portal/static/css/main.css
index 324fa29..400ccfa 100644
--- a/ram/portal/static/css/main.css
+++ b/ram/portal/static/css/main.css
@@ -17,6 +17,11 @@ td > img.logo-xl {
   max-height: 96px;
 }
 
+/* Disable margin on last <p> in a <td> */
+td > p:last-child {
+  margin-bottom: 0;
+}
+
 .btn > span {
   display: inline-block;
 }
@@ -38,10 +43,6 @@ a.badge, a.badge:hover {
   border-top: calc(var(--bs-border-width) * 3) solid var(--bs-border-color);
 }
 
-#nav-notes > p {
-  padding: .5rem;
-}
-
 #nav-journal ul, #nav-journal ol {
   margin: 0;
   padding-left: 1rem;
diff --git a/ram/portal/templates/bookshelf/book.html b/ram/portal/templates/bookshelf/book.html
index 2bc935c..c8e1a35 100644
--- a/ram/portal/templates/bookshelf/book.html
+++ b/ram/portal/templates/bookshelf/book.html
@@ -57,7 +57,6 @@
               <div class="tab-content" id="nav-tabContent">
                 <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
                   <table class="table table-striped">
-                    {{ book.description | safe }}
                     <thead>
                       <tr>
                       {% if type == "catalog" %}
@@ -119,6 +118,12 @@
                         <td>{{ book.price|default:"-" }}</td>
                       </tr>
                       {% endif %}
+                      {% if book.description %}
+                      <tr>
+                        <th class="w-33" scope="row">Description</th>
+                        <td>{{ book.description | safe }}</td>
+                      </tr>
+                      {% endif %}
                     </tbody>
                   </table>
                   {% if properties %}
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index 7651d40..86b04a5 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -151,7 +151,6 @@
                   {% endif %}
                 </div>
                 <div class="tab-pane" id="nav-model" role="tabpanel" aria-labelledby="nav-model-tab">
-                  {{ rolling_stock.description | safe }}
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -193,6 +192,12 @@
                         <td>{{ rolling_stock.price|default:"-" }}</td>
                       </tr>
                       {% endif %}
+                      {% if rolling_stock.description %}
+                      <tr>
+                        <th class="w-33" scope="row">Description</th>
+                        <td>{{ rolling_stock.description | safe }}</td>
+                      </tr>
+                      {% endif %}
                     </tbody>
                   </table>
                   {% if properties %}
@@ -214,7 +219,6 @@
                   {% endif %}
                 </div>
                 <div class="tab-pane" id="nav-class" role="tabpanel" aria-labelledby="nav-class-tab">
-                  {{ class.description | safe }}
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -238,6 +242,12 @@
                           {% else %}-{% endif %}
                         </td>
                       </tr>
+                      {% if class.description %}
+                      <tr>
+                        <th class="w-33" scope="row">Description</th>
+                        <td>{{ class.description | safe }}</td>
+                      </tr>
+                      {% endif %}
                     </tbody>
                   </table>
                   {% if class_properties %}
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index 43902a2..891494d 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.15.1"
+__version__ = "0.15.2"
 __version__ += git_suffix(__file__)