Skip to content
Snippets Groups Projects
Commit 10a9fedd authored by Michaela Brückner's avatar Michaela Brückner :unicorn: Committed by Jan-Hendrik Willms
Browse files

adjust dialog size and table line height, fixes #1364

Closes #1364

Merge request !2202
parent 128da93c
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,8 @@ $options = array_filter([ ...@@ -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]) ?> <?= 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 <button
class="undecorated" 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') ?> <?= _('Aktueller Ordner') ?>
</button> </button>
</div> </div>
...@@ -42,8 +43,7 @@ $options = array_filter([ ...@@ -42,8 +43,7 @@ $options = array_filter([
<?= Icon::create('files')->asInput(50, ['formaction' => $controller->action_url('choose_folder/' . Folder::findTopFolder($GLOBALS['user']->id)->getId())]) ?> <?= Icon::create('files')->asInput(50, ['formaction' => $controller->action_url('choose_folder/' . Folder::findTopFolder($GLOBALS['user']->id)->getId())]) ?>
<button <button
class="undecorated" 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') ?> <?= _('Persönlicher Dateibereich') ?>
</button> </button>
</div> </div>
...@@ -51,7 +51,7 @@ $options = array_filter([ ...@@ -51,7 +51,7 @@ $options = array_filter([
<div class="clickable"> <div class="clickable">
<?= Icon::create('seminar')->asinput(50, ['formaction' => $controller->action_url('choose_folder_from_course')]) ?> <?= Icon::create('seminar')->asinput(50, ['formaction' => $controller->action_url('choose_folder_from_course')]) ?>
<button class="undecorated" <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') ?> <?= _('Meine Veranstaltungen') ?>
</button> </button>
</div> </div>
...@@ -59,7 +59,7 @@ $options = array_filter([ ...@@ -59,7 +59,7 @@ $options = array_filter([
<div class="clickable"> <div class="clickable">
<?= Icon::create('institute')->asInput(50, ['formaction' => $controller->action_url('choose_folder_from_institute')]) ?> <?= Icon::create('institute')->asInput(50, ['formaction' => $controller->action_url('choose_folder_from_institute')]) ?>
<button class="undecorated" <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') ?> <?= _('Meine Einrichtungen') ?>
</button> </button>
</div> </div>
......
...@@ -203,13 +203,13 @@ switch ($top_folder->range_type) { ...@@ -203,13 +203,13 @@ switch ($top_folder->range_type) {
<!-- neu --> <!-- neu -->
<?= Studip\Button::create(_('Zurück'), [ <?= Studip\Button::create(_('Zurück'), [
'formaction' => $controller->action_url('choose_folder_from_course'), 'formaction' => $controller->action_url('choose_folder_from_course'),
'data-dialog' => '', 'data-dialog' => 'size=medium',
]) ?> ]) ?>
<? elseif($top_folder->range_type === 'institute'): ?> <? elseif($top_folder->range_type === 'institute'): ?>
<!-- neu --> <!-- neu -->
<?= Studip\Button::create(_('Zurück'), [ <?= Studip\Button::create(_('Zurück'), [
'formaction' => $controller->action_url('choose_folder_from_institute'), 'formaction' => $controller->action_url('choose_folder_from_institute'),
'data-dialog' => '', 'data-dialog' => 'size=medium',
]) ?> ]) ?>
<? endif; ?> <? endif; ?>
</footer> </footer>
...@@ -29,12 +29,12 @@ jQuery(function ($) { ...@@ -29,12 +29,12 @@ jQuery(function ($) {
->render() ?> ->render() ?>
<? else : ?> <? else : ?>
<form action="#" method="post" data-dialog> <form action="#" method="post" data-dialog>
<table class="default"> <table class="default sortable-table">
<thead> <thead>
<tr> <tr>
<th><?= _('Bild') ?></th> <th><?= _('Bild') ?></th>
<th><?= _('Name') ?></th> <th data-sort="text"><?= _('Name') ?></th>
<th><?= _('Semester') ?></th> <th data-sort="htmldata"><?= _('Semester') ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -42,17 +42,23 @@ jQuery(function ($) { ...@@ -42,17 +42,23 @@ jQuery(function ($) {
<tr> <tr>
<td> <td>
<!-- neu --> <!-- 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') ?>"
<?= CourseAvatar::getAvatar($course->id)->getImageTag(Avatar::MEDIUM, ['style' => 'width: 50px; height: 50px;']) ?> name="course_id"
value="<?= htmlReady($course->id) ?>"
class="undecorated">
<?= CourseAvatar::getAvatar($course->id)->getImageTag(Avatar::MEDIUM, ['style' => 'width: 20px; height: 20px;']) ?>
</button> </button>
</td> </td>
<td> <td data-sort-value="<?= Semester::find($course->id)->beginn ?>">
<!-- neu --> <!-- 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()) ?> <?= htmlReady($course->getFullname()) ?>
</button> </button>
</td> </td>
<td> <td data-sort-value="<?= htmlReady($course->getTextualSemester()) ?>">
<?= htmlReady($course->getTextualSemester()) ?> <?= htmlReady($course->getTextualSemester()) ?>
</td> </td>
</tr> </tr>
......
...@@ -22,19 +22,19 @@ $options = array_filter([ ...@@ -22,19 +22,19 @@ $options = array_filter([
?> ?>
<? else : ?> <? else : ?>
<form action="#" method="post" data-dialog> <form action="#" method="post" data-dialog>
<table class="default"> <table class="default sortable-table">
<thead> <thead>
<tr> <tr>
<th><?= _('Bild') ?></th> <th><?= _('Bild') ?></th>
<th><?= _('Name') ?></th> <th data-sort="text"><?= _('Name') ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<? foreach (Institute::getMyInstitutes($GLOBALS['user']->id) as $institut) : ?> <? foreach (Institute::getMyInstitutes($GLOBALS['user']->id) as $institut) : ?>
<tr> <tr>
<td> <td data-sort-value="<?= htmlReady($institut['Name']) ?>">
<input type="image" class="undecorated" <input type="image" class="undecorated"
style="width: 50px; height: 50px;" style="width: 20px; height: 20px;"
formaction="<?= $controller->link_for('file/choose_folder_from_institute') ?>" formaction="<?= $controller->link_for('file/choose_folder_from_institute') ?>"
name="Institut_id" name="Institut_id"
value="<?= htmlReady($institut['Institut_id']) ?>" value="<?= htmlReady($institut['Institut_id']) ?>"
...@@ -43,7 +43,10 @@ $options = array_filter([ ...@@ -43,7 +43,10 @@ $options = array_filter([
) ?>"> ) ?>">
</td> </td>
<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']) ?> <?= htmlReady($institut['Name']) ?>
</button> </button>
</td> </td>
......
...@@ -33,7 +33,7 @@ if ($table_id) { ...@@ -33,7 +33,7 @@ if ($table_id) {
<? endif ?> <? endif ?>
<?= Studip\Button::create(_('Kopieren'), 'copy', [ <?= Studip\Button::create(_('Kopieren'), 'copy', [
'formaction' => $controller->url_for('file/choose_destination/copy/bulk'), 'formaction' => $controller->url_for('file/choose_destination/copy/bulk'),
'data-dialog' => '' 'data-dialog' => 'size=auto'
]) ?> ]) ?>
<? if ($writable): ?> <? if ($writable): ?>
<?= Studip\Button::create(_('Löschen'), 'delete', [ <?= Studip\Button::create(_('Löschen'), 'delete', [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment