Remove view

docs/CHANGELOG.md

@@ -4,7 +4,7 @@ Changelog
 1.7.0 (Unreleased)
 -----------------------
 - Fix #509: Fix event type visibility
-- Enh #512: Move the widget wall entry links to a view and surround the links with a dedicated HTML class
+- Enh #512: Surround the widget wall entry links with a dedicated HTML class
 
 1.6.4 (Unreleased)
 -----------------------

widgets/DownloadIcsLink.php

@@ -8,7 +8,10 @@
 namespace humhub\modules\calendar\widgets;
 
 use humhub\components\Widget;
+use humhub\libs\Html;
+use humhub\modules\calendar\helpers\Url;
 use humhub\modules\calendar\interfaces\event\CalendarEventIF;
+use Yii;
 
 /**
  * Class DownloadIcsLink
@@ -27,8 +30,14 @@ public function run()
             return '';
         }
 
-        return $this->render('downloadLink', [
-            'calendarEntry' => $this->calendarEntry,
-        ]);
+        return Html::tag(
+            'span',
+            Html::a(
+                Yii::t('CalendarModule.base', 'Download ICS'),
+                Url::toEntryDownloadICS($this->calendarEntry),
+                ['target' => '_blank'],
+            ),
+            ['class' => 'calendar-entry-ics-download'],
+        );
     }
 }

widgets/ReminderLink.php

@@ -8,8 +8,12 @@
 namespace humhub\modules\calendar\widgets;
 
 use humhub\components\Widget;
+use humhub\libs\Html;
+use humhub\modules\calendar\helpers\Url;
 use humhub\modules\calendar\interfaces\event\CalendarEventIF;
 use humhub\modules\content\components\ContentActiveRecord;
+use humhub\widgets\ModalButton;
+use Yii;
 
 /**
  * Class DownloadIcsLink
@@ -24,12 +28,16 @@ class ReminderLink extends Widget
 
     public function run()
     {
-        if (!$this->entry || !$this->entry instanceof ContentActiveRecord || !$this->entry instanceof CalendarEventIF) {
+        if (!$this->entry instanceof ContentActiveRecord || !$this->entry instanceof CalendarEventIF) {
             return;
         }
 
-        return $this->render('reminderLink', [
-            'entry' => $this->entry,
-        ]);
+        return Html::tag(
+            'span',
+            ModalButton::asLink(Yii::t('CalendarModule.base', 'Set reminder'))
+                ->load(Url::toUserLevelReminderConfig($this->entry))
+                ->loader(true),
+            ['class' => 'calendar-entry-reminder'],
+        );
     }
 }