From 79fb115259873f119c5c6628eea38683373070b5 Mon Sep 17 00:00:00 2001 From: Till Date: Wed, 30 Aug 2023 17:03:46 +0200 Subject: [PATCH] Courseware - fixes #741 (#781) * working on some further courseware changes * fix courseware inclusion --- OpenCast.class.php | 2 +- .../components/CoursewareVideoTable.vue | 107 ++++++-- courseware/vueapp/components/LtiAuth.vue | 40 +++ courseware/vueapp/components/Tag.vue | 19 ++ courseware/vueapp/components/VideoCard.vue | 235 ++++++++++++++++++ .../courseware-plugin-opencast-video.vue | 94 +------ lib/Routes/Config/SimpleConfigList.php | 6 +- 7 files changed, 400 insertions(+), 103 deletions(-) create mode 100644 courseware/vueapp/components/LtiAuth.vue create mode 100644 courseware/vueapp/components/Tag.vue create mode 100644 courseware/vueapp/components/VideoCard.vue diff --git a/OpenCast.class.php b/OpenCast.class.php index 821befab7..41605be27 100644 --- a/OpenCast.class.php +++ b/OpenCast.class.php @@ -61,6 +61,7 @@ public function __construct() } $this->addStylesheet("assets/css/courseware.scss"); + $this->addStylesheet("assets/css/opencast.scss"); VersionHelper::get()->registerCoursewareBlock($this); } @@ -265,7 +266,6 @@ public function perform($unconsumed_path) $app->group('/opencast/api', new RouteMap($app)); $app->run(); } else { - $this->addStylesheet("assets/css/opencast.scss"); $css = VersionHelper::get()->getVersionSpecificStylesheet(); if ($css) { diff --git a/courseware/vueapp/components/CoursewareVideoTable.vue b/courseware/vueapp/components/CoursewareVideoTable.vue index 60ea42f43..f12382c2e 100644 --- a/courseware/vueapp/components/CoursewareVideoTable.vue +++ b/courseware/vueapp/components/CoursewareVideoTable.vue @@ -7,7 +7,7 @@
- +
+ --> + + \ No newline at end of file diff --git a/courseware/vueapp/components/LtiAuth.vue b/courseware/vueapp/components/LtiAuth.vue new file mode 100644 index 000000000..0c0455aab --- /dev/null +++ b/courseware/vueapp/components/LtiAuth.vue @@ -0,0 +1,40 @@ + + + diff --git a/courseware/vueapp/components/Tag.vue b/courseware/vueapp/components/Tag.vue new file mode 100644 index 000000000..bd43f8e04 --- /dev/null +++ b/courseware/vueapp/components/Tag.vue @@ -0,0 +1,19 @@ + + + \ No newline at end of file diff --git a/courseware/vueapp/components/VideoCard.vue b/courseware/vueapp/components/VideoCard.vue new file mode 100644 index 000000000..c1774ce1c --- /dev/null +++ b/courseware/vueapp/components/VideoCard.vue @@ -0,0 +1,235 @@ + + + diff --git a/courseware/vueapp/courseware-plugin-opencast-video.vue b/courseware/vueapp/courseware-plugin-opencast-video.vue index 76836f6ba..383ffdd21 100644 --- a/courseware/vueapp/courseware-plugin-opencast-video.vue +++ b/courseware/vueapp/courseware-plugin-opencast-video.vue @@ -11,24 +11,19 @@ >