Changeset 2218


Ignore:
Timestamp:
Feb 27, 2008, 9:25:18 PM (16 years ago)
Author:
rub
Message:

Resolved issue 0000807: New slideshow features

Location:
trunk
Files:
11 added
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/category_default.inc.php

    r2123 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    6767  // current row displayed
    6868  $row_number = 0;
     69
     70  // define category slideshow url
     71  $row = reset($pictures);
     72  $page['cat_slideshow_url'] =
     73    add_url_params(
     74      duplicate_picture_url(
     75        array(
     76          'image_id' => $row['id'],
     77          'image_file' => $row['file']
     78        ),
     79        array('start')
     80      ),
     81      array('slideshow' =>
     82        (isset($_GET['slideshow']) ? $_GET['slideshow']
     83                                   : '' ))
     84    );
    6985}
    7086

  • trunk/include/config_default.inc.php

    r2216 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    6666//    the date_available
    6767$conf['order_by'] = ' ORDER BY date_available DESC, file ASC, id ASC';
    68 
    69 // slideshow_period : waiting time in seconds before loading a new page
    70 // during automated slideshow
    71 $conf['slideshow_period'] = 4;
    7268
    7369// file_ext : file extensions (case sensitive) authorized
    … …  
    693689
    694690// +-----------------------------------------------------------------------+
    695 // | Light slideshow                                                       |
    696 // +-----------------------------------------------------------------------+
     691// | Slideshow                                                             |
     692// +-----------------------------------------------------------------------+
     693// slideshow_period : waiting time in seconds before loading a new page
     694// during automated slideshow
     695// slideshow_period_min, slideshow_period_max are bounds of slideshow_period
     696// slideshow_period_step is the step of navigation between min and max
     697$conf['slideshow_period_min'] = 1;
     698$conf['slideshow_period_max'] = 10;
     699$conf['slideshow_period_step'] = 1;
     700$conf['slideshow_period'] = 4;
     701
     702// slideshow_repeat : slideshow loops on pictures
     703$conf['slideshow_repeat'] = true;
     704
    697705// $conf['light_slideshow'] indicates to use slideshow.tpl in state of
    698706// picture.tpl for slideshow

  • trunk/include/functions.inc.php

    r2134 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    750750    ob_clean();
    751751  }
     752  // default url is on html format
     753  $url = html_entity_decode($url);
    752754  header('Request-URI: '.$url);
    753755  header('Content-Location: '.$url);

  • trunk/include/functions_picture.inc.php

    r2206 r2218  
    22// +-----------------------------------------------------------------------+
    33// | PhpWebGallery - a PHP based picture gallery                           |
    4 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     4// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    55// +-----------------------------------------------------------------------+
    66// | file          : $Id$
    … …  
    224224}
    225225
     226/*
     227 * get slideshow default params into array
     228 *
     229 * @param void
     230 *
     231 * @return slideshow default values into array
     232 */
     233function get_default_slideshow_params()
     234{
     235  global $conf;
     236
     237  return array(
     238    'period' => $conf['slideshow_period'],
     239    'repeat' => $conf['slideshow_repeat'],
     240    'play' => true,
     241    );
     242}
     243
     244/*
     245 * check and correct slideshow params from array
     246 *
     247 * @param array of params
     248 *
     249 * @return slideshow corrected values into array
     250 */
     251function correct_slideshow_params($params = array())
     252{
     253  global $conf;
     254
     255  if ($params['period'] < $conf['slideshow_period_min'])
     256  {
     257    $params['period'] = $conf['slideshow_period_min'];
     258  }
     259  else if ($params['period'] > $conf['slideshow_period_max'])
     260  {
     261    $params['period'] = $conf['slideshow_period_max'];
     262  }
     263
     264  return $params;
     265}
     266
     267/*
     268 * Decode slideshow string params into array
     269 *
     270 * @param string params like ""
     271 *
     272 * @return slideshow values into array
     273 */
     274function decode_slideshow_params($encode_params = null)
     275{
     276  global $conf;
     277
     278  $result = get_default_slideshow_params();
     279
     280  if (is_numeric($encode_params))
     281  {
     282    $result['period'] = $encode_params;
     283  }
     284  else
     285  {
     286    $matches = array();
     287    if (preg_match_all('/([a-z]+)-(\d+)/', $encode_params, $matches))
     288    {
     289      $matchcount = count($matches[1]);
     290      for ($i = 0; $i < $matchcount; $i++)
     291      {
     292        $result[$matches[1][$i]] = $matches[2][$i];
     293      }
     294    }
     295
     296    if (preg_match_all('/([a-z]+)-(true|false)/', $encode_params, $matches))
     297    {
     298      $matchcount = count($matches[1]);
     299      for ($i = 0; $i < $matchcount; $i++)
     300      {
     301        $result[$matches[1][$i]] = get_boolean($matches[2][$i]);
     302      }
     303    }
     304  }
     305
     306  return correct_slideshow_params($result);
     307}
     308
     309/*
     310 * Encode slideshow array params into array
     311 *
     312 * @param array params
     313 *
     314 * @return slideshow values into string
     315 */
     316function encode_slideshow_params($decode_params = array())
     317{
     318  global $conf;
     319
     320  $params = array_diff_assoc(correct_slideshow_params($decode_params), get_default_slideshow_params());
     321  $result = '';
     322
     323  foreach ($params as $name => $value)
     324  {
     325    // boolean_to_string return $value, if it's not a bool
     326    $result .= '+'.$name.'-'.boolean_to_string($value);
     327  }
     328
     329  return $result;
     330}
     331
    226332?>

  • trunk/index.php

    r2138 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    6868}
    6969
    70 if ( count($page['items']) > $user['nb_image_page'])
     70if (count($page['items']) > $user['nb_image_page'])
    7171{
    7272  $page['navigation_bar'] = create_navigation_bar(
    … …  
    100100//-------------------------------------------------------------- category title
    101101$template_title = $page['title'];
    102 if ( count($page['items']) > 0)
     102if (count($page['items']) > 0)
    103103{
    104104  $template_title.= ' ['.count($page['items']).']';
    … …  
    193193}
    194194
    195 if (is_admin() and !empty($page['items']) )
     195if (is_admin() and !empty($page['items']))
    196196{
    197197  $template->assign_block_vars(
    … …  
    263263//------------------------------------------------------- category informations
    264264
     265// slideshow
     266// execute after init thumbs in order to have all picture informations
     267if (!empty($page['cat_slideshow_url']))
     268{
     269  if (isset($_GET['slideshow']))
     270  {
     271    redirect($page['cat_slideshow_url']);
     272  }
     273  else
     274  {
     275    $template->assign_block_vars(
     276      'slideshow', array('URL' => $page['cat_slideshow_url']));
     277  }
     278}
     279
    265280// navigation bar
    266281if ($page['navigation_bar'] != '')

  • trunk/language/en_UK/common.lang.php

    r2142 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    383383$lang['Tag results for'] = 'Tag results for';
    384384$lang['from %s to %s'] = 'from %s to %s';
     385$lang['start_play'] = 'Play of slideshow';
     386$lang['stop_play'] = 'Pause of slideshow';
     387$lang['start_repeat'] = 'Repeat the slideshow';
     388$lang['stop_repeat'] = 'Not repeat the slideshow';
     389$lang['inc_period'] = 'Increase waiting between pictures';
     390$lang['dec_period'] = 'Decrease waiting between pictures';
    385391
    386392?>

  • trunk/language/es_ES/common.lang.php

    r2170 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $ $
    … …  
    382382$lang['Tag results for'] = 'Los resultados de los tags para';
    383383$lang['from %s to %s'] = 'de %s a %s';
     384/* TODO */ $lang['start_play'] = 'Play of slideshow';
     385/* TODO */ $lang['stop_play'] = 'Pause of slideshow';
     386/* TODO */ $lang['start_repeat'] = 'Repeat the slideshow';
     387/* TODO */ $lang['stop_repeat'] = 'Not repeat the slideshow';
     388/* TODO */ $lang['inc_period'] = 'Increase waiting between pictures';
     389/* TODO */ $lang['dec_period'] = 'Decrease waiting between pictures';
     390
    384391?>

  • trunk/language/fr_FR/common.lang.php

    r2142 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    382382$lang['Tag results for'] = 'Résultats des tags pour';
    383383$lang['from %s to %s'] = 'de %s à %s';
     384$lang['start_play'] = 'Lecture du diaporama';
     385$lang['stop_play'] = 'Pause du diaporama';
     386$lang['start_repeat'] = 'Répeter le diaporama';
     387$lang['stop_repeat'] = 'Ne pas répeter le diaporama';
     388$lang['inc_period'] = 'Augmenter l\'attente entre les images';
     389$lang['dec_period'] = 'Diminuer l\'attente entre les images';
    384390
    385391?>

  • trunk/language/nl_NL/common.lang.php

    r2171 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    383383$lang['Tag results for'] = 'Tag resultaten voor';
    384384$lang['from %s to %s'] = 'van %s tot %s';
     385/* TODO */ $lang['start_play'] = 'Play of slideshow';
     386/* TODO */ $lang['stop_play'] = 'Pause of slideshow';
     387/* TODO */ $lang['start_repeat'] = 'Repeat the slideshow';
     388/* TODO */ $lang['stop_repeat'] = 'Not repeat the slideshow';
     389/* TODO */ $lang['inc_period'] = 'Increase waiting between pictures';
     390/* TODO */ $lang['dec_period'] = 'Decrease waiting between pictures';
     391
    385392?>

  • trunk/picture.php

    r2204 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    7979    );
    8080
    81   if ( !isset($page['slideshow']) and isset($element_info['high_url']) )
     81  if ( !$page['slideshow'] and isset($element_info['high_url']) )
    8282  {
    8383    $uuid = uniqid(rand());
    … …  
    425425;
    426426
    427 $url_slide = add_url_params(
    428   $picture['current']['url'],
    429   array( 'slideshow'=>$conf['slideshow_period'] )
    430   );
    431 
    432 
    433 $template->set_filename('picture', 'picture.tpl');
    434 if ( isset( $_GET['slideshow'] ) )
    435 {
    436   $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
     427$slideshow_params = array();
     428$slideshow_url_params = array();
     429
     430if (isset($_GET['slideshow']))
     431{
    437432  $page['slideshow'] = true;
    438   if ( $conf['light_slideshow'] )
    439   { // Change template file
    440     // Add local-slideshow.css file if exists
    441     $template->set_filename('picture', 'slideshow.tpl');
    442     $css = get_root_url() . get_themeconf('template_dir') . '/theme/'
    443          . get_themeconf('theme') . '/local-slideshow.css';
    444     if (file_exists($css))
    445     {
    446       $template->assign_block_vars('slideshow', array());
    447     }
    448   }
    449   if ( isset($page['next_item']) )
    450   {
    451     // $redirect_msg, $refresh, $url_link and $title are required for creating
    452     // an automated refresh page in header.tpl
    453     $refresh= $_GET['slideshow'];
    454     $url_link = add_url_params(
    455         $picture['next']['url'],
    456         array('slideshow'=>$refresh)
    457       );
    458     $redirect_msg = nl2br(l10n('redirect_msg'));
     433  $page['meta_robots'] = array('noindex'=>1, 'nofollow'=>1);
     434
     435  $slideshow_params = decode_slideshow_params($_GET['slideshow']);
     436  $slideshow_url_params['slideshow'] = encode_slideshow_params($slideshow_params);
     437
     438  if ($slideshow_params['play'])
     439  {
     440    $id_pict_redirect = '';
     441    if (isset($page['next_item']))
     442    {
     443      $id_pict_redirect = 'next';
     444    }
     445    else
     446    {
     447      if ($slideshow_params['repeat'] and isset($page['first_item']))
     448      {
     449        $id_pict_redirect = 'first';
     450      }
     451    }
     452
     453    if (!empty($id_pict_redirect))
     454    {
     455      // $redirect_msg, $refresh, $url_link and $title are required for creating
     456      // an automated refresh page in header.tpl
     457      $refresh = $slideshow_params['period'];
     458      $url_link = add_url_params(
     459          $picture[$id_pict_redirect]['url'],
     460          $slideshow_url_params
     461        );
     462      $redirect_msg = nl2br(l10n('redirect_msg'));
     463    }
     464  }
     465}
     466else
     467{
     468  $page['slideshow'] = false;
     469}
     470
     471$template->set_filenames(
     472  array(
     473    'picture' =>
     474      (($page['slideshow'] and $conf['light_slideshow']) ? 'slideshow.tpl' : 'picture.tpl'),
     475    'nav_buttons' => 'picture_nav_buttons.tpl'));
     476
     477if ($page['slideshow'])
     478{
     479  // Add local-slideshow.css file if exists
     480  // Not only for ligth
     481  $css = get_root_url() . get_themeconf('template_dir') . '/theme/'
     482       . get_themeconf('theme') . '/local-slideshow.css';
     483  if (file_exists($css))
     484  {
     485    $template->assign_block_vars('slideshow', array());
    459486  }
    460487}
    … …  
    515542        'TITLE_IMG' => $picture[$which_image]['name'],
    516543        'IMG' => $picture[$which_image]['thumbnail'],
    517         'U_IMG' => $picture[$which_image]['url'],
     544        // Params slideshow was transmit to navigation buttons
     545        'U_IMG' =>
     546          add_url_params(
     547            $picture[$which_image]['url'], $slideshow_url_params)
    518548        )
    519549      );
    … …  
    526556      );
    527557  }
     558}
     559
     560
     561if ($page['slideshow'])
     562{
     563  //slideshow end
     564  $template->assign_block_vars(
     565    'stop_slideshow',
     566    array(
     567      'U_SLIDESHOW' => $picture['current']['url'],
     568      )
     569    );
     570
     571  foreach (array('repeat', 'play') as $p)
     572  {
     573    $template->assign_block_vars(
     574      ($slideshow_params[$p] ? 'stop' : 'start').'_'.$p,
     575      array(
     576        // Params slideshow was transmit to navigation buttons
     577        'U_IMG' =>
     578          add_url_params(
     579            $picture['current']['url'],
     580            array('slideshow' =>
     581              encode_slideshow_params(
     582                array_merge($slideshow_params,
     583                  array($p => ! $slideshow_params[$p]))
     584                  )
     585                )
     586              )
     587          )
     588      );
     589  }
     590
     591  foreach (array('dec', 'inc') as $op)
     592  {
     593    $new_period = $slideshow_params['period'] + ((($op == 'dec') ? -1 : 1) * $conf['slideshow_period_step']);
     594    $new_slideshow_params =
     595      correct_slideshow_params(
     596        array_merge($slideshow_params,
     597                  array('period' => $new_period)));
     598    $block_period = $op.'_period';
     599
     600    if ($new_slideshow_params['period'] === $new_period)
     601    {
     602      $template->assign_block_vars(
     603        $block_period,
     604        array(
     605          // Params slideshow was transmit to navigation buttons
     606          'U_IMG' =>
     607            add_url_params(
     608              $picture['current']['url'],
     609              array('slideshow' => encode_slideshow_params($new_slideshow_params)
     610                  )
     611                )
     612              )
     613          );
     614    }
     615    else
     616    {
     617      $template->assign_block_vars(
     618        $block_period.'_unactive',
     619        array()
     620        );
     621    }
     622  }
     623}
     624else
     625{
     626  $template->assign_block_vars(
     627    'start_slideshow',
     628    array(
     629      'U_SLIDESHOW' =>
     630        add_url_params(
     631          $picture['current']['url'],
     632          array( 'slideshow'=>''))
     633      )
     634    );
     635  $template->assign_block_vars(
     636    'thumbnails',array('U_UP' => $url_up));
    528637}
    529638
    … …  
    538647
    539648    'U_HOME' => make_index_url(),
    540     'U_UP' => $url_up,
    541649    'U_METADATA' => $url_metadata,
    542650    'U_ADMIN' => $url_admin,
    543     'U_SLIDESHOW'=> $url_slide,
    544651    'U_ADD_COMMENT' => $url_self,
    545652    )
    … …  
    643750
    644751//--------------------------------------------------------- picture information
    645 $header_infos = array();        //for html header use
     752$header_infos = array(); //for html header use
    646753// legend
    647754if (isset($picture['current']['comment'])
    … …  
    790897}
    791898
    792 //slideshow end
    793 if (isset($_GET['slideshow']))
    794 {
    795   if (!is_numeric($_GET['slideshow']))
    796   {
    797     $_GET['slideshow'] = $conf['slideshow_period'];
    798   }
    799 
    800   $template->assign_block_vars(
    801     'stop_slideshow',
    802     array(
    803       'U_SLIDESHOW' => $picture['current']['url'],
    804       )
    805     );
    806 }
     899// assign tpl picture_nav_buttons
     900$template->assign_var_from_handle('NAV_BUTTONS', 'nav_buttons');
    807901
    808902// maybe someone wants a special display (call it before page_header so that

  • trunk/plugins/c13y_upgrade/initialize.inc.php

    r2208 r2218  
    4242  /* Check user with same e-mail */
    4343  $query = '
    44 select count(*)
    45 from '.USERS_TABLE.'
    46 where '.$conf['user_fields']['email'].' is not null
    47 group by upper('.$conf['user_fields']['email'].')
     44select
     45  count(*)
     46from
     47  '.USERS_TABLE.'
     48where
     49  '.$conf['user_fields']['email'].' is not null
     50group by
     51  upper('.$conf['user_fields']['email'].')
    4852having count(*) > 1
    4953limit 0,1
    … …  
    5458    $can_be_deactivate = false;
    5559    add_c13y(
    56       l10n('c13y_exif_dbl_email_user'),
     60      l10n('c13y_dbl_email_user'),
    5761      null,
    5862      null,
    59       l10n('c13y_exif_correction_dbl_email_user'));
     63      l10n('c13y_correction_dbl_email_user'));
    6064  }
    6165
     66  /* Check plugin included in Piwigo sources */
     67  $included_plugins = array('dew');
     68  $query = '
     69select
     70  id
     71from
     72  '.PLUGINS_TABLE.'
     73where
     74  id in ('.
     75    implode(
     76      ',',
     77      array_map(
     78        create_function('$s', 'return "\'".$s."\'";'),
     79        $included_plugins
     80        )
     81      )
     82      .')
     83;';
     84
     85  $result = pwg_query($query);
     86  while ($row = mysql_fetch_assoc($result))
     87  {
     88    $can_be_deactivate = false;
     89
     90    $uninstall_msg_link =
     91      '<a href="'.
     92      PHPWG_ROOT_PATH.
     93      'admin.php?page=plugins&amp;plugin='.$row['id'].'&amp;action=uninstall'.
     94      '" onclick="window.open(this.href, \'\'); return false;">'.
     95      sprintf(l10n('c13y_correction_obsolete_plugin'), $row['id']).'</a>';
     96
     97    add_c13y(
     98      l10n('c13y_obsolete_plugin'),
     99      null,
     100      null,
     101      $uninstall_msg_link);
     102  }
    62103
    63104  /* Check if this plugin must deactivate */

  • trunk/plugins/c13y_upgrade/language/en_UK/plugin.lang.php

    r2115 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    2828$lang['c13y_upgrade_no_anomaly'] = 'No anomaly detected after application upgrade';
    2929$lang['c13y_upgrade_deactivate'] = 'You can deactivate "Check upgrades" plugin';
    30 $lang['c13y_exif_dbl_email_user'] = 'Users with same email address';
    31 $lang['c13y_exif_correction_dbl_email_user'] = 'Delete duplicate users';
     30$lang['c13y_dbl_email_user'] = 'Users with same email address';
     31$lang['c13y_correction_dbl_email_user'] = 'Delete duplicate users';
     32$lang['c13y_obsolete_plugin'] = 'Obsolete plugin';
     33$lang['c13y_correction_obsolete_plugin'] = '"%s" plugin has been included in this application version and you must uninstall it.';
     34
    3235?>

  • trunk/plugins/c13y_upgrade/language/es_ES/plugin.lang.php

    r2149 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    2828$lang['c13y_upgrade_no_anomaly'] = 'Ninguna anomalía detectada después de la puesta al día de la aplicación';
    2929$lang['c13y_upgrade_deactivate'] = 'Usted puede desactivar el plugin Check upgrades';
    30 $lang['c13y_exif_dbl_email_user'] = 'Utilizadores con la misma dirección e-mail';
    31 $lang['c13y_exif_correction_dbl_email_user'] = 'Suprima a los utilizadores en duplicado';
     30$lang['c13y_dbl_email_user'] = 'Utilizadores con la misma dirección e-mail';
     31$lang['c13y_correction_dbl_email_user'] = 'Suprima a los utilizadores en duplicado';
     32/* TODO */ $lang['c13y_obsolete_plugin'] = 'Obsolete plugin';
     33/* TODO */ $lang['c13y_correction_obsolete_plugin'] = '"%s" plugin has been included in this application version and you must uninstall it.';
    3234
    3335?>

  • trunk/plugins/c13y_upgrade/language/fr_FR/plugin.lang.php

    r2131 r2218  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    2828$lang['c13y_upgrade_no_anomaly'] = 'Pas d\'anomalie détectée après la mise à jour de l\'application';
    2929$lang['c13y_upgrade_deactivate'] = 'Vous pouvez désactiver le plugin "Check upgrades"';
    30 $lang['c13y_exif_dbl_email_user'] = 'Utilisateurs avec la même adresse email';
    31 $lang['c13y_exif_correction_dbl_email_user'] = 'Supprimez les utilisateurs en double';
     30$lang['c13y_dbl_email_user'] = 'Utilisateurs avec la même adresse email';
     31$lang['c13y_correction_dbl_email_user'] = 'Supprimez les utilisateurs en double';
     32$lang['c13y_obsolete_plugin'] = 'Plugin obsolète';
     33$lang['c13y_correction_obsolete_plugin'] = 'Le plugin "%s" a été inclus dans cette version de l\'application et vous devez le désinstaller.';
    3234
    3335?>

  • trunk/template/yoga/index.tpl

    r2135 r2218  
    2727      <li><a href="{search_rules.URL}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{lang:Search rules}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
    2828      <!-- END search_rules -->
     29
     30      <!-- BEGIN slideshow -->
     31      <li><a href="{slideshow.URL}" title="{lang:slideshow}"><img src="{pwg_root}{themeconf:icon_dir}/slideshow.png" class="button" alt="{lang:slideshow}"/></a></li>
     32      <!-- END slideshow -->
    2933
    3034      <!-- BEGIN mode_normal -->

  • trunk/template/yoga/picture.tpl

    r2211 r2218  
    3131
    3232<div id="imageToolBar">
    33 
    34 <div class="randomButtons">
    35   <a href="{U_SLIDESHOW}" title="{lang:slideshow}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/slideshow.png" class="button" alt="{lang:slideshow}"></a>
    36   <a href="{U_METADATA}" title="{lang:picture_show_metadata}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/metadata.png" class="button" alt="{lang:picture_show_metadata}"></a>
    37 <!-- BEGIN download -->
    38   <a href="{download.U_DOWNLOAD}" title="{lang:download_hint}"><img src="{pwg_root}{themeconf:icon_dir}/save.png" class="button" alt="{lang:download}"></a>
    39 <!-- END download -->
    40   {PLUGIN_PICTURE_ACTIONS}
    41 <!-- BEGIN favorite -->
    42   <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}"><img src="{favorite.FAVORITE_IMG}" class="button" alt="{favorite.FAVORITE_ALT}"></a>
    43 <!-- END favorite -->
    44 <!-- BEGIN representative -->
    45   <a href="{representative.URL}" title="{lang:set as category representative}"><img src="{pwg_root}{themeconf:icon_dir}/representative.png" class="button" alt="{lang:representative}"></a>
    46 <!-- END representative -->
    47 <!-- BEGIN admin -->
    48   <a href="{U_ADMIN}" title="{lang:link_info_image}"><img src="{pwg_root}{themeconf:icon_dir}/preferences.png" class="button" alt="{lang:link_info_image}"></a>
    49 <!-- END admin -->
    50 <!-- BEGIN caddie -->
    51   <a href="{caddie.URL}" title="{lang:add to caddie}"><img src="{pwg_root}{themeconf:icon_dir}/caddie_add.png" class="button" alt="{lang:caddie}"></a>
    52 <!-- END caddie -->
    53 </div>
    54 
    55 <div class="navButtons">
    56 <!-- BEGIN last -->
    57   <a class="navButton prev" href="{last.U_IMG}" title="{lang:last_page} : {last.TITLE_IMG}" rel="last"><img src="{pwg_root}{themeconf:icon_dir}/last.png" class="button" alt="{lang:last_page}"></a>
    58 <!-- END last -->
    59 <!-- BEGIN last_unactive -->
    60   <a class="navButton prev"><img src="{pwg_root}{themeconf:icon_dir}/last_unactive.png" class="button" alt=""></a>
    61 <!-- END last_unactive -->
    62 <!-- BEGIN next -->
    63   <a class="navButton next" href="{next.U_IMG}" title="{lang:next_page} : {next.TITLE_IMG}" rel="next"><img src="{pwg_root}{themeconf:icon_dir}/right.png" class="button" alt="{lang:next_page}"></a>
    64 <!-- END next -->
    65 <!-- BEGIN next_unactive -->
    66   <a class="navButton next"><img src="{pwg_root}{themeconf:icon_dir}/right_unactive.png" class="button" alt=""></a>
    67 <!-- END next_unactive -->
    68   <a class="navButton up" href="{U_UP}" title="{lang:thumbnails}" rel="up"><img src="{pwg_root}{themeconf:icon_dir}/up.png" class="button" alt="{lang:thumbnails}"></a>
    69 <!-- BEGIN previous -->
    70   <a class="navButton prev" href="{previous.U_IMG}" title="{lang:previous_page} : {previous.TITLE_IMG}" rel="prev"><img src="{pwg_root}{themeconf:icon_dir}/left.png" class="button" alt="{lang:previous_page}"></a>
    71 <!-- END previous -->
    72 <!-- BEGIN previous_unactive -->
    73   <a class="navButton prev"><img src="{pwg_root}{themeconf:icon_dir}/left_unactive.png" class="button" alt=""></a>
    74 <!-- END previous_unactive -->
    75 <!-- BEGIN first -->
    76   <a class="navButton prev" href="{first.U_IMG}" title="{lang:first_page} : {first.TITLE_IMG}" rel="first"><img src="{pwg_root}{themeconf:icon_dir}/first.png" class="button" alt="{lang:first_page}"></a>
    77 <!-- END first -->
    78 <!-- BEGIN first_unactive -->
    79   <a class="navButton prev"><img src="{pwg_root}{themeconf:icon_dir}/first_unactive.png" class="button" alt=""></a>
    80 <!-- END first_unactive -->
    81 </div>
     33  <div class="randomButtons">
     34    <!-- BEGIN start_slideshow -->
     35      <a href="{start_slideshow.U_SLIDESHOW}" title="{lang:slideshow}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/slideshow.png" class="button" alt="{lang:slideshow}"></a>
     36    <!-- END start_slideshow -->
     37    <!-- BEGIN stop_slideshow -->
     38      <a href="{stop_slideshow.U_SLIDESHOW}" title="{lang:slideshow_stop}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/stop_slideshow.png" class="button" alt="{lang:slideshow_stop}"></a>
     39    <!-- END stop_slideshow -->
     40      <a href="{U_METADATA}" title="{lang:picture_show_metadata}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/metadata.png" class="button" alt="{lang:picture_show_metadata}"></a>
     41    <!-- BEGIN download -->
     42      <a href="{download.U_DOWNLOAD}" title="{lang:download_hint}"><img src="{pwg_root}{themeconf:icon_dir}/save.png" class="button" alt="{lang:download}"></a>
     43    <!-- END download -->
     44      {PLUGIN_PICTURE_ACTIONS}
     45    <!-- BEGIN favorite -->
     46      <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}"><img src="{favorite.FAVORITE_IMG}" class="button" alt="{favorite.FAVORITE_ALT}"></a>
     47    <!-- END favorite -->
     48    <!-- BEGIN representative -->
     49      <a href="{representative.URL}" title="{lang:set as category representative}"><img src="{pwg_root}{themeconf:icon_dir}/representative.png" class="button" alt="{lang:representative}"></a>
     50    <!-- END representative -->
     51    <!-- BEGIN admin -->
     52      <a href="{U_ADMIN}" title="{lang:link_info_image}"><img src="{pwg_root}{themeconf:icon_dir}/preferences.png" class="button" alt="{lang:link_info_image}"></a>
     53    <!-- END admin -->
     54    <!-- BEGIN caddie -->
     55      <a href="{caddie.URL}" title="{lang:add to caddie}"><img src="{pwg_root}{themeconf:icon_dir}/caddie_add.png" class="button" alt="{lang:caddie}"></a>
     56    <!-- END caddie -->
     57  </div>
     58  {NAV_BUTTONS}
     59  </div>
    8260
    8361</div> <!-- imageToolBar -->
    … …  
    229207<!-- END comments -->
    230208
    231 <script type="text/javascript">
    232 function keyboardNavigation(e)
    233 {
    234         if(!e) var e=window.event;
    235         if (e.altKey) return true;
    236         var target = e.target || e.srcElement;
    237         if (target && target.type) return true; //an input editable element
    238         var keyCode=e.keyCode || e.which;
    239         var docElem = document.documentElement;
    240         switch(keyCode) {
    241 <!-- BEGIN next -->
    242                 case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth ){window.location="{next.U_IMG}".replace( "&amp;", "&" ); return false; } break;
    243 <!-- END next -->
    244 <!-- BEGIN previous -->
    245                 case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0){ window.location="{previous.U_IMG}".replace("&amp;","&"); return false; } break;
    246 <!-- END previous -->
    247 <!-- BEGIN first -->
    248                 /*Home*/case 36: if (e.ctrlKey){window.location="{first.U_IMG}".replace("&amp;","&"); return false; } break;
    249 <!-- END first -->
    250 <!-- BEGIN last -->
    251                 /*End*/case 35: if (e.ctrlKey){window.location="{last.U_IMG}".replace("&amp;","&"); return false; } break;
    252 <!-- END last -->
    253                 /*Up*/case 38: if (e.ctrlKey){window.location="{U_UP}".replace("&amp;","&"); return false; } break;
    254         }
    255         return true;
    256 }
    257 document.onkeydown=keyboardNavigation;
    258 </script>

  • trunk/template/yoga/slideshow.tpl

    r1912 r2218  
    1111  <!-- END title -->
    1212</div>
     13
     14<div id="imageToolBar">
     15  {NAV_BUTTONS}
     16</div>
     17
    1318<div id="theImage">
    1419  {ELEMENT_CONTENT}
    15 <!-- BEGIN legend -->
    16 <p class="showlegend">{legend.COMMENT_IMG}</p>
    17 <!-- END legend -->
     20  <!-- BEGIN legend -->
     21  <p class="showlegend">{legend.COMMENT_IMG}</p>
     22  <!-- END legend -->
    1823</div>
Note: See TracChangeset for help on using the changeset viewer.