diff options
| author | Moritz Strohm <strohm@data-quest.de> | 2024-04-23 14:45:07 +0000 |
|---|---|---|
| committer | Moritz Strohm <strohm@data-quest.de> | 2024-04-23 14:45:07 +0000 |
| commit | 73482db31db6f82a66b210ce6dc346742720eecf (patch) | |
| tree | 22c7e12f706c37595e1ad6e2eb1c412c30d5732a /app | |
| parent | 3d4b1124bbbb07ffb9e656432f7a6a971d207897 (diff) | |
fix for BIESt 4009, fixes #4009
Closes #4009
Merge request studip/studip!2865
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/file/_terms_of_use_select.php | 22 | ||||
| -rw-r--r-- | app/views/file/new_edit_folder_form.php | 17 |
2 files changed, 19 insertions, 20 deletions
diff --git a/app/views/file/_terms_of_use_select.php b/app/views/file/_terms_of_use_select.php index 59cb507..c1aae00 100644 --- a/app/views/file/_terms_of_use_select.php +++ b/app/views/file/_terms_of_use_select.php @@ -24,20 +24,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 c1301d4..d2dd931 100644 --- a/app/views/file/new_edit_folder_form.php +++ b/app/views/file/new_edit_folder_form.php @@ -27,20 +27,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() ?> |
