Changeset 6373


Ignore:
Timestamp:
05/26/10 15:48:18 (9 years ago)
Author:
patdenice
Message:

Compatible Piwigo 2.1

Location:
extensions/lightbox
Files:
1 added
1 deleted
4 edited
1 copied
2 moved

Legend:

Unmodified
Added
Removed
  • extensions/lightbox/admin/admin.php

    r4621 r6373  
    7171  'DISPLAY_ARROWS'       => $params['display_arrows'], 
    7272  'ALL_CAT'              => $params['all_cat'], 
    73   'themes'               => $themes, 
     73  'colorbox_themes'      => $themes, 
    7474  'SELECTED_THEME'       => $params['theme'], 
    7575  'SELECTED_TRANSITION'  => $params['transition'], 
  • extensions/lightbox/admin/admin.tpl

    r3609 r6373  
    5555    <td align="right">{'lb_theme'|@translate} : &nbsp;&nbsp;</td> 
    5656    <td><select name="theme"> 
    57           {foreach from=$themes item=theme key=i} 
    58           <option label="{$theme|@ucwords}" value="{$theme}" {if $SELECTED_THEME == $theme}selected="selected"{/if}>{$theme|@ucwords}</option> 
     57          {foreach from=$colorbox_themes item=colorbox_theme key=i} 
     58          <option label="{$theme|@ucwords}" value="{$colorbox_theme}" {if $SELECTED_THEME == $colorbox_theme}selected="selected"{/if}>{$colorbox_theme|@ucwords}</option> 
    5959          {/foreach} 
    6060        </select> 
  • extensions/lightbox/lightbox.php

    r5735 r6373  
    77$conf['lightbox_rel'] = isset($conf['lightbox_rel']) ? ++$conf['lightbox_rel'] : 0; 
    88 
    9 switch ($user['template']) 
     9switch ($user['theme']) 
    1010{ 
    1111  case 'simple': 
     
    1818} 
    1919 
    20 $template->func_known_script(array('id'=>'colorbox', 'src'=>get_root_url().'plugins/lightbox/jquery.colorbox.js'), $smarty); 
     20$template->func_known_script(array('id'=>'jquery', 'src'=>get_root_url().'themes/default/js/jquery.packed.js'), $smarty); 
     21$template->func_known_script(array('id'=>'colorbox', 'src'=>get_root_url().'plugins/lightbox/js/jquery.colorbox-min.js'), $smarty); 
    2122$template->block_html_head('', ' 
    2223<link rel="stylesheet" href="'.get_root_url().'plugins/lightbox/theme/'.$params['theme'].'/colorbox.css" type="text/css" media="screen"> 
  • extensions/lightbox/main.inc.php

    r4826 r6373  
    44Version: auto 
    55Description: Display pictures in a lightbox. 
    6 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=280 
     6Plugin URI: http://piwigo.org/ext/extension_view.php?eid=280 
    77Author: P@t 
    88Author URI: http://www.gauchon.com 
     
    1111define('LIGHTBOX_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/'); 
    1212 
    13 add_event_handler('init', 'load_jquery_lightbox_plugin'); 
    1413add_event_handler('loc_end_index_thumbnails', 'lightbox_plugin', 40, 2); 
    15  
    16 function load_jquery_lightbox_plugin() 
    17 { 
    18   global $template; 
    19  
    20   $template->func_known_script(array('id'=>'jquery', 'src'=>get_root_url().'plugins/lightbox/jquery.min.js'), $smarty); 
    21 } 
    2214 
    2315function lightbox_plugin($tpl_thumbnails_var, $pictures) 
Note: See TracChangeset for help on using the changeset viewer.