Changeset 8941


Ignore:
Timestamp:
01/27/11 14:10:00 (9 years ago)
Author:
cljosse
Message:
 
Location:
extensions/cl_conflit
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/cl_conflit/conflit.inc.php

    r8929 r8941  
    2525   PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/' 
    2626); 
     27 
     28  $CONFLIT_PATH_ABS=str_replace('\\','/',dirname(__FILE__) ); 
    2729if (!defined('CONFLIT_PATH_ABS'))  
    2830define( 
    29   'CONFLIT_PATH_ABS',dirname(__FILE__).'/'); 
     31  'CONFLIT_PATH_ABS',   $CONFLIT_PATH_ABS."/" 
     32); 
     33 
     34 
    3035class conflit_controler { 
    3136//============================================================ 
  • extensions/cl_conflit/main.inc.php

    r8929 r8941  
    22/* 
    33Plugin Name: cl_conflit 
    4 Version: 1.0.9 
     4Version: 1.1.0 
    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

    r8928 r8941  
    1 {html_head}  
    2 <!--- cl_conflit/template/confilt.tpl --->  
     1{if PHPWG_VERSION < 2.2 }   
     2  {assign var= file value=$AUTOSIZE_PATH_ABS|@cat:'template/header_2_1.tpl' } 
     3 {else} 
     4  {assign var= file value=$AUTOSIZE_PATH_ABS|@cat:'template/header_2_2.tpl' 
     5} 
     6 {/if}  { include file= $file   }  
     7<script type="text/javascript"> 
    38  
    4 {if PHPWG_VERSION < 2.2 }  
    5 {include file=$CONFLIT_PATH_ABS|@cat:'template/header_2_1.tpl'} 
    6 {else}  
    7 {include file= $CONFLIT_PATH_ABS|@cat:'template/header_2_2.tpl'}  
    8 {/if}  
    9   
    10 {/html_head}    
    11 <script type="text/javascript"> 
    12     var DEBUG = '{$DEBUG}'; 
     9 var DEBUG = '{$DEBUG}'; 
    1310    var theme = '{$theme}'; 
    1411    var cl_version = '{$cl_version}'; 
  • extensions/cl_conflit/template/header_2_1.tpl

    r8928 r8941  
    1  
    2 {known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=1} 
     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  
    7  
Note: See TracChangeset for help on using the changeset viewer.