@windward/core 0.3.0 → 0.4.1

package/components/Settings/ImageSettings.vue

@@ -2,9 +2,10 @@
     <v-container>
         <ContentBlockAsset
             mimes="image/jpeg,image/png,image/gif"
-            @click:file="onFileSelect"
+            v-model="block.metadata.config.asset"
             class="mb-4"
             :disabled="render"
+            @click:file="onFileSelect"
         >
             <template #title>
                 {{ $t('windward.core.components.content.blocks.image.title') }}
@@ -19,7 +20,7 @@
         </ContentBlockAsset>
 
         <v-switch
-            v-model="block.metadata.config.hide_background"
+            v-model="block.metadata.config.hideBackground"
             :label="
                 $t('windward.core.components.settings.image.hide_background')
             "
@@ -31,30 +32,86 @@
             :disabled="render"
         ></v-switch>
         <v-tooltip top color="primary">
-            <template v-slot:activator="{ on, attrs }">
-                <div v-bind="attrs" v-on="on" class="d-flex justify-content">
-                    <v-switch
-                        v-model="block.metadata.config.decorative"
-                        @change="onDecorativeToggled($event)"
-                        :label="
-                            $t(
-                                'windward.core.components.settings.image.decorative'
-                            )
-                        "
-                        :disabled="render"
-                    ></v-switch>
-                    <div class="d-flex align-center pb-4">
-                        <v-icon x-small>mdi-help</v-icon>
-                    </div>
-                </div>
+            <template #activator="{ on, attrs }">
+                <v-switch
+                    v-model="block.metadata.config.decorative"
+                    :disabled="render"
+                    @change="onDecorativeToggled($event)"
+                >
+                    <template #label>
+                        <span v-bind="attrs" v-on="on">
+                            {{
+                                $t(
+                                    'windward.core.components.settings.image.decorative'
+                                )
+                            }}
+                            <v-icon x-small class="help-offset-icon">
+                                mdi-help
+                            </v-icon>
+                        </span>
+                    </template>
+                </v-switch>
             </template>
             <span class="span-description">{{
-                $t('windward.core.components.settings.image.toggle_description')
+                $t(
+                    'windward.core.components.settings.image.decorative_toggle_description'
+                )
             }}</span>
         </v-tooltip>
 
         <v-form v-if="!block.metadata.config.decorative">
+            <v-tooltip top color="primary">
+                <template #activator="{ on, attrs }">
+                    <v-switch
+                        v-model="block.metadata.config.inherit"
+                        :disabled="render"
+                    >
+                        <template #label>
+                            <span v-bind="attrs" v-on="on">
+                                {{
+                                    $t(
+                                        'windward.core.components.settings.image.inherit'
+                                    )
+                                }}
+                                <v-icon x-small class="help-offset-icon">
+                                    mdi-help
+                                </v-icon>
+                            </span>
+                        </template>
+                    </v-switch>
+                </template>
+                <span class="span-description">{{
+                    $t(
+                        'windward.core.components.settings.image.inherit_global_toggle_description'
+                    )
+                }}</span>
+            </v-tooltip>
+
+            <v-alert
+                v-if="block.metadata.config.inherit && !assetAltText"
+                type="warning"
+            >
+                {{
+                    $t('windward.core.components.settings.image.inherit_no_alt')
+                }}
+            </v-alert>
+
+            <v-text-field
+                v-if="block.metadata.config.inherit && assetAltText"
+                :value="assetAltText"
+                :label="
+                    $t('windward.core.components.navigation.image.default_alt')
+                "
+                outlined
+                counter
+                maxlength="125"
+                :rules="validation.textRules"
+                disabled
+            >
+            </v-text-field>
+
             <v-text-field
+                v-if="!block.metadata.config.inherit"
                 v-model="block.metadata.config.alt"
                 outlined
                 counter
@@ -65,9 +122,9 @@
                 :rules="validation.textRules"
                 :disabled="render"
             >
-                <template v-slot:append>
+                <template #append>
                     <v-tooltip top color="primary">
