Changeset 9287

Show
Ignore:
Timestamp:
03/19/10 12:38:49 (2 years ago)
Author:
p_lindheimer
Message:

move add fields button below to make moshe happy for now, and fix some of the dialrule wizards that I broke

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.8/core/page.trunks.php

    r9286 r9287  
    499499    </tr> 
    500500 
    501     <tr><td colspan="2"> 
    502       <input type="button" id="dial-pattern-add"  value="<?php echo _("Add More Dial Pattern Fields")?>" /> 
    503       <input type="button" id="dial-pattern-clear"  value="<?php echo _("Clear all Fields")?>" /> 
    504     </td></tr> 
    505501    <tr><td colspan="2"><div class="dialpatterns"><table> 
    506502<?php 
     
    548544  $tabindex += 2000; // make room for dynamic insertion of new fields 
    549545?> 
     546    <tr><td colspan="2"> 
     547      <input type="button" id="dial-pattern-add"  value="<?php echo _("+ Add More Dial Pattern Fields")?>" /> 
     548      <input type="button" id="dial-pattern-clear"  value="<?php echo _("Clear all Fields")?>" /> 
     549    </td></tr> 
    550550      <tr> 
    551551        <td> 
     
    618618      function populateAlwaysAdd() { 
    619619        do { 
    620           var localpattern = <?php echo 'prompt("'._("What is the local dialing pattern?\\n\\n(ie. NXXNXXXXXX for US/CAN 10-digit dialing, NXXXXXX for 7-digit)").'"'?>,<?php echo _("NXXXXXX")?>); 
     620          var localpattern = <?php echo 'prompt("'._("What is the local dialing pattern?\\n\\n(ie. NXXNXXXXXX for US/CAN 10-digit dialing, NXXXXXX for 7-digit)").'"'?>,"<?php echo _("NXXXXXX")?>"); 
    621621          if (localpattern == null) return; 
    622622        } while (!localpattern.match('^[0-9#*ZXN\.]+$') && <?php echo '!alert("'._("Invalid pattern. Only 0-9, #, *, Z, N, X and . are allowed.").'")'?>); 
     
    627627        } while (!localprefix.match('^[0-9#*]+$') && <?php echo '!alert("'._("Invalid prefix. Only dialable characters (0-9, #, and *) are allowed.").'")'?>); 
    628628 
    629         addCustomField(localprefix,'',localpattern); 
     629        return addCustomField(localprefix,'',localpattern); 
    630630      } 
    631631       
     
    637637         
    638638        do { 
    639           var localpattern = <?php echo 'prompt("'._("What is the dialing pattern for local numbers after")?> "+localprefix+"? \n\n<?php echo _("(ie. NXXNXXXXXX for US/CAN 10-digit dialing, NXXXXXX for 7-digit)").'"'?>,<?php echo _("NXXXXXX")?>); 
     639          var localpattern = <?php echo 'prompt("'._("What is the dialing pattern for local numbers after")?> "+localprefix+"? \n\n<?php echo _("(ie. NXXNXXXXXX for US/CAN 10-digit dialing, NXXXXXX for 7-digit)").'"'?>,"<?php echo _("NXXXXXX")?>"); 
    640640          if (localpattern == null) return; 
    641641        } while (!localpattern.match('^[0-9#*ZXN\.]+$') && <?php echo '!alert("'._("Invalid pattern. Only 0-9, #, *, Z, N, X and . are allowed.").'")'?>); 
    642642         
    643         addCustomField('',localprefix,localpattern); 
     643        return addCustomField('',localprefix,localpattern); 
    644644      } 
    645645 
     
    651651        do { 
    652652 
    653         var localprepend = <?php echo 'prompt("'._("Google 411 number to dial, or alternative number you want dialed when calling directory assistance on this trunk").'"'?>,<?php echo _('"18004664411"') ?>); 
     653        var localprepend = <?php echo 'prompt("'._("Google 411 number to dial, or alternative number you want dialed when calling directory assistance on this trunk").'"'?>,"<?php echo _('18004664411') ?>"); 
    654654          if (localprepend == null) return; 
    655655        } while (!localprepend.match('^[0-9#*]+$') && <?php echo '!alert("'._('Invalid number. Only 0-9, #,  and * are allowed.').'")'?>); 
    656656         
    657         addCustomField(localprepend,localprefix,''); 
     657        return addCustomField(localprepend,localprefix,''); 
    658658      } 
    659659       
    660660      function changeAutoPop() { 
     661        var idx = false; 
    661662        switch(document.getElementById('autopop').value) { 
    662663          case "always": 
    663             populateAlwaysAdd(); 
     664            idx = populateAlwaysAdd(); 
     665            if (idx) { 
     666              $('#pattern_prefix_'+idx).focus(); 
     667            } 
    664668          break; 
    665669          case "remove": 
    666             populateRemove(); 
     670            idx = populateRemove(); 
     671            if (idx) { 
     672              $('#prepend_digit_'+idx).focus(); 
     673            } 
    667674          break; 
    668675          case "google411": 
    669             populateGoogle411(); 
     676            idx = populateGoogle411(); 
     677            if (idx) { 
     678              $('#pattern_pass_'+idx).focus(); 
     679            } 
    670680          break; 
    671681          case "lookup7":