FS-7509: move name to main page

diff --git a/html5/verto/video_demo/index.html b/html5/verto/video_demo/index.html
index 4b13390a1c47893e36370f203cfa26246555c80f..5378d4b6a8df47f5c7f5f60448314cf7ef80ae59 100644 (file)
--- a/html5/verto/video_demo/index.html
+++ b/html5/verto/video_demo/index.html
@@ -183,16 +183,17 @@
        <input type="password" size="20" id="passwd"/>
       </div>
 
+<!--
       <div class="ui-field-contain">
        <label for="name">CID Name</label>  
-       <input type="text" size="30" id="name"/>
+       <input type="text" size="30" class="name"/>
       </div>
 
       <div class="ui-field-contain">
        <label for="name">CID Number</label>  
-       <input type="text" size="20" id="cid"/>
+       <input type="text" size="20" class="cid"/>
       </div>
-
+-->
       <div class="ui-field-contain">
        <label for="name">Hostname</label>
        <input type="text" size="20" id="hostName"/>
@@ -378,7 +379,18 @@ function dial(ext)
 
 
 <br><br><br>
+      <div class="ui-field-contain" style="text-align:right;">
+       <label for="name">Name</label>  
+       <input type="text" size="30" id="cidname"/>
+      </div>
+      <div class="ui-field-contain" style="text-align:right;">
+       <label for="name">CID Number</label>  
+       <input type="text" size="20" id="cid"/>
+      </div>
+      <div class="ui-field-contain" style="text-align:right;">
+       <label for="name">Extension</label>  
          <input type="text" id="ext""/>
+</div>
          <button data-inline="true" id="callbtn">Call Extension</button>
          <br><br>
          <div style="color:blue" id="main_info">&nbsp;</div><br><br>

diff --git a/html5/verto/video_demo/verto.js b/html5/verto/video_demo/verto.js
index 02930e3b4d9bac743af9a119f3cad6c44cf3634c..c827f9f553aae39d3a3551e706548b537ddb3fca 100644 (file)
--- a/html5/verto/video_demo/verto.js
+++ b/html5/verto/video_demo/verto.js
@@ -361,7 +361,7 @@ var callbacks = {
             $("#ansbtn").click(function() {
                 cur_call.answer({
                    useStereo: $("#use_stereo").is(':checked'),
-                   callee_id_name: $("#name").val(),
+                   callee_id_name: $("#cidname").val(),
                    callee_id_number: $("#cid").val(),
                    useCamera: $("#usecamera").find(":selected").val(),
                    useMic: $("#usemic").find(":selected").val()
@@ -538,7 +538,7 @@ function docall() {
 
     cur_call = verto.newCall({
         destination_number: $("#ext").val(),
-        caller_id_name: $("#name").val(),
+        caller_id_name: $("#cidname").val(),
         caller_id_number: $("#cid").val(),
        outgoingBandwidth: outgoingBandwidth,
        incomingBandwidth: incomingBandwidth,
@@ -570,7 +570,7 @@ function doshare(on) {
        
        share_call = verto.newCall({
             destination_number: $("#ext").val() + "-screen",
-            caller_id_name: $("#name").val() + " (Screen)",
+            caller_id_name: $("#cidname").val() + " (Screen)",
             caller_id_number: $("#cid").val() + " (screen)",
            outgoingBandwidth: outgoingBandwidth,
            incomingBandwidth: incomingBandwidth,
@@ -589,7 +589,7 @@ function doshare(on) {
 
     //cur_share = verto.newCall({
     //    destination_number: $("#ext").val(),
-    //    caller_id_name: $("#name").val(),
+    //    caller_id_name: $("#cidname").val(),
     //    caller_id_number: $("#cid").val(),
     //    useVideo: check_vid(),
     //    useStereo: $("#use_stereo").is(':checked')
@@ -676,7 +676,7 @@ function init() {
        pop("#ext", "verto_demo_ext", "3500");
     }
 
-    pop("#name", "verto_demo_name", "FreeSWITCH User");
+    pop("#cidname", "verto_demo_name", "FreeSWITCH User");
     pop("#cid", "verto_demo_cid", "1008");
     pop("#textto", "verto_demo_textto", "1000");