Changeset 8942


Ignore:
Timestamp:
Jan 27, 2011, 2:31:54 PM (9 years ago)
Author:
cljosse
Message:

[cl_conflit] template compatibility with piwigo 2.2

Location:
extensions/cl_conflit
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • extensions/cl_conflit/admin/cl_conflit_admin.php

    r8925 r8942  
    2929   PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/'
    3030);
     31  $CONFLIT_PATH_ABS=str_replace('\\','/',dirname(__FILE__) );
    3132if (!defined('CONFLIT_PATH_ABS'))
    32 define('CONFLIT_PATH_ABS',dirname(__FILE__).'/');
     33define(
     34  'CONFLIT_PATH_ABS',   $CONFLIT_PATH_ABS."/"
     35);
     36
    3337// +-----------------------------------------------------------------------+
    3438// | Check Access and exit when user status is not ok                      |
     
    111115                                                array(
    112116                        'CONFLIT_PATH' => CONFLIT_PATH,
    113                                                 'CONFLIT_PATH_ABS' => CONFLIT_PATH_ABS 
     117                                                'CONFLIT_PATH_ABS' => CONFLIT_PATH_ABS  ,
     118                         'Infos' =>  conflit_memo_var($cl_plugin ) ,
     119                         'cl_version' =>$cl_plugin['version']
    114120                        ) );
    115121
     
    118124 {
    119125  case 'cl_conflit_admin':
    120 
     126 
    121127    $template->set_filenames(array('plugin_admin_content' => realpath(CONFLIT_PATH . 'admin/template/admin.tpl')));
    122128   
  • extensions/cl_conflit/admin/template/admin.tpl

    r8924 r8942  
    1 {html_head}
     1{* $Id: conflit admin.tpl  *}{html_head}
    22 <script type="text/javascript">
    33     var DEBUG = '{$DEBUG}';
     
    1111     var cl_type = '{$cl_type}';
    1212
    13      </script>
     13     </script> {/html_head}
    1414{if PHPWG_VERSION < 2.2 } {include file=$CONFLIT_PATH_ABS|@cat:'template/header_2_1.tpl'}
    15 {else} {include file= $CONFLIT_PATH_ABS|@cat:'template/header_2_2.tpl'} {/if} {/html_head}
    16 
    17 {* $Id: conflit admin.tpl  *}
     15{else} {include file= $CONFLIT_PATH_ABS|@cat:'template/header_2_2.tpl'} {/if}
    1816 <!--- HEAD conflit TPL --->
    1917
     
    3432                <h2>{'cl_conflit'} {'version'|translate}{$cl_version}</h2>
    3533</div>
    36  
    37 
    38 
     34<fieldset  ><legende >INFOS</legende>
     35 {$Infos}
     36 </fieldset>
    3937   
    4038<table >
     
    4240 
    4341    <table>
    44        <td><input name="submit" type="submit" value="{'cl_conflit_save'|@translate}" /></td>
     42       <td><input name="submit" type="hidden" value="{'save'|@translate}" /></td>
    4543    </table>
    4644</form>
  • extensions/cl_conflit/admin/template/header_2_1.tpl

    r8924 r8942  
    1 
    2 {known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=1}
     1{html_head}
     2{known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js"  }
    33{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    44{known_script id="conflit_script" src = $CONFLIT_PATH|@cat:"js/conflit.js"  }
    55{known_script id="dimensions" src = $CONFLIT_PATH|@cat:"js/jquery.dimensions.js"  }
     6{/html_head}
    67
    78
  • extensions/cl_conflit/conflit.inc.php

    r8941 r8942  
    160160         
    161161 }
     162
     163  function conflit_memo_var($variables)
     164{
     165  ob_start();
     166  echo '<pre>';
     167  print_r($variables);
     168  echo '</pre>';
     169  $m= ob_get_contents();
     170  ob_end_clean();
     171  return $m;           
     172}
     173   
    162174?>
  • extensions/cl_conflit/include/affiche.php

    r7944 r8942  
    11<?php 
    2 
    3        
    42
    53$visible=(isset($visible))?$visible:false;
    64$theme=$user['theme'];
    7  
    8 
    95        $template->assign(
    106                                        array(
    117                    'CONFLIT_PATH' => CONFLIT_PATH,
    12                     'theme' => $theme,
    13 
    14                                        
     8                    'theme' => $theme,                                 
    159                                 )
    16                                 );     
    17 
    18                            
     10                                );                                 
    1911 //unset($_POST);
    2012?>
  • extensions/cl_conflit/template/conflit.tpl

    r8941 r8942  
    11{if PHPWG_VERSION < 2.2 } 
    2   {assign var= file value=$AUTOSIZE_PATH_ABS|@cat:'template/header_2_1.tpl' }
     2  {assign var= file value=$CONFLIT_PATH_ABS|@cat:'template/header_2_1.tpl' }
    33 {else}
    4   {assign var= file value=$AUTOSIZE_PATH_ABS|@cat:'template/header_2_2.tpl'
     4  {assign var= file value=$CONFLIT_PATH_ABS|@cat:'template/header_2_2.tpl'
    55}
    66 {/if}  { include file= $file   }
Note: See TracChangeset for help on using the changeset viewer.