diff --git a/app/views/admin/configuration/type-edit.php b/app/views/admin/configuration/type-edit.php index ecbbe555ab5a562b4991627a14709c28a0d52c55..6d277b45374617e59748c5b00a5766ec06e7281f 100644 --- a/app/views/admin/configuration/type-edit.php +++ b/app/views/admin/configuration/type-edit.php @@ -1,9 +1,8 @@ <? if ($type === 'boolean') : ?> <input type="hidden" name="value" value="0"> - <input type="checkbox" name="value" value="1" id="item-value" class="studip-checkbox" - <? if ($value) echo 'checked'; ?>> - <label for="item-value"> + <label> + <input type="checkbox" name="value" value="1" <? if ($value) echo 'checked'; ?>> <?= _('aktiviert') ?> </label> <? else : ?> diff --git a/app/views/admin/courseplanning/pick_color.php b/app/views/admin/courseplanning/pick_color.php index 2606041aa364523453a9f0684180daf931d026b7..b9a95b50f94bd1a2aa9e1c00e523e56a3f788c5b 100644 --- a/app/views/admin/courseplanning/pick_color.php +++ b/app/views/admin/courseplanning/pick_color.php @@ -3,8 +3,8 @@ <div id="event-color-picker"></div> - <input id="semtype-checkbox" name="event_color_semtype" type="checkbox" class="studip-checkbox" value="1"> - <label for="semtype-checkbox"> + <label> + <input name="event_color_semtype" type="checkbox" value="1"> <?= sprintf(_('Farbtyp für alle VA dieses Typs (%s) übernehmen'), htmlReady($semtype)) ?> </label> diff --git a/app/views/admin/courseplanning/viewcolumns.php b/app/views/admin/courseplanning/viewcolumns.php index da1abfa00c2e3fb2bdfda0e49ff3f72967bff0c0..cc072733fc1f95110c9706fe0442eba70864ce55 100644 --- a/app/views/admin/courseplanning/viewcolumns.php +++ b/app/views/admin/courseplanning/viewcolumns.php @@ -13,11 +13,11 @@ <? if($col['id'] == '0') continue; ?> <tr> <td> - <input id="column_view_<?= $col['id'] ?>" name="column_view[]" - class="studip-checkbox" type="checkbox" + <input name="column_view[]" + type="checkbox" value="<?= $col['id'] ?>" + title="<?= htmlReady($col['title']) ?>" <?= $col['visible'] ? 'checked' : '' ?>> - <label for="column_view_<?= $col['id'] ?>"><?= htmlReady($col['title']) ?></label> </td> <td class="actions"> <?= ActionMenu::get()->addLink( diff --git a/app/views/admin/install/mysql.php b/app/views/admin/install/mysql.php index 2e8f654f1b6267433d5f1cc7a2b6c389e30d451b..dbc330455352de487f659d2095e5a781e3576a7f 100644 --- a/app/views/admin/install/mysql.php +++ b/app/views/admin/install/mysql.php @@ -25,8 +25,7 @@ </div> <div class="type-checkbox"> - <input type="checkbox" name="create" id="create" value="1" checked - class="studip-checkbox"> + <input type="checkbox" name="create" id="create" value="1" checked> <label for="create"> <?= _('Versuche Datenbank anzulegen, falls sie noch nicht existiert') ?> </label> diff --git a/app/views/admin/install/prepare.php b/app/views/admin/install/prepare.php index ea93b077b2af4441b31916b65da7ad0d6741ea86..d504c551732dd8e6fc817a0fda59051fec1a310a 100644 --- a/app/views/admin/install/prepare.php +++ b/app/views/admin/install/prepare.php @@ -11,10 +11,10 @@ <li> <?php if (in_array($file, $required)): ?> <input type="hidden" name="files[]" value="<?= htmlReady($file) ?>"> - <input type="checkbox" checked disabled class="studip-checkbox"> + <input type="checkbox" checked disabled> <?php else: ?> <input type="checkbox" name="files[]" value="<?= htmlReady($file) ?>" - class="studip-checkbox" id="option-<?= $i ?>"> + id="option-<?= $i ?>"> <?php endif; ?> <label for="option-<?= $i ?>"> <strong <?php if (in_array($file, $required)): ?>class="required"<?php endif; ?>> diff --git a/app/views/consultation/admin/cancel_slot.php b/app/views/consultation/admin/cancel_slot.php index 569fe64f4792bf395a7391d39920d82018115e88..ee67f80fa323ecd4ac3e8238bd8ebe427141a97f 100644 --- a/app/views/consultation/admin/cancel_slot.php +++ b/app/views/consultation/admin/cancel_slot.php @@ -20,11 +20,9 @@ <ul class="list-unstyled"> <? foreach ($slot->bookings as $booking): ?> <li> - <input type="checkbox" name="ids[]" checked - class="studip-checkbox" - id="booking-<?= htmlReady($booking->id) ?>" - value="<?= htmlReady($booking->id) ?>"> - <label for="booking-<?= htmlReady($booking->id) ?>" class="undecorated"> + <label class="undecorated"> + <input type="checkbox" name="ids[]" checked + value="<?= htmlReady($booking->id) ?>"> <?= htmlReady($booking->user->getFullName()) ?> </label> </li> diff --git a/app/views/consultation/admin/index.php b/app/views/consultation/admin/index.php index c6b36c3028f581440c1e81164ecd9e6d5f556356..5d0a7dac0d14da6a9e830bd8ed2785df4fd8843f 100644 --- a/app/views/consultation/admin/index.php +++ b/app/views/consultation/admin/index.php @@ -23,11 +23,9 @@ <thead> <tr> <th> - <input type="checkbox" id="checkbox-proxy" - class="studip-checkbox" + <input type="checkbox" data-proxyfor=".consultation-overview tbody th :checkbox" data-activates=".consultation-overview tfoot button"> - <label for="checkbox-proxy"></label> </th> </th> <th><?= _('Uhrzeit') ?></th> @@ -40,10 +38,7 @@ <tbody id="block-<?= htmlReady($block['block']->id) ?>" <? if ($block['block']->is_expired) echo 'class="block-is-expired"'; ?>> <tr class="<? if ($block['block']->has_bookings) echo 'is-occupied'; ?>"> <th> - <input type="checkbox" id="slots-<?= htmLReady($block['block']->id) ?>-checkbox" - class="studip-checkbox" - data-proxyfor="#block-<?= htmlReady($block['block']->id) ?> :checkbox[name^=slot]"> - <label for="slots-<?= htmlReady($block['block']->id) ?>-checkbox"></label> + <input type="checkbox" data-proxyfor="#block-<?= htmlReady($block['block']->id) ?> :checkbox[name^=slot]"> </th> <th colspan="3"> <?= $this->render_partial('consultation/block-description.php', ['block' => $block['block']]) ?> @@ -88,10 +83,7 @@ <? foreach ($block['slots'] as $slot): ?> <tr id="slot-<?= htmlReady($slot->id) ?>" class="<? if ($slot->is_expired) echo 'slot-is-expired'; ?> <? if (count($slot->bookings) > 0) echo 'is-occupied'; ?>"> <td> - <input type="checkbox" name="slot-id[]" id="slot-<?= htmlReady($slot->id) ?>-checkbox" - class="studip-checkbox" - value="<?= htmlReady($block['block']->id) ?>-<?= htmlReady($slot->id) ?>"> - <label for="slot-<?= htmlReady($slot->id) ?>-checkbox"></label> + <input type="checkbox" name="slot-id[]" value="<?= htmlReady($block['block']->id) ?>-<?= htmlReady($slot->id) ?>"> </td> <td> <?= strftime('%R', $slot->start_time) ?> diff --git a/app/views/consultation/admin/ungrouped.php b/app/views/consultation/admin/ungrouped.php index 881c940d39e8ad10489af875a19739791ecabbe6..6ed21700c230acf1a640185c89c7d9b5cba2cfc0 100644 --- a/app/views/consultation/admin/ungrouped.php +++ b/app/views/consultation/admin/ungrouped.php @@ -25,11 +25,9 @@ <thead> <tr> <th> - <input type="checkbox" id="checkbox-block-proxy" - class="studip-checkbox" + <input type="checkbox" data-proxyfor=".block-overview tbody :checkbox" data-activates=".block-overview tfoot button"> - <label for="checkbox-block-proxy"></label> </th> <th><?= _('Tag') ?></th> <th><?= _('Zeit') ?></th> @@ -42,10 +40,7 @@ <? foreach ($blocks as $block): ?> <tr id="block-<?= htmlReady($block->id) ?>" class="<? if ($block->is_expired) echo 'block-is-expired'; ?> <? if ($block->has_bookings) echo 'is-occupied'; ?>"> <td> - <input type="checkbox" id="block-checkbox-<?= htmlReady($block->id) ?>" - name="block-id[]" - class="studip-checkbox" value="<?= htmlReady($block->id) ?>"> - <label for="block-checkbox-<?= htmlReady($block->id) ?>"></label> + <input type="checkbox" name="block-id[]" value="<?= htmlReady($block->id) ?>"> </td> <td> <?= strftime('%A, %x', $block->start) ?> @@ -139,11 +134,9 @@ <thead> <tr> <th> - <input type="checkbox" id="checkbox-slot-proxy" - class="studip-checkbox" + <input type="checkbox" data-proxyfor=".slot-overview tbody :checkbox" data-activates=".slot-overview tfoot button"> - <label for="checkbox-slot-proxy"></label> </th> </th> <th><?= _('Tag') ?></th> @@ -159,10 +152,7 @@ <? foreach ($slots as $slot): ?> <tr id="slot-<?= htmlReady($slot->id) ?>" class="<? if ($slot->is_expired) echo 'slot-is-expired'; ?> <? if (count($slot->bookings) > 0) echo 'is-occupied'; ?>"> <td> - <input type="checkbox" name="slot-id[]" id="slot-<?= htmlReady($slot->id) ?>" - class="studip-checkbox" - value="<?= htmlReady($slot->block_id) ?>-<?= htmlReady($slot->id) ?>"> - <label for="slot-<?= htmlReady($slot->id) ?>"></label> + <input type="checkbox" name="slot-id[]" value="<?= htmlReady($slot->block_id) ?>-<?= htmlReady($slot->id) ?>"> </td> <td> <?= strftime(_('%A, %x'), $slot->start_time) ?> diff --git a/app/views/files/_fileref_tr.php b/app/views/files/_fileref_tr.php index 06fe18cbcf2651b827c15e9982fc149d25e3d609..2bf7fe2db36190b2d010016db417f07da5050d9f 100644 --- a/app/views/files/_fileref_tr.php +++ b/app/views/files/_fileref_tr.php @@ -15,12 +15,9 @@ if ($file->isDownloadable($GLOBALS['user']->id)) { <td> <? if ($file->isDownloadable($GLOBALS['user']->id)) : ?> <input type="checkbox" - class="studip-checkbox" name="ids[]" - id="file_checkbox_<?= htmlReady($table_id) ?>_<?= htmlReady($file->getId()) ?>" value="<?= htmlReady($file->getId()) ?>" <?= in_array($file->getId(), (array) $marked_element_ids) ? 'checked' : '' ?>> - <label for="file_checkbox_<?= htmlReady($table_id) ?>_<?= htmlReady($file->getId()) ?>"></label> <? endif ?> </td> <? endif ?> diff --git a/app/views/files/_files_thead.php b/app/views/files/_files_thead.php index 7769a968b07bf0160c53eded0e8fd44757f6eb49..4bad9f793b01ef94843d75e0aaf4e08ff93761f9 100644 --- a/app/views/files/_files_thead.php +++ b/app/views/files/_files_thead.php @@ -17,7 +17,6 @@ <? if ($show_bulk_checkboxes) : ?> <th data-sort="false"> <input type="checkbox" - class="studip-checkbox" <?= $table_id ? 'data-proxyfor="table.documents[data-table_id=\'' . htmlReady($table_id) . '\'] tbody :checkbox"' : 'data-proxyfor="table.documents tbody :checkbox"' @@ -26,8 +25,7 @@ ? 'data-activates="table.documents[data-table_id=\'' . htmlReady($table_id) . '\'] tfoot .multibuttons .button"' : 'data-activates="table.documents tfoot .multibuttons .button"' ?> - id="all_files_checkbox_<?= htmlReady($table_id) ?>"> - <label for="all_files_checkbox_<?= htmlReady($table_id) ?>"></label> + > </th> <? endif ?> <th data-sort="htmldata"><?= _('Typ') ?></th> diff --git a/app/views/files/_folder_tr.php b/app/views/files/_folder_tr.php index a45fbba870c7bf367c2638cdf76fcfd61bd1b405..6d7dc8acceeb96fcd4015eb5111acac97ff0ceff 100644 --- a/app/views/files/_folder_tr.php +++ b/app/views/files/_folder_tr.php @@ -25,11 +25,8 @@ if ($folder->isReadable($GLOBALS['user']->id)) { <? if ($is_readable) : ?> <input type="checkbox" name="ids[]" - class="studip-checkbox" - id="file_checkbox_<?= $folder->id ?>" value="<?= $folder->id ?>" <? if (in_array($folder->getId(), (array)$marked_element_ids)) echo 'checked'; ?>> - <label for="file_checkbox_<?= $folder->id ?>"></label> <? endif?> </td> <td class="document-icon" data-sort-value="<?=crc32(get_class($folder))?>"> diff --git a/app/views/help_content/admin_overview.php b/app/views/help_content/admin_overview.php index ac697e076482197799ad05a7356fa21ba7472cce..5fc00529065083e7c6ed729384e43a3447c11dca 100644 --- a/app/views/help_content/admin_overview.php +++ b/app/views/help_content/admin_overview.php @@ -27,12 +27,8 @@ <? foreach ($help_contents as $help_content_id => $help_content) : ?> <tr> <td><input type="checkbox" name="help_content_status_<?= $help_content_id ?>" - id="help_content_status_<?= $help_content_id ?>" value="1" - class="studip-checkbox help_on" - <?= tooltip(_("Status der Hilfe (aktiv oder inaktiv)"), false) ?><?= ($help_content->visible) ? ' checked' : '' ?>> - <label for="help_content_status_<?= $help_content_id ?>"> - <? _('Status der Hilfe (aktiv oder inaktiv)') ?> - </label> + value="1" class="help_on" + <?= tooltip(_("Status der Hilfe (aktiv oder inaktiv)"), false) ?><?= $help_content->visible ? ' checked' : '' ?>> </td> <td><?= htmlReady($help_content->route) ?></td> <td><?= htmlReady($help_content->language) ?></td> diff --git a/app/views/profile_modules/index.php b/app/views/profile_modules/index.php index 4e49495d3fa972c67388b5c00b37adf4a6ad0879..10ef79963a3c0f82697f8cf18842a4d3e029d3b1 100644 --- a/app/views/profile_modules/index.php +++ b/app/views/profile_modules/index.php @@ -12,12 +12,12 @@ <div class="element_header"> <input type="hidden" name="modules[<?= htmlReady($id) ?>]" value="0"> - <input type="checkbox" value="1" class="studip-checkbox" - id="<?= md5($item['name']) ?>" name="modules[<?= htmlReady($id) ?>]" - onclick="jQuery(this).closest('form').submit()" - <? if ($item['activated']) echo 'checked'; ?>> + <label> + <input type="checkbox" value="1" + name="modules[<?= htmlReady($id) ?>]" + onclick="jQuery(this).closest('form').submit()" + <? if ($item['activated']) echo 'checked'; ?>> - <label for="<?= md5($item['name']) ?>"> <strong><?= htmlReady($item['name']) ?></strong> </label> </div> diff --git a/app/views/resources/property/_add_edit_form.php b/app/views/resources/property/_add_edit_form.php index 66cd7f9d8bec74b29d373bb86dc5bbe44a57357f..42c4955d48b8a1a1c7f4aa556f3a1af536fc5448 100644 --- a/app/views/resources/property/_add_edit_form.php +++ b/app/views/resources/property/_add_edit_form.php @@ -46,22 +46,20 @@ <?= _('Angezeigter Name') ?> <?= I18N::input('display_name', $display_name) ?> </label> -<input type="checkbox" name="searchable" id="searchable" class="studip-checkbox" - <?= $searchable ? 'checked="checked"' : '' ?> - <?= $property->system ? 'disabled="disabled"' : '' ?>> -<label for="searchable"> +<label> + <input type="checkbox" name="searchable" + <?= $searchable ? 'checked="checked"' : '' ?> + <?= $property->system ? 'disabled="disabled"' : '' ?>> <?= _('Diese Eigenschaft kann zur Suche genutzt werden.') ?> </label> -<input type="checkbox" value="1" name="info_label" id="info_label" class="studip-checkbox" - <?= $info_label ? 'checked="checked"' : '' ?>> -<label for="info_label"> +<label> + <input type="checkbox" value="1" name="info_label" + <?= $info_label ? 'checked="checked"' : '' ?>> <?= _('Diese Eigenschaft soll im Info-Icon zu einem Raum angezeigt werden.') ?> </label> -<input type="checkbox" name="range_search" value="1" class="studip-checkbox" id="range_search" - <?= $range_search - ? 'checked="checked"' - : '' ?> - <?= $property->system ? 'disabled="disabled"' : '' ?>> -<label for="range_search"> +<label> + <input type="checkbox" name="range_search" value="1" + <?= $range_search ? 'checked="checked"' : '' ?> + <?= $property->system ? 'disabled="disabled"' : '' ?>> <?= _('Suchkriterium mit Intervall') ?> </label> diff --git a/app/views/resources/room_request/_add_edit_form.php b/app/views/resources/room_request/_add_edit_form.php index 94c90f39c4d252ca082318143387b52cc5c32ce7..1650961113e5ad110e299800c668638068b1872b 100644 --- a/app/views/resources/room_request/_add_edit_form.php +++ b/app/views/resources/room_request/_add_edit_form.php @@ -1,9 +1,9 @@ <? if ($show_form): ?> <form class="default" method="post" action="<?= $form_action_link ?>" data-dialog="reload-on-close"> <input type="hidden" name="origin_url" value="<?= htmlReady($origin_url) ?>"> - <input type="checkbox" id="multiday" <?= ($begin_date_str != $end_date_str) ? 'checked' : ''; ?> - onClick="$('#end_date_section').toggle();" class="studip-checkbox"> - <label for="multiday"> + <label> + <input type="checkbox" <?= ($begin_date_str != $end_date_str) ? 'checked' : ''; ?> + onClick="$('#end_date_section').toggle();"> <?= _('Mehrtägig') ?> </label> <section> diff --git a/resources/assets/stylesheets/less/forms.less b/resources/assets/stylesheets/less/forms.less index f3fa397039b5ac801738148e95939934c2097bb5..e4f75bafa4328acd931fabc3d3c1a68af6c2d6da 100644 --- a/resources/assets/stylesheets/less/forms.less +++ b/resources/assets/stylesheets/less/forms.less @@ -463,30 +463,6 @@ form.narrow { } } -.studip-checkbox { - display: none; - + label { - .icon('before', 'checkbox-unchecked', 'clickable', 16, 5px); - cursor: pointer; - } - &:checked + label { - .icon('before', 'checkbox-checked', 'clickable', 16, 5px); - } - &:indeterminate + label { - .icon('before', 'checkbox-indeterminate', 'clickable', 16, 5px); - } - - &[disabled] { - + label { - .icon('before', 'checkbox-unchecked', 'inactive', 16, 5px); - } - - &:checked + label { - .icon('before', 'checkbox-checked', 'inactive', 16, 5px); - } - } -} - // give forms some optimized styling for very narrow screen sizes .media-breakpoint-tiny-down({ form.default { diff --git a/resources/assets/stylesheets/less/skiplinks.less b/resources/assets/stylesheets/less/skiplinks.less index f6df62bbd73356c49903d032b9770ca0c481daf1..edbf09a17cf9b8799373b6eaafdcde7117d8e9cb 100644 --- a/resources/assets/stylesheets/less/skiplinks.less +++ b/resources/assets/stylesheets/less/skiplinks.less @@ -26,12 +26,8 @@ } body.enable-skiplinks { - *:focus, - .focus_box, - .studip-checkbox:focus + label { - &:not(:empty) { - outline: 2px dashed @orange; - } + *:not(:empty):focus { + outline: 2px dashed @orange; } #tabs { diff --git a/resources/assets/stylesheets/scss/installer.scss b/resources/assets/stylesheets/scss/installer.scss index d7a31000b13ff7a3324d7d9df2fbd657d82946a6..9268b9c9cfffc113f02fb3da34ebeb68835bde61 100644 --- a/resources/assets/stylesheets/scss/installer.scss +++ b/resources/assets/stylesheets/scss/installer.scss @@ -233,10 +233,6 @@ } } } - .studip-checkbox + label { - float: none; - width: auto; - } .messagebox { margin-bottom: 2em; diff --git a/resources/vue/components/FilesTable.vue b/resources/vue/components/FilesTable.vue index 44605013b2a63b10e4737da9ccb26e0fa18ea43a..4587265a756b9b68498a9c29f12170719ee9fea6 100644 --- a/resources/vue/components/FilesTable.vue +++ b/resources/vue/components/FilesTable.vue @@ -46,7 +46,6 @@ <tr class="sortable"> <th v-if="show_bulk_actions" data-sort="false"> <studip-proxy-checkbox - type="studip" v-model="selectedIds" :total="allIds" ></studip-proxy-checkbox> @@ -107,7 +106,6 @@ <td v-if="show_bulk_actions"> <studip-proxied-checkbox name="ids[]" - type="studip" :value="folder.id" v-model="selectedIds" ></studip-proxied-checkbox> @@ -153,7 +151,6 @@ <td v-if="show_bulk_actions"> <studip-proxied-checkbox name="ids[]" - type="studip" :value="file.id" v-model="selectedIds" ></studip-proxied-checkbox> diff --git a/resources/vue/components/StudipProxiedCheckbox.vue b/resources/vue/components/StudipProxiedCheckbox.vue index fc8a5328196951d705cee76f8641924fe583d3af..76d07852b8de1f11f03e3d282f45b025180e3bce 100644 --- a/resources/vue/components/StudipProxiedCheckbox.vue +++ b/resources/vue/components/StudipProxiedCheckbox.vue @@ -9,7 +9,6 @@ export default { props: { name: String, id: String, - type: String, value: { required: true }, @@ -41,9 +40,6 @@ export default { }, render (createElement) { const checkbox = createElement('input', { - class: { - 'studip-checkbox': this.type === 'studip' - }, attrs: { type: 'checkbox', name: this.name, @@ -58,22 +54,7 @@ export default { } }); - if (this.type !== 'studip') { - return checkbox; - } - - return createElement('span', { - style: { - display: 'contents', - }, - }, [ - checkbox, - createElement('label', { - attrs: { - for: this.proxiedId - } - }), - ]); + return checkbox; } }; </script> diff --git a/resources/vue/components/StudipProxyCheckbox.vue b/resources/vue/components/StudipProxyCheckbox.vue index 91d49b69ad1b8c356a43b59d9c5badaa1599febe..b9cd2187429f167dfb489032b8a4c1001e9fa8b9 100644 --- a/resources/vue/components/StudipProxyCheckbox.vue +++ b/resources/vue/components/StudipProxyCheckbox.vue @@ -8,7 +8,6 @@ export default { }, props: { id: String, - type: String, total: { type: Array, required: true @@ -36,9 +35,6 @@ export default { }, render (createElement) { const checkbox = createElement('input', { - class: { - 'studip-checkbox': this.type === 'studip' - }, attrs: { type: 'checkbox', name: this.name, @@ -53,23 +49,7 @@ export default { } }); - if (this.type !== 'studip') { - return checkbox; - } - - return createElement('span', { - style: { - display: 'contents', - }, - }, [ - checkbox, - createElement('label', { - attrs: { - for: this.proxyId - } - }), - ]); - + return checkbox; } }; </script> diff --git a/templates/sidebar/clipboard-area.php b/templates/sidebar/clipboard-area.php index c51825405071b0e7626401a2cf99b3e33bfeec69..6aa036b30343d52a9323c94c9624d55250963220 100644 --- a/templates/sidebar/clipboard-area.php +++ b/templates/sidebar/clipboard-area.php @@ -99,18 +99,19 @@ : '' ?>" data-range_id="<?= htmlReady($item['range_id']) ?>"> <td class="item-name"> - <input type="checkbox" - name="selected_clipboard_items[]" - title="<?= _('Diesen Eintrag auswählen.') ?>" - value="<?= htmlReady($item['id']) ?>" - id="<?= htmlReady($checkbox_id) ?>" - <?= in_array($item['id'], $selected_clipboard_items) - ? 'checked="checked"' - : (!$selected_clipboard_items - ? 'checked="checked"' - : '') ?> - class="studip-checkbox"> - <label for="<?= htmlReady($checkbox_id) ?>"><?= htmlReady($item['name']) ?></label> + <label> + <input type="checkbox" + name="selected_clipboard_items[]" + title="<?= _('Diesen Eintrag auswählen.') ?>" + value="<?= htmlReady($item['id']) ?>" + <?= in_array($item['id'], $selected_clipboard_items) + ? 'checked="checked"' + : (!$selected_clipboard_items + ? 'checked="checked"' + : '') ?> + > + <?= htmlReady($item['name']) ?> + </label> </td> <? if (!$readonly): ?> <td class="item-actions"> @@ -149,8 +150,7 @@ <input type="checkbox" name="selected_clipboard_items[]" value="" - class="studip-checkbox item-id"> - <label></label> + class="item-id"> </td> <? if (!$readonly): ?> <td class="item-actions"> @@ -192,9 +192,7 @@ <td> <input type="checkbox" name="clipboard_selected_items[]" - value="" - class="studip-checkbox"> - <label></label> + value=""> </td> <td> <?= Icon::create('trash', 'clickable')->asImg( diff --git a/templates/sidebar/options-widget-form.php b/templates/sidebar/options-widget-form.php index ea73083e60252e0f965ec5054723249201975081..0c6e212388c9e2508866196da461b336b54964e4 100644 --- a/templates/sidebar/options-widget-form.php +++ b/templates/sidebar/options-widget-form.php @@ -7,7 +7,6 @@ <? if ($element['type'] == 'checkbox'): ?> <input type="checkbox" name="<?= htmlReady($element['name']) ?>" value="<?= htmlReady($element['value']) ?>" - class="<?= '' /*studip-checkbox*/ ?>" <?= $element['checked'] ? 'checked="checked"' : '' ?>> <label for="<?= htmlReady($element['name']) ?>"> <?= htmlReady($element['label']) ?> diff --git a/templates/sidebar/room-clipboard-item.php b/templates/sidebar/room-clipboard-item.php index 60422186cb51784b71ee13895b8e99a696164f8d..c7d5734d2623ecf93324b1c5252a6dcf9e2e6d11 100644 --- a/templates/sidebar/room-clipboard-item.php +++ b/templates/sidebar/room-clipboard-item.php @@ -31,19 +31,20 @@ if (!$item) { <tr class="<?= htmlReady($classes) ?>" data-range_id="<?= htmlReady($item['range_id']) ?>"> <td class="item-name"> - <input type="checkbox" - name="selected_clipboard_items[]" - title="<?= _('Diesen Raum auswählen.') ?>" - value="<?= htmlReady($item['id']) ?>" - <?= $checkbox_id ? sprintf('id="%s"', htmlReady($checkbox_id)) : ''?> - <?= in_array($item['id'], $selected_clipboard_items) - ? 'checked="checked"' - : (!$selected_clipboard_items - ? 'checked="checked"' - : '' - ) ?> - class="studip-checkbox"> - <label for="<?= htmlReady($checkbox_id) ?>"></label><?= htmlReady($item['name']) ?> + <label> + <input type="checkbox" + name="selected_clipboard_items[]" + title="<?= _('Diesen Raum auswählen.') ?>" + value="<?= htmlReady($item['id']) ?>" + <?= in_array($item['id'], $selected_clipboard_items) + ? 'checked="checked"' + : (!$selected_clipboard_items + ? 'checked="checked"' + : '' + ) ?> + > + <?= htmlReady($item['name']) ?> + </label> </td> <td class="item-actions"> <? diff --git a/templates/sidebar/room-search-criteria-available-range.php b/templates/sidebar/room-search-criteria-available-range.php index ec06cbeea1b6af3ce94a6c0f0fa42bf7e16cd34e..1a07f65b3c115acc134f0bb07c58182b0f26843c 100644 --- a/templates/sidebar/room-search-criteria-available-range.php +++ b/templates/sidebar/room-search-criteria-available-range.php @@ -38,7 +38,7 @@ */ ?> <li class="item"> - <input type="checkbox" class="special-item-switch studip-checkbox" value="1" + <input type="checkbox" class="special-item-switch" value="1" title="<?= _('Kriterium ausgewählt'); ?>" id="cb_<?= htmlReady($criteria['name']); ?>" name="<?= htmlReady($criteria['name'] . '_enabled')?>" <?= $criteria['enabled'] ? 'checked="checked"' : ''?>> diff --git a/templates/sidebar/room-search-criteria.php b/templates/sidebar/room-search-criteria.php index df16cf707e7d08db567c8157bd5a677c6312650e..918de6ebb78adfffc9a82c6fb5bed8ba9645a779 100644 --- a/templates/sidebar/room-search-criteria.php +++ b/templates/sidebar/room-search-criteria.php @@ -29,7 +29,7 @@ ) ?> <? endif ?> <? if ($criteria['switch']): ?> - <input type="checkbox" class="special-item-switch studip-checkbox" value="1" + <input type="checkbox" class="special-item-switch" value="1" title="<?= _('Kriterium ausgewählt'); ?>" id="cb_<?= htmlReady($criteria['name']); ?>" name="<?= htmlReady($criteria['name'] . '_enabled')?>" <?= $criteria['enabled'] ? 'checked="checked"' : ''?>>