Changeset 1606
- Timestamp:
- 04/20/08 18:19:03 (3 months ago)
- Files:
-
- branches/punbb-1.3-dev/upload/include/functions.php (modified) (5 diffs)
- branches/punbb-1.3-dev/upload/lang/English/common.php (modified) (2 diffs)
- branches/punbb-1.3-dev/upload/moderate.php (modified) (3 diffs)
- branches/punbb-1.3-dev/upload/search.php (modified) (2 diffs)
- branches/punbb-1.3-dev/upload/style/Oxygen/Oxygen.css (modified) (8 diffs)
- branches/punbb-1.3-dev/upload/style/Oxygen/Oxygen_cs.css (modified) (3 diffs)
- branches/punbb-1.3-dev/upload/style/Oxygen/Oxygen_ie6.css (modified) (1 diff)
- branches/punbb-1.3-dev/upload/style/Oxygen/Oxygen_ie7.css (modified) (1 diff)
- branches/punbb-1.3-dev/upload/userlist.php (modified) (1 diff)
- branches/punbb-1.3-dev/upload/viewforum.php (modified) (2 diffs)
- branches/punbb-1.3-dev/upload/viewtopic.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/punbb-1.3-dev/upload/include/functions.php
r1594 r1606 570 570 { 571 571 if ($i < ($num_crumbs - 1)) 572 $crumbs .= '<span class="crumb'.(($i == 0) ? ' crumbfirst' : '').'">'.(($i >= 1) ? '<span>'.$lang_common['Crumb separator'].'</span> ' : '').(is_array($pun_page['crumbs'][$i]) ? '<a href="'.$pun_page['crumbs'][$i][1].'"><span>'.$lang_common['Back to'].' </span>'.pun_htmlencode($pun_page['crumbs'][$i][0]).'</a>' : pun_htmlencode($pun_page['crumbs'][$i])).'</span>';572 $crumbs .= '<span class="crumb'.(($i == 0) ? ' crumbfirst' : '').'">'.(($i >= 1) ? '<span>'.$lang_common['Crumb separator'].'</span>' : '').(is_array($pun_page['crumbs'][$i]) ? '<a href="'.$pun_page['crumbs'][$i][1].'">'.pun_htmlencode($pun_page['crumbs'][$i][0]).'</a>' : pun_htmlencode($pun_page['crumbs'][$i])).'</span> '; 573 573 else 574 $crumbs .= '<span class="crumb crumblast'.(($i == 0) ? ' crumbfirst' : '').'">'.(($i >= 1) ? '<span>'.$lang_common['Crumb separator'].'</span> ' : '').(is_array($pun_page['crumbs'][$i]) ? '<a href="'.$pun_page['crumbs'][$i][1].'"><span>'.$lang_common['You are here'].' </span>'.pun_htmlencode($pun_page['crumbs'][$i][0]).'</a>' : '<span>'.$lang_common['You are here'].'</span> '.pun_htmlencode($pun_page['crumbs'][$i])).'</span>';574 $crumbs .= '<span class="crumb crumblast'.(($i == 0) ? ' crumbfirst' : '').'">'.(($i >= 1) ? '<span>'.$lang_common['Crumb separator'].'</span>' : '').(is_array($pun_page['crumbs'][$i]) ? '<a href="'.$pun_page['crumbs'][$i][1].'">'.pun_htmlencode($pun_page['crumbs'][$i][0]).'</a>' : pun_htmlencode($pun_page['crumbs'][$i])).'</span> '; 575 575 } 576 576 } … … 1648 1648 // Generate a string with numbered links (for multipage scripts) 1649 1649 // 1650 function paginate($num_pages, $cur_page, $link, $ args = null)1650 function paginate($num_pages, $cur_page, $link, $separator, $args = null) 1651 1651 { 1652 1652 global $pun_url, $lang_common; … … 1665 1665 1666 1666 if ($num_pages <= 1) 1667 $pages = array('<strong >1</strong>');1667 $pages = array('<strong class="item1">1</strong>'); 1668 1668 else 1669 1669 { 1670 1670 // Add a previous page link 1671 1671 if ($num_pages > 1 && $cur_page > 1) 1672 $pages[] = '<a class="prev" href="'.pun_sublink($link, $pun_url['page'], ($cur_page - 1), $args).'">'.$lang_common['Previous'].'</a> ';1672 $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.pun_sublink($link, $pun_url['page'], ($cur_page - 1), $args).'">'.$lang_common['Previous'].'</a>'; 1673 1673 1674 1674 if ($cur_page > 3) 1675 1675 { 1676 $pages[] = '<a href="'.pun_sublink($link, $pun_url['page'], 1, $args).'">1</a>';1676 $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.pun_sublink($link, $pun_url['page'], 1, $args).'">1</a>'; 1677 1677 1678 1678 if ($cur_page > 5) 1679 $pages[] = ' âŠ';1679 $pages[] = '<span>âŠ</span>'; 1680 1680 } 1681 1681 … … 1686 1686 continue; 1687 1687 else if ($current != $cur_page || $link_to_all) 1688 $pages[] = '<a href="'.pun_sublink($link, $pun_url['page'], $current, $args).'">'.$current.'</a>';1688 $pages[] = '<a'.(empty($pages) ? ' class="item1" ' : '').' href="'.pun_sublink($link, $pun_url['page'], $current, $args).'">'.$current.'</a>'; 1689 1689 else 1690 $pages[] = '<strong >'.$current.'</strong>';1690 $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.$current.'</strong>'; 1691 1691 } 1692 1692 … … 1694 1694 { 1695 1695 if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) 1696 $pages[] = ' âŠ';1697 1698 $pages[] = '<a href="'.pun_sublink($link, $pun_url['page'], $num_pages, $args).'">'.$num_pages.'</a>';1696 $pages[] = '<span>âŠ</span>'; 1697 1698 $pages[] = '<a'.(empty($pages) ? ' class="item1" ' : '').' href="'.pun_sublink($link, $pun_url['page'], $num_pages, $args).'">'.$num_pages.'</a>'; 1699 1699 } 1700 1700 1701 1701 // Add a next page link 1702 1702 if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) 1703 $pages[] = '  <a class="next"href="'.pun_sublink($link, $pun_url['page'], ($cur_page + 1), $args).'">'.$lang_common['Next'].'</a>';1703 $pages[] = '<a'.(empty($pages) ? ' class="item1" ' : '').' href="'.pun_sublink($link, $pun_url['page'], ($cur_page + 1), $args).'">'.$lang_common['Next'].'</a>'; 1704 1704 } 1705 1705 1706 1706 ($hook = get_hook('fn_paginate_end')) ? eval($hook) : null; 1707 1707 1708 return implode($ lang_common['Page separator'], $pages);1708 return implode($separator, $pages); 1709 1709 } 1710 1710 branches/punbb-1.3-dev/upload/lang/English/common.php
r1601 r1606 66 66 'Replies' => 'Replies', 67 67 'Author' => 'Author', 68 'Pages' => 'Pages ',68 'Pages' => 'Pages:', 69 69 'Page' => 'Page', 70 70 'BBCode' => 'BBCode', // You probably shouldn't change this … … 83 83 'No upload warn' => '<strong>Important!</strong> You must choose a file to <em>upload</em> before submitting this form.', 84 84 'You are here' => 'You are here: ', 85 'Crumb separator' => ' - ', // The character or text that separates links in breadcrumbs85 'Crumb separator' => ' » ', // The character or text that separates links in breadcrumbs 86 86 'Title separator' => ' - ', 87 87 'Page separator' => ' ', //The character or text that separates page numbers 88 'Paging separator' => ' ', //The character or text that separates page numbers for page navigation generally 88 89 'Previous' => 'Previous', 89 90 'Next' => 'Next', branches/punbb-1.3-dev/upload/moderate.php
r1574 r1606 293 293 294 294 // Generate paging links 295 $pun_page['page_post'] = '<p class="paging"><s trong>'.$lang_common['Pages'].'</strong> '.paginate($pun_page['num_pages'], $pun_page['page'], $pun_url['delete_multiple'], array($fid, $tid)).'</p>';295 $pun_page['page_post'] = '<p class="paging"><span class="pages">'.$lang_common['Pages'].'</span> '.paginate($pun_page['num_pages'], $pun_page['page'], $pun_url['delete_multiple'], $lang_common['Paging separator'], array($fid, $tid)).'</p>'; 296 296 297 297 // Navigation links for header and page numbering for title/meta description … … 1045 1045 1046 1046 // Generate paging links 1047 $pun_page['page_post'] = '<p class="paging"><s trong>'.$lang_common['Pages'].'</strong> '.paginate($pun_page['num_pages'], $pun_page['page'], $pun_url['moderate_forum'], $fid).'</p>';1047 $pun_page['page_post'] = '<p class="paging"><span class="pages">'.$lang_common['Pages'].'</span> '.paginate($pun_page['num_pages'], $pun_page['page'], $pun_url['moderate_forum'], $lang_common['Paging separator'], $fid).'</p>'; 1048 1048 1049 1049 // Navigation links for header and page numbering for title/meta description … … 1174 1174 1175 1175 if ($pun_page['item_pages'] > 1) 1176 $pun_page['item_nav'][] = paginate($pun_page['item_pages'], -1, $pun_url['topic'], array($cur_topic['id'], sef_friendly($cur_topic['subject'])));1176 $pun_page['item_nav'][] = paginate($pun_page['item_pages'], -1, $pun_url['topic'], $lang_common['Page separator'], array($cur_topic['id'], sef_friendly($cur_topic['subject']))); 1177 1177 1178 1178 // Does this topic contain posts we haven't read? If so, tag it accordingly. branches/punbb-1.3-dev/upload/search.php
r1576 r1606 763 763 764 764 // Generate paging links 765 $pun_page['page_post'] = '<p class="paging"><s trong>'.$lang_common['Pages'].'</strong> '.paginate($pun_page['num_pages'], $pun_page['page'], $url_type, $search_id).'</p>';765 $pun_page['page_post'] = '<p class="paging"><span class="pages">'.$lang_common['Pages'].'</span> '.paginate($pun_page['num_pages'], $pun_page['page'], $url_type, $lang_common['Paging separator'], $search_id).'</p>'; 766 766 767 767 … … 1012 1012 1013 1013 if ($pun_page['item_pages'] > 1) 1014 $pun_page['item_nav'][] = paginate($pun_page['item_pages'], -1, $pun_url['topic'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject'])));1014 $pun_page['item_nav'][] = paginate($pun_page['item_pages'], -1, $pun_url['topic'], $lang_common['Page separator'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject']))); 1015 1015 1016 1016 // Does this topic contain posts we haven't read? If so, tag it accordingly. branches/punbb-1.3-dev/upload/style/Oxygen/Oxygen.css
r1436 r1606 108 108 #pun-about:after, 109 109 #pun-info #stats:after, 110 .pun .crumbs:after, 110 111 #pun-info #onlinelist:after, 111 112 .main .paged-head:after, … … 440 441 background-image: url(crumb.png); 441 442 background-repeat: no-repeat; 442 background-position: 0;443 background-position: center left; 443 444 white-space: nowrap; 445 float: left; 444 446 } 445 447 … … 481 483 } 482 484 485 .pun .posting, .pun .posting * { 486 white-space: nowrap; 487 } 488 483 489 .main .paged-head .posting span, 484 490 .main .paged-head .paging strong, … … 501 507 } 502 508 509 510 .pun .paging, .pun .paging * { 511 white-space:nowrap; 512 } 513 514 .pun .paging a, .pun .paging strong, .pun .paging span { 515 border-left-style:solid; 516 border-left-width: 1px; 517 text-decoration: none; 518 padding: 0 0.2em 0 0.6em; 519 } 520 521 .pun .paging .item1, .pun .paging .pages { 522 border: 0; 523 padding-left: 0; 524 } 525 526 .pun .paging .pages { 527 padding-right: 0.3em; 528 } 529 503 530 504 531 /* Main Headers and Footers … … 599 626 600 627 .main .main-nav { 601 min-width: 50em;628 min-width: 62em; 602 629 } 603 630 … … 622 649 border-width: 1px; 623 650 float: left; 624 padding: 0;625 }626 627 .main .main-nav ul li a span,628 .main .main-nav ul li a:link span,629 .main .main-nav ul li a:visited span {630 651 height: 2.2em; 631 652 line-height: 2.2em; 632 653 padding: 0 1em; 633 background:transparent;634 float: left;635 border-top-style: solid;636 border-top-width: 1px;637 654 } 638 655 … … 645 662 646 663 .main .submenu ul li.topactive ul { 647 background: transparent;648 664 border: none; 649 height: 2.5em;665 height: 1.85em; 650 666 left: 0; 651 line-height: 2.5em;667 line-height: 1.5em; 652 668 margin: 0; 653 padding: 0 1.7em;669 padding: 0.3em 1.7em 0.5em; 654 670 position: absolute; 655 top: 2. 5em;671 top: 2.3em; 656 672 } 657 673 … … 689 705 690 706 #pun-userlist table .tcl, 691 #pun-searchtopics table .tcl { 707 #pun-searchtopics table .tcl, 708 #pun-modforum table .tcl { 692 709 width: 40% 693 710 } branches/punbb-1.3-dev/upload/style/Oxygen/Oxygen_cs.css
r1418 r1606 82 82 } 83 83 84 .pun .paging a, .pun .paging strong, .pun .paging span { 85 border-color: #ddd; 86 } 87 88 .pun .paged-head, .pun .paged-foot { 89 background: #fff; 90 } 91 84 92 /************************************************************* 85 93 B - TEXT … … 193 201 .main-nav ul li a, .main-nav ul li a:link, .main-nav ul li a:visited { 194 202 text-decoration: none; 195 background: #f1f1f1; 196 border-color: #ddd; 197 } 198 199 .main-nav ul li a span { 200 border-color: #fff; 201 } 202 203 border-color: #ddd; 204 } 205 203 206 .main-nav ul li a:hover, .main-nav ul li a:active, .main-nav ul li a:focus { 204 b ackground: #fbfbfb;207 border-top-color: #b42000; 205 208 } 206 209 … … 211 214 background: #1f537b; 212 215 border-color: #1f537b; 213 }214 215 .main-nav ul li.topactive a span {216 border-color: #1f537b217 216 } 218 217 branches/punbb-1.3-dev/upload/style/Oxygen/Oxygen_ie6.css
r1550 r1606 59 59 ----------------------------------------------------------=--*/ 60 60 61 .pun .crumbs, 61 62 .main .paged-head, 62 63 .main .paged-foot, branches/punbb-1.3-dev/upload/style/Oxygen/Oxygen_ie7.css
r1550 r1606 58 58 ----------------------------------------------------------=--*/ 59 59 60 .pun .crumbs, 60 61 .main .paged-head, 61 62 .main .paged-foot, branches/punbb-1.3-dev/upload/userlist.php
r1533 r1606 81 81 82 82 // Generate paging links 83 $pun_page['page_post'] = '<div class="paging"> '.$lang_common['Pages'].': '.paginate($pun_page['num_pages'], $pun_page['page'], $pun_url['users_browse'], array($pun_page['show_group'], $pun_page['sort_by'], strtoupper($pun_page['sort_dir']), ($pun_page['username'] != '') ? urlencode($pun_page['username']) : '-')).'</div>';83 $pun_page['page_post'] = '<div class="paging"><span class="pages">'.$lang_common['Pages'].'</span> '.paginate($pun_page['num_pages'], $pun_page['page'], $pun_url['users_browse'], $lang_common['Page separator'], array($pun_page['show_group'], $pun_page['sort_by'], strtoupper($pun_page['sort_dir']), ($pun_page['username'] != '') ? urlencode($pun_page['username']) : '-')).'</div>'; 84 84 85 85 // Navigation links for header and page numbering for title/meta description branches/punbb-1.3-dev/upload/viewforum.php
r1560 r1606 141 141 142 142 // Generate paging/posting links 143 $pun_page['page_post'][] = '<p class="paging"><s trong>'.$lang_common['Pages'].'</strong> '.paginate($pun_page['num_pages'], $pun_page['page'], $pun_url['forum'], array($id, sef_friendly($cur_forum['forum_name']))).'</p>';143 $pun_page['page_post'][] = '<p class="paging"><span class="pages">'.$lang_common['Pages'].'</span> '.paginate($pun_page['num_pages'], $pun_page['page'], $lang_common['Paging separator'], $pun_url['forum'], array($id, sef_friendly($cur_forum['forum_name']))).'</p>'; 144 144 145 145 if ($pun_user['may_post']) … … 261 261 262 262 if ($pun_page['item_pages'] > 1) 263 $pun_page['item_nav'][] = paginate($pun_page['item_pages'], -1, $pun_url['topic'], array($cur_topic['id'], sef_friendly($cur_topic['subject'])));263 $pun_page['item_nav'][] = paginate($pun_page['item_pages'], -1, $pun_url['topic'], $lang_common['Page separator'], array($cur_topic['id'], sef_friendly($cur_topic['subject']))); 264 264 265 265 // Does this topic contain posts we haven't read? If so, tag it accordingly. branches/punbb-1.3-dev/upload/viewtopic.php
r1575 r1606 198 198 199 199 // Generate paging and posting links 200 $pun_page['page_post'][] = '<p class="paging"><s trong>'.$lang_common['Pages'].'</strong> '.paginate($pun_page['num_pages'], $pun_page['page'], $pun_url['topic'], array($id, sef_friendly($cur_topic['subject']))).'</p>';200 $pun_page['page_post'][] = '<p class="paging"><span class="pages">'.$lang_common['Pages'].'</span> '.paginate($pun_page['num_pages'], $pun_page['page'], $pun_url['topic'], $lang_common['Paging separator'], array($id, sef_friendly($cur_topic['subject']))).'</p>'; 201 201 202 202 if ($pun_user['may_post'])
