From d259140c4f048b503f32f1c2d75bf4138369e6e7 Mon Sep 17 00:00:00 2001 From: Rasmus Fuhse <fuhse@data-quest.de> Date: Tue, 23 Nov 2021 16:03:38 +0000 Subject: [PATCH] Resolve "OER-Campus Icon nicht konsistent" --- app/views/file/add_files_window.php | 2 +- app/views/oer/embed/_link.php | 2 +- lib/filesystem/StandardFile.php | 2 +- lib/models/OERMaterial.php | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/views/file/add_files_window.php b/app/views/file/add_files_window.php index bdfbca58ae2..94ad52052c4 100644 --- a/app/views/file/add_files_window.php +++ b/app/views/file/add_files_window.php @@ -59,7 +59,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="height=800"> - <?= Icon::create('service', Icon::ROLE_CLICKABLE)->asImg(50) ?> + <?= Icon::create('oer-campus')->asImg(50) ?> <?= htmlReady(Config::get()->OER_TITLE) ?> </a> <? endif ?> diff --git a/app/views/oer/embed/_link.php b/app/views/oer/embed/_link.php index 33ccc801945..ff32f893817 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(sprintf(_('Zum %s wechseln'), Config::get()->OER_TITLE)) ?>"> - <?= Icon::create('service')->asImg(['class' => 'text-bottom']) ?> + <?= Icon::create('oer-campus')->asImg(['class' => 'text-bottom']) ?> <?= htmlReady($material['name']) ?> </a> </div> diff --git a/lib/filesystem/StandardFile.php b/lib/filesystem/StandardFile.php index f941008a578..0e09090e5a1 100644 --- a/lib/filesystem/StandardFile.php +++ b/lib/filesystem/StandardFile.php @@ -297,7 +297,7 @@ class StandardFile implements FileType, ArrayAccess $actionMenu->addLink( URLHelper::getURL('dispatch.php/file/share_oer/' . $this->fileref->id), _('Im OER Campus veröffentlichen'), - Icon::create('service', Icon::ROLE_CLICKABLE, ['size' => 20]), + Icon::create('oer-campus'), ['data-dialog' => '1'] ); } diff --git a/lib/models/OERMaterial.php b/lib/models/OERMaterial.php index cce8c24366f..65acaa4e953 100755 --- a/lib/models/OERMaterial.php +++ b/lib/models/OERMaterial.php @@ -148,11 +148,6 @@ class OERMaterial extends SimpleORMap ? $material->host->url."download/".$material['foreign_material_id'] : URLHelper::getURL("dispatch.php/oer/endpoints/download/".$material->getId()); - - $right_link = '<div style="text-align: right;">'; - $right_link .= '<a href="'.URLHelper::getLink("dispatch.php/oer/market/details/".$id).'" title="'._("Zum OER Campus").'">'.Icon::create("service", "clickable")->asImg(16, ['class' => "text-bottom"])." ".htmlReady($material['name']).'</a>'; - - if ($material['player_url'] || $material->isPDF()) { if ($material['player_url']) { OERDownloadcounter::addCounter($material->id); -- GitLab