diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2026-03-09 09:18:53 +0100 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2026-03-09 09:25:41 +0100 |
| commit | 343a471f165dfef235e056caec1955fd9ee423cb (patch) | |
| tree | c2f865dcbc25695a581e4d655ea2b30a0edc3e1f | |
| parent | 6a14782858a297ead2f509652ce914d8aefb5531 (diff) | |
deprecate asSvg in favor of asImg, fixes #6330
Closes #6330
Merge request studip/studip!4802
272 files changed, 656 insertions, 641 deletions
diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php index 38ce72b..69d9ab3 100644 --- a/app/controllers/admin/courses.php +++ b/app/controllers/admin/courses.php @@ -640,7 +640,7 @@ class Admin_CoursesController extends AuthenticatedController $d['name'] = '<a href="'.URLHelper::getLink('dispatch.php/course/basicdata/view', ['cid' => $course->id]).'">' . htmlReady($course->name) .'</a> ' - .'<a href="'.URLHelper::getLink('dispatch.php/course/details/index/'. $course->id).'" data-dialog><button class="undecorated">'.Icon::create('info-circle', Icon::ROLE_INACTIVE)->asSvg($params).'</button></a> ' + .'<a href="'.URLHelper::getLink('dispatch.php/course/details/index/'. $course->id).'" data-dialog><button class="undecorated">'.Icon::create('info-circle', Icon::ROLE_INACTIVE)->asImg($params).'</button></a> ' .(!$course->visible ? _('(versteckt)') : ''); } if (in_array('number', $activated_fields)) { @@ -710,7 +710,7 @@ class Admin_CoursesController extends AuthenticatedController foreach ($icons as $icon) { $d['contents'] .= '<li class="my-courses-navigation-item '. ($icon->getImage()->signalsAttention() ? 'my-courses-navigation-important' : '').'"> <a href="'. URLHelper::getLink('dispatch.php/course/go', ['to' => $course->id, 'redirect_to' => $icon->getURL()]).'"'. ($icon->getTitle() ? ' title="'.htmlReady($icon->getTitle()).'"' : '') .'> - '. $icon->getImage()->asSvg() .' + '. $icon->getImage()->asImg() .' </a> </li>'; } diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php index 841f725..d43d73b 100644 --- a/app/controllers/course/members.php +++ b/app/controllers/course/members.php @@ -205,7 +205,7 @@ class Course_MembersController extends AuthenticatedController $results = SimpleCollection::createFromArray($members)->pluck('email'); if (!empty($results)) { - return sprintf('<a href="mailto:%s">%s</a>', htmlReady(join(',', $results)), Icon::create('mail', attributes: ['title' => sprintf('E-Mail an alle %s versenden',$textStatus)])->asSvg()); + return sprintf('<a href="mailto:%s">%s</a>', 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 dffc6a6..d0594f9 100644 --- a/app/controllers/course/room_requests.php +++ b/app/controllers/course/room_requests.php @@ -632,7 +632,7 @@ class Course_RoomRequestsController extends AuthenticatedController } if ($request_dates_booked === 0) { $this->available_room_icons[$room->id] = - Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asSvg( + Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asImg( [ 'class' => 'text-bottom', 'title' => _('freier Raum') @@ -640,7 +640,7 @@ class Course_RoomRequestsController extends AuthenticatedController ); $available_rooms[] = $room; } elseif ($request_dates_booked < $request_time_intervals) { - $this->available_room_icons[$room->id] = Icon::create('exclaim-circle', Icon::ROLE_STATUS_YELLOW)->asSvg([ + $this->available_room_icons[$room->id] = Icon::create('exclaim-circle', Icon::ROLE_STATUS_YELLOW)->asImg([ 'class' => 'text-bottom', 'title' => _('teilweise belegter Raum') ]); diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php index ca699b4..ae9474b 100644 --- a/app/controllers/course/wiki.php +++ b/app/controllers/course/wiki.php @@ -59,8 +59,8 @@ class Course_WikiController extends AuthenticatedController '<a href="%s">%s</a>', URLHelper::getLink('dispatch.php/course/wiki/edit_toc'), $toc_content_empty - ? Icon::create('add')->asSvg(['title' => _('Erstellen')]) - : Icon::create('edit')->asSvg(['title' => _('Bearbeiten')]) + ? Icon::create('add')->asImg(['title' => _('Erstellen')]) + : Icon::create('edit')->asImg(['title' => _('Bearbeiten')]) ); $widget->setExtra($extra); } diff --git a/app/controllers/materialien/files.php b/app/controllers/materialien/files.php index 57aed1b..a8d4823 100644 --- a/app/controllers/materialien/files.php +++ b/app/controllers/materialien/files.php @@ -424,7 +424,7 @@ class Materialien_FilesController extends MVVController } $output['document_id'] = $file->id; - $output['icon'] = $file->getIcon(Icon::ROLE_CLICKABLE)->asSvg(['class' => 'text-bottom']); + $output['icon'] = $file->getIcon(Icon::ROLE_CLICKABLE)->asImg(['class' => 'text-bottom']); $this->render_json($output); } diff --git a/app/controllers/messages.php b/app/controllers/messages.php index 3c374b2..1922e8c 100644 --- a/app/controllers/messages.php +++ b/app/controllers/messages.php @@ -198,7 +198,7 @@ class MessagesController extends AuthenticatedController { if ($this->default_message->attachment_folder) { foreach ($this->default_message->attachment_folder->getTypedFolder()->getFiles() as $filetype) { $this->default_attachments[] = [ - 'icon' => $filetype->getIcon('info')->asSvg(['class' => 'text-bottom']), + 'icon' => $filetype->getIcon('info')->asImg(['class' => 'text-bottom']), 'name' => $filetype->getFilename(), 'document_id' => $filetype->getId(), 'size' => $filetype->getSize() @@ -507,7 +507,7 @@ class MessagesController extends AuthenticatedController { if ($new_attachment_file_ref->store()) { $icon = FileManager::getIconForFileRef($new_attachment_file_ref); $this->default_attachments[] = [ - 'icon' => $icon->asSvg(['class' => 'text-bottom']), + 'icon' => $icon->asImg(['class' => 'text-bottom']), 'name' => $new_attachment_file_ref->name, 'document_id' => $new_attachment_file_ref->id, 'size' => relsize($new_attachment_file_ref->size, false) @@ -876,7 +876,7 @@ class MessagesController extends AuthenticatedController { $output['document_id'] = $uploaded['files'][0]->getId(); - $output['icon'] = $uploaded['files'][0]->getIcon(Icon::ROLE_CLICKABLE)->asSvg(['class' => 'text-bottom']); + $output['icon'] = $uploaded['files'][0]->getIcon(Icon::ROLE_CLICKABLE)->asImg(['class' => 'text-bottom']); $this->render_json($output); } diff --git a/app/controllers/oer/admin.php b/app/controllers/oer/admin.php index 3404e54..625c203 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")->asSvg() + 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')->asSvg() + Icon::create('checkbox-'.(Request::int('active') ? '' : 'un').'checked')->asImg() )); } diff --git a/app/views/admin/autoinsert/index.php b/app/views/admin/autoinsert/index.php index 5773537..33dfdcf 100644 --- a/app/views/admin/autoinsert/index.php +++ b/app/views/admin/autoinsert/index.php @@ -93,7 +93,7 @@ <?= $this->render_partial("admin/autoinsert/_status.php", ['status' => 'autor', 'auto_sem' => $auto_sem, 'domains' => $userdomains]) ?> <td class="actions"> <a href="<?= $controller->delete($auto_sem['seminar_id'] ) ?>"> - <?= Icon::create('trash')->asSvg([ + <?= Icon::create('trash')->asImg([ 'title' => _('Veranstaltung entfernen'), 'class' => 'text-top', ]) ?> diff --git a/app/views/admin/banner/index.php b/app/views/admin/banner/index.php index 620f7a5..11f9d8e 100644 --- a/app/views/admin/banner/index.php +++ b/app/views/admin/banner/index.php @@ -61,16 +61,16 @@ <td><?= $banner->priority ?> (<?= $banner->getViewProbability() ?>)</td> <td class="actions"> <a class="load-in-new-row" href="<?= $controller->info($banner, ['path' => $banner->banner_path]) ?>"> - <?= Icon::create('info')->asSvg(['title' => _('Eigenschaften')]) ?> + <?= Icon::create('info')->asImg(['title' => _('Eigenschaften')]) ?> </a> <a href="<?= $controller->edit($banner, ['path' => $banner->banner_path]) ?>" data-dialog="size=auto"> - <?= Icon::create('edit')->asSvg(['title' => _('Banner bearbeiten')]) ?> + <?= Icon::create('edit')->asImg(['title' => _('Banner bearbeiten')]) ?> </a> <a href="<?= $controller->reset($banner) ?>"> - <?= Icon::create('refresh')->asSvg(['title' => _('Klicks/Views zurücksetzen')]) ?> + <?= Icon::create('refresh')->asImg(['title' => _('Klicks/Views zurücksetzen')]) ?> </a> <a href="<?= $controller->delete($banner) ?>"> - <?= Icon::create('trash')->asSvg(['title' => _('Banner löschen')]) ?> + <?= Icon::create('trash')->asImg(['title' => _('Banner löschen')]) ?> </a> </td> </tr> diff --git a/app/views/admin/configuration/edit_configuration.php b/app/views/admin/configuration/edit_configuration.php index 6d8354f..aa4c574 100644 --- a/app/views/admin/configuration/edit_configuration.php +++ b/app/views/admin/configuration/edit_configuration.php @@ -28,9 +28,9 @@ <?= _('Standard') ?> <? if ($config['is_default'] === '1'): ?> - <?= Icon::create('checkbox-checked', Icon::ROLE_INFO)->asSvg(['title' => _('Ja')]) ?> + <?= Icon::create('checkbox-checked', Icon::ROLE_INFO)->asImg(['title' => _('Ja')]) ?> <? elseif ($config['is_default'] === '0'): ?> - <?= Icon::create('checkbox-unchecked', Icon::ROLE_INFO)->asSvg(['title' => _('Nein')]) ?> + <?= Icon::create('checkbox-unchecked', Icon::ROLE_INFO)->asImg(['title' => _('Nein')]) ?> <? elseif ($config['is_default'] === null): ?> <em>- <?= _('kein Eintrag vorhanden') ?> -</em> <? endif ?> diff --git a/app/views/admin/configuration/table-row.php b/app/views/admin/configuration/table-row.php index 3f7ae89..a0725a5 100644 --- a/app/views/admin/configuration/table-row.php +++ b/app/views/admin/configuration/table-row.php @@ -37,10 +37,10 @@ <td class="actions"> <? if (!Config::get()->fromEnv($field)): ?> <a data-dialog="size=auto" href="<?= $controller->link_for($linkchunk, compact('field')) ?>"> - <?= Icon::create('edit')->asSvg(['title' => _('Konfigurationsparameter bearbeiten')]) ?> + <?= Icon::create('edit')->asImg(['title' => _('Konfigurationsparameter bearbeiten')]) ?> </a> <? else: ?> - <?= Icon::create('ufo', Icon::ROLE_INFO)->asSvg([ + <?= Icon::create('ufo', Icon::ROLE_INFO)->asImg([ 'title' => _('Wert wurde über eine Umgebungsvariable gesetzt und kann an dieser Stelle nicht verändert werden.'), ]) ?> <? endif; ?> diff --git a/app/views/admin/course_wizard_steps/edit.php b/app/views/admin/course_wizard_steps/edit.php index f25005c..067ff2e 100644 --- a/app/views/admin/course_wizard_steps/edit.php +++ b/app/views/admin/course_wizard_steps/edit.php @@ -25,7 +25,7 @@ <? foreach ($availableClasses as $className) : ?> <li> <a href="#" onClick="jQuery('input[name=classname]').val('<?= htmlReady($className) ?>');"> - <?= Icon::create('arr_2up', 'info')->asSvg(['class' => "text-bottom"]) ?> + <?= Icon::create('arr_2up', 'info')->asImg(['class' => "text-bottom"]) ?> <?= htmlReady($className) ?> </a> </li> diff --git a/app/views/admin/course_wizard_steps/index.php b/app/views/admin/course_wizard_steps/index.php index d57d7ea..b951e21 100644 --- a/app/views/admin/course_wizard_steps/index.php +++ b/app/views/admin/course_wizard_steps/index.php @@ -15,7 +15,7 @@ <?= _('Vorhandene Schritte im Anlegeassistenten für Veranstaltungen') ?> <span class="actions"> <a href="<?= $controller->url_for('admin/coursewizardsteps/edit') ?>" data-dialog="size=auto"> - <?= Icon::create('add')->asSvg(tooltip2(_('Neuen Schritt hinzufügen'))) ?> + <?= Icon::create('add')->asImg(tooltip2(_('Neuen Schritt hinzufügen'))) ?> </a> </span> </caption> diff --git a/app/views/admin/courseplanning/nonconform.php b/app/views/admin/courseplanning/nonconform.php index 2ddda05..08a128a 100644 --- a/app/views/admin/courseplanning/nonconform.php +++ b/app/views/admin/courseplanning/nonconform.php @@ -23,7 +23,7 @@ <td> <?= htmlReady($ncd['name']) ?> <a href="<?= $controller->link_for('course/details/index/' . $ncd['cid']) ?>" data-dialog="size=auto"> - <?= Icon::create('info-circle')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('info-circle')->asImg(['class' => 'text-bottom']) ?> </a> </td> <td><?= htmlReady($ncd['start']) ?></td> diff --git a/app/views/admin/cronjobs/logs/index.php b/app/views/admin/cronjobs/logs/index.php index b1f0195..d76e153 100644 --- a/app/views/admin/cronjobs/logs/index.php +++ b/app/views/admin/cronjobs/logs/index.php @@ -114,19 +114,19 @@ use Studip\Button, Studip\LinkButton; <td><?= htmlReady($log->schedule->title ?: $log->schedule->task->name) ?></td> <td> <? if ($log->duration == -1): ?> - <?= Icon::create('question', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Läuft noch')]) ?> + <?= Icon::create('question', Icon::ROLE_INACTIVE)->asImg(['title' => _('Läuft noch')]) ?> <? elseif ($log->exception === null): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('Ja')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('Ja')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('Nein')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['title' => _('Nein')]) ?> <? endif; ?> </td> <td style="text-align: right"> <a data-dialog href="<?= $controller->display($log, $pagination->getCurrentPage()) ?>"> - <?= Icon::create('admin')->asSvg(['title' => _('Logeintrag anzeigen')]) ?> + <?= Icon::create('admin')->asImg(['title' => _('Logeintrag anzeigen')]) ?> </a> <a href="<?= $controller->delete($log, $pagination->getCurrentPage()) ?>"> - <?= Icon::create('trash')->asSvg(['title' => _('Logeintrag löschen')]) ?> + <?= Icon::create('trash')->asImg(['title' => _('Logeintrag löschen')]) ?> </a> </td> </tr> diff --git a/app/views/admin/cronjobs/schedules/index.php b/app/views/admin/cronjobs/schedules/index.php index 1872ff6..12180a6 100644 --- a/app/views/admin/cronjobs/schedules/index.php +++ b/app/views/admin/cronjobs/schedules/index.php @@ -97,29 +97,29 @@ use Studip\Button, Studip\LinkButton; <td style="text-align: center;" data-sort-value="'<?= (int)($schedule->active && $schedule->task->active) ?>'"> <? if (!$schedule->task->active): ?> - <?= Icon::create('checkbox-unchecked', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Cronjob kann nicht aktiviert werden, da die zugehörige ' . 'Aufgabe deaktiviert ist.')]) ?> + <?= Icon::create('checkbox-unchecked', Icon::ROLE_INACTIVE)->asImg(['title' => _('Cronjob kann nicht aktiviert werden, da die zugehörige ' . 'Aufgabe deaktiviert ist.')]) ?> <? elseif ($schedule->active): ?> <a href="<?= $controller->deactivate($schedule) ?>" data-behaviour="ajax-toggle"> - <?= Icon::create('checkbox-checked')->asSvg(['title' => _('Cronjob deaktivieren')]) ?> + <?= Icon::create('checkbox-checked')->asImg(['title' => _('Cronjob deaktivieren')]) ?> </a> <? else: ?> <a href="<?= $controller->activate($schedule) ?>" data-behaviour="ajax-toggle"> - <?= Icon::create('checkbox-unchecked')->asSvg(['title' => _('Cronjob aktivieren')]) ?> + <?= Icon::create('checkbox-unchecked')->asImg(['title' => _('Cronjob aktivieren')]) ?> </a> <? endif; ?> </td> <?= $this->render_partial('admin/cronjobs/schedules/periodic-schedule', $schedule->toArray() + ['display' => 'table-cells']) ?> <td style="text-align: right"> <a data-dialog href="<?= $controller->display($schedule) ?>"> - <?= Icon::create('admin')->asSvg(['title' => _('Cronjob anzeigen')]) ?> + <?= Icon::create('admin')->asImg(['title' => _('Cronjob anzeigen')]) ?> </a> <a href="<?= $controller->edit($schedule) ?>"> - <?= Icon::create('edit')->asSvg(['title' => _('Cronjob bearbeiten')]) ?> + <?= Icon::create('edit')->asImg(['title' => _('Cronjob bearbeiten')]) ?> </a> <a href="<?= $controller->link_for('admin/cronjobs/logs/schedule', $schedule) ?>"> - <?= Icon::create('log')->asSvg(['title' => _('Log anzeigen')]) ?> + <?= Icon::create('log')->asImg(['title' => _('Log anzeigen')]) ?> </a> <?= Icon::create('trash')->asInput([ 'data-confirm' => _('Wollen Sie den ausgewählten Cronjob wirklich löschen?'), diff --git a/app/views/admin/cronjobs/tasks/index.php b/app/views/admin/cronjobs/tasks/index.php index ab510b0..9f2602d 100644 --- a/app/views/admin/cronjobs/tasks/index.php +++ b/app/views/admin/cronjobs/tasks/index.php @@ -50,22 +50,22 @@ use Studip\Button; <td style="text-align: center;" data-sort-value="'<?= (int) $task->active ?>'"> <? if ($task->active): ?> <a href="<?= $controller->deactivate($task) ?>" data-behaviour="ajax-toggle"> - <?= Icon::create('checkbox-checked')->asSvg(['title' => _('Aufgabe deaktivieren')]) ?> + <?= Icon::create('checkbox-checked')->asImg(['title' => _('Aufgabe deaktivieren')]) ?> </a> <? else: ?> <a href="<?= $controller->activate($task) ?>" data-behaviour="ajax-toggle"> - <?= Icon::create('checkbox-unchecked')->asSvg(['title' => _('Aufgabe aktivieren')]) ?> + <?= Icon::create('checkbox-unchecked')->asImg(['title' => _('Aufgabe aktivieren')]) ?> </a> <? endif; ?> </td> <td style="text-align: right"> <? if ($task->valid): ?> <a data-dialog href="<?= $controller->execute($task) ?>"> - <?= Icon::create('play')->asSvg(['title' => _('Aufgabe ausführen')]) ?> + <?= Icon::create('play')->asImg(['title' => _('Aufgabe ausführen')]) ?> </a> <? endif; ?> <a href="<?= $controller->link_for('admin/cronjobs/logs/task', $task) ?>"> - <?= Icon::create('log')->asSvg(['title' => _('Log anzeigen')]) ?> + <?= Icon::create('log')->asImg(['title' => _('Log anzeigen')]) ?> </a> <?= Icon::create('trash')->asInput([ 'data-confirm' => _('Wollen Sie die ausgewählte Aufgabe wirklich löschen?'), diff --git a/app/views/admin/datafields/index.php b/app/views/admin/datafields/index.php index 5441e24..0e01920 100644 --- a/app/views/admin/datafields/index.php +++ b/app/views/admin/datafields/index.php @@ -89,7 +89,7 @@ <td> <? if (in_array($val->type, words('selectbox selectboxmultiple radio combo'))): ?> <a data-dialog="size=auto" href="<?= $controller->url_for('admin/datafields/config/'. $val->id) ?>"> - <?= Icon::create('edit')->asSvg(['class'=> 'text-top', 'title' => 'Einträge bearbeiten']) ?> + <?= Icon::create('edit')->asImg(['class' => 'text-top', 'title' => 'Einträge bearbeiten']) ?> </a> <? endif; ?> <span><?= htmlReady($val->type) ?></span> @@ -131,31 +131,31 @@ <? if ($key === 'user'): ?> <td> <? if ($val->system): ?> - <?= Icon::create('checkbox-checked', Icon::ROLE_INACTIVE, ['title' => _('Ja')])->asSvg() ?> + <?= Icon::create('checkbox-checked', Icon::ROLE_INACTIVE, ['title' => _('Ja')])->asImg() ?> <? else: ?> - <?= Icon::create('checkbox-unchecked', Icon::ROLE_INACTIVE, ['title' => _('Nein')])->asSvg() ?> + <?= Icon::create('checkbox-unchecked', Icon::ROLE_INACTIVE, ['title' => _('Nein')])->asImg() ?> <? endif; ?> </td> <td> <? if ($val->is_userfilter): ?> - <?= Icon::create('checkbox-checked', Icon::ROLE_INACTIVE, ['title' => _('Ja')])->asSvg() ?> + <?= Icon::create('checkbox-checked', Icon::ROLE_INACTIVE, ['title' => _('Ja')])->asImg() ?> <? else: ?> - <?= Icon::create('checkbox-unchecked', Icon::ROLE_INACTIVE, ['title' => _('Nein')])->asSvg() ?> + <?= Icon::create('checkbox-unchecked', Icon::ROLE_INACTIVE, ['title' => _('Nein')])->asImg() ?> <? endif; ?> </td> <? elseif ($key === 'sem'): ?> <td> <? if ($val->is_required): ?> - <?= Icon::create('checkbox-checked', Icon::ROLE_INACTIVE, ['title' => _('Ja')])->asSvg() ?> + <?= Icon::create('checkbox-checked', Icon::ROLE_INACTIVE, ['title' => _('Ja')])->asImg() ?> <? else: ?> - <?= Icon::create('checkbox-unchecked', Icon::ROLE_INACTIVE, ['title' => _('Nein')])->asSvg() ?> + <?= Icon::create('checkbox-unchecked', Icon::ROLE_INACTIVE, ['title' => _('Nein')])->asImg() ?> <? endif; ?> </td> <td> <? if (trim($val->description)): ?> - <?= Icon::create('checkbox-checked', Icon::ROLE_INACTIVE, ['title' => _('Ja')])->asSvg() ?> + <?= Icon::create('checkbox-checked', Icon::ROLE_INACTIVE, ['title' => _('Ja')])->asImg() ?> <? else: ?> - <?= Icon::create('checkbox-unchecked', Icon::ROLE_INACTIVE, ['title' => _('Nein')])->asSvg() ?> + <?= Icon::create('checkbox-unchecked', Icon::ROLE_INACTIVE, ['title' => _('Nein')])->asImg() ?> <? endif; ?> </td> <? else: ?> @@ -165,10 +165,10 @@ <td style="text-align: right;"><?= count($val) ?></td> <td class="actions"> <a href="<?=$controller->url_for('admin/datafields/edit/' . $val->id)?>" data-dialog> - <?= Icon::create('edit')->asSvg(['title' => 'Datenfeld ändern']) ?> + <?= Icon::create('edit')->asImg(['title' => 'Datenfeld ändern']) ?> </a> <a href="<?=$controller->url_for('admin/datafields/delete/' . $val->id)?>"> - <?= Icon::create('trash')->asSvg(['title' => 'Datenfeld löschen']) ?> + <?= Icon::create('trash')->asImg(['title' => 'Datenfeld löschen']) ?> </a> </td> </tr> diff --git a/app/views/admin/domain/index.php b/app/views/admin/domain/index.php index 74c6a2b..4b709d7 100644 --- a/app/views/admin/domain/index.php +++ b/app/views/admin/domain/index.php @@ -38,7 +38,7 @@ <td><?= $domain->countCourses() ?></td> <td class="actions"> <a href="<?= $controller->link_for("admin/domain/edit/{$domain->id}") ?>" data-dialog="size=auto"> - <?= Icon::create('edit')->asSvg(tooltip2(_('bearbeiten'))) ?> + <?= Icon::create('edit')->asImg(tooltip2(_('bearbeiten'))) ?> </a> <? if ($domain->countUsers() === 0): ?> <?= Icon::create('trash')->asInput(tooltip2(_('löschen')) + [ @@ -47,7 +47,7 @@ 'data-confirm' => _('Wollen Sie die Nutzerdomäne wirklich löschen?') ]) ?> <? else: ?> - <?= Icon::create('trash', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Domänen, denen noch Personen zugewiesen sind, können nicht gelöscht werden.')]) ?> + <?= Icon::create('trash', Icon::ROLE_INACTIVE)->asImg(['title' => _('Domänen, denen noch Personen zugewiesen sind, können nicht gelöscht werden.')]) ?> <? endif; ?> </td> </tr> diff --git a/app/views/admin/holidays/index.php b/app/views/admin/holidays/index.php index 4c523d3..98aa72e 100644 --- a/app/views/admin/holidays/index.php +++ b/app/views/admin/holidays/index.php @@ -58,7 +58,7 @@ </td> <td class="actions"> <a data-dialog="size=auto" href="<?= $controller->url_for('admin/holidays/edit/' . $holiday->id) ?>"> - <?= Icon::create('edit')->asSvg(['title' => _('Ferienangaben bearbeiten')]) ?> + <?= Icon::create('edit')->asImg(['title' => _('Ferienangaben bearbeiten')]) ?> </a> <?= Icon::create('trash')->asInput([ 'title' => _('Ferien löschen'), diff --git a/app/views/admin/ilias_interface/edit_server.php b/app/views/admin/ilias_interface/edit_server.php index f9757df..4bb163a 100644 --- a/app/views/admin/ilias_interface/edit_server.php +++ b/app/views/admin/ilias_interface/edit_server.php @@ -84,7 +84,7 @@ <?=$ldap_options;?> </select><br> <?=_("Authentifizierungsplugin (nur LDAP/Shibboleth) beim Anlegen von externen Accounts übernehmen.");?> - <?=Icon::create('info-circle', Icon::ROLE_INACTIVE)->asSvg(['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')]);?> + <?=Icon::create('info-circle', Icon::ROLE_INACTIVE)->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')]);?> <? else : ?> <br><?=_('(Um diese Einstellung zu nutzen, muss zumindest ein Authentifizierungsplugin aktiviert sein.)');?> <input type="hidden" name="ilias_ldap_enable" value=""> diff --git a/app/views/admin/ilias_interface/index.php b/app/views/admin/ilias_interface/index.php index fce9464..00e4f36 100644 --- a/app/views/admin/ilias_interface/index.php +++ b/app/views/admin/ilias_interface/index.php @@ -11,7 +11,7 @@ <?= _('Angebundene ILIAS-Installationen') ?> <span class="actions"> <a href="<?= $controller->url_for('admin/ilias_interface/edit_server/new') ?>" data-dialog="size=auto"> - <?= Icon::create('add')->asSvg(tooltip2(_('Neue ILIAS-Installation hinzufügen'))) ?> + <?= Icon::create('add')->asImg(tooltip2(_('Neue ILIAS-Installation hinzufügen'))) ?> </a> </span> </caption> @@ -44,7 +44,7 @@ } ?> <a href="<?= $controller->url_for('admin/ilias_interface/'.$cmd.'/'.$ilias_index) ?>"> - <?= Icon::create($img)->asSvg(['title' => $text]) ?> + <?= Icon::create($img)->asImg(['title' => $text]) ?> </a> </td> <td><?= htmlReady($ilias_config['name']) ?></td> diff --git a/app/views/admin/licenses/index.php b/app/views/admin/licenses/index.php index e6d162d..8814461 100644 --- a/app/views/admin/licenses/index.php +++ b/app/views/admin/licenses/index.php @@ -34,7 +34,7 @@ </td> <td class="actions"> <a href="<?= $controller->link_for("admin/licenses/edit", ['identifier' => $license['identifier']]) ?>" data-dialog> - <?= Icon::create('edit')->asSvg(['class' => "text-bottom"]) ?> + <?= Icon::create('edit')->asImg(['class' => "text-bottom"]) ?> </a> <form action="<?= $controller->link_for('admin/licenses/delete', ['identifier' => $license->getId()]) ?>" method="post" diff --git a/app/views/admin/lockrules/index.php b/app/views/admin/lockrules/index.php index b439b94..1214d83 100644 --- a/app/views/admin/lockrules/index.php +++ b/app/views/admin/lockrules/index.php @@ -43,7 +43,7 @@ </td> <td class="actions"> <a href="<?= $controller->url_for('admin/lockrules/edit/' . $rule->lock_id) ?>"> - <?= Icon::create('edit')->asSvg(['title' => _('Diese Regel bearbeiten')]) ?> + <?= Icon::create('edit')->asImg(['title' => _('Diese Regel bearbeiten')]) ?> </a> <? diff --git a/app/views/admin/login_style/newpic.php b/app/views/admin/login_style/newpic.php index fe8948b..c5f7fbf 100644 --- a/app/views/admin/login_style/newpic.php +++ b/app/views/admin/login_style/newpic.php @@ -17,7 +17,7 @@ accept="image/gif,image/jpeg,image/png" required multiple> - <?= Icon::create('upload')->asSvg(['class' => 'text-bottom upload']) ?> + <?= Icon::create('upload')->asImg(['class' => 'text-bottom upload']) ?> </label> <label> diff --git a/app/views/admin/overlapping/conflicts.php b/app/views/admin/overlapping/conflicts.php index 9923a9d..f1cd914 100644 --- a/app/views/admin/overlapping/conflicts.php +++ b/app/views/admin/overlapping/conflicts.php @@ -78,7 +78,7 @@ <div class="mvv-ovl-title"> <?= htmlReady($comp_cycle->comp_course->VeranstaltungsNummer) ?> <a href="<?= $controller->course_info($comp_cycle->id) ?>" data-dialog> - <?= Icon::create('info-circle', Icon::ROLE_INFO)->asSvg(['style' => 'vertical-align: text-bottom;', 'title' => _('Veranstaltungsdetails')]) ?> + <?= Icon::create('info-circle', Icon::ROLE_INFO)->asImg(['style' => 'vertical-align: text-bottom;', 'title' => _('Veranstaltungsdetails')]) ?> </a> <?= htmlReady($comp_cycle->comp_course->getFullName('type-name')) ?> <? if ($comp_cycle->comp_course->admission_turnout) : ?> diff --git a/app/views/admin/overlapping/courses.php b/app/views/admin/overlapping/courses.php index 22c4a49..5cb0a7d 100644 --- a/app/views/admin/overlapping/courses.php +++ b/app/views/admin/overlapping/courses.php @@ -30,7 +30,7 @@ <? if ($course_obj->admission_turnout) : ?> <?= sprintf(_('(erw. TN %s)'), htmlReady($course_obj->admission_turnout)) ?> <? endif; ?> - <?= Icon::create('date-cycle', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('date-cycle', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom']) ?> <?= sprintf('%s (%sx)', $cycle->toString('short'), count($dates)); ?> </div> <ul> diff --git a/app/views/admin/plugin/index.php b/app/views/admin/plugin/index.php index 66e1a81..fb56d15 100644 --- a/app/views/admin/plugin/index.php +++ b/app/views/admin/plugin/index.php @@ -75,7 +75,7 @@ use Studip\Button, Studip\LinkButton; <td <? if (!$plugin['enabled']) echo 'class="quiet"'; ?>> <?= htmlReady($update_info[$pluginid]['version'] ?? '') ?> <? if ($plugin['automatic_update_url']): ?> - <?= Icon::create('install', Icon::ROLE_STATUS_RED)->asSvg([ + <?= Icon::create('install', Icon::ROLE_STATUS_RED)->asImg([ 'title' => _('Automatische Updates sind eingerichtet'), 'style' => 'vertical-align: text-bottom', ]) ?> diff --git a/app/views/admin/role/assign_role.php b/app/views/admin/role/assign_role.php index ab85070..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; </td> <td class="actions"> <a href="<?= $controller->action_link('assign_role_institutes/' . $assignedrole->getRoleid() . '/' . $currentuser->id) ?>" data-dialog="size=auto;reload-on-close"> - <?= Icon::create('edit')->asSvg(['title' => _('Einrichtungszuordnung bearbeiten')]) ?> + <?= Icon::create('edit')->asImg(['title' => _('Einrichtungszuordnung bearbeiten')]) ?> </a> </td> </tr> diff --git a/app/views/admin/role/index.php b/app/views/admin/role/index.php index 54b25d8..30be4c0 100644 --- a/app/views/admin/role/index.php +++ b/app/views/admin/role/index.php @@ -33,7 +33,7 @@ <th></th> </tr> <tr> - + </tr> </thead> <tbody> @@ -60,7 +60,7 @@ <td class="actions"> <? if (!$role->getSystemtype()): ?> <a href="<?= $controller->link_for('admin/role/ask_remove_role', $role_id) ?>"> - <?= Icon::create('trash')->asSvg(tooltip2(_('Rolle löschen'))) ?> + <?= Icon::create('trash')->asImg(tooltip2(_('Rolle löschen'))) ?> </a> <? endif ?> </td> diff --git a/app/views/admin/sem_classes/_sem_type.php b/app/views/admin/sem_classes/_sem_type.php index 9ee57d6..6b24b53 100644 --- a/app/views/admin/sem_classes/_sem_type.php +++ b/app/views/admin/sem_classes/_sem_type.php @@ -28,11 +28,11 @@ $id = $sem_type['id']; </span> (<?= sprintf(_("%s Veranstaltungen"), $number_of_seminars ?: _("keine")) ?>) <a href="#" class="sem_type_edit" onClick="jQuery(this).closest('li').find('.name_container').children().toggle().find('input').focus(); return false;" title="<?= _('Veranstaltungstyp umbenennen') ?>"> - <?= Icon::create('edit')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('edit')->asImg(['class' => 'text-bottom']) ?> </a> <? if ($number_of_seminars == 0) : ?> <a href="#" class="sem_type_delete" onClick="return false;" title="<?= _("Veranstaltungstyp löschen") ?>"> - <?= Icon::create('trash')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('trash')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> </li> diff --git a/app/views/admin/sem_classes/details.php b/app/views/admin/sem_classes/details.php index 8080920..d7e21d7 100644 --- a/app/views/admin/sem_classes/details.php +++ b/app/views/admin/sem_classes/details.php @@ -26,7 +26,7 @@ <div> <span class="name"><?= htmlReady($sem_class['name']) ?></span> <a href="#" class="sem_class_edit" onClick="jQuery(this).closest('label').children().toggle().find('input:visible').focus(); return false;"> - <?= Icon::create('edit')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('edit')->asImg(['class' => 'text-bottom']) ?> </a> </div> @@ -42,7 +42,7 @@ <div> <span class="description"><?= htmlReady($sem_class['description']) ?></span> <a href="#" class="sem_class_edit" onClick="jQuery(this).closest('label').children().toggle().find('input:visible').focus(); return false;"> - <?= Icon::create('edit')->asSvg(['class' => 'text-bottom']) ?></a> + <?= Icon::create('edit')->asImg(['class' => 'text-bottom']) ?></a> </div> <div class="description_input" style="display: none;"> <input id="sem_class_description" type="text" value="<?= htmlReady($sem_class['description']) ?>" onBlur="jQuery(this).closest('label.sem_class_name').children().toggle().find('.description').text(this.value);" style="width: 80%;"> @@ -60,11 +60,11 @@ <div class="add"> <div style="display: none; margin-left: 37px;"> <input type="text" id="new_sem_type" onBlur="if (!this.value) jQuery(this).closest('.add').children().toggle();"> - <a href="" onClick="STUDIP.admin_sem_class.add_sem_type(); return false;"><?= Icon::create('arr_2up', 'sort')->asSvg(['class' => 'text-bottom', 'title' => _('hinzufügen')]) ?></a> + <a href="" onClick="STUDIP.admin_sem_class.add_sem_type(); return false;"><?= Icon::create('arr_2up', 'sort')->asImg(['class' => 'text-bottom', 'title' => _('hinzufügen')]) ?></a> </div> <div style="margin-left: 21px;"> <a href="#" onClick="jQuery(this).closest('.add').children().toggle(); jQuery('#new_sem_type').focus(); return false;"> - <?= Icon::create('add')->asSvg([ + <?= Icon::create('add')->asImg([ 'class' => 'text-bottom', 'title' => _('Veranstaltungstyp hinzufügen'), ]) ?> diff --git a/app/views/admin/sem_classes/overview.php b/app/views/admin/sem_classes/overview.php index 5cae59c..0a93f09 100644 --- a/app/views/admin/sem_classes/overview.php +++ b/app/views/admin/sem_classes/overview.php @@ -32,7 +32,7 @@ <td><?= date("j.n.Y H:i", $sem_class['chdate']) ?> <?= _("Uhr") ?></td> <td class="actions"> <a href="<?= URLHelper::getLink('dispatch.php/admin/sem_classes/details', ['id' => $id]) ?>" title="<?= _('Editieren dieser Veranstaltungskategorie') ?>"> - <?= Icon::create('edit')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('edit')->asImg(['class' => 'text-bottom']) ?> </a> </td> </tr> diff --git a/app/views/admin/specification/index.php b/app/views/admin/specification/index.php index 9933cce..4538b6a 100644 --- a/app/views/admin/specification/index.php +++ b/app/views/admin/specification/index.php @@ -43,10 +43,10 @@ </td> <td class="actions"> <a href="<?= $controller->edit($rule) ?>"> - <?= Icon::create('edit')->asSvg(['title' => _('Regel bearbeiten')]) ?> + <?= Icon::create('edit')->asImg(['title' => _('Regel bearbeiten')]) ?> </a> <? if (count($rule->courses) > 0): ?> - <?= Icon::create('trash', Icon::ROLE_INACTIVE)->asSvg( + <?= Icon::create('trash', Icon::ROLE_INACTIVE)->asImg( tooltip2(_('Die Regel kann nicht gelöscht werden, da sie noch verwendet wird.')) ) ?> <? else: ?> diff --git a/app/views/admin/user/_results.php b/app/views/admin/user/_results.php index 6fe0ad0..1541907 100644 --- a/app/views/admin/user/_results.php +++ b/app/views/admin/user/_results.php @@ -82,7 +82,7 @@ <?= htmlReady($user->username) ?> </a> <? if ($user->locked) : ?> - <?= Icon::create('lock-locked', Icon::ROLE_INFO)->asSvg(tooltip2(sprintf(_('%s ist gesperrt'), htmlReady($user->getFullName())))) ?> + <?= Icon::create('lock-locked', Icon::ROLE_INFO)->asImg(tooltip2(sprintf(_('%s ist gesperrt'), htmlReady($user->getFullName())))) ?> <? endif ?> </td> <td> diff --git a/app/views/admin/user/activities.php b/app/views/admin/user/activities.php index fce928f..0357b86 100644 --- a/app/views/admin/user/activities.php +++ b/app/views/admin/user/activities.php @@ -32,7 +32,7 @@ <? if (!empty($query['details'])) : ?> <a href="<?= $controller->url_for('admin/user/activities/' . $user['user_id'], ['view' => $query['details']] + $params) ?>" <?= Request::isXhr() ? 'data-dialog="size=50%"' : ''?>> - <?= Icon::create('info-circle')->asSvg(['title' => _('Übersicht anzeigen')]) ?> + <?= Icon::create('info-circle')->asImg(['title' => _('Übersicht anzeigen')]) ?> </a> <? endif ?> </td> diff --git a/app/views/admin/user/edit.php b/app/views/admin/user/edit.php index 39d31cf..825949f 100644 --- a/app/views/admin/user/edit.php +++ b/app/views/admin/user/edit.php @@ -266,7 +266,7 @@ use Studip\Button, Studip\LinkButton; </label> <label class="col-2"> - <?= Icon::create('accept', Icon::ROLE_ACCEPT)->asSvg([ + <?= Icon::create('accept', Icon::ROLE_ACCEPT)->asImg([ 'id' => 'pw_success', 'style' => 'display: none', ]) ?> @@ -577,7 +577,7 @@ use Studip\Button, Studip\LinkButton; <? if ($GLOBALS['perm']->have_studip_perm('admin', $inst_membership->institut_id)) : ?> <a data-dialog="size=auto" href="<?= $controller->url_for('admin/user/edit_institute/' . $user->user_id . '/' . $inst_membership->institut_id) ?>"> - <?= Icon::create('edit')->asSvg([ + <?= Icon::create('edit')->asImg([ 'class' => 'text-bottom', 'title' => _('Diese Einrichtung bearbeiten'), ]) ?> diff --git a/app/views/admission/courseset/index.php b/app/views/admission/courseset/index.php index 656b5ba..70033af 100644 --- a/app/views/admission/courseset/index.php +++ b/app/views/admission/courseset/index.php @@ -57,18 +57,18 @@ if ($coursesets) { </td> <td class="actions"> <a class="load-in-new-row" href="<?= $controller->link_for('', ['course_set_details' => $courseset->getId()]); ?>"> - <?= Icon::create('info')->asSvg(['title' => _('Weitere Informationen einblenden')]) ?> + <?= Icon::create('info')->asImg(['title' => _('Weitere Informationen einblenden')]) ?> </a> <? if ($courseset->isUserAllowedToEdit($GLOBALS['user']->id)) : ?> <a href="<?= $controller->link_for('admission/courseset/copy/'.$courseset->getId()); ?>"> - <?= Icon::create('clipboard')->asSvg(['title' => _('Anmeldeset kopieren'), "alt" => _('Anmeldeset kopieren')]); ?> + <?= Icon::create('clipboard')->asImg(['title' => _('Anmeldeset kopieren'), "alt" => _('Anmeldeset kopieren')]); ?> </a> <a href="<?= $controller->link_for('admission/courseset/configure/'.$courseset->getId()); ?>"> - <?= Icon::create('edit')->asSvg(['title' => _('Anmeldeset bearbeiten')]) ?> + <?= Icon::create('edit')->asImg(['title' => _('Anmeldeset bearbeiten')]) ?> </a> <a href="<?= $controller->link_for('admission/courseset/delete/'. $courseset->getId(), ['really' => 1]) ?>" data-confirm="<?= sprintf(_('Soll das Anmeldeset %s wirklich gelöscht werden?'), htmlReady($courseset->getName())) ?>"> - <?= Icon::create('trash')->asSvg(['title' => _('Anmeldeset löschen')]) ?> + <?= Icon::create('trash')->asImg(['title' => _('Anmeldeset löschen')]) ?> </a> <? endif ?> </td> diff --git a/app/views/admission/courseset/institutes.php b/app/views/admission/courseset/institutes.php index 30f10ba..30b78c3 100644 --- a/app/views/admission/courseset/institutes.php +++ b/app/views/admission/courseset/institutes.php @@ -5,7 +5,7 @@ * @var array $selectedInstitutes */ ?> -<?= Icon::create('arr_2down', Icon::ROLE_SORT)->asSvg([ +<?= Icon::create('arr_2down', Icon::ROLE_SORT)->asImg([ 'title' => _('Einrichtung hinzufügen'), 'onclick' => "STUDIP.Admission.updateInstitutes($('input[name=\"institute_id\"]').val(), '" . $controller->url_for('admission/courseset/institutes', !empty($courseset) ? $courseset->getId() : '') . "', '" . $controller->url_for('admission/courseset/instcourses', !empty($courseset) ? $courseset->getId() : '') . "', 'add')", ]) ?> @@ -19,7 +19,7 @@ <span class="hover_box"> <?= htmlReady($data['Name']) ?> <span class="action_icons"> - <?= Icon::create('trash')->asSvg([ + <?= Icon::create('trash')->asImg([ 'title' => _('Einrichtung entfernen'), 'onclick' => "STUDIP.Admission.updateInstitutes('{$institute}', '" . $controller->url_for('admission/courseset/institutes',$institute) . "', '" . $controller->url_for('admission/courseset/instcourses',$institute)."', 'delete')" ]); ?> diff --git a/app/views/admission/ruleadministration/index.php b/app/views/admission/ruleadministration/index.php index 94d9f86..ef3fa1b 100644 --- a/app/views/admission/ruleadministration/index.php +++ b/app/views/admission/ruleadministration/index.php @@ -19,14 +19,14 @@ <td> <a href="<?= $controller->toggle_activation($type) ?>" role="button"> <? if ($details['active']): ?> - <?= Icon::create('checkbox-checked')->asSvg([ + <?= Icon::create('checkbox-checked')->asImg([ 'title' => sprintf( _('Die Regel "%s" ist aktiv. Klicken Sie hier, um sie zu deaktivieren.'), $details['name'] ) ]) ?> <? else: ?> - <?= Icon::create('checkbox-unchecked')->asSvg([ + <?= Icon::create('checkbox-unchecked')->asImg([ 'title' => sprintf( _('Die Regel "%s" ist inaktiv. Klicken Sie hier, um sie zu aktivieren.'), $details['name'] diff --git a/app/views/blubber/compose.php b/app/views/blubber/compose.php index 2cdb89b..67ba605 100644 --- a/app/views/blubber/compose.php +++ b/app/views/blubber/compose.php @@ -14,19 +14,19 @@ <div> <a href="#" onclick="$('.file_select_possibilities').hide(); $('.private_blubber_composer').show(); return false;"> - <?= Icon::create('group3')->asSvg(50) ?> + <?= Icon::create('group3')->asImg(50) ?> <?= _('Kontakte') ?> </a> <a href="<?= $controller->link_for('blubber/index/global') ?>"> - <?= Icon::create('globe')->asSvg(50) ?> + <?= Icon::create('globe')->asImg(50) ?> <?= _('Öffentlich') ?> </a> <? if (!$GLOBALS['perm']->have_perm('admin')) : ?> <a href="#" onclick="$('.file_select_possibilities').hide(); $('.course_blubber_composer').show(); return false;"> - <?= Icon::create('seminar')->asSvg(50) ?> + <?= Icon::create('seminar')->asImg(50) ?> <?= _('Veranstaltung') ?> </a> <? endif ?> @@ -67,10 +67,10 @@ </span> <a href="" onClick="$('#blubber_contacts').trigger('focus').select2('open'); return false;"> - <?= Icon::create('search')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('search')->asImg(['class' => 'text-bottom']) ?> </a> <a href="" onClick="$('#blubber_contacts').val(null).trigger('change'); return false;"> - <?= Icon::create('decline')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('decline')->asImg(['class' => 'text-bottom']) ?> </a> </div> <? endif ?> @@ -113,10 +113,10 @@ ->fireJSFunctionOnSelect('STUDIP.Blubber.Composer.vue.addUser')->render() ?> <a href="" onClick="$('input[name=search_user_id_parameter]').trigger('focus'); return false;"> - <?= Icon::create('search')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('search')->asImg(['class' => 'text-bottom']) ?> </a> <a href="" onClick="STUDIP.Blubber.Composer.vue.clearUsers(); return false;"> - <?= Icon::create('decline')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('decline')->asImg(['class' => 'text-bottom']) ?> </a> </div> </div> diff --git a/app/views/blubber/private_to_studygroup.php b/app/views/blubber/private_to_studygroup.php index 6c49a40..8cdad33 100644 --- a/app/views/blubber/private_to_studygroup.php +++ b/app/views/blubber/private_to_studygroup.php @@ -4,9 +4,9 @@ enctype="multipart/form-data"> <div style="display: flex; justify-content: center; align-items: center"> - <?= Icon::create('blubber', Icon::ROLE_INFO)->asSvg(50, ['style' => 'margin-right: 50px;']) ?> - <?= Icon::create('arr_2right', Icon::ROLE_INFO)->asSvg(['style' => 'margin-right: 50px;']) ?> - <?= Icon::create('studygroup', Icon::ROLE_INFO)->asSvg(50) ?> + <?= Icon::create('blubber', Icon::ROLE_INFO)->asImg(50, ['style' => 'margin-right: 50px;']) ?> + <?= Icon::create('arr_2right', Icon::ROLE_INFO)->asImg(['style' => 'margin-right: 50px;']) ?> + <?= Icon::create('studygroup', Icon::ROLE_INFO)->asImg(50) ?> </div> <label> diff --git a/app/views/calendar/calendar/share_select.php b/app/views/calendar/calendar/share_select.php index 07de565..1f30a62 100644 --- a/app/views/calendar/calendar/share_select.php +++ b/app/views/calendar/calendar/share_select.php @@ -7,12 +7,12 @@ <div> <a href="<?= $controller->link_for('calendar/calendar/share') ?>" data-dialog="size=default"> - <?= Icon::create('group2')->asSvg(50) ?> + <?= Icon::create('group2')->asImg(50) ?> <?= _('Mit Nutzenden teilen') ?> </a> <a href="<?= $controller->link_for('calendar/calendar/publish') ?>" data-dialog="size=auto"> - <?= Icon::create('permalink')->asSvg(50) ?> + <?= Icon::create('permalink')->asImg(50) ?> <?= _('Link zu diesem Kalender') ?> </a> </div> diff --git a/app/views/calendar/contentbox/_termin.php b/app/views/calendar/contentbox/_termin.php index 963116d..1576cb8 100644 --- a/app/views/calendar/contentbox/_termin.php +++ b/app/views/calendar/contentbox/_termin.php @@ -11,7 +11,7 @@ <header> <h1> <a href="<?= ContentBoxHelper::href($termin->getObjectId()) ?>"> - <?= Icon::create('date', Icon::ROLE_INACTIVE)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('date', Icon::ROLE_INACTIVE)->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($titles[$termin->getObjectId()] ?? $termin->getTitle()) ?> </a> </h1> @@ -26,19 +26,19 @@ <? if ($admin && $isProfile && $termin->getObjectClass() === 'CalendarDateAssignment') : ?> <a href="<?= URLHelper::getLink('dispatch.php/calendar/calendar') ?>" title="<?= _('Zum Kalender') ?>" aria-label="<?= _('Zum Kalender') ?>"> - <?= Icon::create('schedule')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('schedule')->asImg(['class' => 'text-bottom']) ?> </a> <? if ($termin->calendar_date->isWritable($GLOBALS['user']->id)) : ?> <a href="<?= URLHelper::getLink('dispatch.php/calendar/date/edit/' . $termin->getPrimaryObjectId()) ?>" title="<?= _('Termin bearbeiten') ?>" aria-label="<?= _('Termin bearbeiten') ?>" data-dialog> - <?= Icon::create('edit')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('edit')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> <? elseif (!$course_range && in_array($termin->getObjectClass(), [CalendarCourseDate::class, CalendarCourseExDate::class])) : ?> <a href="<?= URLHelper::getLink('dispatch.php/course/dates', ['cid' => $termin->getPrimaryObjectId()]) ?>" title="<?= _('Zur Veranstaltung') ?>" aria-label="<?= _('Zur Veranstaltung') ?>"> - <?= Icon::create('seminar')->asSvg(['class'=> 'text-bottom']) ?> + <?= Icon::create('seminar')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> </nav> @@ -63,7 +63,7 @@ <? if (count($themen)) : ?> <? foreach ($themen as $thema) : ?> <h3> - <?= Icon::create('topic', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('topic', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($thema['title']) ?> </h3> <div> @@ -91,7 +91,7 @@ <? if (!$course_range && in_array($termin->getObjectClass(), [CalendarCourseDate::class, CalendarCourseExDate::class])) : ?> <div> <a href="<?= URLHelper::getLink('dispatch.php/course/dates', ['cid' => $termin->getPrimaryObjectId()]) ?>"> - <?= Icon::create('link-intern')->asSvg(['class'=> 'text-bottom']) ?> + <?= Icon::create('link-intern')->asImg(['class' => 'text-bottom']) ?> <?= _('Zur Veranstaltung') ?> </a> </div> diff --git a/app/views/calendar/contentbox/display.php b/app/views/calendar/contentbox/display.php index 1c86a97..902df33 100644 --- a/app/views/calendar/contentbox/display.php +++ b/app/views/calendar/contentbox/display.php @@ -2,7 +2,7 @@ <article class="studip"> <header> <h1> - <?= Icon::create('schedule', 'info')->asSvg() ?> + <?= Icon::create('schedule', 'info')->asImg() ?> <?= htmlReady($title) ?> </h1> <nav> @@ -11,12 +11,12 @@ <a href="<?= URLHelper::getLink('dispatch.php/calendar/date/add') ?>" data-dialog="reload-on-close" title="<?= _('Neuen Termin anlegen') ?>" aria-label="<?= _('Neuen Termin anlegen') ?>"> - <?= Icon::create('add')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('add')->asImg(['class' => 'text-bottom']) ?> </a> <? else: ?> <a href="<?= URLHelper::getLink("dispatch.php/course/timesrooms", ['cid' => $range_id]) ?>" title="<?= _('Neuen Termin anlegen') ?>" aria-label="<?= _('Neuen Termin anlegen') ?>"> - <?= Icon::create('admin')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('admin')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> <? endif ?> diff --git a/app/views/calendar/date/_add_edit_form.php b/app/views/calendar/date/_add_edit_form.php index fb5596e..74dc955 100644 --- a/app/views/calendar/date/_add_edit_form.php +++ b/app/views/calendar/date/_add_edit_form.php @@ -33,7 +33,7 @@ class="validation_notes studip"> <header> <h1> - <?= Icon::create('info-circle', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom validation_notes_icon']) ?> + <?= Icon::create('info-circle', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom validation_notes_icon']) ?> <?= _('Hinweise zum Ausfüllen des Formulars') ?> </h1> </header> diff --git a/app/views/calendar/schedule/course_info.php b/app/views/calendar/schedule/course_info.php index a9e0c02..c87e4cd 100644 --- a/app/views/calendar/schedule/course_info.php +++ b/app/views/calendar/schedule/course_info.php @@ -58,12 +58,12 @@ <? if ($GLOBALS['perm']->have_studip_perm('user', $course->id)) : ?> <a href="<?= URLHelper::getLink('dispatch.php/course/overview', ['cid' => $course->id]) ?>"> <?= _('Direkt zur Veranstaltung') ?> - <?= Icon::create('link-intern')->asSvg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> + <?= Icon::create('link-intern')->asImg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> </a> <? else : ?> <a href="<?= URLHelper::getLink('dispatch.php/course/details', ['sem_id' => $course->id]) ?>"> <?= _('Direkt zur Veranstaltung') ?> - <?= Icon::create('link-intern')->asSvg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> + <?= Icon::create('link-intern')->asImg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> </a> <? endif ?> </section> diff --git a/app/views/consultation/overview/booked.php b/app/views/consultation/overview/booked.php index ebe5a35..69a0cd9 100644 --- a/app/views/consultation/overview/booked.php +++ b/app/views/consultation/overview/booked.php @@ -46,7 +46,7 @@ </td> <td class="actions"> <a href="<?= $controller->cancel($slot->block, $slot, 1) ?>" data-dialog="size=auto"> - <?= Icon::create('trash')->asSvg(tooltip2(_('Termin absagen'))) ?> + <?= Icon::create('trash')->asImg(tooltip2(_('Termin absagen'))) ?> </a> </td> </tr> diff --git a/app/views/consultation/overview/index.php b/app/views/consultation/overview/index.php index 63f35ba..ef7f208 100644 --- a/app/views/consultation/overview/index.php +++ b/app/views/consultation/overview/index.php @@ -54,14 +54,14 @@ <td class="actions"> <? if ($slot->isOccupied($GLOBALS['user']->id)): ?> <a href="<?= $controller->cancel($block, $slot) ?>" data-dialog="size=auto"> - <?= Icon::create('trash')->asSvg(tooltip2(_('Termin absagen'))) ?> + <?= Icon::create('trash')->asImg(tooltip2(_('Termin absagen'))) ?> </a> <? elseif ($slot->userMayCreateBookingForSlot()): ?> <a href="<?= $controller->book($block, $slot) ?>" data-dialog="size=auto"> - <?= Icon::create('add')->asSvg(tooltip2(_('Termin reservieren'))) ?> + <?= Icon::create('add')->asImg(tooltip2(_('Termin reservieren'))) ?> </a> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_INACTIVE)->asSvg(tooltip2(_('Dieser Termin ist für Buchungen gesperrt.'))) ?> + <?= Icon::create('decline', Icon::ROLE_INACTIVE)->asImg(tooltip2(_('Dieser Termin ist für Buchungen gesperrt.'))) ?> <? endif; ?> </td> </tr> diff --git a/app/views/consultation/overview/ungrouped.php b/app/views/consultation/overview/ungrouped.php index 023d499..c9eb519 100644 --- a/app/views/consultation/overview/ungrouped.php +++ b/app/views/consultation/overview/ungrouped.php @@ -84,14 +84,14 @@ <td class="actions"> <? if ($slot->isOccupied($GLOBALS['user']->id)): ?> <a href="<?= $controller->cancel($block, $slot) ?>" data-dialog="size=auto"> - <?= Icon::create('trash')->asSvg(tooltip2(_('Termin absagen'))) ?> + <?= Icon::create('trash')->asImg(tooltip2(_('Termin absagen'))) ?> </a> <? elseif ($slot->userMayCreateBookingForSlot()): ?> <a href="<?= $controller->book($block, $slot) ?>" data-dialog="size=auto"> - <?= Icon::create('add')->asSvg(tooltip2(_('Termin reservieren'))) ?> + <?= Icon::create('add')->asImg(tooltip2(_('Termin reservieren'))) ?> </a> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_INACTIVE)->asSvg(tooltip2(_('Dieser Termin ist für Buchungen gesperrt.'))) ?> + <?= Icon::create('decline', Icon::ROLE_INACTIVE)->asImg(tooltip2(_('Dieser Termin ist für Buchungen gesperrt.'))) ?> <? endif; ?> </td> </tr> diff --git a/app/views/contents/overview/index.php b/app/views/contents/overview/index.php index 37c81e9..7f79113 100644 --- a/app/views/contents/overview/index.php +++ b/app/views/contents/overview/index.php @@ -5,7 +5,7 @@ <a href="<?= URLHelper::getLink($navigation->getURL()) ?>" class="content-item-link"> <div class="content-item-img-wrapper"> <? if ($navigation->getImage()): ?> - <?= $navigation->getImage()->asSvg(64, $navigation->getLinkAttributes()) ?> + <?= $navigation->getImage()->asImg(64, $navigation->getLinkAttributes()) ?> <? endif ?> </div> <div class="content-item-text"> diff --git a/app/views/course/basicdata/view.php b/app/views/course/basicdata/view.php index 4b8dac3..62c0620 100644 --- a/app/views/course/basicdata/view.php +++ b/app/views/course/basicdata/view.php @@ -133,12 +133,12 @@ $dialog_attr = Request::isXhr() ? ' data-dialog="size=50%"' : ''; <? if ($perm_dozent && !$dozent_is_locked): ?> <? if ($num > 0) : ?> <button class="as-link" formaction="<?= $controller->link_for('course/basicdata/priorityupfor', $course_id, $dozent['user_id'], 'dozent') ?>" <?= $dialog_attr ?>> - <?= Icon::create('arr_2up', Icon::ROLE_SORT)->asSvg(['class' => 'middle']) ?> + <?= Icon::create('arr_2up', Icon::ROLE_SORT)->asImg(['class' => 'middle']) ?> </button> <? endif; ?> <? if ($num < count($dozenten) - 1): ?> <button class="as-link" formaction="<?= $controller->link_for('course/basicdata/prioritydownfor', $course_id, $dozent['user_id'], 'dozent') ?>" <?= $dialog_attr ?>> - <?= Icon::create('arr_2down', Icon::ROLE_SORT)->asSvg(['class' => 'middle']) ?> + <?= Icon::create('arr_2down', Icon::ROLE_SORT)->asImg(['class' => 'middle']) ?> </button> <? endif; ?> <?= Icon::create('trash')->asInput([ @@ -270,12 +270,12 @@ $dialog_attr = Request::isXhr() ? ' data-dialog="size=50%"' : ''; <? if ($perm_dozent && !$tutor_is_locked): ?> <? if ($num > 0) : ?> <button class="as-link" formaction="<?= $controller->link_for('course/basicdata/priorityupfor', $course_id, $tutor['user_id'], 'tutor') ?>" <?= $dialog_attr ?>> - <?= Icon::create('arr_2up', Icon::ROLE_SORT)->asSvg(['class' => 'middle']) ?> + <?= Icon::create('arr_2up', Icon::ROLE_SORT)->asImg(['class' => 'middle']) ?> </button> <? endif; ?> <? if ($num < count($tutoren) - 1) : ?> <button class="as-link" formaction="<?= $controller->link_for('course/basicdata/prioritydownfor', $course_id, $tutor['user_id'], 'tutor') ?>" <?= $dialog_attr ?>> - <?= Icon::create('arr_2down', Icon::ROLE_SORT)->asSvg(['class' => 'middle']) ?> + <?= Icon::create('arr_2down', Icon::ROLE_SORT)->asImg(['class' => 'middle']) ?> </button> <? endif; ?> <?= Icon::create('trash')->asInput([ diff --git a/app/views/course/contentmodules/info.php b/app/views/course/contentmodules/info.php index 97dc2b0..48323c4 100644 --- a/app/views/course/contentmodules/info.php +++ b/app/views/course/contentmodules/info.php @@ -12,7 +12,7 @@ <div class="header"> <div class="image"> <? if ($metadata['icon']): ?> - <?= $metadata['icon']->copyWithRole(Icon::ROLE_INFO)->asSvg(100) ?> + <?= $metadata['icon']->copyWithRole(Icon::ROLE_INFO)->asImg(100) ?> <? endif; ?> </div> <div class="text"> diff --git a/app/views/course/dates/_date_row-exdate.php b/app/views/course/dates/_date_row-exdate.php index e47c999..2a179ef 100644 --- a/app/views/course/dates/_date_row-exdate.php +++ b/app/views/course/dates/_date_row-exdate.php @@ -1,6 +1,6 @@ <tr id="date_<?= $date->id ?>" class="ausfall" data-termin-id="<?= htmlReady($date->id) ?>"> <td data-sort-value="<?= htmlReady($date->date) ?>" class="date_name"> - <?= Icon::create('date', Icon::ROLE_INFO)->asSvg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> + <?= Icon::create('date', Icon::ROLE_INFO)->asImg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> <?= htmlReady($date->getFullName()) ?> <?= tooltipIcon($date->content) ?> <? if (count($date->dozenten) > 0): ?> diff --git a/app/views/course/dates/_date_row.php b/app/views/course/dates/_date_row.php index b45bd55..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 <tr id="date_<?= $date->id ?>" <? if (!empty($is_next_date)) echo 'class="nextdate" title="' . _('Der nächste Termin') . '"'; ?> data-termin-id="<?= htmlReady($date->id) ?>"> <td data-sort-value="<?= htmlReady($date->date) ?>" class="date_name"> <a href="<?= $dialog_url ?>" data-dialog> - <?= Icon::create($icon)->asSvg(Icon::SIZE_INLINE,['class' => 'text-bottom']) ?> + <?= Icon::create($icon)->asImg(Icon::SIZE_INLINE,['class' => 'text-bottom']) ?> <?= htmlReady($date->getFullName(CourseDate::FORMAT_VERBOSE)) ?> </a> <? if (count($date->dozenten) > 0): ?> diff --git a/app/views/course/dates/_topic_li.php b/app/views/course/dates/_topic_li.php index 9353ddb..88e267f 100644 --- a/app/views/course/dates/_topic_li.php +++ b/app/views/course/dates/_topic_li.php @@ -1,11 +1,11 @@ <li data-issue_id="<?= $topic->id ?>" class="topic_<?= $date->id ?>_<?= $topic->id ?>"> <a href="<?= $controller->url_for("course/topics#{$topic->id}", ['open' => $topic->id]) ?>" class="title"> - <?= Icon::create('topic')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('topic')->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($topic['title']) ?> </a> <? if ($has_access) : ?> <a href="#" onClick="STUDIP.Dates.removeTopicFromIcon.call(this); return false;"> - <?= Icon::create('trash')->asSvg(['class' => 'text-bottom'] + tooltip2(_('Thema entfernen'))) ?> + <?= Icon::create('trash')->asImg(['class' => 'text-bottom'] + tooltip2(_('Thema entfernen'))) ?> </a> <? endif ?> </li> diff --git a/app/views/course/dates/current_day_dates.php b/app/views/course/dates/current_day_dates.php index 9df4b09..c0f92d7 100644 --- a/app/views/course/dates/current_day_dates.php +++ b/app/views/course/dates/current_day_dates.php @@ -12,7 +12,7 @@ <? foreach ($dates as $date): ?> <tr> <td class="date_name"> - <?= Icon::create('date')->asSvg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> + <?= Icon::create('date')->asImg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> <?= htmlReady($date->getFullName(CourseDate::FORMAT_VERBOSE)) ?> </td> <td> diff --git a/app/views/course/details/index.php b/app/views/course/details/index.php index d418997..934d251 100644 --- a/app/views/course/details/index.php +++ b/app/views/course/details/index.php @@ -340,7 +340,7 @@ <a class="module-info" href="<?= URLHelper::getLink($module['nav']->getUrl())?>"> <?= htmlReady($module['title']) ?> <? if ($module['nav']->getImage()) : ?> - <?= $module['nav']->getImage()->asSvg($module['nav']->getLinkAttributes()) ?> + <?= $module['nav']->getImage()->asImg($module['nav']->getLinkAttributes()) ?> <? endif ?> <span><?= htmlReady($module['nav']->getTitle())?></span> </a> diff --git a/app/views/course/forum/discussion_types/index.php b/app/views/course/forum/discussion_types/index.php index f6eb534..0dd4f2d 100644 --- a/app/views/course/forum/discussion_types/index.php +++ b/app/views/course/forum/discussion_types/index.php @@ -36,7 +36,7 @@ use Forum\DiscussionType; <tr> <td> <?php if ($type->icon) : ?> - <?= Icon::create($type->icon, ['title' => htmlReady($type->icon)])->asSvg(24) ?> + <?= Icon::create($type->icon, ['title' => htmlReady($type->icon)])->asImg(24) ?> <?php endif; ?> </td> <td> diff --git a/app/views/course/ilias_interface/add_object.php b/app/views/course/ilias_interface/add_object.php index 6e015a7..ddb4fed 100644 --- a/app/views/course/ilias_interface/add_object.php +++ b/app/views/course/ilias_interface/add_object.php @@ -85,7 +85,7 @@ <? foreach ($ilias_modules as $module_id => $module) : ?> <tr> <td> - <?= Icon::create('learnmodule')->asSvg([ + <?= Icon::create('learnmodule')->asImg([ 'title' => $module->getModuleTypeName(), ]) ?> </td> diff --git a/app/views/course/management/index.php b/app/views/course/management/index.php index 06fabf7..c7ab4bf 100644 --- a/app/views/course/management/index.php +++ b/app/views/course/management/index.php @@ -5,7 +5,7 @@ <a href="<?= URLHelper::getLink($nav->getURL()) ?>"> <h3> <? if ($nav->getImage()): ?> - <?= $nav->getImage()->asSvg(false, $nav->getLinkAttributes()) ?> + <?= $nav->getImage()->asImg(false, $nav->getLinkAttributes()) ?> <? endif; ?> <?= htmlReady($nav->getTitle()) ?> </h3> diff --git a/app/views/course/statusgroups/_group.php b/app/views/course/statusgroups/_group.php index 3649e9b..8cc8a5a 100644 --- a/app/views/course/statusgroups/_group.php +++ b/app/views/course/statusgroups/_group.php @@ -20,7 +20,7 @@ <a class="no-contentbox-link" href="<?= $controller->url_for('course/statusgroups/groupinfo', $group->id) ?>" data-dialog="size=auto"> - <?= Icon::create('info-circle')->asSvg([ + <?= Icon::create('info-circle')->asImg([ 'title' => sprintf(_('Informationen zu %s'), $group->name) ]) ?> </a> @@ -137,7 +137,7 @@ 'course_id' => $course_id, 'default_subject' => $course_title.' ('.$group->name.')' ]) ?>" data-dialog="size=auto;"> - <?= Icon::create('mail')->asSvg(['title' => _('Nachricht an alle nicht zugeordneten Personen schicken')]) ?> + <?= Icon::create('mail')->asImg(['title' => _('Nachricht an alle nicht zugeordneten Personen schicken')]) ?> </a> </nav> <?php endif ?> diff --git a/app/views/course/studygroup/_members_gallery.php b/app/views/course/studygroup/_members_gallery.php index 0c98c26..52a81f9 100644 --- a/app/views/course/studygroup/_members_gallery.php +++ b/app/views/course/studygroup/_members_gallery.php @@ -15,7 +15,7 @@ <div> <a href="<?= $controller->link_for('messages/write', ['rec_uname' => $m['username']]) ?>" data-dialog="size=50%"> - <?= Icon::create('mail')->asSvg(['title' => _('Nachricht schreiben')]) ?> + <?= Icon::create('mail')->asImg(['title' => _('Nachricht schreiben')]) ?> </a> <? if ($GLOBALS['perm']->have_studip_perm('tutor', $sem_id)): ?> <?= $this->render_partial('course/studygroup/_members_options.php', compact('m')) ?> diff --git a/app/views/course/studygroup/_members_list.php b/app/views/course/studygroup/_members_list.php index a8cec1e..c1dbc26 100644 --- a/app/views/course/studygroup/_members_list.php +++ b/app/views/course/studygroup/_members_list.php @@ -51,7 +51,7 @@ <td class="actions"> <a href="<?= $controller->link_for('messages/write', ['rec_uname' => $m['username']]) ?>" data-dialog="size=50%"> - <?= Icon::create('mail')->asSvg(['title' => _('Nachricht schreiben')]) ?> + <?= Icon::create('mail')->asImg(['title' => _('Nachricht schreiben')]) ?> </a> <? if ($GLOBALS['perm']->have_studip_perm('tutor', $sem_id)) : ?> <?= $this->render_partial('course/studygroup/_members_options.php', compact('m')) ?> diff --git a/app/views/course/studygroup/_members_options.php b/app/views/course/studygroup/_members_options.php index bad7242..76b6dd8 100644 --- a/app/views/course/studygroup/_members_options.php +++ b/app/views/course/studygroup/_members_options.php @@ -1,18 +1,18 @@ <? if ($GLOBALS['perm']->have_studip_perm('dozent', $sem_id) && $GLOBALS['perm']->have_studip_perm('tutor', $sem_id, $m['user_id'])) : ?> <a href="<?= $controller->link_for('course/studygroup/edit_members/downgrade', $type, ['user' => $m['username']]) ?>" data-confirm="<?= _('Wollen Sie die Person wirklich runterstufen?') ?>"> - <?= Icon::create('arr_2down')->asSvg(['title' => _('Runterstufen')]) ?> + <?= Icon::create('arr_2down')->asImg(['title' => _('Runterstufen')]) ?> </a> <? endif ?> <? if ($GLOBALS['perm']->have_studip_perm('dozent', $sem_id) && !$GLOBALS['perm']->have_studip_perm('dozent', $sem_id, $m['user_id'])) : ?> <a href="<?= $controller->link_for('course/studygroup/edit_members/promote', $type, ['user' => $m['username']]) ?>" data-confirm="<?= _('Wollen Sie die Person wirklich hochstufen?') ?>"> - <?= Icon::create('arr_2up')->asSvg(['title' => _('Hochstufen')])?> + <?= Icon::create('arr_2up')->asImg(['title' => _('Hochstufen')])?> </a> <? endif ?> <? if ($m['user_id'] !== $GLOBALS['user']->id && $GLOBALS['perm']->have_studip_perm('dozent', $sem_id)): ?> <a href="<?= $controller->link_for('course/studygroup/edit_members/remove', ['user' => $m['username']]) ?>" data-confirm="<?= _('Möchten Sie die Person wirklich aus der Studiengruppe entfernen?') ?>"> - <?= Icon::create('trash')->asSvg(['title' => _('Entfernen')])?> + <?= Icon::create('trash')->asImg(['title' => _('Entfernen')])?> </a> <? endif; ?> diff --git a/app/views/course/studygroup/members.php b/app/views/course/studygroup/members.php index 060f339..503991d 100644 --- a/app/views/course/studygroup/members.php +++ b/app/views/course/studygroup/members.php @@ -88,11 +88,11 @@ </td> <td class="actions"> <a href="<?= $controller->edit_members('accept', ['user' => $p->username]) ?>"> - <?= Icon::create('accept')->asSvg(['title' => _('Eintragen')]) ?> + <?= Icon::create('accept')->asImg(['title' => _('Eintragen')]) ?> </a> <a href="<?= $controller->edit_members('deny', ['user' => $p->username]) ?>" data-confirm="<?= _('Wollen Sie die Mitgliedschaft wirklich ablehnen?') ?>"> - <?= Icon::create('trash')->asSvg(['title' => _('Mitgliedschaft ablehnen')]) ?> + <?= Icon::create('trash')->asImg(['title' => _('Mitgliedschaft ablehnen')]) ?> </a> </td> </tr> @@ -156,7 +156,7 @@ </td> <td class="actions"> <a href="<?= $controller->edit_members('cancelInvitation', ['user' => $p->user->username]) ?>" data-confirm="<?= _('Wollen Sie die Einladung wirklich löschen?') ?>"> - <?= Icon::create('trash')->asSvg(['title' => _('Einladung löschen')]) ?> + <?= Icon::create('trash')->asImg(['title' => _('Einladung löschen')]) ?> </a> </td> </tr> diff --git a/app/views/course/studygroup/widget.php b/app/views/course/studygroup/widget.php index cf0f787..7e68922 100644 --- a/app/views/course/studygroup/widget.php +++ b/app/views/course/studygroup/widget.php @@ -3,10 +3,10 @@ <h1> <? if ($course->isStudygroup()) : ?> - <?= Icon::create('seminar', Icon::ROLE_INFO)->asSvg(['class' => "text-bottom"]) ?> + <?= Icon::create('seminar', Icon::ROLE_INFO)->asImg(['class' => "text-bottom"]) ?> <?= _('Zugehörige Veranstaltung') ?> <? else : ?> - <?= Icon::create('studygroup', Icon::ROLE_INFO)->asSvg(['class' => "text-bottom"]) ?> + <?= Icon::create('studygroup', Icon::ROLE_INFO)->asImg(['class' => "text-bottom"]) ?> <?= _('Verknüpfte Studiengruppen') ?> <? endif ?> </h1> diff --git a/app/views/course/timesrooms/_regularEvents.php b/app/views/course/timesrooms/_regularEvents.php index 0fd733a..62e59b2 100644 --- a/app/views/course/timesrooms/_regularEvents.php +++ b/app/views/course/timesrooms/_regularEvents.php @@ -42,7 +42,7 @@ tabindex="0" data-tooltip aria-label="<?= htmlReady($booking_status_message) ?>"> - <?= $booking_status_icon->asSvg(['class' => 'text-bottom']) ?> + <?= $booking_status_icon->asImg(['class' => 'text-bottom']) ?> <span class="tooltip-content"><?= $booking_status_message ?></span> </span> <a href="<?= ContentBoxHelper::href($metadate_id) ?>"> diff --git a/app/views/course/timesrooms/_roomRequest.php b/app/views/course/timesrooms/_roomRequest.php index 5902e5f..ffa72b0 100644 --- a/app/views/course/timesrooms/_roomRequest.php +++ b/app/views/course/timesrooms/_roomRequest.php @@ -59,7 +59,7 @@ <a class="load-in-new-row" href="<?= $controller->link_for('course/room_requests/info/' . $rr->id) ?>" aria-expanded="false"> - <?= Icon::create('info')->asSvg(['title' => _('Weitere Informationen einblenden')]) ?> + <?= Icon::create('info')->asImg(['title' => _('Weitere Informationen einblenden')]) ?> </a> <? $params = [] ?> <? $dialog = []; ?> diff --git a/app/views/course/timesrooms/editDate.php b/app/views/course/timesrooms/editDate.php index f17c52a..15c1986 100644 --- a/app/views/course/timesrooms/editDate.php +++ b/app/views/course/timesrooms/editDate.php @@ -82,7 +82,7 @@ ['only_bookable_rooms' => '1'] ) ?>" <?= Request::isDialog() ? 'data-dialog="size=normal"' : '' ?> title="<?= _('Nur buchbare Räume anzeigen') ?>"> - <?= Icon::create('room-request')->asSvg([ + <?= Icon::create('room-request')->asImg([ 'class' => 'text-bottom', 'style' => 'margin-left: 0.2em; margin-top: 0.6em;', ]) ?> diff --git a/app/views/course/topics/edit.php b/app/views/course/topics/edit.php index 88b5316..a6b897e 100644 --- a/app/views/course/topics/edit.php +++ b/app/views/course/topics/edit.php @@ -26,7 +26,7 @@ <label> <? $folder = $topic->folders->first() ?> <? if ($folder) : ?> - <?= Icon::create('accept', Icon::ROLE_ACCEPT)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('accept', Icon::ROLE_ACCEPT)->asImg(['class' => 'text-bottom']) ?> <?= _('Dateiordner vorhanden') ?> <? else : ?> <input type="checkbox" name="folder" id="topic_folder" value="1"> @@ -38,7 +38,7 @@ <? if ($forum_activated) : ?> <label> <? if ($topic->forum_thread_url) : ?> - <?= Icon::create('accept', Icon::ROLE_ACCEPT)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('accept', Icon::ROLE_ACCEPT)->asImg(['class' => 'text-bottom']) ?> <?= _('Forenthema vorhanden') ?> <? else : ?> <input type="checkbox" name="forumthread" id="topic_forumthread" value="1"> @@ -52,14 +52,14 @@ <label> <input type="checkbox" name="date[<?= htmlReady($date->id) ?>]" value="1" class="text-bottom" <? if (in_array($date->id, $date_ids)) echo 'checked'; ?>> - <?= Icon::create('date', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('date', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom']) ?> <?= floor($date['date'] / 86400) !== floor($date['end_time'] / 86400) ? date("d.m.Y, H:i", $date['date'])." - ".date("d.m.Y, H:i", $date['end_time']) : date("d.m.Y, H:i", $date['date'])." - ".date("H:i", $date['end_time']) ?> <? if (count($date->topics) > 0) : ?> ( <? foreach ($date->topics as $key => $localtopic) : ?> <a href="<?= $controller->index(['open' => $localtopic->id]) ?>"> - <?= Icon::create('topic')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('topic')->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($localtopic->title) ?> </a> <? endforeach ?> diff --git a/app/views/course/topics/index.php b/app/views/course/topics/index.php index e538542..503ddd8 100644 --- a/app/views/course/topics/index.php +++ b/app/views/course/topics/index.php @@ -6,6 +6,7 @@ */ ?> <? if (count($topics) > 0) : ?> +<<<<<<< HEAD <table class="default withdetails"> <colgroup> <col width="50%"> @@ -23,7 +24,7 @@ <td> <a href="#" name="<?=$topic->getId()?>" onClick="jQuery(this).closest('tr').toggleClass('open'); return false;"> <? if ($topic->paper_related): ?> - <?= Icon::create('glossary')->asSvg(array_merge( + <?= Icon::create('glossary')->asImg(array_merge( ['class' => 'text-top'], tooltip2(_('Thema behandelt eine Hausarbeit oder ein Referat')) )) ?> @@ -36,7 +37,7 @@ <? foreach ($topic->dates as $date) : ?> <li> <a href="<?= URLHelper::getLink("dispatch.php/course/dates/details/".$date->getId()) ?>" data-dialog="size=auto"> - <?= Icon::create('date', 'clickable')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('date', 'clickable')->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($date->getFullName()) ?> </a> </li> @@ -64,7 +65,7 @@ <a href="<?= URLHelper::getLink( 'dispatch.php/course/files/index/' . $folder->id ) ?>"> - <?= $folder->getTypedFolder()->getIcon('clickable')->asSvg(['class' => 'text-bottom']) ?> + <?= $folder->getTypedFolder()->getIcon('clickable')->asImg(['class' => 'text-bottom']) ?> <?= _('Dateiordner') ?> </a> </li> @@ -74,7 +75,7 @@ <? if ($forum_activated && ($link_to_thread = $topic->forum_thread_url)) : ?> <li> <a href="<?= URLHelper::getLink($link_to_thread) ?>"> - <?= Icon::create('forum', 'clickable')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('forum', 'clickable')->asImg(['class' => 'text-bottom']) ?> <?= _('Thema im Forum') ?> </a> </li> diff --git a/app/views/course/wiki/ask_deleting.php b/app/views/course/wiki/ask_deleting.php index 59d9145..915e689 100644 --- a/app/views/course/wiki/ask_deleting.php +++ b/app/views/course/wiki/ask_deleting.php @@ -15,7 +15,7 @@ data-confirm="<?= _('Wirklich die letzte Änderung löschen?') ?>" formaction="<?= $controller->deleteversionURL($page, ['redirect_to' => 'page']) ?>" > - <?= Icon::create('archive2')->asSvg(50) ?> + <?= Icon::create('archive2')->asImg(50) ?> <?= _('Nur die letzte Änderung löschen') ?> </button> </div> @@ -27,7 +27,7 @@ data-confirm="<?= _('Wollen Sie wirklich die komplette Seite löschen?') ?>" formaction="<?= $controller->deleteURL($page) ?>" > - <?= Icon::create('wiki')->asSvg(50) ?> + <?= Icon::create('wiki')->asImg(50) ?> <?= _('Ganze Wikiseite löschen') ?> </button> </div> diff --git a/app/views/course/wiki/blame.php b/app/views/course/wiki/blame.php index 933c425..6a06985 100644 --- a/app/views/course/wiki/blame.php +++ b/app/views/course/wiki/blame.php @@ -26,7 +26,7 @@ href="<?= $controller->versiondiff(!$version || is_a($version, WikiPage::class) ? $version : $version->page, is_a($version, WikiVersion::class) ? $version->id : null) ?>" data-dialog title="<?= _('Änderungen anzeigen') ?>"> - <?= Icon::create('log')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('log')->asImg(['class' => 'text-bottom']) ?> </a> <div class="content"> <?= wikiReady($collect) ?> diff --git a/app/views/course/wiki/history.php b/app/views/course/wiki/history.php index f581ce2..bf1d163 100644 --- a/app/views/course/wiki/history.php +++ b/app/views/course/wiki/history.php @@ -43,7 +43,7 @@ <td data-sort-value="<?= $page->chdate ?>"><?= $page->chdate > 0 ? date('d.m.Y H:i:s', $page->chdate) : _('unbekannt') ?></td> <td class="actions"> <a href="<?= $controller->versiondiff($page) ?>" data-dialog> - <?= Icon::create('log')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('log')->asImg(['class' => 'text-bottom']) ?> </a> </td> </tr> @@ -67,7 +67,7 @@ <td><?= $version->mkdate > 0 ? date('d.m.Y H:i:s', $version->mkdate) : _('unbekannt') ?></td> <td class="actions"> <a href="<?= $controller->versiondiff($page, $version->id) ?>" data-dialog> - <?= Icon::create('log')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('log')->asImg(['class' => 'text-bottom']) ?> </a> </td> </tr> diff --git a/app/views/course/wiki/import.php b/app/views/course/wiki/import.php index 7984dd3..7c602ef 100644 --- a/app/views/course/wiki/import.php +++ b/app/views/course/wiki/import.php @@ -29,14 +29,14 @@ <? if ($bad_course_search): ?> <a href="<?= $controller->import() ?>" data-dialog="1"> - <?= Icon::create('decline')->asSvg([ + <?= Icon::create('decline')->asImg([ 'class' => 'text-bottom', 'title' => _('Suche zurücksetzen'), 'onclick' => "STUDIP.QuickSearch.reset('wiki_import_form', 'selected_range_id');" ]) ?> </a> <? else : ?> - <?= Icon::create('search')->asSvg([ + <?= Icon::create('search')->asImg([ 'class' => 'text-bottom', 'title' => _('Suche starten'), 'onclick' => "jQuery(this).closest('form').submit();" diff --git a/app/views/course/wiki/newpages.php b/app/views/course/wiki/newpages.php index 838eef9..96b2e6a 100644 --- a/app/views/course/wiki/newpages.php +++ b/app/views/course/wiki/newpages.php @@ -107,7 +107,7 @@ <a href="<?= $controller->versiondiff($page, is_a($version, 'WikiVersion') ? $version->id : null) ?>" title="<?= _('Einzelne Änderung anzeigen') ?>" data-dialog> - <?= Icon::create('log')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('log')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> <? endforeach ?> diff --git a/app/views/course/wiki/search.php b/app/views/course/wiki/search.php index 53f20d4..0cc030d 100644 --- a/app/views/course/wiki/search.php +++ b/app/views/course/wiki/search.php @@ -102,7 +102,7 @@ <tr> <td colspan="3"> <a href="<?= $controller->searchpage($page_id, ['search' => Request::get('search')]) ?>"> - <?= Icon::create('add')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('add')->asImg(['class' => 'text-bottom']) ?> <? if (count($pagedata['versions']) === 1) : ?> <?= _('Weiterer Treffer in einer älteren Version.') ?> <? else : ?> diff --git a/app/views/event_log/show.php b/app/views/event_log/show.php index 133efdd..a87ac1a 100644 --- a/app/views/event_log/show.php +++ b/app/views/event_log/show.php @@ -60,7 +60,7 @@ </select> <a href="<?= $controller->show(['action_id' => $action_id]) ?>"> - <?= Icon::create('decline')->asSvg(['title' => _('neue Suche')]) ?> + <?= Icon::create('decline')->asImg(['title' => _('neue Suche')]) ?> </a> </div> </label> diff --git a/app/views/fachabschluss/abschluesse/details.php b/app/views/fachabschluss/abschluesse/details.php index b475f40..f9be5fa 100644 --- a/app/views/fachabschluss/abschluesse/details.php +++ b/app/views/fachabschluss/abschluesse/details.php @@ -14,7 +14,7 @@ <td class="actions"> <? if (MvvPerm::havePermWrite($fach)) : ?> <a data-dialog href="<?= $controller->action_link('fach/' . $fach->id) ?>"> - <?= Icon::create('edit', 'clickable', ['title' => _('Fach bearbeiten')])->asSvg(); ?> + <?= Icon::create('edit', 'clickable', ['title' => _('Fach bearbeiten')])->asImg(); ?> </a> <? endif; ?> </td> diff --git a/app/views/fachabschluss/abschluesse/index.php b/app/views/fachabschluss/abschluesse/index.php index 7e8947f..147078a 100644 --- a/app/views/fachabschluss/abschluesse/index.php +++ b/app/views/fachabschluss/abschluesse/index.php @@ -28,7 +28,7 @@ <td class="dont-hide actions" style="white-space: nowrap;"> <? if (MvvPerm::havePermWrite($abschluss)) : ?> <a href="<?=$controller->action_link('abschluss/' . $abschluss->id)?>"> - <?= Icon::create('edit', Icon::ROLE_CLICKABLE, tooltip2(_('Abschluss bearbeiten')))->asSvg(); ?> + <?= Icon::create('edit', Icon::ROLE_CLICKABLE, tooltip2(_('Abschluss bearbeiten')))->asImg(); ?> </a> <? endif; ?> <? if (MvvPerm::havePermCreate($abschluss)) : ?> @@ -43,7 +43,7 @@ 'name' => 'delete' ]); ?> <? else : ?> - <?= Icon::create('trash', Icon::ROLE_INACTIVE, tooltip2(_('Abschluss kann nicht glöscht werden')))->asSvg(); ?> + <?= Icon::create('trash', Icon::ROLE_INACTIVE, tooltip2(_('Abschluss kann nicht glöscht werden')))->asImg(); ?> <? endif; ?> <? endif; ?> </td> diff --git a/app/views/fachabschluss/faecher/details.php b/app/views/fachabschluss/faecher/details.php index b8abf4e..ad773cd 100644 --- a/app/views/fachabschluss/faecher/details.php +++ b/app/views/fachabschluss/faecher/details.php @@ -13,7 +13,7 @@ <td class="actions"> <? if (MvvPerm::havePermWrite($abschluss)) : ?> <a data-dialog href="<?= $controller->action_link('abschluss/' . $abschluss->id) ?>"> - <?= Icon::create('edit', Icon::ROLE_CLICKABLE, ['title' => _('Abschluss bearbeiten')])->asSvg(); ?> + <?= Icon::create('edit', Icon::ROLE_CLICKABLE, ['title' => _('Abschluss bearbeiten')])->asImg(); ?> </a> <? endif; ?> </td> diff --git a/app/views/fachabschluss/faecher/details_fachbereich.php b/app/views/fachabschluss/faecher/details_fachbereich.php index dd49a25..6ca7dc2 100644 --- a/app/views/fachabschluss/faecher/details_fachbereich.php +++ b/app/views/fachabschluss/faecher/details_fachbereich.php @@ -12,7 +12,7 @@ <td class="actions"> <? if (MvvPerm::havePermWrite($fach)) : ?> <a href="<?= $controller->action_link('fach/' . $fach->id) ?>"> - <?= Icon::create('edit', Icon::ROLE_CLICKABLE, ['title' => _('Fach bearbeiten')])->asSvg(); ?> + <?= Icon::create('edit', Icon::ROLE_CLICKABLE, ['title' => _('Fach bearbeiten')])->asImg(); ?> </a> <? endif; ?> </td> diff --git a/app/views/fachabschluss/faecher/fach.php b/app/views/fachabschluss/faecher/fach.php index 08ade5f..08335db 100644 --- a/app/views/fachabschluss/faecher/fach.php +++ b/app/views/fachabschluss/faecher/fach.php @@ -70,7 +70,7 @@ <? if ($perm->haveFieldPerm('institut_id', MvvPerm::PERM_WRITE)): ?> <div class="mvv-item-list-buttons"> <a href="#" - class="mvv-item-remove"><?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Einrichtung entfernen')])->asSvg(); ?></a> + class="mvv-item-remove"><?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Einrichtung entfernen')])->asImg(); ?></a> </div> <? endif; ?> <input type="hidden" name="institut_items[]" value="<?= $fachbereich->getId() ?>"> diff --git a/app/views/fachabschluss/faecher/index.php b/app/views/fachabschluss/faecher/index.php index b42761e..f2ba7a4 100644 --- a/app/views/fachabschluss/faecher/index.php +++ b/app/views/fachabschluss/faecher/index.php @@ -27,7 +27,7 @@ <td class="dont-hide actions" style="white-space: nowrap;"> <? if (MvvPerm::havePermWrite($fach)) : ?> <a href="<?= $controller->action_link('fach/' . $fach->id) ?>"> - <?= Icon::create('edit', Icon::ROLE_CLICKABLE, ['title' => _('Fach bearbeiten')])->asSvg(); ?> + <?= Icon::create('edit', Icon::ROLE_CLICKABLE, ['title' => _('Fach bearbeiten')])->asImg(); ?> </a> <? endif; ?> <? if (MvvPerm::havePermCreate($fach)) : ?> @@ -39,7 +39,7 @@ 'name' => 'delete' ]); ?> <? else : ?> - <?= Icon::create('trash', Icon::ROLE_INACTIVE, tooltip2(_('Fach kann nicht glöscht werden')))->asSvg(); ?> + <?= Icon::create('trash', Icon::ROLE_INACTIVE, tooltip2(_('Fach kann nicht glöscht werden')))->asImg(); ?> <? endif; ?> <? endif; ?> </td> diff --git a/app/views/fachabschluss/kategorien/index.php b/app/views/fachabschluss/kategorien/index.php index 0f327ba..44c9bad 100644 --- a/app/views/fachabschluss/kategorien/index.php +++ b/app/views/fachabschluss/kategorien/index.php @@ -40,7 +40,7 @@ <td style="white-space: nowrap;" class="dont-hide actions"> <? if ($perm->havePermWrite()) : ?> <a href="<?= $controller->action_link('kategorie/' . $kategorie->id) ?>"> - <?= Icon::create('edit', Icon::ROLE_CLICKABLE, tooltip2(_('Abschluss-Kategorie bearbeiten')))->asSvg(); ?> + <?= Icon::create('edit', Icon::ROLE_CLICKABLE, tooltip2(_('Abschluss-Kategorie bearbeiten')))->asImg(); ?> </a> <? endif; ?> <? if ($perm->havePermCreate()) : ?> @@ -52,7 +52,7 @@ 'name' => 'delete' ]); ?> <? else : ?> - <?= Icon::create('trash', Icon::ROLE_INACTIVE, tooltip2(_('Löschen nicht möglich')))->asSvg(); ?> + <?= Icon::create('trash', Icon::ROLE_INACTIVE, tooltip2(_('Löschen nicht möglich')))->asImg(); ?> <? endif; ?> <? endif; ?> </td> diff --git a/app/views/file/_terms_of_use_select.php b/app/views/file/_terms_of_use_select.php index a4616c6..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="<?= htmlReady(kill_format($content_terms_of_use_entry->description)) ?>"> <label for="content_terms_of_use-<?= htmlReady($content_terms_of_use_entry->id) ?>"> - <?= Icon::create('radiobutton-unchecked')->asSvg(['class' => 'arrow']) ?> - <?= Icon::create('radiobutton-checked')->asSvg(['class' => 'check']) ?> + <?= Icon::create('radiobutton-unchecked')->asImg(['class' => 'arrow']) ?> + <?= Icon::create('radiobutton-checked')->asImg(['class' => 'check']) ?> <div class="text"> <?= htmlReady($content_terms_of_use_entry->name) ?> </div> @@ -34,7 +34,7 @@ if (!$selected_terms_of_use_id) { <? if (filter_var($content_terms_of_use_entry['icon'], FILTER_VALIDATE_URL)): ?> <img src="<?= htmlReady($content_terms_of_use_entry['icon']) ?>" width="32" height="32"> <? else : ?> - <?= Icon::create($content_terms_of_use_entry['icon'])->asSvg(Icon::SIZE_LARGE) ?> + <?= Icon::create($content_terms_of_use_entry['icon'])->asImg(Icon::SIZE_LARGE) ?> <? endif ?> <? endif ?> </div> diff --git a/app/views/file/add_files_window.php b/app/views/file/add_files_window.php index bdde120..8b963e7 100644 --- a/app/views/file/add_files_window.php +++ b/app/views/file/add_files_window.php @@ -23,7 +23,7 @@ if ($folder_id) { <a class="important-item" data-dialog="size=medium-43" href="<?= $controller->link_for('file/add_from_library/' . $folder_id)?>"> <div class="icon"> - <?= Icon::create('literature')->asSvg(50) ?> + <?= Icon::create('literature')->asImg(50) ?> <div><?= _('Bibliothek') ?></div> </div> <div class="description"> @@ -35,29 +35,29 @@ if ($folder_id) { <? endif ?> <div> <a href="#" onclick="jQuery('.file_selector input[type=file]').first().click(); return false;"> - <?= Icon::create('computer')->asSvg(50) ?> + <?= Icon::create('computer')->asImg(50) ?> <?= _('Mein Computer') ?> </a> <a href="<?= $controller->link_for('file/add_url/' . $folder_id, array_merge($options, ['from_plugin' => ""])) ?>" data-dialog="size=medium"> - <?= Icon::create('globe')->asSvg(50) ?> + <?= Icon::create('globe')->asImg(50) ?> <?= _('Webadresse') ?> </a> <a href="<?= $controller->link_for('file/choose_file/' . Folder::findTopFolder($GLOBALS['user']->id)->getId(), array_merge($options, ['from_plugin' => ""])) ?>" data-dialog> - <?= Icon::create('files')->asSvg(50) ?> + <?= Icon::create('files')->asImg(50) ?> <?= _('Persönlicher Dateibereich') ?> </a> <a href="<?= $controller->link_for('file/choose_file_from_course/' . $folder_id, array_merge($options, ['from_plugin' => ""])) ?>" data-dialog> - <?= Icon::create('seminar')->asSvg(50) ?> + <?= Icon::create('seminar')->asImg(50) ?> <?= _('Meine Veranstaltungen') ?> </a> <? if ($range instanceof Course && $GLOBALS['perm']->have_studip_perm('tutor', $range->id) && $show_library_functions) : ?> <a href="<?= $controller->link_for('library_file/select_type/' . $folder_id) ?>" data-dialog="size=auto"> - <?= Icon::create('literature')->asSvg(50) ?> + <?= Icon::create('literature')->asImg(50) ?> <?= _('Literatur') ?> </a> <? if ($GLOBALS['LIBRARY_CATALOGS'] && !$range->getSemClass()['studygroup_mode'] && !$library_search_description) : ?> <a href="<?= $controller->link_for('file/add_from_library/' . $folder_id) ?>" data-dialog="size=medium-43"> - <?= Icon::create('literature')->asSvg(50) ?> + <?= Icon::create('literature')->asImg(50) ?> <?= _('Originaldokument aus Bibliothek') ?> </a> <? endif ?> @@ -65,7 +65,7 @@ if ($folder_id) { <? if (Config::get()->OERCAMPUS_ENABLED && $GLOBALS['perm']->have_perm(Config::get()->OERCAMPUS_PUBLIC_STATUS)) : ?> <a href="<?= $controller->link_for('oer/addfile/choose_file', array_merge($options, ['from_plugin' => ""])) ?>" data-dialog="size=800x800"> - <?= Icon::create('oer-campus')->asSvg(50) ?> + <?= Icon::create('oer-campus')->asImg(50) ?> <?= _('OER Campus') ?> </a> <? endif ?> @@ -74,7 +74,7 @@ if ($folder_id) { <? $nav = $plugin->getFileSelectNavigation() ?> <? if ($nav): ?> <a href="<?= $controller->link_for('file/choose_file/', array_merge($options, ['from_plugin' => get_class($plugin)])) ?>" data-dialog> - <?= $nav->getImage()->asSvg(50) ?> + <?= $nav->getImage()->asImg(50) ?> <?= htmlReady($nav->getTitle()) ?> </a> <? endif; ?> diff --git a/app/views/file/add_from_library.php b/app/views/file/add_from_library.php index 5a8b396..8be6484 100644 --- a/app/views/file/add_from_library.php +++ b/app/views/file/add_from_library.php @@ -86,9 +86,9 @@ <label for="result_<?= htmlReady($result_id) ?>"> <section class="contentbox"> <header> - <span class="title no-overflow"><?= $result->getIcon()->asSvg() ?> <?= $result->getTitle('long-comma') ?></span> + <span class="title no-overflow"><?= $result->getIcon() ?> <?= $result->getTitle('long-comma') ?></span> <nav> - <?= Icon::create('accept', 'status-green')->asSvg( + <?= Icon::create('accept', 'status-green')->asImg( 20, ['class' => 'hidden-checkbox-checked-icon'] ) ?> @@ -156,7 +156,7 @@ <? endif ?> <? if (!empty($library_plugins)) : ?> <section class="big-help-box"> - <?= Icon::create('support')->asSvg(96, ['class' => 'icon']) ?> + <?= Icon::create('support')->asImg(96, ['class' => 'icon']) ?> <div class="text"> <strong><?= _('Passendes Dokument nicht gefunden?') ?></strong> <p><?= _('Gerne unterstützen wir Sie bei der Suche nach Dokumenten.') ?></p> diff --git a/app/views/file/choose_file.php b/app/views/file/choose_file.php index 83f4b54..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')) { <div style="text-align: center; margin-bottom: 20px;"> <?= _('Kopieren nach') ?> - <?= Icon::create('folder-full', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('folder-full', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($to_folder_name) ?> </div> @@ -95,9 +95,9 @@ if (Request::get('to_folder_id')) { <a href="<?= $controller->link_for('file/choose_file/' . $subfolder->id, $options) ?>" data-dialog> <? endif ?> <? if (!empty($is_empty)): ?> - <?= Icon::create('folder-empty')->asSvg(24) ?> + <?= Icon::create('folder-empty')->asImg(24) ?> <? else: ?> - <?= Icon::create('folder-full')->asSvg(24) ?> + <?= Icon::create('folder-full')->asImg(24) ?> <? endif; ?> <? if ($subfolder->isReadable($GLOBALS['user']->id)) : ?> </a> @@ -128,11 +128,11 @@ if (Request::get('to_folder_id')) { <form action="<?= $controller->link_for('file/choose_file/' . $top_folder->id, $options) ?>" method="post" data-dialog> <input type="hidden" name="file_id" value="<?= htmlReady($file->getId()) ?>"> <a href="#" onclick="jQuery(this).closest('form').submit(); return false;"> - <?= FileManager::getIconForMimeType($file->getMimetype())->asSvg(24) ?> + <?= FileManager::getIconForMimeType($file->getMimetype())->asImg(24) ?> </a> </form> <? else: ?> - <?= FileManager::getIconForMimeType($file->getMimetype(), Icon::ROLE_INACTIVE)->asSvg(24) ?> + <?= FileManager::getIconForMimeType($file->getMimetype(), Icon::ROLE_INACTIVE)->asImg(24) ?> <? endif ?> </td> <td> diff --git a/app/views/file/choose_file_from_course.php b/app/views/file/choose_file_from_course.php index 9fb4378..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')) { </td> <td class="actions"> <a href="<?= $controller->link_for('file/choose_file_from_course/' . $folder_id, array_merge($options, ['course_id' => $course->id])) ?>" data-dialog> - <?= Icon::create('folder-full')->asSvg(30) ?> + <?= Icon::create('folder-full')->asImg(30) ?> </a> </td> </tr> diff --git a/app/views/file/choose_folder.php b/app/views/file/choose_folder.php index 1f9daa2..955aa8f 100644 --- a/app/views/file/choose_folder.php +++ b/app/views/file/choose_folder.php @@ -23,7 +23,7 @@ $buttonLabels = [ <div style="text-align: center; margin-bottom: 20px;"> <?= $headings[$options['copymode']] ?> - <?= Icon::create('folder-full', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('folder-full', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($top_folder_name) ?> </div> @@ -104,9 +104,9 @@ $buttonLabels = [ <!-- neu --> <button formaction="<?= $controller->action_link('choose_folder/' . $subfolder->getId()) ?>" class="undecorated" data-dialog> <? if ($subfolder->is_empty): ?> - <?= Icon::create('folder-empty')->asSvg(24) ?> + <?= Icon::create('folder-empty')->asImg(24) ?> <? else: ?> - <?= Icon::create('folder-full')->asSvg(24) ?> + <?= Icon::create('folder-full')->asImg(24) ?> <? endif; ?> </button> </td> @@ -127,9 +127,9 @@ $buttonLabels = [ <tr> <td class="document-icon" data-sort-value="0"> <? if ($subfolder->is_empty): ?> - <?= Icon::create('folder-empty', Icon::ROLE_INACTIVE)->asSvg(24) ?> + <?= Icon::create('folder-empty', Icon::ROLE_INACTIVE)->asImg(24) ?> <? else: ?> - <?= Icon::create('folder-full', Icon::ROLE_INACTIVE)->asSvg(24) ?> + <?= Icon::create('folder-full', Icon::ROLE_INACTIVE)->asImg(24) ?> <? endif ?> </td> <td> diff --git a/app/views/file/new_edit_folder_form.php b/app/views/file/new_edit_folder_form.php index a563ea6..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-<?= htmlReady($folder_type['class']) ?>" <? if ($folder_type['class'] === get_class($folder)) echo 'checked'; ?>> <label for="folder-type-<?= htmlReady($folder_type['class']) ?>"> - <?= Icon::create('radiobutton-unchecked')->asSvg(['class' => 'arrow']) ?> - <?= Icon::create('radiobutton-checked')->asSvg(['class' => 'check']) ?> + <?= Icon::create('radiobutton-unchecked')->asImg(['class' => 'arrow']) ?> + <?= Icon::create('radiobutton-checked')->asImg(['class' => 'check']) ?> <div class="text"> <?= htmlReady($folder_type['name']) ?> <? if ($template = $folder_type['instance']->getDescriptionTemplate()): ?> @@ -37,7 +37,7 @@ </div> <div class="icon"> <? if ($folder_type['icon']) : ?> - <?= $folder_type['icon']->asSvg(32) ?> + <?= $folder_type['icon']->asImg(32) ?> <? endif ?> </div> </label> diff --git a/app/views/file/oer_post_upload.php b/app/views/file/oer_post_upload.php index bbd23db..30b8926 100644 --- a/app/views/file/oer_post_upload.php +++ b/app/views/file/oer_post_upload.php @@ -17,13 +17,13 @@ if (!isset($selected_oer_upload)) { <? if (0 == $selected_oer_upload) echo 'checked'; ?>> <label for="oer-upload-no"> <div class="icon"> - <?= Icon::create('decline')->asSvg(32) ?> + <?= Icon::create('decline')->asImg(32) ?> </div> <div class="text"> <?= _('Nicht für den OER-Campus bereitstellen.') ?> </div> - <?= Icon::create('arr_1down')->asSvg(24, ['class' => 'arrow']) ?> - <?= Icon::create('check-circle')->asSvg(32, ['class' => 'check']) ?> + <?= Icon::create('arr_1down')->asImg(24, ['class' => 'arrow']) ?> + <?= Icon::create('check-circle')->asImg(32, ['class' => 'check']) ?> </label> <div class="oer_upload_description"> <div class="description"> @@ -36,13 +36,13 @@ if (!isset($selected_oer_upload)) { <? if (1 == $selected_oer_upload) echo 'checked'; ?>> <label for="oer-upload-yes"> <div class="icon"> - <?= Icon::create('accept')->asSvg(32) ?> + <?= Icon::create('accept')->asImg(32) ?> </div> <div class="text"> <?= _('Jetzt für den OER-Campus bereitstellen.') ?> </div> - <?= Icon::create('arr_1down')->asSvg(24, ['class' => 'arrow']) ?> - <?= Icon::create('check-circle')->asSvg(32, ['class' => 'check']) ?> + <?= Icon::create('arr_1down')->asImg(24, ['class' => 'arrow']) ?> + <?= Icon::create('check-circle')->asImg(32, ['class' => 'check']) ?> </label> <div class="oer_upload_description"> <div class="description"> @@ -54,13 +54,13 @@ if (!isset($selected_oer_upload)) { <? if (2 == $selected_oer_upload) echo 'checked'; ?>> <label for="oer-upload-later"> <div class="icon"> - <?= Icon::create('date')->asSvg(32) ?> + <?= Icon::create('date')->asImg(32) ?> </div> <div class="text"> <?= _('Zu einem späteren Zeitpunkt für den OER-Campus bereitstellen.') ?> </div> - <?= Icon::create('arr_1down')->asSvg(24, ['class' => 'arrow']) ?> - <?= Icon::create('check-circle')->asSvg(32, ['class' => 'check']) ?> + <?= Icon::create('arr_1down')->asImg(24, ['class' => 'arrow']) ?> + <?= Icon::create('check-circle')->asImg(32, ['class' => 'check']) ?> </label> <div class="oer_upload_description"> <div class="description"> diff --git a/app/views/file/suggest_oer.php b/app/views/file/suggest_oer.php index 39d5892..78e9018 100644 --- a/app/views/file/suggest_oer.php +++ b/app/views/file/suggest_oer.php @@ -36,7 +36,7 @@ </h1> </header> <div id="oer_preview_image"> - <?= Icon::create($icon_shape)->asSvg(160) ?> + <?= Icon::create($icon_shape)->asImg(160) ?> </div> </article> </label> diff --git a/app/views/file/unzipquestion.php b/app/views/file/unzipquestion.php index c3b82d1..361ae63 100644 --- a/app/views/file/unzipquestion.php +++ b/app/views/file/unzipquestion.php @@ -4,7 +4,7 @@ <input type="hidden" name="file_refs[]" value="<?= htmlReady($file->getId()) ?>"> <? endforeach ?> - <?= Icon::create('unit-test', Icon::ROLE_INACTIVE)->asSvg(120, ['style' => 'display: block; margin-left: auto; margin-right: auto;']) ?> + <?= Icon::create('unit-test', Icon::ROLE_INACTIVE)->asImg(120, ['style' => 'display: block; margin-left: auto; margin-right: auto;']) ?> <?= _('Soll diese ZIP-Datei entpackt werden?') ?> diff --git a/app/views/file/upload_window.php b/app/views/file/upload_window.php index d5b368f..5c2bc2e 100644 --- a/app/views/file/upload_window.php +++ b/app/views/file/upload_window.php @@ -6,11 +6,11 @@ <ul class="filenames clean"></ul> <div class="uploadbar uploadbar-outer"> <div class="uploadbar uploadbar-inner"> - <?= Icon::create('upload', Icon::ROLE_INFO_ALT)->asSvg(30) ?> - <?= Icon::create('ufo', Icon::ROLE_INFO_ALT)->asSvg(30, ['class' => 'ufo']) ?> + <?= Icon::create('upload', Icon::ROLE_INFO_ALT)->asImg(30) ?> + <?= Icon::create('ufo', Icon::ROLE_INFO_ALT)->asImg(30, ['class' => 'ufo']) ?> </div> - <?= Icon::create('upload')->asSvg(30) ?> + <?= Icon::create('upload')->asImg(30) ?> <span class="upload-progress"></span> </div> diff --git a/app/views/files/_fileref_tr.php b/app/views/files/_fileref_tr.php index a7c1156..57c4350 100644 --- a/app/views/files/_fileref_tr.php +++ b/app/views/files/_fileref_tr.php @@ -24,10 +24,10 @@ if ($file->isDownloadable($GLOBALS['user']->id)) { <td class="file-icon" data-sort-value="<?= crc32($file->getMimeType()) ?>"> <? if ($file->isDownloadable($GLOBALS['user']->id)) : ?> <a href="<?= htmlReady($file->getDownloadURL()) ?>" target="_blank" rel="noopener noreferrer"> - <?= $file->getIcon(Icon::ROLE_CLICKABLE)->asSvg(24) ?> + <?= $file->getIcon(Icon::ROLE_CLICKABLE)->asImg(24) ?> </a> <? else : ?> - <?= $file->getIcon(Icon::ROLE_INACTIVE)->asSvg(24, ['class' => 'icon-inactive']) ?> + <?= $file->getIcon(Icon::ROLE_INACTIVE)->asImg(24, ['class' => 'icon-inactive']) ?> <? endif ?> </td> <td data-sort-value="<?= htmlReady($file->getFilename()) ?>"> @@ -41,7 +41,7 @@ if ($file->isDownloadable($GLOBALS['user']->id)) { <?php $terms = $file->getTermsOfUse() ?> <? if ($terms && !empty($topFolder) && !$terms->isDownloadable($topFolder->range_id, $topFolder->range_type, false)) : ?> - <?= Icon::create('lock-locked', Icon::ROLE_INFO)->asSvg(['title' => _('Das Herunterladen dieser Datei ist nur eingeschränkt möglich.')]) ?> + <?= Icon::create('lock-locked', Icon::ROLE_INFO)->asImg(['title' => _('Das Herunterladen dieser Datei ist nur eingeschränkt möglich.')]) ?> <? endif ?> </td> <? $size = $file->getSize() ?> diff --git a/app/views/files/configure.php b/app/views/files/configure.php index d4d50c7..5ab6eea 100644 --- a/app/views/files/configure.php +++ b/app/views/files/configure.php @@ -1,7 +1,7 @@ <div class="file_select_possibilities"> <? foreach ($configure_urls as $url) : ?> <a href="<?= htmlReady($url['url']) ?>" data-dialog> - <?= $url['icon']->asSvg(50) ?> + <?= $url['icon']->asImg(50) ?> <?= htmlReady($url['name']) ?> </a> <? endforeach ?> diff --git a/app/views/files_dashboard/_input-group-search.php b/app/views/files_dashboard/_input-group-search.php index df65ddf..402c62d 100644 --- a/app/views/files_dashboard/_input-group-search.php +++ b/app/views/files_dashboard/_input-group-search.php @@ -10,7 +10,7 @@ <span class="input-group-append"> <button type="submit" class="button"> - <?= Icon::create('search')->asSvg(['title' => _('Suche starten')]) ?> + <?= Icon::create('search')->asImg(['title' => _('Suche starten')]) ?> </button> <? if (!empty($query)) : ?> diff --git a/app/views/files_dashboard/_search_tr.php b/app/views/files_dashboard/_search_tr.php index 6048261..607de71 100644 --- a/app/views/files_dashboard/_search_tr.php +++ b/app/views/files_dashboard/_search_tr.php @@ -3,10 +3,10 @@ <td class="files-search-icon"> <? if ($searchResult['folder']->isFileDownloadable($searchResult['fileRef'], $user->id)) : ?> <a href="<?= htmlReady($searchResult['fileRef']->getDownloadURL('force_download')) ?>" target="_blank" rel="noopener noreferrer"> - <?= FileManager::getIconForFileRef($searchResult['fileRef'])->asSvg(24) ?> + <?= FileManager::getIconForFileRef($searchResult['fileRef'])->asImg(24) ?> </a> <? else : ?> - <?= FileManager::getIconForFileRef($searchResult['fileRef'], Icon::ROLE_INACTIVE)->asSvg(24) ?> + <?= FileManager::getIconForFileRef($searchResult['fileRef'], Icon::ROLE_INACTIVE)->asImg(24) ?> <? endif ?> </td> @@ -21,7 +21,7 @@ <? if ($searchResult['fileRef']->terms_of_use && $searchResult['fileRef']->terms_of_use->download_condition > 0) : ?> - <?= Icon::create('lock-locked', Icon::ROLE_INACTIVE)->asSvg([ + <?= Icon::create('lock-locked', Icon::ROLE_INACTIVE)->asImg([ 'class' => 'text-top', 'title' => _('Das Herunterladen dieser Datei ist nur eingeschränkt möglich.')]) ?> <? endif; ?> @@ -35,7 +35,7 @@ <? if ($searchResult['fileRef']->terms_of_use && $searchResult['fileRef']->terms_of_use->download_condition > 0) : ?> - <?= Icon::create('lock-locked', Icon::ROLE_INFO)->asSvg([ + <?= Icon::create('lock-locked', Icon::ROLE_INFO)->asImg([ 'class' => 'text-top', 'title' => _('Das Herunterladen dieser Datei ist nur eingeschränkt möglich.')]) ?> <? endif; ?> diff --git a/app/views/help_content/admin_overview.php b/app/views/help_content/admin_overview.php index fd6e9b8..05cf2e1 100644 --- a/app/views/help_content/admin_overview.php +++ b/app/views/help_content/admin_overview.php @@ -52,10 +52,10 @@ <td class="actions"> <a href="<?= URLHelper::getURL('dispatch.php/help_content/edit/' . $help_content_id) ?>" <?= tooltip(_('Hilfe-Text bearbeiten')) ?> data-dialog="size=auto;reload-on-close"> - <?= Icon::create('edit', 'clickable')->asSvg() ?></a> + <?= Icon::create('edit', 'clickable')->asImg() ?></a> <a href="<?= URLHelper::getURL('dispatch.php/help_content/delete/' . $help_content_id) ?>" <?= tooltip(_('Hilfe-Text löschen')) ?> data-dialog="size=auto;reload-on-close"> - <?= Icon::create('trash', 'clickable')->asSvg() ?></a> + <?= Icon::create('trash', 'clickable')->asImg() ?></a> </td> </tr> <? endforeach ?> diff --git a/app/views/institute/extern/new.php b/app/views/institute/extern/new.php index 356831a..34736a9 100644 --- a/app/views/institute/extern/new.php +++ b/app/views/institute/extern/new.php @@ -10,7 +10,7 @@ <li class="content-item"> <a class="content-item-link" href="<?= $controller->edit($type_id) ?>"> <div class="content-item-img-wrapper"> - <?= Icon::create($config_type['icon'])->asSvg(64) ?> + <?= Icon::create($config_type['icon'])->asImg(64) ?> </div> <div class="content-item-text"> <p class="content-item-title"> diff --git a/app/views/login/index.php b/app/views/login/index.php index 2488440..96931e6 100644 --- a/app/views/login/index.php +++ b/app/views/login/index.php @@ -94,10 +94,10 @@ $enable_news = count($news_entries) > 0; <? if ($enable_faq && $enable_news): ?> <div id="login-infobox-button-wrapper"> <button id="hide-faq" class="selected" title="<?= _('Ankündigungen anzeigen') ?>"> - <?= Icon::create('news')->asSvg(24, ['style' => 'align-self: end;']) ?> + <?= Icon::create('news')->asImg(24, ['style' => 'align-self: end;']) ?> </button> <button id="show-faq" title="<?= _('Hinweise zum Login anzeigen')?>"> - <?= Icon::create('faq')->asSvg(24, ['style' => 'align-self: end;']) ?> + <?= Icon::create('faq')->asImg(24, ['style' => 'align-self: end;']) ?> </button> </div> diff --git a/app/views/lti/_link_user_info.php b/app/views/lti/_link_user_info.php index 0bdafc4..568aaf8 100644 --- a/app/views/lti/_link_user_info.php +++ b/app/views/lti/_link_user_info.php @@ -26,13 +26,13 @@ <p> <? if ($link->deployment->tool->terms_of_use_url) : ?> <a href="<?= htmlReady($link->deployment->tool->terms_of_use_url) ?>"> - <?= Icon::create('link-extern')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('link-extern')->asImg(['class' => 'text-bottom']) ?> <?= _('Nutzungsbedingungen') ?> </a> <? endif ?> <? if ($link->deployment->tool->privacy_policy_url) : ?> <a href="<?= htmlReady($link->deployment->tool->privacy_policy_url) ?>"> - <?= Icon::create('link-extern')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('link-extern')->asImg(['class' => 'text-bottom']) ?> <?= _('Datenschutzerklärung') ?> </a> <? endif ?> diff --git a/app/views/lti/_tool_info.php b/app/views/lti/_tool_info.php index d4248fa..fb9657e 100644 --- a/app/views/lti/_tool_info.php +++ b/app/views/lti/_tool_info.php @@ -19,12 +19,12 @@ <dd> <? if ($link && $link->launch_url) : ?> <a href="<?= htmlReady($link->launch_url) ?>"> - <?= Icon::create('link-extern')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('link-extern')->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($link->launch_url) ?> </a> <? else : ?> <a href="<?= htmlReady($tool->launch_url) ?>"> - <?= Icon::create('link-extern')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('link-extern')->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($tool->launch_url) ?> </a> <? endif ?> @@ -69,7 +69,7 @@ <ul> <li> <a href="<?= $controller->link_for('course/lti/iframe', $link->id) ?>"> - <?= Icon::create('link-extern')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('link-extern')->asImg(['class' => 'text-bottom']) ?> <?= $controller->link_for('course/lti/iframe', $link->id) ?> </a> </li> diff --git a/app/views/lvgruppen/lvgruppen/details.php b/app/views/lvgruppen/lvgruppen/details.php index d42b689..56b34d4 100644 --- a/app/views/lvgruppen/lvgruppen/details.php +++ b/app/views/lvgruppen/lvgruppen/details.php @@ -66,11 +66,11 @@ <span style="margin-left: 20%" onClick="jQuery('#mvv-lvgruppen-semester').find('.mvv-sem-hidden').slideToggle(); jQuery(this).find('span').toggle(); return false;"> <a href="<?= $controller->action_link('details/' . $lvgruppe->id, ['all_sem' => 1]) ?>"> <span> - <?= Icon::create('arr_1up', Icon::ROLE_CLICKABLE, ['style' => 'vertical-align:text-bottom;'])->asSvg(); ?> + <?= Icon::create('arr_1up', Icon::ROLE_CLICKABLE, ['style' => 'vertical-align:text-bottom;'])->asImg(); ?> <?= _('Alle Semester anzeigen') ?> </span> <span style="display: none;"> - <?= Icon::create('arr_1down', Icon::ROLE_CLICKABLE, ['style' => 'vertical-align:text-bottom;'])->asSvg(); ?> + <?= Icon::create('arr_1down', Icon::ROLE_CLICKABLE, ['style' => 'vertical-align:text-bottom;'])->asImg(); ?> <?= _('Nur aktuelle Semester anzeigen') ?> </span> </a> diff --git a/app/views/materialien/files/add_dokument.php b/app/views/materialien/files/add_dokument.php index bf92e2e..659adb5 100644 --- a/app/views/materialien/files/add_dokument.php +++ b/app/views/materialien/files/add_dokument.php @@ -37,7 +37,7 @@ <td> <div class="attachments" style="<?= (empty($documents) || !array_key_exists($key, $documents)) ? '' : 'display: none;'?>"> <span style="cursor:pointer;" onClick="$('#fileselector_<?= $language_key; ?>').toggle();$(this).toggle();"> - <?= Icon::create('add')->asSvg(['title' => _('Datei hinzufügen'), 'class' => 'text-bottom']); ?> + <?= Icon::create('add')->asImg(['title' => _('Datei hinzufügen'), 'class' => 'text-bottom']); ?> <?= _('Datei hinzufügen') ?> </span> <div id="fileselector_<?= $language_key; ?>" style="display:none;"> @@ -48,13 +48,13 @@ <span class="name"></span> <span class="size"></span> <button class="refresh_attachment as-link" data-language="<?= htmlReady($language_key) ?>"> - <?= Icon::create('refresh')->asSvg([ + <?= Icon::create('refresh')->asImg([ 'class' => 'text-bottom', 'title' => _('Datei aktualisieren'), ]) ?> </button> <button class="remove_attachment as-link"> - <?= Icon::create('trash')->asSvg([ + <?= Icon::create('trash')->asImg([ 'class' => 'text-bottom', 'title' => _('Datei löschen'), ]) ?> @@ -69,7 +69,7 @@ </div> <label id="upload_chooser" style="cursor: pointer;"> <input type="file" id="fileupload" multiple onChange="STUDIP.MVV.Document.upload_from_input(this, '<?= $language_key; ?>');" style="display: none;"> - <?= Icon::create('upload')->asSvg(['title' => _('Datei hochladen'), 'class' => 'text-bottom']) ?> + <?= Icon::create('upload')->asImg(['title' => _('Datei hochladen'), 'class' => 'text-bottom']) ?> <?= _('Datei hochladen') ?> </label> <br> @@ -91,13 +91,13 @@ <span class="name"><?= htmlReady($documents[$language_key]->filename) ?></span> <span class="size"><?= relsize($documents[$language_key]->file_ref->size) ?></span> <button class="refresh_attachment as-link" data-language="<?= htmlReady($language_key) ?>"> - <?= Icon::create('refresh')->asSvg([ + <?= Icon::create('refresh')->asImg([ 'class' => 'text-bottom', 'title' => _('Datei aktualisieren'), ]) ?> </button> <button class="remove_attachment as-link"> - <?= Icon::create('trash')->asSvg([ + <?= Icon::create('trash')->asImg([ 'class' => 'text-bottom', 'title' => _('Datei löschen'), ]) ?> diff --git a/app/views/materialien/files/index.php b/app/views/materialien/files/index.php index 60f713f..ae26c71 100644 --- a/app/views/materialien/files/index.php +++ b/app/views/materialien/files/index.php @@ -31,7 +31,7 @@ <td class="dont-hide"> <? if ($mvv_file->getFiletypes()[0] === 'Link'): ?> <a href="<?= htmlReady($mvv_file->file_refs[0]->file_ref->file->metadata['url']); ?>" target="_blank"> - <?= Icon::create('link-extern')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('link-extern')->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($mvv_file->getFilenames()[0]); ?> </a> <? else: ?> @@ -42,7 +42,7 @@ <?= Icon::create( $mvv_file->extern_visible?'visibility-visible':'visibility-invisible', Icon::ROLE_INFO - )->asSvg([ + )->asImg([ 'class' => 'text-bottom', 'title' => $mvv_file->extern_visible ? _('Sichtbar') : _('Unsichtbar') ]) ?> diff --git a/app/views/messages/_message_row.php b/app/views/messages/_message_row.php index 4e2f019..a481aa3 100644 --- a/app/views/messages/_message_row.php +++ b/app/views/messages/_message_row.php @@ -9,8 +9,8 @@ <a href="<?= URLHelper::getLink('dispatch.php/messages/read/' . $message->getId() .'/' . ($received ? 'rec' : 'snd') ) ?>" data-dialog> <?= trim($message['subject']) ? htmlReady($message['subject']) : htmlReady(mila(kill_format($message['message']), 40)) ?> <div class="message-indicators"> - <span><?= $message->getNumAttachments() ? Icon::create('staple', Icon::ROLE_INFO)->asSvg(['title' => _('Mit Anhang')]) : '' ?></span> - <span><?= $message->isAnswered($GLOBALS['user']->id) ? Icon::create('outbox', Icon::ROLE_INFO)->asSvg(['title' => _('Beantwortet')]) : '' ?></span> + <span><?= $message->getNumAttachments() ? Icon::create('staple', Icon::ROLE_INFO)->asImg(['title' => _('Mit Anhang')]) : '' ?></span> + <span><?= $message->isAnswered($GLOBALS['user']->id) ? Icon::create('outbox', Icon::ROLE_INFO)->asImg(['title' => _('Beantwortet')]) : '' ?></span> </div> </a> <p class="hidden-medium-up responsive_author"> diff --git a/app/views/messages/overview.php b/app/views/messages/overview.php index 5e9bd17..989acbe 100644 --- a/app/views/messages/overview.php +++ b/app/views/messages/overview.php @@ -45,11 +45,11 @@ <tr> <td colspan="8"> <? if (Request::int("offset") > 0) : ?> - <a title="<?= _('Zurück') ?>" href="<?= URLHelper::getLink('?', ['offset' => Request::int('offset') - $messageBufferCount > 0 ? Request::int('offset') - $messageBufferCount : null]) ?>"><?= Icon::create('arr_1left', 'clickable')->asSvg(['class' => 'text-bottom']) ?></a> + <a title="<?= _('Zurück') ?>" href="<?= URLHelper::getLink('?', ['offset' => Request::int('offset') - $messageBufferCount > 0 ? Request::int('offset') - $messageBufferCount : null]) ?>"><?= Icon::create('arr_1left', 'clickable')->asImg(['class' => 'text-bottom']) ?></a> <? endif ?> <? if (!empty($more)) : ?> <div style="float:right"> - <a title="<?= _("weiter") ?>" href="<?= URLHelper::getLink("?", ['offset' => Request::int("offset") + $messageBufferCount]) ?>"><?= Icon::create('arr_1right', 'clickable')->asSvg(["class" => "text-bottom"]) ?></a> + <a title="<?= _("weiter") ?>" href="<?= URLHelper::getLink("?", ['offset' => Request::int("offset") + $messageBufferCount]) ?>"><?= Icon::create('arr_1right', 'clickable')->asImg(["class" => "text-bottom"]) ?></a> </div> <? endif ?> </td> @@ -64,11 +64,11 @@ <tr> <td colspan="7"> <? if (Request::int("offset") > 0) : ?> - <a title="<?= _('Zurück') ?>" href="<?= URLHelper::getLink('?', ['offset' => Request::int('offset') - $messageBufferCount > 0 ? Request::int('offset') - $messageBufferCount : null]) ?>"><?= Icon::create('arr_1left', 'clickable')->asSvg(['class' => 'text-bottom']) ?></a> + <a title="<?= _('Zurück') ?>" href="<?= URLHelper::getLink('?', ['offset' => Request::int('offset') - $messageBufferCount > 0 ? Request::int('offset') - $messageBufferCount : null]) ?>"><?= Icon::create('arr_1left', 'clickable')->asImg(['class' => 'text-bottom']) ?></a> <? endif ?> <? if (!empty($more)) : ?> <div style="float:right"> - <a title="<?= _('Weiter') ?>" href="<?= URLHelper::getLink('?', ['offset' => Request::int('offset') + $messageBufferCount]) ?>"><?= Icon::create('arr_1right', 'clickable')->asSvg(['class' => 'text-bottom']) ?></a> + <a title="<?= _('Weiter') ?>" href="<?= URLHelper::getLink('?', ['offset' => Request::int('offset') + $messageBufferCount]) ?>"><?= Icon::create('arr_1right', 'clickable')->asImg(['class' => 'text-bottom']) ?></a> </div> <? endif ?> </td> @@ -90,7 +90,7 @@ <div style="display: none; background-color: rgba(255,255,255, 0.3); padding: 3px; border-radius: 5px; border: thin solid black;" id="move_handle"> - <?= Icon::create('mail')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('mail')->asImg(['class' => 'text-bottom']) ?> <span class="title"></span> </div> diff --git a/app/views/messages/write.php b/app/views/messages/write.php index f63b3c4..58ff6c0 100644 --- a/app/views/messages/write.php +++ b/app/views/messages/write.php @@ -8,7 +8,7 @@ class="validation_notes studip"> <header> <h1> - <?= Icon::create('info-circle', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom validation_notes_icon']) ?> + <?= Icon::create('info-circle', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom validation_notes_icon']) ?> <?= _('Hinweise zum Ausfüllen des Formulars') ?> </h1> </header> @@ -36,7 +36,7 @@ <li id="template_adressee" style="display: none;" class="adressee"> <input type="hidden" name="message_to[]" value=""> <span class="visual"></span> - <a class="remove_adressee"><?= Icon::create('trash', 'clickable')->asSvg(['class' => 'text-bottom']) ?></a> + <a class="remove_adressee"><?= Icon::create('trash', 'clickable')->asImg(['class' => 'text-bottom']) ?></a> </li> <? foreach ($default_message->getRecipients() as $user) : ?> <li class="adressee"> @@ -44,7 +44,7 @@ <span class="visual"> <?= htmlReady($user['fullname']) ?> </span> - <a class="remove_adressee"><?= Icon::create('trash', 'clickable')->asSvg(['class' => 'text-bottom']) ?></a> + <a class="remove_adressee"><?= Icon::create('trash', 'clickable')->asImg(['class' => 'text-bottom']) ?></a> </li> <? endforeach ?> </ul> @@ -92,7 +92,7 @@ <a href="" onClick="STUDIP.Messages.toggleSetting('attachments'); return false;" aria-expanded="false" role="button" title="<?= _('Anhänge verwalten') ?>" aria-controls="attachments" id="toggle-attachments"> - <?= Icon::create('staple')->asSvg(40) ?> + <?= Icon::create('staple')->asImg(40) ?> <br> <strong><?= _('Anhänge') ?></strong> </a> @@ -101,7 +101,7 @@ <li> <a href="" onClick="STUDIP.Messages.toggleSetting('tags'); return false;" aria-expanded="false" role="button" title="<?= _('Schlagworte verwalten') ?>" aria-controls="tags" id="toggle-tags"> - <?= Icon::create('star')->asSvg(40) ?> + <?= Icon::create('star')->asImg(40) ?> <br> <strong><?= _('Schlagworte') ?></strong> </a> @@ -109,7 +109,7 @@ <li> <a href="" onClick="STUDIP.Messages.toggleSetting('settings'); return false;" aria-expanded="false" role="button" title="<?= _('Optionen') ?>" aria-controls="settings" id="toggle-settings"> - <?= Icon::create('admin', 'clickable')->asSvg(40) ?> + <?= Icon::create('admin', 'clickable')->asImg(40) ?> <br> <strong><?= _('Optionen') ?></strong> </a> @@ -126,7 +126,7 @@ <span class="icon"></span> <span class="name"></span> <span class="size"></span> - <a class="remove_attachment"><?= Icon::create('trash', 'clickable')->asSvg(['class' => 'text-bottom']) ?></a> + <a class="remove_attachment"><?= Icon::create('trash', 'clickable')->asImg(['class' => 'text-bottom']) ?></a> </li> <? if ($default_attachments) : ?> <? foreach ($default_attachments as $a) : ?> @@ -134,7 +134,7 @@ <span class="icon"><?=$a['icon']?></span> <span class="name"><?=$a['name']?></span> <span class="size"><?=$a['size']?></span> - <a class="remove_attachment"><?= Icon::create('trash', 'clickable')->asSvg(['class' => 'text-bottom']) ?></a> + <a class="remove_attachment"><?= Icon::create('trash', 'clickable')->asImg(['class' => 'text-bottom']) ?></a> </li> <? endforeach ?> <? endif ?> @@ -147,7 +147,7 @@ </div> <label > <input type="file" id="fileupload" multiple onChange="STUDIP.Messages.upload_from_input(this);" style="display: none;"> - <?= Icon::create('upload')->asSvg(['title' => _('Datei hochladen'), 'class' => 'text-bottom']) ?> + <?= Icon::create('upload')->asImg(['title' => _('Datei hochladen'), 'class' => 'text-bottom']) ?> <?= _('Datei hochladen') ?> </label> diff --git a/app/views/module/module/modul.php b/app/views/module/module/modul.php index dc84d4e..714434a 100644 --- a/app/views/module/module/modul.php +++ b/app/views/module/module/modul.php @@ -93,7 +93,7 @@ if ($GLOBALS['MVV_MODUL']['SPRACHE']['default'] !== $display_language) { <? if ($perm->haveFieldPerm('modul_variante', MvvPerm::PERM_WRITE)) : ?> <div class="mvv-item-list-buttons"> <a href="#" - class="mvv-item-remove"><?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Entfernen')])->asSvg(); ?></a> + class="mvv-item-remove"><?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Entfernen')])->asImg(); ?></a> </div> <? endif; ?> <input type="hidden" name="modul_item" value="<?= $modul->modul_variante->id ?>"> @@ -298,7 +298,7 @@ if ($GLOBALS['MVV_MODUL']['SPRACHE']['default'] !== $display_language) { </div> <div class="mvv-item-list-buttons"> <a href="#" - class="mvv-item-remove"><?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Entfernen')])->asSvg(); ?></a> + class="mvv-item-remove"><?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Entfernen')])->asImg(); ?></a> </div> <input type="hidden" name="responsible_item" value="<?= $modul->responsible_institute->institut_id ?>"> @@ -350,7 +350,7 @@ if ($GLOBALS['MVV_MODUL']['SPRACHE']['default'] !== $display_language) { </div> <div class="mvv-item-list-buttons"> <a href="#" class="mvv-item-remove"> - <?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Einrichtung entfernen')])->asSvg(); ?> + <?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Einrichtung entfernen')])->asImg(); ?> </a> </div> <input type="hidden" name="institutes_items[]" value="<?= $assigned_institute->institut_id ?>"> @@ -394,7 +394,7 @@ if ($GLOBALS['MVV_MODUL']['SPRACHE']['default'] !== $display_language) { <li id="language_<?= $assigned_language->lang ?>" class="drag-handle sort_items"> <div class="mvv-item-list-text"><?= htmlReady($assigned_language->getDisplayName()) ?></div> <div class="mvv-item-list-buttons"> - <a href="#" class="mvv-item-remove"><?= Icon::create('trash', 'clickable', array('title' => _('Sprache entfernen')))->asSvg(); ?></a> + <a href="#" class="mvv-item-remove"><?= Icon::create('trash', 'clickable', array('title' => _('Sprache entfernen')))->asImg(); ?></a> </div> <input type="hidden" name="language_items[]" value="<?= htmlReady($assigned_language->lang) ?>"> </li> diff --git a/app/views/module/module/module.php b/app/views/module/module/module.php index 0496141..8390976 100644 --- a/app/views/module/module/module.php +++ b/app/views/module/module/module.php @@ -15,7 +15,7 @@ <? $details_action = $details_action ?? 'details'; ?> <a class="mvv-load-in-new-row" href="<?= $controller->action_link($details_action, $modul->getId()) ?>"> <? if ($ampel_icon) : ?> - <?= $ampel_icon->asSvg(['title' => $ampelstatus, 'style' => 'vertical-align: bottom;']) ?> + <?= $ampel_icon->asImg(['title' => $ampelstatus, 'style' => 'vertical-align: bottom;']) ?> <? endif; ?> <?= htmlReady($modul->code) ?> </a> @@ -37,7 +37,7 @@ <? else : ?> <td style="white-space:nowrap; font-weight: 700; padding-left: 20px;"> <? if ($ampel_icon) : ?> - <?= $ampel_icon->asSvg(['title' => $ampelstatus, 'style' => 'vertical-align: bottom;']) ?> + <?= $ampel_icon->asImg(['title' => $ampelstatus, 'style' => 'vertical-align: bottom;']) ?> <? endif; ?> <?= htmlReady($modul->code) ?> </td> diff --git a/app/views/module/module/modulteil.php b/app/views/module/module/modulteil.php index dfbb573..80d6fa3 100644 --- a/app/views/module/module/modulteil.php +++ b/app/views/module/module/modulteil.php @@ -143,7 +143,7 @@ if ($GLOBALS['MVV_MODULTEIL']['SPRACHE']['default'] != $display_language) { <div class="mvv-item-list-text"><?= htmlReady($assigned_language->getDisplayName()) ?></div> <div class="mvv-item-list-buttons"> <a href="#" class="mvv-item-remove"> - <?= Icon::create('trash', Icon::ROLE_CLICKABLE ,['title' => _('Sprache entfernen')])->asSvg(); ?> + <?= Icon::create('trash', Icon::ROLE_CLICKABLE ,['title' => _('Sprache entfernen')])->asImg(); ?> </a> </div> <input type="hidden" name="language_items[]" value="<?= $assigned_language->lang ?>"> diff --git a/app/views/multipersonsearch/js_form.php b/app/views/multipersonsearch/js_form.php index 1be3d50..f07fd92 100644 --- a/app/views/multipersonsearch/js_form.php +++ b/app/views/multipersonsearch/js_form.php @@ -11,10 +11,10 @@ <div class="search-wrapper"> <input id="<?= $name . '_searchinput'; ?>" type="text" placeholder="<?= _("Suchen"); ?>" value="" name="<?= $name . '_searchinput'; ?>" aria-label="<?= _("Suchen"); ?>" spellcheck="false"> <button id="<?= $name . '_resetsearch'; ?>" class="icon-button enter-accessible reset-search" onclick='STUDIP.MultiPersonSearch.resetSearch(); return false' title="<?= _('Suche zurücksetzen') ?>"> - <?= Icon::create('decline')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('decline')->asImg(['class' => 'text-bottom']) ?> </button> <button class="icon-button enter-accessible search" onclick='STUDIP.MultiPersonSearch.search();return false' title="<?= _('Suche starten') ?>"> - <?= Icon::create('search')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('search')->asImg(['class' => 'text-bottom']) ?> </button> </div> </label> diff --git a/app/views/my_courses/_deputy_bosses.php b/app/views/my_courses/_deputy_bosses.php index ca8392d..a1537e5 100644 --- a/app/views/my_courses/_deputy_bosses.php +++ b/app/views/my_courses/_deputy_bosses.php @@ -37,17 +37,17 @@ <td class="actions"> <? if ($boss->edit_about && $deputies_edit_about_enabled) : ?> <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => $boss->boss_username]) ?>"> - <?= Icon::create('person')->asSvg(['title' => _('Personenangaben bearbeiten')]) ?> + <?= Icon::create('person')->asImg(['title' => _('Personenangaben bearbeiten')]) ?> </a> <? endif ?> <a href="<?= URLHelper::getLink( 'dispatch.php/messages/write', ['filter' => 'send_sms_to_all', 'rec_uname' => $boss->boss_username])?>" data-dialog> - <?= Icon::create('mail')->asSvg(['title' => sprintf(_('Nachricht an %s senden'), $boss_fullname)]) ?> + <?= Icon::create('mail')->asImg(['title' => sprintf(_('Nachricht an %s senden'), $boss_fullname)]) ?> </a> <a href="<?= $controller->link_for('my_courses/delete_boss/' . $boss->range_id) ?>" data-confirm="<?= sprintf(_('Wollen Sie sich wirklich als Standardvertretung von %s austragen?'), htmlReady($boss_fullname)) ?>"> - <?= Icon::create('trash')->asSvg([ + <?= Icon::create('trash')->asImg([ 'title' => sprintf(_('Mich als Standardvertretung von %s austragen'), $boss_fullname) ]) ?> </a> diff --git a/app/views/my_courses/archive.php b/app/views/my_courses/archive.php index e86537c..57d6f7d 100644 --- a/app/views/my_courses/archive.php +++ b/app/views/my_courses/archive.php @@ -38,10 +38,10 @@ <td align="center"> <? if ($row['forumdump'] and archiv_check_perm($row['seminar_id'])) : ?> <a href="<?= URLHelper::getLink('dispatch.php/archive/forum/' . $row['seminar_id']) ?>" data-dialog> - <?= Icon::create('forum')->asSvg(['title' => _('Beiträge des Forums der Veranstaltung')]) ?> + <?= Icon::create('forum')->asImg(['title' => _('Beiträge des Forums der Veranstaltung')]) ?> </a> <? else: ?> - <?= Icon::create('forum', Icon::ROLE_INACTIVE)->asSvg(['style' => 'visibility: hidden;']) ?> + <?= Icon::create('forum', Icon::ROLE_INACTIVE)->asImg(['style' => 'visibility: hidden;']) ?> <? endif; ?> @@ -49,22 +49,22 @@ <? if(($row['archiv_file_id']) and archiv_check_perm($row['seminar_id'])): ?> <a href="<?= FileManager::getDownloadLinkForArchivedCourse($course, false) ?>"> - <?= Icon::create('file-archive')->asSvg(['title' => _('Dateisammlung der Veranstaltung herunterladen')]) ?> + <?= Icon::create('file-archive')->asImg(['title' => _('Dateisammlung der Veranstaltung herunterladen')]) ?> </a> <? elseif(($row['archiv_protected_file_id']) and archiv_check_perm($row['seminar_id'] == 'admin')): ?> <a href="<?= FileManager::getDownloadLinkForArchivedCourse($course, true) ?>"> - <?= Icon::create('file-archive')->asSvg(['title' => _('Dateisammlung der Veranstaltung herunterladen')]) ?> + <?= Icon::create('file-archive')->asImg(['title' => _('Dateisammlung der Veranstaltung herunterladen')]) ?> </a> <? else: ?> - <?= Icon::create('file-archive', Icon::ROLE_INACTIVE)->asSvg(['style' => 'visibility: hidden;']) ?> + <?= Icon::create('file-archive', Icon::ROLE_INACTIVE)->asImg(['style' => 'visibility: hidden;']) ?> <? endif; ?> <? if ($row['wikidump'] and archiv_check_perm($row['seminar_id'])) : ?> <a href="<?= URLHelper::getLink('dispatch.php/archive/wiki/' . $row['seminar_id']) ?>" data-dialog> - <?= Icon::create('wiki')->asSvg(['title' => _('Beiträge des Wikis der Veranstaltung')]) ?> + <?= Icon::create('wiki')->asImg(['title' => _('Beiträge des Wikis der Veranstaltung')]) ?> </a> <? else: ?> - <?= Icon::create('wiki', Icon::ROLE_INACTIVE)->asSvg(['style' => 'visibility: hidden;']) ?> + <?= Icon::create('wiki', Icon::ROLE_INACTIVE)->asImg(['style' => 'visibility: hidden;']) ?> <? endif; ?> </td> <td style="text-align: center"><?= $row['status'] ?></td> diff --git a/app/views/my_courses/waiting_list.php b/app/views/my_courses/waiting_list.php index 3ac47ed..819465f 100644 --- a/app/views/my_courses/waiting_list.php +++ b/app/views/my_courses/waiting_list.php @@ -75,7 +75,7 @@ href="<?= $controller->link_for('course/details/index', $wait['seminar_id']) ?>" > <? $params = tooltip2(_('Veranstaltungsdetails anzeigen')) ?> - <?= Icon::create('info-circle', Icon::ROLE_INACTIVE)->asSvg(['style' => 'cursor: pointer']) ?> + <?= Icon::create('info-circle', Icon::ROLE_INACTIVE)->asImg(['style' => 'cursor: pointer']) ?> </a> </td> <td style="text-align: center"> @@ -99,11 +99,11 @@ <td style="text-align: right"> <? if ($wait['status'] === 'accepted' && $wait['admission_binding']) : ?> <a href="<?= $controller->url_for('my_courses/decline_binding') ?>"> - <?= Icon::create('door-leave', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Die Teilnahme ist bindend. Bitte wenden Sie sich an die Lehrenden.')]) ?> + <?= Icon::create('door-leave', Icon::ROLE_INACTIVE)->asImg(['title' => _('Die Teilnahme ist bindend. Bitte wenden Sie sich an die Lehrenden.')]) ?> </a> <? else : ?> <a href="<?= $controller->link_for('my_courses/decline', $wait['seminar_id'], ['cmd' => 'suppose_to_kill_admission']) ?>"> - <?= Icon::create('door-leave', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Aus der Veranstaltung abmelden')]) ?> + <?= Icon::create('door-leave', Icon::ROLE_INACTIVE)->asImg(['title' => _('Aus der Veranstaltung abmelden')]) ?> </a> <? endif ?> </td> diff --git a/app/views/my_ilias_accounts/my_courses.php b/app/views/my_ilias_accounts/my_courses.php index cd4691d..fd06a5d 100644 --- a/app/views/my_ilias_accounts/my_courses.php +++ b/app/views/my_ilias_accounts/my_courses.php @@ -25,7 +25,7 @@ <? if (array_key_exists($ilias_index, $courses_list) && count($courses_list[$ilias_index]) > 0) : ?> <? foreach ($courses_list[$ilias_index] as $crs_id => $course) : ?> <tr> - <td><?= Icon::create('learnmodule', Icon::ROLE_INFO)->asSvg(['title' => _('ILIAS-Kurs')]) ?></td> + <td><?= Icon::create('learnmodule', Icon::ROLE_INFO)->asImg(['title' => _('ILIAS-Kurs')]) ?></td> <td> <? if ($course['online'] || in_array($course['status'], [2, 4])) : ?> <a href="<?= URLHelper::getLink("dispatch.php/my_ilias_accounts/view_course/{$ilias_index}/{$crs_id}")?>" data-dialog=""><?= htmlReady($course['title']) ?></a> @@ -37,7 +37,7 @@ <td> <? if ($course['studip_object']) : ?> <a href="<?= URLHelper::getLink('dispatch.php/course/go', ['to' => $course['studip_object']]) ?>"> - <?= Icon::create('seminar')->asSvg(['title' => Course::find($course['studip_object'])->Name]) ?> + <?= Icon::create('seminar')->asImg(['title' => Course::find($course['studip_object'])->Name]) ?> </a> <? endif ?> </td> @@ -82,7 +82,7 @@ <? if (!empty($workgroups_list[$ilias_index])) : ?> <? foreach ($workgroups_list[$ilias_index] as $cat_id => $workgroup) : ?> <tr> - <td><?= Icon::create('community', Icon::ROLE_INFO)->asSvg(['title' => _('ILIAS-Arbeitsbereich')]) ?></td> + <td><?= Icon::create('community', Icon::ROLE_INFO)->asImg(['title' => _('ILIAS-Arbeitsbereich')]) ?></td> <td> <a href="<?= URLHelper::getLink("dispatch.php/my_ilias_accounts/view_workgroup/{$ilias_index}/{$cat_id}")?>" data-dialog=""><?= htmlReady($workgroup['title']) ?></a> </td> diff --git a/app/views/my_institutes/index.php b/app/views/my_institutes/index.php index f63c244..ad24a71 100644 --- a/app/views/my_institutes/index.php +++ b/app/views/my_institutes/index.php @@ -62,7 +62,7 @@ URLHelper::getLink('dispatch.php/institute/overview', ['auswahl' => $instid, 'redirect_to' => $nav->getURL()]) ?>" <?= $nav->hasBadgeNumber() ? 'class="badge" data-badge-number="' . intval($nav->getBadgeNumber()) . '"' : '' ?>> - <?= $nav->getImage()->asSvg($nav->getLinkAttributes()) ?> + <?= $nav->getImage()->asImg($nav->getLinkAttributes()) ?> </a> </li> <? else: ?> @@ -78,7 +78,7 @@ <td style="text-align: left; white-space: nowrap"> <? if (Config::get()->ALLOW_SELFASSIGN_INSTITUTE && $values['perms'] === 'user') : ?> <a href="<?= $controller->decline_inst($instid) ?>"> - <?= Icon::create('door-leave')->asSvg(['title' => _('Aus der Einrichtung austragen')]) ?> + <?= Icon::create('door-leave')->asImg(['title' => _('Aus der Einrichtung austragen')]) ?> </a> <? else : ?> <?= Assets::img('blank.gif', ['size' => Icon::SIZE_DEFAULT]) ?> diff --git a/app/views/my_studygroups/_course.php b/app/views/my_studygroups/_course.php index 3a854ba..0fe65d5 100644 --- a/app/views/my_studygroups/_course.php +++ b/app/views/my_studygroups/_course.php @@ -35,7 +35,7 @@ URLHelper::getLink('dispatch.php/course/go', ['to' => $group['seminar_id'], 'redirect_to' => $nav->getURL()]) ?>" <?= $nav->hasBadgeNumber() ? 'class="badge" data-badge-number="' . intval($nav->getBadgeNumber()) . '"' : '' ?>> - <?= $nav->getImage()->asSvg($nav->getLinkAttributes()) ?> + <?= $nav->getImage()->asImg($nav->getLinkAttributes()) ?> </a> </li> <? elseif (is_string($key)) : ?> @@ -56,18 +56,18 @@ <? endif ?> <? if (!empty($adminnavigation)) : ?> <a href="<?= URLHelper::getLink($adminnavigation->getURL(), ['cid' => $group['seminar_id']]) ?>"> - <?= $adminnavigation->getImage()->asSvg($adminnavigation->getLinkAttributes())?> + <?= $adminnavigation->getImage()->asImg($adminnavigation->getLinkAttributes())?> </a> <? endif ?> <? elseif (!empty($group['binding'])) : ?> <a href="<?= URLHelper::getLink('', ['to' => $group['seminar_id'], 'cmd' => 'no_kill']) ?>"> - <?= Icon::create('door-leave', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Die Teilnahme ist bindend. Bitte wenden Sie sich an die Lehrenden.')]) ?> + <?= Icon::create('door-leave', Icon::ROLE_INACTIVE)->asImg(['title' => _('Die Teilnahme ist bindend. Bitte wenden Sie sich an die Lehrenden.')]) ?> </a> <? else : ?> <a href="<?= URLHelper::getLink("dispatch.php/my_courses/decline/{$group['seminar_id']}", ['cmd' => 'suppose_to_kill']) ?>"> - <?= Icon::create('door-leave', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Aus der Studiengruppe abmelden')]) ?> + <?= Icon::create('door-leave', Icon::ROLE_INACTIVE)->asImg(['title' => _('Aus der Studiengruppe abmelden')]) ?> </a> <? endif ?> </td> diff --git a/app/views/news/display.php b/app/views/news/display.php index c8f271e..46616b5 100644 --- a/app/views/news/display.php +++ b/app/views/news/display.php @@ -2,7 +2,7 @@ <article class="studip"> <header> <h1> - <?= Icon::create('news', 'info')->asSvg() ?> + <?= Icon::create('news', 'info')->asImg() ?> <?= _('Ankündigungen') ?> </h1> @@ -10,20 +10,20 @@ <? if ($perm): ?> <a href="<?= $controller->link_for('news/edit_news/new/' . $range); ?>" data-dialog title="<?= _('Hinzufügen') ?>" aria-label="<?= _('Hinzufügen') ?>"> - <?= Icon::create('add')->asSvg() ?> + <?= Icon::create('add')->asImg() ?> </a> <? endif; ?> <? if ($perm && Config::get()->NEWS_RSS_EXPORT_ENABLE): ?> <a data-dialog="size=auto;reload-on-close" title="<?=_('RSS-Feed konfigurieren') ?>" aria-label="<?=_('RSS-Feed konfigurieren') ?>" href="<?= $controller->link_for('news/rss_config/' . $range); ?>"> - <?= Icon::create('admin')->asSvg() ?> + <?= Icon::create('admin')->asImg() ?> </a> <? endif; ?> <? if ($rss_id): ?> <a href="<?= URLHelper::getLink('rss.php', ['id' => $rss_id]) ?>" title="<?= _('RSS-Feed') ?>" aria-label="<?= _('RSS-Feed') ?>"> - <?= Icon::create('rss')->asSvg() ?> + <?= Icon::create('rss')->asImg() ?> </a> <? endif; ?> </nav> @@ -35,7 +35,7 @@ <header> <h1> <a href="<?= ContentBoxHelper::href($new->id, ['contentbox_type' => 'news']) ?>"> - <?= Icon::create('news')->asSvg() ?> + <?= Icon::create('news')->asImg() ?> <?= htmlReady($new['topic']); ?> </a> </h1> diff --git a/app/views/oer/admin/hosts.php b/app/views/oer/admin/hosts.php index be21197..8f46dc9 100644 --- a/app/views/oer/admin/hosts.php +++ b/app/views/oer/admin/hosts.php @@ -17,19 +17,19 @@ <tr id="host_<?= $host->getId() ?>" data-host_id="<?= $host->getId() ?>"> <td> <? if ($host->isMe()) : ?> - <?= Icon::create('home', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom', 'title' => _('Das ist Ihr Stud.IP')]) ?> + <?= Icon::create('home', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom', 'title' => _('Das ist Ihr Stud.IP')]) ?> <? endif ?> <?= htmlReady($host['name']) ?></td> <td> <a href="<?= htmlReady($host['url']) ?>" target="_blank"> - <?= Icon::create('link-extern')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('link-extern')->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($host['url']) ?> </a> </td> <td> <?= $host['public_key'] ? md5($host['public_key']) : "" ?> <? if (strpos($host['public_key'], "\r") !== false) : ?> - <?= Icon::create('exclaim', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'text-bottom', 'title' => _('Der Key hat ein Carriage-Return-Zeichen, weshalb der Hash des Public-Keys vermutlich vom Original-Hash abweicht.')]) ?> + <?= Icon::create('exclaim', Icon::ROLE_STATUS_RED)->asImg(['class' => 'text-bottom', 'title' => _('Der Key hat ein Carriage-Return-Zeichen, weshalb der Hash des Public-Keys vermutlich vom Original-Hash abweicht.')]) ?> <? endif ?> </td> <td class="index_server"> @@ -45,7 +45,7 @@ <?= Icon::create("checkbox-".($host['allowed_as_index_server'] ? "" : "un")."checked") ?> </a> <? else : ?> - <?= Icon::create("checkbox-unchecked", Icon::ROLE_INACTIVE)->asSvg(['title' => _('Dieser Server steht nicht als Indexserver zur Verfügung.')]) ?> + <?= Icon::create("checkbox-unchecked", Icon::ROLE_INACTIVE)->asImg(['title' => _('Dieser Server steht nicht als Indexserver zur Verfügung.')]) ?> <? endif ?> <? endif ?> </td> @@ -64,7 +64,7 @@ <? if (!$host->isMe()) : ?> <a href="<?= $controller->link_for("oer/admin/ask_for_hosts/".$host->getId()) ?>" title="<?= _('Diesen Server nach weiteren bekannten Hosts fragen.') ?>"> - <?= Icon::create('campusnavi')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('campusnavi')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> </td> diff --git a/app/views/oer/embed/_link.php b/app/views/oer/embed/_link.php index b22ab83..684a388 100644 --- a/app/views/oer/embed/_link.php +++ b/app/views/oer/embed/_link.php @@ -1,7 +1,7 @@ <div style="text-align: right;"> <a href="<?= URLHelper::getLink("dispatch.php/oer/market/details/{$id}") ?>" title="<?= htmlReady(_('Zum OER Campus wechseln')) ?>"> - <?= Icon::create('oer-campus')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('oer-campus')->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($material['name']) ?> </a> </div> diff --git a/app/views/oer/embed/standard.php b/app/views/oer/embed/standard.php index b5c7a4c..4374c37 100644 --- a/app/views/oer/embed/standard.php +++ b/app/views/oer/embed/standard.php @@ -3,6 +3,6 @@ <? else : ?> <a href="<?= htmlReady($source_url) ?>" target="_blank"> <? endif ?> - <?= Icon::create('oer-campus')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('oer-campus')->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($material['name']) ?> </a> diff --git a/app/views/oer/market/_details_file.php b/app/views/oer/market/_details_file.php index 0481793..18f0f70 100644 --- a/app/views/oer/market/_details_file.php +++ b/app/views/oer/market/_details_file.php @@ -1,7 +1,7 @@ <? if ($file['is_folder']) : ?> <? if ($name !== "__MACOSX") : ?> <li class="folder"> - <?= Icon::create('folder-full', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('folder-full', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($name) ?> <ol> <? foreach ($file['structure'] as $name => $subfile) : ?> @@ -15,7 +15,7 @@ <div class="size" style="float: right"> <?= htmlReady(number_format($file['size'] / 1024, 2)) ?> KB </div> - <?= FileManager::getFileIcon($name, Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom']) ?> + <?= FileManager::getFileIcon($name, Icon::ROLE_INFO)->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($name) ?> </li> <? endif ?> diff --git a/app/views/oer/market/_material_short.php b/app/views/oer/market/_material_short.php index ca76936..d863b6a 100644 --- a/app/views/oer/market/_material_short.php +++ b/app/views/oer/market/_material_short.php @@ -8,7 +8,7 @@ <a href="<?= $controller->link_for('oer/market/details', $material) ?>" target="_blank"> <header> <h1> - <?= $material->getIcon()->asSvg(['class' => 'text-bottom']) ?> + <?= $material->getIcon()->asImg(['class' => 'text-bottom']) ?> <div class="title"> <? if (strlen($material->name) > 50) : ?> <?= htmlReady(substr($material->name, 0, 50)) . ' ...' ?> diff --git a/app/views/oer/market/add_to_course.php b/app/views/oer/market/add_to_course.php index 79207ae..4ac30fd 100644 --- a/app/views/oer/market/add_to_course.php +++ b/app/views/oer/market/add_to_course.php @@ -35,7 +35,7 @@ <button type="submit" title="<?= _('Zur Veranstaltung hinzufügen') ?>" style="border: none; background: none; cursor: pointer;"> - <?= Icon::create('add')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('add')->asImg(['class' => 'text-bottom']) ?> </button> </form> </td> diff --git a/app/views/oer/market/add_to_course_select_class.php b/app/views/oer/market/add_to_course_select_class.php index 502548b..72c092a 100644 --- a/app/views/oer/market/add_to_course_select_class.php +++ b/app/views/oer/market/add_to_course_select_class.php @@ -10,7 +10,7 @@ <? $icon = $object->oerGetIcon() ?> <? if ($icon) : ?> - <?= $icon->asSvg(50) ?> + <?= $icon->asImg(50) ?> <? endif ?> <?= htmlReady($metadata['displayname']) ?> </a> diff --git a/app/views/oer/market/details.php b/app/views/oer/market/details.php index 67eba3a..87a1246 100644 --- a/app/views/oer/market/details.php +++ b/app/views/oer/market/details.php @@ -180,11 +180,11 @@ title="<?= $GLOBALS['perm']->have_perm("autor") ? _('Geben Sie die erste Bewertung ab.') : _('Noch keine Bewertung abgegeben.') ?>" href="<?= $controller->link_for('oer/market/review/' . $material->getId()) ?>" data-dialog> <? endif ?> - <?= Icon::create("star", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asSvg(50) ?> - <?= Icon::create("star", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asSvg(50) ?> - <?= Icon::create("star", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asSvg(50) ?> - <?= Icon::create("star", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asSvg(50) ?> - <?= Icon::create("star", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asSvg(50) ?> + <?= Icon::create("star", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asImg(50) ?> + <?= Icon::create("star", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asImg(50) ?> + <?= Icon::create("star", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asImg(50) ?> + <?= Icon::create("star", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asImg(50) ?> + <?= Icon::create("star", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INACTIVE)->asImg(50) ?> <? if ($allowed_to_review) : ?> </a> <? endif ?> @@ -194,15 +194,15 @@ <? endif ?> <? $material['rating'] = round($material['rating'], 1) / 2 ?> <? $v = $material['rating'] >= 0.75 ? "" : ($material['rating'] >= 0.25 ? "-halffull" : "-empty") ?> - <?= Icon::create("star{$v}", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO)->asSvg(50) ?> + <?= Icon::create("star{$v}", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO)->asImg(50) ?> <? $v = $material['rating'] >= 1.75 ? "" : ($material['rating'] >= 1.25 ? "-halffull" : "-empty") ?> - <?= Icon::create("star{$v}", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO)->asSvg(50) ?> + <?= Icon::create("star{$v}", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO)->asImg(50) ?> <? $v = $material['rating'] >= 2.75 ? "" : ($material['rating'] >= 2.25 ? "-halffull" : "-empty") ?> - <?= Icon::create("star{$v}", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO)->asSvg(50) ?> + <?= Icon::create("star{$v}", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO)->asImg(50) ?> <? $v = $material['rating'] >= 3.75 ? "" : ($material['rating'] >= 3.25 ? "-halffull" : "-empty") ?> - <?= Icon::create("star{$v}", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO)->asSvg(50) ?> + <?= Icon::create("star{$v}", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO)->asImg(50) ?> <? $v = $material['rating'] >= 4.75 ? "" : ($material['rating'] >= 4.25 ? "-halffull" : "-empty") ?> - <?= Icon::create("star{$v}", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO)->asSvg(50) ?> + <?= Icon::create("star{$v}", $allowed_to_review ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO)->asImg(50) ?> <? if ($allowed_to_review) : ?> </a> <? endif ?> @@ -260,12 +260,12 @@ <div class="comments center"> <? if (count($review->comments)) : ?> <a href="<?= $controller->link_for("oer/market/discussion/".$review->getId()) ?>"> - <?= Icon::create('comment')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('comment')->asImg(['class' => 'text-bottom']) ?> <?= sprintf(_('%s Kommentare dazu'), count($review->comments)) ?> </a> <? elseif ($material->isMine()) : ?> <a href="<?= $controller->link_for("oer/market/discussion/".$review->getId()) ?>"> - <?= Icon::create('comment')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('comment')->asImg(['class' => 'text-bottom']) ?> <?= _('Dazu einen Kommentar schreiben') ?> </a> <? endif ?> diff --git a/app/views/oer/market/discussion.php b/app/views/oer/market/discussion.php index 432439e..2e10c38 100644 --- a/app/views/oer/market/discussion.php +++ b/app/views/oer/market/discussion.php @@ -1,5 +1,5 @@ <a href="<?= $controller->link_for("oer/market/details/".$thread['context_id']) ?>"> - <?= Icon::create('arr_1left')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('arr_1left')->asImg(['class' => 'text-bottom']) ?> <?= _('Zurück') ?> </a> diff --git a/app/views/oer/mymaterial/_material_list.php b/app/views/oer/mymaterial/_material_list.php index 8658e6c..afb47b3 100644 --- a/app/views/oer/mymaterial/_material_list.php +++ b/app/views/oer/mymaterial/_material_list.php @@ -14,7 +14,7 @@ <tr> <td> <? if ($material->draft) : ?> - <?= Icon::create('lock-locked', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('lock-locked', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom']) ?> <? endif ?> </td> <td> @@ -24,23 +24,23 @@ </td> <td> <? if ($material->rating === null) : ?> - <?= Icon::create('star', Icon::ROLE_INFO)->asSvg($starwidth) ?> - <?= Icon::create('star', Icon::ROLE_INFO)->asSvg($starwidth) ?> - <?= Icon::create('star', Icon::ROLE_INFO)->asSvg($starwidth) ?> - <?= Icon::create('star', Icon::ROLE_INFO)->asSvg($starwidth) ?> - <?= Icon::create('star', Icon::ROLE_INFO)->asSvg($starwidth) ?> + <?= Icon::create('star', Icon::ROLE_INFO)->asImg($starwidth) ?> + <?= Icon::create('star', Icon::ROLE_INFO)->asImg($starwidth) ?> + <?= Icon::create('star', Icon::ROLE_INFO)->asImg($starwidth) ?> + <?= Icon::create('star', Icon::ROLE_INFO)->asImg($starwidth) ?> + <?= Icon::create('star', Icon::ROLE_INFO)->asImg($starwidth) ?> <? else : ?> <? $material->rating = round($material->rating, 1) / 2 ?> <? $v = $material->rating >= 0.75 ? '' : ($material->rating >= 0.25 ? '-halffull' : '-empty') ?> - <?= Icon::create("star{$v}", Icon::ROLE_INFO)->asSvg($starwidth) ?> + <?= Icon::create("star{$v}", Icon::ROLE_INFO)->asImg($starwidth) ?> <? $v = $material->rating >= 1.75 ? '' : ($material->rating >= 1.25 ? '-halffull' : '-empty') ?> - <?= Icon::create("star{$v}", Icon::ROLE_INFO)->asSvg($starwidth) ?> + <?= Icon::create("star{$v}", Icon::ROLE_INFO)->asImg($starwidth) ?> <? $v = $material->rating >= 2.75 ? '' : ($material->rating >= 2.25 ? '-halffull' : '-empty') ?> - <?= Icon::create("star{$v}", Icon::ROLE_INFO)->asSvg($starwidth) ?> + <?= Icon::create("star{$v}", Icon::ROLE_INFO)->asImg($starwidth) ?> <? $v = $material->rating >= 3.75 ? '' : ($material->rating >= 3.25 ? '-halffull' : '-empty') ?> - <?= Icon::create("star{$v}", Icon::ROLE_INFO)->asSvg($starwidth) ?> + <?= Icon::create("star{$v}", Icon::ROLE_INFO)->asImg($starwidth) ?> <? $v = $material->rating >= 4.75 ? '' : ($material->rating >= 4.25 ? '-halffull' : '-empty') ?> - <?= Icon::create("star{$v}", Icon::ROLE_INFO)->asSvg($starwidth) ?> + <?= Icon::create("star{$v}", Icon::ROLE_INFO)->asImg($starwidth) ?> <? endif ?> </td> <td> diff --git a/app/views/oer/mymaterial/edit.php b/app/views/oer/mymaterial/edit.php index 77014f6..38fb5b6 100644 --- a/app/views/oer/mymaterial/edit.php +++ b/app/views/oer/mymaterial/edit.php @@ -152,7 +152,7 @@ <?= htmlReady($user['name']) ?> </span> <? if (count($material->users) > 1) : ?> - <?= Icon::create('trash')->asSvg(['class' => 'text-bottom', 'title' => _('Person als Autor entfernen.')]) ?> + <?= Icon::create('trash')->asImg(['class' => 'text-bottom', 'title' => _('Person als Autor entfernen.')]) ?> <? endif ?> </div> </label> @@ -170,7 +170,7 @@ <?= htmlReady($user ? $user->getFullName() : _('unbekannt')) ?> </span> <? if (count($material->users) > 1) : ?> - <?= Icon::create('trash')->asSvg(['class' => 'text-bottom', 'title' => _('Person als Autor/Autorin entfernen.')]) ?> + <?= Icon::create('trash')->asImg(['class' => 'text-bottom', 'title' => _('Person als Autor/Autorin entfernen.')]) ?> <? endif ?> </div> </label> diff --git a/app/views/privacy/landing.php b/app/views/privacy/landing.php index a4829fd..9ca20bc 100644 --- a/app/views/privacy/landing.php +++ b/app/views/privacy/landing.php @@ -10,7 +10,7 @@ <li> <a href="<?= $controller->link_for("privacy/index/{$user_id}/{$key}") ?>" <? if (Request::isDialog()) echo 'data-dialog="size=big"'; ?>> <h3> - <?= $row['icon']->asSvg(false) ?> + <?= $row['icon']->asImg(false) ?> <?= htmlReady($row['title']) ?> </h3> <p> diff --git a/app/views/profile_modules/index.php b/app/views/profile_modules/index.php index 19d46cc..ae844f8 100644 --- a/app/views/profile_modules/index.php +++ b/app/views/profile_modules/index.php @@ -32,7 +32,7 @@ <div class="element_description"> <? if ($item['icon']): ?> - <?= $item['icon']->asSvg(['class' => 'plugin_icon text-bottom']) ?> + <?= $item['icon']->asImg(['class' => 'plugin_icon text-bottom']) ?> <? endif ?> <strong class="shortdesc"> diff --git a/app/views/public_courses/index.php b/app/views/public_courses/index.php index 19f8b7f..8ecd0ab 100644 --- a/app/views/public_courses/index.php +++ b/app/views/public_courses/index.php @@ -69,7 +69,7 @@ } ?> <a href="<?= URLHelper::getLink('dispatch.php/course/go?to='. $id . '&redirect_to=' . str_replace('?', '&', $navigation->getURL())) ?>"<?= $badge ?>> - <?= $navigation->getImage()->asSvg($navigation->getLinkAttributes()) ?> + <?= $navigation->getImage()->asImg($navigation->getLinkAttributes()) ?> </a> <? else: ?> <?= Assets::img('blank.gif', ['width' => Icon::SIZE_DEFAULT, 'height' => Icon::SIZE_DEFAULT]) ?> diff --git a/app/views/questionnaire/_answer_description_container.php b/app/views/questionnaire/_answer_description_container.php index 26c45b7..dfdb9f8 100644 --- a/app/views/questionnaire/_answer_description_container.php +++ b/app/views/questionnaire/_answer_description_container.php @@ -10,7 +10,7 @@ </div> <article class="description"> <? if (isset($vote->questiondata['mandatory']) && $vote->questiondata['mandatory']) : ?> - <?= Icon::create('star', Icon::ROLE_ATTENTION)->asSvg(['class' => 'text-bottom', 'alt' => '']) ?> + <?= Icon::create('star', Icon::ROLE_ATTENTION)->asImg(['class' => 'text-bottom', 'alt' => '']) ?> <?= _('Pflichtantwort') ?> <? endif ?> <?= formatReady($vote->questiondata['description']) ?> diff --git a/app/views/questionnaire/_overview_questionnaire.php b/app/views/questionnaire/_overview_questionnaire.php index 23e1cc1..8b45d42 100644 --- a/app/views/questionnaire/_overview_questionnaire.php +++ b/app/views/questionnaire/_overview_questionnaire.php @@ -74,7 +74,7 @@ </td> <td class="actions"> <? if ($questionnaire->isRunning() && $countedAnswers) : ?> - <?= Icon::create('edit', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Der Fragebogen wurde gestartet und kann nicht mehr bearbeitet werden.')]) ?> + <?= Icon::create('edit', Icon::ROLE_INACTIVE)->asImg(['title' => _('Der Fragebogen wurde gestartet und kann nicht mehr bearbeitet werden.')]) ?> <? else : ?> <a href="<?= $controller->link_for('questionnaire/edit/' . $questionnaire->id) ?>" data-dialog="size=big" diff --git a/app/views/questionnaire/_question.php b/app/views/questionnaire/_question.php index 9d21f93..757603a 100644 --- a/app/views/questionnaire/_question.php +++ b/app/views/questionnaire/_question.php @@ -5,19 +5,19 @@ <div style="float: right; padding-top: 3px; padding-right: 5px;"> <a href="#" class="move_up" title="<?= _('Frage nach oben verschieben') ?>" onClick="STUDIP.Questionnaire.moveQuestionUp.call(this); return false;"> - <?= Icon::create('arr_1up')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('arr_1up')->asImg(['class' => 'text-bottom']) ?> </a> <a href="#" class="move_down" title="<?= _('Frage nach unten verschieben') ?>" onClick="STUDIP.Questionnaire.moveQuestionDown.call(this); return false;"> - <?= Icon::create('arr_1down')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('arr_1down')->asImg(['class' => 'text-bottom']) ?> </a> <a href="#" onClick="var that = this; STUDIP.Dialog.confirm('<?= _('Wirklich löschen?') ?>', function () { jQuery(that).closest('fieldset').remove(); }); return false;" title="<?= sprintf(_('%s löschen'), htmlReady($class::getName())) ?>"> - <?= Icon::create('trash')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('trash')->asImg(['class' => 'text-bottom']) ?> </a> </div> <div> - <?= $class::getIcon()->asSvg(['class' => 'text-bottom']) ?> + <?= $class::getIcon()->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($class::getName()) ?> </div> diff --git a/app/views/questionnaire/_widget_questionnaire.php b/app/views/questionnaire/_widget_questionnaire.php index 295d913..3941a66 100644 --- a/app/views/questionnaire/_widget_questionnaire.php +++ b/app/views/questionnaire/_widget_questionnaire.php @@ -41,7 +41,7 @@ title="<?= _('QR-Code zu diesem Fragebogen anzeigen') ?>" aria-label="<?= _('QR-Code zu diesem Fragebogen anzeigen') ?>" data-qr-code> <? URLHelper::setBaseURL($oldbase) ?> - <?= Icon::create('code-qr')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('code-qr')->asImg(['class' => 'text-bottom']) ?> </a> </span> </nav> diff --git a/app/views/questionnaire/add_to_context.php b/app/views/questionnaire/add_to_context.php index ac80be6..337d130 100644 --- a/app/views/questionnaire/add_to_context.php +++ b/app/views/questionnaire/add_to_context.php @@ -9,13 +9,13 @@ $icons = [ <div> <a href="<?= $controller->link_for("questionnaire/edit", ['range_type' => Context::getType(), 'range_id' => Context::get()->id]) ?>" data-dialog="size=big"> - <?= Icon::create($icons[Context::getType()], Icon::ROLE_CLICKABLE)->asSvg(50) ?> + <?= Icon::create($icons[Context::getType()], Icon::ROLE_CLICKABLE)->asImg(50) ?> <?= htmlReady(Context::get()->name) ?> </a> <? foreach ($statusgruppen as $statusgruppe) : ?> <a href="<?= $controller->link_for('questionnaire/edit', ['range_type' => 'statusgruppe', 'range_id' => $statusgruppe->getId()]) ?>" data-dialog="size=big"> - <?= Icon::create('group2', Icon::ROLE_CLICKABLE)->asSvg(50) ?> + <?= Icon::create('group2', Icon::ROLE_CLICKABLE)->asImg(50) ?> <?= htmlReady($statusgruppe->name) ?> </a> <? endforeach ?> diff --git a/app/views/questionnaire/context.php b/app/views/questionnaire/context.php index e1b53ac..78455b1 100644 --- a/app/views/questionnaire/context.php +++ b/app/views/questionnaire/context.php @@ -8,7 +8,7 @@ <input type="text" aria-label="<?= _('URL zum Fragebogen (nur lesbar)') ?>" readonly value="<?= htmlReady($GLOBALS['ABSOLUTE_URI_STUDIP'].'dispatch.php/questionnaire/answer/'.$questionnaire->getId()) ?>"> <a href="<?= htmlReady($GLOBALS['ABSOLUTE_URI_STUDIP'] . "dispatch.php/questionnaire/answer/" . $questionnaire->id) ?>" data-qr-code title="<?= _('QR-Code zum Link anzeigen') ?>"> - <?= Icon::create('code-qr')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('code-qr')->asImg(['class' => 'text-bottom']) ?> </a> </fieldset> <fieldset> @@ -41,7 +41,7 @@ <a href="<?= URLHelper::getLink('dispatch.php/course/go', ['to' => $course->getId()]) ?>"> <?= htmlReady((Config::get()->IMPORTANT_SEMNUMBER ? $course->veranstaltungsnummer." " : "").$course->name. ' ('.$course->semester_text.')') ?> </a> - <?= Icon::create('trash')->asSvg(['class' => 'text-bottom', 'title' => _('Zuweisung zur Veranstaltung aufheben.')]) ?> + <?= Icon::create('trash')->asImg(['class' => 'text-bottom', 'title' => _('Zuweisung zur Veranstaltung aufheben.')]) ?> </span> </label> </li> @@ -63,7 +63,7 @@ <a href="<?= URLHelper::getLink("dispatch.php/course/go", ['to' => $statusgruppe->getId()]) ?>"> <?= htmlReady($statusgruppe->course['name'].": ".$statusgruppe->name) ?> </a> - <?= Icon::create('trash')->asSvg(['class' => 'text-bottom', 'title' => _('Zuweisung zur Veranstaltung aufheben.')]) ?> + <?= Icon::create('trash')->asImg(['class' => 'text-bottom', 'title' => _('Zuweisung zur Veranstaltung aufheben.')]) ?> </span> </label> </li> @@ -81,7 +81,7 @@ <label> <input type="checkbox" name="remove_inst[]" value="<?= htmlReady($assignment['range_id']) ?>" style="display: none;"> <span><?= htmlReady(Institute::find($assignment['range_id'])->name) ?></span> - <?= Icon::create('trash', 'clickable', ['title' => _('Zuweisung zur Einrichtung aufheben.')])->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('trash', 'clickable', ['title' => _('Zuweisung zur Einrichtung aufheben.')])->asImg(['class' => 'text-bottom']) ?> </label> </li> <? endif ?> diff --git a/app/views/questionnaire/question_types/automated_data/_evaluation_part.php b/app/views/questionnaire/question_types/automated_data/_evaluation_part.php index 966c30d..d2b7bac 100644 --- a/app/views/questionnaire/question_types/automated_data/_evaluation_part.php +++ b/app/views/questionnaire/question_types/automated_data/_evaluation_part.php @@ -36,7 +36,7 @@ <a href="" title="<?= _('Zeige wieder alle Ergebnisse ohne Filterung an.') ?>" onclick="STUDIP.Questionnaire.removeFilter('<?= htmlReady($question['questionnaire_id']) ?>'); return false;"> - <?= Icon::create('filter2')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('filter2')->asImg(['class' => 'text-bottom']) ?> (<?= $percentage ?>% | <?= (int) count((array) $answerdata[$key]) ?>/<?= $countAnswers ?>) </a> <? else : ?> diff --git a/app/views/questionnaire/question_types/likert/likert_evaluation.php b/app/views/questionnaire/question_types/likert/likert_evaluation.php index cc3b287..f92adf9 100644 --- a/app/views/questionnaire/question_types/likert/likert_evaluation.php +++ b/app/views/questionnaire/question_types/likert/likert_evaluation.php @@ -104,7 +104,7 @@ $options = $vote->questiondata['options']; <?= htmlReady($hits) ?> </div> </div> - <?= Icon::create('filter2')->asSvg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> + <?= Icon::create('filter2')->asImg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> <?= round(100 * $hits / $countAnswers) ?>% </a> <? else : ?> diff --git a/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php b/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php index f51d1aa..7f090dd 100644 --- a/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php +++ b/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php @@ -105,7 +105,7 @@ $options = range($vote->questiondata['minimum'], $vote->questiondata['maximum']) <?= htmlReady($hits) ?> </div> </div> - <?= Icon::create('filter2')->asSvg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> + <?= Icon::create('filter2')->asImg(Icon::SIZE_INLINE, ['class' => 'text-bottom']) ?> <?= round(100 * $hits / $countAnswers) ?>% </a> <? else : ?> diff --git a/app/views/questionnaire/question_types/vote/vote_evaluation.php b/app/views/questionnaire/question_types/vote/vote_evaluation.php index 77cab48..cd1222f 100644 --- a/app/views/questionnaire/question_types/vote/vote_evaluation.php +++ b/app/views/questionnaire/question_types/vote/vote_evaluation.php @@ -102,7 +102,7 @@ rsort($ordered_results); <a href="" title="<?= _('Zeige wieder alle Ergebnisse ohne Filterung an.') ?>" onclick="STUDIP.Questionnaire.removeFilter('<?= htmlReady($vote['questionnaire_id']) ?>'); return false;"> - <?= Icon::create('filter2')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('filter2')->asImg(['class' => 'text-bottom']) ?> (<?= $percentage ?>% | <?= (int) ($results[$key] ?? 0) ?>/<?= $countAnswers ?>) </a> <? else : ?> diff --git a/app/views/questionnaire/widget.php b/app/views/questionnaire/widget.php index fac294c..3ab9ce7 100644 --- a/app/views/questionnaire/widget.php +++ b/app/views/questionnaire/widget.php @@ -2,7 +2,7 @@ <article class="studip questionnaire_widget" id="questionnaire_area"> <header> <h1> - <?= Icon::create('evaluation', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('evaluation', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom']) ?> <?= _('Fragebögen') ?> </h1> <nav> @@ -10,17 +10,17 @@ <? if ($statusgruppen_ids): ?> <a href="<?= $controller->link_for('questionnaire/add_to_context') ?>" data-dialog="size=auto" title="<?= _('Fragebogen hinzufügen') ?>" aria-label="<?= _('Fragebogen hinzufügen') ?>"> - <?= Icon::create('add')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('add')->asImg(['class' => 'text-bottom']) ?> </a> <? else: ?> <a href="<?= $controller->link_for('questionnaire/edit', compact('range_type', 'range_id')) ?>" data-dialog title="<?= _('Fragebogen hinzufügen') ?>" aria-label="<?= _('Fragebogen hinzufügen') ?>"> - <?= Icon::create('add')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('add')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> <a href="<?= URLHelper::getLink('dispatch.php/questionnaire/' . ($range_type == 'course' || $range_type == 'institute' ? 'course' : ''). 'overview') ?>" title="<?= _('Fragebögen verwalten') ?>" aria-label="<?= _('Fragebögen verwalten') ?>"> - <?= Icon::create('admin')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('admin')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> </nav> diff --git a/app/views/resources/_common/_resource_tr.php b/app/views/resources/_common/_resource_tr.php index bf52a0f..9b69f04 100644 --- a/app/views/resources/_common/_resource_tr.php +++ b/app/views/resources/_common/_resource_tr.php @@ -112,7 +112,7 @@ </span> <? else: ?> <?= htmlReady($resource->name) ?> - <?= Icon::create('link-intern')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('link-intern')->asImg(['class' => 'text-bottom']) ?> <? endif ?> </a> <? if (!empty($resource_tooltip)): ?> diff --git a/app/views/resources/admin/properties.php b/app/views/resources/admin/properties.php index 438ddff..072817b 100644 --- a/app/views/resources/admin/properties.php +++ b/app/views/resources/admin/properties.php @@ -37,7 +37,7 @@ <?= CSRFProtection::tokenTag() ?> <a href="<?=$controller->url_for('resources/property/edit/' . $property->id)?>" data-dialog="size=auto"> - <?= Icon::create('edit')->asSvg( + <?= Icon::create('edit')->asImg( [ 'title' => _('Bearbeiten') ] diff --git a/app/views/resources/admin/user_permissions.php b/app/views/resources/admin/user_permissions.php index 48f7fa5..5dedeb9 100644 --- a/app/views/resources/admin/user_permissions.php +++ b/app/views/resources/admin/user_permissions.php @@ -125,7 +125,7 @@ 'user_id' => $permission->user_id ] ) ?>" data-dialog> - <?= Icon::create('edit')->asSvg( + <?= Icon::create('edit')->asImg( '20px', [ 'class' => 'text-bottom', @@ -139,7 +139,7 @@ . '/' . $permission->resource_id ) ?>" data-dialog> - <?= Icon::create('log')->asSvg( + <?= Icon::create('log')->asImg( [ 'class' => 'text-bottom', 'title' => 'Liste mit Buchungen anzeigen' @@ -222,7 +222,7 @@ 'user_id' => $permission->user_id ] ) ?>" data-dialog> - <?= Icon::create('edit')->asSvg( + <?= Icon::create('edit')->asImg( [ 'class' => 'text-bottom', 'title' => _('Berechtigung bearbeiten') @@ -235,7 +235,7 @@ . '/' . $permission->resource_id ) ?>" data-dialog> - <?= Icon::create('log')->asSvg( + <?= Icon::create('log')->asImg( [ 'class' => 'text-bottom', 'title' => _('Liste mit Buchungen anzeigen') @@ -300,7 +300,7 @@ ['user_id' => $user->id] ) ?>"> <?= htmlReady($user->getFullName('full_rev')) ?> - <?= Icon::create('link-intern')->asSvg( + <?= Icon::create('link-intern')->asImg( [ 'class' => 'text-bottom' ] diff --git a/app/views/resources/booking/_add_edit_form.php b/app/views/resources/booking/_add_edit_form.php index 97f08f8..7c328b8 100644 --- a/app/views/resources/booking/_add_edit_form.php +++ b/app/views/resources/booking/_add_edit_form.php @@ -455,7 +455,7 @@ 'messages/write', ['rec_uname' => $booking->assigned_user->username] ) ?>" data-dialog="size=auto"> - <?= Icon::create('mail')->asSvg( + <?= Icon::create('mail')->asImg( '20px', ['class' => 'text-bottom'] ) ?> @@ -467,7 +467,7 @@ <?= _('Eine andere nutzende Person auswählen') ?> <div class="assigned-user-search-wrapper"> <?= $assigned_user_search->render() ?> - <?= Icon::create('refresh')->asSvg( + <?= Icon::create('refresh')->asImg( '20px', ['class' => 'delete-assigned-user-icon'] ) ?> </div> @@ -477,7 +477,7 @@ <?= _('Die nutzende Person zur Buchung') ?> <div class="assigned-user-search-wrapper"> <?= $assigned_user_search->render() ?> - <?= Icon::create('refresh')->asSvg( + <?= Icon::create('refresh')->asImg( '20px', ['class' => 'delete-assigned-user-icon'] ) ?> </div> @@ -498,7 +498,7 @@ 'messages/write', ['rec_uname' => $booking->booking_user->username] ) ?>" data-dialog="size=auto"> - <?= Icon::create('mail')->asSvg( + <?= Icon::create('mail')->asImg( '20px', ['class' => 'text-bottom'] ) ?> @@ -582,7 +582,7 @@ <td class="booking-list-interval-actions"> <button class="takes-place-delete takes-place-status-toggle <?= $interval->takes_place ? '' : ' invisible'; ?>" data-interval_id="<?= htmlReady($interval->id) ?>"> - <?= Icon::create('trash')->asSvg( + <?= Icon::create('trash')->asImg( [ 'class' => 'text-bottom', 'title' => _('Löschen') @@ -592,7 +592,7 @@ <button class="takes-place-revive takes-place-status-toggle <?= $interval->takes_place ? ' invisible' : ''; ?>" data-interval_id="<?= htmlReady($interval->id) ?>"> - <?= Icon::create('refresh')->asSvg( + <?= Icon::create('refresh')->asImg( [ 'class' => 'text-bottom', 'title' => _('Wiederherstellen') diff --git a/app/views/resources/booking/index.php b/app/views/resources/booking/index.php index 3a98bb2..d339408 100644 --- a/app/views/resources/booking/index.php +++ b/app/views/resources/booking/index.php @@ -85,7 +85,7 @@ 'dispatch.php/messages/write', ['rec_uname' => $booking->booking_user->username] ) ?>" data-dialog="size=auto"> - <?= Icon::create('mail')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('mail')->asImg(['class' => 'text-bottom']) ?> </a> <? else :?> <?= _('unbekannt') ?> @@ -133,7 +133,7 @@ 'dispatch.php/messages/write', ['rec_uname' => $booking->assigned_user->username] ) ?>" data-dialog="size=auto"> - <?= Icon::create('mail')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('mail')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> <? else : ?> diff --git a/app/views/resources/building/index.php b/app/views/resources/building/index.php index cfd874c..69ff6a8 100644 --- a/app/views/resources/building/index.php +++ b/app/views/resources/building/index.php @@ -101,7 +101,7 @@ <li> <a href="<?= $controller->link_for('resources/room/index/' . $child->id); ?>" <?= (Request::isDialog()) ? 'data-dialog' : ''; ?>> - <?= $child->getIcon('clickable')->asSvg( + <?= $child->getIcon('clickable')->asImg( ['class' => 'text-bottom'] ) ?> <?= htmlReady($child->name); ?> @@ -111,4 +111,4 @@ </ul> </section> </section> -<? endif ?>
\ No newline at end of file +<? endif ?> diff --git a/app/views/resources/category/_add_edit_form.php b/app/views/resources/category/_add_edit_form.php index a0a9571..148107a 100644 --- a/app/views/resources/category/_add_edit_form.php +++ b/app/views/resources/category/_add_edit_form.php @@ -143,7 +143,7 @@ </option> <? endforeach ?> </select> - <?= Icon::create('add')->asSvg(['class' => 'add-action']) ?> + <?= Icon::create('add')->asImg(['class' => 'add-action']) ?> </td> </tr> </tfoot> diff --git a/app/views/resources/category/details.php b/app/views/resources/category/details.php index edb9a4d..59eea31 100644 --- a/app/views/resources/category/details.php +++ b/app/views/resources/category/details.php @@ -18,7 +18,7 @@ <ul class="list-unstyled"> <? foreach ($category->property_definitions as $definition): ?> <li> - <?= Icon::create('checkbox-checked')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('checkbox-checked')->asImg(['class' => 'text-bottom']) ?> <? if ($definition->system): ?> <strong><?= htmlReady($definition) ?></strong> <? else: ?> diff --git a/app/views/resources/location/index.php b/app/views/resources/location/index.php index 8e6ef8c..162bfcd 100644 --- a/app/views/resources/location/index.php +++ b/app/views/resources/location/index.php @@ -75,7 +75,7 @@ <li> <a href="<?= $controller->link_for('resources/building/index/' . $child->id); ?>" <?= (Request::isDialog()) ? 'data-dialog' : ''; ?>> - <?= $child->getIcon('clickable')->asSvg( + <?= $child->getIcon('clickable')->asImg( ['class' => 'text-bottom'] ) ?> <?= htmlReady($child->name); ?> diff --git a/app/views/resources/messages/index.php b/app/views/resources/messages/index.php index 0bd4767..a2e0d0d 100644 --- a/app/views/resources/messages/index.php +++ b/app/views/resources/messages/index.php @@ -23,7 +23,7 @@ <span class="selected-room template invisible"> <input type="hidden" name="room_ids[]"> <span></span> - <?= Icon::create('trash')->asSvg( + <?= Icon::create('trash')->asImg( [ 'class' => 'remove-icon text-bottom' ] @@ -35,7 +35,7 @@ <input type="hidden" name="room_ids[]" value="<?= htmlReady($room->id) ?>"> <span><?= htmlReady($room->name) ?></span> - <?= Icon::create('trash')->asSvg( + <?= Icon::create('trash')->asImg( [ 'class' => 'remove-icon text-bottom' ] diff --git a/app/views/resources/resource/_standard_properties_display_part.php b/app/views/resources/resource/_standard_properties_display_part.php index cc33af3..ada4f80 100644 --- a/app/views/resources/resource/_standard_properties_display_part.php +++ b/app/views/resources/resource/_standard_properties_display_part.php @@ -58,7 +58,7 @@ 'messages/write', ['rec_uname' => $user->username] ) ?>" data-dialog> - <?= Icon::create('mail')->asSvg( + <?= Icon::create('mail')->asImg( ['class' => 'text-bottom'] ) ?> </a> @@ -69,7 +69,7 @@ <a href="<?= htmlReady($property->state) ?>" target="_blank"> <?= htmlReady($property->state) ?> - <?= Icon::create('link-extern')->asSvg( + <?= Icon::create('link-extern')->asImg( ['class' => 'text-bottom'] ) ?> </a> diff --git a/app/views/resources/resource/files.php b/app/views/resources/resource/files.php index f78dfe8..fc46b92 100644 --- a/app/views/resources/resource/files.php +++ b/app/views/resources/resource/files.php @@ -6,7 +6,7 @@ <caption> <a href="<?= $controller->url_for('resources/resource/files/' . $resource->id)?>" title="<?= _('Zum Hauptordner') ?>"> - <?= Icon::create('folder-home-full', 'clickable')->asSvg(30, ['class' => 'text-bottom']) ?> + <?= Icon::create('folder-home-full', 'clickable')->asImg(30, ['class' => 'text-bottom']) ?> </a> <?= htmlReady($resource->getFullName()) ?></caption> <?= $this->render_partial('files/_files_thead') ?> diff --git a/app/views/resources/room_request/overview.php b/app/views/resources/room_request/overview.php index 9e2d787..ecb664d 100644 --- a/app/views/resources/room_request/overview.php +++ b/app/views/resources/room_request/overview.php @@ -37,7 +37,7 @@ <th <? if ($sort_var === 1) printf('class="sort%s"', $sort_order) ?>> <? $sortorder = $sort_var !== 1 ? 'desc' : ($sort_order === 'asc' ? 'desc' : 'asc') ?> <a href="<?= URLHelper::getLink(sprintf('?sorting=1&sort_order=%s', $sortorder)) ?>"> - <?= Icon::create('radiobutton-checked')->asSvg( + <?= Icon::create('radiobutton-checked')->asImg( [ 'title' => _('Markierung') ] diff --git a/app/views/resources/room_request/resolve.php b/app/views/resources/room_request/resolve.php index 9458491..89719f0 100644 --- a/app/views/resources/room_request/resolve.php +++ b/app/views/resources/room_request/resolve.php @@ -42,7 +42,7 @@ ) ?>" target="_blank" title="<?= _('Belegungsplan anzeigen') ?>"> <?= htmlReady($room_info['room']->getFullName()) ?> - <?= Icon::create('link-intern')->asSvg( + <?= Icon::create('link-intern')->asImg( [ 'class' => 'text-bottom', 'title' => '' diff --git a/app/views/resources/room_request/resolve_room_tr.php b/app/views/resources/room_request/resolve_room_tr.php index a7f003a..8fb21f8 100644 --- a/app/views/resources/room_request/resolve_room_tr.php +++ b/app/views/resources/room_request/resolve_room_tr.php @@ -49,11 +49,11 @@ name="all_in_room" value="<?= htmlReady($room->id) ?>" <?= $room_availability_share[$room->id] <= 0.0 ? 'disabled="disabled"' : '' ?>> <? if ($room_availability_share[$room->id] >= 1.0) : ?> - <?= Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'text-bottom']) ?> <? elseif ($room_availability_share[$room->id] <= 0.0) : ?> - <?= Icon::create('decline-circle', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('decline-circle', Icon::ROLE_STATUS_RED)->asImg(['class' => 'text-bottom']) ?> <? else : ?> - <?= Icon::create('exclaim-circle', Icon::ROLE_STATUS_YELLOW)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('exclaim-circle', Icon::ROLE_STATUS_YELLOW)->asImg(['class' => 'text-bottom']) ?> <?= tooltipIcon(sprintf( _('%u von %u Terminen nicht verfügbar'), $unavailable_dates[$room->id], @@ -78,11 +78,11 @@ ? 'checked' : ''?>> <? if ($availability >= 1.0) : ?> - <?= Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'text-bottom']) ?> <? elseif ($availability <= 0.0) : ?> - <?= Icon::create('decline-circle', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('decline-circle', Icon::ROLE_STATUS_RED)->asImg(['class' => 'text-bottom']) ?> <? else : ?> - <?= Icon::create('exclaim-circle', Icon::ROLE_STATUS_YELLOW)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('exclaim-circle', Icon::ROLE_STATUS_YELLOW)->asImg(['class' => 'text-bottom']) ?> <?= tooltipIcon(sprintf( _('%u von %u Terminen nicht verfügbar'), $unavailable_metadate_dates[$room->id][$metadate_id], @@ -119,12 +119,12 @@ || (!empty($interval['booked_room']) && $interval['booked_room'] === $room->id)) ? 'checked="checked"' : ''?>> - <?= Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'text-bottom']) ?> <? else: ?> <input type="radio" name="<?= htmlReady($room_radio_name) ?>" value="1" disabled="disabled" class="text-bottom"> - <?= Icon::create('decline-circle', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('decline-circle', Icon::ROLE_STATUS_RED)->asImg(['class' => 'text-bottom']) ?> <? endif ?> </td> <? $i++ ?> diff --git a/app/views/room_management/overview/index.php b/app/views/room_management/overview/index.php index ea88309..9fa41c0 100644 --- a/app/views/room_management/overview/index.php +++ b/app/views/room_management/overview/index.php @@ -92,7 +92,7 @@ <thead> <tr> <th> - <?= Icon::create('radiobutton-checked')->asSvg( + <?= Icon::create('radiobutton-checked')->asImg( [ 'class' => 'text-bottom', 'title' => _('Markierung') diff --git a/app/views/room_management/planning/copy_bookings.php b/app/views/room_management/planning/copy_bookings.php index 0ab0bd7..d704e68 100644 --- a/app/views/room_management/planning/copy_bookings.php +++ b/app/views/room_management/planning/copy_bookings.php @@ -209,7 +209,7 @@ <?= Icon::create( $data['available'] ? 'accept' : 'decline', $data['available'] ? Icon::ROLE_STATUS_GREEN : Icon::ROLE_STATUS_RED - )->asSvg(['class' => 'text-bottom']) ?> + )->asImg(['class' => 'text-bottom']) ?> </td> </tr> <? endforeach ?> diff --git a/app/views/score/index.php b/app/views/score/index.php index b11a86a..abae1a8 100644 --- a/app/views/score/index.php +++ b/app/views/score/index.php @@ -55,7 +55,7 @@ <?= htmlReady($person['fullname']) ?> </a> <? foreach ($person['is_king'] as $type => $text): ?> - <?= Icon::create('crown', Icon::ROLE_SORT)->asSvg(['title' => $text, 'alt' => $text, 'class' => 'text-top']) ?> + <?= Icon::create('crown', Icon::ROLE_SORT)->asImg(['title' => $text, 'alt' => $text, 'class' => 'text-top']) ?> <? endforeach ?> </td> <td class="hidden-small-down"> @@ -68,7 +68,7 @@ $content .= sprintf( '<a href="%s">%s</a> ', URLHelper::getLink('dispatch.php/profile?username=' . $person['username']), - Icon::create('news', Icon::ROLE_CLICKABLE, ['title' => $tmp])->asSvg() + Icon::create('news', Icon::ROLE_CLICKABLE, ['title' => $tmp])->asImg() ); } else { $content .= Assets::img('blank.gif', ['width' => Icon::SIZE_DEFAULT]) . ' '; @@ -80,7 +80,7 @@ $content .= sprintf( '<a href="%s">%s</a> ', URLHelper::getLink('dispatch.php/profile?username=' . $person['username'] . '#questionnaire_area'), - Icon::create('vote', Icon::ROLE_CLICKABLE, ['title' => $tmp])->asSvg() + Icon::create('vote', Icon::ROLE_CLICKABLE, ['title' => $tmp])->asImg() ); } else { $content .= Assets::img('blank.gif', ['width' => Icon::SIZE_DEFAULT]) . ' '; @@ -92,7 +92,7 @@ $content .= sprintf( '<a href="%s">%s</a> ', URLHelper::getLink('dispatch.php/profile?username=' . $person['username'] . '#a'), - Icon::create('schedule', Icon::ROLE_CLICKABLE, ['title' => $tmp])->asSvg() + Icon::create('schedule', Icon::ROLE_CLICKABLE, ['title' => $tmp])->asImg() ); } else { $content .= Assets::img('blank.gif', ['width' => Icon::SIZE_DEFAULT]) . ' '; @@ -109,7 +109,7 @@ <? if($person['user_id'] == $GLOBALS['user']->id): ?> <a href="<?= $controller->url_for('score/unpublish') ?>"> <?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Ihren Wert von der Liste löschen')]) - ->asSvg(['class' => 'text-top']) + ->asImg(['class' => 'text-top']) ?> </a> <? endif; ?> diff --git a/app/views/search/globalsearch/index.php b/app/views/search/globalsearch/index.php index 6140a66..a84cd56 100644 --- a/app/views/search/globalsearch/index.php +++ b/app/views/search/globalsearch/index.php @@ -6,11 +6,11 @@ <span class="input-group-append"> <button type="submit" class="button" id="reset-search"> - <?= Icon::create('decline')->asSvg(['title' => _('Suche zurücksetzen')]) ?> + <?= Icon::create('decline')->asImg(['title' => _('Suche zurücksetzen')]) ?> </button> <button type="submit" class="button search-button" id="search-btn"> - <?= Icon::create('search')->asSvg(['title' => _('Suche starten')]) ?> + <?= Icon::create('search')->asImg(['title' => _('Suche starten')]) ?> </button> </span> @@ -38,8 +38,8 @@ data-all-results="<?= _('Filter aufheben') ?>" data-searchterm="<?= htmlReady(Request::get('q')) ?>" data-category="<?= htmlReady(Request::get('category')) ?>" - data-img-add="<?= htmlReady(Icon::create('add')->asSvg(['title' => _('Unterveranstaltungen anzeigen')])) ?>" - data-img-remove="<?= htmlReady(Icon::create('remove')->asSvg(['title' => _('Unterveranstaltungen ausblenden')])) ?>" + data-img-add="<?= htmlReady(Icon::create('add')->asImg(['title' => _('Unterveranstaltungen anzeigen')])) ?>" + data-img-remove="<?= htmlReady(Icon::create('remove')->asImg(['title' => _('Unterveranstaltungen ausblenden')])) ?>" data-results-per-type="<?= Config::get()->GLOBALSEARCH_MAX_RESULT_OF_TYPE ?>" data-filters="<?= htmlReady(json_encode($filters)) ?>"> </div> diff --git a/app/views/search/module/_drill_down_list.php b/app/views/search/module/_drill_down_list.php index d679f33..b8a8b67 100644 --- a/app/views/search/module/_drill_down_list.php +++ b/app/views/search/module/_drill_down_list.php @@ -2,7 +2,7 @@ <div style="width: 100%; text-align:right;"> <a href="<?= $controller->url_for('search/module/reset_drilldown') ?>"> <?= _('Auswahl aufheben') ?> - <?= Icon::create('decline', 'clickable', ['title' => _('Auswahl aufheben')])->asSvg(); ?> + <?= Icon::create('decline', 'clickable', ['title' => _('Auswahl aufheben')])->asImg(); ?> </a> </div> <? endif; ?> @@ -24,7 +24,7 @@ <a href="<?= $controller->url_for('search/module/drilldown', ['type' => get_class($object), 'id' => $object->getId()]) ?>"> <?= htmlReady($object->getDisplayName()) . ' (' . $object->count_module . ')' ?> <? if ($object->getId() == $drill_down_id) : ?> - <?= Icon::create('accept', 'clickable', ['title' => _('Bereich ausgewählt')])->asSvg(); ?> + <?= Icon::create('accept', 'clickable', ['title' => _('Bereich ausgewählt')])->asImg(); ?> <? endif; ?> </a> </li> diff --git a/app/views/search/module/_modul.php b/app/views/search/module/_modul.php index a3c155e..1ac6280 100644 --- a/app/views/search/module/_modul.php +++ b/app/views/search/module/_modul.php @@ -10,7 +10,7 @@ <tr class="table-header header-row" id="modul_<?= htmlReady($modul->id) ?>"> <td> <a data-dialog="size=auto" title="<?= htmlReady($modul->getDisplayName()) . ' (' . _('Vollständige Modulbeschreibung') . ')' ?>" href="<?= $controller->link_for('shared/modul/description/' . $modul->id) ?>"> - <?= Icon::create('log')->asSvg(['title' => _('Vollständige Modulbeschreibung')]) ?> + <?= Icon::create('log')->asImg(['title' => _('Vollständige Modulbeschreibung')]) ?> </a> </td> <? if (count($modul->getAssignedCoursesBySemester($selected_semester->id, $GLOBALS['user']->id))) : ?> diff --git a/app/views/search/stgtable/index.php b/app/views/search/stgtable/index.php index f4ed092..f9d8260 100644 --- a/app/views/search/stgtable/index.php +++ b/app/views/search/stgtable/index.php @@ -20,7 +20,7 @@ <? foreach ($kategorien as $kat_id => $kategorie): ?> <? if (!empty($stg[$kat_id])) : ?> <td style="text-align: center;"> - <a href="<?= $controller->action_link('studiengang', $stg[$kat_id]) ?>"><?= Icon::create('info-circle-full', 'clickable', ['title' => _('Studiengang anzeigen')])->asSvg(); ?></a> + <a href="<?= $controller->action_link('studiengang', $stg[$kat_id]) ?>"><?= Icon::create('info-circle-full', 'clickable', ['title' => _('Studiengang anzeigen')])->asImg(); ?></a> </td> <? else : ?> <td></td> diff --git a/app/views/search/studiengaenge/mehrfach.php b/app/views/search/studiengaenge/mehrfach.php index 29311e3..5a081e2 100644 --- a/app/views/search/studiengaenge/mehrfach.php +++ b/app/views/search/studiengaenge/mehrfach.php @@ -4,7 +4,7 @@ <?= _('Studiengang') ?>: <?= htmlReady($studiengang->getDisplayName()) ?> <? if (Config::get()->ENABLE_STUDYCOURSE_INFO_PAGE) : ?> <a href="<?= $controller->link_for('search/studiengaenge/info', $studiengang->id)?>" data-dialog> - <?= Icon::create('infopage2')->asSvg(['title' => _('Informationen zum Studiengang')]) ?> + <?= Icon::create('infopage2')->asImg(['title' => _('Informationen zum Studiengang')]) ?> </a> <? endif; ?> </caption> @@ -26,7 +26,7 @@ <td style="text-align: center;"> <? if (isset($fach[$teil_bezeichnung->id])) : ?> <a href="<?= $controller->link_for($verlauf_url, $fach[$teil_bezeichnung->id], $teil_bezeichnung->id, $studiengang_id ?? null) ?>"> - <?= Icon::create('info-circle-full')->asSvg(['title' => _('Studienverlaufsplan anzeigen')]) ?> + <?= Icon::create('info-circle-full')->asImg(['title' => _('Studienverlaufsplan anzeigen')]) ?> </a> <? endif; ?> </td> diff --git a/app/views/settings/categories.php b/app/views/settings/categories.php index e8003b6..14afb8a 100644 --- a/app/views/settings/categories.php +++ b/app/views/settings/categories.php @@ -16,22 +16,22 @@ <span> <? if ($index > 0): ?> <a href="<?= $controller->url_for('settings/categories/swap', $category->id, $last->id) ?>"> - <?= Icon::create('arr_2up', Icon::ROLE_SORT)->asSvg(['class' => 'text-bottom', 'title' =>_('Kategorie nach oben verschieben')]) ?> + <?= Icon::create('arr_2up', Icon::ROLE_SORT)->asImg(['class' => 'text-bottom', 'title' =>_('Kategorie nach oben verschieben')]) ?> </a> <? else: ?> - <?= Icon::create('arr_2up', Icon::ROLE_INACTIVE)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('arr_2up', Icon::ROLE_INACTIVE)->asImg(['class' => 'text-bottom']) ?> <? endif; ?> <? if ($index < $count - 1): ?> <a href="<?= $controller->url_for('settings/categories/swap', $category->id, $categories[$index + 1]->id) ?>"> - <?= Icon::create('arr_2down', Icon::ROLE_SORT)->asSvg(['class' => 'text-bottom', 'title' =>_('Kategorie nach unten verschieben')]) ?> + <?= Icon::create('arr_2down', Icon::ROLE_SORT)->asImg(['class' => 'text-bottom', 'title' =>_('Kategorie nach unten verschieben')]) ?> </a> <? else: ?> - <?= Icon::create('arr_2down', Icon::ROLE_INACTIVE)->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('arr_2down', Icon::ROLE_INACTIVE)->asImg(['class' => 'text-bottom']) ?> <? endif; ?> <a href="<?= $controller->url_for('settings/categories/delete', $category->id) ?>"> - <?= Icon::create('trash')->asSvg(['class' => 'text-bottom', 'title' => _('Kategorie löschen')]) ?> + <?= Icon::create('trash')->asImg(['class' => 'text-bottom', 'title' => _('Kategorie löschen')]) ?> </a> </span> </legend> diff --git a/app/views/settings/messaging.php b/app/views/settings/messaging.php index 8f02725..028d9f8 100644 --- a/app/views/settings/messaging.php +++ b/app/views/settings/messaging.php @@ -81,7 +81,7 @@ <?= get_fullname($user->smsforward_rec, 'full', true) ?> </a> <a href="<?= $controller->url_for('settings/messaging/verify/forward_receiver') ?>"> - <?= Icon::create('trash', 'clickable')->asSvg() ?> + <?= Icon::create('trash', 'clickable')->asImg() ?> </a> <br> <label> diff --git a/app/views/settings/statusgruppen/index.php b/app/views/settings/statusgruppen/index.php index bf6eed2..c51f78f 100644 --- a/app/views/settings/statusgruppen/index.php +++ b/app/views/settings/statusgruppen/index.php @@ -34,11 +34,11 @@ <? if ($GLOBALS['perm']->have_studip_perm('admin', $inst_id)) : ?> <a href="<?= URLHelper::getURL('dispatch.php/institute/members', ['cid' => $inst_id, 'admin_view' => 1]) ?>"> - <?= Icon::create('link-intern')->asSvg(['title' => _('Zur Einrichtung')]) ?> + <?= Icon::create('link-intern')->asImg(['title' => _('Zur Einrichtung')]) ?> </a> <? else: ?> <a href="<?= URLHelper::getURL('dispatch.php/institute/overview', ['auswahl' => $inst_id]) ?>"> - <?= Icon::create('link-intern')->asSvg(['title' => _('Zur Einrichtung')]) ?> + <?= Icon::create('link-intern')->asImg(['title' => _('Zur Einrichtung')]) ?> </a> <? endif; ?> </nav> @@ -78,11 +78,11 @@ <nav> <? if ($GLOBALS['perm']->have_studip_perm('admin', $inst_id) && !$locked) : ?> <a href="<?= $controller->url_for('settings/statusgruppen/verify/delete/' . $role_id) ?>#<?= $role_id ?>"> - <?= Icon::create('trash')->asSvg(['title' => _('Löschen')]) ?> + <?= Icon::create('trash')->asImg(['title' => _('Löschen')]) ?> </a> <a href="<?= URLHelper::getURL('dispatch.php/admin/statusgroups', ['cid' => $inst_id]) ?>#group-<?= $role_id ?>"> - <?= Icon::create('link-intern')->asSvg(['title' => _('Zur Funktion')]) ?> + <?= Icon::create('link-intern')->asImg(['title' => _('Zur Funktion')]) ?> </a> <? endif; ?> </nav> diff --git a/app/views/settings/statusgruppen/modify.php b/app/views/settings/statusgruppen/modify.php index 72aeaea..cea3eaf 100644 --- a/app/views/settings/statusgruppen/modify.php +++ b/app/views/settings/statusgruppen/modify.php @@ -32,7 +32,7 @@ $default_entries = DataFieldEntry::getDataFieldEntries([$user->user_id, $inst_id </td> <td style="text-align: right"> <a href="<?= $controller->url_for('settings/statusgruppen/default', $inst_id, $role_id, $id, true) ?>"> - <?= Icon::create('checkbox-unchecked')->asSvg(['title' => _('Diese Daten von den Standarddaten übernehmen'), 'class' => 'text-top']) ?> + <?= Icon::create('checkbox-unchecked')->asImg(['title' => _('Diese Daten von den Standarddaten übernehmen'), 'class' => 'text-top']) ?> </a> </td> <? elseif ($entry->getValue() == 'default_value'): ?> @@ -42,7 +42,7 @@ $default_entries = DataFieldEntry::getDataFieldEntries([$user->user_id, $inst_id </td> <td style="text-align:right"> <? if ($entry->isEditable() && !$locked): ?> - <a href="<?= $controller->link_for('settings/statusgruppen/default', $inst_id, $role_id, $id, false) ?>"> <?= Icon::create('checkbox-checked')->asSvg(['title' => _('Diese Daten NICHT von den Standarddaten übernehmen'), 'class' => 'text-top']) ?> + <a href="<?= $controller->link_for('settings/statusgruppen/default', $inst_id, $role_id, $id, false) ?>"> <?= Icon::create('checkbox-checked')->asImg(['title' => _('Diese Daten NICHT von den Standarddaten übernehmen'), 'class' => 'text-top']) ?> </a> <? endif; ?> </td> diff --git a/app/views/settings/statusgruppen/modify_institute.php b/app/views/settings/statusgruppen/modify_institute.php index 24903cf..7faa312 100644 --- a/app/views/settings/statusgruppen/modify_institute.php +++ b/app/views/settings/statusgruppen/modify_institute.php @@ -58,7 +58,7 @@ $entries = (array)DataFieldEntry::getDataFieldEntries([$user->user_id, $inst_id] <label> <? if ($institute['externdefault']) : ?> - <?= Icon::create('accept', 'inactive')->asSvg(['class' => 'text-top']); ?> + <?= Icon::create('accept', 'inactive')->asImg(['class' => 'text-top']); ?> <input type="hidden" name="default_institute" value="1"> <? else : ?> <input type="checkbox" id="default_institute" name="default_institute" value="1" diff --git a/app/views/settings/userdomains.php b/app/views/settings/userdomains.php index f423e97..03763fd 100644 --- a/app/views/settings/userdomains.php +++ b/app/views/settings/userdomains.php @@ -35,7 +35,7 @@ <? if ($allow_change): ?> <input type="checkbox" name="userdomain_delete[]" value="<?= $domain->id ?>"> <? else: ?> - <?= Icon::create('accept', 'inactive')->asSvg(['class' => 'text-top']) ?> + <?= Icon::create('accept', 'inactive')->asImg(['class' => 'text-top']) ?> <? endif; ?> </td> </tr> diff --git a/app/views/shared/filter.php b/app/views/shared/filter.php index 04bab78..5869859 100644 --- a/app/views/shared/filter.php +++ b/app/views/shared/filter.php @@ -13,7 +13,7 @@ ) : ?> <div style="width: 100%; text-align: right;"> <a href="<?= $action_reset ?>"> - <?= Icon::create('refresh', 'clickable', ['title' => _('Filter zurücksetzen')])->asSvg(); ?> + <?= Icon::create('refresh', 'clickable', ['title' => _('Filter zurücksetzen')])->asImg(); ?> <?= _('Zurücksetzen') ?> </a> </div> diff --git a/app/views/shared/form_dokumente.php b/app/views/shared/form_dokumente.php index 48c64ed..1f3db9e 100644 --- a/app/views/shared/form_dokumente.php +++ b/app/views/shared/form_dokumente.php @@ -51,14 +51,14 @@ 'trash', Icon::ROLE_CLICKABLE, ['title' => _('Dokument entfernen')] - )->asSvg(); ?> + )->asImg(); ?> </a> <a href="#" class="mvv-item-edit-properties"> <?= Icon::create( 'edit', Icon::ROLE_CLICKABLE, ['title' => _('Kommentar bearbeiten')] - )->asSvg(); ?> + )->asImg(); ?> </a> </div> <fieldset class="mvv-item-document-comments" style="display: none;"> @@ -93,7 +93,7 @@ 'add', Icon::ROLE_CLICKABLE, ['title' => _('Neues Dokument anlegen')] - )->asSvg(); ?> + )->asImg(); ?> </a> </div> <div style="padding-top: 15px; width: 100%; max-width: 48em;"> diff --git a/app/views/shared/info_search.php b/app/views/shared/info_search.php index 3cdf95b..008d549 100644 --- a/app/views/shared/info_search.php +++ b/app/views/shared/info_search.php @@ -6,6 +6,6 @@ </script> <?= $search ?> <? if ($reset) : ?> - <a href="<?= $reset ?>"><?= Icon::create('refresh', 'clickable', ['title' => _('Suche zurücksetzen')])->asSvg(); ?></a> + <a href="<?= $reset ?>"><?= Icon::create('refresh', 'clickable', ['title' => _('Suche zurücksetzen')])->asImg(); ?></a> <? endif; ?> </form> diff --git a/app/views/shared/language_chooser.php b/app/views/shared/language_chooser.php index 9c231b7..85f1c06 100644 --- a/app/views/shared/language_chooser.php +++ b/app/views/shared/language_chooser.php @@ -8,7 +8,7 @@ </option> <? endforeach; ?> </select> - <span role="button" tabindex="0" class="mvv-inst-add-button"><?= Icon::create('arr_2up')->asSvg(['title' => _('Sprache zuordnen')]) ?></span> + <span role="button" tabindex="0" class="mvv-inst-add-button"><?= Icon::create('arr_2up')->asImg(['title' => _('Sprache zuordnen')]) ?></span> </div> <?= $addition ?> </div> diff --git a/app/views/shared/version/_versionmodule.php b/app/views/shared/version/_versionmodule.php index a7e4f1a..dfd8a84 100644 --- a/app/views/shared/version/_versionmodule.php +++ b/app/views/shared/version/_versionmodule.php @@ -79,7 +79,7 @@ foreach ($abschnitte as $abschnitt) { <?= htmlReady($abschnitt_modul->getDisplayName()) ?> </a> <a data-dialog="size=auto" title="<?= htmlReady($modul['name']) . ' (' . _('Vollständige Modulbeschreibung') . ')' ?>" href="<?= URLHelper::getLink('shared/modul/description/' . $modul_id) ?>"> - <?= Icon::create('info-circle', 'clickable', [])->asSvg(); ?> + <?= Icon::create('info-circle', 'clickable', [])->asImg(); ?> </a> </td> <? endif;?> diff --git a/app/views/siteinfo/markup/uniContact.php b/app/views/siteinfo/markup/uniContact.php index 18e1918..c622761 100644 --- a/app/views/siteinfo/markup/uniContact.php +++ b/app/views/siteinfo/markup/uniContact.php @@ -2,6 +2,6 @@ # Lifter010: TODO ?> <a href="mailto:<?= $contact ?>"> - <?= Icon::create('link-extern', 'clickable')->asSvg() ?> + <?= Icon::create('link-extern', 'clickable')->asImg() ?> <?= $contact ?> </a> diff --git a/app/views/start/_widget.php b/app/views/start/_widget.php index 2117877..aa68bdc 100644 --- a/app/views/start/_widget.php +++ b/app/views/start/_widget.php @@ -20,7 +20,7 @@ <?= $key ?>="<?= htmlReady($value) ?>" <? endif ?> <? endforeach ?>> - <?= $nav->getImage()->asSvg() ?> + <?= $nav->getImage()->asImg() ?> </a> <? endif ?> <?endforeach ?> @@ -28,12 +28,12 @@ <? if (isset($admin_url)): ?> <a href="<?= URLHelper::getLink($admin_url) ?>"> - <?= Icon::create('admin', Icon::ROLE_CLICKABLE, ['title' => $admin_title])->asSvg() ?> + <?= Icon::create('admin', Icon::ROLE_CLICKABLE, ['title' => $admin_title])->asImg() ?> </a> <? endif ?> <a href="<?= $controller->url_for('start/delete/' . $widget->getPluginId()) ?>"> - <?= Icon::create('decline', Icon::ROLE_CLICKABLE, ['title' => _('Entfernen')])->asSvg() ?> + <?= Icon::create('decline', Icon::ROLE_CLICKABLE, ['title' => _('Entfernen')])->asImg() ?> </a> </span> <span id="widgetName<?= $widget->getPluginId() ?>" class="widget-title"> diff --git a/app/views/studiengaenge/fachbereichestgteile/index.php b/app/views/studiengaenge/fachbereichestgteile/index.php index fc60e5f..0fe3cfc 100644 --- a/app/views/studiengaenge/fachbereichestgteile/index.php +++ b/app/views/studiengaenge/fachbereichestgteile/index.php @@ -31,7 +31,7 @@ <td class="actions dont-hide" style="white-space: nowrap;"> <? if (MvvPerm::havePermCreate('StudiengangTeil')) : ?> <a href="<?= $controller->action_link('stgteil_fachbereich/' . $fachbereich['institut_id']) ?>"> - <?= Icon::create('file', Icon::ROLE_CLICKABLE , ['title' => _('Neuen Studiengangteil in diesem Fachbereich anlegen')])->asSvg(); ?> + <?= Icon::create('file', Icon::ROLE_CLICKABLE , ['title' => _('Neuen Studiengangteil in diesem Fachbereich anlegen')])->asImg(); ?> </a> <? endif; ?> </td> diff --git a/app/views/studiengaenge/faecher/index.php b/app/views/studiengaenge/faecher/index.php index e3f8c3e..485d922 100644 --- a/app/views/studiengaenge/faecher/index.php +++ b/app/views/studiengaenge/faecher/index.php @@ -39,7 +39,7 @@ <td class="dont-hide actions"> <? if (MvvPerm::havePermCreate('StudiengangTeil')) : ?> <a href="<?= $controller->action_link('stgteil_fach/' . $fach->id) ?>"> - <?= Icon::create('file', Icon::ROLE_CLICKABLE ,['title' => _('Neuen Studiengangteil für gewähltes Fach anlegen')])->asSvg(); ?> + <?= Icon::create('file', Icon::ROLE_CLICKABLE ,['title' => _('Neuen Studiengangteil für gewähltes Fach anlegen')])->asImg(); ?> </a> <? endif; ?> </td> diff --git a/app/views/studiengaenge/informationen/degree.php b/app/views/studiengaenge/informationen/degree.php index 9638f5e..be9a69f 100644 --- a/app/views/studiengaenge/informationen/degree.php +++ b/app/views/studiengaenge/informationen/degree.php @@ -34,7 +34,7 @@ <? if ($GLOBALS['perm']->have_perm('root', $GLOBALS['user']->id)) : ?> <a href="<?= $controller->messagehelper(['abschluss_id' => $deg->abschluss_id]) ?>" data-dialog> - <?= Icon::create('mail')->asSvg( + <?= Icon::create('mail')->asImg( ['title' => sprintf( _('Alle Studierenden mit dem Studienabschluss %s benachrichtigen.'), $deg->name) diff --git a/app/views/studiengaenge/informationen/index.php b/app/views/studiengaenge/informationen/index.php index 9b2fb0b..fcdbc3b 100644 --- a/app/views/studiengaenge/informationen/index.php +++ b/app/views/studiengaenge/informationen/index.php @@ -33,7 +33,7 @@ </td> <td class="dont-hide actions"> <a href="<?= $controller->messagehelper(['fach_id' => $studycourse->fach_id]) ?>" data-dialog> - <?= Icon::create('mail')->asSvg( + <?= Icon::create('mail')->asImg( ['title' => sprintf( _('Alle Studierenden des Faches %s benachrichtigen.'), $studycourse->name) diff --git a/app/views/studiengaenge/stgteilbezeichnungen/index.php b/app/views/studiengaenge/stgteilbezeichnungen/index.php index 65a415b..96bf7d0 100644 --- a/app/views/studiengaenge/stgteilbezeichnungen/index.php +++ b/app/views/studiengaenge/stgteilbezeichnungen/index.php @@ -44,7 +44,7 @@ <? if ($perm->havePermWrite()) : ?> <a data-dialog href="<?= $controller->action_link('stgteilbezeichnung/' . $stgteilbezeichnung->id) ?>"> - <?= Icon::create('edit', Icon::ROLE_CLICKABLE ,['title' => _('Studiengangteil-Bezeichnung bearbeiten')])->asSvg(); ?> + <?= Icon::create('edit', Icon::ROLE_CLICKABLE ,['title' => _('Studiengangteil-Bezeichnung bearbeiten')])->asImg(); ?> </a> <? endif; ?> <? if ($perm->havePermCreate() && $stgteilbezeichnung->count_stgteile < 1) : ?> diff --git a/app/views/studiengaenge/studiengaenge/aufbaustg_table.php b/app/views/studiengaenge/studiengaenge/aufbaustg_table.php index 047ded2..039d464 100644 --- a/app/views/studiengaenge/studiengaenge/aufbaustg_table.php +++ b/app/views/studiengaenge/studiengaenge/aufbaustg_table.php @@ -54,7 +54,7 @@ $perm = MvvPerm::get($grund_stg); </div> <? if (trim($aufbau_stg->kommentar)) : ?> <a data-dialog="size=auto" href="<?= $controller->link_for('studiengaenge/studiengaenge/aufbaustg_info', $aufbau_stg->id) ?>"> - <?= Icon::create('info')->asSvg(12, tooltip2(_('Bemerkung anzeigen'))) ?> + <?= Icon::create('info')->asImg(12, tooltip2(_('Bemerkung anzeigen'))) ?> </a> <? endif; ?> </td> diff --git a/app/views/studiengaenge/studiengaenge/studiengaenge.php b/app/views/studiengaenge/studiengaenge/studiengaenge.php index 4ae0dc3..b154c72 100644 --- a/app/views/studiengaenge/studiengaenge/studiengaenge.php +++ b/app/views/studiengaenge/studiengaenge/studiengaenge.php @@ -22,7 +22,7 @@ <? $ampel_icon = $GLOBALS['MVV_STUDIENGANG']['STATUS']['values'][$studiengang->stat]['icon'] ?? null; ?> <? $ampelstatus = $GLOBALS['MVV_STUDIENGANG']['STATUS']['values'][$studiengang->stat]['name'] ?? null; ?> <? if ($ampel_icon) : ?> - <?= $ampel_icon->asSvg(['title' => $ampelstatus, 'style' => 'vertical-align: text-top;']) ?> + <?= $ampel_icon->asImg(['title' => $ampelstatus, 'style' => 'vertical-align: text-top;']) ?> <? endif; ?> <?= htmlReady($studiengang->name) ?> <?= (mb_strlen($studiengang->name_kurz) ? '(' . htmlReady($studiengang->name_kurz) . ')' : '') ?> <? if ($studiengang->count_dokumente) : ?> diff --git a/app/views/studiengaenge/studiengaenge/studiengang.php b/app/views/studiengaenge/studiengaenge/studiengang.php index 4ee2c42..5afe651 100644 --- a/app/views/studiengaenge/studiengaenge/studiengang.php +++ b/app/views/studiengaenge/studiengaenge/studiengang.php @@ -176,7 +176,7 @@ use Studip\Button, Studip\LinkButton; <? if ($perm->haveFieldPerm('institut_id', MvvPerm::PERM_WRITE)): ?> <div class="mvv-item-list-buttons"> <a href="#" - class="mvv-item-remove"><?= Icon::create('trash', Icon::ROLE_CLICKABLE , ['title' => _('Einrichtung entfernen')])->asSvg() ?></a> + class="mvv-item-remove"><?= Icon::create('trash', Icon::ROLE_CLICKABLE , ['title' => _('Einrichtung entfernen')])->asImg() ?></a> </div> <? endif ?> <input type="hidden" name="institut_item" value="<?= $studiengang->institut_id ?>"> @@ -242,7 +242,7 @@ use Studip\Button, Studip\LinkButton; <li id="language_<?= $assigned_language->lang ?>" class="drag-handle sort_items"> <div class="mvv-item-list-text"><?= htmlReady($assigned_language->getDisplayName()) ?></div> <div class="mvv-item-list-buttons"> - <a href="#" class="mvv-item-remove"><?= Icon::create('trash', 'clickable', array('title' => _('Sprache entfernen')))->asSvg() ?></a> + <a href="#" class="mvv-item-remove"><?= Icon::create('trash', 'clickable', array('title' => _('Sprache entfernen')))->asImg() ?></a> </div> <input type="hidden" name="language_items[]" value="<?= htmlReady($assigned_language->lang) ?>"> </li> diff --git a/app/views/studiengaenge/studiengangteile/details_grouped.php b/app/views/studiengaenge/studiengangteile/details_grouped.php index 397f98d..6f10bd0 100644 --- a/app/views/studiengaenge/studiengangteile/details_grouped.php +++ b/app/views/studiengaenge/studiengangteile/details_grouped.php @@ -13,7 +13,7 @@ <tr> <td> <? if (!empty($ampel_icon)) : ?> - <?= $ampel_icon->asSvg(['title' => $ampelstatus, 'style' => 'vertical-align: text-top;']) ?> + <?= $ampel_icon->asImg(['title' => $ampelstatus, 'style' => 'vertical-align: text-top;']) ?> <? endif; ?> <?= htmlReady($stgteil->getDisplayName()) ?> </td> diff --git a/app/views/studiengaenge/studiengangteile/stgteil.php b/app/views/studiengaenge/studiengangteile/stgteil.php index 4295aeb..8f3fa6e 100644 --- a/app/views/studiengaenge/studiengangteile/stgteil.php +++ b/app/views/studiengaenge/studiengangteile/stgteil.php @@ -52,7 +52,7 @@ use Studip\Button, Studip\LinkButton; <? if ($perm->haveFieldPerm('fach', MvvPerm::PERM_WRITE)) : ?> <div class="mvv-item-list-buttons"> <a href="#" class="mvv-item-remove"> - <?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Fach entfernen')])->asSvg(); ?> + <?= Icon::create('trash', Icon::ROLE_CLICKABLE, ['title' => _('Fach entfernen')])->asImg(); ?> </a> </div> <? endif; ?> diff --git a/app/views/studiengaenge/versionen/details_abschnitt.php b/app/views/studiengaenge/versionen/details_abschnitt.php index a3eaa58..63abfee 100644 --- a/app/views/studiengaenge/versionen/details_abschnitt.php +++ b/app/views/studiengaenge/versionen/details_abschnitt.php @@ -36,11 +36,11 @@ <td class="dont-hide actions" style="white-space: nowrap;"> <? if (MvvPerm::haveFieldPermModul_zuordnungen($abschnitt, MvvPerm::PERM_WRITE)) : ?> <a data-dialog="" href="<?= $controller->action_link('modul_zuordnung', $assignment->id) ?>"> - <?= Icon::create('edit', Icon::ROLE_CLICKABLE , tooltip2(_('Modulzuordnung bearbeiten')))->asSvg(); ?> + <?= Icon::create('edit', Icon::ROLE_CLICKABLE , tooltip2(_('Modulzuordnung bearbeiten')))->asImg(); ?> </a> <? endif; ?> <a data-dialog="size=auto" href="<?= $controller->link_for('module/module/description', $assignment->modul_id, ['abschnitt_id' => $assignment->abschnitt_id]) ?>"> - <?= Icon::create('log', Icon::ROLE_CLICKABLE, tooltip2(_('Lokale Modulbeschreibung')))->asSvg(); ?> + <?= Icon::create('log', Icon::ROLE_CLICKABLE, tooltip2(_('Lokale Modulbeschreibung')))->asImg(); ?> </a> <? if (MvvPerm::havePermCreate($assignment)) : ?> <?= Icon::create('trash', Icon::ROLE_CLICKABLE , tooltip2(_('Modulzuordnung löschen'))) diff --git a/app/views/studiengaenge/versionen/modulteile.php b/app/views/studiengaenge/versionen/modulteile.php index 495da70..86b2c37 100644 --- a/app/views/studiengaenge/versionen/modulteile.php +++ b/app/views/studiengaenge/versionen/modulteile.php @@ -19,7 +19,7 @@ <? $perm = MvvPerm::get($assignment->abschnitt) ?> <? if ($perm->haveFieldPerm('modulteil_abschnitte')) : ?> <a data-dialog="" href="<?= $controller->action_link('modulteil_semester', $assignment->id, $modulteil->id) ?>"> - <?= Icon::create('edit', Icon::ROLE_CLICKABLE , ['title' => _('Semesterzuordnung bearbeiten')])->asSvg(); ?> + <?= Icon::create('edit', Icon::ROLE_CLICKABLE , ['title' => _('Semesterzuordnung bearbeiten')])->asImg(); ?> </a> <? endif; ?> </td> diff --git a/app/views/studiengaenge/versionen/versionen.php b/app/views/studiengaenge/versionen/versionen.php index 9e42873..aff5d5f 100644 --- a/app/views/studiengaenge/versionen/versionen.php +++ b/app/views/studiengaenge/versionen/versionen.php @@ -9,7 +9,7 @@ <? $ampel_icon = $GLOBALS['MVV_STGTEILVERSION']['STATUS']['values'][$version->stat]['icon'] ?> <? $ampelstatus = $GLOBALS['MVV_STGTEILVERSION']['STATUS']['values'][$version->stat]['name'] ?> <? if ($ampel_icon) : ?> - <?= $ampel_icon->asSvg(['title' => $ampelstatus, 'style' => 'vertical-align: text-top;']) ?> + <?= $ampel_icon->asImg(['title' => $ampelstatus, 'style' => 'vertical-align: text-top;']) ?> <? endif; ?> <?= htmlReady($version->getDisplayName()) ?> <? if ($version->count_abschnitte) : ?> @@ -18,7 +18,7 @@ </td> <td class="dont-hide" style="text-align: center;"> <? if ($version->count_dokumente) : ?> - <?= Icon::create('staple', Icon::ROLE_INFO, ['title' => sprintf(ngettext('%s Dokument zugeordnet', '%s Dokumente zugeordnet', $version->count_dokumente), $version->count_dokumente)])->asSvg(); ?> + <?= Icon::create('staple', Icon::ROLE_INFO, ['title' => sprintf(ngettext('%s Dokument zugeordnet', '%s Dokumente zugeordnet', $version->count_dokumente), $version->count_dokumente)])->asImg(); ?> <? endif; ?> </td> <td class="dont-hide" style="white-space: nowrap; text-align: right;"> diff --git a/app/views/userfilter/filter/configure.php b/app/views/userfilter/filter/configure.php index c278c43..cd170ab 100644 --- a/app/views/userfilter/filter/configure.php +++ b/app/views/userfilter/filter/configure.php @@ -9,7 +9,7 @@ </div> <br/> <a href="#" onclick="return STUDIP.UserFilter.addConditionField('conditionfields', '<?= $controller->configure() ?>')"> - <?= Icon::create('add')->asSvg(['alt' => _('Auswahlfeld hinzufügen')]) ?> + <?= Icon::create('add')->asImg(['alt' => _('Auswahlfeld hinzufügen')]) ?> <?= _('Auswahlfeld hinzufügen') ?> </a> <br/><br/> diff --git a/app/views/vips/exam_mode/index.php b/app/views/vips/exam_mode/index.php index b5aba7f..50bf0a6 100644 --- a/app/views/vips/exam_mode/index.php +++ b/app/views/vips/exam_mode/index.php @@ -32,7 +32,7 @@ </td> <td> <a href="<?= URLHelper::getLink($nav->getURL(), ['cid' => $course_id]) ?>"> - <?= $nav->getImage()->asSvg($nav->getLinkAttributes()) ?> + <?= $nav->getImage()->asImg($nav->getLinkAttributes()) ?> </a> </td> </tr> diff --git a/app/views/vips/exercises/ClozeTask/correct.php b/app/views/vips/exercises/ClozeTask/correct.php index 867a644..0791581 100644 --- a/app/views/vips/exercises/ClozeTask/correct.php +++ b/app/views/vips/exercises/ClozeTask/correct.php @@ -15,19 +15,19 @@ <? if ($solution->id): ?> <? if ($results[$blank]['points'] == 1): ?> --><span class="correct_item math-tex"><?= htmlReady($response[$blank]) ?><!-- - --><?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_inline', 'title' => _('richtig')]) ?><!-- + --><?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_inline', 'title' => _('richtig')]) ?><!-- --></span><!-- <? elseif ($results[$blank]['points'] == 0.5): ?> --><span class="fuzzy_item math-tex"><?= htmlReady($response[$blank]) ?><!-- - --><?= Icon::create('decline', Icon::ROLE_STATUS_YELLOW)->asSvg(['class' => 'correction_inline', 'title' => _('fast richtig')]) ?><!-- + --><?= Icon::create('decline', Icon::ROLE_STATUS_YELLOW)->asImg(['class' => 'correction_inline', 'title' => _('fast richtig')]) ?><!-- --></span><!-- <? elseif (empty($edit_solution) || $results[$blank]['safe']): ?> --><span class="wrong_item math-tex"><?= htmlReady($response[$blank]) ?><!-- - --><?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_inline', 'title' => _('falsch')]) ?><!-- + --><?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_inline', 'title' => _('falsch')]) ?><!-- --></span><!-- <? else: ?> --><span class="wrong_item math-tex"><?= htmlReady($response[$blank]) ?><!-- - --><?= Icon::create('question', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_inline', 'title' => _('Unbekannte Antwort')]) ?><!-- + --><?= Icon::create('question', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_inline', 'title' => _('Unbekannte Antwort')]) ?><!-- --></span><!-- <? endif ?> <? endif ?> diff --git a/app/views/vips/exercises/ClozeTask/print.php b/app/views/vips/exercises/ClozeTask/print.php index 4be1f4a..fce4bc4 100644 --- a/app/views/vips/exercises/ClozeTask/print.php +++ b/app/views/vips/exercises/ClozeTask/print.php @@ -17,11 +17,11 @@ --><span class="math-tex" style="text-decoration: underline;"> <?= htmlReady($response[$blank]) ?> </span><!-- <? if ($print_correction): ?> <? if ($results[$blank]['points'] == 1): ?> - --><?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('richtig')]) ?><!-- + --><?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('richtig')]) ?><!-- <? elseif ($results[$blank]['points'] == 0.5): ?> - --><?= Icon::create('decline', Icon::ROLE_STATUS_YELLOW)->asSvg(['title' => _('fast richtig')]) ?><!-- + --><?= Icon::create('decline', Icon::ROLE_STATUS_YELLOW)->asImg(['title' => _('fast richtig')]) ?><!-- <? else: ?> - --><?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('falsch')]) ?><!-- + --><?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['title' => _('falsch')]) ?><!-- <? endif ?> <? endif ?> <? elseif ($exercise->isSelect($blank)): ?> diff --git a/app/views/vips/exercises/MatchingTask/correct.php b/app/views/vips/exercises/MatchingTask/correct.php index d38afb6..64faca6 100644 --- a/app/views/vips/exercises/MatchingTask/correct.php +++ b/app/views/vips/exercises/MatchingTask/correct.php @@ -44,9 +44,9 @@ <?= formatReady($answer['text']) ?> <? if ($exercise->isCorrectAnswer($answer, $i)): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> <? endif ?> </div> <? endif ?> @@ -78,9 +78,9 @@ <? if ($solution->id): ?> <? if ($exercise->isCorrectAnswer($answer, -1)): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_inline', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_inline', 'title' => _('richtig')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_inline', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_inline', 'title' => _('falsch')]) ?> <? endif ?> <? endif ?> </div> diff --git a/app/views/vips/exercises/MatchingTask/print.php b/app/views/vips/exercises/MatchingTask/print.php index 123c9a6..a9617df 100644 --- a/app/views/vips/exercises/MatchingTask/print.php +++ b/app/views/vips/exercises/MatchingTask/print.php @@ -44,9 +44,9 @@ <? if ($print_correction): ?> <? if ($exercise->isCorrectAnswer($answer, $i)) : ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> <? else : ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> <? endif ?> <? endif ?> </div> @@ -84,9 +84,9 @@ <? if ($solution->id && $print_correction): ?> <? if ($exercise->isCorrectAnswer($answer, -1)): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('richtig')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['title' => _('falsch')]) ?> <? endif ?> <? endif ?> </li> diff --git a/app/views/vips/exercises/MatrixChoiceTask/correct.php b/app/views/vips/exercises/MatrixChoiceTask/correct.php index 82a87fe..1b4f8ba 100644 --- a/app/views/vips/exercises/MatrixChoiceTask/correct.php +++ b/app/views/vips/exercises/MatrixChoiceTask/correct.php @@ -18,9 +18,9 @@ <td style="white-space: nowrap;"> <? if (isset($response[$key]) && $response[$key] !== '' && $response[$key] != -1): ?> <? if ($response[$key] == $entry['choice']): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> <? endif ?> <? endif ?> diff --git a/app/views/vips/exercises/MatrixChoiceTask/print.php b/app/views/vips/exercises/MatrixChoiceTask/print.php index 9403d0c..314730f 100644 --- a/app/views/vips/exercises/MatrixChoiceTask/print.php +++ b/app/views/vips/exercises/MatrixChoiceTask/print.php @@ -17,9 +17,9 @@ <td style="white-space: nowrap;"> <? if (isset($response[$key]) && $response[$key] !== '' && $response[$key] != -1 && $print_correction): ?> <? if ($response[$key] == $entry['choice']): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> <? endif ?> <? endif ?> diff --git a/app/views/vips/exercises/MultipleChoiceTask/correct.php b/app/views/vips/exercises/MultipleChoiceTask/correct.php index 59fe5b6..2f2a6dc 100644 --- a/app/views/vips/exercises/MultipleChoiceTask/correct.php +++ b/app/views/vips/exercises/MultipleChoiceTask/correct.php @@ -20,9 +20,9 @@ <? if (isset($response[$key])): ?> <? if ((int) $response[$key] == $entry['score']): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> <? endif ?> <? endif ?> </div> diff --git a/app/views/vips/exercises/MultipleChoiceTask/print.php b/app/views/vips/exercises/MultipleChoiceTask/print.php index ea2d761..d352f17 100644 --- a/app/views/vips/exercises/MultipleChoiceTask/print.php +++ b/app/views/vips/exercises/MultipleChoiceTask/print.php @@ -18,9 +18,9 @@ <? if (isset($response[$key]) && $print_correction): ?> <? if ((int) $response[$key] == $entry['score']): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> <? endif ?> <? endif ?> </div> diff --git a/app/views/vips/exercises/SequenceTask/correct.php b/app/views/vips/exercises/SequenceTask/correct.php index 8093be0..72cfba5 100644 --- a/app/views/vips/exercises/SequenceTask/correct.php +++ b/app/views/vips/exercises/SequenceTask/correct.php @@ -37,10 +37,10 @@ <div class="correction_marker sequence"> <? if ($results[$i]['points'] == 1): ?> <span style="color: green;">}</span> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('richtig')]) ?> <? else: ?> <span style="color: red;">}</span> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['title' => _('falsch')]) ?> <? endif ?> </div> <? endif ?> @@ -49,9 +49,9 @@ <?= formatReady($answer['text']) ?> <? if ($results[$i]['points'] == 1): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> <? endif ?> </div> <? else: ?> diff --git a/app/views/vips/exercises/SequenceTask/print.php b/app/views/vips/exercises/SequenceTask/print.php index 485d4d7..1ccb76d 100644 --- a/app/views/vips/exercises/SequenceTask/print.php +++ b/app/views/vips/exercises/SequenceTask/print.php @@ -39,10 +39,10 @@ <div class="correction_marker sequence"> <? if ($results[$i]['points'] == 1): ?> <span style="color: green;">}</span> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('richtig')]) ?> <? else: ?> <span style="color: red;">}</span> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['title' => _('falsch')]) ?> <? endif ?> </div> <? endif ?> @@ -52,9 +52,9 @@ <? if ($print_correction): ?> <? if ($results[$i]['points'] == 1): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> <? endif ?> <? endif ?> </li> diff --git a/app/views/vips/exercises/SingleChoiceTask/correct.php b/app/views/vips/exercises/SingleChoiceTask/correct.php index a2796fb..cecc743 100644 --- a/app/views/vips/exercises/SingleChoiceTask/correct.php +++ b/app/views/vips/exercises/SingleChoiceTask/correct.php @@ -28,9 +28,9 @@ <? if (isset($response[$group]) && $response[$group] === "$key"): ?> <? if ($entry['score'] == 1): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> <? elseif ($key != -1): ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> <? endif ?> <? endif ?> </div> diff --git a/app/views/vips/exercises/SingleChoiceTask/print.php b/app/views/vips/exercises/SingleChoiceTask/print.php index 5ac9961..a61bc84 100644 --- a/app/views/vips/exercises/SingleChoiceTask/print.php +++ b/app/views/vips/exercises/SingleChoiceTask/print.php @@ -27,9 +27,9 @@ <? if ($print_correction): ?> <? if (isset($response[$group]) && $response[$group] === "$key"): ?> <? if ($entry['score'] == 1): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'correction_marker', 'title' => _('richtig')]) ?> <? elseif ($key != -1): ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['class' => 'correction_marker', 'title' => _('falsch')]) ?> <? endif ?> <? endif ?> <? endif ?> diff --git a/app/views/vips/exercises/TextLineTask/correct.php b/app/views/vips/exercises/TextLineTask/correct.php index 3457f2e..c87d531 100644 --- a/app/views/vips/exercises/TextLineTask/correct.php +++ b/app/views/vips/exercises/TextLineTask/correct.php @@ -16,13 +16,13 @@ <?= htmlReady($response[0]) ?> <? if ($results[0]['points'] == 1): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('richtig')]) ?> <? elseif ($results[0]['points'] == 0.5): ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_YELLOW)->asSvg(['title' => _('fast richtig')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_YELLOW)->asImg(['title' => _('fast richtig')]) ?> <? elseif (!$edit_solution || $results[0]['safe']): ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['title' => _('falsch')]) ?> <? else: ?> - <?= Icon::create('question', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('Unbekannte Antwort')]) ?> + <?= Icon::create('question', Icon::ROLE_STATUS_RED)->asImg(['title' => _('Unbekannte Antwort')]) ?> <? endif ?> <? endif ?> diff --git a/app/views/vips/exercises/TextLineTask/print.php b/app/views/vips/exercises/TextLineTask/print.php index ba86963..08944d2 100644 --- a/app/views/vips/exercises/TextLineTask/print.php +++ b/app/views/vips/exercises/TextLineTask/print.php @@ -13,11 +13,11 @@ <? if ($print_correction): ?> <? if ($results[0]['points'] == 1): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('richtig')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('richtig')]) ?> <? elseif ($results[0]['points'] == 0.5): ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_YELLOW)->asSvg(['title' => _('fast richtig')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_YELLOW)->asImg(['title' => _('fast richtig')]) ?> <? else: ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('falsch')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['title' => _('falsch')]) ?> <? endif ?> <? endif ?> <? else : ?> diff --git a/app/views/vips/exercises/TextTask/correct.php b/app/views/vips/exercises/TextTask/correct.php index 175de6c..69336a4 100644 --- a/app/views/vips/exercises/TextTask/correct.php +++ b/app/views/vips/exercises/TextTask/correct.php @@ -131,7 +131,7 @@ <tr> <td> <a href="<?= htmlReady($file_ref->getDownloadURL()) ?>"> - <?= Icon::create('file')->asSvg(['title' => _('Datei herunterladen')]) ?> + <?= Icon::create('file')->asImg(['title' => _('Datei herunterladen')]) ?> <?= htmlReady($file_ref->name) ?> </a> </td> diff --git a/app/views/vips/exercises/TextTask/solve.php b/app/views/vips/exercises/TextTask/solve.php index 62b2fa0..7425adc 100644 --- a/app/views/vips/exercises/TextTask/solve.php +++ b/app/views/vips/exercises/TextTask/solve.php @@ -97,7 +97,7 @@ <td> <input type="hidden" name="file_ids[]" value="<?= $file_ref->id ?>"> <a href="<?= htmlReady($file_ref->getDownloadURL()) ?>"> - <?= Icon::create('file')->asSvg(['title' => _('Datei herunterladen')]) ?> + <?= Icon::create('file')->asImg(['title' => _('Datei herunterladen')]) ?> <?= htmlReady($file_ref->name) ?> </a> </td> diff --git a/app/views/vips/sheets/add_exercise_dialog.php b/app/views/vips/sheets/add_exercise_dialog.php index 2858485..fbcd953 100644 --- a/app/views/vips/sheets/add_exercise_dialog.php +++ b/app/views/vips/sheets/add_exercise_dialog.php @@ -16,7 +16,7 @@ <div class="exercise_types"> <? foreach ($exercise_types as $type => $entry): ?> <button class="exercise_type" name="exercise_type" value="<?= htmlReady($type) ?>"> - <?= $type::getTypeIcon()->asSvg(40) ?> + <?= $type::getTypeIcon()->asImg(40) ?> <div class="exercise_type_description"> <span class="exercise_type_name"><?= htmlReady($entry['name']) ?></span> <span><?= htmlReady($type::getTypeDescription()) ?></span> diff --git a/app/views/vips/sheets/content_bar_icons.php b/app/views/vips/sheets/content_bar_icons.php index b0f98c1..5d6268a 100644 --- a/app/views/vips/sheets/content_bar_icons.php +++ b/app/views/vips/sheets/content_bar_icons.php @@ -1,19 +1,19 @@ <? if (isset($prev_exercise_url)): ?> <a href="<?= htmlReady($prev_exercise_url) ?>"> - <?= Icon::create('arr_1left')->asSvg(24, ['title' => _('Vorige Aufgabe')]) ?> + <?= Icon::create('arr_1left')->asImg(24, ['title' => _('Vorige Aufgabe')]) ?> </a> <? else: ?> <span> - <?= Icon::create('arr_1left', Icon::ROLE_INACTIVE)->asSvg(24) ?> + <?= Icon::create('arr_1left', Icon::ROLE_INACTIVE)->asImg(24) ?> </span> <? endif ?> <? if (isset($next_exercise_url)): ?> <a href="<?= htmlReady($next_exercise_url) ?>"> - <?= Icon::create('arr_1right')->asSvg(24, ['title' => _('Nächste Aufgabe')]) ?> + <?= Icon::create('arr_1right')->asImg(24, ['title' => _('Nächste Aufgabe')]) ?> </a> <? else: ?> <span> - <?= Icon::create('arr_1right', Icon::ROLE_INACTIVE)->asSvg(24) ?> + <?= Icon::create('arr_1right', Icon::ROLE_INACTIVE)->asImg(24) ?> </span> <? endif ?> diff --git a/app/views/vips/sheets/copy_assignment_dialog.php b/app/views/vips/sheets/copy_assignment_dialog.php index f7c8209..49eecb9 100644 --- a/app/views/vips/sheets/copy_assignment_dialog.php +++ b/app/views/vips/sheets/copy_assignment_dialog.php @@ -67,7 +67,7 @@ <?= htmlReady($assignment['test_title']) ?> <a href="<?= $controller->link_for('vips/sheets/show_assignment', ['cid' => $course_id, 'assignment_id' => $assignment['id']]) ?>" target="_blank"> - <?= Icon::create('link-intern')->asSvg(['title' => _('Vorschau anzeigen')]) ?> + <?= Icon::create('link-intern')->asImg(['title' => _('Vorschau anzeigen')]) ?> </a> </label> </td> diff --git a/app/views/vips/sheets/copy_exercise_dialog.php b/app/views/vips/sheets/copy_exercise_dialog.php index d825ce1..7eeec26 100644 --- a/app/views/vips/sheets/copy_exercise_dialog.php +++ b/app/views/vips/sheets/copy_exercise_dialog.php @@ -90,7 +90,7 @@ <a href="<?= $controller->link_for('vips/sheets/preview_exercise', ['assignment_id' => $exercise['assignment_id'], 'exercise_id' => $exercise['id']]) ?>" data-dialog="id=vips_preview;size=800x600" target="_blank"> - <?= Icon::create('question-circle')->asSvg(['title' => _('Vorschau anzeigen')]) ?> + <?= Icon::create('question-circle')->asImg(['title' => _('Vorschau anzeigen')]) ?> </a> </label> </td> diff --git a/app/views/vips/sheets/edit_assignment.php b/app/views/vips/sheets/edit_assignment.php index 5ced547..d6e1b78 100644 --- a/app/views/vips/sheets/edit_assignment.php +++ b/app/views/vips/sheets/edit_assignment.php @@ -81,8 +81,8 @@ <section> <input id="options-toggle" class="options-toggle" type="checkbox" value="on" <?= $assignment_id ? '' : 'checked' ?>> <a class="caption" href="#" role="button" data-toggles="#options-toggle" aria-controls="options-panel" aria-expanded="<?= $assignment_id ? 'false' : 'true' ?>"> - <?= Icon::create('arr_1down')->asSvg(['class' => 'toggle-open']) ?> - <?= Icon::create('arr_1right')->asSvg(['class' => 'toggle-closed']) ?> + <?= Icon::create('arr_1down')->asImg(['class' => 'toggle-open']) ?> + <?= Icon::create('arr_1right')->asImg(['class' => 'toggle-closed']) ?> <?= _('Weitere Einstellungen') ?> </a> @@ -191,8 +191,8 @@ <div class="practice-hidden exam-hidden"> <input id="feedback-toggle" class="options-toggle" type="checkbox" value="on"> <a class="caption" href="#" role="button" data-toggles="#feedback-toggle" aria-controls="feedback-panel" aria-expanded="false"> - <?= Icon::create('arr_1down')->asSvg(['class' => 'toggle-open']) ?> - <?= Icon::create('arr_1right')->asSvg(['class' => 'toggle-closed']) ?> + <?= Icon::create('arr_1down')->asImg(['class' => 'toggle-open']) ?> + <?= Icon::create('arr_1right')->asImg(['class' => 'toggle-closed']) ?> <?= _('Automatisches Feedback') ?> </a> diff --git a/app/views/vips/sheets/edit_exercise.php b/app/views/vips/sheets/edit_exercise.php index 41156e1..2650691 100644 --- a/app/views/vips/sheets/edit_exercise.php +++ b/app/views/vips/sheets/edit_exercise.php @@ -75,7 +75,7 @@ <td> <input type="hidden" name="file_ids[]" value="<?= $file_ref->id ?>"> <a href="<?= htmlReady($file_ref->getDownloadURL()) ?>" <?= $file_ref->getContentDisposition() === 'inline' ? 'target="_blank"' : '' ?>> - <?= Icon::create('file')->asSvg(['title' => _('Datei herunterladen')]) ?> + <?= Icon::create('file')->asImg(['title' => _('Datei herunterladen')]) ?> <?= htmlReady($file_ref->name) ?> </a> </td> @@ -122,8 +122,8 @@ <input id="options-toggle" class="options-toggle" type="checkbox" value="on"> <a class="caption" href="#" role="button" data-toggles="#options-toggle" aria-controls="options-panel" aria-expanded="false"> - <?= Icon::create('arr_1down')->asSvg(['class' => 'toggle-open']) ?> - <?= Icon::create('arr_1right')->asSvg(['class' => 'toggle-closed']) ?> + <?= Icon::create('arr_1down')->asImg(['class' => 'toggle-open']) ?> + <?= Icon::create('arr_1right')->asImg(['class' => 'toggle-closed']) ?> <?= _('Weitere Einstellungen') ?> </a> diff --git a/app/views/vips/sheets/show_assignment.php b/app/views/vips/sheets/show_assignment.php index 1494b74..d598e51 100644 --- a/app/views/vips/sheets/show_assignment.php +++ b/app/views/vips/sheets/show_assignment.php @@ -56,8 +56,8 @@ <form class="default width-1200" style="margin-bottom: 1.5ex;"> <input id="options-toggle" class="options-toggle" type="checkbox" value="on"> <a class="caption" href="#" role="button" data-toggles="#options-toggle" aria-controls="options-panel" aria-expanded="false"> - <?= Icon::create('arr_1down')->asSvg(['class' => 'toggle-open']) ?> - <?= Icon::create('arr_1right')->asSvg(['class' => 'toggle-closed']) ?> + <?= Icon::create('arr_1down')->asImg(['class' => 'toggle-open']) ?> + <?= Icon::create('arr_1right')->asImg(['class' => 'toggle-closed']) ?> <?= _('Teilnahmebedingungen') ?> </a> @@ -148,9 +148,9 @@ </td> <td style="text-align: center;"> <? if ($solution): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('ja')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('ja')]) ?> <? else : ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('nein')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['title' => _('nein')]) ?> <? endif ?> </td> <td style="text-align: center;"> diff --git a/app/views/vips/sheets/show_exercise_link.php b/app/views/vips/sheets/show_exercise_link.php index 1abc369..6f41a6a 100644 --- a/app/views/vips/sheets/show_exercise_link.php +++ b/app/views/vips/sheets/show_exercise_link.php @@ -17,7 +17,7 @@ </div> <div class="sidebar_exercise_state"> <? if ($assignment->getSolution($solver_id, $item->task_id)): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('Aufgabe bearbeitet')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('Aufgabe bearbeitet')]) ?> <? endif ?> </div> </a> diff --git a/app/views/vips/solutions/assignment_solutions.php b/app/views/vips/solutions/assignment_solutions.php index 472d7ef..388574c 100644 --- a/app/views/vips/solutions/assignment_solutions.php +++ b/app/views/vips/solutions/assignment_solutions.php @@ -65,8 +65,8 @@ <th style="width: 1em;"></th> <th> <a href="#" class="solution-toggle"> - <?= Icon::create('arr_1right')->asSvg(['class' => 'arrow_all', 'title' => _('Aufgaben aller Teilnehmenden anzeigen')]) ?> - <?= Icon::create('arr_1down')->asSvg(['class' => 'arrow_all', 'title' => _('Aufgaben aller Teilnehmenden verstecken'), 'style' => 'display: none;']) ?> + <?= Icon::create('arr_1right')->asImg(['class' => 'arrow_all', 'title' => _('Aufgaben aller Teilnehmenden anzeigen')]) ?> + <?= Icon::create('arr_1down')->asImg(['class' => 'arrow_all', 'title' => _('Aufgaben aller Teilnehmenden verstecken'), 'style' => 'display: none;']) ?> <?= _('Teilnehmende') ?> </a> </th> @@ -108,8 +108,8 @@ <td> <a href="#" class="solution-toggle"> - <?= Icon::create('arr_1right')->asSvg(['class' => 'solution-open', 'title' => _('Aufgaben anzeigen')]) ?> - <?= Icon::create('arr_1down')->asSvg(['class' => 'solution-close', 'title' => _('Aufgaben verstecken')]) ?> + <?= Icon::create('arr_1right')->asImg(['class' => 'solution-open', 'title' => _('Aufgaben anzeigen')]) ?> + <?= Icon::create('arr_1down')->asImg(['class' => 'solution-close', 'title' => _('Aufgaben verstecken')]) ?> <?= htmlReady($solver['name']) ?> </a> diff --git a/app/views/vips/solutions/assignments_list.php b/app/views/vips/solutions/assignments_list.php index 851fd47..c685e9a 100644 --- a/app/views/vips/solutions/assignments_list.php +++ b/app/views/vips/solutions/assignments_list.php @@ -109,9 +109,9 @@ <? if (!isset($ass['uncorrected_solutions'])): ?> – <? elseif ($ass['uncorrected_solutions'] == 0): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('ja')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('ja')]) ?> <? else : ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('nein')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['title' => _('nein')]) ?> <? endif ?> </td> diff --git a/app/views/vips/solutions/edit_solution.php b/app/views/vips/solutions/edit_solution.php index 327342f..fb00f6b 100644 --- a/app/views/vips/solutions/edit_solution.php +++ b/app/views/vips/solutions/edit_solution.php @@ -25,10 +25,10 @@ <? /* previous solver */ ?> <? if (isset($prev_solver)): ?> <a href="<?= $controller->edit_solution(['assignment_id' => $assignment_id, 'exercise_id' => $exercise_id, 'solver_id' => $prev_solver['user_id'], 'view' => $view]) ?>"> - <?= Icon::create('arr_1left')->asSvg(['title' => _('Voriger Teilnehmer / vorige Teilnehmerin')]) ?> + <?= Icon::create('arr_1left')->asImg(['title' => _('Voriger Teilnehmer / vorige Teilnehmerin')]) ?> </a> <? else: ?> - <?= Icon::create('arr_1left', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Keiner der vorhergehenden Teilnehmenden hat diese Aufgabe bearbeitet')]) ?> + <?= Icon::create('arr_1left', Icon::ROLE_INACTIVE)->asImg(['title' => _('Keiner der vorhergehenden Teilnehmenden hat diese Aufgabe bearbeitet')]) ?> <? endif ?> <? /* overview */ ?> @@ -39,10 +39,10 @@ <? /* next solver */ ?> <? if (isset($next_solver)): ?> <a href="<?= $controller->edit_solution(['assignment_id' => $assignment_id, 'exercise_id' => $exercise_id, 'solver_id' => $next_solver['user_id'], 'view' => $view]) ?>"> - <?= Icon::create('arr_1right')->asSvg(['title' => _('Nächster Teilnehmer / nächste Teilnehmerin')]) ?> + <?= Icon::create('arr_1right')->asImg(['title' => _('Nächster Teilnehmer / nächste Teilnehmerin')]) ?> </a> <? else: ?> - <?= Icon::create('arr_1right', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Keiner der nachfolgenden Teilnehmenden hat diese Aufgabe bearbeitet')]) ?> + <?= Icon::create('arr_1right', Icon::ROLE_INACTIVE)->asImg(['title' => _('Keiner der nachfolgenden Teilnehmenden hat diese Aufgabe bearbeitet')]) ?> <? endif ?> / @@ -50,10 +50,10 @@ <? /* previous exercise */ ?> <? if (isset($prev_exercise)): ?> <a href="<?= $controller->edit_solution(['assignment_id' => $assignment_id, 'exercise_id' => $prev_exercise['id'], 'solver_id' => $solver_id, 'view' => $view]) ?>"> - <?= Icon::create('arr_1left')->asSvg(['title' => _('Vorige Aufgabe')]) ?> + <?= Icon::create('arr_1left')->asImg(['title' => _('Vorige Aufgabe')]) ?> </a> <? else: ?> - <?= Icon::create('arr_1left', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Die teilnehmende Person hat keine der vorhergehenden Aufgaben bearbeitet')]) ?> + <?= Icon::create('arr_1left', Icon::ROLE_INACTIVE)->asImg(['title' => _('Die teilnehmende Person hat keine der vorhergehenden Aufgaben bearbeitet')]) ?> <? endif ?> <? /* exercise name */ ?> @@ -62,10 +62,10 @@ <? /* next exercise */ ?> <? if (isset($next_exercise)): ?> <a href="<?= $controller->edit_solution(['assignment_id' => $assignment_id, 'exercise_id' => $next_exercise['id'], 'solver_id' => $solver_id, 'view' => $view]) ?>"> - <?= Icon::create('arr_1right')->asSvg(['title' => _('Nächste Aufgabe')]) ?> + <?= Icon::create('arr_1right')->asImg(['title' => _('Nächste Aufgabe')]) ?> </a> <? else: ?> - <?= Icon::create('arr_1right', Icon::ROLE_INACTIVE)->asSvg(['title' => _('Die teilnehmende Person hat keine der nachfolgenden Aufgaben bearbeitet')]) ?> + <?= Icon::create('arr_1right', Icon::ROLE_INACTIVE)->asImg(['title' => _('Die teilnehmende Person hat keine der nachfolgenden Aufgaben bearbeitet')]) ?> <? endif ?> </div> @@ -147,7 +147,7 @@ <td> <input type="hidden" name="file_ids[]" value="<?= htmlReady($file_ref->id) ?>"> <a href="<?= htmlReady($file_ref->getDownloadURL()) ?>"> - <?= Icon::create('file')->asSvg(['title' => _('Datei herunterladen')]) ?> + <?= Icon::create('file')->asImg(['title' => _('Datei herunterladen')]) ?> <?= htmlReady($file_ref->name) ?> </a> </td> diff --git a/app/views/vips/solutions/feedback_files_table.php b/app/views/vips/solutions/feedback_files_table.php index 8c6757c..dff9869 100644 --- a/app/views/vips/solutions/feedback_files_table.php +++ b/app/views/vips/solutions/feedback_files_table.php @@ -31,7 +31,7 @@ <tr> <td> <a href="<?= htmlReady($file_ref->getDownloadURL()) ?>"> - <?= Icon::create('file')->asSvg(['title' => _('Datei herunterladen')]) ?> + <?= Icon::create('file')->asImg(['title' => _('Datei herunterladen')]) ?> <?= htmlReady($file_ref->name) ?> </a> </td> diff --git a/app/views/vips/solutions/student_assignment_solutions.php b/app/views/vips/solutions/student_assignment_solutions.php index b279a36..d5b717a 100644 --- a/app/views/vips/solutions/student_assignment_solutions.php +++ b/app/views/vips/solutions/student_assignment_solutions.php @@ -64,9 +64,9 @@ </td> <td style="text-align: center;"> <? if ($solution): ?> - <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asSvg(['title' => _('ja')]) ?> + <?= Icon::create('accept', Icon::ROLE_STATUS_GREEN)->asImg(['title' => _('ja')]) ?> <? else : ?> - <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asSvg(['title' => _('nein')]) ?> + <?= Icon::create('decline', Icon::ROLE_STATUS_RED)->asImg(['title' => _('nein')]) ?> <? endif ?> </td> <td style="text-align: center;"> diff --git a/lib/admissionrules/coursememberadmission/templates/info.php b/lib/admissionrules/coursememberadmission/templates/info.php index 8616aad..9c844e3 100644 --- a/lib/admissionrules/coursememberadmission/templates/info.php +++ b/lib/admissionrules/coursememberadmission/templates/info.php @@ -14,7 +14,7 @@ <li> <strong><?= htmlReady($course->getFullName('number-name-semester')) ?></strong> <a href="<?= URLHelper::getLink('dispatch.php/course/details/index/' . $course->id) ?>" data-dialog> - <?= Icon::create('info-circle')->asSvg([ + <?= Icon::create('info-circle')->asImg([ 'title' => _('Veranstaltungsdetails aufrufen') ]) ?> </a> diff --git a/lib/classes/Icon.php b/lib/classes/Icon.php index 509664e..8306181 100644 --- a/lib/classes/Icon.php +++ b/lib/classes/Icon.php @@ -198,7 +198,7 @@ class Icon implements JsonSerializable */ public function __toString() { - return $this->asSvg(); + return $this->asImg(); } public function jsonSerialize(): mixed @@ -207,35 +207,49 @@ class Icon implements JsonSerializable } /** - * Renders the icon inside an img html tag. + * Renders the icon inside as an svg image. * * @param int $size Optional; Defines the dimension in px of the rendered icon; FALSE prevents any * width or height attributes * @param Array $view_attributes Optional; Additional attributes to pass * into the rendered output * @return String containing the html representation for the icon. + * + * @deprecated will be removed in Stud.IP 7.0. Use `asImg` instead. */ - public function asImg($size = null, $view_attributes = []) + public function asSvg($size = self::SIZE_DEFAULT, $view_attributes = []): string { - if (is_array($size)) { - [$view_attributes, $size] = [$size, null]; - } - return sprintf( - '<img %s>', - arrayToHtmlAttributes( - $this->prepareHTMLAttributes($size, $view_attributes) - ) - ); + return $this->asImg(...func_get_args()); } - public function asSvg($size = self::SIZE_DEFAULT, $view_attributes = []): string - { - if (self::isStatic($this->shape)) { - return $this->asImg($size, $view_attributes); + /** + * Renders the icon as an HTML image. + * + * @param int $size Optional; Defines the dimension in px of the rendered icon; FALSE prevents any + * width or height attributes + * @param Array $view_attributes Optional; Additional attributes to pass + * into the rendered output + * @param bool $force_img_tag Optional; If true, the icon will always be rendered as an img tag. + * @return String containing the html representation for the icon. + */ + public function asImg( + $size = self::SIZE_DEFAULT, + $view_attributes = [], + bool $force_img_tag = false + ): string { + if (is_array($size)) { + [$view_attributes, $size] = [$size, self::SIZE_DEFAULT]; } - if (is_array($size)) { - [$view_attributes, $size] = [$size, $size['size'] ?? self::SIZE_DEFAULT]; + $size ??= self::SIZE_DEFAULT; + + if ($force_img_tag || self::isStatic($this->shape)) { + return sprintf( + '<img %s>', + arrayToHtmlAttributes( + $this->prepareHTMLAttributes($size, $view_attributes) + ) + ); } $cacheKey = md5(json_encode([ @@ -305,7 +319,7 @@ class Icon implements JsonSerializable $text = isset($view_attributes['text']) ? htmlReady($view_attributes['text']) : ''; - $svgContent = $this->asSvg($size, $view_attributes); + $svgContent = $this->asImg($size, $view_attributes); if ($without_label) { return sprintf( diff --git a/lib/classes/forms/Link.php b/lib/classes/forms/Link.php index eeb0244..6f26f28 100644 --- a/lib/classes/forms/Link.php +++ b/lib/classes/forms/Link.php @@ -159,7 +159,7 @@ class Link extends Part '<div class="formpart"><a href="%1$s" %2$s>%3$s %4$s</a></div>', \URLHelper::getLink($this->url, [], true), arrayToHtmlAttributes($this->attributes), - $this->icon ? $this->icon->asSvg(['class' => 'text-bottom']) : '', + $this->icon ? $this->icon->asImg(['class' => 'text-bottom']) : '', htmlReady($this->label) ); } diff --git a/lib/classes/globalsearch/GlobalSearchCourses.php b/lib/classes/globalsearch/GlobalSearchCourses.php index a02e691..939203c 100644 --- a/lib/classes/globalsearch/GlobalSearchCourses.php +++ b/lib/classes/globalsearch/GlobalSearchCourses.php @@ -185,21 +185,21 @@ class GlobalSearchCourses extends GlobalSearchModule implements GlobalSearchFull 'decline-circle', Icon::ROLE_STATUS_YELLOW, tooltip2(_('Eingeschränkter Zugang')) - )->asSvg(); + )->asImg(); break; case 2: $admission_state = Icon::create( 'decline-circle', Icon::ROLE_STATUS_RED, tooltip2(_('Kein Zugang')) - )->asSvg(); + )->asImg(); break; default: $admission_state = Icon::create( 'check-circle', Icon::ROLE_STATUS_GREEN, tooltip2(_('Uneingeschränkter Zugang')) - )->asSvg(); + )->asImg(); } } diff --git a/lib/classes/globalsearch/GlobalSearchStudygroups.php b/lib/classes/globalsearch/GlobalSearchStudygroups.php index 74bc11f..a9f1398 100644 --- a/lib/classes/globalsearch/GlobalSearchStudygroups.php +++ b/lib/classes/globalsearch/GlobalSearchStudygroups.php @@ -188,21 +188,21 @@ class GlobalSearchStudygroups extends GlobalSearchModule implements GlobalSearch 'decline-circle', Icon::ROLE_STATUS_YELLOW, tooltip2(_('Eingeschränkter Zugang')) - )->asSvg(); + )->asImg(); break; case 2: $admission_state = Icon::create( 'decline-circle', Icon::ROLE_STATUS_RED, tooltip2(_('Kein Zugang')) - )->asSvg(); + )->asImg(); break; default: $admission_state = Icon::create( 'check-circle', Icon::ROLE_STATUS_GREEN, tooltip2(_('Uneingeschränkter Zugang')) - )->asSvg(); + )->asImg(); } } diff --git a/lib/classes/sidebar/CourseManagementSelectWidget.php b/lib/classes/sidebar/CourseManagementSelectWidget.php index 8f10eaa..3ce9d80 100644 --- a/lib/classes/sidebar/CourseManagementSelectWidget.php +++ b/lib/classes/sidebar/CourseManagementSelectWidget.php @@ -19,7 +19,7 @@ class CourseManagementSelectWidget extends SelectWidget '<a href="%s" title="%s" data-dialog="size=auto">%s</a>', URLHelper::getURL('dispatch.php/course/management/order_settings', ['cid' => $this->course->id, 'from' => Request::url()]), _('Sortiereinstellungen'), - Icon::create('settings')->asSvg(['title' => _('Sortiereinstellungen')]) + Icon::create('settings')->asImg(['title' => _('Sortiereinstellungen')]) ); $this->setExtra($extra); $this->class = 'nested-select'; diff --git a/lib/classes/sidebar/LinkElement.php b/lib/classes/sidebar/LinkElement.php index 0376a47..9214f10 100644 --- a/lib/classes/sidebar/LinkElement.php +++ b/lib/classes/sidebar/LinkElement.php @@ -241,7 +241,7 @@ class LinkElement extends WidgetElement implements ArrayAccess '<%1$s %2$s>%3$s%4$s</%1$s>', $tag, arrayToHtmlAttributes($attributes), - $icon->asSvg(), + $icon->asImg(), htmlReady($this->label) ); } @@ -257,7 +257,7 @@ class LinkElement extends WidgetElement implements ArrayAccess '<button formaction="%s" %s>%s %s</button>', htmlReady($this->url), arrayToHtmlAttributes((array) $this->attributes), - $icon?->asSvg() ?? '', + $icon?->asImg() ?? '', htmlReady($this->label) ); } diff --git a/lib/ilias_interface/IliasModule.php b/lib/ilias_interface/IliasModule.php index f792c5d..84336ab 100644 --- a/lib/ilias_interface/IliasModule.php +++ b/lib/ilias_interface/IliasModule.php @@ -374,6 +374,6 @@ class IliasModule if (!$this->icon_file) { $this->icon_file = 'learnmodule'; } - return Icon::create($this->icon_file, 'inactive', [])->asSvg(); + return Icon::create($this->icon_file, 'inactive', [])->asImg(); } } diff --git a/lib/models/OERReview.php b/lib/models/OERReview.php index 09dc73f..af672cd 100644 --- a/lib/models/OERReview.php +++ b/lib/models/OERReview.php @@ -204,15 +204,15 @@ class OERReview extends BlubberThread $data['thread_posting']['html'] .= "<div>"; $rating = round($this['metadata']['rating'], 1); $v = $rating >= 0.75 ? "" : ($rating >= 0.25 ? "-halffull" : "-empty"); - $data['thread_posting']['html'] .= Icon::create("star{$v}", 'info')->asSvg(25); + $data['thread_posting']['html'] .= Icon::create("star{$v}", 'info')->asImg(25); $v = $rating >= 1.75 ? "" : ($rating >= 1.25 ? "-halffull" : "-empty"); - $data['thread_posting']['html'] .= Icon::create("star{$v}", 'info')->asSvg(25); + $data['thread_posting']['html'] .= Icon::create("star{$v}", 'info')->asImg(25); $v = $rating >= 2.75 ? "" : ($rating >= 2.25 ? "-halffull" : "-empty"); - $data['thread_posting']['html'] .= Icon::create("star{$v}", 'info')->asSvg(25); + $data['thread_posting']['html'] .= Icon::create("star{$v}", 'info')->asImg(25); $v = $rating >= 3.75 ? "" : ($rating >= 3.25 ? "-halffull" : "-empty"); - $data['thread_posting']['html'] .= Icon::create("star{$v}", 'info')->asSvg(25); + $data['thread_posting']['html'] .= Icon::create("star{$v}", 'info')->asImg(25); $v = $rating >= 4.75 ? "" : ($rating >= 4.25 ? "-halffull" : "-empty"); - $data['thread_posting']['html'] .= Icon::create("star{$v}", 'info')->asSvg(25); + $data['thread_posting']['html'] .= Icon::create("star{$v}", 'info')->asImg(25); $data['thread_posting']['html'] .= "</div>"; return $data; diff --git a/lib/models/resources/ResourcePropertyDefinition.php b/lib/models/resources/ResourcePropertyDefinition.php index 1e2333d..f878975 100644 --- a/lib/models/resources/ResourcePropertyDefinition.php +++ b/lib/models/resources/ResourcePropertyDefinition.php @@ -254,7 +254,7 @@ class ResourcePropertyDefinition extends SimpleORMap ), $this->__toString(), $search->render(), - Icon::create('refresh')->asSvg( + Icon::create('refresh')->asImg( [ 'class' => 'delete-assigned-user-icon enter-accessible', 'data-input-name' => $input_name, diff --git a/lib/navigation/Navigation.php b/lib/navigation/Navigation.php index 6f4de69..9f26ab6 100644 --- a/lib/navigation/Navigation.php +++ b/lib/navigation/Navigation.php @@ -202,7 +202,7 @@ class Navigation implements IteratorAggregate public function getImageTag() { if ($image = $this->getImage()) { - return $image->asSvg($this->getLinkAttributes()); + return $image->asImg($this->getLinkAttributes()); } else { return ''; } diff --git a/lib/statusgruppe.inc.php b/lib/statusgruppe.inc.php index 993ae08..a9c382c 100644 --- a/lib/statusgruppe.inc.php +++ b/lib/statusgruppe.inc.php @@ -161,7 +161,7 @@ function get_role_data_recursive($roles, $user_or_id, $default_entries, $level = if ($role['user_there'] && $role['visible']) { $out .= '<tr><td>' - . Icon::create('arr_1right', Icon::ROLE_INFO)->asSvg(Icon::SIZE_INLINE, []) + . Icon::create('arr_1right', Icon::ROLE_INFO)->asImg(Icon::SIZE_INLINE, []) . '</td><td colspan="2"><b>'. htmlReady($new_pred) .'</b></td></tr>'; $entries = DataFieldEntry::getDataFieldEntries([$user->id, $role_id]); diff --git a/templates/admin/topLinks.php b/templates/admin/topLinks.php index a97ef75..08336b3 100644 --- a/templates/admin/topLinks.php +++ b/templates/admin/topLinks.php @@ -18,7 +18,7 @@ <? if (isset($last_one)) : ?> <div style="float: left;"> <a href="<?= URLHelper::getLink('?#admin_top_links', ['cid' => $adminList[$last_one]['Seminar_id']]) ?>" title="<?= htmlReady($adminList[$last_one]['Name']) ?>"> - <?= Icon::create('arr_1left')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('arr_1left')->asImg(['class' => 'text-bottom']) ?> <?= _("zurück") ?> </a> </div> @@ -27,13 +27,13 @@ <div style="float: right;"> <a href="<?= URLHelper::getLink('?#admin_top_links', ['cid' => $adminList[$next_one]['Seminar_id']]) ?>" title="<?= htmlReady($adminList[$next_one]['Name']) ?>"> <?= _("vor") ?> - <?= Icon::create('arr_1right')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('arr_1right')->asImg(['class' => 'text-bottom']) ?> </a> </div> <? endif ?> <div> <a href="<?= URLHelper::getLink('adminarea_start.php', ['list' => 'TRUE']) ?>"> - <?= Icon::create('arr_1up')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('arr_1up')->asImg(['class' => 'text-bottom']) ?> <?= _("Liste") ?> </a> </div> diff --git a/templates/blubber/coursegroup_context.php b/templates/blubber/coursegroup_context.php index 78c4627..b8c754b 100644 --- a/templates/blubber/coursegroup_context.php +++ b/templates/blubber/coursegroup_context.php @@ -36,7 +36,7 @@ <? $folder = $thread->statusgruppe->getFolder() ?> <div> <a href="<?= URLHelper::getLink('dispatch.php/course/files/index/'.$folder->getId(), ['cid' => $course->getId()]) ?>"> - <?= $folder->getIcon('clickable')->asSvg(25, ['class' => 'text-bottom']) ?> + <?= $folder->getIcon('clickable')->asImg(25, ['class' => 'text-bottom']) ?> <?= htmlReady($folder->name) ?> </a> </div> diff --git a/templates/blubber/disable-notifications.php b/templates/blubber/disable-notifications.php index f7900dd..813da62 100644 --- a/templates/blubber/disable-notifications.php +++ b/templates/blubber/disable-notifications.php @@ -5,8 +5,8 @@ class="followunfollow<?= $unfollowed ? " unfollowed" : "" ?>" title="<?= _('Benachrichtigungen für diese Konversation abstellen.') ?>" data-thread_id="<?= htmlReady($thread->id) ?>"> - <?= Icon::create('decline')->asSvg(['class' => 'follow text-bottom']) ?> - <?= Icon::create('notification2')->asSvg(['class' => 'unfollow text-bottom']) ?> + <?= Icon::create('decline')->asImg(['class' => 'follow text-bottom']) ?> + <?= Icon::create('notification2')->asImg(['class' => 'unfollow text-bottom']) ?> <?= _('Benachrichtigungen aktiviert') ?> </a> </div> diff --git a/templates/blubber/global_context.php b/templates/blubber/global_context.php index e41e0f0..0568782 100644 --- a/templates/blubber/global_context.php +++ b/templates/blubber/global_context.php @@ -10,8 +10,8 @@ aria-pressed="<?= $unfollowed ? 'false' : 'true' ?>" role="button" data-thread_id="global"> - <?= Icon::create('decline')->asSvg(['class' => 'follow text-bottom']) ?> - <?= Icon::create('notification2')->asSvg(['class' => 'unfollow text-bottom']) ?> + <?= Icon::create('decline')->asImg(['class' => 'follow text-bottom']) ?> + <?= Icon::create('notification2')->asImg(['class' => 'unfollow text-bottom']) ?> <?= _('Benachrichtigungen aktiviert') ?> </a> </div> diff --git a/templates/blubber/private_context.php b/templates/blubber/private_context.php index a943ba3..1e7d642 100644 --- a/templates/blubber/private_context.php +++ b/templates/blubber/private_context.php @@ -1,7 +1,7 @@ <div class="blubber_private_info indented"> <div class="icon"> - <?= Icon::create('group3', Icon::ROLE_INFO)->asSvg(50, ['title' => _('Dies ist ein privater Blubber.')]) ?> + <?= Icon::create('group3', Icon::ROLE_INFO)->asImg(50, ['title' => _('Dies ist ein privater Blubber.')]) ?> </div> <ul class="clean members"> @@ -14,7 +14,7 @@ <? if ($user) : ?> <? if ($user->getId() !== $GLOBALS['user']->id && count($mentions) > 2) : ?> <a class="float_right" href="<?= URLHelper::getLink('dispatch.php/blubber/write_to/' . $user->getId()) ?>" data-dialog title="<?= _('Anblubbern') ?>"> - <?= Icon::create('blubber')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('blubber')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> <? if ($user->getId() === $GLOBALS['user']->id) : ?> @@ -23,7 +23,7 @@ data-dialog="size=auto" title="<?= _('Gruppe verlassen') ?>" data-confirm="<?= _('Private Konversation wirklich verlassen?') ?>"> - <?= Icon::create('door-leave')->asSvg(['class' => 'text-bottom']) ?> + <?= Icon::create('door-leave')->asImg(['class' => 'text-bottom']) ?> </a> <? endif ?> <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => $user['username']]) ?>"> @@ -39,7 +39,7 @@ <? endforeach ?> <li> <a href="<?= URLHelper::getLink('dispatch.php/blubber/add_member_to_private/'.$thread->getId()) ?>" data-dialog="width=600;height=300"> - <?= Icon::create('add')->asSvg(25, ['class' => 'text-bottom']) ?> + <?= Icon::create('add')->asImg(25, ['class' => 'text-bottom']) ?> </a> </li> </ul> diff --git a/templates/blubber/public_context.php b/templates/blubber/public_context.php index ea0f643..5bb3591 100644 --- a/templates/blubber/public_context.php +++ b/templates/blubber/public_context.php @@ -6,7 +6,7 @@ <a href="<?= URLHelper::getLink('dispatch.php/blubber/compose/'.$thread->getId()) ?>" data-dialog title="<?= _('Blubber bearbeiten') ?>"> - <?= Icon::create('edit')->asSvg(30) ?> + <?= Icon::create('edit')->asImg(30) ?> </a> <form action="<?= URLHelper::getLink('dispatch.php/blubber/delete/'.$thread->getId()) ?>" method="post" diff --git a/templates/contact/header-groups.php b/templates/contact/header-groups.php index 48776be..ae7d262 100644 --- a/templates/contact/header-groups.php +++ b/templates/contact/header-groups.php @@ -32,7 +32,7 @@ </a> <? if ($filter == $group_id): ?> <a href="<?= URLHelper::getLink('dispatch.php/messages/write?', compact('group_id')) ?>"> - <?= Icon::create('mail')->asSvg(['title' => _('Nachricht an alle Personen dieser Gruppe schicken')]) ?> + <?= Icon::create('mail')->asImg(['title' => _('Nachricht an alle Personen dieser Gruppe schicken')]) ?> </a> <? endif; ?> </td> diff --git a/templates/contentbar/contentbar.php b/templates/contentbar/contentbar.php index 34dab2a..a4632ca 100644 --- a/templates/contentbar/contentbar.php +++ b/templates/contentbar/contentbar.php @@ -14,10 +14,10 @@ <div class="contentbar-wrapper-left"> <nav class="contentbar-breadcrumb"> <? if ($toc->isActive()): ?> - <?= $icon->asSvg(24, ['class' => 'text-bottom contentbar-icon']) ?> + <?= $icon->asImg(24, ['class' => 'text-bottom contentbar-icon']) ?> <? else: ?> <a href="<?= $toc->getUrl() ?>" title="<?= htmlReady($toc->getTitle()) ?>" class="contentbar-icon"> - <?= $icon->asSvg(24, ['class' => 'text-bottom']) ?> + <?= $icon->asImg(24, ['class' => 'text-bottom']) ?> </a> <? endif ?> <?= $breadcrumbs->render() ?> diff --git a/templates/forms/form.php b/templates/forms/form.php index f2d0eb5..2a53e4e 100644 --- a/templates/forms/form.php +++ b/templates/forms/form.php @@ -55,7 +55,7 @@ $form_id = md5(uniqid()); v-if="STUDIPFORM_REQUIRED.length > 0 || STUDIPFORM_VALIDATIONNOTES.length > 0"> <header> <h1> - <?= Icon::create('info-circle', Icon::ROLE_INFO)->asSvg(['class' => 'text-bottom validation_notes_icon']) ?> + <?= Icon::create('info-circle', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom validation_notes_icon']) ?> <?= _('Hinweise zum Ausfüllen des Formulars') ?> </h1> </header> diff --git a/templates/header-navigation-item.php b/templates/header-navigation-item.php index 511b803..76a3d4c 100644 --- a/templates/header-navigation-item.php +++ b/templates/header-navigation-item.php @@ -17,7 +17,7 @@ $attr_str = arrayToHtmlAttributes($attributes); <li id="nav_<?= $path ?>"<? if ($nav->isActive()) : ?> class="active"<? endif ?>> <a href="<?= URLHelper::getLink($nav->getURL(), $link_params) ?>" <?= $attr_str ?>> - <?= $nav->getImage()->asSvg(32, ['class' => 'headericon original', 'title' => null]) ?> + <?= $nav->getImage()->asImg(32, ['class' => 'headericon original', 'title' => null]) ?> <div class="navtitle"><?= htmlReady($nav->getTitle()) ?></div> </a> </li> diff --git a/templates/header.php b/templates/header.php index eed71fe..dda7c4b 100644 --- a/templates/header.php +++ b/templates/header.php @@ -140,7 +140,7 @@ if ($navigation) { aria-expanded="false" > <span class="count" aria-hidden="true"><?= count($notifications) ?></span> - <?= Icon::create('notification2', Icon::ROLE_INFO)->asSvg() ?> + <?= Icon::create('notification2', Icon::ROLE_INFO)->asImg() ?> </button> <input type="checkbox" id="notification_checkbox"> <div class="list below" id="notification_list"> @@ -180,13 +180,13 @@ if ($navigation) { <li id="responsive-toggle-fullscreen"> <button class="styleless" id="fullscreen-off" title="<?= _('Kompakte Navigation ausschalten') ?>"> - <?= Icon::create('screen-standard', Icon::ROLE_INFO_ALT)->asSvg(24) ?> + <?= Icon::create('screen-standard', Icon::ROLE_INFO_ALT)->asImg(24) ?> </button> </li> <li id="responsive-toggle-focusmode"> <button class="styleless consuming_mode_trigger" id="focusmode-on" title="<?= _('Vollbild aktivieren') ?>"> - <?= Icon::create('screen-full', Icon::ROLE_INFO_ALT)->asSvg(24) ?> + <?= Icon::create('screen-full', Icon::ROLE_INFO_ALT)->asImg(24) ?> </button> </li> </ul> @@ -209,7 +209,7 @@ if ($navigation) { <input type="checkbox" id="header-sink"> <label for="header-sink"> <a class="canvasready" href="#"> - <?= Icon::create('action', 'navigation')->asSvg(28, [ + <?= Icon::create('action', 'navigation')->asImg(28, [ 'class' => 'headericon original', 'title' => '', 'alt' => '', diff --git a/templates/helpbar/helpbar.php b/templates/helpbar/helpbar.php index 79d4bdf..6f8efbb 100644 --- a/templates/helpbar/helpbar.php +++ b/templates/helpbar/helpbar.php @@ -9,7 +9,7 @@ <a id="helpbar_icon" href="#" class="helpbar-toggler" data-toggles=".helpbar" role="button" title="<?= _('Hilfelasche anzeigen/verstecken') ?>" aria-controls="helpbar-content" aria-expanded="<?= $open ? 'true' : 'false' ?>"> - <?= Icon::create('question-circle')->asSvg(24, ['alt' => '']) ?> + <?= Icon::create('question-circle')->asImg(24, ['alt' => '']) ?> </a> <div class="helpbar" id="helpbar-content" <? if (!$open) echo 'style="display: none"'; ?>> @@ -18,28 +18,28 @@ <a href="#" class="helpbar-toggler" data-toggles=".helpbar" aria-hidden="true" role="button" title="<?= _('Hilfelasche verstecken') ?>" aria-controls="helpbar-content" aria-expanded="<?= $open ? 'true' : 'false' ?>"> - <?= Icon::create('decline-circle', Icon::ROLE_INFO_ALT)->asSvg(24, ['alt' => '']) ?> + <?= Icon::create('decline-circle', Icon::ROLE_INFO_ALT)->asImg(24, ['alt' => '']) ?> </a> </h2> <ul class="helpbar-widgets"> <? foreach ($widgets as $index => $widget): ?> <li> <? if ($widget->icon): ?> - <?= is_string($widget->icon) ? Assets::img($widget->icon, ['class' => 'helpbar-widget-icon']) : $widget->icon->asSvg(['class' => 'helpbar-widget-icon', 'alt' => '']) ?> + <?= is_string($widget->icon) ? Assets::img($widget->icon, ['class' => 'helpbar-widget-icon']) : $widget->icon->asImg(['class' => 'helpbar-widget-icon', 'alt' => '']) ?> <? endif; ?> <?= $widget->render(['base_class' => 'helpbar'])?> <div class="helpbar-widget-admin-icons"> <? if ($widget->edit_link): ?> <a href="<?=$widget->edit_link?>" data-dialog="size=auto;reload-on-close"> - <?= Icon::create('edit', 'info_alt')->asSvg(['title' => _('Hilfe-Text bearbeiten'), 'alt' => '']) ?></a> + <?= Icon::create('edit', 'info_alt')->asImg(['title' => _('Hilfe-Text bearbeiten'), 'alt' => '']) ?></a> <? endif; ?> <? if ($widget->delete_link): ?> <a href="<?=$widget->delete_link?>" data-dialog="size=auto;reload-on-close"> - <?= Icon::create('trash', 'info_alt')->asSvg(['title' => _('Hilfe-Text löschen'), 'alt' => '']) ?></a> + <?= Icon::create('trash', 'info_alt')->asImg(['title' => _('Hilfe-Text löschen'), 'alt' => '']) ?></a> <? endif; ?> <? if ($widget->add_link): ?> <a href="<?=$widget->add_link?>" data-dialog="size=auto;reload-on-close"> - <?= Icon::create('add', 'info_alt')->asSvg(['title' => _('Neuer Hilfe-Text'), 'alt' => '']) ?></a> + <?= Icon::create('add', 'info_alt')->asImg(['title' => _('Neuer Hilfe-Text'), 'alt' => '']) ?></a> <? endif; ?> </div> </li> diff --git a/templates/layouts/base.php b/templates/layouts/base.php index be6b0be..8ae32ce 100644 --- a/templates/layouts/base.php +++ b/templates/layouts/base.php @@ -97,7 +97,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']); <h1 class="sr-only"><?= htmlReady(PageLayout::getTitle()) ?></h1> <? if (PageLayout::isFullscreenModeAllowed()): ?> <button hidden class="fullscreen-toggle unfullscreen" aria-label="<?= _('Vollbildmodus verlassen') ?>" title="<?= _('Vollbildmodus verlassen') ?>"> - <?= Icon::create('zoom-out2')->asSvg(24) ?> + <?= Icon::create('zoom-out2')->asImg(24) ?> </button> <? endif; ?> <?= implode(PageLayout::getMessages(QuestionBox::class)) ?> @@ -113,7 +113,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']); <!-- End main content --> <a id="scroll-to-top" class="hide" tabindex="0" title="<?= _('Zurück zum Seitenanfang') ?>"> - <?= Icon::create('arr_1up', 'info_alt')->asSvg(24, ['class' => '']) ?> + <?= Icon::create('arr_1up', 'info_alt')->asImg(24, ['class' => '']) ?> </a> <?= $this->render_partial('footer', ['link_params' => $header_template->link_params ?? null]); ?> diff --git a/templates/login/_header_contrast.php b/templates/login/_header_contrast.php index d98db07..38f98c3 100644 --- a/templates/login/_header_contrast.php +++ b/templates/login/_header_contrast.php @@ -4,11 +4,11 @@ <input type="hidden" name="page" value="<?= Request::url() ?>"> <div id="contrast"> <? if (!empty($_SESSION['contrast'])): ?> - <?= Icon::create('accessibility', Icon::ROLE_INFO_ALT)->asSvg(24) ?> + <?= Icon::create('accessibility', Icon::ROLE_INFO_ALT)->asImg(24) ?> <button class="as-link" name="unset_contrast"><?= _('Normalen Kontrast aktivieren') ?></button> <?= tooltipIcon(_('Aktiviert standardmäßige, nicht barrierefreie Kontraste.'), false, false, true); ?> <? else: ?> - <?= Icon::create('accessibility', Icon::ROLE_INFO_ALT)->asSvg(24) ?> + <?= Icon::create('accessibility', Icon::ROLE_INFO_ALT)->asImg(24) ?> <button class="as-link" name="set_contrast"><?= _('Hohen Kontrast aktivieren') ?></button> <?= tooltipIcon(_('Aktiviert einen hohen Kontrast gemäß WCAG 2.1. Diese Einstellung wird nach dem Login übernommen. Sie können sie in Ihren persönlichen Einstellungen ändern.'), false, false, true); ?> diff --git a/templates/mail/notification_html.php b/templates/mail/notification_html.php index 2325ca0..81a38f3 100644 --- a/templates/mail/notification_html.php +++ b/templates/mail/notification_html.php @@ -154,7 +154,7 @@ <a href="<?= URLHelper::getLink($module['url'], ['sso' => $sso]) ?>"><?= htmlReady($module['text']) ?></a> </td> <td> - <a href="<?= URLHelper::getLink($module['url'], ['sso' => $sso]) ?>"><?= $module['icon']->asSvg(['title' => $module['text']]) ?></a> + <a href="<?= URLHelper::getLink($module['url'], ['sso' => $sso]) ?>"><?= $module['icon']->asImg(['title' => $module['text']]) ?></a> </td> </tr> <? endforeach ?> diff --git a/templates/multipersonsearch/link.php b/templates/multipersonsearch/link.php index 446c30d..daed91a 100644 --- a/templates/multipersonsearch/link.php +++ b/templates/multipersonsearch/link.php @@ -1,7 +1,7 @@ <a href="<?= URLHelper::getLink('dispatch.php/multipersonsearch/no_js_form/?name=' . $name); ?>" class="multi_person_search_link" data-dialog="width=720;height=490;id=mp-search" data-dialogname="<?= $name; ?>" title="<?= htmlReady($title) ?>" data-js-form="<?= URLHelper::getLink('dispatch.php/multipersonsearch/js_form/' . $name); ?>"> <? if (!empty($linkIconPath)) { - print $linkIconPath->asSvg(20, ['class' => 'action-menu-item-icon']); + print $linkIconPath->asImg(['class' => 'action-menu-item-icon']); } if (!empty($linkIconPath) && !empty($linkText)) { print " "; diff --git a/templates/online/user.php b/templates/online/user.php index 2bba643..89a63ed 100644 --- a/templates/online/user.php +++ b/templates/online/user.php @@ -7,7 +7,7 @@ <? if (!$is_buddy) : ?> <a href="<?= URLHelper::getLink('online.php', ['cmd' => 'add_user', 'add_uname' => $tmp_online_uname]) ?>"> - <?= Icon::create('arr_2left', Icon::ROLE_SORT)->asSvg([ + <?= Icon::create('arr_2left', Icon::ROLE_SORT)->asImg([ 'title' => _('zu den Buddies hinzufügen'), 'style' => 'padding-right: 0.33em;', 'class' => 'middle', @@ -29,7 +29,7 @@ <?= htmlReady($fullname) ?> </a> <? foreach (StudipKing::is_king($tmp_user_id, TRUE) as $type => $text) : ?> - <?= Icon::create('crown', Icon::ROLE_SORT)->asSvg(['title' => $text, 'class' => 'text-bottom']) ?> + <?= Icon::create('crown', Icon::ROLE_SORT)->asImg(['title' => $text, 'class' => 'text-bottom']) ?> <? endforeach ?> </td> @@ -40,14 +40,14 @@ <td width="3%" align="center"> <? if (class_exists('Blubber')) : ?> <a href="<?= URLHelper::getLink('dispatch.php/course/streams/global', ['mention' => $tmp_online_uname]) ?>"> - <?= Icon::create('blubber')->asSvg(['title' => _('Blubber diesen Nutzer an'), 'class' => 'text-bottom']) ?> + <?= Icon::create('blubber')->asImg(['title' => _('Blubber diesen Nutzer an'), 'class' => 'text-bottom']) ?> </a> <? endif ?> </td> <td width="3%" align="center"> <a href="<?= URLHelper::getLink('dispatch.php/messages/write', ['rec_uname' => $tmp_online_uname]) ?>"> - <?= Icon::create('mail')->asSvg(['title' => _('Nachricht an Benutzer verschicken'), 'class' => 'text-bottom']) ?> + <?= Icon::create('mail')->asImg(['title' => _('Nachricht an Benutzer verschicken'), 'class' => 'text-bottom']) ?> </a> </td> @@ -56,7 +56,7 @@ <a href="<?= URLHelper::getLink('online.php', ['cmd' => 'delete_user', 'delete_uname' => $tmp_online_uname]) ?>"> - <?= Icon::create('trash')->asSvg(['title' => _('aus der Buddy-Liste entfernen'), 'class' => 'text-bottom']) ?> + <?= Icon::create('trash')->asImg(['title' => _('aus der Buddy-Liste entfernen'), 'class' => 'text-bottom']) ?> </a> <? else : ?> diff --git a/templates/personal_notifications/notification.php b/templates/personal_notifications/notification.php index 20f1f9d..974823e 100644 --- a/templates/personal_notifications/notification.php +++ b/templates/personal_notifications/notification.php @@ -14,7 +14,7 @@ <?= htmlReady($notification['text']) ?> </a> <button class="options mark_as_read"> - <?= Icon::create('decline')->asSvg(16, ['title' => _('Als gelesen markieren')]) ?> + <?= Icon::create('decline')->asImg(16, ['title' => _('Als gelesen markieren')]) ?> </button> </div> <? if ($notification->more_unseen > 0): ?> diff --git a/templates/shared/action-menu-single.php b/templates/shared/action-menu-single.php index 9fdd5d3..dbe38c1 100644 --- a/templates/shared/action-menu-single.php +++ b/templates/shared/action-menu-single.php @@ -15,7 +15,7 @@ <? if ($action['disabled']): ?> <label class="undecorated action-menu-item-disabled" aria-disabled="true" <?= arrayToHtmlAttributes($action['attributes'] + ['title' => $action['label']]) ?>> <? if ($action['icon']): ?> - <?= $action['icon']->asSvg(['class' => 'action-menu-item-icon']) ?> + <?= $action['icon']->asImg(['class' => 'action-menu-item-icon']) ?> <? else: ?> <?= htmlReady($action['label']) ?> <? endif ?> @@ -23,7 +23,7 @@ <? elseif ($action['type'] === 'link'): ?> <a href="<?= htmlReady($action['link']) ?>" <?= arrayToHtmlAttributes($action['attributes'] + ['title' => $action['label']]) ?>> <? if ($action['icon']): ?> - <?= $action['icon']->asSvg(['class' => 'action-menu-item-icon']) ?> + <?= $action['icon']->asImg(['class' => 'action-menu-item-icon']) ?> <? else: ?> <?= htmlReady($action['label']) ?> <? endif ?> diff --git a/templates/shared/action-menu.php b/templates/shared/action-menu.php index 0119e40..5b105b2 100644 --- a/templates/shared/action-menu.php +++ b/templates/shared/action-menu.php @@ -37,7 +37,7 @@ <? if ($action['disabled']): ?> <label class="undecorated" aria-disabled="true" <?= arrayToHtmlAttributes($action['attributes']) ?>> <? if ($action['icon']): ?> - <?= $action['icon']->asSvg(false, ['class' => 'action-menu-item-icon']) ?> + <?= $action['icon']->asImg(false, ['class' => 'action-menu-item-icon']) ?> <? else: ?> <span class="action-menu-no-icon"></span> <? endif ?> @@ -47,7 +47,7 @@ <? elseif ($action['type'] === 'link'): ?> <a href="<?= htmlReady($action['link']) ?>" <?= arrayToHtmlAttributes($action['attributes']) ?>> <? if ($action['icon']): ?> - <?= $action['icon']->asSvg(false, ['class' => 'action-menu-item-icon']) ?> + <?= $action['icon']->asImg(false, ['class' => 'action-menu-item-icon']) ?> <? else: ?> <span class="action-menu-no-icon"></span> <? endif ?> diff --git a/templates/shared/content_box.php b/templates/shared/content_box.php index 2c5b0f0..c31f467 100644 --- a/templates/shared/content_box.php +++ b/templates/shared/content_box.php @@ -11,7 +11,7 @@ <? if (isset($admin_url)): ?> <nav> <a href="<?= URLHelper::getLink($admin_url) ?>" title="<?= htmlReady($admin_title) ?>"> - <?= Icon::create('admin')->asSvg(tooltip2(htmlReady($admin_title))) ?> + <?= Icon::create('admin')->asImg(tooltip2(htmlReady($admin_title))) ?> </a> </nav> <? endif; ?> diff --git a/templates/shared/index_box.php b/templates/shared/index_box.php index 98ef9c5..92170f4f 100644 --- a/templates/shared/index_box.php +++ b/templates/shared/index_box.php @@ -20,7 +20,7 @@ <td class="table_header_bold" style="text-align: right;"> <? if (isset($admin_url)): ?> <a href="<?= URLHelper::getLink($admin_url) ?>" title="<?= htmlReady($admin_title ?? _('Administration')) ?>"> - <?= Icon::create('admin', Icon::ROLE_INFO_ALT)->asSvg([ + <?= Icon::create('admin', Icon::ROLE_INFO_ALT)->asImg([ 'alt' => $admin_title ?? _('Administration'), ]) ?> </a> diff --git a/templates/sidebar/resource-tree-widget.php b/templates/sidebar/resource-tree-widget.php index e20ee41..890971b 100644 --- a/templates/sidebar/resource-tree-widget.php +++ b/templates/sidebar/resource-tree-widget.php @@ -21,7 +21,7 @@ <? if ($resource_path && !in_array($resource->id, $resource_path)): ?> <a href="<?= $link ?>"> <? endif; ?> - <?= Icon::create('arr_1right')->asSvg([ + <?= Icon::create('arr_1right')->asImg([ 'class' => in_array($resource->id, $resource_path) || (!$resource_path && $resource->level < $max_open_depth) ? 'rotated' : '', @@ -42,7 +42,7 @@ <?= $selected ? 'class="selected-resource"' : '' ?>> - <?= $resource->getIcon($selected ? Icon::ROLE_INFO_ALT : Icon::ROLE_CLICKABLE)->asSvg([ + <?= $resource->getIcon($selected ? Icon::ROLE_INFO_ALT : Icon::ROLE_CLICKABLE)->asImg([ 'class' => 'text-bottom' ]) ?> <?= htmlReady($resource->name) ?> diff --git a/templates/sidebar/resources_individual_booking_plan_sidebar.php b/templates/sidebar/resources_individual_booking_plan_sidebar.php index 50c4438..8ba630d 100644 --- a/templates/sidebar/resources_individual_booking_plan_sidebar.php +++ b/templates/sidebar/resources_individual_booking_plan_sidebar.php @@ -11,7 +11,7 @@ <input type="color" value="#000000" class="big-colour-input"> </div> <? endfor ?> - <?= Icon::create('print')->asSvg(Icon::SIZE_LARGE, [ + <?= Icon::create('print')->asImg(Icon::SIZE_LARGE, [ 'class' => 'text-bottom print-action', 'title' => _('Individuelle Druckansicht drucken'), 'onclick' => 'javascript:window.print();' diff --git a/templates/sidebar/room-clipboard-item.php b/templates/sidebar/room-clipboard-item.php index 40b5146..45633a0 100644 --- a/templates/sidebar/room-clipboard-item.php +++ b/templates/sidebar/room-clipboard-item.php @@ -33,13 +33,13 @@ if (!$item) { <td class="item-name"><?= htmlReady($item['name'] ?? '') ?></td> <td class="actions"> <a href="<?= Room::getLinkForAction('show', (!empty($item) ? $item['range_id'] : 'RANGE_ID')) ?>" data-dialog> - <?= Icon::create('info-circle')->asSvg([ + <?= Icon::create('info-circle')->asImg([ 'title' => _('Rauminformationen'), 'class' => 'text-bottom' ])?> </a> <a href="<?= Room::getLinkForAction('semester_plan', (!empty($item) ? $item['range_id'] : 'RANGE_ID')) ?>" target="_blank"> - <?= Icon::create('timetable')->asSvg([ + <?= Icon::create('timetable')->asImg([ 'title' => _('Semesterbelegung'), 'class' => 'text-bottom' ])?> diff --git a/templates/sidebar/room-search-criteria-templates.php b/templates/sidebar/room-search-criteria-templates.php index 09e980b..d084fa4 100644 --- a/templates/sidebar/room-search-criteria-templates.php +++ b/templates/sidebar/room-search-criteria-templates.php @@ -16,7 +16,7 @@ </label> </li> <li class="template invisible" data-template-type="range"> - <?= Icon::create('trash')->asSvg( + <?= Icon::create('trash')->asImg( [ 'class' => 'text-bottom remove-icon', 'aria-label' => _('Kriterium entfernen'), @@ -38,7 +38,7 @@ </label> </li> <li class="template invisible" data-template-type="num"> - <?= Icon::create('trash')->asSvg( + <?= Icon::create('trash')->asImg( [ 'class' => 'text-bottom remove-icon', 'aria-label' => _('Kriterium entfernen'), @@ -51,7 +51,7 @@ </label> </li> <li class="template invisible" data-template-type="select"> - <?= Icon::create('trash')->asSvg(['class' => 'text-bottom remove-icon']) ?> + <?= Icon::create('trash')->asImg(['class' => 'text-bottom remove-icon']) ?> <label class="undecorated"> <span></span> <select class="room-search-widget_criteria-list_input"> @@ -60,7 +60,7 @@ </li> <li class="template invisible" data-template-type="other"> - <?= Icon::create('trash')->asSvg( + <?= Icon::create('trash')->asImg( [ 'class' => 'text-bottom remove-icon', 'aria-label' => _('Kriterium entfernen'), diff --git a/templates/sidebar/room-search-tree-widget.php b/templates/sidebar/room-search-tree-widget.php index 13bd204..008b1bc 100644 --- a/templates/sidebar/room-search-tree-widget.php +++ b/templates/sidebar/room-search-tree-widget.php @@ -8,7 +8,7 @@ <li <?= ((!$resource_path && $resource->level > $max_open_depth) || $hide) ? 'style="display: none;"' : ''; ?> > <? if (count($resource->children)): ?> - <?= Icon::create('arr_1right')->asSvg( + <?= Icon::create('arr_1right')->asImg( [ 'class' => implode( ' ', @@ -38,7 +38,7 @@ <? endif ?> <span id="<?= $search_object; ?>" style="cursor: pointer;"> - <?= $resource->getIcon()->asSvg( + <?= $resource->getIcon()->asImg( [ 'class' => 'text-bottom' ] diff --git a/templates/start/contents.php b/templates/start/contents.php index c0bbcc6..bb5697f 100644 --- a/templates/start/contents.php +++ b/templates/start/contents.php @@ -6,7 +6,7 @@ <a href="<?= URLHelper::getLink($navigation->getURL()) ?>" class="content-item-link"> <div class="content-item-img-wrapper"> <? if ($navigation->getImage()): ?> - <?= $navigation->getImage()->asSvg(32, $navigation->getLinkAttributes()) ?> + <?= $navigation->getImage()->asImg(32, $navigation->getLinkAttributes()) ?> <? endif ?> </div> <div class="content-item-text"> diff --git a/templates/tabs.php b/templates/tabs.php index ae1f409..b53dbf8 100644 --- a/templates/tabs.php +++ b/templates/tabs.php @@ -23,14 +23,14 @@ foreach (Navigation::getItem("/")->getSubNavigation() as $path => $nav) { ?> <a href="<?= URLHelper::getLink($nav->getURL()) ?>" <?= arrayToHtmlAttributes($attr) ?>> <? if ($image = $nav->getImage()) : ?> - <?= $image->asSvg(['class' => "tab-icon", 'title' => $nav->getTitle() ? $nav->getTitle() : $nav->getDescription()]) ?> + <?= $image->asImg(['class' => "tab-icon", 'title' => $nav->getTitle() ? $nav->getTitle() : $nav->getDescription()]) ?> <? endif ?> <span title="<?= $nav->getDescription() ? htmlReady($nav->getDescription()) : htmlReady($nav->getTitle())?>" class="tab-title"><?= htmlReady($nav->getTitle()) ?></span> </a> <? else: ?> <span class="quiet tab-title"> <? if ($image = $nav->getImage()) : ?> - <?= $image->asSvg(['class' => "tab-icon", 'title' => $nav->getTitle()]) ?> + <?= $image->asImg(['class' => "tab-icon", 'title' => $nav->getTitle()]) ?> <? endif ?> <?= htmlReady($nav->getTitle()) ?> </span> @@ -47,7 +47,7 @@ foreach (Navigation::getItem("/")->getSubNavigation() as $path => $nav) { <div id="non-responsive-toggle-fullscreen"> <button class="as-link" id="fullscreen-on" title="<?= _('Kompakte Navigation aktivieren') ?>"> - <?= Icon::create('screen-compact')->asSvg(24) ?> + <?= Icon::create('screen-compact')->asImg(24) ?> </button> </div> <? endif ?> diff --git a/templates/toc/_toc-item-list.php b/templates/toc/_toc-item-list.php index 82cad85..3e2ee0d 100644 --- a/templates/toc/_toc-item-list.php +++ b/templates/toc/_toc-item-list.php @@ -4,7 +4,7 @@ <a class="navigate" href="<?= htmlReady($item->getURL()) ?>"> <? endif ?> <? if ($item->getIcon()) : ?> - <?= $item->getIcon()->copyWithRole(Icon::ROLE_INFO)->asSvg(24) ?> + <?= $item->getIcon()->copyWithRole(Icon::ROLE_INFO)->asImg(24) ?> <? endif ?> <?= htmlReady($item->getTitle()) ?> <? if (!$item->isActive()) : ?> diff --git a/templates/toc/generic-toc-list.php b/templates/toc/generic-toc-list.php index 0894e5f..475ceaa 100644 --- a/templates/toc/generic-toc-list.php +++ b/templates/toc/generic-toc-list.php @@ -3,7 +3,7 @@ <header id="toc_header"> <h1 id="toc_h1"><?= sprintf(_('Inhalt (%u Elemente)'), htmlReady($root->countAllChildren())) ?></h1> <label for="cb-toc" class="check-box enter-accessible" title="<?= _('Schließen')?>" tabindex="0"> - <?= Icon::create('decline')->asSvg(24) ?> + <?= Icon::create('decline')->asImg(24) ?> </label> </header> <section> diff --git a/templates/userfilter/display.php b/templates/userfilter/display.php index 2aba04f..189f6cd 100644 --- a/templates/userfilter/display.php +++ b/templates/userfilter/display.php @@ -17,7 +17,7 @@ if ($filter->show_user_count) { $fieldText .= ' (' . sprintf(ngettext('Eine Person', '%s Personen', $user_count), $user_count); if ($user_count === 0) { $fieldText .= ' ' . Icon::create('exclaim-circle', Icon::ROLE_ATTENTION) - ->asSvg(['title' => _('Niemand erfüllt diese Bedingung.')]); + ->asImg(['title' => _('Niemand erfüllt diese Bedingung.')]); } $fieldText .= ')'; } |