From 10a9fedd275785708f684a18d79bcfb50061abab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Wed, 27 Sep 2023 11:12:02 +0000
Subject: adjust dialog size and table line height, fixes #1364

Closes #1364

Merge request studip/studip!2202
---
 app/views/file/choose_destination.php           | 10 +++++-----
 app/views/file/choose_folder.php                |  4 ++--
 app/views/file/choose_folder_from_course.php    | 22 ++++++++++++++--------
 app/views/file/choose_folder_from_institute.php | 13 ++++++++-----
 app/views/files/_flat_tfoot.php                 |  2 +-
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/app/views/file/choose_destination.php b/app/views/file/choose_destination.php
index 7247439..49afe87 100644
--- a/app/views/file/choose_destination.php
+++ b/app/views/file/choose_destination.php
@@ -33,7 +33,8 @@ $options = array_filter([
                 <?= Icon::create('folder-parent', Icon::ROLE_CLICKABLE)->asInput(50, ['formaction' => $controller->action_url('choose_folder/' . $parent_folder->getId()), 'to_plugin' => $options['from_plugin'] ?? null]) ?>
                 <button
                     class="undecorated"
-                    formaction="<?= $controller->action_link('choose_folder/' . $parent_folder->getId()) ?>" <? if ($options['from_plugin']): ?> name="to_plugin" value="<?= htmlReady($options['from_plugin'] ?? null) ?>"<? endif; ?>>
+                    formaction="<?= $controller->action_link('choose_folder/' . $parent_folder->getId()) ?>" <? if ($options['from_plugin']): ?> name="to_plugin" value="<?= htmlReady($options['from_plugin'] ?? null) ?>"<? endif; ?>
+                    data-dialog="size=medium">
                     <?= _('Aktueller Ordner') ?>
                 </button>
             </div>
@@ -42,8 +43,7 @@ $options = array_filter([
                 <?= Icon::create('files')->asInput(50, ['formaction' => $controller->action_url('choose_folder/' . Folder::findTopFolder($GLOBALS['user']->id)->getId())]) ?>
                 <button
                     class="undecorated"
-                    formaction="<?= $controller->action_link('choose_folder/' . Folder::findTopFolder($GLOBALS['user']->id)->getId()) ?>">
-
+                    formaction="<?= $controller->action_link('choose_folder/' . Folder::findTopFolder($GLOBALS['user']->id)->getId()) ?>" data-dialog="size=medium">
                     <?= _('Persönlicher Dateibereich') ?>
                 </button>
             </div>
@@ -51,7 +51,7 @@ $options = array_filter([
             <div class="clickable">
                 <?= Icon::create('seminar')->asinput(50, ['formaction' => $controller->action_url('choose_folder_from_course')]) ?>
                 <button class="undecorated"
-                        formaction="<?= $controller->action_link('choose_folder_from_course') ?>">
+                        formaction="<?= $controller->action_link('choose_folder_from_course') ?>" data-dialog="size=medium">
                     <?= _('Meine Veranstaltungen') ?>
                 </button>
             </div>
@@ -59,7 +59,7 @@ $options = array_filter([
             <div class="clickable">
                 <?= Icon::create('institute')->asInput(50, ['formaction' => $controller->action_url('choose_folder_from_institute')]) ?>
                 <button class="undecorated"
-                        formaction="<?= $controller->action_link('choose_folder_from_institute') ?>">
+                        formaction="<?= $controller->action_link('choose_folder_from_institute') ?>" data-dialog="size=medium">
                     <?= _('Meine Einrichtungen') ?>
                 </button>
             </div>
diff --git a/app/views/file/choose_folder.php b/app/views/file/choose_folder.php
index d2d81f5..a50af25 100644
--- a/app/views/file/choose_folder.php
+++ b/app/views/file/choose_folder.php
@@ -203,13 +203,13 @@ switch ($top_folder->range_type) {
     <!-- neu -->
     <?= Studip\Button::create(_('Zurück'), [
         'formaction'  => $controller->action_url('choose_folder_from_course'),
-        'data-dialog' => '',
+        'data-dialog' => 'size=medium',
     ]) ?>
 <? elseif($top_folder->range_type === 'institute'): ?>
     <!-- neu -->
     <?= Studip\Button::create(_('Zurück'), [
         'formaction'  => $controller->action_url('choose_folder_from_institute'),
-        'data-dialog' => '',
+        'data-dialog' => 'size=medium',
     ]) ?>
 <? endif; ?>
 </footer>
diff --git a/app/views/file/choose_folder_from_course.php b/app/views/file/choose_folder_from_course.php
index 3496e5b..27bcb09 100644
--- a/app/views/file/choose_folder_from_course.php
+++ b/app/views/file/choose_folder_from_course.php
@@ -29,12 +29,12 @@ jQuery(function ($) {
         ->render() ?>
 <? else : ?>
 <form action="#" method="post" data-dialog>
-    <table class="default">
+    <table class="default sortable-table">
         <thead>
             <tr>
                 <th><?= _('Bild') ?></th>
-                <th><?= _('Name') ?></th>
-                <th><?= _('Semester') ?></th>
+                <th data-sort="text"><?= _('Name') ?></th>
+                <th data-sort="htmldata"><?= _('Semester') ?></th>
             </tr>
         </thead>
         <tbody>
@@ -42,17 +42,23 @@ jQuery(function ($) {
             <tr>
                 <td>
                     <!-- neu -->
-                    <button formaction="<?= $controller->link_for('file/choose_folder_from_course') ?>" name="course_id" value="<?= htmlReady($course->id) ?>" class="undecorated">
-                        <?= CourseAvatar::getAvatar($course->id)->getImageTag(Avatar::MEDIUM, ['style' => 'width: 50px; height: 50px;']) ?>
+                    <button formaction="<?= $controller->link_for('file/choose_folder_from_course') ?>"
+                            name="course_id"
+                            value="<?= htmlReady($course->id) ?>"
+                            class="undecorated">
+                        <?= CourseAvatar::getAvatar($course->id)->getImageTag(Avatar::MEDIUM, ['style' => 'width: 20px; height: 20px;']) ?>
                     </button>
                 </td>
-                <td>
+                <td data-sort-value="<?= Semester::find($course->id)->beginn ?>">
                     <!-- neu -->
-                    <button formaction="<?= $controller->link_for('file/choose_folder_from_course') ?>" name="course_id" value="<?= htmlReady($course->id) ?>" class="undecorated">
+                    <button formaction="<?= $controller->link_for('file/choose_folder_from_course') ?>"
+                            name="course_id"
+                            value="<?= htmlReady($course->id) ?>"
+                            class="undecorated">
                         <?= htmlReady($course->getFullname()) ?>
                     </button>
                 </td>
-                <td>
+                <td data-sort-value="<?= htmlReady($course->getTextualSemester()) ?>">
                     <?= htmlReady($course->getTextualSemester()) ?>
                 </td>
             </tr>
diff --git a/app/views/file/choose_folder_from_institute.php b/app/views/file/choose_folder_from_institute.php
index 02ae675..9a9298d 100644
--- a/app/views/file/choose_folder_from_institute.php
+++ b/app/views/file/choose_folder_from_institute.php
@@ -22,19 +22,19 @@ $options = array_filter([
     ?>
 <? else : ?>
 <form action="#" method="post" data-dialog>
-    <table class="default">
+    <table class="default sortable-table">
         <thead>
             <tr>
                 <th><?= _('Bild') ?></th>
-                <th><?= _('Name') ?></th>
+                <th data-sort="text"><?= _('Name') ?></th>
             </tr>
         </thead>
         <tbody>
         <? foreach (Institute::getMyInstitutes($GLOBALS['user']->id) as $institut) : ?>
             <tr>
-                <td>
+                <td data-sort-value="<?= htmlReady($institut['Name']) ?>">
                     <input type="image" class="undecorated"
-                           style="width: 50px; height: 50px;"
+                           style="width: 20px; height: 20px;"
                            formaction="<?= $controller->link_for('file/choose_folder_from_institute') ?>"
                            name="Institut_id"
                            value="<?= htmlReady($institut['Institut_id']) ?>"
@@ -43,7 +43,10 @@ $options = array_filter([
                                 ) ?>">
                 </td>
                 <td>
-                    <button formaction="<?= $controller->link_for('file/choose_folder_from_institute') ?>" name="Institut_id" value="<?= htmlReady($institut['Institut_id']) ?>" class="undecorated">
+                    <button formaction="<?= $controller->link_for('file/choose_folder_from_institute') ?>"
+                            name="Institut_id"
+                            value="<?= htmlReady($institut['Institut_id']) ?>"
+                            class="undecorated">
                         <?= htmlReady($institut['Name']) ?>
                     </button>
                 </td>
diff --git a/app/views/files/_flat_tfoot.php b/app/views/files/_flat_tfoot.php
index b18eda9..3a767bd 100644
--- a/app/views/files/_flat_tfoot.php
+++ b/app/views/files/_flat_tfoot.php
@@ -33,7 +33,7 @@ if ($table_id) {
                 <? endif ?>
                 <?= Studip\Button::create(_('Kopieren'), 'copy', [
                     'formaction'  => $controller->url_for('file/choose_destination/copy/bulk'),
-                    'data-dialog' => ''
+                    'data-dialog' => 'size=auto'
                 ]) ?>
                 <? if ($writable): ?>
                     <?= Studip\Button::create(_('Löschen'), 'delete', [
-- 
cgit v1.0