Browse Source

UI-3333: Show media upload disclosure message depending on config flag (#125)

4.3
Joris Tirado 7 years ago
committed by GitHub
parent
commit
9284cd8ced
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 1 deletions
  1. +1
    -0
      submodules/groups/groups.js
  2. +8
    -0
      submodules/groups/views/feature-ringback.html
  3. +1
    -0
      submodules/myOffice/myOffice.js
  4. +9
    -1
      submodules/myOffice/views/musicOnHoldPopup.html
  5. +1
    -0
      submodules/users/users.js
  6. +8
    -0
      submodules/users/views/feature-music_on_hold.html

+ 1
- 0
submodules/groups/groups.js View File

@ -672,6 +672,7 @@ define(function(require) {
self.groupsListMedias(function(medias) {
var templateData = {
showMediaUploadDisclosure: monster.config.whitelabel.showMediaUploadDisclosure,
group: data.group,
silenceMedia: silenceMediaId,
mediaList: medias,


+ 8
- 0
submodules/groups/views/feature-ringback.html View File

@ -32,6 +32,14 @@
<input type="file" class="upload-input" accept="audio/*">
<button type="button" class="monster-button monster-button-success non-fixed upload-action upload-submit"><i class="fa fa-upload"></i></button>
<button type="button" class="monster-button monster-button-danger non-fixed upload-action upload-cancel"><i class="fa fa-times"></i></button>
{{#if showMediaUploadDisclosure}}
<div>
<br>
{{#monsterPanelText i18n.mediaUploadDisclosure.title "info" "fill-width"}}
{{i18n.mediaUploadDisclosure.text}}
{{/monsterPanelText}}
</div>
{{/if}}
</div>
</div>


+ 1
- 0
submodules/myOffice/myOffice.js View File

@ -763,6 +763,7 @@ define(function(require) {
self.myOfficeListMedias(function(medias) {
var templateData = {
showMediaUploadDisclosure: monster.config.whitelabel.showMediaUploadDisclosure,
silenceMedia: silenceMediaId,
mediaList: medias,
media: 'music_on_hold' in account && 'media_id' in account.music_on_hold ? account.music_on_hold.media_id : undefined


+ 9
- 1
submodules/myOffice/views/musicOnHoldPopup.html View File

@ -28,6 +28,14 @@
<input type="file" class="upload-input" accept="audio/*">
<button type="button" class="monster-button monster-button-success upload-action upload-submit"><i class="fa fa-upload"></i></button>
<button type="button" class="monster-button monster-button-danger upload-action upload-cancel"><i class="fa fa-times"></i></button>
{{#if showMediaUploadDisclosure}}
<div>
<br>
{{#monsterPanelText i18n.mediaUploadDisclosure.title "info" "fill-width"}}
{{i18n.mediaUploadDisclosure.text}}
{{/monsterPanelText}}
</div>
{{/if}}
</div>
</div>
@ -37,4 +45,4 @@
<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
</div>
</div>
</div>
</div>

+ 1
- 0
submodules/users/users.js View File

@ -3069,6 +3069,7 @@ define(function(require) {
self.usersListMedias(function(medias) {
var templateData = {
showMediaUploadDisclosure: monster.config.whitelabel.showMediaUploadDisclosure,
user: currentUser,
silenceMedia: silenceMediaId,
mediaList: medias,


+ 8
- 0
submodules/users/views/feature-music_on_hold.html View File

@ -32,6 +32,14 @@
<input type="file" class="upload-input" accept="audio/*">
<button type="button" class="monster-button monster-button-success non-fixed upload-action upload-submit"><i class="fa fa-upload"></i></button>
<button type="button" class="monster-button monster-button-danger non-fixed upload-action upload-cancel"><i class="fa fa-times"></i></button>
{{#if showMediaUploadDisclosure}}
<div>
<br>
{{#monsterPanelText i18n.mediaUploadDisclosure.title "info" "fill-width"}}
{{i18n.mediaUploadDisclosure.text}}
{{/monsterPanelText}}
</div>
{{/if}}
</div>
</div>


Loading…
Cancel
Save