Changeset 1258

Show
Ignore:
Timestamp:
11/20/08 15:21:27 (2 months ago)
Author:
areski
Message:

little bug on prefix

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/admin/Public/A2B_entity_prefix.php

    r1254 r1258  
    3636$smarty->display('main.tpl'); 
    3737 
    38        if ($popup_select){ 
     38if ($popup_select){ 
    3939?> 
    40 <SCRIPT LANGUAGE="javascript"> 
    41 <!-- Begin 
    42 function sendValue(selvalue){ 
    43         window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue; 
    44         window.close(); 
     40        <SCRIPT LANGUAGE="javascript"> 
     41        <!-- Begin 
     42        function sendValue(selvalue){ 
     43                window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue; 
     44                window.close(); 
     45        } 
     46        // End --> 
     47        </script> 
     48<?php 
    4549} 
    46 // End --> 
    47 </script> 
    48 <?php 
    49         } 
    5050 
    5151 
    5252// #### HELP SECTION 
    53 if (!($popup_select==1) && ($form_action=='list')) echo $CC_help_list_prefix; 
    54         elseif (!($popup_select==1)) echo $CC_help_edit_prefix; 
    55  
     53if ($form_action=='list') {  
     54        if (!$popup_select) echo $CC_help_list_prefix; 
     55} else { 
     56        echo $CC_help_list_tariffgroup; 
     57} 
    5658 
    5759// #### TOP SECTION PAGE 
    …… 
    6668 
    6769// #### FOOTER SECTION 
    68 if (!($popup_select==1)) $smarty->display('footer.tpl'); 
     70if (!$popup_select) $smarty->display('footer.tpl'); 
    6971 
    7072 
    7173 
    72  
    73 ?> 

  • trunk/admin/Public/A2B_entity_tariffgroup.php

    r777 r1258  
    6565 
    6666// #### FOOTER SECTION 
    67 $smarty->display('footer.tpl'); 
     67if (!$popup_select) $smarty->display('footer.tpl'); 

  • trunk/admin/Public/form_data/FG_var_def_ratecard.inc

    r1257 r1258  
    177177   "13", 
    178178   gettext("Insert the dialing prefix, such as for UK '44' or for US '1' "), 
    179    "" , "", "", "", "" , "A2B_entity_prefix.php?popup_select=1&", ", 'prefix','width=550,height=340,top=20,left=100,scrollbars=1'", gettext("A) Add destination prefixes, ie '441' for UK Landlines.<br>B) Use 'defaultprefix' to setup a rate for all destinations where a specific rate is not provided.<br>C) if you ADD a rate, NOT an EDIT, you can define a range of prefixes. '32484-32487' adds all prefixes between 32484 and 32487. '32484,32386,32488' would add only the individual prefixes listed.<br>D) Asterisk extensions style + POSIX regex syntaxes are supported. '_447[7-9]XXXXXXXX' matches 12-digit UK mobiles. '_X{0,3}(112|999|911)' matches any 0-3 digits followed an emergency number. '_' can be used to add length, and raise the priority.")); 
     179   "" , "", "", "", "" , "A2B_entity_prefix.php?popup_select=2&", ", 'prefix','width=550,height=340,top=20,left=100,scrollbars=1'", gettext("A) Add destination prefixes, ie '441' for UK Landlines.<br>B) Use 'defaultprefix' to setup a rate for all destinations where a specific rate is not provided.<br>C) if you ADD a rate, NOT an EDIT, you can define a range of prefixes. '32484-32487' adds all prefixes between 32484 and 32487. '32484,32386,32488' would add only the individual prefixes listed.<br>D) Asterisk extensions style + POSIX regex syntaxes are supported. '_447[7-9]XXXXXXXX' matches 12-digit UK mobiles. '_X{0,3}(112|999|911)' matches any 0-3 digits followed an emergency number. '_' can be used to add length, and raise the priority.")); 
    180180 
    181181 

  • trunk/admin/Public/form_data/FG_var_prefix.inc

    r1257 r1258  
    3030$HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false; 
    3131 
    32 if (!($popup_select==1)) { 
    33         $HD_Form -> FG_EDITION = true; 
    34         $HD_Form -> FG_DELETION = true; 
    35 } else { 
    36         $HD_Form -> CV_FOLLOWPARAMETERS= "&popup_select=".$_GET['popup_select']."&popup_formname=".$_GET['popup_formname']."&popup_fieldname=".$_GET['popup_fieldname']; 
    37         $HD_Form ->FG_LIMITE_DISPLAY=7; 
     32 
     33if ($popup_select) { 
     34        $HD_Form -> FG_LIMITE_DISPLAY = 7; 
     35        $HD_Form -> CV_FOLLOWPARAMETERS = "&popup_select=" . $_GET['popup_select'] . "&popup_formname=" . $_GET['popup_formname'] . "&popup_fieldname=" . $_GET['popup_fieldname']; 
     36 
    3837        $HD_Form -> FG_OTHER_BUTTON1 = true; 
    3938        $HD_Form -> FG_OTHER_BUTTON1_ALT = '<font color="red">&lt;select&gt;</font>'; 
    4039        $HD_Form -> FG_OTHER_BUTTON1_IMG = ''; 
    41                                          
    42         $HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|col1|');"; 
     40 
     41        if ($popup_select == 1) 
     42                $HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|param|');"; 
     43        elseif ($popup_select == 2) 
     44                $HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|col0|');"; 
    4345} 
     46else { 
     47        $HD_Form -> FG_EDITION = true; 
     48        $HD_Form -> FG_DELETION = true; 
     49} 
     50 
    4451 
    4552 


Google