entcore 4.0.0-dev.21 → 4.0.0-dev.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
<section class="tabs heading-tabs">
|
|
36
36
|
<header workflow="[[header.worflowKey]]"
|
|
37
37
|
navigation-trigger="showHeader(header)"
|
|
38
|
-
navigation-trigger-param="{onEvent:'click', guardMessageKey:'
|
|
38
|
+
navigation-trigger-param="{onEvent:'click', guardMessageKey: '[[header.guardMessageKey]]', rootGuardId:'videoCapturedGuard'}"
|
|
39
39
|
ng-repeat="header in headers()"
|
|
40
40
|
ng-class="{'selected':isSelectedHeader(header)}"
|
|
41
41
|
ng-show="header.visible()">
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<div ng-controller="VideoController" class="video" custom-guard="
|
|
1
|
+
<div ng-controller="VideoController" class="video" custom-guard="recordGuard">
|
|
2
2
|
<div class="recorder--video">
|
|
3
3
|
<div ng-if="isIncompatible() && !isIncompatibleDevice()" class="browser" style="box-shadow:none">
|
|
4
4
|
<h3><i18n>embed.video.incompatible</i18n></h3>
|
|
@@ -17,36 +17,97 @@
|
|
|
17
17
|
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
18
18
|
~
|
|
19
19
|
-->
|
|
20
|
+
<section custom-guard="uploadGuard">
|
|
21
|
+
<div ng-if="!display.isUploading">
|
|
22
|
+
<p>
|
|
23
|
+
<em class="twelve cell small-text"><i18n>video.upload.supported.formats</i18n></em>
|
|
24
|
+
<em class="twelve cell small-text"><i18n>video.upload.supported.weight</i18n></em>
|
|
25
|
+
</p>
|
|
26
|
+
<div class="row media-library">
|
|
27
|
+
<div class="drop-zone import-files">
|
|
28
|
+
<article class="drop flex-row align-center">
|
|
29
|
+
<i class="two cloud-upload"></i>
|
|
30
|
+
<div class="ten help">
|
|
31
|
+
<em><i18n>video.drop.help2</i18n></em>
|
|
32
|
+
</div>
|
|
33
|
+
</article>
|
|
34
|
+
<article class="default flex-row align-center absolute-position">
|
|
35
|
+
<div class="three select-file">
|
|
36
|
+
<div class="hidden-content">
|
|
37
|
+
<input
|
|
38
|
+
class="upload-input"
|
|
39
|
+
type="file"
|
|
40
|
+
files-input-change="importFiles()"
|
|
41
|
+
accept="video/avi, video/msvideo, video/x-msvideo, video/quicktime, video/x-quicktime, video/mp4, .mov, .avi, .mp4"
|
|
42
|
+
ng-model="upload.files" />
|
|
43
|
+
</div>
|
|
44
|
+
<button class="file-button no-margin" translate content="library.file.choose" ng-click="triggerIpnutFileClick($event)"></button>
|
|
45
|
+
</div>
|
|
46
|
+
<i class="two cloud-upload"></i>
|
|
47
|
+
<div class="seven help">
|
|
48
|
+
<em><i18n>video.drop.help</i18n></em>
|
|
49
|
+
</div>
|
|
50
|
+
</article>
|
|
20
51
|
|
|
21
|
-
<p>
|
|
22
|
-
<em class="twelve cell small-text"><i18n>video.upload.supported.formats</i18n></em>
|
|
23
|
-
<em class="twelve cell small-text"><i18n>video.upload.supported.weight</i18n></em>
|
|
24
|
-
</p>
|
|
25
|
-
<div class="row media-library">
|
|
26
|
-
<div class="drop-zone import-files">
|
|
27
|
-
<article class="drop flex-row align-center">
|
|
28
|
-
<i class="two cloud-upload"></i>
|
|
29
|
-
<div class="ten help">
|
|
30
|
-
<em><i18n>video.drop.help2</i18n></em>
|
|
31
|
-
</div>
|
|
32
|
-
</article>
|
|
33
|
-
<article class="default flex-row align-center absolute-position">
|
|
34
|
-
<div class="three select-file">
|
|
35
|
-
<div class="hidden-content">
|
|
36
|
-
<input
|
|
37
|
-
class="upload-input"
|
|
38
|
-
type="file"
|
|
39
|
-
files-input-change="importFiles()"
|
|
40
|
-
accept="video/avi, video/msvideo, video/x-msvideo, video/quicktime, video/x-quicktime, video/mp4"
|
|
41
|
-
ng-model="upload.files" />
|
|
42
|
-
</div>
|
|
43
|
-
<button class="file-button no-margin" translate content="library.file.choose" ng-click="triggerIpnutFileClick($event)"></button>
|
|
44
52
|
</div>
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
53
|
+
</div>
|
|
54
|
+
</div>
|
|
55
|
+
<div ng-if="display.isUploading">
|
|
56
|
+
<div class="split-screen" ng-class="{ split: display.editedDocument !== undefined }">
|
|
57
|
+
<div class="loading-list drop-zone">
|
|
58
|
+
<ul>
|
|
59
|
+
<li ng-repeat="doc in upload.documents"
|
|
60
|
+
ng-click="openCompression(doc)"
|
|
61
|
+
ng-class="{
|
|
62
|
+
'image-file': doc.isEditableImage && doc.uploadStatus === 'loaded',
|
|
63
|
+
'loading': doc.uploadStatus === 'loading',
|
|
64
|
+
selected: doc === display.editedDocument
|
|
65
|
+
}"
|
|
66
|
+
>
|
|
67
|
+
<div class="icon">
|
|
68
|
+
<i class="[[doc.role()]]"></i>
|
|
69
|
+
<i tooltip-check="doc.isEditableImage && doc.uploadStatus === 'loaded'"
|
|
70
|
+
tooltip="medialibrary.editImage.tooltip" class="edit" ng-if="doc.isEditableImage && doc.uploadStatus === 'loaded'"></i>
|
|
71
|
+
</div>
|
|
72
|
+
<div class="title">[[doc.name || doc.title]]</div>
|
|
73
|
+
<div class="status-infos">
|
|
74
|
+
<span class="small-text horizontal-margin">
|
|
75
|
+
[[doc.size]]
|
|
76
|
+
</span>
|
|
77
|
+
<i ng-class="{
|
|
78
|
+
loading: doc.uploadStatus === 'loading',
|
|
79
|
+
loaded: doc.uploadStatus === 'loaded',
|
|
80
|
+
failed: doc.uploadStatus === 'failed'
|
|
81
|
+
}"></i>
|
|
82
|
+
</div>
|
|
83
|
+
<i class="close" ng-click="abortOrDelete(doc)"></i>
|
|
84
|
+
</li>
|
|
85
|
+
</ul>
|
|
48
86
|
</div>
|
|
49
|
-
</
|
|
50
|
-
|
|
87
|
+
</div>
|
|
88
|
+
<div class="row media-library-toolbar zero-mobile">
|
|
89
|
+
<div class="one cell"> <!-- Marge d'Alizée, voir #44014 --></div>
|
|
90
|
+
|
|
91
|
+
<div class="five cell">
|
|
92
|
+
<em class="small-text"><i18n>video.upload.supported.formats</i18n></em>
|
|
93
|
+
<br>
|
|
94
|
+
<em class="small-text"><i18n>video.upload.supported.weight</i18n></em>
|
|
95
|
+
</div>
|
|
96
|
+
<div class="six cell">
|
|
97
|
+
<button class="right-magnet" ng-click="confirmImport()" ng-disabled="!canConfirmImport()" type="button"><i18n>import</i18n></button>
|
|
98
|
+
<button class="right-magnet cancel" ng-click="cancelUpload()" type="button"><i18n>cancel</i18n></button>
|
|
99
|
+
</div>
|
|
100
|
+
</div>
|
|
101
|
+
<div class="twelve row zero-desktop">
|
|
102
|
+
<p>
|
|
103
|
+
<em class="small-text"><i18n>video.upload.supported.formats</i18n></em>
|
|
104
|
+
<br>
|
|
105
|
+
<em class="small-text"><i18n>video.upload.supported.weight</i18n></em>
|
|
106
|
+
</p>
|
|
107
|
+
<div class="twelve cell">
|
|
108
|
+
<button class="right-magnet" ng-click="confirmImport()" ng-disabled="!canConfirmImport()" type="button"><i18n>import</i18n></button>
|
|
109
|
+
<button class="right-magnet cancel" ng-click="cancelUpload()" type="button"><i18n>cancel</i18n></button>
|
|
110
|
+
</div>
|
|
111
|
+
</div>
|
|
51
112
|
</div>
|
|
52
|
-
</
|
|
113
|
+
</section>
|
|
@@ -1,56 +0,0 @@
|
|
|
1
|
-
<div class="split-screen" ng-class="{ split: display.editedDocument !== undefined }">
|
|
2
|
-
<div class="loading-list drop-zone">
|
|
3
|
-
<ul>
|
|
4
|
-
<li ng-repeat="doc in upload.documents"
|
|
5
|
-
ng-click="openCompression(doc)"
|
|
6
|
-
ng-class="{
|
|
7
|
-
'image-file': doc.isEditableImage && doc.uploadStatus === 'loaded',
|
|
8
|
-
'loading': doc.uploadStatus === 'loading',
|
|
9
|
-
selected: doc === display.editedDocument
|
|
10
|
-
}"
|
|
11
|
-
>
|
|
12
|
-
<div class="icon">
|
|
13
|
-
<i class="[[doc.role()]]"></i>
|
|
14
|
-
<i tooltip-check="doc.isEditableImage && doc.uploadStatus === 'loaded'"
|
|
15
|
-
tooltip="medialibrary.editImage.tooltip" class="edit" ng-if="doc.isEditableImage && doc.uploadStatus === 'loaded'"></i>
|
|
16
|
-
</div>
|
|
17
|
-
<div class="title">[[doc.name || doc.title]]</div>
|
|
18
|
-
<div class="status-infos">
|
|
19
|
-
<span class="small-text horizontal-margin">
|
|
20
|
-
[[doc.size]]
|
|
21
|
-
</span>
|
|
22
|
-
<i ng-class="{
|
|
23
|
-
loading: doc.uploadStatus === 'loading',
|
|
24
|
-
loaded: doc.uploadStatus === 'loaded',
|
|
25
|
-
failed: doc.uploadStatus === 'failed'
|
|
26
|
-
}"></i>
|
|
27
|
-
</div>
|
|
28
|
-
<i class="close" ng-click="abortOrDelete(doc)"></i>
|
|
29
|
-
</li>
|
|
30
|
-
</ul>
|
|
31
|
-
</div>
|
|
32
|
-
</div>
|
|
33
|
-
<div class="row zero-mobile">
|
|
34
|
-
<div class="one cell"> <!-- Marge d'Alizée, voir #44014 --></div>
|
|
35
|
-
|
|
36
|
-
<div class="five cell">
|
|
37
|
-
<em class="small-text"><i18n>video.upload.supported.formats</i18n></em>
|
|
38
|
-
<br>
|
|
39
|
-
<em class="small-text"><i18n>video.upload.supported.weight</i18n></em>
|
|
40
|
-
</div>
|
|
41
|
-
<div class="six cell">
|
|
42
|
-
<button class="right-magnet" ng-click="confirmImport()" ng-disabled="!canConfirmImport()" type="button"><i18n>import</i18n></button>
|
|
43
|
-
<button class="right-magnet cancel" ng-click="cancelUpload()" type="button"><i18n>cancel</i18n></button>
|
|
44
|
-
</div>
|
|
45
|
-
</div>
|
|
46
|
-
<div class="twelve row zero-desktop">
|
|
47
|
-
<p>
|
|
48
|
-
<em class="small-text"><i18n>video.upload.supported.formats</i18n></em>
|
|
49
|
-
<br>
|
|
50
|
-
<em class="small-text"><i18n>video.upload.supported.weight</i18n></em>
|
|
51
|
-
</p>
|
|
52
|
-
<div class="twelve cell">
|
|
53
|
-
<button class="right-magnet" ng-click="confirmImport()" ng-disabled="!canConfirmImport()" type="button"><i18n>import</i18n></button>
|
|
54
|
-
<button class="right-magnet cancel" ng-click="cancelUpload()" type="button"><i18n>cancel</i18n></button>
|
|
55
|
-
</div>
|
|
56
|
-
</div>
|