Changeset 3557

Show
Ignore:
Timestamp:
01/08/07 23:30:03 (6 years ago)
Author:
qldrob
Message:

Right, this should be the last of the patches. Lets see what happens!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • misc/deb/trunk/debian/patches/00list

    r3556 r3557  
    1 # fix various things which freepbx just does wrong 
     1# fix various things to make freepbx more package-friendly. 
    22ast-config-dirs 
    33clean-install-amp 
    …… 
    55fix-retrieve-op-panel-cfg 
    66fix-toplinks 
    7 fix-index-php 
    8 fix-wierd-email 
    9  
    10 # backports from the trunk, nice features, fixes... why not having them as well...? 
    11 check-ast-runnning 
    12 alternative-css 
    13 log-retrieve 

  • misc/deb/trunk/debian/patches/fix-toplinks.dpatch

    r3550 r3557  
    99--- freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/header.php 2006-05-05 20:41:30.000000000 +0300 
    1010+++ /tmp/dpep.QH14HN/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/header.php  2006-11-28 14:52:28.000000000 +0200 
    11 @@ -102,15 +102,15 @@ 
    12   </a> 
    13  <?php } ?> 
     11@@ -135,8 +135,10 @@ 
     12  print_sub_tool( _("Setup")     , "config.php" , $currentFile=='config.php' && isset($_REQUEST['type']) && ($_REQUEST['type']=='setup' || $_REQUEST['type'] == ""), "config.php?type=setup", false ); 
     13  print_sub_tool( _("Tools")     , "config.php" , $currentFile=='config.php' && isset($_REQUEST['type']) && $_REQUEST['type']=='tool' , "config.php?type=tool", false ); 
     14  print_sub_tool( _("Reports")   , "reports.php", $currentFile=='reports.php' ); 
     15- print_sub_tool( _("Panel")     , "panel.php"  , $currentFile=='panel.php' ); 
     16- print_sub_tool( _("Recordings"), "../recordings/index.php"  ,0, NULL, true ); 
     17+ if (is_file("panel/index_amp.php))  
     18+   print_sub_tool( _("Panel")     , "panel.php"  , $currentFile=='panel.php' ); 
     19+ if (is_file("recordings/index.php")) 
     20+   print_sub_tool( _("Recordings"), "../recordings/index.php"  ,0, NULL, true ); 
     21  echo "\t\t</ul>\n"; 
    1422  
    15 -<?php if (is_file("../panel/index_amp.php")){ ?> 
    16 +<?php if (is_file("panel/index_amp.php")){ ?> 
    17   <a id="<?php echo ($currentFile=='panel.php' ? 'current':'') ?>" href="panel.php?"> 
    18     &#8226; 
    19     <li><?php echo _("Panel") ?></li> 
    20   </a> 
    21  <?php } ?> 
    22   
    23 -<?php if (is_file("../recordings/index.php")){ ?> 
    24 - <a href="../recordings/index.php" target="_blank"> 
    25 +<?php if (is_file("recordings/index.php")){ ?> 
    26 + <a href="recordings/index.php" target="_blank"> 
    27     &#8226; 
    28     <li><?php echo _("Recordings") ?></li> 
    29   </a> 
     23  $freepbx_alt = _("freePBX"); 
    3024diff -urNad freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/panel.php /tmp/dpep.QH14HN/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/panel.php 
    3125--- freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/panel.php  2006-04-11 00:06:12.000000000 +0300