Commit fc666746 authored by Anton's avatar Anton

Rename Video to Media

parent 9c80b1d1
Pipeline #14256 passed with stage
in 23 seconds
......@@ -6,7 +6,7 @@
import path from 'path'
import url from 'url'
import he from 'he'
// import { getMetaData } from '../../../lib/annotations/videos'
// import { getMetaData } from '../../../lib/annotations/media'
const fetchTitle = function (source) {
const _this = this
......
......@@ -4,7 +4,7 @@ import MarkdownDisplay from './MarkdownDisplay'
import PromiseSpan from './PromiseSpan'
import StyleTag from './StyleTag'
import Username from './Username'
import VideoTitle from './VideoTitle'
import VideoTitle from './MediaTitle'
export {
ConditionalLink,
......
......@@ -10,7 +10,7 @@
q-list.col-7.no-border.no-padding.margin-bottom(v-if="sc == 'timeline'")
q-item.item-hover
q-item-main ...is allowed to add videos to this timeline.
q-item-main ...is allowed to add media to this timeline.
q-item-side.text-white
q-toggle(v-for="ut in u.timelines", v-model="ut.add", :key="ut")
......@@ -30,7 +30,7 @@
q-list.col-7.no-border.no-padding.margin-bottom(v-if="sc == 'grid'")
q-item.item-hover
q-item-main ...is allowed to add videos to this grid.
q-item-main ...is allowed to add media to this grid.
q-item-side.text-white
q-toggle(v-model="toggle")
q-item.item-hover
......@@ -48,22 +48,22 @@
q-list.col-7.no-border.no-padding.margin-bottom(v-if="sc == 'timeline'")
q-item.item-hover
q-item-main ...is allowed to add videos.
q-item-main ...is allowed to add media.
q-item-side.text-white
q-toggle(v-model="toggle")
q-item.item-hover
q-item-main ...is allowed to videos.
q-item-main ...is allowed to media.
q-item-side.text-white
q-toggle(v-model="toggle")
q-item.item-hover
q-item-main ...is allowed to delete videos.
q-item-main ...is allowed to delete media.
q-item-side.text-white
q-toggle(v-model="toggle")
q-item.item-hover
q-item-main ...is allowed to annotate videos.
q-item-main ...is allowed to annotate media.
q-item-side.text-white
q-toggle(v-model="toggle")
......
import { BackButton } from './buttons'
import FullScreen from './layouts/FullScreen'
import VideoPlayer from './media/VideoPlayer'
import MediaPlayer from './media/MediaPlayer'
import BrowserWarning from './dialogs/BrowserWarning'
import DataTable from './partials/DataTable'
import ConfirmModal from './dialogs/ConfirmModal'
......@@ -9,13 +9,13 @@ import PromiseSpan from './elements/PromiseSpan'
import SiteFooter from './partials/SiteFooter'
import Uploader from './partials/Uploader'
import Username from './elements/Username'
import VideoTitle from './elements/VideoTitle'
import MediaTitle from './elements/MediaTitle'
export {
BackButton,
BrowserWarning,
FullScreen,
VideoPlayer,
MediaPlayer,
DataTable,
ConfirmModal,
MarkdownDisplay,
......@@ -23,5 +23,5 @@ export {
SiteFooter,
Uploader,
Username,
VideoTitle
MediaTitle
}
......@@ -28,8 +28,6 @@
import { videoPlayer } from 'vue-video-player'
import guessType from 'mbjs-media/src/util/guess-type'
if (process.env.FEATURE_BETWEENUS) require('./videojs-betweenus.styl')
export default {
components: {
'vue-video-player': videoPlayer
......@@ -213,7 +211,7 @@
top -0.4em
z-index 0
/* Video.js scaling */
/* Media.js scaling */
.video-js .vjs-tech
/*height auto*/
......
// FOR EXHIBITION
.vjs-betweenus
.video-js
font-family 'Roboto'
.video-js .vjs-control-bar
height 40px
.video-js.vjs-paused .vjs-big-play-button
background #2a65ff
width 65px
height 65px
border 0
border-radius 0
.vjs-big-play-centered
.vjs-big-play-button
margin-top -33px
.vjs-icon-placeholder:before
line-height 65px !important
.vjs-button > .vjs-icon-placeholder:before
font-size 2.5em
padding-top 1px
.video-js .vjs-control-bar
background-color #2a65ffaa
.vjs-slider
background-color #ffffff55
.vjs-volume-panel
display: none
.vjs-play-control
.vjs-icon-placeholder:before
line-height 40px
.vjs-fullscreen-control .vjs-icon-placeholder:before
line-height 40px
.video-js .vjs-time-control
font-size 0.85rem
line-height 40px
.video-js .vjs-progress-control
padding-top 3px
.vjs-load-progress
background-color #ffffff55
.video-js .vjs-play-progress:before
font-size: 1.5em
right: -0.8em
top: -0.4em
......@@ -56,7 +56,7 @@
export default {
name: 'breadcrumb-nav',
props: ['timeline', 'videoMetadata', 'video', 'grid', 'document'],
props: ['timeline', 'mediaMetadata', 'media', 'grid', 'document'],
components: {
UserNavButton
},
......@@ -114,13 +114,13 @@
label: this.timeline.title,
name: 'piecemaker.timelines.show',
params: { uuid: this.timeline._uuid },
route: '/piecemaker/timelines/' + this.timeline._uuid + '/videos'
route: '/piecemaker/timelines/' + this.timeline._uuid + '/media'
})
}
if (this.videoMetadata) {
if (this.mediaMetadata) {
bc.push({
label: this.videoMetadata.title,
route: '/piecemaker/videos/' + this.video._uuid + '/annotate'
label: this.mediaMetadata.title,
route: '/piecemaker/media/' + this.media._uuid + '/annotate'
})
}
if (this.grid) {
......@@ -156,8 +156,8 @@
}
else {
bc.push({
label: 'Add video',
route: '/piecemaker/timelines/' + this.timeline._uuid + '/videos'
label: 'Add media',
route: '/piecemaker/timelines/' + this.timeline._uuid + '/media'
})
}
}
......@@ -180,8 +180,8 @@
let di = []
if (this.timeline) {
di.push({
label: this.$t('navigation.piecemaker.piecemaker_videos_list'),
route: '/piecemaker/timelines/' + this.timeline._uuid + '/videos',
label: this.$t('navigation.piecemaker.piecemaker_media_list'),
route: '/piecemaker/timelines/' + this.timeline._uuid + '/media',
name: 'piecemaker.timelines.list'
}, {
label: this.$t('navigation.piecemaker.piecemaker_timelines_annotate'),
......@@ -197,20 +197,20 @@
name: 'piecemaker.timelines.search'
})
}
if (this.videoMetadata) {
if (this.mediaMetadata) {
di = []
di.push({
label: this.$t('navigation.piecemaker.piecemaker_videos_annotate'),
route: '/piecemaker/videos/' + this.video._uuid + '/annotate',
name: 'piecemaker.videos.annotate'
label: this.$t('navigation.piecemaker.piecemaker_media_annotate'),
route: '/piecemaker/media/' + this.media._uuid + '/annotate',
name: 'piecemaker.media.annotate'
}, {
label: this.$t('navigation.piecemaker.piecemaker_videos_edit'),
route: '/piecemaker/videos/' + this.video._uuid + '/edit',
name: 'piecemaker.videos.edit'
label: this.$t('navigation.piecemaker.piecemaker_media_edit'),
route: '/piecemaker/media/' + this.media._uuid + '/edit',
name: 'piecemaker.media.edit'
}, {
label: this.$t('navigation.piecemaker.piecemaker_videos_sync'),
route: '/piecemaker/videos/' + this.video._uuid + '/sync',
name: 'piecemaker.videos.sync'
label: this.$t('navigation.piecemaker.piecemaker_media_sync'),
route: '/piecemaker/media/' + this.media._uuid + '/sync',
name: 'piecemaker.media.sync'
})
}
if (this.grid) {
......@@ -265,9 +265,9 @@
}
if (this.timeline) {
ab = {
label: this.$t('buttons.add_video'),
route: '/piecemaker/timelines/' + this.timeline._uuid + '/videos/create',
name: 'piecemaker.videos.create'
label: this.$t('buttons.add_media'),
route: '/piecemaker/timelines/' + this.timeline._uuid + '/media/create',
name: 'piecemaker.media.create'
}
}
if (this.breadcrumbs[0].label === 'Documents') {
......
......@@ -77,18 +77,18 @@
'piecemaker.timelines.edit',
'piecemaker.timelines.search',
'piecemaker.timelines.show',
'piecemaker.videos.create'
'piecemaker.media.create'
],
timelineCreate: [
'piecemaker.timelines.create'
],
video: [
'piecemaker.videos.annotate',
'piecemaker.videos.edit',
'piecemaker.videos.sync'
media: [
'piecemaker.media.annotate',
'piecemaker.media.edit',
'piecemaker.media.sync'
],
videoCreate: [
'piecemaker.videos.create'
mediaCreate: [
'piecemaker.media.create'
],
mosys: [
'mosys.grids.list'
......@@ -199,7 +199,7 @@
navLinks: [
{
name: 'piecemaker.timelines.show',
label: 'Videos'
label: 'labels.media'
},
{
name: 'piecemaker.timelines.annotate',
......@@ -219,9 +219,9 @@
'piecemaker.timelines.show': [
{
type: 'link',
label: this.$t('buttons.add_video'),
label: this.$t('buttons.add_media'),
color: 'primary',
name: 'piecemaker.videos.create',
name: 'piecemaker.media.create',
icon: 'add',
params: {
'timelineUuid': 'uuid'
......@@ -244,23 +244,23 @@
}
},
*/
video: {
media: {
navLinks: [
{
name: 'piecemaker.videos.annotate',
name: 'piecemaker.media.annotate',
label: 'Annotate'
},
{
name: 'piecemaker.videos.edit',
name: 'piecemaker.media.edit',
label: 'Edit'
},
{
name: 'piecemaker.videos.sync',
name: 'piecemaker.media.sync',
label: 'Sync'
}
],
specialFunctions: {
'piecemaker.videos.annotate': [
'piecemaker.media.annotate': [
{
type: 'popover',
icon: 'view_quilt',
......@@ -294,9 +294,9 @@
}
}
/*
videoCreate: {
mediaCreate: {
specialFunctions: {
'piecemaker.videos.create': [
'piecemaker.media.create': [
{
type: 'link',
label: 'Cancel',
......
This diff is collapsed.
......@@ -27,8 +27,8 @@
if (this.currentRoute === 'piecemaker.timelines.show' && this.name === 'piecemaker.timelines.list') {
this.nameCheck = 'piecemaker.timelines.show'
}
else if (this.currentRoute === 'piecemaker.videos.list' && this.name === 'piecemaker.timelines.list') {
this.nameCheck = 'piecemaker.videos.list'
else if (this.currentRoute === 'piecemaker.media.list' && this.name === 'piecemaker.timelines.list') {
this.nameCheck = 'piecemaker.media.list'
}
else this.nameCheck = this.name
},
......
......@@ -101,7 +101,7 @@
if (/.+\/timelines\/[^/]+\/edit$/.test(path)) {
return constants.mapTypes.MAP_TYPE_TIMELINE
}
else if (/.+\/videos\/[^/]+\/edit$/.test(path)) {
else if (/.+\/media\/[^/]+\/edit$/.test(path)) {
return 'Video'
}
else if (/.+\/grids\/[^/]+\/edit$/.test(path)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment