@windward/core 0.19.0 → 0.21.0

package/components/Content/Blocks/UserUpload.vue

@@ -35,7 +35,7 @@
                         :enrollment="enrollment"
                     ></DisplayUserFilesTable>
                 </v-col>
-                <v-col cols="12" v-if="showUpload">
+                <v-col v-if="showUpload" cols="12">
                     <div v-if="blockExists">
                         <v-form
                             ref="form"
@@ -76,59 +76,23 @@
 <script>
 import _ from 'lodash'
 import { mapGetters } from 'vuex'
-import TextViewer from '~/components/Text/TextViewer'
-import TextEditor from '~/components/Text/TextEditor'
 import Uuid from '~/helpers/Uuid'
 import Download from '~/helpers/Download'
-
-import UserFileAsset from '../../../models/UserFileAsset'
 import Enrollment from '~/models/Enrollment'
 import ContentBlock from '~/models/ContentBlock'
 import BaseContentBlock from '~/components/Content/Blocks/BaseContentBlock'
 import FileDropZone from '~/components/Core/FileDropZone.vue'
+import UserFileAsset from '../../../models/UserFileAsset'
 
 import DisplayUserFilesTable from './UserUpload/DisplayUserFilesTable.vue'
 
 export default {
     name: 'UserUpload',
     components: {
-        TextEditor,
-        TextViewer,
         FileDropZone,
         DisplayUserFilesTable,
     },
     extends: BaseContentBlock,
-    beforeMount() {
-        if (_.isEmpty(this.block)) {
-            this.block = {}
-        }
-        // Default the instructions to collapsed
-        this.block.__expandInstructions = false
-
-        if (_.isEmpty(this.block.body)) {
-            this.block.body = this.$t(
-                'windward.core.shared.content_blocks.title.user_upload'
-            )
-        }
-        if (_.isEmpty(this.block.metadata)) {
-            this.block.metadata = {}
-        }
-        if (_.isEmpty(this.block.metadata.config)) {
-            this.block.metadata.config = {}
-        }
-        if (!_.isBoolean(this.block.metadata.config.display_title)) {
-            this.$set(this.block.metadata.config, 'display_title', true)
-        }
-        if (_.isEmpty(this.block.metadata.config.instructions)) {
-            this.block.metadata.config.instructions = ''
-        }
-        if (_.isEmpty(this.block.metadata.config.uploadSettings)) {
-            this.block.metadata.config.uploadSettings = {
-                multiple: false,
-                accept: '',
-            }
-        }
-    },
     data() {
         return {
             Download,
@@ -201,6 +165,37 @@ export default {
             }
         },
     },
+    beforeMount() {
+        if (_.isEmpty(this.block)) {
+            this.block = {}
+        }
+        // Default the instructions to collapsed
+        this.block.__expandInstructions = false
+
+        if (_.isEmpty(this.block.body)) {
+            this.block.body = this.$t(
+                'windward.core.shared.content_blocks.title.user_upload'
+            )
+        }
+        if (_.isEmpty(this.block.metadata)) {
+            this.block.metadata = {}
+        }
+        if (_.isEmpty(this.block.metadata.config)) {
+            this.block.metadata.config = {}
+        }
+        if (!_.isBoolean(this.block.metadata.config.display_title)) {
+            this.$set(this.block.metadata.config, 'display_title', true)
+        }
+        if (_.isEmpty(this.block.metadata.config.instructions)) {
+            this.block.metadata.config.instructions = ''
+        }
+        if (_.isEmpty(this.block.metadata.config.uploadSettings)) {
+            this.block.metadata.config.uploadSettings = {
+                multiple: false,
+                accept: '',
+            }
+        }
+    },
     mounted() {
         if (this.blockExists) {
             this.loadUserUploads()

package/components/Content/Blocks/Video.vue

@@ -13,46 +13,48 @@
             {{ block.metadata.config.instructions }}
         </p>
 
-        <VuetifyPlayer
-            :language="$i18n && $i18n.locale ? $i18n.locale : 'en-US'"
-            type="auto"
-            :playlist="linkedPlaylist"
-            :autoplay="block.metadata.config.attributes.autoplay"
-            :autopictureinpicture="
-                block.metadata.config.attributes.autopictureinpicture
-            "
-            :controls="block.metadata.config.attributes.controls"
-            :controlslist="block.metadata.config.attributes.controlslist"
-            :crossorigin="block.metadata.config.attributes.crossorigin"
-            :disablepictureinpicture="
-                block.metadata.config.attributes.disablepictureinpicture
-            "
-            :disableremoteplayback="
-                block.metadata.config.attributes.disableremoteplayback
-            "
-            :height="block.metadata.config.attributes.height"
-            :width="block.metadata.config.attributes.width"
-            :rewind="block.metadata.config.attributes.rewind"
-            :loop="block.metadata.config.attributes.loop"
-            :muted="block.metadata.config.attributes.muted"
-            :volume.sync="volume"
-            :cc.sync="ccVisible"
-            :playsinline="block.metadata.config.attributes.playsinline"
-            :poster="linkedPosterPublicUrl"
-            :preload="block.metadata.config.attributes.preload"
-            :captionsmenu="block.metadata.config.attributes.captionsmenu"
-            :playlistmenu="block.metadata.config.attributes.playlistmenu"
-            :playlistautoadvance="
-                block.metadata.config.attributes.playlistautoadvance
-            "
-            :playbackrates="block.metadata.config.attributes.playbackrates"
-            :captions-autoscroll.sync="captionsAutoscroll"
-            :captions-paragraph-view.sync="captionsParagraphView"
-            :captions-visible.sync="captionsVisible"
-            flat
-            @seeking="onSeeking"
-            @timeupdate="onTimeupdate"
-        >
+        <div class="video-wrapper">
+            <VuetifyPlayer
+                class="no-border-player"
+                :language="$i18n && $i18n.locale ? $i18n.locale : 'en-US'"
+                type="auto"
+                :playlist="linkedPlaylist"
+                :autoplay="block.metadata.config.attributes.autoplay"
+                :autopictureinpicture="
+                    block.metadata.config.attributes.autopictureinpicture
+                "
+                :controls="block.metadata.config.attributes.controls"
+                :controlslist="block.metadata.config.attributes.controlslist"
+                :crossorigin="block.metadata.config.attributes.crossorigin"
+                :disablepictureinpicture="
+                    block.metadata.config.attributes.disablepictureinpicture
+                "
+                :disableremoteplayback="
+                    block.metadata.config.attributes.disableremoteplayback
+                "
+                :height="block.metadata.config.attributes.height"
+                :width="block.metadata.config.attributes.width"
+                :rewind="block.metadata.config.attributes.rewind"
+                :loop="block.metadata.config.attributes.loop"
+                :muted="block.metadata.config.attributes.muted"
+                :volume.sync="volume"
+                :cc.sync="ccVisible"
+                :playsinline="block.metadata.config.attributes.playsinline"
+                :poster="linkedPosterPublicUrl"
+                :preload="block.metadata.config.attributes.preload"
+                :captionsmenu="block.metadata.config.attributes.captionsmenu"
+                :playlistmenu="block.metadata.config.attributes.playlistmenu"
+                :playlistautoadvance="
+                    block.metadata.config.attributes.playlistautoadvance
+                "
+                :playbackrates="block.metadata.config.attributes.playbackrates"
+                :captions-autoscroll.sync="captionsAutoscroll"
+                :captions-paragraph-view.sync="captionsParagraphView"
+                :captions-visible.sync="captionsVisible"
+                flat
+                @seeking="onSeeking"
+                @timeupdate="onTimeupdate"
+            >
             <template #no-source>
                 <v-card>
                     <v-card-title class="justify-center">
@@ -71,6 +73,7 @@
                 </v-card>
             </template>
         </VuetifyPlayer>
+        </div>
         <!--    display first note in the playlist for now    -->
         <v-alert
             v-if="notes.length > 0"
@@ -475,3 +478,27 @@ export default {
     overflow: hidden;
 }
 </style>
+
+<style>
+/* Remove black backgrounds from video player containers */
+.no-border-player,
+.no-border-player > div:not(.vjs-control-bar),
+.no-border-player .video-js:not(.vjs-control-bar) {
+    background: transparent !important;
+    background-color: transparent !important;
+}
+
+/* Ensure video element has transparent background */
+.no-border-player video {
+    background: transparent !important;
+    background-color: transparent !important;
+}
+
+/* Make video player larger */
+.video-wrapper {
+    margin-left: -15px;
+    margin-right: -15px;
+    padding-left: 0;
+    padding-right: 0;
+}
+</style>

package/components/Navigation/Items/CourseGlossaryToolNav.vue

@@ -10,7 +10,13 @@
                 <template #form="{ on, attrs }">
                     <div v-bind="attrs" v-on="on">
                         <v-alert
-                            v-if="!$ContextService.courseInSourceOrganization()"
+                            v-if="
+                                !$ContextService.courseInSourceOrganization() &&
+                                $PermissionService.userHasAccessTo(
+                                    'plugin.windward.core.organization.course.glossary',
+                                    'writable'
+                                )
+                            "
                             type="warning"
                         >
                             {{

package/components/Settings/EmailSettings.vue

@@ -23,11 +23,11 @@
                               'windward.core.shared.settings.title.click_to_enter'
                           )
                 }}</template>
-                <template #body="{ item, index }">
+                <template #body="{ index }">
                     <v-container :key="expansionPanelKey">
                         <v-text-field
                             v-model="block.metadata.config.emails[index].from"
-                            :rules="$Validation.getRule('shortInput')"
+                            :rules="getFromRules()"
                             :counter="$Validation.getLimit('shortInput')"
                             outlined
                             :label="
@@ -36,20 +36,22 @@
                                 )
                             "
                             :disabled="render"
+                            required
                         ></v-text-field>
                         <v-text-field
                             v-model="block.metadata.config.emails[index].to"
-                            :rules="$Validation.getRule('shortInput')"
+                            :rules="getToRules()"
                             :counter="$Validation.getLimit('shortInput')"
                             outlined
                             :label="
                                 $t('windward.core.components.settings.email.to')
                             "
                             :disabled="render"
+                            required
                         ></v-text-field>
                         <v-text-field
                             v-model="block.metadata.config.emails[index].cc"
-                            :rules="$Validation.getRule('shortInput')"
+                            :rules="getCcRules()"
                             :counter="$Validation.getLimit('shortInput')"
                             outlined
                             :label="
@@ -61,7 +63,7 @@
                             v-model="
                                 block.metadata.config.emails[index].subject
                             "
-                            :rules="$Validation.getRule('shortInput')"
+                            :rules="getSubjectRules()"
                             :counter="$Validation.getLimit('shortInput')"
                             outlined
                             :label="
@@ -70,6 +72,7 @@
                                 )
                             "
                             :disabled="render"
