Show
Ignore:
Timestamp:
08/29/11 08:02:24 (2 years ago)
Author:
mbrevda
Message:

closes #5342 - update skin

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.10/core/assets/css/core.css

    r12426 r12445  
    1 .text-watermark { 
    2   color: #CCCCCC; 
    3 } 
    4 .dpt-title { 
    5   color: #CCCCCC; 
    6 } 
    7 .text-normal { 
    8   color: inherit; 
    9 } 
     1 
    102div.dialpatterns { 
    113  max-height: 15em;  

  • modules/branches/2.10/core/assets/js/advancedsettings.js

    r12426 r12445  
    3434      dataType: 'json', 
    3535      success: function(data, textStatus, XMLHttpRequest) { 
     36        //console.log(data); 
    3637        mythis.attr({src: 'images/accept.png'}); 
    3738        if (!data.validated) { 

  • modules/branches/2.10/core/module.xml

    r12070 r12445  
    22  <rawname>core</rawname> 
    33  <repo>standard</repo> 
    4   <type>setup</type> 
    5   <category>Basic</category> 
     4  <category>Apps</category> 
    65  <name>Core</name> 
    76  <version>2.9.0.0</version> 
    …… 
    1918    *2.9.0rc1.1* #5011, #5017, #5033 
    2019    *2.9.0rc1.0* #4987, #4989, #5000, #4998, #4995 
    21     *2.9.0beta2.3* #4937, #4977, #4970 
    22     *2.9.0beta2.2* #4968, other cosmectic changes 
    23     *2.9.0beta2.1* #4936 
    24     *2.9.0beta2.0* #4804, #4908, #4933 
    25     *2.9.0beta1.9* #4001, #4914 
    26     *2.9.0beta1.8* #4902 
    27     *2.9.0beta1.7* #4137, #4620 
    28     *2.9.0beta1.6* #4890, #2110 
    29     *2.9.0beta1.5* #4888 
    30     *2.9.0beta1.4* #4880 
    31     *2.9.0beta1.3* #4656, #4821, #4798, #4872, #4401, #4619 
    32     *2.9.0beta1.2* #4224 
    33     *2.9.0beta1.1* #778, #4804, #4809, #4812, #4576, #4334, #4815, #3893 
    34     *2.9.0alpha1.7* #4608, #4790, #4788, #4800 
    35     *2.9.0alpha1.6* #4774, #4775, #4776, #3784, #4440 
    36     *2.9.0alpha1.5* #4733, #4469, #4740, #4962, #4744, #4749, #4752, #4753, #4758, #4760, #4299, #1565 
    37     *2.9.0alpha1.4* #4648,#4653,#4453,#4563,#4445,#4617,#4654,#4332,#4652,#4684,#4681,#4689,#4701,#4697,#4702,#4697,#4472,#4710,#4655,#4730,#4566,#4733 
    38     *2.9.0alpha1.3* #4580, #4599, #4600, #4615, #4633, #4634, #4645 
    39     *2.9.0alpha1.2* #4401, #4525, #4507, #4499, #4574, #4572, #4575, #4527, #4469 
    40     *2.9.0alpha1.1* #4443, #4444, #4460, #4414 
    41     *2.9.0alpha1.0* bump to 2.9 
    42     *2.8.0.1* #4426 
    43     *2.8.0.0* #4396 
    44     *2.8.0.0RC1.4* #4390 
    45     *2.8.0.0RC1.3* #4380 
    46     *2.8.0.0RC1.2* #4379 again 
    47     *2.8.0.0RC1.1* #4378, #4379 
    48     *2.8.0.0RC1.0* #4374 
    49     *2.8.0.0beta2.4* #4350, #4357 
    50     *2.8.0.0beta2.3* #4338 
    51     *2.8.0.0beta2.2* #4309, remove legacy directory settings if no IVRs using them 
    52     *2.8.0.0beta2.1* #4293 
    53     *2.8.0.0beta2.0* #4273, #4230, #4242, #4196, #3519, #4288, #4270, #4219 
    54     *2.8.0.0beta1.9* #4205, #4208, #4155, #4212 
    55     *2.8.0.0beta1.8* #4202 
    56     *2.8.0.0beta1.7* #4174, #4190, #4201, #4161 
    57     *2.8.0.0beta1.6* #4181, #4184 
    58     *2.8.0.0beta1.5* #4155 
    59     *2.8.0.0beta1.4* #4071, #4152, #4156, #4159, #4160 
    60     *2.8.0.0beta1.3* #4151 
    61     *2.8.0.0beta1.2* #4146, #4148, triming local changelog 
    62     *2.8.0.0beta1.1* #4132, #2833, #4068, #4135, #4143, #4144 
    63     *2.8.0.0beta1.0* #4100, #4102, #4110 New Outbound Routing Schema and features 
    64     *2.7.0.2* really fix #4092 
    65     *2.7.0.1* #4093, #4094, #4095, #4092 
    66     *2.7.0.0* minor tweaks 
    67     *2.7.0RC1.5* #4075, #4078, #4080, #4053 
    68     *2.7.0RC1.4* #4072 
    69     *2.7.0RC1.3* #4068, (#4069 available but not used) 
    70     *2.7.0RC1.2* #4067 
    71     *2.7.0RC1.1* #4058, #4065, #4066 
    72     *2.7.0RC1.0* #4041, #4042, #4047, #4051 (requires MoH 2.7.0.0 or above) 
    73     *2.7.0beta1.3* #4037 
    74     *2.7.0beta1.2* #3993 (#3934, #3889) 
    75     *2.7.0beta1.1* #4020, #2389, #3980, #3992, #3939, #333, #3721, #3185 
    76     *2.7.0beta1.0* #3882, #4000, #1718, #3927, #3805, #4007, #3998, #3951, sql injections fixes 
    77     *2.6.0.1* #3889 reverted, #3900, #3962, #2787, #3793, #3377, #3386, #3717 
    78     *2.6.0.0* #3889, #3919 
    79     *2.6.0RC2.1* #3886, #3885, #3875 revisited 
    80     *2.6.0RC2.0* #3854, #3872, #3871, #3877 
    81     *2.6.0RC1.1* #3751 
    82     *2.6.0RC1.0* #3529, #3864, #3538 
    83     *2.6.0beta2.2* #3722, #3848, #3841, #3700 
    84     *2.6.0beta2.1* #3844 (revert #3423), #3846, #3849 
    85     *2.6.0beta2.0* #3075, #3501, #3636, #3581, #3266, #3701, #3545, #3430, #3798, #3609, #3836 
    86     *2.6.0beta1.3* trunk tab improvements 
    87     *2.6.0beta1.2* added more sql escape in devices 
    88     *2.6.0beta1.1* #3696, (needs framework updated), #3702, #3706, #3712, #3691, #3693, #3705, #3644, #3739, #3741, #3744, #3790  
    89     *2.6.0beta1.0* #3478, #3423, #3648, #3685, #3686, #1380 
    90     *2.6.0alpha1.4* fixes re #3649 
    91     *2.6.0alpha1.3* #3653, #3591, #3650 
    92     *2.6.0alpha1.2* #3451, $932, #3426, #3474, #3439, #3526, #3534, $3648, #3649, #3517 moved macro-vm to auto-generation (WARNING: custom modification of macro-vm in extensions_custom.conf need to be moved to extensions_override_freepbx.conf 
    93     *2.6.0alpha1.1* #3380, #3358, #3387, localizations 
    94     *2.6.0alpha1.0* #3321, #3328, #3345 inbound CID routing fix, adds vm-callme voicemail access option 
    95     *2.5* CHANGELOG TRUNCATED See SVN Repository 
    9620  </changelog> 
    9721  <depends> 
    …… 
    10226  </requirements> 
    10327  <menuitems> 
    104     <extensions needsenginedb="yes" sort="-4">Extensions</extensions> 
    105     <users needsenginedb="yes" sort="-3">Users</users> 
    106     <devices needsenginedb="yes" sort="-4">Devices</devices> 
    107     <did category="Inbound Call Control" sort="-5">Inbound Routes</did> 
    108     <zapchandids category="Inbound Call Control" sort="-5">Zap Channel DIDs</zapchandids> 
    109     <routing>Outbound Routes</routing> 
    110     <trunks>Trunks</trunks> 
    111     <general>General Settings</general> 
    112     <advancedsettings category="Advanced Administration" type="tool" sort="-9">Advanced Settings</advancedsettings> 
    113     <ampusers sort="5">Administrators</ampusers> 
    114     <wiki type="tool" category="Support" sort="5" href="http://freepbx.org" target="_blank" access="all">FreePBX Support</wiki> 
     28    <extensions needsenginedb="yes">Extensions</extensions> 
     29    <users needsenginedb="yes">Users</users> 
     30    <devices needsenginedb="yes">Devices</devices> 
     31    <did category="Call Flow">Inbound Routes</did> 
     32    <zapchandids category="Call Flow">Zap Channel DIDs</zapchandids> 
     33    <routing category="Call Flow">Outbound Routes</routing> 
     34    <trunks category="Call Flow">Trunks</trunks> 
     35    <general category="Settings">General Settings</general> 
     36    <advancedsettings category="Settings">Advanced Settings</advancedsettings> 
     37    <ampusers category="Admin">Administrators</ampusers> 
     38    <wiki category="Admin" href="http://freepbx.org" target="_blank" access="all">FreePBX Support</wiki> 
    11539  </menuitems> 
    11640  <location>release/2.9/core-2.9.0.0.tgz</location> 

  • modules/branches/2.10/core/page.advancedsettings.php

    r12065 r12445  
    1212    $freepbx_conf->set_conf_values(array($keyword => trim($var['value'])),true,$amp_conf['AS_OVERRIDE_READONLY']); 
    1313    $status = $freepbx_conf->get_last_update_status(); 
    14     if ($var['send_reload'] && $status[$keyword]['saved']) { 
     14    /*if ($var['send_reload'] && $status[$keyword]['saved']) { 
    1515      ob_start(); 
    1616      include ('views/freepbx_reloadbar.php'); 
    …… 
    2020      include ('views/freepbx_reload.php'); 
    2121      $status[$keyword]['reload_header'] = ob_get_clean(); 
    22     } 
     22    }*/ 
    2323    if ($status[$keyword]['saved']) { 
    2424      freepbx_log(FPBX_LOG_INFO,sprintf(_("Advanced Settings changed freepbx_conf setting: [$keyword] => [%s]"),$var['value'])); 
    …… 
    3232        case 'ASTMANAGERPROXYPORT': 
    3333        case 'AMPMGRUSER': 
    34           $astman->Command('module reload manager'); 
     34          //$astman->Command('module reload manager'); 
    3535          break; 
    3636      } 
    …… 
    3838    } 
    3939    echo json_encode($status[$keyword]); 
     40    exit; 
    4041  } 
    4142  exit; 

  • modules/branches/2.10/core/page.routing.php

    r12426 r12445  
    180180  case 'ajaxroutepos': 
    181181    core_routing_setrouteorder($repotrunkkey, $repotrunkdirection); 
    182     needreload(); 
    183     include_once("common/json.inc.php"); 
    184     if ($_POST['send_reload'] == 'yes') { 
    185       ob_start(); 
    186       include ('views/freepbx_reloadbar.php'); 
    187       $json_array['reload_bar'] = ob_get_clean(); 
    188  
    189       ob_start(); 
    190       include ('views/freepbx_reload.php'); 
    191       $json_array['reload_header'] = ob_get_clean(); 
    192     } 
    193     $json_array['show_reload'] = 'yes'; 
    194     $json = new Services_JSON(); 
    195     header("Content-type: application/json");  
    196     echo $json->encode($json_array); 
     182      needreload(); 
     183     
     184      header("Content-type: application/json");  
     185      echo json_encode($json_array); 
    197186    exit; 
    198187 
    …… 
    323312      var repotrunkkey=+ui.item.attr('id').replace('routelist',''); 
    324313      var repotrunkdirection=ui.item.index();repotrunkdirection--; 
    325       var send_reload = '&send_reload='+($('#need_reload_block').size() == 0 ? 'yes':'no'); 
    326314      $.ajax({ 
    327315        type: 'POST', 
    328316        url: location.href, 
    329         data: "action=ajaxroutepos&quietmode=1&skip_astman=1&restrictmods=core&repotrunkkey="+repotrunkkey+"&repotrunkdirection="+repotrunkdirection+send_reload, 
     317        data: "action=ajaxroutepos&quietmode=1&skip_astman=1&restrictmods=core&repotrunkkey="+repotrunkkey+"&repotrunkdirection="+repotrunkdirection, 
    330318        dataType: 'json', 
    331319        success: function(data) { 
    332           /* if the reload_block is not there, we blindly insert the info we think we got because we told 
    333              it in the ajax call to send it to use, should wo double check? 
    334           */ 
    335           if ((data.show_reload == 'yes') && !$('#need_reload_block').fadeIn().size()) { 
    336             $('#logo').after(data.reload_bar).fadeIn(); 
    337             $('#moduleBox').before(data.reload_header); 
    338           } 
    339           if (data.show_reload == 'yes') { 
    340             $('#need_reload_block').fadeIn(); 
    341           } 
     320        toggle_reload_button('show'); 
    342321        }, 
    343322        error: function(data) { 
    …… 
    796775  }); 
    797776  $('#pattern_file').hide(); 
    798   $(".dpt-nodisplay").mouseover(function(){ 
    799     $(this).toggleVal({ 
    800       populateFrom: "title", 
    801       changedClass: "text-normal", 
    802       focusClass: "text-normal" 
    803     }).removeClass('dpt-nodisplay').unbind('mouseover'); 
    804   }); 
    805777});  
    806778 
    …… 
    833805  </tr>\ 
    834806  ').prev(); 
    835  
    836   new_insert.find(".dpt-title").toggleVal({ 
    837     populateFrom: "title", 
    838     changedClass: "text-normal", 
    839     focusClass: "text-normal" 
    840   }); 
    841807 
    842808  return idx; 
    …… 
    936902  } 
    937903  if (culprit != undefined) { 
    938     // now we have to put it back... 
    939     // do I have to turn it off first though? 
    940     $(".dpt-display").each(function() { 
    941       if ($.trim($(this).val()) == '') { 
    942         $(this).toggleVal({ 
    943           populateFrom: "title", 
    944           changedClass: "text-normal", 
    945           focusClass: "text-normal" 
    946         }); 
    947       } 
    948     }); 
    949904    return warnInvalid(culprit, msgInvalidDialPattern); 
    950905  } else {