Browse Source

UI-1774: fuxed tts greeting on main conf and added tooltip on icon

4.3
Maxime Roux 10 years ago
parent
commit
e1d62c2c01
3 changed files with 9 additions and 5 deletions
  1. +2
    -1
      i18n/en-US.json
  2. +6
    -3
      submodules/strategy/strategy.js
  3. +1
    -1
      views/strategy-layout.html

+ 2
- 1
i18n/en-US.json View File

@ -862,7 +862,8 @@
"title": "Custom Conference Greeting", "title": "Custom Conference Greeting",
"link": "Custom Greeting", "link": "Custom Greeting",
"info": "Customize your conference greeting message using our Text-to-Speech feature. Simply type your greeting message in the input field below.", "info": "Customize your conference greeting message using our Text-to-Speech feature. Simply type your greeting message in the input field below.",
"mainConfMissing": "Your Main Conference could not be found."
"mainConfMissing": "Your Main Conference could not be found.",
"tooltip": "Your Main Conference has a custom greeting message."
} }
}, },


+ 6
- 3
submodules/strategy/strategy.js View File

@ -203,6 +203,8 @@ define(function(require){
.empty() .empty()
.append(template); .append(template);
monster.ui.tooltips(template);
if(!hasMainNumber) { if(!hasMainNumber) {
template.find('.element-container.strategy-hours,.element-container.strategy-holidays,.element-container.strategy-calls').hide(); template.find('.element-container.strategy-hours,.element-container.strategy-holidays,.element-container.strategy-calls').hide();
template.find('.element-container.helper').css('display', 'block'); template.find('.element-container.helper').css('display', 'block');
@ -1036,7 +1038,8 @@ define(function(require){
confCallflow.flow.data.welcome_prompt = { confCallflow.flow.data.welcome_prompt = {
media_id: updatedGreeting.id media_id: updatedGreeting.id
}; };
self.strategyUpdateCallflow(confCallflow, function() {
self.strategyUpdateCallflow(confCallflow, function(updatedCallflow) {
strategyData.callflows.MainConference = updatedCallflow;
greetingPopup.dialog('close').remove(); greetingPopup.dialog('close').remove();
$('#strategy_container .custom-greeting-icon').show(); $('#strategy_container .custom-greeting-icon').show();
}); });
@ -1044,7 +1047,8 @@ define(function(require){
} else { } else {
if('welcome_prompt' in confCallflow.flow.data) { if('welcome_prompt' in confCallflow.flow.data) {
delete confCallflow.flow.data.welcome_prompt; delete confCallflow.flow.data.welcome_prompt;
self.strategyUpdateCallflow(confCallflow, function() {
self.strategyUpdateCallflow(confCallflow, function(updatedCallflow) {
strategyData.callflows.MainConference = updatedCallflow;
greetingPopup.dialog('close').remove(); greetingPopup.dialog('close').remove();
$('#strategy_container .custom-greeting-icon').hide(); $('#strategy_container .custom-greeting-icon').hide();
}); });
@ -1054,7 +1058,6 @@ define(function(require){
} }
}); });
}); });
} else { } else {
monster.ui.alert('error', self.i18n.active().strategy.customConferenceGreeting.mainConfMissing) monster.ui.alert('error', self.i18n.active().strategy.customConferenceGreeting.mainConfMissing)
} }


+ 1
- 1
views/strategy-layout.html View File

@ -92,7 +92,7 @@
</span> </span>
<i class="fa fa-play"></i> <i class="fa fa-play"></i>
</div> </div>
<i class="fa fa-volume-up monster-blue custom-greeting-icon" {{#unless customConfGreeting}}style="display:none"{{/unless}}></i>
<i class="fa fa-volume-up monster-blue custom-greeting-icon" data-original-title="{{i18n.strategy.customConferenceGreeting.tooltip}}" data-placement="top" data-toggle="tooltip" {{#unless customConfGreeting}}style="display:none"{{/unless}}></i>
</div> </div>
</div> </div>
<div class="element-content"></div> <div class="element-content"></div>


Loading…
Cancel
Save