Skip to content

Commit

Permalink
Merge branch 'master' into asr
Browse files Browse the repository at this point in the history
  • Loading branch information
otsakir committed Jul 18, 2017
2 parents 8540a38 + fd0bb50 commit 3643152
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions designer/src/main/webapp/templates/steps/sayStep.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@
<div collapse='!step.iface.optionsVisible'>
<br/>
<div class="row">
<div class="col-lg-5 form-group input-group language">
<span class="input-group-addon ">{{'sayStepLanguageLabel' | translate}}</span>
<select ng-model='step.language' auto-clear ng-options='language.name as language.text for language in languages' id="languageSelect" class="form-control say-language-dropdown" >
<option value=""></option>
</select>
<div class="col-lg-5 form-group language">
<div class="input-group">
<span class="input-group-addon ">{{'sayStepLanguageLabel' | translate}}</span>
<select ng-model='step.language' auto-clear ng-options='language.name as language.text for language in languages' id="languageSelect" class="form-control say-language-dropdown" >
<option value=""></option>
</select>
</div>
</div>
<div class="col-lg-5 form-group btn-toolbar voice" role="toolbar">
<span class="btn-group">
Expand All @@ -37,11 +39,13 @@
</div>
</div>
<div class="row">
<div class="col-md-12 input-group loop">
<span class='input-group-addon help-tooltip' tooltip-trigger='mouseenter' tooltip-popup-delay='1000' tooltip="{{'sayStepLoopTooltip' | translate}}">{{'sayStepLoopLabel' | translate}}</span>
<input ng-model='step.loop' auto-clear type='number' class='form-control' placeholder="{{'sayStepLoopInputPlaceholder' | translate}}" />
<div class="col-md-12 loop">
<div class="input-group">
<span class='input-group-addon help-tooltip' tooltip-trigger='mouseenter' tooltip-popup-delay='1000' tooltip="{{'sayStepLoopTooltip' | translate}}">{{'sayStepLoopLabel' | translate}}</span>
<input ng-model='step.loop' auto-clear type='number' class='form-control' placeholder="{{'sayStepLoopInputPlaceholder' | translate}}" />
</div>
<div ng-show="step.loop==0" class="validation-warning"><i class="fa fa-warning step-warning-icon"></i> {{'sayStepLoopNeverendingWarning' | translate}}</div>
</div>
<div ng-show="step.loop==0" class="validation-warning"><i class="fa fa-warning step-warning-icon"></i> {{'sayStepLoopNeverendingWarning' | translate}}</div>
</div>
</div>

Expand Down

0 comments on commit 3643152

Please sign in to comment.