Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Courseware block integration #762

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Courseware block integration #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a23300
Fixing courseware plugin
ssrahn Aug 16, 2023
53e5147
Dont show episode id
ssrahn Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions OpenCast.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public function __construct()
// }
}

$this->addStylesheet("assets/css/courseware.scss");
VersionHelper::get()->registerCoursewareBlock($this);
}

Expand Down
134 changes: 134 additions & 0 deletions assets/css/courseware.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
/* * * * * * * * * * * * * * * * * * */
/* C O U R S E W A R E B L O C K */
/* * * * * * * * * * * * * * * * * * */

.oc-cw-searchbar {
clear: both;
position: relative;
display: flex;
flex-direction: row;
}

.oc-cw-searchbar .oc-cw-searchbar-container {
list-style-type: none;
padding: 0;
margin: 0;
width: 100%;
float: left;
margin-right: 5px;
flex: 3;

display: flex;
flex-direction: row;

border: 1px solid var(--light-gray-color-40);
}

.oc-cw-searchbar .oc-cw-searchbar-container li {
padding: none;
white-space: nowrap;
}

.oc-cw-searchbar .oc-cw-searchbar-container .oc-cw-searchbar-input {
padding: 8px;
width: 100%;
}

.oc-cw-searchbar .oc-cw-searchbar-container .oc-cw-searchbar-input > input {
padding: 0px;
font-size: 16px;
border: none;
width: 100%;
}

.oc-cw-searchbar .oc-cw-searchbar-container .oc-cw-searchbar-input input:focus {
outline: none;
}

.oc-cw-searchbar .oc-cw-searchbar-sorter {
flex: 1;
min-width: 12em;
height: 40px !important;
}

.oc-cw-searchbar .oc-cw-searchbar-container .oc-cw-searchbar-search-icon {
display: flex;
align-items: center;
justify-content: center;
width: 35px;

border-left: thin solid $content-color-40;
background-color: $content-color-20;

cursor: pointer;
}

.oc-cw-video-list {
margin-top: 1em;
}

.oc-cw-video-list ul {
clear: both;
padding-left: 0;
list-style: none;
overflow: auto;
height: auto;
}

.oc-cw-video-list ul li {
background: var(--dark-gray-color-5);
border-right-width: 1px;
border-left-width: 1px;
border-width: 1px 0 0;
margin-bottom: 1em;
padding: 1em;
display: block;
position: relative;
overflow: hidden;
border-color: #ddd;
cursor: pointer;
}

.oc-cw-video-list ul li:hover, .oc-cw-video-list ul li.selected {
background: var(--content-color-40);
}

.oc-cw-pagination {
margin-bottom: 1em;
display: flex;
}

.oc-cw-pagination button {
padding: 8px 16px;
border: 1px solid #ddd;
float: left;
cursor: pointer;
}

.oc-cw-pagination button:disabled {
cursor: default
}

.oc-cw-pagination .active {
background-color: var(--base-color-60);
color: white;
cursor: default;
}

.oc-cw-loadingbar {
border-radius: 15px;
background-color: var(--dark-gray-color-10);
height: 15px;
width: 300px;
display: block;
}

.oc-cw-loadingbar:not(:last-of-type) {
margin-bottom: 5px;
}

iframe.oc_cw_iframe {
border: none;
width: 100%;
height: 600px;
}
121 changes: 0 additions & 121 deletions assets/css/opencast.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,127 +1343,6 @@ label.oc--file-upload {
}
}


/* * * * * * * * * * * * * * * * * * */
/* C O U R S E W A R E B L O C K */
/* * * * * * * * * * * * * * * * * * */

.oc-cw-searchbar {
clear: both;
position: relative;
display: flex;
flex-direction: row;
}
.oc-cw-searchbar .oc-cw-searchbar-container {
list-style-type: none;
padding: 0;
margin: 0;
width: 100%;
float: left;
margin-right: 5px;
flex: 2;

display: flex;
flex-direction: row;

border: 1px solid var(--light-gray-color-40);
}
.oc-cw-searchbar .oc-cw-searchbar-container li {
padding: none;
white-space: nowrap;
}

.oc-cw-searchbar .oc-cw-searchbar-container .oc-cw-searchbar-input {
padding: 8px;
width: 100%;
}

.oc-cw-searchbar .oc-cw-searchbar-container .oc-cw-searchbar-input > input {
padding: 0px;
font-size: 16px;
border: none;
background: var(--dark-gray-color-5);
width: 100%;
}

.oc-cw-searchbar .oc-cw-searchbar-container .oc-cw-searchbar-input input:focus {
outline: none;
}

.oc-cw-searchbar .oc-cw-searchbar-sorter {
flex: 1;
height: 40px !important;
}


.oc-cw-video-list {
margin-top: 1em;
}

.oc-cw-video-list ul {
clear: both;
padding-left: 0;
list-style: none;
overflow: auto;
height: auto;
}
.oc-cw-video-list ul li {
background: var(--dark-gray-color-5);
border-right-width: 1px;
border-left-width: 1px;
border-width: 1px 0 0;
margin-bottom: 1em;
padding: 1em;
display: block;
position: relative;
overflow: hidden;
border-color: #ddd;
cursor: pointer;
}

