Changeset 10347


Ignore:
Timestamp:
04/13/11 09:45:43 (9 years ago)
Author:
cljosse
Message:

[extensions] autosize fix bug on path

Location:
extensions/Autosize
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • extensions/Autosize/admin/template/admin.tpl

    r10202 r10347  
     1{if PHPWG_VERSION < 2.2 }  
     2{include file=$AUTOSIZE_PATH_ABS|@cat:'admin/template/header_2_1.tpl'} 
     3{else}  
     4{include file= $AUTOSIZE_PATH_ABS|@cat:'admin/template/header_2_2.tpl'} 
     5{/if}  
    16{html_head}  
    27 <script type="text/javascript"> 
     
    3540 </script> 
    3641  
    37   {if PHPWG_VERSION < 2.2 }  
    38   {include file=$AUTOSIZE_PATH_ABS|@cat:'admin/template/header_2_1.tpl'} 
    39 {else}  
    40 {include file= $AUTOSIZE_PATH_ABS|@cat:'admin/template/header_2_2.tpl'} 
    41  {/if}  
     42 
    4243  
    4344    
  • extensions/Autosize/admin/template/header_2_2.tpl

    r9948 r10347  
    11{get_combined_scripts load='header'}  
    2 {combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js"} 
    3 {combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" } 
     2{combine_script id="jquery" load="header" path = "themes/default/js/jquery.min.js"} 
     3{combine_script id="jquery.cluetip" path = "themes/default/js/plugins/jquery.cluetip.js" require="jquery" } 
    44{combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"}  
    55{combine_script id="dimensions" path = $AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js" require="jquery"}  
  • extensions/Autosize/autosize.inc.php

    r10308 r10347  
    4646    if ('kardon' == $user['theme'] and isset($_GET['slideshow'])) return ; 
    4747      
    48                 $ma_page=isset($page['body_id'])?$page['body_id']:"" ; 
    49                 if ($ma_page=='thePiwiShackControllerPage') return ; 
    50  
    51        if (PHPWG_VERSION < 2.2 )  
    52                 $file =AUTOSIZE_PATH_ABS.'template/header_2_1.tpl' ; 
    53         else  
    54                 $file =AUTOSIZE_PATH_ABS.'template/header_2_2.tpl' ; 
    55  
    56         $template->set_filenames(array('autosize_init_header'=> $file )); 
    57                 $template->set_filenames(array('autosize_init'=>AUTOSIZE_PATH_ABS. "template/conflit.tpl" ) );   
    58                 $DEBUG = isset($conf['cl_debug_conflit']) ? $conf['cl_debug_conflit'] : "false" ;  
    59                 $autosize_parametres =   cl_autosize_Get_Options() ;                     
    60                 $theme=$user['theme']; 
    61                 $template->assign( 
    62                                                 array(    
    63                                                 'autosize_parametres' => $autosize_parametres , 
    64                                                 'cl_plugins' => $cl_plugin , 
    65                                                 'cl_version' => $cl_plugin['version'] , 
    66                                                 'name' => $cl_plugin['name'] , 
     48    $ma_page=isset($page['body_id'])?$page['body_id']:"" ; 
     49    if ($ma_page=='thePiwiShackControllerPage') return ; 
     50 
     51 
     52    if (PHPWG_VERSION < 2.2 )  
     53      $file =AUTOSIZE_PATH_ABS.'template/header_2_1.tpl' ; 
     54    else  
     55      $file =AUTOSIZE_PATH_ABS.'template/header_2_2.tpl' ; 
     56    $template->set_filenames(array('autosize_init_header'=> $file )); 
     57    $template->set_filenames(array('autosize_init'=>AUTOSIZE_PATH_ABS. "template/conflit.tpl" ) );       
     58 
     59    $DEBUG = isset($conf['cl_debug_conflit']) ? $conf['cl_debug_conflit'] : "false" ;  
     60    $autosize_parametres =       cl_autosize_Get_Options() ;                     
     61    $theme=$user['theme']; 
     62    $template->assign( 
     63      array(    
     64        'autosize_parametres' => $autosize_parametres , 
     65        'cl_plugins' => $cl_plugin , 
     66        'cl_version' => $cl_plugin['version'] , 
     67        'name' => $cl_plugin['name'] , 
    6768                                                                          
    68                                                 'theme' => $theme  , 
    69                                                 'DEBUG' => $DEBUG   , 
    70                          'AUTOSIZE_PATH' => AUTOSIZE_PATH  , 
    71                          'AUTOSIZE_PATH_ABS' => AUTOSIZE_PATH_ABS, 
    72                                                                 ) 
    73                                                 ); 
     69        'theme' => $theme  , 
     70        'DEBUG' => $DEBUG   , 
     71        'AUTOSIZE_PATH' => str_replace("../","",AUTOSIZE_PATH)  , 
     72        'AUTOSIZE_PATH_ABS' => AUTOSIZE_PATH_ABS, 
     73         ) 
     74    ); 
    7475                $template->concat('cl_conflit_init', $template->parse('autosize_init_header', true)); 
    7576                return $template->parse( 'autosize_init', false); 
  • extensions/Autosize/main.inc.php

    r10308 r10347  
    1212if (!defined('AUTOSIZE_PATH'))  
    1313define(  'AUTOSIZE_PATH',   PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/' ); 
    14 if (!defined('ROOT_URL'))  
    15 define(  'ROOT_URL',  get_root_url().'/' ); 
     14 
    1615//================================================================== 
    1716        include(AUTOSIZE_PATH."include/constants.php");             
     
    2019global $page; 
    2120if (!isset( $page['start'])) { 
    22   
    2321 $page['start']=0; 
    2422 } 
  • extensions/Autosize/template/header_2_2.tpl

    r9990 r10347  
    1 {combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js"}  
    2 {combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" }  
     1{combine_script id="jquery" load="header" path = "themes/default/js/jquery.min.js"}  
     2{combine_script id="jquery.cluetip" path = "themes/default/js/plugins/jquery.cluetip.js" require="jquery" }  
    33{combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"} 
    44{combine_script id="dimensions" path = $AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js" require="jquery"}  
Note: See TracChangeset for help on using the changeset viewer.