Changeset 1031


Ignore:
Timestamp:
Feb 10, 2006, 3:10:41 AM (18 years ago)
Author:
rvelices
Message:

feature 77: standard navigation link - finalized

3 small fixes: simplified code (unnecessary $pagetab_expand),
urls in comments (at end of line nl2br issue+regex+html 4 validated) and
$pagewhere correction for most_visited

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/category.php

    r1029 r1031  
    8989}
    9090
    91 // creation of the array containing the cat ids to expand in the menu
    92 // $page['tab_expand'] contains an array with the category ids
    93 // $page['expand'] contains the string to display in URL with comma
    94 $page['tab_expand'] = array();
    95 if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
    96 {
    97   // the category displayed (in the URL cat=23) must be seen in the menu ->
    98   // parent categories must be expanded
    99   $uppercats = explode( ',', $page['uppercats'] );
    100   foreach ( $uppercats as $uppercat ) {
    101     array_push( $page['tab_expand'], $uppercat );
    102   }
    103 }
    104 // in case of expanding all authorized cats $page['tab_expand'] is empty
    105 if ( $user['expand'] )
    106 {
    107   $page['tab_expand'] = array();
    108 }
    10991//----------------------------------------------------- template initialization
    11092//
    … …  
    301283'NAME'=>$lang['search'],
    302284'U_SUMMARY'=> 'search.php',
     285'REL'=> 'rel="search"'
    303286));
    304287
    … …  
    323306    'TITLE'=>l10n('notification'),
    324307    'NAME'=>l10n('Notification'),
    325     'U_SUMMARY'=> PHPWG_ROOT_PATH.'notification.php'
     308    'U_SUMMARY'=> PHPWG_ROOT_PATH.'notification.php',
     309    'REL'=> 'rel="nofollow"'
    326310));
    327311

  • trunk/include/functions_category.inc.php

    r1029 r1031  
    133133    $query.= '
    134134    AND (id_uppercat is NULL';
    135     if (isset ($page['tab_expand']) and count($page['tab_expand']) > 0)
    136     {
    137       $query.= ' OR id_uppercat IN ('.implode(',',$page['tab_expand']).')';
     135    if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
     136    {
     137      $query.= ' OR id_uppercat IN ('.$page['uppercats'].')';
    138138    }
    139139    $query.= ')';
    … …  
    324324  global $conf;
    325325  return array(
    326         array('Default', '', true),
    327         array(get_lang('best_rated_cat'),   'average_rate DESC', $conf['rate']),
    328         array(get_lang('most_visited_cat'), 'hit DESC', true),
    329         array(get_lang('Creation date'), 'date_creation DESC', true),
    330         array(get_lang('Availability date'), 'date_available DESC', true),
    331         array(get_lang('File name'), 'file ASC', true)
     326    array('Default', '', true),
     327    array(l10n('best_rated_cat'),   'average_rate DESC', $conf['rate']),
     328    array(l10n('most_visited_cat'), 'hit DESC', true),
     329    array(l10n('Creation date'), 'date_creation DESC', true),
     330    array(l10n('Availability date'), 'date_available DESC', true),
     331    array(l10n('File name'), 'file ASC', true)
    332332  );
    333333}
    … …  
    372372      $page['cat_uploadable'] = $result['uploadable'];
    373373      $page['cat_commentable'] = $result['commentable'];
     374      $page['cat_id_uppercat'] = $result['id_uppercat'];
    374375      $page['uppercats']      = $result['uppercats'];
    375376      $page['title'] =
    … …  
    469470        if (isset($forbidden))
    470471        {
    471           $page['where'] = "\n".'    AND '.$forbidden;
     472          $page['where'] .= "\n".'    AND '.$forbidden;
    472473        }
    473474

  • trunk/include/functions_html.inc.php

    r1030 r1031  
    8282    {
    8383      $navbar.= '<a href="';
    84       $navbar.= $url.'&amp;start=0';
     84      $navbar.= $url;
    8585      $navbar.= '" class="'.$link_class.'" rel="start">'.$lang['first_page'];
    8686      $navbar.= '</a>';
    … …  
    9696      $previous = $start - $nb_element_page;
    9797      $navbar.= '<a href="';
    98       $navbar.= $url.'&amp;start='.$previous;
     98      $navbar.= $url;
     99      if ($previous>0)
     100      {
     101        $navbar.= '&amp;start='.$previous;
     102      }
    99103      $navbar.= '" class="'.$link_class.'" rel="prev">'.$lang['previous_page'];
    100104      $navbar.= '</a>';
    … …  
    104108      $navbar.= $lang['previous_page'];
    105109    }
    106     $navbar.= ' | ';
     110    $navbar.= ' |';
    107111
    108112    if ($cur_page > $pages_around + 1)
    109113    {
    110114      $navbar.= '&nbsp;<a href="';
    111       $navbar.= $url.'&amp;start=0';
     115      $navbar.= $url;
    112116      $navbar.= '" class="'.$link_class.'">1</a>';
    113117      if ($cur_page > $pages_around + 2)
    … …  
    130134        $temp_start = ($i - 1) * $nb_element_page;
    131135        $navbar.= '&nbsp;<a href="';
    132         $navbar.= $url.'&amp;start='.$temp_start;
     136        $navbar.= $url;
     137        if ($temp_start>0)
     138        {
     139          $navbar.= '&amp;start='.$temp_start;
     140        }
    133141        $navbar.= '" class="'.$link_class.'"';
    134         if ($i == $cur_page - 1)
    135         {
    136           $navbar.= ' rel="prev"';
    137         }
    138         if ($i == $cur_page + 1)
    139         {
    140           $navbar.= ' rel="next"';
    141         }
    142142        $navbar.='>'.$i.'</a>';
    143143      }
    … …  
    183183      $navbar.= '<a href="';
    184184      $navbar.= $url.'&amp;start='.$temp_start;
    185       $navbar.= '" class="'.$link_class.'">'.$lang['last_page'];
     185      $navbar.= '" class="'.$link_class.'" rel="last">'.$lang['last_page'];
    186186      $navbar.= '</a>';
    187187    }
    … …  
    351351  $menu = '';
    352352 
     353  $page_cat = 0;
     354  if (isset($page['cat']) and is_numeric($page['cat']) )
     355  {
     356    $page_cat = $page['cat'];
     357  }
    353358  foreach ($categories as $category)
    354359  {
    … …  
    371376
    372377    $menu.= "\n\n".'<li';
    373     if (isset($page['cat'])
    374         and is_numeric($page['cat'])
    375         and $category['id'] == $page['cat'])
     378    if ($category['id'] == $page_cat)
    376379    {
    377380      $menu.= ' class="selected"';
    … …  
    380383 
    381384    $url = PHPWG_ROOT_PATH.'category.php?cat='.$category['id'];
    382     $menu.= "\n".'<a href="'.$url.'">'.$category['name'].'</a>';
     385    $menu.= "\n".'<a href="'.$url.'"';
     386    if ($category['id'] == $page['cat_id_uppercat'])
     387    {
     388      $menu.= ' rel="up"';
     389    }
     390    $menu.= '>'.$category['name'].'</a>';
    383391
    384392    if ($category['nb_images'] > 0)
    … …  
    409417function parse_comment_content($content)
    410418{
     419  $pattern = '/(https?:\/\/\S*)/';
     420  $replacement = '<a href="$1" rel="nofollow">$1</a>';
     421  $content = preg_replace($pattern, $replacement, $content);
     422
    411423  $content = nl2br($content);
    412 
    413   $pattern = '/(http?:\/\/\S*)/';
    414   $replacement = '<a href="$1">$1</a>';
    415   $content = preg_replace($pattern, $replacement, $content);
    416424 
    417425  // replace _word_ by an underlined word
    … …  
    426434 
    427435  // replace /word/ by an italic word
    428    $pattern = "/\/(\S*)\/(\s)/";
    429    $replacement = '<span style="font-style:italic;">$1$2</span>';
    430    $content = preg_replace($pattern, $replacement, $content);
    431 
     436  $pattern = "/\/(\S*)\/(\s)/";
     437  $replacement = '<span style="font-style:italic;">$1$2</span>';
     438  $content = preg_replace($pattern, $replacement, $content);
     439
     440  $content = '<div>'.$content.'</div>';
    432441  return $content;
    433442}

  • trunk/template/yoga/category.tpl

    r1020 r1031  
    3535    <ul>
    3636      <!-- BEGIN summary -->
    37       <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}">{summary.NAME}</a></li>
     37      <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li>
    3838      <!-- END summary -->
    3939      <!-- BEGIN upload -->
    … …  
    5151    <ul>
    5252      <!-- BEGIN register -->
    53       <li><a href="{U_REGISTER}">{L_REGISTER}</a></li>
     53      <li><a href="{U_REGISTER}" rel="nofollow">{L_REGISTER}</a></li>
    5454      <!-- END register -->
    5555      <!-- BEGIN login -->
    56       <li><a href="{F_IDENTIFY}">{lang:Connection}</a></li>
     56      <li><a href="{F_IDENTIFY}" rel="nofollow">{lang:Connection}</a></li>
    5757      <!-- END login -->
    5858      <!-- BEGIN logout -->

  • trunk/template/yoga/picture.tpl

    r1020 r1031  
    44
    55<div id="imageHeaderBar">
    6   <div class="browsePath"><a href="{U_HOME}">{L_HOME}</a>{LEVEL_SEPARATOR}{CATEGORY}</div>
     6  <div class="browsePath"><a href="{U_HOME}" rel="home">{L_HOME}</a>{LEVEL_SEPARATOR}{CATEGORY}</div>
    77  <div class="imageNumber">{PHOTO}</div>
    88  <!-- BEGIN title -->
    … …  
    3636<div class="navButtons">
    3737<!-- BEGIN last -->
    38   <a class="navButton prev" href="{last.U_IMG}"><img src="{themeconf:icon_dir}/last.png" class="button" alt="{lang:last_page}"></a>
     38  <a class="navButton prev" href="{last.U_IMG}" rel="last"><img src="{themeconf:icon_dir}/last.png" class="button" alt="{lang:last_page}"></a>
    3939<!-- END last -->
    4040<!-- BEGIN next -->
    4141  <a class="navButton next" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}" rel="next"><img src="{themeconf:icon_dir}/right.png" class="button" alt="next"></a>
    4242<!-- END next -->
    43   <a class="navButton up" href="{U_UP}" title="{L_UP_HINT}"><img src="{themeconf:icon_dir}/up.png" class="button" alt="{L_UP_ALT}"></a>
     43  <a class="navButton up" href="{U_UP}" title="{L_UP_HINT}" rel="up"><img src="{themeconf:icon_dir}/up.png" class="button" alt="{L_UP_ALT}"></a>
    4444<!-- BEGIN previous -->
    4545  <a class="navButton prev" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}" rel="prev"><img src="{themeconf:icon_dir}/left.png" class="button" alt="previous"></a>
    4646<!-- END previous -->
    4747<!-- BEGIN first -->
    48   <a class="navButton prev" href="{first.U_IMG}" rel="start"><img src="{themeconf:icon_dir}/first.png" class="button" alt="{lang:first_page}"></a>
     48  <a class="navButton prev" href="{first.U_IMG}" rel="first"><img src="{themeconf:icon_dir}/first.png" class="button" alt="{lang:first_page}"></a>
    4949<!-- END first -->
    5050</div>

  • trunk/template/yoga/search.tpl

    r960 r1031  
    44    <ul class="categoryActions">
    55      <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
    6       <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
     6      <li><a href="{U_HOME}" title="{lang:return to homepage}" rel="home"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
    77    </ul>
    88    <h2>{lang:Search}</h2>
Note: See TracChangeset for help on using the changeset viewer.