Changeset 10347 for extensions

Timestamp:

Apr 13, 2011, 9:45:43 AM (14 years ago)

Author:

cljosse

Message:

[extensions] autosize fix bug on path

Location:

extensions/Autosize

Files:

• admin/template/admin.tpl (modified) (2 diffs)
• admin/template/header_2_2.tpl (modified) (1 diff)
• autosize.inc.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• template/header_2_2.tpl (modified) (1 diff)

extensions/Autosize/admin/template/admin.tpl

@@ +1 @@
+{if PHPWG_VERSION < 2.2 } 
+{include file=$AUTOSIZE_PATH_ABS|@cat:'admin/template/header_2_1.tpl'}
+{else} 
+{include file= $AUTOSIZE_PATH_ABS|@cat:'admin/template/header_2_2.tpl'}
+{/if} 
 {html_head} 
  <script type="text/javascript">
@@ -35 +40 @@
  </script>
  
-  {if PHPWG_VERSION < 2.2 } 
-  {include file=$AUTOSIZE_PATH_ABS|@cat:'admin/template/header_2_1.tpl'}
-{else} 
-{include file= $AUTOSIZE_PATH_ABS|@cat:'admin/template/header_2_2.tpl'}
- {/if} 
+
  
    

extensions/Autosize/admin/template/header_2_2.tpl

@@ -1 +1 @@
 {get_combined_scripts load='header'} 
-{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js"}
-{combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" }
+{combine_script id="jquery" load="header" path = "themes/default/js/jquery.min.js"}
+{combine_script id="jquery.cluetip" path = "themes/default/js/plugins/jquery.cluetip.js" require="jquery" }
 {combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"} 
 {combine_script id="dimensions" path = $AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js" require="jquery"} 

extensions/Autosize/autosize.inc.php

@@ -46 +46 @@
     if ('kardon' == $user['theme'] and isset($_GET['slideshow'])) return ;
      
-                $ma_page=isset($page['body_id'])?$page['body_id']:"" ;
-                if ($ma_page=='thePiwiShackControllerPage') return ;
-
-       if (PHPWG_VERSION < 2.2 ) 
-                $file =AUTOSIZE_PATH_ABS.'template/header_2_1.tpl' ;
-        else 
-                $file =AUTOSIZE_PATH_ABS.'template/header_2_2.tpl' ;
-
-        $template->set_filenames(array('autosize_init_header'=> $file ));
-                $template->set_filenames(array('autosize_init'=>AUTOSIZE_PATH_ABS. "template/conflit.tpl" ) );  
-                $DEBUG = isset($conf['cl_debug_conflit']) ? $conf['cl_debug_conflit'] : "false" ; 
-                $autosize_parametres =   cl_autosize_Get_Options() ;                    
-                $theme=$user['theme'];
-                $template->assign(
-                                                array(   
-                                                'autosize_parametres' => $autosize_parametres ,
-                                                'cl_plugins' => $cl_plugin ,
-                                                'cl_version' => $cl_plugin['version'] ,
-                                                'name' => $cl_plugin['name'] ,
+    $ma_page=isset($page['body_id'])?$page['body_id']:"" ;
+    if ($ma_page=='thePiwiShackControllerPage') return ;
+
+
+    if (PHPWG_VERSION < 2.2 ) 
+      $file =AUTOSIZE_PATH_ABS.'template/header_2_1.tpl' ;
+    else 
+      $file =AUTOSIZE_PATH_ABS.'template/header_2_2.tpl' ;
+    $template->set_filenames(array('autosize_init_header'=> $file ));
+    $template->set_filenames(array('autosize_init'=>AUTOSIZE_PATH_ABS. "template/conflit.tpl" ) );      
+
+    $DEBUG = isset($conf['cl_debug_conflit']) ? $conf['cl_debug_conflit'] : "false" ; 
+    $autosize_parametres =       cl_autosize_Get_Options() ;                    
+    $theme=$user['theme'];
+    $template->assign(
+      array(   
+        'autosize_parametres' => $autosize_parametres ,
+        'cl_plugins' => $cl_plugin ,
+        'cl_version' => $cl_plugin['version'] ,
+        'name' => $cl_plugin['name'] ,
                                                                          
-                                                'theme' => $theme  ,
-                                                'DEBUG' => $DEBUG   ,
-                         'AUTOSIZE_PATH' => AUTOSIZE_PATH  ,
-                         'AUTOSIZE_PATH_ABS' => AUTOSIZE_PATH_ABS,
-                                                                )
-                                                 );
+        'theme' => $theme  ,
+        'DEBUG' => $DEBUG   ,
+        'AUTOSIZE_PATH' => str_replace("../","",AUTOSIZE_PATH)  ,
+        'AUTOSIZE_PATH_ABS' => AUTOSIZE_PATH_ABS,
+         )
+    );
                 $template->concat('cl_conflit_init', $template->parse('autosize_init_header', true));
                 return $template->parse( 'autosize_init', false);

extensions/Autosize/main.inc.php

@@ -12 +12 @@
 if (!defined('AUTOSIZE_PATH')) 
 define(  'AUTOSIZE_PATH',   PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/' );
-if (!defined('ROOT_URL')) 
-define(  'ROOT_URL',  get_root_url().'/' );
+
 //==================================================================
         include(AUTOSIZE_PATH."include/constants.php");            
@@ -20 +19 @@
 global $page;
 if (!isset( $page['start'])) {
- 
  $page['start']=0;
  }

extensions/Autosize/template/header_2_2.tpl

@@ -1 @@
-{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js"} 
-{combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" } 
+{combine_script id="jquery" load="header" path = "themes/default/js/jquery.min.js"} 
+{combine_script id="jquery.cluetip" path = "themes/default/js/plugins/jquery.cluetip.js" require="jquery" } 
 {combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"}
 {combine_script id="dimensions" path = $AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js" require="jquery"}