FS-9346 [verto_communicator] Add DTMF icon while on a video call, fixing conferences...

diff --git a/html5/verto/verto_communicator/src/partials/dialpad_widget.html b/html5/verto/verto_communicator/src/partials/dialpad_widget.html
index 583b023c74a163073765a4ee0528872bcf17fada..09c0351b11c4389ffe631fd8a60aa5c9c8511eb1 100644 (file)
--- a/html5/verto/verto_communicator/src/partials/dialpad_widget.html
+++ b/html5/verto/verto_communicator/src/partials/dialpad_widget.html
@@ -1,17 +1,7 @@
-<div class="panel panel-default shadow-z-2" ng-class="{'shadow-z-4': call_history, 'shadow-z-2': !call_history}">
+<div class="panel panel-default shadow-z-2" ng-class="{'shadow-z-2': !call_history}">
       <form name="form">
         <div class="input-group dialpad-display">
-          <span ng-show="!incall" class="input-group-btn-left">
-            <a href="" ng-click="toggleCallHistory()">
-              <i class="mdi-action-settings-phone"></i>
-            </a>
-          </span>
-          <input name="dialpadnumber" type="text" class="form-control text-center" placeholder="Enter an extension" ng-model="dialpadNumber" />
-          <span class="input-group-btn">
-            <a href="" ng-click="backspace()">
-              <i class="mdi-content-backspace"></i>
-            </a>
-          </span>
+          <input name="dialpadnumber" type="text" class="form-control text-center" placeholder="" ng-model="dialpadNumber" />
         </div>
         <div class="panel-body">
           <div class="dialpad-numbers">
@@ -96,16 +86,6 @@
               </div>
             </div>
           </div>
-          <div class="form-group text-center">
-            <button type="submit" class="btn btn-success btn-fab" ng-click="call(); ok()" title="Call Extension">
-              <i class="mdi-communication-call"></i>
-            </button>
-            &nbsp;&nbsp;
-            <button type="submit" class="btn btn-primary btn-fab" ng-click="transfer(); ok()" title="Transfer">
-              <i class="mdi-notification-phone-forwarded"></i>
-            </button>
-
-          </div>
         </div>
       </form>
     </div>

diff --git a/html5/verto/verto_communicator/src/partials/video_call.html b/html5/verto/verto_communicator/src/partials/video_call.html
index bd76ea47ae8cf78fb158a8d9dd620daf0da9b779..e22448a6ba3c94ac47af39ada6b49a1341e2d71a 100644 (file)
--- a/html5/verto/verto_communicator/src/partials/video_call.html
+++ b/html5/verto/verto_communicator/src/partials/video_call.html
@@ -68,6 +68,9 @@
             </li>
           </ul>
         </div>
+        <button tooltips="" tooltip-title="Dialpad" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-900" ng-click="toggleDialpad()">
+          <i class="big-icon mdi-communication-dialpad"></i>
+        </button>
         <div class="btn-group" ng-show="conf.canvasCount > 1">
           <button tooltip-placement="bottom" tooltip-title="{{'MESSAGE_POPUP' | translate}}" uib-tooltips="{{'MESSAGE_POPUP' | translate}}" type="button" class="btn btn-material-blue-900 dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <i class="mdi-image-filter-none"></i>

diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
index 1c528089380e25fe3177526bdc85406df80b8cde..b926c77f9ef2d8da233fd7dc48c62e97a3aa8d0b 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
@@ -896,7 +896,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
           return false;
         }
 
-        data.call.dtmf(number);
+        data.call.dtmf(number.toString());
         console.debug('The DTMF was sent for the call.');
 
         if (angular.isFunction(callback)) {