From 8b7a902269a1a20a6a5ddec387913753d01999ea Mon Sep 17 00:00:00 2001 From: Rasmus Fuhse Date: Sat, 20 Aug 2022 19:09:44 +0000 Subject: =?UTF-8?q?Resolve=20"Icons=20mit=20Zus=C3=A4tze=20ersetzen=20durc?= =?UTF-8?q?h=20Icons=20ohne=20Zus=C3=A4tze"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #1463 Merge request studip/studip!913 --- app/controllers/admin/courses.php | 2 +- app/controllers/admin/plugin.php | 9 +- app/controllers/admin/statusgroups.php | 2 +- app/controllers/admin/user.php | 8 +- app/controllers/admission/restricted_courses.php | 2 +- app/controllers/consultation/admin.php | 4 +- app/controllers/contact.php | 2 +- app/controllers/course/details.php | 2 +- app/controllers/course/feedback.php | 2 +- app/controllers/course/files.php | 6 +- app/controllers/course/grouping.php | 2 +- app/controllers/course/ilias_interface.php | 14 +- app/controllers/course/management.php | 4 +- app/controllers/course/members.php | 22 +- app/controllers/course/overview.php | 4 +- app/controllers/course/statusgroups.php | 14 +- app/controllers/course/studygroup.php | 4 +- app/controllers/course/topics.php | 2 +- app/controllers/fachabschluss/abschluesse.php | 2 +- app/controllers/fachabschluss/faecher.php | 2 +- app/controllers/fachabschluss/kategorien.php | 2 +- app/controllers/files.php | 4 +- app/controllers/files_dashboard/helpers.php | 4 +- app/controllers/files_dashboard/sidebar.php | 2 +- app/controllers/institute/files.php | 4 +- app/controllers/lvgruppen/lvgruppen.php | 6 +- app/controllers/materialien/files.php | 2 +- app/controllers/messages.php | 2 +- app/controllers/module/module.php | 2 +- app/controllers/my_courses.php | 6 +- app/controllers/my_institutes.php | 4 +- app/controllers/news.php | 2 +- app/controllers/profile.php | 4 +- app/controllers/resources/resource.php | 2 +- app/controllers/resources/room_request.php | 8 +- app/controllers/room_management/planning.php | 6 +- app/controllers/settings/deputies.php | 2 +- app/controllers/shared/contacts.php | 4 +- app/controllers/studiengaenge/studiengaenge.php | 2 +- app/controllers/studiengaenge/studiengangteile.php | 2 +- app/controllers/studiengaenge/versionen.php | 2 +- app/views/admin/plugin/index.php | 6 +- app/views/admin/role/show_role.php | 2 +- app/views/admin/webservice_access/index.php | 2 +- app/views/admission/courseset/index.php | 2 +- app/views/calendar/schedule/index.php | 2 +- app/views/calendar/single/manage_access.php | 4 +- app/views/consultation/admin/index.php | 6 +- app/views/consultation/admin/ungrouped.php | 6 +- app/views/contact/index.php | 2 +- app/views/course/dates/_date_row-exdate.php | 2 +- app/views/course/dates/_date_row.php | 4 +- app/views/course/forum/area/add.php | 2 +- app/views/course/forum/index/_post.php | 2 +- app/views/course/forum/index/_threads.php | 4 +- app/views/course/ilias_interface/index.php | 6 +- app/views/course/statusgroups/_member.php | 2 +- app/views/course/timesrooms/_cycleRow.php | 2 +- app/views/course/timesrooms/_irregularEvents.php | 4 +- app/views/evaluation/_actions.php | 4 +- app/views/file/choose_folder.php | 4 +- app/views/files/_folder_tr.php | 6 +- app/views/materialien/files/add_dokument.php | 2 +- app/views/materialien/files/index.php | 2 +- app/views/materialien/files/range.php | 226 ++++++++++----------- app/views/module/module/details.php | 2 +- app/views/module/module/module.php | 2 +- app/views/my_courses/waiting_list.php | 2 +- app/views/my_ilias_accounts/index.php | 8 +- app/views/my_studygroups/_course.php | 2 +- app/views/news/admin_news.php | 2 +- app/views/news/display.php | 2 +- app/views/oer/market/details.php | 2 +- app/views/oer/market/index.php | 2 +- app/views/online/user-row.php | 4 +- app/views/questionnaire/widget.php | 2 +- app/views/resources/booking/_add_edit_form.php | 2 +- app/views/shared/contacts/index.php | 2 +- app/views/shared/contacts/range.php | 2 +- .../studiengaenge/fachbereichestgteile/index.php | 4 +- app/views/studiengaenge/faecher/index.php | 4 +- app/views/studiengaenge/studiengangteile/index.php | 2 +- app/views/studiengaenge/versionen/versionen.php | 2 +- lib/classes/Icon.class.php | 6 +- lib/classes/MultiPersonSearch.class.php | 2 +- lib/classes/sidebar/SearchWidget.php | 2 +- lib/filesystem/FilesystemVueDataManager.php | 4 +- lib/filesystem/HiddenFolder.php | 4 +- lib/filesystem/StandardFile.php | 8 +- lib/models/Freetext.php | 2 +- lib/models/Test.php | 2 +- lib/models/Vote.php | 2 +- lib/modules/ActivityFeed.php | 2 +- lib/modules/NewsWidget.php | 2 +- lib/wiki.inc.php | 2 +- templates/blubber/course_context.php | 2 +- templates/blubber/global_context.php | 2 +- tests/unit/lib/classes/IconClassTest.php | 16 +- 98 files changed, 294 insertions(+), 297 deletions(-) diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php index 6cee886..711494a 100644 --- a/app/controllers/admin/courses.php +++ b/app/controllers/admin/courses.php @@ -222,7 +222,7 @@ class Admin_CoursesController extends AuthenticatedController $actions->addLink( _('Neue Veranstaltung anlegen'), URLHelper::getURL('dispatch.php/course/wizard'), - Icon::create('seminar+add') + Icon::create('add') )->asDialog('size=50%'); $actions->addLink( _('Diese Seitenleiste konfigurieren'), diff --git a/app/controllers/admin/plugin.php b/app/controllers/admin/plugin.php index 91f5972..044fc50 100644 --- a/app/controllers/admin/plugin.php +++ b/app/controllers/admin/plugin.php @@ -56,18 +56,15 @@ class Admin_PluginController extends AuthenticatedController $views = Sidebar::get()->addWidget(new ViewsWidget()); $views->addLink( _('Pluginverwaltung'), - $this->indexURL(), - Icon::create('plugin') + $this->indexURL() )->setActive($action === 'index'); $views->addLink( _('Weitere Plugins installieren'), - $this->searchURL(), - Icon::create('search') + $this->searchURL() )->setActive($action === 'search'); $views->addLink( _('Vorhandene Plugins registrieren'), - $this->unregisteredURL(), - Icon::create('plugin+add') + $this->unregisteredURL() )->setActive($action === 'unregistered'); } diff --git a/app/controllers/admin/statusgroups.php b/app/controllers/admin/statusgroups.php index 57ad318..aee95f9 100644 --- a/app/controllers/admin/statusgroups.php +++ b/app/controllers/admin/statusgroups.php @@ -70,7 +70,7 @@ class Admin_StatusgroupsController extends AuthenticatedController $widget = new ActionsWidget(); $widget->addLink(_('Neue Gruppe anlegen'), $this->url_for('admin/statusgroups/editGroup'), - Icon::create('group3+add', 'clickable')) + Icon::create('add', 'clickable')) ->asDialog('size=auto'); $widget->addLink(_('Gruppenreihenfolge ändern'), $this->url_for('admin/statusgroups/sortGroups'), diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php index ab9f23b..9c9491c 100644 --- a/app/controllers/admin/user.php +++ b/app/controllers/admin/user.php @@ -1528,18 +1528,18 @@ class Admin_UserController extends AuthenticatedController $actions->addLink( _('Neues Konto anlegen'), $this->url_for('admin/user/new'), - Icon::create('person+add') + Icon::create('add') )->asDialog(); } $actions->addLink( _('Vorläufiges Konto anlegen'), $this->url_for('admin/user/new/prelim'), - Icon::create('date+add') + Icon::create('add') )->asDialog(); $actions->addLink( _('Konten zusammenführen'), $this->url_for('admin/user/migrate/' . (($this->user && is_array($this->user)) ? $this->user['user_id'] : '')), - Icon::create('persons+new') + Icon::create('community') ); $search = $sidebar->addWidget(new SearchWidget()); @@ -1554,7 +1554,7 @@ class Admin_UserController extends AuthenticatedController $export = $sidebar->addWidget(new ExportWidget()); $export->addLink(_('Suchergebnis exportieren'), $this->url_for('admin/user?export=1'), - Icon::create('persons+move_right') + Icon::create('export') ); } diff --git a/app/controllers/admission/restricted_courses.php b/app/controllers/admission/restricted_courses.php index 5ae3a38..f611f09 100644 --- a/app/controllers/admission/restricted_courses.php +++ b/app/controllers/admission/restricted_courses.php @@ -32,7 +32,7 @@ class Admission_RestrictedCoursesController extends AuthenticatedController { $actions = new ActionsWidget(); - $actions->addLink(_("Export"), $this->url_for('admission/restricted_courses', ['csv' => 1]), Icon::create('file-excel+export', 'clickable')); + $actions->addLink(_("Export"), $this->url_for('admission/restricted_courses', ['csv' => 1]), Icon::create('export', 'clickable')); Sidebar::get()->addWidget($actions); $sem_condition = ""; diff --git a/app/controllers/consultation/admin.php b/app/controllers/consultation/admin.php index eca774c..3708bc8 100644 --- a/app/controllers/consultation/admin.php +++ b/app/controllers/consultation/admin.php @@ -817,12 +817,12 @@ class Consultation_AdminController extends ConsultationController $export->addLink( _('Anmeldungen exportieren'), $this->url_for('consultation/export/bookings', $action === 'expired'), - Icon::create('file-excel+export') + Icon::create('export') ); $export->addLink( _('Alle Termine exportieren'), $this->url_for('consultation/export/all', $action === 'expired'), - Icon::create('file-excel+export') + Icon::create('export') ); } diff --git a/app/controllers/contact.php b/app/controllers/contact.php index 1453f91..35b693c 100644 --- a/app/controllers/contact.php +++ b/app/controllers/contact.php @@ -221,7 +221,7 @@ class ContactController extends AuthenticatedController $actions->addLink( _('Neue Gruppe anlegen'), $this->url_for('contact/editGroup'), - Icon::create('group3+add') + Icon::create('group3') )->asDialog('size=auto'); $actions->addLink( _('Nachricht an alle'), diff --git a/app/controllers/course/details.php b/app/controllers/course/details.php index bcd4f54..5eaedf7 100644 --- a/app/controllers/course/details.php +++ b/app/controllers/course/details.php @@ -287,7 +287,7 @@ class Course_DetailsController extends AuthenticatedController 'cid' => null, 'again' => 'yes', ]), - Icon::create('group') + Icon::create('clipboard') ); $sidebar->addWidget($share); diff --git a/app/controllers/course/feedback.php b/app/controllers/course/feedback.php index a4d79e3..cd970a0 100644 --- a/app/controllers/course/feedback.php +++ b/app/controllers/course/feedback.php @@ -49,7 +49,7 @@ class Course_FeedbackController extends AuthenticatedController $widget->addLink( _('Neues Feedback-Element'), $this->url_for('course/feedback/create_form'), - Icon::create('star+add') + Icon::create('star') )->asDialog(); } } diff --git a/app/controllers/course/files.php b/app/controllers/course/files.php index cccbdee..6cfef6e 100644 --- a/app/controllers/course/files.php +++ b/app/controllers/course/files.php @@ -73,7 +73,7 @@ class Course_FilesController extends AuthenticatedController $actions->addLink( _('Neuer Ordner'), URLHelper::getUrl('dispatch.php/file/new_folder/' . $this->topFolder->getId()), - Icon::create('folder-empty+add', 'clickable') + Icon::create('folder-empty', 'clickable') )->asDialog(); } @@ -81,7 +81,7 @@ class Course_FilesController extends AuthenticatedController $actions->addLink( _('Dokument hinzufügen'), '#', - Icon::create('file+add', 'clickable'), + Icon::create('add', 'clickable'), ['onclick' => "STUDIP.Files.openAddFilesWindow(); return false;"] ); } @@ -89,7 +89,7 @@ class Course_FilesController extends AuthenticatedController $actions->addLink( _('Neues Feedback-Element'), $this->url_for('course/feedback/create_form/' . $this->topFolder->getId() . '/Folder'), - Icon::create('star+add') + Icon::create('star') )->asDialog(); } diff --git a/app/controllers/course/grouping.php b/app/controllers/course/grouping.php index 2386a4d..e357282 100644 --- a/app/controllers/course/grouping.php +++ b/app/controllers/course/grouping.php @@ -133,7 +133,7 @@ class Course_GroupingController extends AuthenticatedController $actions->addLink( _('Unterveranstaltungen anlegen'), $this->url_for('course/grouping/create_children'), - Icon::create('seminar+add', 'clickable') + Icon::create('add', 'clickable') )->asDialog('size=auto'); $sidebar->addWidget($actions); } diff --git a/app/controllers/course/ilias_interface.php b/app/controllers/course/ilias_interface.php index d6ebce2..a07e24a 100644 --- a/app/controllers/course/ilias_interface.php +++ b/app/controllers/course/ilias_interface.php @@ -103,14 +103,14 @@ class Course_IliasInterfaceController extends AuthenticatedController $widget->addLink( _('Lernobjekte suchen'), $this->url_for('course/ilias_interface/add_object/search'), - Icon::create('learnmodule+add') + Icon::create('add') )->asDialog(); } if ($this->author_permission) { $widget->addLink( _('Meine Lernobjekte'), $this->url_for('course/ilias_interface/add_object/my_modules'), - Icon::create('learnmodule+add') + Icon::create('add') )->asDialog(); } if ($this->ilias_interface_config['search_active'] || $this->author_permission) { @@ -124,20 +124,20 @@ class Course_IliasInterfaceController extends AuthenticatedController $widget->addLink( _('Neuen ILIAS-Kurs anlegen'), $this->url_for('course/ilias_interface/add_object/new_course'), - Icon::create('seminar+add') + Icon::create('add') )->asDialog('size=auto;reload-on-close'); if ($this->change_course_permission) { $widget->addLink( _('ILIAS-Kurs aus einer anderen Veranstaltung zuordnen'), $this->url_for('course/ilias_interface/add_object/assign_course'), - Icon::create('seminar+add') + Icon::create('learnmodule') )->asDialog('size=auto;reload-on-close'); } if ($this->add_own_course_permission) { $widget->addLink( _('Eigenen ILIAS-Kurs zuordnen'), $this->url_for('course/ilias_interface/add_object/assign_own_course'), - Icon::create('seminar+add') + Icon::create('learnmodule') )->asDialog('size=auto;reload-on-close'); } } @@ -152,7 +152,7 @@ class Course_IliasInterfaceController extends AuthenticatedController $widget->addLink( sprintf(_('Verknüpfung zu %s entfernen'), $this->ilias_list[$ilias_index]->getName()), $this->url_for("course/ilias_interface/remove_course/{$ilias_index}/{$crs_id}"), - Icon::create('seminar+remove'), + Icon::create('trash'), [ 'data-confirm' => sprintf( _('Verknüpfung zum Kurs in %s entfernen? Hierdurch werden auch die Verknüpfungen zu allen Objekten innerhalb des Kurses entfernt.'), @@ -170,7 +170,7 @@ class Course_IliasInterfaceController extends AuthenticatedController $widget->addLink( _('Gruppen übertragen'), $this->url_for('course/ilias_interface/add_groups'), - Icon::create('group2+refresh') + Icon::create('group2') )->asDialog('size=auto'); } if ($this->author_permission) { diff --git a/app/controllers/course/management.php b/app/controllers/course/management.php index 2f8bc7b..b3b9268 100644 --- a/app/controllers/course/management.php +++ b/app/controllers/course/management.php @@ -66,7 +66,7 @@ class Course_ManagementController extends AuthenticatedController $actions->addLink( _('Veranstaltung kopieren'), URLHelper::getURL($this->url_for('course/wizard/copy/'.$course->id), ['studip_ticket' => Seminar_Session::get_ticket()]), - Icon::create('seminar+add') + Icon::create('seminar') ); } @@ -74,7 +74,7 @@ class Course_ManagementController extends AuthenticatedController $actions->addLink( _('Veranstaltung löschen'), URLHelper::getURL( $this->url_for('course/archive/confirm'), ['studip_ticket' => Seminar_Session::get_ticket()]), - Icon::create('seminar+remove') + Icon::create('trash') )->asDialog('size=auto'); } diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php index 4e6afdc..e9cdb5f 100644 --- a/app/controllers/course/members.php +++ b/app/controllers/course/members.php @@ -203,7 +203,7 @@ class Course_MembersController extends AuthenticatedController $results = SimpleCollection::createFromArray($members)->pluck('email'); if (!empty($results)) { - return sprintf('%s', htmlReady(join(',', $results)), Icon::create('mail+move_right', 'clickable', ['title' => sprintf('E-Mail an alle %s versenden',$textStatus)])->asImg(16)); + return sprintf('%s', htmlReady(join(',', $results)), Icon::create('mail', 'clickable', ['title' => sprintf('E-Mail an alle %s versenden',$textStatus)])->asImg(16)); } else { return null; } @@ -1426,7 +1426,7 @@ class Course_MembersController extends AuthenticatedController 'course_id' => $this->course_id, 'default_subject' => $this->subject ]), - Icon::create('inbox') + Icon::create('mail') )->asDialog('size=auto'); } if ($this->is_tutor) { @@ -1497,7 +1497,7 @@ class Course_MembersController extends AuthenticatedController $membersOfInstitute) ->setNavigationItem('/course/members/view') ->render(); - $element = LinkElement::fromHTML($mp, Icon::create('community+add')); + $element = LinkElement::fromHTML($mp, Icon::create('add')); $widget->addElement($element); } if (!$this->tutor_is_locked) { @@ -1553,7 +1553,7 @@ class Course_MembersController extends AuthenticatedController $membersOfInstitute) ->setNavigationItem('/course/members/view') ->render(); - $element = LinkElement::fromHTML($mp, Icon::create('community+add')); + $element = LinkElement::fromHTML($mp, Icon::create('add')); $widget->addElement($element); } } @@ -1617,7 +1617,7 @@ class Course_MembersController extends AuthenticatedController ->render(); $widget->addElement(LinkElement::fromHTML( $mp, - Icon::create('community+add') + Icon::create('add') )); // add "add person to waitlist" to sidebar @@ -1644,13 +1644,13 @@ class Course_MembersController extends AuthenticatedController ->addQuickfilter(_('Mitglieder der Einrichtung'), $membersOfInstitute) ->setNavigationItem('/course/members/view') ->render(); - $element = LinkElement::fromHTML($mp, Icon::create('community+add')); + $element = LinkElement::fromHTML($mp, Icon::create('add')); $widget->addElement($element); } $widget->addLink( _('Teilnehmendenliste importieren'), $this->url_for('course/members/import_autorlist'), - Icon::create('community+add'), + Icon::create('persons'), ['data-dialog' => 1] ); } @@ -1671,7 +1671,7 @@ class Course_MembersController extends AuthenticatedController ); $widget->addLinkFromHTML( $csvExport, - Icon::create('file-office') + Icon::create('export') ); // create csv-export link @@ -1687,7 +1687,7 @@ class Course_MembersController extends AuthenticatedController ); $widget->addLinkFromHTML( $rtfExport, - Icon::create('file-text') + Icon::create('export') ); if (count($this->awaiting) > 0) { @@ -1703,7 +1703,7 @@ class Course_MembersController extends AuthenticatedController ); $widget->addLinkFromHTML( $awaiting_rtf, - Icon::create('file-office+export') + Icon::create('export') ); $awaiting_csv = export_link( @@ -1718,7 +1718,7 @@ class Course_MembersController extends AuthenticatedController ); $widget->addLinkFromHTML( $awaiting_csv, - Icon::create('file-text+export') + Icon::create('export') ); } } diff --git a/app/controllers/course/overview.php b/app/controllers/course/overview.php index 3d209e6..bfff553 100644 --- a/app/controllers/course/overview.php +++ b/app/controllers/course/overview.php @@ -153,7 +153,7 @@ class Course_OverviewController extends AuthenticatedController 'cid' => null, 'again' => 'yes', ]), - Icon::create('group') + Icon::create('clipboard') ); } else { $share->addCopyableLink( @@ -163,7 +163,7 @@ class Course_OverviewController extends AuthenticatedController 'cid' => null, 'again' => 'yes', ]), - Icon::create('group') + Icon::create('clipboard') ); } $sidebar->addWidget($share); diff --git a/app/controllers/course/statusgroups.php b/app/controllers/course/statusgroups.php index 4013c8c..46618e2 100644 --- a/app/controllers/course/statusgroups.php +++ b/app/controllers/course/statusgroups.php @@ -236,14 +236,14 @@ class Course_StatusgroupsController extends AuthenticatedController if ($this->is_tutor) { if (!$this->is_locked) { $actions->addLink( - _('Neue Gruppe anlegen'), + _('Gruppe anlegen'), $this->url_for('course/statusgroups/edit'), Icon::create('add') )->asDialog('size=auto'); $actions->addLink( _('Mehrere Gruppen anlegen'), $this->url_for('course/statusgroups/create_groups'), - Icon::create('group2+add') + Icon::create('add') )->asDialog('size=auto'); } if (Config::get()->EXPORT_ENABLE) { @@ -252,18 +252,18 @@ class Course_StatusgroupsController extends AuthenticatedController $csvExport = export_link($this->course_id, 'person', sprintf('%s %s', _('Gruppenliste'), htmlReady($this->course_title)), 'csv', 'csv-gruppen', 'status', - _('Gruppen als CSV-Dokument exportieren'), + _('Als CSV-Dokument exportieren'), 'passthrough'); - $element = LinkElement::fromHTML($csvExport, Icon::create('file-office')); + $element = LinkElement::fromHTML($csvExport, Icon::create('export')); $export->addElement($element); // create rtf-export link $rtfExport = export_link($this->course_id, 'person', sprintf('%s %s', _('Gruppenliste'), htmlReady($this->course_title)), 'rtf', 'rtf-gruppen', 'status', - _('Gruppen als RTF-Dokument exportieren'), + _('Als RTF-Dokument exportieren'), 'passthrough'); - $element = LinkElement::fromHTML($rtfExport, Icon::create('file-text')); + $element = LinkElement::fromHTML($rtfExport, Icon::create('export')); $export->addElement($element); $sidebar->addWidget($export); @@ -287,7 +287,7 @@ class Course_StatusgroupsController extends AuthenticatedController $actions->addLink( _('Alle Gruppen aufklappen'), $this->url_for('course/statusgroups', ['open_groups' => '1']), - Icon::create('arr_2down') + Icon::create('arr_1down') ); } $sidebar->addWidget($actions); diff --git a/app/controllers/course/studygroup.php b/app/controllers/course/studygroup.php index cbe711e..58032b8 100644 --- a/app/controllers/course/studygroup.php +++ b/app/controllers/course/studygroup.php @@ -376,7 +376,7 @@ class Course_StudygroupController extends AuthenticatedController $actions->addLink( _('Neue Studiengruppe anlegen'), $this->url_for('course/wizard?studygroup=1'), - Icon::create('studygroup+add') + Icon::create('add') ); if ($GLOBALS['perm']->have_studip_perm('tutor', $id)) { $actions->addLink( @@ -551,7 +551,7 @@ class Course_StudygroupController extends AuthenticatedController ->setNavigationItem('/course/members') ->render(); - $element = LinkElement::fromHTML($mp, Icon::create('community+add', 'clickable')); + $element = LinkElement::fromHTML($mp, Icon::create('add', 'clickable')); $actions->addElement($element); } diff --git a/app/controllers/course/topics.php b/app/controllers/course/topics.php index c821856..d90955f 100644 --- a/app/controllers/course/topics.php +++ b/app/controllers/course/topics.php @@ -250,7 +250,7 @@ class Course_TopicsController extends AuthenticatedController $actions->addLink( _('Themen aus Veranstaltung kopieren'), $this->url_for('course/topics/copy'), - Icon::create('topic+add') + Icon::create('clipboard') )->asDialog(); } diff --git a/app/controllers/fachabschluss/abschluesse.php b/app/controllers/fachabschluss/abschluesse.php index 4d3bca8..e7d350d 100644 --- a/app/controllers/fachabschluss/abschluesse.php +++ b/app/controllers/fachabschluss/abschluesse.php @@ -180,7 +180,7 @@ class Fachabschluss_AbschluesseController extends MVVController $widget->addLink( _('Neuen Abschluss anlegen'), $this->url_for('/abschluss'), - Icon::create('file') + Icon::create('add') ); $sidebar->addWidget($widget); } diff --git a/app/controllers/fachabschluss/faecher.php b/app/controllers/fachabschluss/faecher.php index 1240a88..b767005 100644 --- a/app/controllers/fachabschluss/faecher.php +++ b/app/controllers/fachabschluss/faecher.php @@ -228,7 +228,7 @@ class Fachabschluss_FaecherController extends MVVController $widget->addLink( _('Neues Fach anlegen'), $this->url_for('/fach'), - Icon::create('file+add') + Icon::create('add') ); $sidebar->addWidget($widget); } diff --git a/app/controllers/fachabschluss/kategorien.php b/app/controllers/fachabschluss/kategorien.php index 892ec5e..8c00587 100644 --- a/app/controllers/fachabschluss/kategorien.php +++ b/app/controllers/fachabschluss/kategorien.php @@ -225,7 +225,7 @@ class Fachabschluss_KategorienController extends MVVController $widget->addLink( _('Neue Abschluss-Kategorie anlegen'), $this->url_for('/kategorie'), - Icon::create('file+add') + Icon::create('add') ); $sidebar->addWidget($widget); } diff --git a/app/controllers/files.php b/app/controllers/files.php index 531463d..aaa26ef 100644 --- a/app/controllers/files.php +++ b/app/controllers/files.php @@ -96,7 +96,7 @@ class FilesController extends AuthenticatedController $actions->addLink( _('Neuer Ordner'), URLHelper::getUrl('dispatch.php/file/new_folder/' . $folder->getId()), - Icon::create('folder-empty+add', 'clickable'), ['data-dialog' => 1] + Icon::create('folder-empty', 'clickable'), ['data-dialog' => 1] ); } @@ -113,7 +113,7 @@ class FilesController extends AuthenticatedController $actions->addLink( _('Dokument hinzufügen'), '#', - Icon::create('file+add', 'clickable'), + Icon::create('add', 'clickable'), ['onClick' => "STUDIP.Files.openAddFilesWindow(); return false;"] ); } diff --git a/app/controllers/files_dashboard/helpers.php b/app/controllers/files_dashboard/helpers.php index 1e4e271..3519fb8 100644 --- a/app/controllers/files_dashboard/helpers.php +++ b/app/controllers/files_dashboard/helpers.php @@ -56,7 +56,7 @@ trait Helpers $actionMenu->addLink( URLHelper::getURL('dispatch.php/file/choose_destination/move/'.$fileRef->id), _('Datei verschieben'), - Icon::create('file+move_right', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('arr_1right', Icon::ROLE_CLICKABLE, ['size' => 20]), ['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('file+add', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('clipboard', Icon::ROLE_CLICKABLE, ['size' => 20]), ['data-dialog' => 'size=auto'] ); } diff --git a/app/controllers/files_dashboard/sidebar.php b/app/controllers/files_dashboard/sidebar.php index 347b99c..9fcc237 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('file+add', 'clickable'), + \Icon::create('add', 'clickable'), ['data-dialog' => 'size=auto'] ); diff --git a/app/controllers/institute/files.php b/app/controllers/institute/files.php index 8ff697b..9f2cdd5 100644 --- a/app/controllers/institute/files.php +++ b/app/controllers/institute/files.php @@ -67,14 +67,14 @@ class Institute_FilesController extends AuthenticatedController URLHelper::getUrl( 'dispatch.php/file/new_folder/' . $this->topFolder ->getId() ), - Icon::create('folder-empty+add', 'clickable') + Icon::create('folder-empty', 'clickable') )->asDialog(); } if ($this->topFolder && $this->topFolder->isWritable($GLOBALS['user']->id)) { $actions->addLink( _('Dokument hinzufügen'), '#', - Icon::create('file+add', 'clickable'), + Icon::create('add', 'clickable'), ['onclick' => "STUDIP.Files.openAddFilesWindow(); return false;"] ); } diff --git a/app/controllers/lvgruppen/lvgruppen.php b/app/controllers/lvgruppen/lvgruppen.php index 43831cb..e9050de 100644 --- a/app/controllers/lvgruppen/lvgruppen.php +++ b/app/controllers/lvgruppen/lvgruppen.php @@ -94,17 +94,17 @@ class Lvgruppen_LvgruppenController extends MVVController $this->setSidebar(); $sidebar = Sidebar::get(); - $widget = new ActionsWidget(); + $widget = new ExportWidget(); $widget->addLink(_('Lehrveranstaltungsgruppen mit Zuordnungen exportieren'), $this->url_for('/export_xls'), - Icon::create('download')); + Icon::create('export')); if (Config::get()->MVV_ALLOW_CREATE_LVGRUPPEN_INDEPENDENTLY && MvvPerm::havePermCREATE('Lvgruppe')) { $widget->addLink(_('Neue LV-Gruppe anlegen'), $this->url_for('/lvgruppe'), - Icon::create('file+add'), ['data-dialog' => 'size=auto']); + Icon::create('add'), ['data-dialog' => 'size=auto']); } $sidebar->addWidget($widget); diff --git a/app/controllers/materialien/files.php b/app/controllers/materialien/files.php index 629845a..ba5f2c8 100644 --- a/app/controllers/materialien/files.php +++ b/app/controllers/materialien/files.php @@ -614,7 +614,7 @@ class Materialien_FilesController extends MVVController $widget->addLink( _('Neues Dokument anlegen'), $this->url_for('/new_dokument'), - Icon::create('file+add') + Icon::create('add') )->asDialog('size=auto'); } $sidebar->addWidget($widget); diff --git a/app/controllers/messages.php b/app/controllers/messages.php index 82d42d1..c6672ae 100644 --- a/app/controllers/messages.php +++ b/app/controllers/messages.php @@ -997,7 +997,7 @@ class MessagesController extends AuthenticatedController { $actions->addLink( _('Neue Nachricht schreiben'), $this->url_for('messages/write'), - Icon::create('mail+add'), + Icon::create('mail'), ['data-dialog' => 'width=700;height=700'] ); } diff --git a/app/controllers/module/module.php b/app/controllers/module/module.php index cf7b6ac..cb68582 100644 --- a/app/controllers/module/module.php +++ b/app/controllers/module/module.php @@ -1317,7 +1317,7 @@ class Module_ModuleController extends MVVController $widget->addLink( _('Neues Modul anlegen'), $this->url_for('/modul'), - Icon::create('file+add') + Icon::create('add') ); } $sidebar->addWidget($widget, 'actions'); diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php index 0c12f41..a45ad4d 100644 --- a/app/controllers/my_courses.php +++ b/app/controllers/my_courses.php @@ -882,20 +882,20 @@ class MyCoursesController extends AuthenticatedController $setting_widget->addLink( _('Neue Veranstaltung anlegen'), URLHelper::getURL('dispatch.php/course/wizard'), - Icon::create('seminar+add') + Icon::create('add') )->asDialog(); } $setting_widget->addLink( _('Veranstaltung hinzufügen'), URLHelper::getURL('dispatch.php/search/courses'), - Icon::create('seminar') + Icon::create('search') ); if (Config::get()->STUDYGROUPS_ENABLE) { $setting_widget->addLink( _('Neue Studiengruppe anlegen'), URLHelper::getURL('dispatch.php/course/wizard', ['studygroup' => 1]), - Icon::create('studygroup+add') + Icon::create('studygroup') )->asDialog(); } diff --git a/app/controllers/my_institutes.php b/app/controllers/my_institutes.php index 0bdff85..514fd66 100644 --- a/app/controllers/my_institutes.php +++ b/app/controllers/my_institutes.php @@ -118,14 +118,14 @@ class MyInstitutesController extends AuthenticatedController $links->addLink( _('Einrichtungsdaten bearbeiten'), URLHelper::getURL('dispatch.php/settings/statusgruppen'), - Icon::create('institute+edit') + Icon::create('edit') ); } if ($GLOBALS['perm']->have_perm('autor')) { $links->addLink( _('Einrichtungen suchen'), URLHelper::getURL('dispatch.php/search/globalsearch#GlobalSearchInstitutes'), - Icon::create('institute+add') + Icon::create('search') ); $links->addLink( _('Studiendaten bearbeiten'), diff --git a/app/controllers/news.php b/app/controllers/news.php index 9e685ea..d41ee63 100644 --- a/app/controllers/news.php +++ b/app/controllers/news.php @@ -582,7 +582,7 @@ class NewsController extends StudipController $widget->addLink( _('Ankündigung erstellen'), $this->url_for('news/edit_news/new'), - Icon::create('news+add'), + Icon::create('add'), ['target' => '_blank'] )->asDialog(); $this->sidebar->addWidget($widget); diff --git a/app/controllers/profile.php b/app/controllers/profile.php index 21de27e..cd2994f 100644 --- a/app/controllers/profile.php +++ b/app/controllers/profile.php @@ -279,14 +279,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('person+add', Icon::ROLE_CLICKABLE, tooltip2(_('Zu den Kontakten hinzufügen'))), + Icon::create('add', Icon::ROLE_CLICKABLE, 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('person+remove', Icon::ROLE_CLICKABLE, tooltip2(_('Zu den Kontakten hinzufügen'))), + Icon::create('trash', Icon::ROLE_CLICKABLE, tooltip2(_('Zu den Kontakten hinzufügen'))), ['data-confirm' => _('Wollen Sie die Person wirklich von den Kontakten entfernen?')] )->asButton(); } diff --git a/app/controllers/resources/resource.php b/app/controllers/resources/resource.php index b2aaa78..e7570d2 100644 --- a/app/controllers/resources/resource.php +++ b/app/controllers/resources/resource.php @@ -1446,7 +1446,7 @@ class Resources_ResourceController extends AuthenticatedController $actions->addLink( _('Dokument hinzufügen'), '#', - Icon::create('file+add'), + Icon::create('file'), [ 'onclick' => 'STUDIP.Files.openAddFilesWindow(); return false;' ] diff --git a/app/controllers/resources/room_request.php b/app/controllers/resources/room_request.php index 3ab375d..b12da6b 100644 --- a/app/controllers/resources/room_request.php +++ b/app/controllers/resources/room_request.php @@ -557,7 +557,7 @@ class Resources_RoomRequestController extends AuthenticatedController $filter_reset_widget->addLink( _('Filter zurücksetzen'), $this->overviewURL(['reset_filter' => '1']), - Icon::create('filter+decline') + Icon::create('decline') ); $sidebar->addWidget($filter_reset_widget); } @@ -770,12 +770,12 @@ class Resources_RoomRequestController extends AuthenticatedController $export->addLink( _('Gefilterte Anfragen'), $this->export_listURL($export_url_params), - Icon::create('file-excel') + Icon::create('export') ); $export->addLink( _('Alle Anfragen'), $this->export_listURL(), - Icon::create('file-excel') + Icon::create('export') ); $sidebar->addWidget($export); @@ -2593,7 +2593,7 @@ class Resources_RoomRequestController extends AuthenticatedController $filter_reset_widget->addLink( _('Filter zurücksetzen'), $this->planningURL(['reset_filter' => '1']), - Icon::create('filter+decline') + Icon::create('decline') ); $sidebar->addWidget($filter_reset_widget); } diff --git a/app/controllers/room_management/planning.php b/app/controllers/room_management/planning.php index 95d806b..5890a66 100644 --- a/app/controllers/room_management/planning.php +++ b/app/controllers/room_management/planning.php @@ -286,7 +286,7 @@ class RoomManagement_PlanningController extends AuthenticatedController $actions->addLink( _('Buchungen kopieren'), $this->url_for('room_management/planning/copy_bookings'), - Icon::create('assessment+add'), + Icon::create('clipboard'), ['data-dialog' => 'size=auto'] ); $sidebar->addWidget($actions); @@ -1132,7 +1132,7 @@ class RoomManagement_PlanningController extends AuthenticatedController 'date' => $this->date->format('d.m.Y') ] ), - Icon::create('file-text') + Icon::create('export') ); $actions->addLink( _('Export als CSV'), @@ -1143,7 +1143,7 @@ class RoomManagement_PlanningController extends AuthenticatedController 'date' => $this->date->format('d.m.Y') ] ), - Icon::create('file-excel') + Icon::create('export') ); $sidebar->addWidget($actions); diff --git a/app/controllers/settings/deputies.php b/app/controllers/settings/deputies.php index 910d93d..6992166 100644 --- a/app/controllers/settings/deputies.php +++ b/app/controllers/settings/deputies.php @@ -93,7 +93,7 @@ class Settings_DeputiesController extends Settings_SettingsController ->setSearchObject($this->search) ->setNavigationItem('/links/settings/deputies') ->render(); - $element = LinkElement::fromHTML($mp, Icon::create('community+add')); + $element = LinkElement::fromHTML($mp, Icon::create('add')); $actions->addElement($element); Sidebar::Get()->addWidget($actions); } diff --git a/app/controllers/shared/contacts.php b/app/controllers/shared/contacts.php index b1d82c4..5ab74eb 100644 --- a/app/controllers/shared/contacts.php +++ b/app/controllers/shared/contacts.php @@ -267,13 +267,13 @@ class Shared_ContactsController extends MVVController $widget->addLink( _('Neuen Ansprechpartner anlegen'), $this->url_for('/new_ansprechpartner'), - Icon::create('headache+add') + Icon::create('add') )->asDialog('size=auto'); } $widget->addLink( _('Liste exportieren (CSV)'), $this->url_for('/export_csv'), - Icon::create('download') + Icon::create('export') ); $sidebar->addWidget($widget); diff --git a/app/controllers/studiengaenge/studiengaenge.php b/app/controllers/studiengaenge/studiengaenge.php index 97a9a58..f04a62a 100644 --- a/app/controllers/studiengaenge/studiengaenge.php +++ b/app/controllers/studiengaenge/studiengaenge.php @@ -1027,7 +1027,7 @@ class Studiengaenge_StudiengaengeController extends MVVController $widget->addLink( _('Neuen Studiengang anlegen'), $this->url_for('/studiengang'), - Icon::create('file+add') + Icon::create('add') ); } $sidebar->addWidget($widget); diff --git a/app/controllers/studiengaenge/studiengangteile.php b/app/controllers/studiengaenge/studiengangteile.php index ffd7151..f5d7b2d 100644 --- a/app/controllers/studiengaenge/studiengangteile.php +++ b/app/controllers/studiengaenge/studiengangteile.php @@ -251,7 +251,7 @@ class Studiengaenge_StudiengangteileController extends SharedVersionController $widget->addLink( _('Neuen Studiengangteil anlegen'), $this->url_for('/stgteil'), - Icon::create('file+add') + Icon::create('add') ); } $sidebar->addWidget($widget); diff --git a/app/controllers/studiengaenge/versionen.php b/app/controllers/studiengaenge/versionen.php index cb0be78..d7fcd70 100644 --- a/app/controllers/studiengaenge/versionen.php +++ b/app/controllers/studiengaenge/versionen.php @@ -281,7 +281,7 @@ class Studiengaenge_VersionenController extends SharedVersionController $widget->addLink( _('Neue Version anlegen'), $this->url_for('/version', $this->chooser_filter['stgteil']), - Icon::create('file+add') + Icon::create('add') ); } } diff --git a/app/views/admin/plugin/index.php b/app/views/admin/plugin/index.php index 5f38b36..859083b 100644 --- a/app/views/admin/plugin/index.php +++ b/app/views/admin/plugin/index.php @@ -67,7 +67,7 @@ use Studip\Button, Studip\LinkButton; > - asImg([ + asImg([ 'title' => _('Automatische Updates sind eingerichtet'), 'style' => 'vertical-align: text-bottom', ]) ?> @@ -79,7 +79,7 @@ use Studip\Button, Studip\LinkButton; - + @@ -100,7 +100,7 @@ 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('plugin+move_down', $plugin['automatic_update_url'] ? 'attention' : 'clickable', [ + Icon::create('install', $plugin['automatic_update_url'] ? 'attention' : 'clickable', [ 'title' => $plugin['automatic_update_url'] ? _('Automatisches Update verwalten (eingerichtet)') : _('Automatisches Update verwalten') diff --git a/app/views/admin/role/show_role.php b/app/views/admin/role/show_role.php index 161296f..ba91fc5 100644 --- a/app/views/admin/role/show_role.php +++ b/app/views/admin/role/show_role.php @@ -144,7 +144,7 @@ use Studip\Button, Studip\LinkButton; htmlReady($role->getRolename())) ?>
- +
diff --git a/app/views/admin/webservice_access/index.php b/app/views/admin/webservice_access/index.php index 2a63164..b74b67c 100644 --- a/app/views/admin/webservice_access/index.php +++ b/app/views/admin/webservice_access/index.php @@ -76,7 +76,7 @@ $sidebar = Sidebar::Get(); $actions = new ActionsWidget(); -$actions->addLink(_('Regeln testen'),$controller->url_for('admin/webservice_access/test'), Icon::create('add', 'clickable')); +$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')); $sidebar->addWidget($actions); diff --git a/app/views/admission/courseset/index.php b/app/views/admission/courseset/index.php index f0f56b7..555e18f 100644 --- a/app/views/admission/courseset/index.php +++ b/app/views/admission/courseset/index.php @@ -58,7 +58,7 @@ if ($coursesets) { isUserAllowedToEdit($GLOBALS['user']->id)) : ?> - _('Anmeldeset kopieren')])->asImg(16, ["alt" => _('Anmeldeset kopieren')]); ?> + _('Anmeldeset kopieren')])->asImg(16, ["alt" => _('Anmeldeset kopieren')]); ?> asImg(['title' => _('Anmeldeset bearbeiten')]) ?> diff --git a/app/views/calendar/schedule/index.php b/app/views/calendar/schedule/index.php index 60e6d69..31339f5 100644 --- a/app/views/calendar/schedule/index.php +++ b/app/views/calendar/schedule/index.php @@ -17,7 +17,7 @@ if (!$inst_mode) { $actions->addLink( _('Neuer Eintrag'), $controller->url_for('calendar/schedule/entry'), - Icon::create('date+add'), + Icon::create('add'), ['data-dialog' => 'size=auto'] ); } diff --git a/app/views/calendar/single/manage_access.php b/app/views/calendar/single/manage_access.php index b5f1634..5aa5ca6 100644 --- a/app/views/calendar/single/manage_access.php +++ b/app/views/calendar/single/manage_access.php @@ -82,7 +82,7 @@ - asImg() ?> + asImg() ?> @@ -96,4 +96,4 @@ url_for('calendar/single/' . $last_view)) ?> - \ No newline at end of file + diff --git a/app/views/consultation/admin/index.php b/app/views/consultation/admin/index.php index cf8d6c0..70367ae 100644 --- a/app/views/consultation/admin/index.php +++ b/app/views/consultation/admin/index.php @@ -62,7 +62,7 @@ )->condition($block['block']->has_bookings && !$block['block']->is_expired)->addLink( $controller->cancel_blockURL($block['block'], $page), _('Termine absagen'), - Icon::create('consultation+remove'), + Icon::create('decline'), ['data-dialog' => 'size=auto'] )->condition(!$block['block']->has_bookings || $block['block']->is_expired)->addButton( 'remove', @@ -127,7 +127,7 @@ )->condition(!$slot->is_expired && count($slot->bookings) < $slot->block->size)->addLink( $controller->bookURL($block['block'], $slot, $page), _('Termin reservieren'), - Icon::create('consultation+add'), + Icon::create('consultation'), ['data-dialog' => 'size=auto'] )->condition($slot->has_bookings)->addLink( $controller->reasonURL($block['block'], $slot, $slot->bookings->first(), $page), @@ -142,7 +142,7 @@ )->condition($slot->has_bookings && !$slot->is_expired)->addLink( $controller->cancel_slotURL($block['block'], $slot, $page), _('Termin absagen'), - Icon::create('consultation+remove'), + Icon::create('decline'), ['data-dialog' => 'size=auto'] )->condition(!$slot->has_bookings || $slot->is_expired)->addButton( 'delete', diff --git a/app/views/consultation/admin/ungrouped.php b/app/views/consultation/admin/ungrouped.php index e64efea..0643429 100644 --- a/app/views/consultation/admin/ungrouped.php +++ b/app/views/consultation/admin/ungrouped.php @@ -88,7 +88,7 @@ )->condition($block->has_bookings && !$block->is_expired)->addLink( $controller->cancel_blockURL($block, $page), _('Termine absagen'), - Icon::create('consultation+remove'), + Icon::create('decline'), ['data-dialog' => 'size=auto'] )->condition(!$block->has_bookings || $block->is_expired)->addButton( 'remove', @@ -214,7 +214,7 @@ )->condition(!$slot->is_expired && count($slot->bookings) < $slot->block->size)->addLink( $controller->bookURL($slot->block, $slot, $page), _('Termin reservieren'), - Icon::create('consultation+add'), + Icon::create('consultation'), ['data-dialog' => 'size=auto'] )->condition($slot->has_bookings)->addLink( $controller->reasonURL($slot->block, $slot, $slot->bookings->first(), $page), @@ -229,7 +229,7 @@ )->condition($slot->has_bookings && !$slot->is_expired)->addLink( $controller->cancel_slotURL($slot->block, $slot, $page), _('Termin absagen'), - Icon::create('consultation+remove'), + Icon::create('decline'), ['data-dialog' => 'size=auto'] )->condition(!$slot->has_bookings || $slot->is_expired)->addButton( 'delete', diff --git a/app/views/contact/index.php b/app/views/contact/index.php index 503c65a..6ecef64 100644 --- a/app/views/contact/index.php +++ b/app/views/contact/index.php @@ -82,7 +82,7 @@ Icon::create('vcard')) ?> addButton('remove_person', $filter ? _('Kontakt aus Gruppe entfernen') : _('Kontakt entfernen'), - Icon::create('person+remove', + Icon::create('trash', [ 'data-confirm' => sprintf( _('Wollen Sie %s wirklich von der Liste entfernen'), diff --git a/app/views/course/dates/_date_row-exdate.php b/app/views/course/dates/_date_row-exdate.php index c9b95f5..0b86f6e 100644 --- a/app/views/course/dates/_date_row-exdate.php +++ b/app/views/course/dates/_date_row-exdate.php @@ -20,7 +20,7 @@
id}/1") ?>" method="post"> setContext($date) ?> - addButton('restore_date', _('Termin wiederherstellen'), Icon::create('trash+decline'), + addButton('restore_date', _('Termin wiederherstellen'), Icon::create('refresh'), ['data-confirm' => _('Diesen Termin wiederherstellen?')]) ?> render() ?>
diff --git a/app/views/course/dates/_date_row.php b/app/views/course/dates/_date_row.php index fe045ed..32433ae 100644 --- a/app/views/course/dates/_date_row.php +++ b/app/views/course/dates/_date_row.php @@ -1,5 +1,5 @@ chdate > $last_visitdate ? 'date+new' : 'date'; +$icon = 'date'; $dialog_url = $show_raumzeit ? $controller->url_for('course/dates/details/' . $date->id) : $controller->url_for('course/dates/singledate/' . $date->id); @@ -54,7 +54,7 @@ $dialog_url = $show_raumzeit addLink($dialog_url, _('Termin bearbeiten'), Icon::create('edit'), ['data-dialog' => '']) ?> addLink($controller->url_for('course/dates/new_topic?termin_id=' . $date->id), - _('Thema hinzufügen'), Icon::create('topic+add'), ['data-dialog' => 'size=auto']) ?> + _('Thema hinzufügen'), Icon::create('add'), ['data-dialog' => 'size=auto']) ?> addLink($controller->url_for('course/dates/details_files/' . $date->id), diff --git a/app/views/course/forum/area/add.php b/app/views/course/forum/area/add.php index 9524a65..a3fdf2d 100644 --- a/app/views/course/forum/area/add.php +++ b/app/views/course/forum/area/add.php @@ -6,7 +6,7 @@ "> = $visitdate && $entry['user_id'] !== $GLOBALS['user']->id): ?> - asImg([ + asImg([ 'title' => _('Dieser Eintrag ist neu!'), 'style' => 'margin-bottom: 15px', ]) ?> diff --git a/app/views/course/forum/index/_post.php b/app/views/course/forum/index/_post.php index 5052c2e..864c796 100644 --- a/app/views/course/forum/index/_post.php +++ b/app/views/course/forum/index/_post.php @@ -257,7 +257,7 @@ - _("Dieser Beitrag ist seit Ihrem letzten Besuch hinzugekommen.")])->asImg(16) ?> + _("Dieser Beitrag ist seit Ihrem letzten Besuch hinzugekommen.")])->asImg(16) ?> diff --git a/app/views/course/forum/index/_threads.php b/app/views/course/forum/index/_threads.php index 97f0c4c..1445d87 100644 --- a/app/views/course/forum/index/_threads.php +++ b/app/views/course/forum/index/_threads.php @@ -40,7 +40,7 @@ "> = $visitdate && $entry['user_id'] != $GLOBALS['user']->id): ?> - asImg([ + asImg([ 'title' => _('Dieser Eintrag ist neu!'), ]) ?> @@ -126,7 +126,7 @@ ->addLink( "javascript:STUDIP.Forum.moveThreadDialog('{$entry['topic_id']}');", _('Dieses Thema verschieben'), - Icon::create('folder-full+move_right'), + Icon::create('folder-full'), ['class' => 'js'] ) // Open/close thread diff --git a/app/views/course/ilias_interface/index.php b/app/views/course/ilias_interface/index.php index c45d058..8f841b3 100644 --- a/app/views/course/ilias_interface/index.php +++ b/app/views/course/ilias_interface/index.php @@ -58,7 +58,7 @@ isAllowed('edit')) $actionMenu->addButton( 'edit', _('In ILIAS bearbeiten'), - Icon::create('learnmodule+edit', Icon::ROLE_CLICKABLE, [ + Icon::create('edit', Icon::ROLE_CLICKABLE, [ 'title' => _('In ILIAS bearbeiten'), 'formaction' => $controller->url_for($module->getRoute('edit')), 'target' => '_blank', @@ -68,7 +68,7 @@ isAllowed('delete')) $actionMenu->addButton( 'remove', _('Entfernen'), - Icon::create('learnmodule+decline', Icon::ROLE_CLICKABLE, [ + Icon::create('trash', Icon::ROLE_CLICKABLE, [ 'title' => _('Entfernen'), 'formaction' => $controller->url_for($module->getRoute('remove')), 'data-confirm' => $module->siblings_count < 2 ? sprintf(_('Dies ist die einzige Instanz des Objekts "%s". Durch das Entfernen aus dem Kurs wird das Objekt unwiderruflich gelöscht! Wollen Sie das Objekt wirklich löschen?'), htmlReady($module->getTitle())) : sprintf(_('Wollen Sie das Objekt "%s" jetzt entfernen?'), htmlReady($module->getTitle())), @@ -111,7 +111,7 @@ addButton( 'remove', _('Entfernen'), - Icon::create('learnmodule+decline', Icon::ROLE_CLICKABLE, [ + Icon::create('trash', Icon::ROLE_CLICKABLE, [ 'title' => _('Entfernen'), 'formaction' => $controller->url_for('course/ilias_interface/remove_course/'.$ilias_index.'/'.$courses[$ilias_index]), 'data-confirm' => sprintf(_('Verknüpfung zum Kurs in %s entfernen? Hierdurch werden auch die Verknüpfungen zu allen Objekten innerhalb des Kurses entfernt.'), $ilias->getName()), diff --git a/app/views/course/statusgroups/_member.php b/app/views/course/statusgroups/_member.php index ce3507b..d436178 100644 --- a/app/views/course/statusgroups/_member.php +++ b/app/views/course/statusgroups/_member.php @@ -52,7 +52,7 @@ $actions->addLink( $controller->url_for('course/statusgroups/move_member', $m->user_id, $group->id), _('In eine andere Gruppe verschieben'), - Icon::create('person+move_right', 'clickable', [ + Icon::create('arr_1right', 'clickable', [ 'title' => sprintf( _('%s in eine andere Gruppe verschieben'), $user_fullname diff --git a/app/views/course/timesrooms/_cycleRow.php b/app/views/course/timesrooms/_cycleRow.php index d1adcdd..8f05d78 100644 --- a/app/views/course/timesrooms/_cycleRow.php +++ b/app/views/course/timesrooms/_cycleRow.php @@ -116,7 +116,7 @@ $is_exTermin = $termin instanceof CourseExDate; addButton( 'delete_part', _('Termin wiederherstellen'), - Icon::create('trash+decline', Icon::ROLE_CLICKABLE, $params) + Icon::create('refresh', Icon::ROLE_CLICKABLE, $params) ) ?> diff --git a/app/views/course/timesrooms/_irregularEvents.php b/app/views/course/timesrooms/_irregularEvents.php index 2bd4c2d..b252037 100644 --- a/app/views/course/timesrooms/_irregularEvents.php +++ b/app/views/course/timesrooms/_irregularEvents.php @@ -18,14 +18,14 @@ $room_request_filter = function ($date) { addLink( $controller->url_for('course/timesrooms/createSingleDate/' . $course->id, $linkAttributes), _('Einzeltermin hinzufügen'), - Icon::create('date+add', Icon::ROLE_CLICKABLE, ['title' => _('Einzeltermin hinzufügen')]), + Icon::create('date', Icon::ROLE_CLICKABLE, ['title' => _('Einzeltermin hinzufügen')]), ['data-dialog' => 'size=600'] ) ?> addLink( $controller->url_for('course/block_appointments/index/' . $course->id, $linkAttributes), _('Blocktermin hinzufügen'), - Icon::create('timetable+add', Icon::ROLE_CLICKABLE, ['title' => _('Blocktermin hinzufügen')]), + Icon::create('date-block', Icon::ROLE_CLICKABLE, ['title' => _('Blocktermin hinzufügen')]), ['data-dialog' => 'size=600'] ) ?> render() ?> diff --git a/app/views/evaluation/_actions.php b/app/views/evaluation/_actions.php index 45bf032..e702ff2 100644 --- a/app/views/evaluation/_actions.php +++ b/app/views/evaluation/_actions.php @@ -1,4 +1,4 @@ asImg() ?> -asImg() ?> +asImg() ?> asImg() ?> -asImg() ?> \ No newline at end of file +asImg() ?> diff --git a/app/views/file/choose_folder.php b/app/views/file/choose_folder.php index f76f27e..498ad0e 100644 --- a/app/views/file/choose_folder.php +++ b/app/views/file/choose_folder.php @@ -123,9 +123,9 @@ $buttonLabels = [ is_empty): ?> - asImg(24) ?> + asImg(24) ?> - asImg(24) ?> + asImg(24) ?> diff --git a/app/views/files/_folder_tr.php b/app/views/files/_folder_tr.php index ca89fc9..09cd295 100644 --- a/app/views/files/_folder_tr.php +++ b/app/views/files/_folder_tr.php @@ -93,20 +93,20 @@ if ($folder->isReadable($GLOBALS['user']->id)) { $actionMenu->addLink( $controller->url_for('file/choose_destination/move/' . $folder->getId(), ['isfolder' => 1]), _('Ordner verschieben'), - Icon::create('folder-empty+move_right', 'clickable', ['size' => 20]), + Icon::create('arr_1right', 'clickable', ['size' => 20]), ['data-dialog' => 'size=auto'] ); $actionMenu->addLink( $controller->url_for('file/choose_destination/copy/' . $folder->getId(), ['isfolder' => 1]), _('Ordner kopieren'), - Icon::create('folder-empty+add', 'clickable', ['size' => 20]), + Icon::create('clipboard', 'clickable', ['size' => 20]), ['data-dialog' => 'size=auto'] ); if (Feedback::isActivated() && Feedback::hasCreatePerm($course->id)) { $actionMenu->addLink( $controller->url_for('course/feedback/create_form/' . $folder->getId() . '/Folder'), _('Neues Feedback-Element'), - Icon::create('star+add', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('star', Icon::ROLE_CLICKABLE, ['size' => 20]), ['data-dialog' => '1'] ); } diff --git a/app/views/materialien/files/add_dokument.php b/app/views/materialien/files/add_dokument.php index 2b7c5ac..6a531c5 100644 --- a/app/views/materialien/files/add_dokument.php +++ b/app/views/materialien/files/add_dokument.php @@ -37,7 +37,7 @@
- _("Datei hinzufügen"), 'class' => 'text-bottom']); ?> + _("Datei hinzufügen"), 'class' => 'text-bottom']); ?>