From 7a0122fdf99f9af7680a60bf9514ac0c6720c141 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 23 Apr 2024 14:45:07 +0000
Subject: fix for BIESt 4009, fixes #4009

Closes #4009

Merge request studip/studip!2865
---
 app/views/file/_terms_of_use_select.php      | 22 +++++++++++-----------
 app/views/file/new_edit_folder_form.php      | 17 ++++++++---------
 resources/assets/stylesheets/less/files.less |  9 +++++----
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/views/file/_terms_of_use_select.php b/app/views/file/_terms_of_use_select.php
index c1dd994..598e375 100644
--- a/app/views/file/_terms_of_use_select.php
+++ b/app/views/file/_terms_of_use_select.php
@@ -22,20 +22,20 @@ if (!$selected_terms_of_use_id) {
                aria-description="<?= htmlReady(kill_format($content_terms_of_use_entry->description)) ?>">
 
         <label for="content_terms_of_use-<?= htmlReady($content_terms_of_use_entry->id) ?>">
-            <div class="icon">
-            <? if ($content_terms_of_use_entry['icon']) : ?>
-                <? if (filter_var($content_terms_of_use_entry['icon'], FILTER_VALIDATE_URL)): ?>
-                    <img src="<?= htmlReady($content_terms_of_use_entry['icon']) ?>" width="32" height="32">
-                <? else : ?>
-                    <?= Icon::create($content_terms_of_use_entry['icon'], Icon::ROLE_CLICKABLE)->asImg(32) ?>
-                <? endif ?>
-            <? endif ?>
-            </div>
+            <?= Icon::create('radiobutton-unchecked')->asImg(24, ['class' => 'arrow']) ?>
+            <?= Icon::create('radiobutton-checked')->asImg(24, ['class' => 'check']) ?>
             <div class="text">
                 <?= htmlReady($content_terms_of_use_entry->name) ?>
             </div>
-            <?= Icon::create('arr_1down', Icon::ROLE_CLICKABLE)->asImg(24, ['class' => 'arrow']) ?>
-            <?= Icon::create('check-circle', Icon::ROLE_CLICKABLE)->asImg(32, ['class' => 'check']) ?>
+            <div class="icon">
+                <? if ($content_terms_of_use_entry['icon']) : ?>
+                    <? if (filter_var($content_terms_of_use_entry['icon'], FILTER_VALIDATE_URL)): ?>
+                        <img src="<?= htmlReady($content_terms_of_use_entry['icon']) ?>" width="32" height="32">
+                    <? else : ?>
+                        <?= Icon::create($content_terms_of_use_entry['icon'], Icon::ROLE_CLICKABLE)->asImg(32) ?>
+                    <? endif ?>
+                <? endif ?>
+            </div>
         </label>
 
         <? if (trim($content_terms_of_use_entry->description)): ?>
diff --git a/app/views/file/new_edit_folder_form.php b/app/views/file/new_edit_folder_form.php
index 2c7a801..06fa2c7 100644
--- a/app/views/file/new_edit_folder_form.php
+++ b/app/views/file/new_edit_folder_form.php
@@ -23,20 +23,19 @@
                id="folder-type-<?= htmlReady($folder_type['class']) ?>"
                <? if ($folder_type['class'] === get_class($folder)) echo 'checked'; ?>>
         <label for="folder-type-<?= htmlReady($folder_type['class']) ?>">
-            <div class="icon">
-                <? if ($folder_type['icon']) : ?>
-                    <?= $folder_type['icon']->asImg(32) ?>
-                <? endif ?>
-            </div>
+            <?= Icon::create('radiobutton-unchecked')->asImg(24, ['class' => 'arrow']) ?>
+            <?= Icon::create('radiobutton-checked')->asImg(24, ['class' => 'check']) ?>
             <div class="text">
                 <?= htmlReady($folder_type['name']) ?>
             <? if ($template = $folder_type['instance']->getDescriptionTemplate()): ?>
                 <?= tooltipIcon($template instanceof Flexi_Template ? $template->render() : $template, false, true) ?>
-            <? endif; ?>
-
+            <? endif ?>
+            </div>
+            <div class="icon">
+                <? if ($folder_type['icon']) : ?>
+                    <?= $folder_type['icon']->asImg(32) ?>
+                <? endif ?>
             </div>
-            <?= Icon::create('arr_1down')->asImg(24, ['class' => 'arrow']) ?>
-            <?= Icon::create('check-circle')->asImg(32, ['class' => 'check']) ?>
         </label>
         <? if ($folder_type['class'] === get_class($folder)) : ?>
             <? $folder_template = $folder->getEditTemplate() ?>
diff --git a/resources/assets/stylesheets/less/files.less b/resources/assets/stylesheets/less/files.less
index 48161df..5d47a86 100644
--- a/resources/assets/stylesheets/less/files.less
+++ b/resources/assets/stylesheets/less/files.less
@@ -375,7 +375,7 @@ form.default fieldset.select_terms_of_use {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        padding: 6px;
+        padding: 0 10px 0;
         padding-bottom: 2px;
         margin-bottom: 0;
         border-top: none;
@@ -383,12 +383,13 @@ form.default fieldset.select_terms_of_use {
             width: 100%;
             margin-left: 10px;
         }
-        > .arrow {
-            margin-right: 5px;
-        }
         > .check {
             display: none;
         }
+
+        > .icon {
+            margin-top: 6px;
+        }
     }
     > label:first-of-type {
         border-top: 1px solid @content-color-40;
-- 
cgit v1.0