- Timestamp:
- Mar 5, 2009, 10:08:04 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/element_set_global.php
r3049 r3172 468 468 $page['nb_images'] 469 469 ); 470 $template->assign(' NAV_BAR', $nav_bar);470 $template->assign('navbar', $nav_bar); 471 471 472 472 $query = ' -
trunk/admin/element_set_unit.php
r3049 r3172 185 185 $page['nb_images'] 186 186 ); 187 $template->assign(array(' NAV_BAR' => $nav_bar));187 $template->assign(array('navbar' => $nav_bar)); 188 188 189 189 // tags -
trunk/admin/history.php
r3049 r3172 570 570 ); 571 571 572 $template->assign(' NAV_BAR', $navbar);572 $template->assign('navbar', $navbar); 573 573 } 574 574 -
trunk/admin/rating.php
r3049 r3172 116 116 $template->assign( 117 117 array( 118 ' NAVBAR' => create_navigation_bar(118 'navbar' => create_navigation_bar( 119 119 PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start','del')), 120 120 $nb_images, -
trunk/admin/template/goto/element_set_global.tpl
r2761 r3172 38 38 <legend>{'Elements'|@translate}</legend> 39 39 40 {if !empty($ NAV_BAR)}<div class="navigationBar">{$NAV_BAR}</div>{/if}40 {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} 41 41 42 42 {if !empty($thumbnails)} -
trunk/admin/template/goto/element_set_unit.tpl
r2761 r3172 25 25 </fieldset> 26 26 27 {if !empty($NAV_BAR) } 28 <div class="navigationBar">{$NAV_BAR}</div> 29 {/if} 27 {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} 30 28 31 29 {if !empty($elements) } -
trunk/admin/template/goto/history.tpl
r3059 r3172 103 103 {/if} 104 104 105 106 {if !empty($NAV_BAR)} 107 <div class="navigationBar"> 108 {$NAV_BAR} 109 </div> 110 {/if} 111 105 {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} 112 106 113 107 <table class="table2" id="detailedStats"> … … 140 134 </table> 141 135 142 143 {if !empty($NAV_BAR)} 144 <div class="navigationBar"> 145 {$NAV_BAR} 146 </div> 147 {/if} 136 {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} -
trunk/admin/template/goto/rating.tpl
r2971 r3172 33 33 </form> 34 34 35 <div class="navigationBar">{$NAVBAR}</div> 35 {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} 36 36 37 <table width="99%"> 37 38 <tr class="throw"> … … 65 66 </table> 66 67 67 <div class="navigationBar">{$NAVBAR}</div> 68 {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} -
trunk/admin/template/goto/user_list.tpl
r2578 r3172 92 92 </table> 93 93 94 <div class="navigationBar">{$NAVBAR}</div> 94 {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} 95 95 96 96 {* delete the selected users ? *} -
trunk/admin/user_list.php
r3049 r3172 590 590 ); 591 591 592 $template->assign(' NAVBAR', $navbar);592 $template->assign('navbar', $navbar); 593 593 594 594 // +-----------------------------------------------------------------------+ -
trunk/comments.php
r3122 r3172 266 266 ''); 267 267 268 $template->assign(' NAVBAR', $navbar);268 $template->assign('navbar', $navbar); 269 269 270 270 // +-----------------------------------------------------------------------+ -
trunk/include/functions.inc.php
r3145 r3172 1494 1494 ); 1495 1495 } 1496 1497 /** 1498 * return an array which will be sent to template to display navigation bar 1499 */ 1500 function create_navigation_bar($url, $nb_element, $start, $nb_element_page, $clean_url = false) 1501 { 1502 global $conf; 1503 1504 $pages_around = $conf['paginate_pages_around']; 1505 $start_str = $clean_url ? '/start-' : (strpos($url, '?')===false ? '?':'&').'start='; 1506 1507 if (!isset($start) or !is_numeric($start) or (is_numeric($start) and $start < 0)) 1508 { 1509 $start = 0; 1510 } 1511 1512 $navbar = array(); 1513 1514 // navigation bar useful only if more than one page to display ! 1515 if ($nb_element > $nb_element_page) 1516 { 1517 // current page and last page 1518 $cur_page = ceil($start / $nb_element_page) + 1; 1519 $maximum = ceil($nb_element / $nb_element_page); 1520 1521 $navbar['CURRENT_PAGE'] = $cur_page; 1522 1523 // link to first page ? 1524 if ($cur_page != 1) 1525 { 1526 $navbar['URL_FIRST'] = $url; 1527 } 1528 // link on previous page ? 1529 if ($start != 0) 1530 { 1531 $previous = $start - $nb_element_page; 1532 $navbar['URL_PREV'] = $url.($previous > 0 ? $start_str.$previous : ''); 1533 } 1534 // link on next page ? 1535 if ($nb_element > $nb_element_page and $start + $nb_element_page < $nb_element) 1536 { 1537 $next = $start + $nb_element_page; 1538 $navbar['URL_NEXT'] = $url.$start_str.$next; 1539 } 1540 // link to last page ? 1541 if ($cur_page != $maximum) 1542 { 1543 $temp_start = ($maximum - 1) * $nb_element_page; 1544 $navbar['URL_LAST'] = $url.$start_str.$temp_start; 1545 } 1546 1547 // pages to display 1548 $navbar['pages'] = array(); 1549 1550 $navbar['pages'][1] = $url; 1551 $navbar['pages'][$maximum] = $url.$start_str. ($maximum - 1) * $nb_element_page; 1552 1553 for ($i = $cur_page - $pages_around, $stop = $cur_page + $pages_around + 1; $i < $stop; $i++) 1554 { 1555 if ($i < 2 or $i > $maximum - 1) 1556 { 1557 continue; 1558 } 1559 $navbar['pages'][$i] = $url.$start_str. ($i - 1) * $nb_element_page; 1560 } 1561 ksort($navbar['pages']); 1562 } 1563 return $navbar; 1564 } 1496 1565 ?> -
trunk/include/functions_html.inc.php
r3171 r3172 74 74 } 75 75 76 function create_navigation_bar(77 $url, $nb_element, $start, $nb_element_page, $clean_url = false78 )79 {80 global $conf;81 82 $pages_around = $conf['paginate_pages_around'];83 $start_str = $clean_url ? '/start-' :84 ( ( strpos($url, '?')===false ? '?':'&') . 'start=' );85 86 $navbar = '';87 88 // current page detection89 if (!isset($start)90 or !is_numeric($start)91 or (is_numeric($start) and $start < 0))92 {93 $start = 0;94 }95 96 // navigation bar useful only if more than one page to display !97 if ($nb_element > $nb_element_page)98 {99 // current page and last page100 $cur_page = ceil($start / $nb_element_page) + 1;101 $maximum = ceil($nb_element / $nb_element_page);102 103 // link to first page ?104 if ($cur_page != 1)105 {106 $navbar.=107 '<a href="'.$url.'" rel="first">'108 .l10n('first_page')109 .'</a>';110 }111 else112 {113 $navbar.= l10n('first_page');114 }115 $navbar.= ' | ';116 // link on previous page ?117 if ($start != 0)118 {119 $previous = $start - $nb_element_page;120 121 $navbar.=122 '<a href="'123 .$url.($previous > 0 ? $start_str.$previous : '')124 .'" rel="prev">'125 .l10n('previous_page')126 .'</a>';127 }128 else129 {130 $navbar.= l10n('previous_page');131 }132 $navbar.= ' |';133 134 if ($cur_page > $pages_around + 1)135 {136 $navbar.= ' <a href="'.$url.'">1</a>';137 138 if ($cur_page > $pages_around + 2)139 {140 $navbar.= ' ...';141 }142 }143 144 // inspired from punbb source code145 for ($i = $cur_page - $pages_around, $stop = $cur_page + $pages_around + 1;146 $i < $stop;147 $i++)148 {149 if ($i < 1 or $i > $maximum)150 {151 continue;152 }153 else if ($i != $cur_page)154 {155 $temp_start = ($i - 1) * $nb_element_page;156 157 $navbar.=158 ' '159 .'<a href="'.$url160 .($temp_start > 0 ? $start_str.$temp_start : '')161 .'">'162 .$i163 .'</a>';164 }165 else166 {167 $navbar.=168 ' '169 .'<span class="pageNumberSelected">'170 .$i171 .'</span>';172 }173 }174 175 if ($cur_page < ($maximum - $pages_around))176 {177 $temp_start = ($maximum - 1) * $nb_element_page;178 179 if ($cur_page < ($maximum - $pages_around - 1))180 {181 $navbar.= ' ...';182 }183 184 $navbar.= ' <a href="'.$url.$start_str.$temp_start.'">'.$maximum.'</a>';185 }186 187 $navbar.= ' | ';188 // link on next page ?189 if ($nb_element > $nb_element_page190 and $start + $nb_element_page < $nb_element)191 {192 $next = $start + $nb_element_page;193 194 $navbar.=195 '<a href="'.$url.$start_str.$next.'" rel="next">'196 .l10n('next_page')197 .'</a>';198 }199 else200 {201 $navbar.= l10n('next_page');202 }203 204 $navbar.= ' | ';205 // link to last page ?206 if ($cur_page != $maximum)207 {208 $temp_start = ($maximum - 1) * $nb_element_page;209 210 $navbar.=211 '<a href="'.$url.$start_str.$temp_start.'" rel="last">'212 .l10n('last_page')213 .'</a>';214 }215 else216 {217 $navbar.= l10n('last_page');218 }219 }220 return $navbar;221 }222 223 76 /** 224 77 * returns the list of categories as a HTML string -
trunk/include/picture_comment.inc.php
r3145 r3172 113 113 array( 114 114 'COMMENT_COUNT' => $row['nb_comments'], 115 ' COMMENT_NAV_BAR' => $navigation_bar,115 'navbar' => $navigation_bar, 116 116 ) 117 117 ); -
trunk/index.php
r3146 r3172 65 65 } 66 66 67 $page['navigation_bar'] = array(); 67 68 if (count($page['items']) > $user['nb_image_page']) 68 69 { … … 74 75 true 75 76 ); 76 }77 else78 {79 $page['navigation_bar'] = '';80 77 } 81 78 … … 220 217 221 218 // navigation bar 222 $template->assign( ' NAV_BAR', $page['navigation_bar'] );219 $template->assign( 'navbar', $page['navigation_bar'] ); 223 220 224 221 if ( count($page['items']) > 0 -
trunk/template/yoga/comments.tpl
r2480 r3172 66 66 </form> 67 67 68 <div class="navigationBar">{$NAVBAR}</div> 68 {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} 69 69 70 70 {if isset($comments)} -
trunk/template/yoga/index.tpl
r3145 r3172 104 104 {if !empty($THUMBNAILS) }{$THUMBNAILS}{/if} 105 105 106 107 {if !empty($NAV_BAR) } 108 <div class="navigationBar"> 109 {$NAV_BAR} 110 </div> 111 {/if} 106 {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} 112 107 113 108 {if !empty($CONTENT_DESCRIPTION) } -
trunk/template/yoga/picture.tpl
r2902 r3172 256 256 <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3> 257 257 {/if} 258 {if !empty($COMMENT_NAV_BAR)} 259 <div class="navigationBar">{$COMMENT_NAV_BAR}</div> 260 {/if} 258 {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} 261 259 262 260 {if isset($comments)}
Note: See TracChangeset
for help on using the changeset viewer.