.oc-cw-video-list ul li:hover, .oc-cw-video-list ul li.selected {
background: var(--content-color-40);
}

.oc-cw-pagination {
margin-bottom: 1em;
display: flex;
}

.oc-cw-pagination button {
padding: 8px 16px;
border: 1px solid #ddd;
float: left;
cursor: pointer;
}

.oc-cw-pagination button:disabled {
cursor: default
}

.oc-cw-pagination .active {
background-color: var(--base-color-60);
color: white;
cursor: default;
}

.oc-cw-loadingbar {
border-radius: 15px;
background-color: var(--dark-gray-color-10);
height: 15px;
width: 300px;
display: block;
}
.oc-cw-loadingbar:not(:last-of-type) {
margin-bottom: 5px;
}

iframe.oc_cw_iframe {
border: none;
width: 100%;
height: 600px;
}

/* * * * * * * * * * * */
/* M E S S A G E S * */
/* * * * * * * * * * * */
Expand Down
33 changes: 30 additions & 3 deletions courseware/vueapp/components/CoursewareSearchBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
@submit="doSearch"
/>
</li>
<li title="Suche starten"
class="oc-cw-searchbar-search-icon"
@click="doSearch"
>
<studip-icon
shape="search" role="clickable"
/>
</li>
</ul>

<select class="oc-cw-searchbar-sorter" v-model="inputSort" @change="setSort">
Expand All @@ -27,11 +35,30 @@
export default {
name: "CoursewareSearchBar",

props: ['sorts'],

data() {
const sorts = [
{
field: 'created',
order: 'desc',
text: 'Datum hochgeladen: Neueste zuerst'
}, {
field: 'created',
order: 'asc',
text: 'Datum hochgeladen: Älteste zuerst'
}, {
field: 'title',
order: 'asc',
text: 'Titel: Alphabetisch'
}, {
field: 'title',
order: 'desc',
text: 'Titel: Umgekehrt Alphabetisch'
}
];

return {
inputSort: null,
sorts: sorts,
inputSort: sorts[0],
inputSearch: ''
}
},
Expand Down
5 changes: 1 addition & 4 deletions courseware/vueapp/components/CoursewareVideoTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@
<ul class="video-list" v-else>
<li v-for="(video, index) in videos" :key="index" :class="{selected: selectedVideoId == video.id}" @click="setVideo(video)">
<div>
<strong class="oc--metadata-title">
<strong>
{{video.title}}
</strong>
<div>
<small><i>{{ video.episode }}</i></small>
</div>
<div>
{{ printDetails(video) }}
<!-- {{ video.author }}
Expand Down
33 changes: 5 additions & 28 deletions courseware/vueapp/courseware-plugin-opencast-video.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<template #content>
<div>
<div v-if="!lti_connected">
<span v-if="!currentEpisodeURL && !currentEpisodeId" v-translate v-text="'Es wurde bisher keine Video ausgewählt'"></span>
<span v-if="!currentEpisodeURL && currentEpisodeId" v-translate v-text="'Dieses Video hat keinen Veröffentlichungs-URL-Link'"></span>
<span v-else v-translate v-text="'Das Video ist nicht verfügbar'"></span>
<span v-translate v-text="'LTI Verbindung fehlgeschlagen'"></span>
</div>
<div v-else>
<iframe :src="currentEpisodeURL"
<span v-if="!currentEpisodeId" v-translate v-text="'Es wurde bisher kein Video ausgewählt'"></span>
<span v-else-if="!currentEpisodeURL" v-translate v-text="'Dieses Video hat keinen Veröffentlichungs-URL-Link'"></span>
<iframe v-else :src="currentEpisodeURL"
class="oc_cw_iframe"
allowfullscreen
></iframe>
Expand All @@ -37,7 +37,6 @@
<translate>Videos</translate>
</label>
<CoursewareSearchBar
:sorts="sorts"
@doSearch="performSearch"
@doSort="performSort"
/>
Expand Down Expand Up @@ -105,28 +104,6 @@ export default {
relatedContainers: 'courseware-containers/related',
}),

sorts() {
return [
{
field: 'mkdate',
order: 'desc',
text : 'Datum hochgeladen: Neueste zuerst'
}, {
field: 'mkdate',
order: 'asc',
text : 'Datum hochgeladen: Älteste zuerst'
}, {
field: 'title',
order: 'desc',
text : 'Titel: Alphabetisch'
}, {
field: 'title',
order: 'asc',
text : 'Titel: Umgekehrt Alphabetisch'
}
];
},

container() {
return (
this.relatedContainers({
Expand Down Expand Up @@ -198,7 +175,7 @@ export default {
attributes.payload.episode_id = this.currentEpisodeId;
attributes.payload.url = this.currentEpisodeURL;
attributes.payload.visible = this.currentVisible;

if (this.container?.id && this.block?.id) {
return this.updateBlock({
attributes,
Expand Down