Changeset 5938


Ignore:
Timestamp:
04/22/10 15:11:32 (9 years ago)
Author:
laurent.duretz
Message:

Issue 1521 : report trunk on branch 2.0

Location:
branches/2.0
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0/include/config_default.inc.php

    r5254 r5938  
    4343// |                                 misc                                  | 
    4444// +-----------------------------------------------------------------------+ 
    45  
    46 // home_page : relative url of your homepage. Empty by default. It points to the index of the gallery. 
    47 $conf['home_page'] = ''; 
    4845 
    4946// order_by : how to change the order of display for images in a category ? 
     
    329326// 'filename' 
    330327$conf['uniqueness_mode'] = 'md5sum'; 
     328 
     329// home_page : relative url of the homepage. Empty by default. 
     330// It points to the index of the gallery. 
     331// This parameter is used if home page is not index.php of the gallery. 
     332// We suggest avoid the names "index.htm" or "index.html" if you set $conf['php_extension_in_urls'] to false. 
     333$conf['home_page'] = ''; 
    331334 
    332335// +-----------------------------------------------------------------------+ 
  • branches/2.0/include/functions_html.inc.php

    r5254 r5938  
    240240  global $conf; 
    241241 
    242   $output = '<a href="'.PHPWG_ROOT_PATH.$conf['home_page'].'">'.l10n('no_category').'</a>'; 
     242  $output = ''; 
     243  $is_first = true; 
    243244 
    244245  foreach ($cat_informations as $cat) 
     
    254255      ); 
    255256 
    256     $output.= $conf['level_separator']; 
     257    if ($is_first) 
     258    { 
     259      $is_first=false; 
     260    } 
     261    else 
     262    { 
     263      $output.= $conf['level_separator']; 
     264    } 
    257265 
    258266    if ( !isset($url) ) 
  • branches/2.0/include/section_init.inc.php

    r5254 r5938  
    221221if ('categories' == $page['section']) 
    222222{ 
     223  $page['title'] = '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('home').'</a>'; 
     224 
    223225  if (isset($page['category'])) 
    224226  { 
     
    233235            ), 
    234236        'title'             => 
    235           get_cat_display_name($page['category']['upper_names'], '', false), 
    236         ) 
    237       ); 
    238   } 
    239   else 
    240   { 
    241     $page['title'] = '<a href="'.PHPWG_ROOT_PATH.$conf['home_page'].'">'.l10n('no_category').'</a>'; 
     237          $page['title'].$conf['level_separator'].get_cat_display_name($page['category']['upper_names'], '', false), 
     238        ) 
     239      ); 
    242240  } 
    243241 
  • branches/2.0/picture.php

    r4509 r5938  
    693693    'LEVEL_SEPARATOR' => $conf['level_separator'], 
    694694 
    695     'U_HOME' => make_index_url(), 
    696695    'U_UP' => $url_up, 
    697696    'U_METADATA' => $url_metadata, 
  • branches/2.0/template/yoga/picture.tpl

    r4512 r5938  
    3030<div id="imageHeaderBar"> 
    3131  <div class="browsePath"> 
    32     <a href="{$U_HOME}" rel="home">{'home'|@translate}</a> 
    33     {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if} 
     32    {$SECTION_TITLE} 
    3433    {$LEVEL_SEPARATOR}{$current.TITLE} 
    3534  </div> 
Note: See TracChangeset for help on using the changeset viewer.