+                            required
                         ></v-text-field>
                         <v-btn
                             class="mb-4"
@@ -249,9 +252,31 @@ export default {
         onDragged() {
             // need to remount body after dragged to update the content body on the element
             this.expansionPanelKey = Crypto.id()
-            //close all panels on drag, leaving them open confuses the tracking as indexes changes around
+            // close all panels on drag, leaving them open confuses the tracking as indexes changes around
             this.block.metadata.config.selectedPanels = null
         },
+        getFromRules() {
+            return [
+                ...this.$Validation.getRule('shortInput'),
+                ...this.$Validation.getRule('exists'),
+            ]
+        },
+        getToRules() {
+            return [
+                ...this.$Validation.getRule('shortInput'),
+                ...this.$Validation.getRule('exists'),
+            ]
+        },
+        getCcRules() {
+            // CC field is not required, so only apply length validation
+            return this.$Validation.getRule('shortInput')
+        },
+        getSubjectRules() {
+            return [
+                ...this.$Validation.getRule('shortInput'),
+                ...this.$Validation.getRule('exists'),
+            ]
+        },
     },
 }
 </script>

package/components/Settings/OpenResponseCollateSettings.vue

@@ -60,6 +60,30 @@
                     </v-list-item>
                 </v-list-item-group>
             </v-list>
