From 6f24501d339d6051ee1137aef9c76035344d4fdf Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 17:27:39 +0100
Subject: [PATCH 01/16] no strong tag allowed, or styling breaks

---
 src/euphorie/content/utils.py                              | 2 +-
 src/euphorie/deployment/locales/de/LC_MESSAGES/euphorie.po | 3 +--
 src/euphorie/deployment/locales/fr/LC_MESSAGES/euphorie.po | 4 ++--
 src/euphorie/deployment/locales/sk/LC_MESSAGES/euphorie.po | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/euphorie/content/utils.py b/src/euphorie/content/utils.py
index 721f51001..f0663602c 100644
--- a/src/euphorie/content/utils.py
+++ b/src/euphorie/content/utils.py
@@ -159,7 +159,7 @@
                 ),
                 "answer_no_integrated_ap": _(
                     "label_not_sufficient_integrated_ap",
-                    default="No, more measures are required <strong>(to be added below)</strong>",  # noqa: E501
+                    default="No, more measures are required (to be added below)",  # noqa: E501
                 ),
                 "answer_na": _("label_not_applicable", default="Not applicable"),
                 "custom_intro_extra": _(
diff --git a/src/euphorie/deployment/locales/de/LC_MESSAGES/euphorie.po b/src/euphorie/deployment/locales/de/LC_MESSAGES/euphorie.po
index 0fd50b9eb..66e504f90 100644
--- a/src/euphorie/deployment/locales/de/LC_MESSAGES/euphorie.po
+++ b/src/euphorie/deployment/locales/de/LC_MESSAGES/euphorie.po
@@ -4826,8 +4826,7 @@ msgstr "Nein, weitere Maßnahmen sind notwendig"
 #: euphorie/content/utils.py:160
 msgid "label_not_sufficient_integrated_ap"
 msgstr ""
-"Nein, weitere Maßnahmen sind notwendig <strong>(weiter unten einzutragen)</"
-"strong>"
+"Nein, weitere Maßnahmen sind notwendig (weiter unten einzutragen)"
 
 #. Default: "Notes"
 #: euphorie/client/browser/templates/training-slides.pt:245
diff --git a/src/euphorie/deployment/locales/fr/LC_MESSAGES/euphorie.po b/src/euphorie/deployment/locales/fr/LC_MESSAGES/euphorie.po
index 07cb0b775..786c2113b 100644
--- a/src/euphorie/deployment/locales/fr/LC_MESSAGES/euphorie.po
+++ b/src/euphorie/deployment/locales/fr/LC_MESSAGES/euphorie.po
@@ -5004,8 +5004,8 @@ msgstr "Non, des mesures sont à ajouter au plan d’actions"
 #: euphorie/content/utils.py:160
 msgid "label_not_sufficient_integrated_ap"
 msgstr ""
-"Non, des mesures sont à ajouter au plan d’actions <strong>(à compléter ci-"
-"dessous)</strong>"
+"Non, des mesures sont à ajouter au plan d’actions (à compléter ci-"
+"dessous)"
 
 #. Default: "Notes"
 #: euphorie/client/browser/templates/training-slides.pt:245
diff --git a/src/euphorie/deployment/locales/sk/LC_MESSAGES/euphorie.po b/src/euphorie/deployment/locales/sk/LC_MESSAGES/euphorie.po
index 9c0cc413e..aa7b0813e 100644
--- a/src/euphorie/deployment/locales/sk/LC_MESSAGES/euphorie.po
+++ b/src/euphorie/deployment/locales/sk/LC_MESSAGES/euphorie.po
@@ -4872,7 +4872,7 @@ msgstr "Nie, sú potrebné ďalšie opatrenia"
 #: euphorie/content/utils.py:160
 msgid "label_not_sufficient_integrated_ap"
 msgstr ""
-"Nie, sú potrebné ďalšie opatrenia <strong>(pridajte ich ďalej)</strong>"
+"Nie, sú potrebné ďalšie opatrenia (pridajte ich ďalej)"
 
 #. Default: "Notes"
 #: euphorie/client/browser/templates/training-slides.pt:245

From 792be29f382f1923338deb9088eac455a954aa84 Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 17:28:15 +0100
Subject: [PATCH 02/16] add missing class and remove small one. This magically
 enables the autocollapse feature for measures in place which makes the
 overview much slicker

---
 src/euphorie/client/browser/templates/webhelpers.pt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/euphorie/client/browser/templates/webhelpers.pt b/src/euphorie/client/browser/templates/webhelpers.pt
index f6734b8f4..e743446aa 100644
--- a/src/euphorie/client/browser/templates/webhelpers.pt
+++ b/src/euphorie/client/browser/templates/webhelpers.pt
@@ -166,7 +166,7 @@
     >
 
       <!-- Existing Measures -->
-      <fieldset class="pat-checklist pat-clone ${python:'pat-inject pat-autosubmit pat-subform' if (webhelpers.integrated_action_plan or webhelpers.use_training_module) else None}"
+      <fieldset class="measures-in-place pat-checklist pat-clone ${python:'pat-inject pat-autosubmit pat-subform' if (webhelpers.integrated_action_plan or webhelpers.use_training_module) else None}"
                 id="risk_identification_form"
                 disabled="${python:'disabled' if not webhelpers.can_edit_session else None}"
                 data-pat-clone="template: #in-place-measure-template; trigger-element: #add-in-place-measure-button; remove-behaviour: none"
@@ -268,7 +268,7 @@
       <div class="button-bar cloning"
            tal:condition="python:view.show_existing_measures"
       >
-        <button class="add-clone small pat-button icon-plus-circle"
+        <button class="add-clone pat-button icon-plus-circle"
                 id="add-in-place-measure-button"
                 title="${view/button_add_extra}"
                 type="button"

From cc0be7cd5eb74d8b702e9b3a48e2862bb907ce0e Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 17:37:39 +0100
Subject: [PATCH 03/16] wrong class for button-bar (buttonBar)

---
 .../client/browser/templates/module_identification_custom.pt    | 2 +-
 src/euphorie/client/browser/templates/report.pt                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/euphorie/client/browser/templates/module_identification_custom.pt b/src/euphorie/client/browser/templates/module_identification_custom.pt
index 555506c39..385d49e68 100644
--- a/src/euphorie/client/browser/templates/module_identification_custom.pt
+++ b/src/euphorie/client/browser/templates/module_identification_custom.pt
@@ -56,7 +56,7 @@
           <tal:question tal:replace="structure module/question">question</tal:question>
         </article>
 
-        <p class="buttonBar"
+        <p class="button-bar"
            id="nav-bar"
         >
           <a class="pat-button back"
diff --git a/src/euphorie/client/browser/templates/report.pt b/src/euphorie/client/browser/templates/report.pt
index 1d611b52e..2c3cb185e 100644
--- a/src/euphorie/client/browser/templates/report.pt
+++ b/src/euphorie/client/browser/templates/report.pt
@@ -54,7 +54,7 @@
               </textarea>
             </label>
           </fieldset>
-          <p class="buttonBar">
+          <p class="button-bar">
             <button class="pat-button default"
                     id="report_comment_submit"
                     name="next"

From 95310ba13b60d314a3cac6f6367863b8756a7e00 Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 17:42:19 +0100
Subject: [PATCH 04/16] no id 'nav-bar' should be there

---
 .../client/browser/templates/module_identification_custom.pt  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/euphorie/client/browser/templates/module_identification_custom.pt b/src/euphorie/client/browser/templates/module_identification_custom.pt
index 385d49e68..a7b287e75 100644
--- a/src/euphorie/client/browser/templates/module_identification_custom.pt
+++ b/src/euphorie/client/browser/templates/module_identification_custom.pt
@@ -56,9 +56,7 @@
           <tal:question tal:replace="structure module/question">question</tal:question>
         </article>
 
-        <p class="button-bar"
-           id="nav-bar"
-        >
+        <p class="button-bar">
           <a class="pat-button back"
              href="${view/previous_question_url}"
              i18n:translate="label_previous"

From 2ef79067cd8ec6120a0d2232edf6f5a6fcdfcdae Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 19:02:57 +0100
Subject: [PATCH 05/16] The dropdown/autocomplete should never be empty, always
 start witht he first element

---
 src/euphorie/client/browser/templates/new-session.pt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/euphorie/client/browser/templates/new-session.pt b/src/euphorie/client/browser/templates/new-session.pt
index a2287d2cc..88c05993b 100644
--- a/src/euphorie/client/browser/templates/new-session.pt
+++ b/src/euphorie/client/browser/templates/new-session.pt
@@ -78,7 +78,6 @@
                           data-pat-autosuggest="minimum-input-length:0"
                           i18n:attributes="placeholder label_select_oira_tool"
                   >
-                    <option value="">&nbsp;</option>
                     <metal:templates define-macro="templates_many">
                       <tal:surveys define="
                                      surveys root/survey_templates;

From 25c204a1929e2627f9be4b618c70431943b12e01 Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 19:50:01 +0100
Subject: [PATCH 06/16] The title of a session should be displayed on top, not
 the title of the tool. When creating a new one, there should be no title,
 until the user enters one.

---
 src/euphorie/client/browser/templates/start.pt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/euphorie/client/browser/templates/start.pt b/src/euphorie/client/browser/templates/start.pt
index 432dc20b5..325faa5ed 100644
--- a/src/euphorie/client/browser/templates/start.pt
+++ b/src/euphorie/client/browser/templates/start.pt
@@ -49,7 +49,7 @@
           </article>
 
           <article class="pat-rich">
-            <h1>${context/Title}</h1>
+            <h1>${view/session/title}</h1>
             <section tal:condition="context/Description">
               <p>${context/Description}</p>
             </section>

From 1cc947b91fd2549e4e7da9bd57cb2704ad51a540 Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 20:51:30 +0100
Subject: [PATCH 07/16] Also the Available OiRA tools portlet should start with
 the select prefilled

---
 src/euphorie/client/browser/templates/portlet-available-tools.pt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/euphorie/client/browser/templates/portlet-available-tools.pt b/src/euphorie/client/browser/templates/portlet-available-tools.pt
index 414780e5a..9c7a2a653 100644
--- a/src/euphorie/client/browser/templates/portlet-available-tools.pt
+++ b/src/euphorie/client/browser/templates/portlet-available-tools.pt
@@ -39,7 +39,6 @@
                       i18n:attributes="placeholder label_select_oira_tool"
               >
                 <metal:templates define-macro="templates_many">
-                  <option value="">&nbsp;</option>
                   <tal:surveys define="
                                  surveys root/survey_templates;
                                ">

From 1f36cefe6e3f1fda2bd08cf5ad768a5aad067ecf Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 20:52:00 +0100
Subject: [PATCH 08/16] Missing data-pat-modal on the add modal link when no
 sessions present

---
 src/euphorie/client/browser/templates/portlet-my-ras.pt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/euphorie/client/browser/templates/portlet-my-ras.pt b/src/euphorie/client/browser/templates/portlet-my-ras.pt
index 7ebb04021..a06b0ef15 100644
--- a/src/euphorie/client/browser/templates/portlet-my-ras.pt
+++ b/src/euphorie/client/browser/templates/portlet-my-ras.pt
@@ -107,7 +107,7 @@
         <tal:no-sessions condition="not:sessions_by_organisation">
           <article class="pat-rich">
             <p>
-              <a class="pat-modal icon-plus-circle"
+              <a class="pat-modal icon-plus-circle" data-pat-modal="class: panel small"
                  href="${here/absolute_url}/@@new-session.html#document-content"
               >${view/label_start_session}</a>
             </p>

From cc6aff12f4ecaef07663392d1ed55322f836a80c Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 21:04:03 +0100
Subject: [PATCH 09/16] move 'status' to its top position, add 'preview or
 print the tool for preparation' and 'exit'

---
 .../client/browser/templates/more_menu.pt     | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/euphorie/client/browser/templates/more_menu.pt b/src/euphorie/client/browser/templates/more_menu.pt
index cea622214..ae56993bb 100644
--- a/src/euphorie/client/browser/templates/more_menu.pt
+++ b/src/euphorie/client/browser/templates/more_menu.pt
@@ -31,6 +31,15 @@
              i18n:translate="label_history"
           >History</a>
         </li>
+        <li>
+          <a class="pat-modal close-panel icon-chart-line ${python: not has_tree and 'disabled' or ''}"
+             href="${python:status_url if has_tree else None}"
+             title="Status"
+             data-pat-modal="class: medium"
+             i18n:attributes="title navigation_status"
+             i18n:translate="navigation_status"
+          >Status</a>
+        </li>
         <li>
           <a class="close-panel icon-trash pat-modal ${python: not can_delete and 'disabled' or ''}"
              href="${python:can_delete and delete_url or None}"
@@ -59,13 +68,18 @@
           >Duplicate</a>
         </li>
         <li>
-          <a class="pat-modal close-panel icon-chart-line ${python: not has_tree and 'disabled' or ''}"
-             href="${python:status_url if has_tree else None}"
-             title="Status"
-             data-pat-modal="class: medium"
-             i18n:attributes="title navigation_status"
-             i18n:translate="navigation_status"
-          >Status</a>
+          <a href="${here/absolute_url}/@@panel-contents-preview#document-content" 
+             class="pat-modal icon-eye close-panel" 
+             data-pat-modal="class: sheet"
+             i18n:translate="label_print_tool_preview"
+          >Preview or print the tool for preparation</a>   
+        </li>
+        <li>
+          <a class="pat-inject close-panel icon-cancel" 
+             href="${webhelpers/country_or_client_url}#content" 
+             data-pat-inject="history: record"
+             i18n:translate="label_exit"
+          >Exit</a>
         </li>
       </ul>
     </div>

From 493198cb077f76b82dc50c37ac0b1f774f4856cb Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 21:18:23 +0100
Subject: [PATCH 10/16] add an info message if no assessment exists

---
 src/euphorie/client/browser/templates/assessments.pt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/euphorie/client/browser/templates/assessments.pt b/src/euphorie/client/browser/templates/assessments.pt
index 93fdf0a15..d4c94a8a0 100644
--- a/src/euphorie/client/browser/templates/assessments.pt
+++ b/src/euphorie/client/browser/templates/assessments.pt
@@ -118,12 +118,18 @@
           <div class="portlet">
             <div class="content">
               <metal:assessments_list metal:define-macro="assessments_list">
+                <p tal:condition="not:sessions/count"
+                   class="pat-message info"
+                   i18n_translate="message_you_dont_have_any_risk_assessments_yet">
+                   You don’t have any risk assessments yet. Start by creating a new one.
+                </p>
                 <ul class="data-matrix ${python:'hd' if show_extra_fields else None}"
                     tal:define="
                       show_extra_fields show_extra_fields|python:False;
                       toLocalizedTime nocall: context/@@plone/toLocalizedTime;
                       get_archived_label nocall:view/get_archived_label|nocall:here/@@assessments/get_archived_label;
                     "
+                    tal:condition="sessions/count"
                 >
                   <li class="row ${python:'archived' if session.is_archived else None}"
                       title="${python: get_archived_label(session)}"

From 30ae020d9513b1f7984143736591322d1ea5ba3d Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 21:58:06 +0100
Subject: [PATCH 11/16] added empty message in case there are no assessments

---
 src/euphorie/client/browser/templates/assessments.pt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/euphorie/client/browser/templates/assessments.pt b/src/euphorie/client/browser/templates/assessments.pt
index d4c94a8a0..a437c349e 100644
--- a/src/euphorie/client/browser/templates/assessments.pt
+++ b/src/euphorie/client/browser/templates/assessments.pt
@@ -91,7 +91,7 @@
         </metal:homescreen_navigation>
         <div id="application-content"
              tal:define="
-               sessions view/sessions;
+               sessions python:view.sessions.all();
                show_extra_fields python:True;
              "
         >
@@ -118,7 +118,7 @@
           <div class="portlet">
             <div class="content">
               <metal:assessments_list metal:define-macro="assessments_list">
-                <p tal:condition="not:sessions/count"
+              <p tal:condition="not: sessions"
                    class="pat-message info"
                    i18n_translate="message_you_dont_have_any_risk_assessments_yet">
                    You don’t have any risk assessments yet. Start by creating a new one.
@@ -129,7 +129,7 @@
                       toLocalizedTime nocall: context/@@plone/toLocalizedTime;
                       get_archived_label nocall:view/get_archived_label|nocall:here/@@assessments/get_archived_label;
                     "
-                    tal:condition="sessions/count"
+                    tal:condition="sessions"
                 >
                   <li class="row ${python:'archived' if session.is_archived else None}"
                       title="${python: get_archived_label(session)}"

From ff46f52a0592f7e816413cfc4a29ae46811c272e Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 21:58:18 +0100
Subject: [PATCH 12/16] added empty message in case there are no certificates

---
 .../client/browser/templates/certificates.pt      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/euphorie/client/browser/templates/certificates.pt b/src/euphorie/client/browser/templates/certificates.pt
index 8f8fccf2a..da68102e5 100644
--- a/src/euphorie/client/browser/templates/certificates.pt
+++ b/src/euphorie/client/browser/templates/certificates.pt
@@ -20,8 +20,19 @@
         </metal:homescreen_navigation>
         <div id="application-content">
           <div class="portlet">
-            <div class="content">
-              <tal:year tal:repeat="item view/certificates">
+            <div class="content" tal:define="certificates view/certificates">
+              <tal:cond condition="python: len(certificates) == 0">
+                <p class="pat-message info"
+                  i18n_translate="message_you_dont_have_any_certificates_yet">
+                  You haven’t earned any certificates yet.
+                </p>
+                <a class="pat-inject no-label"  
+                   data-pat-inject="history: record; source: #content; target: #content;" 
+                   href="${webhelpers/base_url}/++resource++euphorie.resources/oira/help/${webhelpers/help_language}/pages/certificates.html#content"
+                   i18n:translate="message_learn_more_about_certificates"
+                >Learn more about certificates.</a>
+              </tal:cond>
+              <tal:year tal:repeat="item certificates">
                 <tal:year tal:define="
                             year python:item[0];
                             sessions python:item[1];

From cc9617a4f9ae8501e7caa729822460528d8b2c13 Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 22:03:04 +0100
Subject: [PATCH 13/16] changelog update

---
 docs/changes.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/changes.rst b/docs/changes.rst
index 248436758..003573324 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -19,6 +19,9 @@ Changelog
   (`#2375 <https://github.com/syslabcom/scrum/issues/2375>`_)
   [reinhardt]
 
+- Updated resources from proto and applied a number of markup fixes in a review session with Daniel
+  [pilz]
+
 
 16.2.7 (2025-01-15)
 -------------------

From 74f1d86d22ad1fbd3241a3383802f11213228a0a Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Tue, 28 Jan 2025 22:37:24 +0100
Subject: [PATCH 14/16] run zpretty

---
 .../client/browser/templates/assessments.pt       |  9 +++++----
 .../client/browser/templates/certificates.pt      | 15 ++++++++++-----
 .../client/browser/templates/more_menu.pt         | 10 +++++-----
 .../client/browser/templates/portlet-my-ras.pt    |  3 ++-
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/euphorie/client/browser/templates/assessments.pt b/src/euphorie/client/browser/templates/assessments.pt
index a437c349e..9007c4e8a 100644
--- a/src/euphorie/client/browser/templates/assessments.pt
+++ b/src/euphorie/client/browser/templates/assessments.pt
@@ -118,10 +118,11 @@
           <div class="portlet">
             <div class="content">
               <metal:assessments_list metal:define-macro="assessments_list">
-              <p tal:condition="not: sessions"
-                   class="pat-message info"
-                   i18n_translate="message_you_dont_have_any_risk_assessments_yet">
-                   You don’t have any risk assessments yet. Start by creating a new one.
+                <p class="pat-message info"
+                   i18n_translate="message_you_dont_have_any_risk_assessments_yet"
+                   tal:condition="not: sessions"
+                >
+                   You don&rsquo;t have any risk assessments yet. Start by creating a new one.
                 </p>
                 <ul class="data-matrix ${python:'hd' if show_extra_fields else None}"
                     tal:define="
diff --git a/src/euphorie/client/browser/templates/certificates.pt b/src/euphorie/client/browser/templates/certificates.pt
index da68102e5..d8aaf9c2c 100644
--- a/src/euphorie/client/browser/templates/certificates.pt
+++ b/src/euphorie/client/browser/templates/certificates.pt
@@ -20,15 +20,20 @@
         </metal:homescreen_navigation>
         <div id="application-content">
           <div class="portlet">
-            <div class="content" tal:define="certificates view/certificates">
+            <div class="content"
+                 tal:define="
+                   certificates view/certificates;
+                 "
+            >
               <tal:cond condition="python: len(certificates) == 0">
                 <p class="pat-message info"
-                  i18n_translate="message_you_dont_have_any_certificates_yet">
-                  You haven’t earned any certificates yet.
+                   i18n_translate="message_you_dont_have_any_certificates_yet"
+                >
+                  You haven&rsquo;t earned any certificates yet.
                 </p>
-                <a class="pat-inject no-label"  
-                   data-pat-inject="history: record; source: #content; target: #content;" 
+                <a class="pat-inject no-label"
                    href="${webhelpers/base_url}/++resource++euphorie.resources/oira/help/${webhelpers/help_language}/pages/certificates.html#content"
+                   data-pat-inject="history: record; source: #content; target: #content;"
                    i18n:translate="message_learn_more_about_certificates"
                 >Learn more about certificates.</a>
               </tal:cond>
diff --git a/src/euphorie/client/browser/templates/more_menu.pt b/src/euphorie/client/browser/templates/more_menu.pt
index ae56993bb..bb4bc1e2f 100644
--- a/src/euphorie/client/browser/templates/more_menu.pt
+++ b/src/euphorie/client/browser/templates/more_menu.pt
@@ -68,15 +68,15 @@
           >Duplicate</a>
         </li>
         <li>
-          <a href="${here/absolute_url}/@@panel-contents-preview#document-content" 
-             class="pat-modal icon-eye close-panel" 
+          <a class="pat-modal icon-eye close-panel"
+             href="${here/absolute_url}/@@panel-contents-preview#document-content"
              data-pat-modal="class: sheet"
              i18n:translate="label_print_tool_preview"
-          >Preview or print the tool for preparation</a>   
+          >Preview or print the tool for preparation</a>
         </li>
         <li>
-          <a class="pat-inject close-panel icon-cancel" 
-             href="${webhelpers/country_or_client_url}#content" 
+          <a class="pat-inject close-panel icon-cancel"
+             href="${webhelpers/country_or_client_url}#content"
              data-pat-inject="history: record"
              i18n:translate="label_exit"
           >Exit</a>
diff --git a/src/euphorie/client/browser/templates/portlet-my-ras.pt b/src/euphorie/client/browser/templates/portlet-my-ras.pt
index a06b0ef15..d32741fd3 100644
--- a/src/euphorie/client/browser/templates/portlet-my-ras.pt
+++ b/src/euphorie/client/browser/templates/portlet-my-ras.pt
@@ -107,8 +107,9 @@
         <tal:no-sessions condition="not:sessions_by_organisation">
           <article class="pat-rich">
             <p>
-              <a class="pat-modal icon-plus-circle" data-pat-modal="class: panel small"
+              <a class="pat-modal icon-plus-circle"
                  href="${here/absolute_url}/@@new-session.html#document-content"
+                 data-pat-modal="class: panel small"
               >${view/label_start_session}</a>
             </p>
           </article>

From 32e14a927292bf8baf0dad8ae35c1be3396c9ef8 Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Thu, 30 Jan 2025 12:54:37 +0100
Subject: [PATCH 15/16] show the tool title on add but the custom title when
 available

---
 src/euphorie/client/browser/templates/start.pt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/euphorie/client/browser/templates/start.pt b/src/euphorie/client/browser/templates/start.pt
index 325faa5ed..17b85e399 100644
--- a/src/euphorie/client/browser/templates/start.pt
+++ b/src/euphorie/client/browser/templates/start.pt
@@ -49,7 +49,7 @@
           </article>
 
           <article class="pat-rich">
-            <h1>${view/session/title}</h1>
+            <h1>${python: view.session.title or context.title}</h1>
             <section tal:condition="context/Description">
               <p>${context/Description}</p>
             </section>

From b7be3ca0c4abab58b551213820130891f0c9b501 Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Thu, 30 Jan 2025 13:04:17 +0100
Subject: [PATCH 16/16] we no longer start with an empty value in the tool
 select, so also don't test for the empty value

---
 src/euphorie/client/tests/test_functional_country.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/euphorie/client/tests/test_functional_country.py b/src/euphorie/client/tests/test_functional_country.py
index afba5b4dc..ff7dd4243 100644
--- a/src/euphorie/client/tests/test_functional_country.py
+++ b/src/euphorie/client/tests/test_functional_country.py
@@ -35,7 +35,7 @@ def test_surveys_filtered_by_language(self):
             self.portal.client["nl"].absolute_url() + "/@@portlet-available-tools"
         )
         self.assertEqual(
-            browser.getControl(name="survey").options, ["", "branche/vragenlijst"]
+            browser.getControl(name="survey").options, ["branche/vragenlijst"]
         )
 
         # Still Dutch
@@ -43,7 +43,7 @@ def test_surveys_filtered_by_language(self):
             self.portal.client["nl"].absolute_url() + "/@@portlet-available-tools"
         )
         self.assertEqual(
-            browser.getControl(name="survey").options, ["", "branche/vragenlijst"]
+            browser.getControl(name="survey").options, ["branche/vragenlijst"]
         )
 
         # Now, switch to English
@@ -53,9 +53,7 @@ def test_surveys_filtered_by_language(self):
         browser.open(
             self.portal.client["nl"].absolute_url() + "/@@portlet-available-tools"
         )
-        self.assertEqual(
-            browser.getControl(name="survey").options, ["", "sector/survey"]
-        )
+        self.assertEqual(browser.getControl(name="survey").options, ["sector/survey"])
 
     def test_must_select_valid_survey(self):
         self.loginAsPortalOwner()