-                        <template v-slot:activator="{ on }">
+                        <template #activator="{ on }">
                             <v-icon v-on="on" small>mdi-help</v-icon>
                         </template>
                         <span class="span-description">{{
@@ -81,8 +138,10 @@
             <h5 class="pb-2">
                 {{ $t('windward.core.components.settings.image.screenreader') }}
                 <v-tooltip top color="primary">
-                    <template v-slot:activator="{ on }">
-                        <v-icon v-on="on" small class="pb-3">mdi-help</v-icon>
+                    <template #activator="{ on }">
+                        <v-icon v-on="on" small class="help-offset-icon">
+                            mdi-help
+                        </v-icon>
                     </template>
                     <span class="span-description">{{
                         $t(
@@ -92,10 +151,26 @@
                 </v-tooltip>
             </h5>
             <TextEditor
-                v-model="block.metadata.config.aria_describedby"
+                v-if="!block.metadata.config.inherit"
+                v-model="block.metadata.config.ariaDescribedBy"
                 menubar="bullist numlist"
                 :disabled="render"
             ></TextEditor>
+
+            <div v-if="block.metadata.config.inherit">
+                <v-card v-if="assetDescribedByText">
+                    <v-card-text>
+                        <TextViewer v-model="assetDescribedByText"></TextViewer>
+                    </v-card-text>
+                </v-card>
+                <v-alert v-if="!assetDescribedByText" type="warning">
+                    {{
+                        $t(
+                            'windward.core.components.settings.image.inherit_no_aria'
+                        )
+                    }}
+                </v-alert>
+            </div>
         </v-form>
     </v-container>
 </template>
@@ -103,17 +178,38 @@
 <script>
 import _ from 'lodash'
 import TextEditor from '~/components/Text/TextEditor'
+import TextViewer from '~/components/Text/TextViewer'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import ContentBlockAsset from '~/components/Content/ContentBlockAsset.vue'
 
 export default {
     name: 'ImageSettings',
     extends: BaseContentSettings,
-    components: { ContentBlockAsset, TextEditor },
+    components: { ContentBlockAsset, TextEditor, TextViewer },
     props: {
         settings: { type: Object, required: false, default: null },
         context: { type: String, required: false, default: 'block' },
     },
+    computed: {
+        assetAltText() {
+            // Get the block aria info and fallback to the asset metadata
+            return _.get(this.fileAsset, 'metadata.props.alt', null)
+        },
+        assetDescribedByText() {
+            // Get the block aria info and fallback to the asset metadata
+            return _.get(
+                this.fileAsset,
+                'metadata.props.aria_describedby',
+                null
+            )
+        },
+        fileAsset() {
+            return _.get(this.block, 'assets[0].asset', null)
+        },
+        fileAssetMap() {
+            return _.get(this.block, 'metadata.config.asset', null)
+        },
+    },
     beforeMount() {
         if (_.isEmpty(this.block)) {
             this.block = {}
@@ -127,11 +223,17 @@ export default {
         if (_.isEmpty(this.block.metadata.config)) {
             this.block.metadata.config = {}
         }
+        if (_.isEmpty(this.block.metadata.config.asset)) {
+            this.block.metadata.config.asset = null
+        }
         if (_.isEmpty(this.block.metadata.config.alt)) {
             this.block.metadata.config.alt = ''
         }
-        if (!_.isBoolean(this.block.metadata.config.hide_background)) {
-            this.block.metadata.config.hide_background = false
+        if (!_.isBoolean(this.block.metadata.config.hideBackground)) {
+            this.block.metadata.config.hideBackground = false
+        }
+        if (!_.isBoolean(this.block.metadata.config.inherit)) {
+            this.block.metadata.config.inherit = true
         }
         if (!_.isBoolean(this.block.metadata.config.modal)) {
             this.block.metadata.config.modal = false
@@ -139,18 +241,12 @@ export default {
         if (!_.isBoolean(this.block.metadata.config.decorative)) {
             this.block.metadata.config.decorative = false
         }
-        if (_.isEmpty(this.block.metadata.config.aria_describedby)) {
-            this.block.metadata.config.aria_describedby = ''
+        if (_.isEmpty(this.block.metadata.config.ariaDescribedBy)) {
+            this.block.metadata.config.ariaDescribedBy = ''
         }
     },
     data() {
         return {
-            imageSettings: {
-                // Default values
-                alt_text: '',
-                aria_described: '',
-                release_results: 'submitted',
-            },
             validation: {
                 textRules: [
                     (v) => !!v || this.$t('shared.forms.errors.required'),
@@ -163,16 +259,19 @@ export default {
     methods: {
         onDecorativeToggled(evt) {
             if (evt) {
-                this.block.metadata.config.aria_describedby = ''
+                this.block.metadata.config.ariaDescribedBy = ''
                 this.block.metadata.config.alt = ''
             }
         },
         onFileSelect(file) {
+            // Clear out the body since we're defining a proper file link now
+            this.block.body = ''
+
             // file = null when you remove a file
             if (_.isEmpty(file)) {
-                this.block.body = ''
+                this.block.assets = []
             } else {
-                this.block.body = file.asset.public_url
+                this.block.assets = [file]
 
                 //Assign height and width for skeleton loader
                 if (!_.isEmpty(file.asset.metadata.props)) {
@@ -188,7 +287,7 @@ export default {
                     ''
                 )
 
-                this.block.metadata.config.aria_describedby = _.get(
+                this.block.metadata.config.ariaDescribedBy = _.get(
                     file,
                     'asset.metadata.props.aria_describedby',
                     ''
@@ -204,4 +303,8 @@ export default {
     justify-content: center;
     width: 200px;
 }
+.help-offset-icon {
+    position: relative;
+    top: -8px;
+}
 </style>

package/components/Settings/MathSettings.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <br />
-        <v-btn :disabled="render" @click="onToggleExpand" text class="mb-2">
+        <v-btn elevation="0" :disabled="render" @click="onToggleExpand" text class="mb-2">
             <v-icon v-if="!block.metadata.config.expand" color="primary"
                 >mdi-arrow-expand-all</v-icon
             >

package/components/Settings/OpenResponseSettings.vue

@@ -45,12 +45,11 @@
 import _ from 'lodash'
 import TextEditor from '~/components/Text/TextEditor'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
-import ContentBlockAsset from '~/components/Content/ContentBlockAsset.vue'
 
 export default {
     name: 'ImageSettings',
     extends: BaseContentSettings,
-    components: { ContentBlockAsset, TextEditor },
+    components: { TextEditor },
     props: {
         settings: { type: Object, required: false, default: null },
         context: { type: String, required: false, default: 'block' },

package/components/Settings/ScenarioChoiceSettings.vue

@@ -115,6 +115,7 @@
             <v-row justify="center" class="my-4">
                 <v-btn
                     color="primary"
+                    elevation="0"
                     :disabled="
                         render || block.metadata.config.items.length > 26
                     "

package/components/Settings/TabSettings.vue

@@ -34,6 +34,7 @@
                         <v-btn
                             @click="onToggleExpand(index)"
                             text
+                            elevation="0"
                             class="mb-3"
                             :disabled="render"
                         >
@@ -61,7 +62,12 @@
                 </template>
             </SortableExpansionPanel>
             <v-row justify="center" class="my-4">
-                <v-btn color="primary" :disabled="render" @click="onAddElement">
+                <v-btn
+                    color="primary"
+                    elevation="0"
+                    :disabled="render"
+                    @click="onAddElement"
+                >
                     <v-icon>mdi-plus</v-icon>
                     {{ $t('windward.core.components.settings.tab.add_tab') }}
                 </v-btn>

package/components/Settings/TextEditorSettings.vue

@@ -5,7 +5,7 @@
             <v-btn-toggle v-model="settingSelector" multiple borderless>
                 <v-tooltip top>
                     <template #activator="{ on, attrs }">
-                        <v-btn v-bind="attrs" v-on="on" text :disabled="render">
+                        <v-btn elevation="0" v-bind="attrs" v-on="on" text :disabled="render">
                             <v-icon>mdi-comment-text-multiple</v-icon>
                             {{
                                 $t(
@@ -25,7 +25,7 @@
 
                 <v-tooltip top>
                     <template #activator="{ on, attrs }">
-                        <v-btn v-bind="attrs" v-on="on" text :disabled="render">
+                        <v-btn elevation="0" v-bind="attrs" v-on="on" text :disabled="render">
                             <v-icon> mdi-text-long</v-icon>
                             {{
                                 $t(
@@ -48,6 +48,7 @@
                         <v-btn
                             v-bind="attrs"
                             v-on="on"
+                            elevation="0"
                             text
                             :disabled="render"
                             @click="

package/components/Settings/UserUploadSettings.vue

@@ -22,7 +22,7 @@
             "
             :disabled="render"
         ></v-select>
-        <v-btn text class="mt-4" :disabled="render" @click="onToggleExpand()">
+        <v-btn elevation="0" text class="mt-4" :disabled="render" @click="onToggleExpand()">
             <v-icon v-if="!block.metadata.config.expand" color="primary"
                 >mdi-arrow-expand-all</v-icon
             >