+            <v-container class="pa-0">
+                <p>
+                    {{
+                        $t(
+                            'windward.core.components.settings.open_response_collate.additional_text'
+                        )
+                    }}
+                </p>
+                <TextEditor
+                    v-model="block.metadata.config.additional_text"
+                    :disabled="render"
+                ></TextEditor>
+                <v-btn-toggle
+                    v-model="block.metadata.config.additional_text_alignment"
+                    class="pt-2"
+                >
+                    <v-btn value="top" :disabled="render">{{
+                        $t('windward.core.shared.settings.top')
+                    }}</v-btn>
+                    <v-btn value="bottom" :disabled="render">{{
+                        $t('windward.core.shared.settings.bottom')
+                    }}</v-btn>
+                </v-btn-toggle>
+            </v-container>
         </v-form>
     </v-container>
 </template>
@@ -67,16 +91,15 @@
 <script>
 import _ from 'lodash'
 import { mapGetters } from 'vuex'
-import draggable from 'vuedraggable'
-import TextEditor from '~/components/Text/TextEditor'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import ContentBlock from '~/models/ContentBlock'
 import Course from '~/models/Course'
+import TextEditor from '~/components/Text/TextEditor'
 
 export default {
     name: 'OpenResponseCollateSettings',
+    components: { TextEditor },
     extends: BaseContentSettings,
-    components: { draggable, TextEditor },
     props: {
         settings: { type: Object, required: false, default: null },
         context: { type: String, required: false, default: 'block' },
@@ -87,6 +110,16 @@ export default {
             linked: [],
         }
     },
+    async fetch() {
+        this.contentBlocks = await ContentBlock.where(
+            'tag',
+            'plugin-core-open-response'
+        )
+            .for(new Course({ id: this.course.id }))
+            .get()
+
+        this.sortContentBlocks(this.contentBlocks)
+    },
     computed: {
         ...mapGetters({
             organization: 'organization/get',
@@ -100,16 +133,6 @@ export default {
             }
         },
     },
-    async fetch() {
-        this.contentBlocks = await ContentBlock.where(
-            'tag',
-            'plugin-core-open-response'
-        )
-            .for(new Course({ id: this.course.id }))
-            .get()
-
-        this.sortContentBlocks(this.contentBlocks)
-    },
     beforeMount() {
         if (_.isEmpty(this.block)) {
             this.block = {}
@@ -129,21 +152,30 @@ export default {
         if (_.isEmpty(this.block.metadata.config.filename)) {
             this.block.metadata.config.filename = ''
         }
+        if (_.isEmpty(this.block.metadata.config.additional_text)) {
+            this.block.metadata.config.additional_text = ''
+        }
+        if (_.isEmpty(this.block.metadata.config.additional_text_alignment)) {
+            this.block.metadata.config.additional_text_alignment = 'top'
+        }
         // _.isEmpty(true) returns false. use isBoolean to check if this prop exists
         if (!_.isBoolean(this.block.metadata.config.include_prompts)) {
             this.block.metadata.config.include_prompts = false
         }
         this.linked = this.block.metadata.config.linked
     },
-    watch: {},
     mounted() {},
     methods: {
         sortContentBlocks(contentBlocks) {
-            let contentBlocksByPage = []
+            const contentBlocksByPage = []
             const blockMap = []
             // getting page order
             const contentBlockTree = this.$ContentService.getFlatTree()
-            contentBlockTree.forEach(function (page, index) {
+            const homePage = this.$ContentService.getHomepage()
+            if (homePage !== null) {
+                contentBlockTree.unshift(homePage)
+            }
+            contentBlockTree.forEach(function (page) {
                 contentBlocks.forEach((block) => {
                     // If the block is on this page and it wasn't already used on a different page
                     if (

package/components/Settings/UserUploadSettings.vue

@@ -1,10 +1,17 @@
 <template>
     <div>
-        <v-container>
+        <v-container class="pa-0">
             <BaseContentBlockSettings
                 v-model="block.metadata.config"
                 :disabled="render"
             ></BaseContentBlockSettings>
+            <p>
+                {{
+                    $t(
+                        'windward.core.components.settings.user_upload.max_file_size'
+                    )
+                }}
+            </p>
         </v-container>
         <v-switch
             v-model="block.metadata.config.uploadSettings.multiple"
@@ -23,6 +30,7 @@
             item-value="value"
             outlined
             dense
+            style="z-index: 20"
             :label="
                 $t('windward.core.components.settings.user_upload.accept_types')
             "
@@ -31,16 +39,111 @@
     </div>
 </template>
 <script>
-import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import _ from 'lodash'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import Uuid from '~/helpers/Uuid'
 import BaseContentBlockSettings from '~/components/Content/Settings/BaseContentBlockSettings.vue'
-import TextEditor from '~/components/Text/TextEditor'
 
 export default {
     name: 'UserUploadSettings',
-    components: { TextEditor, BaseContentBlockSettings },
+    components: { BaseContentBlockSettings },
     extends: BaseContentSettings,
+    data() {
+        return {
+            valid: true,
+            debounce: null,
+            loading: false,
+            attrs: {
+                class: 'mb-6',
+                boilerplate: true,
+                elevation: 0,
+            },
+        }
+    },
+    computed: {
+        acceptOptions() {
+            const documents = [
+                { name: 'doc', value: 'application/msword' },
+                {
+                    name: 'docx',
+                    value: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                },
+                {
+                    name: 'odt',
+                    value: 'application/vnd.oasis.opendocument.text',
+                },
+                { name: 'pdf', value: 'application/pdf' },
+                { name: 'xls', value: 'application/vnd.ms-excel' },
+                {
+                    name: 'xlsx',
+                    value: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                },
+                { name: 'rtf', value: 'application/rtf' },
+                { name: 'pages', value: 'application/x-iwork-pages-sffpages' },
+                {
+                    name: 'numbers',
+                    value: 'application/x-iwork-numbers-sffnumbers',
+                },
+                { name: 'txt', value: 'text/plain' },
+                {
+                    name: 'ods',
+                    value: 'application/vnd.oasis.opendocument.spreadsheet',
+                },
+                {
+                    name: 'csv',
+                    value: 'text/csv',
+                },
+                {
+                    name: 'pptx',
+                    value: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+                },
+                {
+                    name: 'ppt',
+                    value: 'application/vnd.ms-powerpoint',
+                },
+                {
+                    name: 'odp',
+                    value: 'application/vnd.oasis.opendocument.presentation',
+                },
+                {
+                    name: 'keynote',
+                    value: 'application/zip',
+                },
+            ]
+            return [
+                {
+                    name: this.$t(
+                        'windward.core.components.settings.user_upload.types.all'
+                    ),
+                    value: '*',
+                },
+                {
+                    name: this.$t(
+                        'windward.core.components.settings.user_upload.types.all_image'
+                    ),
+                    value: 'image/*',
+                },
+                {
+                    name: this.$t(
+                        'windward.core.components.settings.user_upload.types.all_video_audio'
+                    ),
+                    value: 'video/*,audio/*',
+                },
+                {
+                    name: this.$t(
+                        'windward.core.components.settings.user_upload.types.all_word'
+                    ),
+                    value: documents.map((type) => type.value).join(','),
+                },
+                {
+                    name: this.$t(
+                        'windward.core.components.settings.user_upload.types.all_zip'
+                    ),
+                    value: 'application/zip,application/gzip,application/x-gzip,application/x-tar,application/rar,application/x-rar-compressed,application/x-7z-compressed,application/x-bzip2,application/x-xz',
+                },
+            ]
+        },
+    },
     beforeMount() {
         if (_.isEmpty(this.block)) {
             this.block = {}
@@ -79,50 +182,6 @@ export default {
             }
         }
     },
-    data() {
-        return {
-            valid: true,
-            debounce: null,
-            loading: false,
-            acceptOptions: [
-                {
-                    name: this.$t(
-                        'windward.core.components.settings.user_upload.types.all'
-                    ),
-                    value: '*',
-                },
-                {
-                    name: this.$t(
-                        'windward.core.components.settings.user_upload.types.all_image'
-                    ),
-                    value: 'image/jpeg,image/gif,image/png',
-                },
-                {
-                    name: this.$t(
-                        'windward.core.components.settings.user_upload.types.all_word'
-                    ),
-                    value: 'application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                },
-                {
-                    name: this.$t(
-                        'windward.core.components.settings.user_upload.types.all_excel'
-                    ),
-                    value: 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                },
-                {
-                    name: this.$t(
-                        'windward.core.components.settings.user_upload.types.all_zip'
-                    ),
-                    value: 'application/zip',
-                },
-            ],
-            attrs: {
-                class: 'mb-6',
-                boilerplate: true,
-                elevation: 0,
-            },
-        }
-    },
     mounted() {},
     beforeDestroy() {
         if (this.debouncer) {