From 6bc51a71aa09d4f3e7797631517707851ce19acf Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Mon, 11 Nov 2024 13:56:06 +0000 Subject: set default icon size to 20, fixes #2801 Closes #2801 Merge request studip/studip!1908 --- .stylelintrc.json | 1 + app/controllers/admin/courses.php | 2 +- app/controllers/admin/role.php | 2 +- app/controllers/admin/statusgroups.php | 18 +- app/controllers/course/files.php | 11 +- app/controllers/course/grouping.php | 4 +- app/controllers/course/members.php | 2 +- app/controllers/course/room_requests.php | 2 +- app/controllers/course/studygroup.php | 4 +- app/controllers/files.php | 15 +- app/controllers/files_dashboard/helpers.php | 14 +- app/controllers/files_dashboard/sidebar.php | 2 +- app/controllers/help_content.php | 3 +- app/controllers/institute/files.php | 9 +- app/controllers/institute/members.php | 5 +- app/controllers/messages.php | 2 +- app/controllers/my_ilias_accounts.php | 2 +- app/controllers/oer/admin.php | 4 +- app/controllers/privacy.php | 22 +- app/controllers/profile.php | 10 +- app/controllers/public_courses.php | 12 +- app/controllers/settings/categories.php | 2 +- app/views/admin/autoinsert/index.php | 9 +- app/views/admin/autoinsert/manual.php | 33 +- app/views/admin/course_wizard_steps/index.php | 21 +- app/views/admin/holidays/index.php | 5 +- app/views/admin/ilias_interface/edit_server.php | 2 +- app/views/admin/ilias_interface/index.php | 7 +- app/views/admin/licenses/index.php | 9 +- app/views/admin/lockrules/index.php | 12 +- app/views/admin/login_style/index.php | 20 +- app/views/admin/plugin/index.php | 25 +- app/views/admin/role/assign_role.php | 2 +- app/views/admin/role/show_role.php | 13 +- app/views/admin/sem_classes/_sem_type.php | 10 +- app/views/admin/sem_classes/details.php | 11 +- app/views/admin/sem_classes/overview.php | 4 +- app/views/admin/semester/index.php | 10 +- app/views/admin/statusgroups/_members.php | 18 +- app/views/admin/user/list_files.php | 2 +- app/views/admin/webservice_access/index.php | 30 +- app/views/admin/webservice_access/test.php | 12 +- app/views/admission/courseset/index.php | 4 +- app/views/admission/rule/save.php | 6 +- app/views/admission/rule/select_type.php | 2 +- app/views/admission/userlist/configure.php | 2 +- app/views/blubber/compose.php | 6 +- app/views/blubber/private_to_studygroup.php | 2 +- app/views/calendar/contentbox/_termin.php | 2 +- app/views/calendar/contentbox/display.php | 4 +- app/views/course/dates/_date_row-exdate.php | 2 +- app/views/course/dates/_date_row.php | 2 +- app/views/course/dates/current_day_dates.php | 2 +- app/views/course/dates/new_topic.php | 2 +- app/views/course/feedback/index.php | 4 +- app/views/course/forum/admin/childs.php | 8 +- app/views/course/forum/index/_breadcrumb.php | 2 +- app/views/course/forum/index/_favorite.php | 4 +- app/views/course/forum/index/_post.php | 4 +- app/views/course/lvgselector/form.php | 4 +- app/views/course/lvgselector/selected_entry.php | 4 +- app/views/course/members/awaiting_list.php | 7 +- app/views/course/members/tutor_list.php | 7 +- app/views/course/statusgroups/_member.php | 65 ++-- app/views/course/studygroup/_choose_founders.php | 25 +- .../course/timesrooms/_bookable_rooms_icon.php | 2 +- app/views/course/timesrooms/editDate.php | 11 +- app/views/course/wiki/blame.php | 2 +- app/views/file/_file_aside.php | 2 +- app/views/file/_terms_of_use_select.php | 6 +- app/views/file/choose_file.php | 2 +- app/views/file/choose_file_from_course.php | 2 +- app/views/file/choose_folder.php | 2 +- app/views/file/new_edit_folder_form.php | 4 +- app/views/file/suggest_oer.php | 1 - app/views/files/_folder_tr.php | 16 +- app/views/materialien/files/add_dokument.php | 2 +- app/views/materialien/files/range.php | 2 +- app/views/messages/_message_row.php | 4 +- app/views/messages/overview.php | 4 +- app/views/messages/read.php | 2 +- app/views/messages/write.php | 2 +- app/views/my_courses/archive.php | 14 +- app/views/my_courses/group_selector.php | 2 +- app/views/my_institutes/index.php | 6 +- app/views/my_studygroups/_course.php | 8 +- app/views/my_studygroups/index.php | 2 +- app/views/oer/admin/hosts.php | 18 +- app/views/oer/market/_details_file.php | 4 +- app/views/oer/market/_searchform.php | 22 +- app/views/oer/market/add_to_course.php | 2 +- app/views/oer/market/details.php | 14 +- app/views/oer/market/discussion.php | 2 +- app/views/oer/market/profile.php | 3 +- app/views/oer/mymaterial/_material_list.php | 6 +- app/views/oer/mymaterial/edit.php | 6 +- app/views/public_courses/index.php | 4 +- .../_answer_description_container.php | 4 +- app/views/questionnaire/_question.php | 8 +- app/views/questionnaire/_widget_questionnaire.php | 2 +- app/views/questionnaire/context.php | 4 +- .../freetext/freetext_evaluation.php | 2 +- .../questionnaire/question_types/info/info.php | 2 +- .../question_types/likert/likert_evaluation.php | 4 +- .../rangescale/rangescale_evaluation.php | 4 +- .../question_types/vote/vote_evaluation.php | 4 +- app/views/questionnaire/widget.php | 8 +- app/views/resources/_common/building.php | 2 +- app/views/resources/_common/location.php | 2 +- app/views/resources/admin/categories.php | 2 +- app/views/resources/category/_add_edit_form.php | 8 +- .../room_management/planning/copy_bookings.php | 14 +- app/views/score/index.php | 14 +- app/views/search/module/_drill_down_list.php | 29 +- app/views/settings/categories.php | 10 +- app/views/settings/statusgruppen/modify.php | 4 +- app/views/studiengaenge/versionen/abschnitte.php | 8 +- app/views/userfilter/filter/configure.php | 2 +- .../preferentialadmission/templates/configure.php | 2 +- lib/classes/HTMLAttributes.php | 218 ++++++++++++ lib/classes/Icon.php | 99 +++--- lib/classes/MyRealmModel.php | 5 +- lib/filesystem/FilesystemVueDataManager.php | 12 +- lib/filesystem/LibraryFile.php | 6 +- lib/filesystem/StandardFile.php | 14 +- lib/filesystem/URLFile.php | 2 +- lib/models/PersonalNotifications.php | 2 +- lib/modules/ActivityFeed.php | 11 +- lib/modules/Blubber.php | 5 +- lib/modules/ConsultationModule.php | 2 +- lib/modules/CoreAdmin.php | 3 +- lib/modules/CoreCalendar.php | 2 +- lib/modules/CoreDocuments.php | 7 +- lib/modules/CoreForum.php | 7 +- lib/modules/CoreOverview.php | 7 +- lib/modules/CoreParticipants.php | 6 +- lib/modules/CorePersonal.php | 2 +- lib/modules/CoreSchedule.php | 7 +- lib/modules/CoreScm.php | 8 +- lib/modules/CoreStudygroupAdmin.php | 3 +- lib/modules/CoreStudygroupParticipants.php | 2 +- lib/modules/CoreWiki.php | 7 +- lib/modules/CoursewareModule.php | 14 +- lib/modules/FeedbackModule.php | 2 +- lib/modules/GradebookModule.php | 7 +- lib/modules/IliasInterfaceModule.php | 17 +- lib/modules/LtiToolModule.php | 7 +- lib/modules/NewsWidget.php | 30 +- lib/modules/QuickSelection.php | 7 +- lib/modules/TerminWidget.php | 7 +- lib/statusgruppe.inc.php | 2 +- lib/visual.inc.php | 16 +- resources/assets/javascripts/lib/fullcalendar.js | 2 +- resources/assets/stylesheets/highcontrast.scss | 4 +- resources/assets/stylesheets/mixins/studip.scss | 53 ++- resources/assets/stylesheets/print.scss | 4 +- resources/assets/stylesheets/scss/actionmenu.scss | 25 +- .../assets/stylesheets/scss/admin-courses.scss | 6 +- resources/assets/stylesheets/scss/admin.scss | 6 +- resources/assets/stylesheets/scss/ajax.scss | 12 +- resources/assets/stylesheets/scss/article.scss | 4 +- resources/assets/stylesheets/scss/buttons.scss | 14 +- resources/assets/stylesheets/scss/clipboard.scss | 6 +- resources/assets/stylesheets/scss/content_box.scss | 2 +- resources/assets/stylesheets/scss/contentbar.scss | 2 +- .../stylesheets/scss/courseware/blockadder.scss | 20 +- .../scss/courseware/blocks/biography.scss | 8 +- .../stylesheets/scss/courseware/blocks/canvas.scss | 16 +- .../scss/courseware/blocks/default-block.scss | 5 +- .../scss/courseware/blocks/dialog-cards.scss | 12 +- .../stylesheets/scss/courseware/blocks/files.scss | 50 +-- .../scss/courseware/blocks/gallery.scss | 8 +- .../scss/courseware/blocks/headline.scss | 74 ++-- .../scss/courseware/blocks/keypoint.scss | 4 +- .../stylesheets/scss/courseware/blocks/link.scss | 10 +- .../stylesheets/scss/courseware/blocks/lti.scss | 2 +- .../courseware/containers/default-container.scss | 5 +- .../scss/courseware/layouts/collapsible.scss | 4 +- .../scss/courseware/layouts/companion.scss | 6 +- .../scss/courseware/layouts/radioset.scss | 10 +- .../scss/courseware/layouts/ribbon.scss | 12 +- .../stylesheets/scss/courseware/layouts/tabs.scss | 8 +- .../scss/courseware/layouts/talk-bubble.scss | 6 +- .../stylesheets/scss/courseware/layouts/tile.scss | 4 +- .../stylesheets/scss/courseware/layouts/tree.scss | 22 +- .../scss/courseware/structural-element.scss | 4 +- .../stylesheets/scss/courseware/widgets.scss | 34 +- resources/assets/stylesheets/scss/css_tree.scss | 2 +- resources/assets/stylesheets/scss/dialog.scss | 18 +- resources/assets/stylesheets/scss/documents.scss | 4 +- resources/assets/stylesheets/scss/forms.scss | 10 +- resources/assets/stylesheets/scss/forum.scss | 6 +- resources/assets/stylesheets/scss/fullscreen.scss | 2 +- .../assets/stylesheets/scss/globalsearch.scss | 10 +- resources/assets/stylesheets/scss/header.scss | 15 +- .../assets/stylesheets/scss/jquery-ui/custom.scss | 4 +- .../assets/stylesheets/scss/jquery-ui/studip.scss | 6 +- resources/assets/stylesheets/scss/links.scss | 8 +- resources/assets/stylesheets/scss/messagebox.scss | 6 +- resources/assets/stylesheets/scss/messages.scss | 2 +- resources/assets/stylesheets/scss/mvv.scss | 16 +- resources/assets/stylesheets/scss/plugins.scss | 2 +- resources/assets/stylesheets/scss/plus.scss | 5 - .../stylesheets/scss/progress_indicator.scss | 2 +- resources/assets/stylesheets/scss/raumzeit.scss | 2 +- resources/assets/stylesheets/scss/report.scss | 2 +- resources/assets/stylesheets/scss/resources.scss | 4 +- resources/assets/stylesheets/scss/search.scss | 10 +- resources/assets/stylesheets/scss/selects.scss | 12 +- resources/assets/stylesheets/scss/sidebar.scss | 23 +- .../assets/stylesheets/scss/studip-cke-ui.scss | 10 +- .../assets/stylesheets/scss/studip-selection.scss | 8 +- resources/assets/stylesheets/scss/tables.scss | 18 +- resources/assets/stylesheets/scss/talk-bubble.scss | 4 +- resources/assets/stylesheets/scss/tooltip.scss | 5 +- resources/assets/stylesheets/scss/variables.scss | 386 +++++++++++---------- resources/assets/stylesheets/scss/wiki.scss | 4 +- resources/assets/stylesheets/scss/wizard.scss | 1 - resources/assets/stylesheets/studip-jquery-ui.scss | 2 +- resources/assets/stylesheets/studip.scss | 14 +- resources/vue/components/AdminCourses.vue | 35 -- resources/vue/components/EditableList.vue | 4 +- resources/vue/components/MemcachedCacheConfig.vue | 2 +- resources/vue/components/MyCoursesTables.vue | 7 +- resources/vue/components/SearchWidget.vue | 3 +- resources/vue/components/SearchWithFilter.vue | 6 +- resources/vue/components/StudipIcon.vue | 36 +- resources/vue/components/StudipSquareButton.vue | 3 +- resources/vue/components/blubber/SearchWidget.vue | 4 +- .../vue/components/blubber/ThreadSubscriber.vue | 4 +- .../toolbar/CoursewareBlockadderItem.vue | 2 +- .../courseware/widgets/CoursewareSearchWidget.vue | 4 +- .../widgets/CoursewareTasksActionWidget.vue | 6 +- .../vue/components/questionnaires/InputArray.vue | 3 +- .../vue/components/responsive/NavigationItem.vue | 2 +- .../vue/components/stock-images/SearchWidget.vue | 4 +- resources/vue/components/tree/StudipTreeList.vue | 6 +- resources/vue/components/tree/StudipTreeNode.vue | 2 +- resources/vue/components/tree/TreeBreadcrumb.vue | 2 +- resources/vue/components/tree/TreeExportWidget.vue | 2 +- resources/vue/components/tree/TreeSearchResult.vue | 2 +- templates/_standard_loginform.php | 4 +- templates/admin/topLinks.php | 8 +- templates/blubber/course_context.php | 4 +- templates/blubber/disable-notifications.php | 4 +- templates/blubber/global_context.php | 4 +- templates/blubber/private_context.php | 4 +- templates/blubber/public_context.php | 6 +- templates/contact/header-groups.php | 2 +- templates/contact/index.php | 4 +- templates/contact/legend.php | 14 +- templates/forms/form.php | 2 +- templates/news/comment-box.php | 7 +- templates/online/user.php | 14 +- templates/quicksearch/selectbox.php | 8 +- templates/sidebar/clipboard-widget.php | 16 +- templates/sidebar/resource-tree-widget.php | 33 +- .../resources_individual_booking_plan_sidebar.php | 13 +- templates/sidebar/room-clipboard-item.php | 33 +- templates/sidebar/room-clipboard-widget.php | 14 +- templates/sidebar/search-widget.php | 19 +- templates/start/_jstemplates.php | 18 +- tests/unit/lib/classes/IconClassTest.php | 86 ++--- 263 files changed, 1644 insertions(+), 1336 deletions(-) create mode 100644 lib/classes/HTMLAttributes.php diff --git a/.stylelintrc.json b/.stylelintrc.json index 388914d..2673782 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -18,6 +18,7 @@ "color-no-invalid-hex": null, "comment-empty-line-before": null, "comment-whitespace-inside": null, + "custom-property-empty-line-before": null, "declaration-bang-space-after": null, "declaration-bang-space-before": null, "declaration-block-no-duplicate-properties": null, diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php index 9e9423d..3d63cd9 100644 --- a/app/controllers/admin/courses.php +++ b/app/controllers/admin/courses.php @@ -697,7 +697,7 @@ class Admin_CoursesController extends AuthenticatedController foreach ($icons as $icon) { $d['contents'] .= '
  • getTitle() ? ' title="'.htmlReady($icon->getTitle()).'"' : '') .'> - '. $icon->getImage()->asImg(20) .' + '. $icon->getImage()->asImg() .'
    • '; } diff --git a/app/controllers/admin/role.php b/app/controllers/admin/role.php index c316021..890965a 100644 --- a/app/controllers/admin/role.php +++ b/app/controllers/admin/role.php @@ -548,7 +548,7 @@ class Admin_RoleController extends AuthenticatedController $actions->addLink( _('Neue Rolle anlegen'), $this->url_for('admin/role/add'), - Icon::create('add', 'clickable') + Icon::create('add') )->asDialog('size=auto'); } diff --git a/app/controllers/admin/statusgroups.php b/app/controllers/admin/statusgroups.php index 5851d48..b634a9a 100644 --- a/app/controllers/admin/statusgroups.php +++ b/app/controllers/admin/statusgroups.php @@ -68,14 +68,16 @@ class Admin_StatusgroupsController extends AuthenticatedController $sidebar = Sidebar::get(); if ($this->tutor) { $widget = new ActionsWidget(); - $widget->addLink(_('Neue Gruppe anlegen'), - $this->url_for('admin/statusgroups/editGroup'), - Icon::create('add', 'clickable')) - ->asDialog('size=auto'); - $widget->addLink(_('Gruppenreihenfolge ändern'), - $this->url_for('admin/statusgroups/sortGroups'), - Icon::create('arr_2down', 'clickable')) - ->asDialog(); + $widget->addLink( + _('Neue Gruppe anlegen'), + $this->url_for('admin/statusgroups/editGroup'), + Icon::create('add') + )->asDialog('size=auto'); + $widget->addLink( + _('Gruppenreihenfolge ändern'), + $this->url_for('admin/statusgroups/sortGroups'), + Icon::create('arr_2down') + )->asDialog(); $sidebar->addWidget($widget); } // Collect all groups diff --git a/app/controllers/course/files.php b/app/controllers/course/files.php index 4370eea..e40ac45 100644 --- a/app/controllers/course/files.php +++ b/app/controllers/course/files.php @@ -54,16 +54,15 @@ class Course_FilesController extends AuthenticatedController $actions->addLink( _("Ordner bearbeiten"), $this->url_for("file/edit_folder/".$this->topFolder->getId()), - Icon::create("edit", "clickable"), - ['data-dialog' => 1] - ); + Icon::create('edit') + )->asDialog(); } if ($this->topFolder && $this->topFolder->isSubfolderAllowed($GLOBALS['user']->id)) { $actions->addLink( _('Neuer Ordner'), URLHelper::getUrl('dispatch.php/file/new_folder/' . $this->topFolder->getId()), - Icon::create('folder-empty', 'clickable') + Icon::create('folder-empty') )->asDialog(); } @@ -71,7 +70,7 @@ class Course_FilesController extends AuthenticatedController $actions->addLink( _('Dokument hinzufügen'), '#', - Icon::create('add', 'clickable'), + Icon::create('add'), ['onclick' => "STUDIP.Files.openAddFilesWindow(); return false;"] ); } @@ -164,7 +163,7 @@ class Course_FilesController extends AuthenticatedController $actions->addLink( _('Neue Dateien herunterladen'), $this->url_for('course/files/newest_files'), - Icon::create('download', 'clickable'), + Icon::create('download'), ['cid' => $this->course->id] ); $actions->addLink( diff --git a/app/controllers/course/grouping.php b/app/controllers/course/grouping.php index aec9264..fa3670d 100644 --- a/app/controllers/course/grouping.php +++ b/app/controllers/course/grouping.php @@ -136,7 +136,7 @@ class Course_GroupingController extends AuthenticatedController $actions->addLink( _('Unterveranstaltungen anlegen'), $this->url_for('course/grouping/create_children'), - Icon::create('add', 'clickable') + Icon::create('add') )->asDialog('size=auto'); $sidebar->addWidget($actions); } @@ -188,7 +188,7 @@ class Course_GroupingController extends AuthenticatedController 'course_id' => $this->course->id, 'default_subject' => '[' . $this->course->getFullName() . ']', ]), - Icon::create('mail', 'clickable') + Icon::create('mail') )->asDialog('size=auto'); $sidebar->addWidget($actions); diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php index 7812771..91601d7 100644 --- a/app/controllers/course/members.php +++ b/app/controllers/course/members.php @@ -213,7 +213,7 @@ class Course_MembersController extends AuthenticatedController $results = SimpleCollection::createFromArray($members)->pluck('email'); if (!empty($results)) { - return sprintf('%s', htmlReady(join(',', $results)), Icon::create('mail', 'clickable', ['title' => sprintf('E-Mail an alle %s versenden',$textStatus)])->asImg(16)); + return sprintf('%s', htmlReady(join(',', $results)), Icon::create('mail', attributes: ['title' => sprintf('E-Mail an alle %s versenden',$textStatus)])->asImg()); } else { return null; } diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php index 788c21f..d3b29a9 100644 --- a/app/controllers/course/room_requests.php +++ b/app/controllers/course/room_requests.php @@ -85,7 +85,7 @@ class Course_RoomRequestsController extends AuthenticatedController $actions->addLink( _('Neue Raumanfrage erstellen'), $this->url_for('course/room_requests/new'), - Icon::create('add', 'clickable') + Icon::create('add') ); Sidebar::get()->addWidget($actions); diff --git a/app/controllers/course/studygroup.php b/app/controllers/course/studygroup.php index 4582225..e9a0f02 100644 --- a/app/controllers/course/studygroup.php +++ b/app/controllers/course/studygroup.php @@ -101,7 +101,7 @@ class Course_StudygroupController extends AuthenticatedController $send_from_search_page = Request::get('send_from_search_page'); } - $icon = Icon::create('door-enter', 'clickable'); + $icon = Icon::create('door-enter'); if ($GLOBALS['perm']->have_studip_perm('autor', $studygroup->id) || $membership_requested) { $action = _('Persönlicher Status:'); if ($membership_requested) { @@ -358,7 +358,7 @@ class Course_StudygroupController extends AuthenticatedController ->setNavigationItem('/course/members') ->render(); - $element = LinkElement::fromHTML($mp, Icon::create('add', 'clickable')); + $element = LinkElement::fromHTML($mp, Icon::create('add')); $actions->addElement($element); } diff --git a/app/controllers/files.php b/app/controllers/files.php index effdf62..b8ccf17 100644 --- a/app/controllers/files.php +++ b/app/controllers/files.php @@ -66,7 +66,7 @@ class FilesController extends AuthenticatedController $sources->addLink( _("Stud.IP-Dateien"), $this->url_for("files/index"), - Icon::create("files", "clickable") + Icon::create('files') ); foreach (PluginManager::getInstance()->getPlugins(FilesystemPlugin::class) as $plugin) { if ($plugin->isPersonalFileArea()) { @@ -87,24 +87,23 @@ class FilesController extends AuthenticatedController $actions->addLink( _('Ordner bearbeiten'), $this->url_for('file/edit_folder/'.$folder->getId()), - Icon::create("edit", "clickable"), - ['data-dialog' => 1] - ); + Icon::create('edit') + )->asDialog(); } if ($folder->isSubfolderAllowed($GLOBALS['user']->id)) { $actions->addLink( _('Neuer Ordner'), URLHelper::getUrl('dispatch.php/file/new_folder/' . $folder->getId()), - Icon::create('folder-empty', 'clickable'), ['data-dialog' => 1] - ); + Icon::create('folder-empty') + )->asDialog(); } if ($folder->isWritable($GLOBALS['user']->id)) { $actions->addLink( _('Dokument hinzufügen'), '#', - Icon::create('add', 'clickable'), + Icon::create('add'), ['onClick' => "STUDIP.Files.openAddFilesWindow(); return false;"] ); } @@ -127,7 +126,7 @@ class FilesController extends AuthenticatedController $actions->addLink( _('Dateibereiche konfigurieren'), $this->url_for('files/configure'), - Icon::create('admin', 'clickable') + Icon::create('admin') )->asDialog(); } else { $actions->addLink( diff --git a/app/controllers/files_dashboard/helpers.php b/app/controllers/files_dashboard/helpers.php index 3519fb8..d86fc9f 100644 --- a/app/controllers/files_dashboard/helpers.php +++ b/app/controllers/files_dashboard/helpers.php @@ -23,7 +23,7 @@ trait Helpers $actionMenu->addLink( URLHelper::getURL('dispatch.php/file/details/'.$fileRef->id), _('Info'), - Icon::create('info-circle', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('info-circle'), ['data-dialog' => 1] ); @@ -33,7 +33,7 @@ trait Helpers $actionMenu->addLink( $rangeLink, _('Ordner öffnen'), - Icon::create('folder-empty', Icon::ROLE_CLICKABLE, ['size' => 20]) + Icon::create('folder-empty') ); } @@ -41,13 +41,13 @@ trait Helpers $actionMenu->addLink( URLHelper::getURL('dispatch.php/file/edit/'.$fileRef->id), _('Datei bearbeiten'), - Icon::create('edit', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('edit'), ['data-dialog' => ''] ); $actionMenu->addLink( URLHelper::getURL('dispatch.php/file/update/'.$fileRef->id), _('Datei aktualisieren'), - Icon::create('refresh', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('refresh'), ['data-dialog' => ''] ); } @@ -56,7 +56,7 @@ trait Helpers $actionMenu->addLink( URLHelper::getURL('dispatch.php/file/choose_destination/move/'.$fileRef->id), _('Datei verschieben'), - Icon::create('arr_1right', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('arr_1right'), ['data-dialog' => 'size=auto'] ); } @@ -65,7 +65,7 @@ trait Helpers $actionMenu->addLink( URLHelper::getURL('dispatch.php/file/choose_destination/copy/'.$fileRef->id), _('Datei kopieren'), - Icon::create('clipboard', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('clipboard'), ['data-dialog' => 'size=auto'] ); } @@ -74,7 +74,7 @@ trait Helpers $actionMenu->addLink( URLHelper::getURL('dispatch.php/file/delete/'.$fileRef->id), _('Datei löschen'), - Icon::create('trash', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('trash'), ['onclick' => "return STUDIP.Dialog.confirmAsPost('".sprintf(_('Soll die Datei "%s" wirklich gelöscht werden?'), jsReady($fileRef->name))."', this.href);"] ); } diff --git a/app/controllers/files_dashboard/sidebar.php b/app/controllers/files_dashboard/sidebar.php index 9fcc237..135761a 100644 --- a/app/controllers/files_dashboard/sidebar.php +++ b/app/controllers/files_dashboard/sidebar.php @@ -23,7 +23,7 @@ trait Sidebar $actions->addLink( _('Datei hinzufügen'), $this->url_for('file/choose_destination/upload'), - \Icon::create('add', 'clickable'), + \Icon::create('add'), ['data-dialog' => 'size=auto'] ); diff --git a/app/controllers/help_content.php b/app/controllers/help_content.php index c2025f1..e794a2e 100644 --- a/app/controllers/help_content.php +++ b/app/controllers/help_content.php @@ -289,7 +289,8 @@ class HelpContentController extends AuthenticatedController $widget->addLink( _('Hilfe-Text erstellen'), $this->url_for('help_content/add'), - Icon::create('add', 'clickable'), ['data-dialog' => 'size=auto;reload-on-close', 'target' => '_blank'] + Icon::create('add'), + ['data-dialog' => 'size=auto;reload-on-close', 'target' => '_blank'] ); $sidebar->addWidget($widget); $search = new SearchWidget('?apply_help_content_filter=1'); diff --git a/app/controllers/institute/files.php b/app/controllers/institute/files.php index afcd0fd..ca46dc8 100644 --- a/app/controllers/institute/files.php +++ b/app/controllers/institute/files.php @@ -56,9 +56,8 @@ class Institute_FilesController extends AuthenticatedController $actions->addLink( _("Ordner bearbeiten"), $this->url_for("file/edit_folder/".$this->topFolder->getId()), - Icon::create("edit", "clickable"), - ['data-dialog' => 1] - ); + Icon::create('edit') + )->asDialog(); } if ($this->topFolder && $this->topFolder->isSubfolderAllowed($GLOBALS['user']->id)) { @@ -67,14 +66,14 @@ class Institute_FilesController extends AuthenticatedController URLHelper::getUrl( 'dispatch.php/file/new_folder/' . $this->topFolder ->getId() ), - Icon::create('folder-empty', 'clickable') + Icon::create('folder-empty') )->asDialog(); } if ($this->topFolder && $this->topFolder->isWritable($GLOBALS['user']->id)) { $actions->addLink( _('Dokument hinzufügen'), '#', - Icon::create('add', 'clickable'), + Icon::create('add'), ['onclick' => "STUDIP.Files.openAddFilesWindow(); return false;"] ); } diff --git a/app/controllers/institute/members.php b/app/controllers/institute/members.php index d5d991d..d70fdc1 100644 --- a/app/controllers/institute/members.php +++ b/app/controllers/institute/members.php @@ -605,9 +605,8 @@ class Institute_MembersController extends AuthenticatedController $actions->addLink( _('Stud.IP Rundmail'), $this->url_for('messages/write', ['inst_id' => $this->institute->id, 'emailrequest' => 1]), - Icon::create('mail', 'clickable'), - ['data-dialog' => 'size=50%'] - ); + Icon::create('mail') + )->asDialog('size=50%'); } $sidebar->addWidget($actions); diff --git a/app/controllers/messages.php b/app/controllers/messages.php index 451801e..65a5cea 100644 --- a/app/controllers/messages.php +++ b/app/controllers/messages.php @@ -956,7 +956,7 @@ class MessagesController extends AuthenticatedController { $actions->addLink( _('Alle als gelesen markieren'), $this->url_for('messages/overview', ['read_all' => 1]), - Icon::create('accept', 'clickable') + Icon::create('accept') ); } diff --git a/app/controllers/my_ilias_accounts.php b/app/controllers/my_ilias_accounts.php index fc4c00d..b82ec7d 100644 --- a/app/controllers/my_ilias_accounts.php +++ b/app/controllers/my_ilias_accounts.php @@ -63,7 +63,7 @@ class MyIliasAccountsController extends AuthenticatedController $widget->addLink( sprintf(_('Zur %s-Startseite'), $ilias->getName()), $this->url_for('my_ilias_accounts/redirect/'.$ilias_list_index.'/login'), - Icon::create('link-extern', 'clickable'), + Icon::create('link-extern'), ['target' => '_blank', 'rel' => 'noopener noreferrer'] ); } diff --git a/app/controllers/oer/admin.php b/app/controllers/oer/admin.php index 11b8266..c394556 100644 --- a/app/controllers/oer/admin.php +++ b/app/controllers/oer/admin.php @@ -129,7 +129,7 @@ class Oer_AdminController extends AuthenticatedController } $this->render_text(( - Icon::create("checkbox-".(Request::int("active") ? "" : "un")."checked")->asImg(20) + Icon::create("checkbox-".(Request::int("active") ? "" : "un")."checked")->asImg() )); } @@ -144,7 +144,7 @@ class Oer_AdminController extends AuthenticatedController } $this->render_text(( - Icon::create("checkbox-".(Request::int("active") ? "" : "un")."checked")->asImg(20) + Icon::create("checkbox-".(Request::int("active") ? "" : "un")."checked")->asImg() )); } diff --git a/app/controllers/privacy.php b/app/controllers/privacy.php index d50b1f1..049aea6 100644 --- a/app/controllers/privacy.php +++ b/app/controllers/privacy.php @@ -39,28 +39,28 @@ class PrivacyController extends AuthenticatedController $actions->addLink( _('Anzeige Personendaten'), $this->url_for("privacy/landing/{$user_id}"), - Icon::create('log', Icon::ROLE_CLICKABLE, tooltip2(_('Anzeige Personendaten'))) + Icon::create('log', attributes: tooltip2(_('Anzeige Personendaten'))) )->asDialog('size=medium'); $actions->addLink( _('Personendaten drucken'), $this->url_for('privacy/print/' . $user_id), - Icon::create('print', Icon::ROLE_CLICKABLE, tooltip2(_('Personendaten drucken'))), + Icon::create('print', attributes: tooltip2(_('Personendaten drucken'))), ['class' => 'print_action', 'target' => '_blank'] ); $actions->addLink( _('Export Personendaten als CSV'), $this->url_for("privacy/export/{$user_id}"), - Icon::create('file-text', Icon::ROLE_CLICKABLE, tooltip2(_('Export Personendaten als CSV'))) + Icon::create('file-text', attributes: tooltip2(_('Export Personendaten als CSV'))) ); $actions->addLink( _('Export persönlicher Dateien als XML'), $this->url_for("privacy/xml/{$user_id}"), - Icon::create('file-text', Icon::ROLE_CLICKABLE, tooltip2(_('Export Personendaten als XML'))) + Icon::create('file-text', attributes: tooltip2(_('Export Personendaten als XML'))) ); $actions->addLink( _('Export persönlicher Dateien als ZIP'), $this->url_for("privacy/filesexport/{$user_id}"), - Icon::create('file-archive', Icon::ROLE_CLICKABLE, tooltip2(_('Export persönlicher Dateien als ZIP'))) + Icon::create('file-archive', attributes: tooltip2(_('Export persönlicher Dateien als ZIP'))) ); @@ -68,14 +68,14 @@ class PrivacyController extends AuthenticatedController $exports->addLink( _('Export angezeigter Dateien als XML'), $this->url_for("privacy/xml/{$user_id}" . ($section ? "/{$section}" : '')), - Icon::create('file-text', Icon::ROLE_CLICKABLE, tooltip2(_('Export angezeigter Daten als XML'))) + Icon::create('file-text', attributes: tooltip2(_('Export angezeigter Daten als XML'))) ); foreach ($this->plugin_data as $label => $tabledata) { $exports->addLink( htmlReady($label) . ' ' . _('CSV'), $this->url_for("privacy/export2csv/{$tabledata['table_name']}/{$user_id}"), - Icon::create('file-text', Icon::ROLE_CLICKABLE, tooltip2(htmlReady($label) . ' CSV')) + Icon::create('file-text', attributes: tooltip2(htmlReady($label) . ' CSV')) ); } } @@ -102,23 +102,23 @@ class PrivacyController extends AuthenticatedController $actions->addLink( _('Personendaten drucken'), $this->url_for("privacy/print/{$user_id}"), - Icon::create('print', Icon::ROLE_CLICKABLE, tooltip2(_('Personendaten drucken'))), + Icon::create('print', attributes: tooltip2(_('Personendaten drucken'))), ['class' => 'print_action', 'target' => '_blank'] ); $actions->addLink( _('Export Personendaten als CSV'), $this->url_for("privacy/export/{$user_id}"), - Icon::create('file-text', Icon::ROLE_CLICKABLE, tooltip2(_('Export Personendaten als CSV'))) + Icon::create('file-text', attributes: tooltip2(_('Export Personendaten als CSV'))) ); $actions->addLink( _('Export persönlicher Dateien als XML'), $this->url_for("privacy/xml/{$user_id}"), - Icon::create('file-text', Icon::ROLE_CLICKABLE, tooltip2(_('Export Personendaten als XML'))) + Icon::create('file-text', attributes: tooltip2(_('Export Personendaten als XML'))) ); $actions->addLink( _('Export persönlicher Dateien als ZIP'), $this->url_for("privacy/filesexport/{$user_id}"), - Icon::create('file-archive', Icon::ROLE_CLICKABLE, tooltip2(_('Export persönlicher Dateien als ZIP'))) + Icon::create('file-archive', attributes: tooltip2(_('Export persönlicher Dateien als ZIP'))) ); } diff --git a/app/controllers/profile.php b/app/controllers/profile.php index 1412c9c..b00c2b2 100644 --- a/app/controllers/profile.php +++ b/app/controllers/profile.php @@ -284,7 +284,7 @@ class ProfileController extends AuthenticatedController $actions->addLink( _('Dieses Konto bearbeiten'), $this->url_for('admin/user/edit/' . $this->current_user->user_id), - Icon::create('edit', Icon::ROLE_CLICKABLE, tooltip2(_('Dieses Konto bearbeiten'))) + Icon::create('edit', attributes: tooltip2(_('Dieses Konto bearbeiten'))) ); } @@ -292,14 +292,14 @@ class ProfileController extends AuthenticatedController $actions->addLink( _('Zu den Kontakten hinzufügen'), $this->url_for('profile/add_buddy?username=' . $this->current_user->username), - Icon::create('add', Icon::ROLE_CLICKABLE, tooltip2(_('Zu den Kontakten hinzufügen'))), + Icon::create('add', attributes: tooltip2(_('Zu den Kontakten hinzufügen'))), ['data-confirm' => _('Wollen Sie die Person wirklich als Kontakt hinzufügen?')] )->asButton(); } else { $actions->addLink( _('Von den Kontakten entfernen'), $this->url_for('profile/remove_buddy', ['username' => $this->current_user->username]), - Icon::create('trash', Icon::ROLE_CLICKABLE, tooltip2(_('Zu den Kontakten hinzufügen'))), + Icon::create('trash', attributes: tooltip2(_('Zu den Kontakten hinzufügen'))), ['data-confirm' => _('Wollen Sie die Person wirklich von den Kontakten entfernen?')] )->asButton(); } @@ -307,7 +307,7 @@ class ProfileController extends AuthenticatedController $actions->addLink( _('Nachricht schreiben'), $this->url_for('messages/write', ['rec_uname' => $this->current_user->username]), - Icon::create('mail', Icon::ROLE_CLICKABLE, tooltip2(_('Nachricht an Nutzer verschicken'))) + Icon::create('mail', attributes: tooltip2(_('Nachricht an Nutzer verschicken'))) )->asDialog('size="50%"'); if (class_exists('Blubber')) { @@ -323,7 +323,7 @@ class ProfileController extends AuthenticatedController $actions->addLink( _('vCard herunterladen'), $this->url_for('contact/vcard', ['user[]' => $this->current_user->username]), - Icon::create('vcard', Icon::ROLE_CLICKABLE, tooltip2(_('vCard herunterladen'))) + Icon::create('vcard', attributes: tooltip2(_('vCard herunterladen'))) ); $sidebar->addWidget($actions); diff --git a/app/controllers/public_courses.php b/app/controllers/public_courses.php index 8af4819..3ab5125 100644 --- a/app/controllers/public_courses.php +++ b/app/controllers/public_courses.php @@ -116,7 +116,7 @@ class PublicCoursesController extends AuthenticatedController while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { if (isset($seminars[$row['range_id']]['navigations']['CoreDocuments'])) { $nav = new Navigation('files', 'dispatch.php/course/files/index'); - $nav->setImage(Icon::create('files', Icon::ROLE_CLICKABLE, ["title" => sprintf(_('%s Dokumente'), $row['count'])])); + $nav->setImage(Icon::create('files', attributes: ['title' => sprintf(_('%s Dokumente'), $row['count'])])); $seminars[$row['range_id']]['navigations']['CoreDocuments'] = $nav; } } @@ -133,7 +133,7 @@ class PublicCoursesController extends AuthenticatedController while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { if (isset($seminars[$row['range_id']]['navigations']['CoreOverview'])) { $nav = new Navigation('news', ''); - $nav->setImage(Icon::create('news', Icon::ROLE_CLICKABLE, ["title" => sprintf(_('%s Ankündigungen'),$row['count'])])); + $nav->setImage(Icon::create('news', attributes: ['title' => sprintf(_('%s Ankündigungen'), $row['count'])])); $seminars[$row['range_id']]['navigations']['CoreOverview'] = $nav; } } @@ -148,7 +148,7 @@ class PublicCoursesController extends AuthenticatedController while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { if (isset($seminars[$row['range_id']]['navigations']['CoreScm'])) { $nav = new Navigation('scm', 'dispatch.php/course/scm'); - $nav->setImage(Icon::create('infopage', Icon::ROLE_CLICKABLE, ["title" => sprintf(_('%s Einträge'), $row['count'])])); + $nav->setImage(Icon::create('infopage', attributes: ['title' => sprintf(_('%s Einträge'), $row['count'])])); $seminars[$row['range_id']]['navigations']['CoreScm'] = $nav; } } @@ -163,7 +163,7 @@ class PublicCoursesController extends AuthenticatedController while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { if (isset($seminars[$row['range_id']]['navigations']['CoreSchedule'])) { $nav = new Navigation('schedule', 'dispatch.php/course/dates'); - $nav->setImage(Icon::create('schedule', Icon::ROLE_CLICKABLE, ["title" => sprintf(_('%s Termine'), $row['count'])])); + $nav->setImage(Icon::create('schedule', attributes: ['title' => sprintf(_('%s Termine'), $row['count'])])); $seminars[$row['range_id']]['navigations']['CoreSchedule'] = $nav; } } @@ -183,7 +183,7 @@ class PublicCoursesController extends AuthenticatedController 'wiki', URLHelper::getURL('dispatch.php/course/wiki/page', ['cid' => $row['range_id']]) ); - $nav->setImage(Icon::create('wiki', Icon::ROLE_CLICKABLE, ["title" => sprintf(_('%s WikiSeiten'), $row['count'])])); + $nav->setImage(Icon::create('wiki', attributes: ['title' => sprintf(_('%s WikiSeiten'), $row['count'])])); $seminars[$row['range_id']]['navigations']['CoreWiki'] = $nav; } } @@ -202,7 +202,7 @@ class PublicCoursesController extends AuthenticatedController while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { if (isset($seminars[$row['range_id']]['navigations']['vote'])) { $nav = new Navigation('vote', '#vote'); - $nav->setImage(Icon::create('vote', Icon::ROLE_CLICKABLE, ["title" => sprintf(_('%s Umfrage(n)'), $row['count'])])); + $nav->setImage(Icon::create('vote', attributes: ['title' => sprintf(_('%s Umfrage(n)'), $row['count'])])); $seminars[$row['range_id']]['navigations']['vote'] = $nav; } } diff --git a/app/controllers/settings/categories.php b/app/controllers/settings/categories.php index 6e8bbab..16a7d05 100644 --- a/app/controllers/settings/categories.php +++ b/app/controllers/settings/categories.php @@ -68,7 +68,7 @@ class Settings_CategoriesController extends Settings_SettingsController $actions->addLink( _('Neue Kategorie anlegen'), $this->url_for('settings/categories/create'), - Icon::create('add', 'clickable') + Icon::create('add') ); $sidebar->addWidget($actions); } diff --git a/app/views/admin/autoinsert/index.php b/app/views/admin/autoinsert/index.php index 0d57d47..a4a999e 100644 --- a/app/views/admin/autoinsert/index.php +++ b/app/views/admin/autoinsert/index.php @@ -93,11 +93,10 @@ render_partial("admin/autoinsert/_status.php", ['status' => 'autor', 'auto_sem' => $auto_sem, 'domains' => $userdomains]) ?> - _('Veranstaltung entfernen'), 'class' => 'text-top'] - ) ?> + asImg([ + 'title' => _('Veranstaltung entfernen'), + 'class' => 'text-top', + ]) ?> diff --git a/app/views/admin/autoinsert/manual.php b/app/views/admin/autoinsert/manual.php index a4f5f5e..b739967 100644 --- a/app/views/admin/autoinsert/manual.php +++ b/app/views/admin/autoinsert/manual.php @@ -77,11 +77,12 @@ - _('Filter hinzufügen')] - )->asInput(["type" => "image", "class" => "middle", "name" => "add_filter"]) ?> + asInput([ + 'title' => _('Filter hinzufügen'), + 'type' => 'image', + 'class' => 'middle', + 'name' => 'add_filter', + ]) ?> @@ -103,11 +104,12 @@ - _('Filter entfernen')] - )->asInput(["type" => "image", "class" => "middle", "name" => "remove_filter[" . $type . "]"]) ?> + asInput([ + 'title' => _('Filter entfernen'), + 'type' => 'image', + 'class' => 'middle', + 'name' => "remove_filter[{$type}]", + ]) ?>

    - _("Wählen Sie hier ein Authentifizierungsplugin, damit neu angelegte ILIAS-Accounts den entsprechenden Authentifizierungsmodus erhalten, wenn dieser Modus auch für den vorhandenen Stud.IP-Account gilt. Andernfalls erhalten alle ILIAS-Accounts den default-Modus")])->asImg(16);?> + asImg(['title' => _("Wählen Sie hier ein Authentifizierungsplugin, damit neu angelegte ILIAS-Accounts den entsprechenden Authentifizierungsmodus erhalten, wenn dieser Modus auch für den vorhandenen Stud.IP-Account gilt. Andernfalls erhalten alle ILIAS-Accounts den default-Modus")]);?>
    diff --git a/app/views/admin/ilias_interface/index.php b/app/views/admin/ilias_interface/index.php index d786a97..b917323 100644 --- a/app/views/admin/ilias_interface/index.php +++ b/app/views/admin/ilias_interface/index.php @@ -44,7 +44,7 @@ } ?> - $text])->asImg() ?> + asImg(['title' => $text]) ?> @@ -74,14 +74,15 @@ addButton( 'delete_config', _('Konfiguration löschen'), - Icon::create('trash', Icon::ROLE_CLICKABLE, [ + Icon::create('trash'), + [ 'title' => _('Konfiguration löschen'), 'formaction' => $controller->url_for("admin/ilias_interface/delete/$ilias_index"), 'data-confirm' => sprintf( _('Soll die ILIAS-Installation "%s" wirklich entfernt werden?'), $ilias_config['name'] ), - ]) + ] ) ?> render() ?> diff --git a/app/views/admin/licenses/index.php b/app/views/admin/licenses/index.php index 9f13a6e..e72536a 100644 --- a/app/views/admin/licenses/index.php +++ b/app/views/admin/licenses/index.php @@ -34,13 +34,13 @@ $license['identifier']]) ?>" data-dialog> - asImg(20, ['class' => "text-bottom"]) ?> + asImg(['class' => "text-bottom"]) ?>
    $license->getId()]) ?>" method="post" data-confirm="" class="inline"> - asInput(20) ?> + asInput() ?>
    @@ -54,7 +54,6 @@ $actions = new ActionsWidget(); $actions->addLink( _("Lizenz erzeugen"), $controller->url_for("admin/licenses/edit"), - Icon::create("add", "clickable"), - ['data-dialog' => 1] -); + Icon::create('add') +)->asDialog(); Sidebar::Get()->addWidget($actions); diff --git a/app/views/admin/lockrules/index.php b/app/views/admin/lockrules/index.php index ee776d0..1214d83 100644 --- a/app/views/admin/lockrules/index.php +++ b/app/views/admin/lockrules/index.php @@ -43,7 +43,7 @@ - _('Diese Regel bearbeiten')])->asImg() ?> + asImg(['title' => _('Diese Regel bearbeiten')]) ?> name) ?> - _('Diese Regel löschen'), - 'style' => 'vertical-align: middle' - ])->asInput(['data-confirm'=>$msg,'formaction'=>$controller->url_for('admin/lockrules/delete/'.$rule->lock_id)]) ?> + asInput([ + 'title' => _('Diese Regel löschen'), + 'style' => 'vertical-align: middle', + 'data-confirm' => $msg, + 'formaction' => $controller->url_for('admin/lockrules/delete/'.$rule->lock_id) + ]) ?> diff --git a/app/views/admin/login_style/index.php b/app/views/admin/login_style/index.php index 24c0b70..e131784 100644 --- a/app/views/admin/login_style/index.php +++ b/app/views/admin/login_style/index.php @@ -41,34 +41,32 @@ desktop ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asInput( - 32, + Icon::SIZE_LARGE, [ 'title' => $pic->mobile ? _('Bild nicht mehr für die Mobilansicht verwenden') : _('Bild für die Mobilansicht verwenden'), 'formaction' => $controller->activationURL($pic->id, 'desktop', (int) !$pic->desktop) ] - )?> + ) ?> mobile ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asInput( - 32, + Icon::SIZE_LARGE, [ 'title' => $pic->mobile ? _('Bild nicht mehr für die Mobilansicht verwenden') : _('Bild für die Mobilansicht verwenden'), 'formaction' => $controller->activationURL($pic->id, 'mobile', (int) !$pic->mobile) ] - )?> + ) ?> in_release): ?> - asInput( - [ - 'title' => _('Bild löschen'), - 'data-confirm' => _('Soll das Bild wirklich gelöscht werden?'), - 'formaction' => $controller->delete_picURL($pic->id) - ] - )?> + asInput([ + 'title' => _('Bild löschen'), + 'data-confirm' => _('Soll das Bild wirklich gelöscht werden?'), + 'formaction' => $controller->delete_picURL($pic->id), + ]) ?> diff --git a/app/views/admin/plugin/index.php b/app/views/admin/plugin/index.php index d24cfc9..fb56d15 100644 --- a/app/views/admin/plugin/index.php +++ b/app/views/admin/plugin/index.php @@ -101,15 +101,19 @@ use Studip\Button, Studip\LinkButton; addLink( $controller->url_for('admin/role/assign_plugin_role/' . $pluginid), _('Zugriffsrechte bearbeiten'), - Icon::create('edit', 'clickable', ['title' => _('Zugriffsrechte bearbeiten')]) + Icon::create('edit'), + ['title' => _('Zugriffsrechte bearbeiten')] ) ?> addLink( $controller->url_for('admin/plugin/edit_description/' . $pluginid), _('Beschreibung und Hervorhebung'), - Icon::create('infopage', Icon::ROLE_CLICKABLE, ['title' => _('Beschreibung und Hervorhebung')]), - ['data-dialog' => 'size=big'] + Icon::create('infopage'), + [ + 'data-dialog' => 'size=big', + 'title' => _('Beschreibung und Hervorhebung'), + ] ); } ?> @@ -118,24 +122,27 @@ use Studip\Button, Studip\LinkButton; addLink( $controller->url_for('admin/plugin/edit_automaticupdate/' . $pluginid), $plugin['automatic_update_url'] ? _('Automatisches Update verwalten (eingerichtet)') : _('Automatisches Update verwalten'), - Icon::create('install', $plugin['automatic_update_url'] ? 'attention' : 'clickable', [ + Icon::create('install', $plugin['automatic_update_url'] ? Icon::ROLE_ATTENTION : Icon::ROLE_CLICKABLE), + [ 'title' => $plugin['automatic_update_url'] ? _('Automatisches Update verwalten (eingerichtet)') - : _('Automatisches Update verwalten') - ]), - ['data-dialog' => 'size=auto;reload-on-close'] + : _('Automatisches Update verwalten'), + 'data-dialog' => 'size=auto;reload-on-close' + ] ) ?> addLink( $controller->url_for('admin/plugin/download/' . $pluginid), _('Herunterladen'), - Icon::create('download', 'clickable', ['title' => _('Herunterladen')]) + Icon::create('download'), + ['title' => _('Herunterladen')] ) ?> addLink( $controller->url_for('admin/plugin/ask_delete/' . $pluginid), _('Deinstallieren'), - Icon::create('trash', 'clickable', ['title' => _('Deinstallieren')]) + Icon::create('trash'), + ['title' => _('Deinstallieren')] ) ?> render() ?> diff --git a/app/views/admin/role/assign_role.php b/app/views/admin/role/assign_role.php index 67c8b1e..8215f41 100644 --- a/app/views/admin/role/assign_role.php +++ b/app/views/admin/role/assign_role.php @@ -133,7 +133,7 @@ use Studip\Button, Studip\LinkButton; - asImg(['title' => _('Einrichtungszuordnung bearbeiten')]) ?> + asImg(['title' => _('Einrichtungszuordnung bearbeiten')]) ?> diff --git a/app/views/admin/role/show_role.php b/app/views/admin/role/show_role.php index 196f9bf..00aa175 100644 --- a/app/views/admin/role/show_role.php +++ b/app/views/admin/role/show_role.php @@ -155,7 +155,7 @@ use Studip\Button; htmlReady($role->getRolename())) ?>
    - +
    @@ -203,10 +203,11 @@ use Studip\Button; - _('Rolle entziehen')]) - ->asInput([ - "data-confirm" => _('Soll diesem Plugin wirklich die Rolle entzogen werden?'), - "formaction" => $controller->url_for('admin/role/remove_plugin/'.$roleid.'/'.$plugin['id'])]) ?> + asInput([ + 'title' => _('Rolle entziehen'), + 'data-confirm' => _('Soll diesem Plugin wirklich die Rolle entzogen werden?'), + 'formaction' => $controller->url_for('admin/role/remove_plugin/'.$roleid.'/'. $plugin['id']) + ]) ?> @@ -217,7 +218,7 @@ use Studip\Button; _('Sollen den markierten Plugins wirklich die Rolle entzogen werden?'), + 'data-confirm' => _('Sollen den markierten Plugins wirklich die Rolle entzogen werden?'), ]) ?> diff --git a/app/views/admin/sem_classes/_sem_type.php b/app/views/admin/sem_classes/_sem_type.php index 2a5c53e..c61257b 100644 --- a/app/views/admin/sem_classes/_sem_type.php +++ b/app/views/admin/sem_classes/_sem_type.php @@ -2,7 +2,7 @@ /** * Copyright (c) 2012 Rasmus Fuhse - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of @@ -27,8 +27,12 @@ $id = $sem_type['id']; () - ">asImg(['class' => "text-bottom"]) ?> + "> + asImg(['class' => "text-bottom"]) ?> + - ">asImg(['class' => "text-bottom"]) ?> + "> + asImg(['class' => "text-bottom"]) ?> + diff --git a/app/views/admin/sem_classes/details.php b/app/views/admin/sem_classes/details.php index 530f553..145bc45 100644 --- a/app/views/admin/sem_classes/details.php +++ b/app/views/admin/sem_classes/details.php @@ -25,7 +25,9 @@
    - asImg(['class' => "text-bottom"]) ?> + + asImg(['class' => 'text-bottom']) ?> +
    diff --git a/app/views/admin/sem_classes/overview.php b/app/views/admin/sem_classes/overview.php index 8cbb0fb..1369b0c 100644 --- a/app/views/admin/sem_classes/overview.php +++ b/app/views/admin/sem_classes/overview.php @@ -32,7 +32,7 @@ $id]) ?>" title=""> - asImg(['class' => "text-bottom"]) ?> + asImg(['class' => 'text-bottom']) ?> @@ -46,7 +46,7 @@ $links = new ActionsWidget(); $links->addLink( _('Neue Kategorie anlegen'), $controller->url_for('admin/sem_classes/add_sem_type'), - Icon::create('add', 'clickable'), + Icon::create('add'), [ 'onClick' => 'STUDIP.sem_classes.add(); return false;', 'data-dialog' => 'size=auto' diff --git a/app/views/admin/semester/index.php b/app/views/admin/semester/index.php index cb654a4..40c5038 100644 --- a/app/views/admin/semester/index.php +++ b/app/views/admin/semester/index.php @@ -109,12 +109,13 @@ $actionMenu->addButton( 'unlock', _('Semester entsperren'), - Icon::create('lock-locked', Icon::ROLE_CLICKABLE, [ + Icon::create('lock-locked'), + [ 'title' => _('Semester entsperren'), 'formaction' => $controller->url_for("admin/semester/unlock/{$semester->id}"), 'data-confirm' => _('Soll das Semester wirklich entsperrt werden? Anmelderegeln und Sperrebenen werden nicht verändert.'), 'style' => 'vertical-align: text-bottom' - ]) + ] ); } @@ -135,12 +136,13 @@ $actionMenu->addButton( 'delete', _('Semester löschen'), - Icon::create('trash', Icon::ROLE_CLICKABLE, [ + Icon::create('trash'), + [ 'title' => _('Semester löschen'), 'formaction' => $controller->url_for("admin/semester/delete/{$semester->id}"), 'data-confirm' => _('Soll das Semester wirklich gelöscht werden?'), 'style' => 'vertical-align: text-bottom' - ]) + ] ); } diff --git a/app/views/admin/statusgroups/_members.php b/app/views/admin/statusgroups/_members.php index 4e64b9e..b8febf3 100644 --- a/app/views/admin/statusgroups/_members.php +++ b/app/views/admin/statusgroups/_members.php @@ -13,14 +13,18 @@ name()) ?> setContext($user->user) ?> - addLink($controller->url_for('settings/statusgruppen/', ['open' => $group->id, 'type' => 'role', 'username' => $user->user->username]), - _('Benutzer in dieser Rolle bearbeiten'), - Icon::create('edit', 'clickable')) ?> + addLink( + $controller->url_for('settings/statusgruppen/', ['open' => $group->id, 'type' => 'role', 'username' => $user->user->username]), + _('Benutzer in dieser Rolle bearbeiten'), + Icon::create('edit') + ) ?> - addLink($controller->url_for('admin/statusgroups/delete/' . $group->id . '/' . $user->user_id), - _('Person aus Gruppe austragen'), - Icon::create('trash', 'clickable'), - ['data-dialog' => 'size=auto']) ?> + addLink( + $controller->url_for('admin/statusgroups/delete/' . $group->id . '/' . $user->user_id), + _('Person aus Gruppe austragen'), + Icon::create('trash'), + ['data-dialog' => 'size=auto'] + ) ?> render() ?> diff --git a/app/views/admin/user/list_files.php b/app/views/admin/user/list_files.php index a351ec5..0e7ed2b 100644 --- a/app/views/admin/user/list_files.php +++ b/app/views/admin/user/list_files.php @@ -24,7 +24,7 @@ setContext($file->name)->addLink( $file->getDownloadURL(), _('Datei herunterladen'), - Icon::create('download', 'clickable') + Icon::create('download') )->render() ?> diff --git a/app/views/admin/webservice_access/index.php b/app/views/admin/webservice_access/index.php index 223e5c3..86367aa 100644 --- a/app/views/admin/webservice_access/index.php +++ b/app/views/admin/webservice_access/index.php @@ -48,8 +48,18 @@ - _('Änderungen speichern')])->asInput(["type" => "image", "class" => "middle", "name" => "ok"]) ?> - _('Abbrechen')])->asInput(['type' => "image", 'class' => "middle", 'name' => "cancel"]) ?> + asInput([ + 'title' => _('Änderungen speichern'), + 'type' => 'image', + 'class' => 'middle', + 'name' => 'ok', + ]) ?> + asInput([ + 'title' => _('Abbrechen'), + 'type' => 'image', + 'class' => 'middle', + 'name' => 'cancel', + ]) ?> @@ -66,10 +76,10 @@ - _('bearbeiten')])->asImg() ?> + asImg(['title' => _('bearbeiten')]) ?> - _('löschen')])->asImg() ?> + asImg(['title' => _('löschen')]) ?> @@ -81,7 +91,15 @@ $sidebar = Sidebar::Get(); $actions = new ActionsWidget(); -$actions->addLink(_('Regeln testen'),$controller->url_for('admin/webservice_access/test'), Icon::create('unit-test', 'clickable')); -$actions->addLink(_('Neue Zugriffsregel anlegen'),$controller->url_for('admin/webservice_access/new'), Icon::create('add', 'clickable')); +$actions->addLink( + _('Regeln testen'), + $controller->url_for('admin/webservice_access/test'), + Icon::create('unit-test') +); +$actions->addLink( + _('Neue Zugriffsregel anlegen'), + $controller->url_for('admin/webservice_access/new'), + Icon::create('add') +); $sidebar->addWidget($actions); diff --git a/app/views/admin/webservice_access/test.php b/app/views/admin/webservice_access/test.php index 396f885..0b05dce 100644 --- a/app/views/admin/webservice_access/test.php +++ b/app/views/admin/webservice_access/test.php @@ -38,7 +38,15 @@ use Studip\Button, Studip\LinkButton; $sidebar = Sidebar::Get(); $actions = new ActionsWidget(); -$actions->addLink(_('Liste der Zugriffsregeln'),$controller->url_for('admin/webservice_access'), Icon::create('add', 'clickable')); -$actions->addLink(_('Neue Zugriffsregel anlegen'),$controller->url_for('admin/webservice_access/new'), Icon::create('add', 'clickable')); +$actions->addLink( + _('Liste der Zugriffsregeln'), + $controller->url_for('admin/webservice_access'), + Icon::create('add') +); +$actions->addLink( + _('Neue Zugriffsregel anlegen'), + $controller->url_for('admin/webservice_access/new'), + Icon::create('add') +); $sidebar->addWidget($actions); diff --git a/app/views/admission/courseset/index.php b/app/views/admission/courseset/index.php index b3a5009..70033af 100644 --- a/app/views/admission/courseset/index.php +++ b/app/views/admission/courseset/index.php @@ -57,11 +57,11 @@ if ($coursesets) { - _('Weitere Informationen einblenden')])->asImg() ?> + asImg(['title' => _('Weitere Informationen einblenden')]) ?> isUserAllowedToEdit($GLOBALS['user']->id)) : ?> - _('Anmeldeset kopieren')])->asImg(16, ["alt" => _('Anmeldeset kopieren')]); ?> + asImg(['title' => _('Anmeldeset kopieren'), "alt" => _('Anmeldeset kopieren')]); ?> asImg(['title' => _('Anmeldeset bearbeiten')]) ?> diff --git a/app/views/admission/rule/save.php b/app/views/admission/rule/save.php index 8448ec7..0f6e8d8 100644 --- a/app/views/admission/rule/save.php +++ b/app/views/admission/rule/save.php @@ -13,9 +13,11 @@ - asImg(); ?> + + - asImg(); ?> + + diff --git a/app/views/admission/rule/select_type.php b/app/views/admission/rule/select_type.php index 6ac53f5..1a72a75 100644 --- a/app/views/admission/rule/select_type.php +++ b/app/views/admission/rule/select_type.php @@ -18,7 +18,7 @@ diff --git a/app/views/admission/userlist/configure.php b/app/views/admission/userlist/configure.php index 3736758..3f2e658 100644 --- a/app/views/admission/userlist/configure.php +++ b/app/views/admission/userlist/configure.php @@ -92,7 +92,7 @@ Helpbar::get()->addPlainText(_('Info'), "Stellen Sie hier ein, wie die Chancen b $userlist_id, $u->id) ?>" class="userlist-delete-user" data-confirm="getFullName())) ?>"> - + diff --git a/app/views/blubber/compose.php b/app/views/blubber/compose.php index 3ea46c4..67ba605 100644 --- a/app/views/blubber/compose.php +++ b/app/views/blubber/compose.php @@ -70,7 +70,7 @@ asImg(['class' => 'text-bottom']) ?> - asImg(['class' => "text-bottom"]) ?> + asImg(['class' => 'text-bottom']) ?> @@ -113,10 +113,10 @@ ->fireJSFunctionOnSelect('STUDIP.Blubber.Composer.vue.addUser')->render() ?> - asImg(['class' => "text-bottom"]) ?> + asImg(['class' => 'text-bottom']) ?> - asImg(['class' => "text-bottom"]) ?> + asImg(['class' => 'text-bottom']) ?> diff --git a/app/views/blubber/private_to_studygroup.php b/app/views/blubber/private_to_studygroup.php index f6b584e..5e04599 100644 --- a/app/views/blubber/private_to_studygroup.php +++ b/app/views/blubber/private_to_studygroup.php @@ -5,7 +5,7 @@
    asImg(50, ['style' => "margin-right: 50px;"]) ?> - asImg(20, ['style' => "margin-right: 50px;"]) ?> + asImg(['style' => "margin-right: 50px;"]) ?> asImg(50) ?>
    diff --git a/app/views/calendar/contentbox/_termin.php b/app/views/calendar/contentbox/_termin.php index 3daf699..ddb95b7 100644 --- a/app/views/calendar/contentbox/_termin.php +++ b/app/views/calendar/contentbox/_termin.php @@ -51,7 +51,7 @@

    - asImg(20, ['class' => "text-bottom"]) ?> + asImg(['class' => "text-bottom"]) ?>

    diff --git a/app/views/calendar/contentbox/display.php b/app/views/calendar/contentbox/display.php index bd7b266..902df33 100644 --- a/app/views/calendar/contentbox/display.php +++ b/app/views/calendar/contentbox/display.php @@ -11,12 +11,12 @@ - asImg(['class' => 'text-bottom']) ?> + asImg(['class' => 'text-bottom']) ?> $range_id]) ?>" title="" aria-label=""> - asImg(['class' => 'text-bottom']) ?> + asImg(['class' => 'text-bottom']) ?> diff --git a/app/views/course/dates/_date_row-exdate.php b/app/views/course/dates/_date_row-exdate.php index bc9beab..2a179ef 100644 --- a/app/views/course/dates/_date_row-exdate.php +++ b/app/views/course/dates/_date_row-exdate.php @@ -1,6 +1,6 @@ - asImg(['class' => 'text-bottom']) ?> + asImg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> getFullName()) ?> content) ?> dozenten) > 0): ?> diff --git a/app/views/course/dates/_date_row.php b/app/views/course/dates/_date_row.php index b10deac..3cad99b 100644 --- a/app/views/course/dates/_date_row.php +++ b/app/views/course/dates/_date_row.php @@ -18,7 +18,7 @@ $dialog_url = $show_raumzeit data-termin-id="id) ?>"> - asImg(['class' => 'text-bottom']) ?> + asImg(Icon::SIZE_INLINE,['class' => 'text-bottom']) ?> getFullName(CourseDate::FORMAT_VERBOSE)) ?> dozenten) > 0): ?> diff --git a/app/views/course/dates/current_day_dates.php b/app/views/course/dates/current_day_dates.php index f7ca4b9..a752558 100644 --- a/app/views/course/dates/current_day_dates.php +++ b/app/views/course/dates/current_day_dates.php @@ -12,7 +12,7 @@ - asImg(['class' => 'text-bottom']) ?> + asImg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> getFullName(CourseDate::FORMAT_VERBOSE)) ?> diff --git a/app/views/course/dates/new_topic.php b/app/views/course/dates/new_topic.php index 1cc303d..cf21191 100644 --- a/app/views/course/dates/new_topic.php +++ b/app/views/course/dates/new_topic.php @@ -38,7 +38,7 @@ topics as $topic) : ?>
  • - asImg() ?> +
    • diff --git a/app/views/course/feedback/index.php b/app/views/course/feedback/index.php index 87a2449..10134d1 100644 --- a/app/views/course/feedback/index.php +++ b/app/views/course/feedback/index.php @@ -103,13 +103,13 @@ $actionMenu->addLink( $controller->link_for('course/feedback/edit_form/' . $feedback->id), _('Bearbeiten'), - Icon::create('edit', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('edit'), ['data-dialog' => ''] ); $actionMenu->addLink( $controller->link_for('course/feedback/delete/' . $feedback->id), _('Löschen'), - Icon::create('trash', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('trash'), ['onclick' => "return STUDIP.Dialog.confirmAsPost('" . _('Feedback-Element und dazugehörige Einträge löschen?') . "', this.href);"] ); ?> diff --git a/app/views/course/forum/admin/childs.php b/app/views/course/forum/admin/childs.php index 3becc1f..c3a8a6b 100644 --- a/app/views/course/forum/admin/childs.php +++ b/app/views/course/forum/admin/childs.php @@ -15,17 +15,17 @@ - asImg() ?> + - asImg() ?> + - asImg() ?> + - \ No newline at end of file + diff --git a/app/views/course/forum/index/_breadcrumb.php b/app/views/course/forum/index/_breadcrumb.php index 0b3a9b4..1627c9f 100644 --- a/app/views/course/forum/index/_breadcrumb.php +++ b/app/views/course/forum/index/_breadcrumb.php @@ -2,7 +2,7 @@
    - + diff --git a/app/views/course/forum/index/_favorite.php b/app/views/course/forum/index/_favorite.php index 63da116..7325d83 100644 --- a/app/views/course/forum/index/_favorite.php +++ b/app/views/course/forum/index/_favorite.php @@ -3,10 +3,10 @@ - _('Beitrag merken')])->asImg() ?> + asImg(['title' => _('Beitrag merken')]) ?> - _('Beitrag nicht mehr merken')])->asImg() ?> + asImg(['title' => _('Beitrag nicht mehr merken')]) ?> diff --git a/app/views/course/forum/index/_post.php b/app/views/course/forum/index/_post.php index 192a414..025cddf 100644 --- a/app/views/course/forum/index/_post.php +++ b/app/views/course/forum/index/_post.php @@ -60,7 +60,7 @@ - _('Dieses Thema wurde geschlossen. Sie können daher nicht auf diesen Beitrag antworten.')])->asImg(16) ?> + _('Dieses Thema wurde geschlossen. Sie können daher nicht auf diesen Beitrag antworten.')])->asImg() ?> @@ -252,7 +252,7 @@ - _("Dieser Beitrag ist seit Ihrem letzten Besuch hinzugekommen.")])->asImg(16) ?> + _("Dieser Beitrag ist seit Ihrem letzten Besuch hinzugekommen.")])->asImg() ?> diff --git a/app/views/course/lvgselector/form.php b/app/views/course/lvgselector/form.php index a1ae506..31af08c 100644 --- a/app/views/course/lvgselector/form.php +++ b/app/views/course/lvgselector/form.php @@ -34,14 +34,14 @@

    - asInput(false, ['name' => 'lvgruppe_selection[search_button]']); ?> + asInput(false, ['name' => 'lvgruppe_selection[search_button]']); ?> searched()) : ?> - asImg(); ?> + getSearchResult())) : ?> diff --git a/app/views/course/lvgselector/selected_entry.php b/app/views/course/lvgselector/selected_entry.php index b424e6e..678ea0c 100644 --- a/app/views/course/lvgselector/selected_entry.php +++ b/app/views/course/lvgselector/selected_entry.php @@ -8,7 +8,7 @@ $_id = htmlReady(implode('_', (array) $area->getId())); style="vertical-align: text-top;" type="image" name="lvgruppe_selection[remove][]" - src="asImagePath(); ?>"> + src="asImagePath(); ?>"> getDisplayName()) ?> @@ -17,7 +17,7 @@ $_id = htmlReady(implode('_', (array) $area->getId())); style="vertical-align: text-top;" type="image" name="lvgruppe_selection[details][]" - src="asImagePath() ?>"> + src="asImagePath() ?>">
      diff --git a/app/views/course/members/awaiting_list.php b/app/views/course/members/awaiting_list.php index f9dcce4..b59767f 100644 --- a/app/views/course/members/awaiting_list.php +++ b/app/views/course/members/awaiting_list.php @@ -123,11 +123,8 @@ addLink( $controller->url_for('course/members/cancel_subscription/singleuser/' . $waiting_type . '/' . $waiting['user_id']), _('Aus Veranstaltung austragen'), - Icon::create( - 'door-leave', - 'clickable', - ['title' => sprintf(_('%s austragen'), $fullname)] - ) + Icon::create('door-leave'), + ['title' => sprintf(_('%s austragen'), $fullname)] ) ?> render() ?> diff --git a/app/views/course/members/tutor_list.php b/app/views/course/members/tutor_list.php index 5c622a3..0bab83f 100644 --- a/app/views/course/members/tutor_list.php +++ b/app/views/course/members/tutor_list.php @@ -147,11 +147,8 @@ addLink( $controller->url_for('course/members/cancel_subscription/singleuser/tutor/' . $tutor['user_id']), _('Aus Veranstaltung austragen'), - Icon::create( - 'door-leave', - 'clickable', - ['title' => sprintf(_('%s austragen'), $fullname)] - ) + Icon::create('door-leave'), + ['title' => sprintf(_('%s austragen'), $fullname)] ) ?> render() ?> diff --git a/app/views/course/statusgroups/_member.php b/app/views/course/statusgroups/_member.php index 2e09327..2ca04db 100644 --- a/app/views/course/statusgroups/_member.php +++ b/app/views/course/statusgroups/_member.php @@ -37,46 +37,49 @@ setContext($user_fullname); if ($is_tutor || $m->user_id !== $GLOBALS['user']->id) { $actions->addLink( - $controller->url_for('messages/write', [ - 'rec_uname' => $m->username, - 'default_subject' => $course_title, - ]), - _('Nachricht schicken'), - Icon::create('mail', 'clickable', [ - 'title' => sprintf(_('Nachricht an %s schicken'), $user_fullname), - ]), - ['data-dialog' => 'size=auto'] + $controller->url_for('messages/write', [ + 'rec_uname' => $m->username, + 'default_subject' => $course_title, + ]), + _('Nachricht schicken'), + Icon::create('mail'), + [ + 'data-dialog' => 'size=auto', + 'title' => sprintf(_('Nachricht an %s schicken'), $user_fullname), + ] ); } if ($is_tutor && !$is_locked) { $actions->addLink( - $controller->url_for('course/statusgroups/move_member', $m->user_id, $group->id), - _('In eine andere Gruppe verschieben'), - Icon::create('arr_1right', 'clickable', [ - 'title' => sprintf( - _('%s in eine andere Gruppe verschieben'), + $controller->url_for('course/statusgroups/move_member', $m->user_id, $group->id), + _('In eine andere Gruppe verschieben'), + Icon::create('arr_1right'), + [ + 'data-dialog' => 'size=auto', + 'title' => sprintf( + _('%s in eine andere Gruppe verschieben'), $user_fullname - ), - ]), - ['data-dialog' => 'size=auto'] + ), + ] ); } if ($group->id !== 'nogroup' && !$is_locked && ($is_tutor || ($m->user_id === $GLOBALS['user']->id && $group->userMayLeave($GLOBALS['user']->id)))) { $actions->addLink( - $controller->url_for('course/statusgroups/delete_member', $m->user_id, $group->id), - _('Aus der Gruppe entfernen'), - Icon::create('trash', 'clickable', [ - 'title' => sprintf( - _('%s aus Gruppe %s entfernen'), - $user_fullname, - $group->name - ), - ]), - ['data-confirm' => sprintf( - _('Soll %s wirklich aus der Gruppe %s entfernt werden?'), - $user_fullname, - $group->name - )] + $controller->url_for('course/statusgroups/delete_member', $m->user_id, $group->id), + _('Aus der Gruppe entfernen'), + Icon::create('trash'), + [ + 'title' => sprintf( + _('%s aus Gruppe %s entfernen'), + $user_fullname, + $group->name + ), + 'data-confirm' => sprintf( + _('Soll %s wirklich aus der Gruppe %s entfernt werden?'), + $user_fullname, + $group->name + ) + ] ); } echo $actions; diff --git a/app/views/course/studygroup/_choose_founders.php b/app/views/course/studygroup/_choose_founders.php index 2e90379..ca47782 100644 --- a/app/views/course/studygroup/_choose_founders.php +++ b/app/views/course/studygroup/_choose_founders.php @@ -12,15 +12,30 @@ - _('NutzerIn hinzufügen')])->asInput(["type" => "image", "class" => "middle", "name" => "add_founder"]) ?> - _('neue Suche starten')])->asInput(["type" => "image", "class" => "middle", "name" => "new_search"]) ?> + asInput([ + 'title' => _('NutzerIn hinzufügen'), + 'type' => 'image', + 'class' => 'middle', + 'name' => 'add_founder' + ]) ?> + asInput([ + 'title' => _('neue Suche starten'), + 'type' => 'image', + 'class' => 'middle', + 'name' => 'new_search', + ]) ?>
      - _('Suchen')])->asInput(["type" => "image", "class" => "middle", "name" => "search_founder"]) ?> - + asInput([ + 'title' => _('Suchen'), + 'type' => 'image', + 'class' => 'middle', + 'name' => 'search_founder', + ]) ?> +
    @@ -30,7 +45,7 @@
    0) : foreach ($founders as $user_id) :?> - + () _('NutzerIn entfernen')])->asInput(["type" => "image", "class" => "middle", "name" => "remove_founder"]) ?> diff --git a/app/views/course/timesrooms/_bookable_rooms_icon.php b/app/views/course/timesrooms/_bookable_rooms_icon.php index 4966730..d0f1039 100644 --- a/app/views/course/timesrooms/_bookable_rooms_icon.php +++ b/app/views/course/timesrooms/_bookable_rooms_icon.php @@ -10,4 +10,4 @@ if (Request::isDialog()) { $input_attr['data-dialog'] = 'size=big'; } ?> -asInput(20, $input_attr) ?> +asInput($input_attr) ?> diff --git a/app/views/course/timesrooms/editDate.php b/app/views/course/timesrooms/editDate.php index 5012a43..b360609 100644 --- a/app/views/course/timesrooms/editDate.php +++ b/app/views/course/timesrooms/editDate.php @@ -82,13 +82,10 @@ ['only_bookable_rooms' => '1'] ) ?>" title=""> - asImg( - 20, - [ - 'class' => 'text-bottom', - 'style' => 'margin-left: 0.2em; margin-top: 0.6em;', - ] - ) ?> + asImg([ + 'class' => 'text-bottom', + 'style' => 'margin-left: 0.2em; margin-top: 0.6em;', + ]) ?> diff --git a/app/views/course/wiki/blame.php b/app/views/course/wiki/blame.php index c1f0d95..d924c17 100644 --- a/app/views/course/wiki/blame.php +++ b/app/views/course/wiki/blame.php @@ -26,7 +26,7 @@ href="versiondiff(!$version || is_a($version, WikiPage::class) ? $version : $version->page, is_a($version, WikiVersion::class) ? $version->id : null) ?>" data-dialog title=""> - asImg(20, ['class' => 'text-bottom']) ?> + asImg(['class' => 'text-bottom']) ?>
    diff --git a/app/views/file/_file_aside.php b/app/views/file/_file_aside.php index cdddc26..b748e73 100644 --- a/app/views/file/_file_aside.php +++ b/app/views/file/_file_aside.php @@ -49,7 +49,7 @@

    - icon, Icon::ROLE_INFO)->asImg(20) ?> + icon, Icon::ROLE_INFO) ?>
    student_description) ?>
    download_condition) : ?> diff --git a/app/views/file/_terms_of_use_select.php b/app/views/file/_terms_of_use_select.php index 4252b2d..42d1678 100644 --- a/app/views/file/_terms_of_use_select.php +++ b/app/views/file/_terms_of_use_select.php @@ -24,8 +24,8 @@ if (!$selected_terms_of_use_id) { aria-description="description)) ?>">
    diff --git a/app/views/file/choose_file.php b/app/views/file/choose_file.php index 8a5cebd..1b59a9d 100644 --- a/app/views/file/choose_file.php +++ b/app/views/file/choose_file.php @@ -13,7 +13,7 @@ if (Request::get('to_folder_id')) {
    - asImg(20, ['class' => 'text-bottom']) ?> + asImg(['class' => 'text-bottom']) ?>
    diff --git a/app/views/file/choose_file_from_course.php b/app/views/file/choose_file_from_course.php index 7ebf73a..6de5332 100644 --- a/app/views/file/choose_file_from_course.php +++ b/app/views/file/choose_file_from_course.php @@ -57,7 +57,7 @@ if (Request::get('range_type')) { - asImg(30) ?> + asImg(30) ?> diff --git a/app/views/file/choose_folder.php b/app/views/file/choose_folder.php index a50af25..955aa8f 100644 --- a/app/views/file/choose_folder.php +++ b/app/views/file/choose_folder.php @@ -23,7 +23,7 @@ $buttonLabels = [
    - asImg(20, ['class' => 'text-bottom']) ?> + asImg(['class' => 'text-bottom']) ?>
    diff --git a/app/views/file/new_edit_folder_form.php b/app/views/file/new_edit_folder_form.php index c25a71c..c89f4c2 100644 --- a/app/views/file/new_edit_folder_form.php +++ b/app/views/file/new_edit_folder_form.php @@ -27,8 +27,8 @@ id="folder-type-" >