Changeset 8958


Ignore:
Timestamp:
Jan 28, 2011, 9:04:27 AM (9 years ago)
Author:
cljosse
Message:

[cl_conflit] bug on compatibility with piwigo 2.2

Location:
extensions/cl_conflit
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • extensions/cl_conflit/admin/template/header_2_1.tpl

    r8942 r8958  
    1 {html_head}
    2 {known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js"  }
     1{known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js"  }
    32{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    43{known_script id="conflit_script" src = $CONFLIT_PATH|@cat:"js/conflit.js"  }
    54{known_script id="dimensions" src = $CONFLIT_PATH|@cat:"js/jquery.dimensions.js"  }
    6 {/html_head}
    7 
    8 
  • extensions/cl_conflit/conflit.inc.php

    r8942 r8958  
    4444                $ma_page=isset($page['body_id'])?$page['body_id']:"" ;
    4545                if ($ma_page=='thePiwiShackControllerPage') return ;
    46                 $my_path =  basename(dirname(__FILE__)).'/' ;
    47             $my_path = dirname(__FILE__).'/';
    48                 $template->set_filenames(array('cl_conflit_init'=>$my_path. "template/conflit.tpl" ) );
     46
     47         if (PHPWG_VERSION < 2.2 )
     48                $file =CONFLIT_PATH_ABS.'template/header_2_1.tpl' ;
     49        else
     50                $file =CONFLIT_PATH_ABS.'template/header_2_2.tpl' ;
     51 
     52        $template->set_filenames(array('cl_conflit_init_header'=> $file ));
     53                $template->set_filenames(array('cl_conflit_init'=>CONFLIT_PATH_ABS. "template/conflit.tpl" ) );
    4954                $DEBUG =  isset($conf['cl_debug']) ? $conf['cl_debug'] : "false"  ;
    5055                $cl_conflit_parametres =         cl_conflit_Get_Options() ;
    5156                $theme=$user['theme'];
    52                 $url = get_root_url(); 
    53    
    5457                $template->assign(
    5558                                                array(
     
    5861                                                'cl_version' => $cl_plugin['version'] ,
    5962                                                'name' => $cl_plugin['name'] ,
    60                                                 'MY_ROOT' => $url,                                               
     63                                                                         
    6164                                                'theme' => $theme  ,
    6265                                                'DEBUG' => $DEBUG   ,
     
    6467                                                'CONFLIT_PATH_ABS' => CONFLIT_PATH_ABS 
    6568                        ) );
    66        
     69                               
     70                $template->concat('cl_conflit_init', $template->parse('cl_conflit_init_header', true));
    6771                return $template->parse( 'cl_conflit_init', false);
    6872        }// function cl_conflit_script_1
  • extensions/cl_conflit/main.inc.php

    r8941 r8958  
    22/*
    33Plugin Name: cl_conflit
    4 Version: 1.1.0
     4Version: 1.1.1
    55Description: gestion des conflits entre jQuery et les autres librairies
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=474
  • extensions/cl_conflit/template/conflit.tpl

    r8942 r8958  
    1 {if PHPWG_VERSION < 2.2 } 
    2   {assign var= file value=$CONFLIT_PATH_ABS|@cat:'template/header_2_1.tpl' }
    3  {else}
    4   {assign var= file value=$CONFLIT_PATH_ABS|@cat:'template/header_2_2.tpl'
    5 }
    6  {/if}  { include file= $file   }
    7 <script type="text/javascript">
    8  
     1{html_head}
     2  <script type="text/javascript">
    93 var DEBUG = '{$DEBUG}';
    104    var theme = '{$theme}';
     
    2115 {/if}
    2216{/if}
    23 </script>
     17</script>{/html_head} 
  • extensions/cl_conflit/template/header_2_1.tpl

    r8941 r8958  
    1 {known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js" }
     1{html_head}
     2{known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=0}
    23{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    34{known_script id="conflit_script" src = $CONFLIT_PATH|@cat:"js/conflit.js"  }
    45{known_script id="dimensions" src = $CONFLIT_PATH|@cat:"js/jquery.dimensions.js"  }
     6{/html_head}
Note: See TracChangeset for help on using the changeset viewer.