Browse Source

UI-3177: Restructure feature popup header to handle longer strings (#87)

* Restructure feature popup header to handle string of different lengths

* Apply new feature popup header structure to call recording

* Apply new feature popup header structure to caller ID

* Apply new feature popup header structure to conferencing

* Apply new feature popup header structure to do not disturbe

* Apply new feature popup header structure to faxbox

* Apply new feature popup header structure to Find Me Follow Me

* Apply new feature popup header structure to Hotdesking

* Apply new feature popup header structure to Music On Hold

* Apply new feature popup header structure to Voicemail to Email

* Clean up remaining feature popup specific styling

* Apply new feature popup header structure to groups features
4.3
Joris Tirado 7 years ago
committed by GitHub
parent
commit
0c5b27b031
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 331 additions and 244 deletions
  1. +8
    -4
      submodules/groups/views/feature-call_recording.html
  2. +9
    -5
      submodules/groups/views/feature-forward.html
  3. +8
    -4
      submodules/groups/views/feature-next_action.html
  4. +9
    -5
      submodules/groups/views/feature-prepend.html
  5. +9
    -5
      submodules/groups/views/feature-ringback.html
  6. +205
    -179
      submodules/users/users.scss
  7. +9
    -4
      submodules/users/views/feature-call_forward.html
  8. +8
    -4
      submodules/users/views/feature-call_recording.html
  9. +8
    -4
      submodules/users/views/feature-caller_id.html
  10. +8
    -4
      submodules/users/views/feature-conferencing.html
  11. +8
    -4
      submodules/users/views/feature-do_not_disturb.html
  12. +8
    -4
      submodules/users/views/feature-faxing.html
  13. +9
    -5
      submodules/users/views/feature-find_me_follow_me.html
  14. +8
    -4
      submodules/users/views/feature-hotdesk.html
  15. +9
    -5
      submodules/users/views/feature-music_on_hold.html
  16. +8
    -4
      submodules/users/views/feature-vm_to_email.html

+ 8
- 4
submodules/groups/views/feature-call_recording.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="call_recording">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.call_recording.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.call_recording.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.groups.callRecording.headline }}
</div>
</div>
{{ i18n.groups.callRecording.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if group.extra.mapFeatures.call_recording.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}


+ 9
- 5
submodules/groups/views/feature-forward.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="forward">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.forward.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.forward.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.groups.forward.headline }}
</div>
</div>
{{ i18n.groups.forward.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if group.extra.mapFeatures.forward.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}
@ -23,4 +27,4 @@
<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
</div>
</div>
</div>
</div>

+ 8
- 4
submodules/groups/views/feature-next_action.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="next_action">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.next_action.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.next_action.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.groups.nextAction.headline }}
</div>
</div>
{{ i18n.groups.nextAction.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if group.extra.mapFeatures.next_action.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}


+ 9
- 5
submodules/groups/views/feature-prepend.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="prepend">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.prepend.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.prepend.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.groups.prepend.headline }}
</div>
</div>
{{ i18n.groups.prepend.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if group.extra.mapFeatures.prepend.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}
@ -30,4 +34,4 @@
<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
</div>
</div>
</div>
</div>

+ 9
- 5
submodules/groups/views/feature-ringback.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="ringback">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.ringback.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.ringback.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.groups.ringback.headline }}
</div>
</div>
{{ i18n.groups.ringback.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if group.extra.mapFeatures.ringback.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}
@ -37,4 +41,4 @@
<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
</div>
</div>
</div>
</div>

submodules/users/users.css → submodules/users/users.scss View File


+ 9
- 4
submodules/users/views/feature-call_forward.html View File

@ -1,11 +1,16 @@
<div class="monster-feature-popup-container" data-feature="call_forward">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.call_forward.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.call_forward.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.users.call_forward.headline }}
</div>
</div>
{{ i18n.users.call_forward.headline }}
<div class="btn-group feature-select-mode">
<div class="btn-group feature-select-mode popup-action">
<button data-value="off" class="monster-button monster-button-fit{{#compare extra.callForwardMode "===" "off"}} monster-button-primary selected{{/compare}}">
{{i18n.off}}
</button>


+ 8
- 4
submodules/users/views/feature-call_recording.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="call_recording">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.call_recording.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.call_recording.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.users.callRecording.headline }}
</div>
</div>
{{ i18n.users.callRecording.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if user.extra.mapFeatures.call_recording.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}


+ 8
- 4
submodules/users/views/feature-caller_id.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="caller_id">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.caller_id.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.caller_id.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.users.caller_id.headline }}
</div>
</div>
{{ i18n.users.caller_id.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" data-on-label="{{i18n.enabled}}" data-off-label="{{i18n.disabled}}"{{#if extra.mapFeatures.caller_id.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}


+ 8
- 4
submodules/users/views/feature-conferencing.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="conferencing">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.conferencing.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.conferencing.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.users.conferencing.headline }}
</div>
</div>
{{ i18n.users.conferencing.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if user.extra.mapFeatures.conferencing.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}


+ 8
- 4
submodules/users/views/feature-do_not_disturb.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="do_not_disturb">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.do_not_disturb.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.do_not_disturb.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.users.do_not_disturb.headline }}
</div>
</div>
{{ i18n.users.do_not_disturb.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" name="enabled" id="checkbox_do_not_disturb" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if extra.mapFeatures.do_not_disturb.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}


+ 8
- 4
submodules/users/views/feature-faxing.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="faxing">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.faxing.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.faxing.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.users.faxing.headline }}
</div>
</div>
{{ i18n.users.faxing.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if user.extra.mapFeatures.faxing.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}


+ 9
- 5
submodules/users/views/feature-find_me_follow_me.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="find_me_follow_me">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{currentUser.extra.mapFeatures.find_me_follow_me.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{currentUser.extra.mapFeatures.find_me_follow_me.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.users.find_me_follow_me.headline }}
</div>
</div>
{{ i18n.users.find_me_follow_me.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" id="checkbox_find_me_follow_me" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if currentUser.extra.mapFeatures.find_me_follow_me.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}
@ -22,4 +26,4 @@
<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
</div>
</div>
</div>
</div>

+ 8
- 4
submodules/users/views/feature-hotdesk.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="hotdesk">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.hotdesk.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.hotdesk.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.users.hotdesk.headline }}
</div>
</div>
{{ i18n.users.hotdesk.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" name="enabled" id="checkbox_hotdesk" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if extra.mapFeatures.hotdesk.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}


+ 9
- 5
submodules/users/views/feature-music_on_hold.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="music_on_hold">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.music_on_hold.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.music_on_hold.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.users.music_on_hold.headline }}
</div>
</div>
{{ i18n.users.music_on_hold.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if user.extra.mapFeatures.music_on_hold.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}
@ -37,4 +41,4 @@
<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
</div>
</div>
</div>
</div>

+ 8
- 4
submodules/users/views/feature-vm_to_email.html View File

@ -1,10 +1,14 @@
<div class="monster-feature-popup-container" data-feature="vm_to_email">
<div class="feature-popup-title">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.vm_to_email.icon}}"></i>
<div class="popup-title">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.vm_to_email.icon}}"></i>
</div>
<div class="feature-title">
{{ i18n.users.vm_to_email.headline }}
</div>
</div>
{{ i18n.users.vm_to_email.headline }}
<div class="switch">
<div class="switch popup-action">
{{#monsterSwitch}}
<input class="switch-state" type="checkbox" id="checkbox_vm_to_email" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if extra.mapFeatures.vm_to_email.active}} checked="checked"{{/if}}></input>
{{/monsterSwitch}}


Loading…
Cancel
Save