Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/283] Use newer pagination style in prosilver & support subsilver2

Browse Source 
B3P-283
This commit is contained in:
Marc Alexander
2014-07-06 21:53:01 +02:00
parent ed8d2e2412
commit 5d441c68b6
9 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
includes/functions.php
View File

@@ -449,7 +449,7 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite
// Make sure $per_page is a valid value // Make sure $per_page is a valid value
$per_page = ($per_page <= 0) ? 1 : $per_page; $per_page = ($per_page <= 0) ? 1 : $per_page;
$seperator = '<span class="page-sep">' . $user->lang['COMMA_SEPARATOR'] . '</span>'; $seperator = '<li>&nbsp;</li>';
$total_pages = ceil($num_items / $per_page); $total_pages = ceil($num_items / $per_page);
if ($total_pages == 1 || !$num_items) if ($total_pages == 1 || !$num_items)
@@ -460,24 +460,27 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite
$on_page = floor($start_item / $per_page) + 1; $on_page = floor($start_item / $per_page) + 1;
$url_delim = (strpos($base_url, '?') === false) ? '?' : '&amp;'; $url_delim = (strpos($base_url, '?') === false) ? '?' : '&amp;';
$page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . $anker .'">1</a>'; $page_string = ($on_page == 1) ? '<ul><li class="active"><span>1</span></li>' : '<ul><li><a href="' . $base_url . $anker .'">1</a></li>';
if ($total_pages > 5) if ($total_pages > 5)
{ {
$start_cnt = min(max(1, $on_page - 4), $total_pages - 5); $start_cnt = min(max(1, $on_page - 4), $total_pages - 5);
$end_cnt = max(min($total_pages, $on_page + 4), 6); $end_cnt = max(min($total_pages, $on_page + 4), 6);
$page_string .= ($start_cnt > 1) ? ' ... ' : $seperator; // Add ... separator to pagination
$page_string .= ($start_cnt > 1) ? '<li class="ellipsis" role="separator"><span>' . $user->lang['ELLIPSIS'] . '</span></li>' : $seperator;
for ($i = $start_cnt + 1; $i < $end_cnt; ++$i) for ($i = $start_cnt + 1; $i < $end_cnt; ++$i)
{ {
$page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '">' . $i . '</a>'; $page_string .= ($i == $on_page) ? '<li class="active"><span>' . $i . '</span></li>' : '<li><a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '">' . $i . '</a></li>';
if ($i < $end_cnt - 1) if ($i < $end_cnt - 1)
{ {
$page_string .= $seperator; $page_string .= $seperator;
} }
} }
$page_string .= ($end_cnt < $total_pages) ? ' ... ' : $seperator;
// Add ... separator to pagination
$page_string .= ($end_cnt < $total_pages) ? '<li class="ellipsis" role="separator"><span>' . $user->lang['ELLIPSIS'] . '</span></li>' : $seperator;
} }
else else
{ {
@@ -485,14 +488,14 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite
for ($i = 2; $i < $total_pages; ++$i) for ($i = 2; $i < $total_pages; ++$i)
{ {
$page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '">' . $i . '</a>'; $page_string .= ($i == $on_page) ? '<li class="active"><span>' . $i . '</span></li>' : '<li><a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '">' . $i . '</a></li>';
if ($i < $total_pages) if ($i < $total_pages)
{ {
$page_string .= $seperator; $page_string .= $seperator;
} }
} }
} }
$page_string .= ($on_page == $total_pages) ? '<strong>' . $total_pages . '</strong>' : '<a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($total_pages - 1) * $per_page) . $anker . '">' . $total_pages . '</a>'; $page_string .= ($on_page == $total_pages) ? '<li class="active"><span>' . $total_pages . '</span></li></ul>' : '<li><a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($total_pages - 1) * $per_page) . $anker . '">' . $total_pages . '</a></li></ul>';
if ($add_prevnext_text) if ($add_prevnext_text)
{ {

2
styles/prosilver/template/portal/modules/announcements_center.html
View File

@@ -37,7 +37,7 @@
<hr class="dashed" /> <hr class="dashed" />
<div class="pagination"> <div class="pagination">
{TOTAL_ANNOUNCEMENTS} {TOTAL_ANNOUNCEMENTS}
<!-- IF AP_PAGE_NUMBER --><!-- IF AP_PAGINATION --> &bull; {AP_PAGE_NUMBER} &bull; <span>{AP_PAGINATION}</span><!-- ELSE --> &bull; {AP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> <!-- IF AP_PAGE_NUMBER --><!-- IF AP_PAGINATION --> &bull; {AP_PAGE_NUMBER} &bull; {AP_PAGINATION}<!-- ELSE --> &bull; {AP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF not $S_POSTBODY_TOP --></div><!-- ENDIF --> <!-- IF not $S_POSTBODY_TOP --></div><!-- ENDIF -->

4
styles/prosilver/template/portal/modules/news_compact_center.html
View File

@@ -59,11 +59,11 @@
</li> </li>
<!-- IF news_row.S_LAST_ROW --> <!-- IF news_row.S_LAST_ROW -->
<!-- IF NP_PAGINATION or TOTAL_NEWS --> <!-- IF NP_PAGINATION or TOTAL_NEWS -->
<li class="row<!-- IF news_row.S_ROW_COUNT is even --> bg2<!-- ELSE --> bg1<!-- ENDIF -->"> <li class="row<!-- IF news_row.S_ROW_COUNT is even --> bg2<!-- ELSE --> bg1<!-- ENDIF --> portal-news-pagination">
<div class="topic-actions"> <div class="topic-actions">
<div class="pagination"> <div class="pagination">
{TOTAL_NEWS} {TOTAL_NEWS}
<!-- IF NP_PAGE_NUMBER --><!-- IF NP_PAGINATION --> &bull; {NP_PAGE_NUMBER} &bull; <span>{NP_PAGINATION}</span><!-- ELSE --> &bull; {NP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> &nbsp; <!-- IF NP_PAGE_NUMBER --><!-- IF NP_PAGINATION --> &bull; {NP_PAGE_NUMBER} &bull; {NP_PAGINATION}<!-- ELSE --> &bull; {NP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> &nbsp;
</div> </div>
</div> </div>
</li> </li>

8
styles/prosilver/theme/portal.css
View File

@@ -120,6 +120,14 @@ span.portal-corners-top-inner, span.portal-corners-bottom-inner{
margin-right: 0px; margin-right: 0px;
} }
.portal-news-pagination {
height: 2em;
}
.portal-news-pagination .pagination {
font-size: 1.1em;
}
/** /**
* margin spacing as in default prosilver for the forumlist * margin spacing as in default prosilver for the forumlist
*/ */

4
styles/subsilver2/template/portal/modules/announcements_center.html
View File

@@ -60,9 +60,9 @@
<hr /> <hr />
<table width="100%" cellspacing="0"> <table width="100%" cellspacing="0">
<tr> <tr>
<td class="gensmall" valign="middle" align="right" nowrap="nowrap"> <td class="gensmall portal-pagination" valign="middle" align="right" nowrap="nowrap">
{TOTAL_ANNOUNCEMENTS} {TOTAL_ANNOUNCEMENTS}
<!-- IF AP_PAGE_NUMBER --><!-- IF AP_PAGINATION --> &bull; {AP_PAGE_NUMBER} &bull; <span>{AP_PAGINATION}</span><!-- ELSE --> &bull; {AP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> <!-- IF AP_PAGE_NUMBER --><!-- IF AP_PAGINATION --> &bull; {AP_PAGE_NUMBER} &bull; {AP_PAGINATION}<!-- ELSE --> &bull; {AP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</td> </td>
</tr> </tr>
</table> </table>

4
styles/subsilver2/template/portal/modules/announcements_center_compact.html
View File

@@ -54,8 +54,8 @@
<!-- IF announcements_center_row.S_LAST_ROW --> <!-- IF announcements_center_row.S_LAST_ROW -->
<!-- IF AP_PAGINATION or TOTAL_ANNOUNCEMENTS --> <!-- IF AP_PAGINATION or TOTAL_ANNOUNCEMENTS -->
<tr class="row<!-- IF announcements_center_row.S_ROW_COUNT is even -->2<!-- ELSE -->1<!-- ENDIF -->"> <tr class="row<!-- IF announcements_center_row.S_ROW_COUNT is even -->2<!-- ELSE -->1<!-- ENDIF -->">
<td class="gensmall" valign="middle" align="right" nowrap="nowrap" colspan="<!-- IF S_TOPIC_ICONS and S_DISPLAY_ANNOUNCEMENTS_RVS -->6<!-- ELSEIF not S_TOPIC_ICONS and S_DISPLAY_ANNOUNCEMENTS_RVS -->5<!-- ELSEIF S_TOPIC_ICONS and not S_DISPLAY_ANNOUNCEMENTS_RVS -->4<!-- ELSE -->3<!-- ENDIF -->">{TOTAL_ANNOUNCEMENTS} <td class="gensmall portal-pagination" valign="middle" align="right" nowrap="nowrap" colspan="<!-- IF S_TOPIC_ICONS and S_DISPLAY_ANNOUNCEMENTS_RVS -->6<!-- ELSEIF not S_TOPIC_ICONS and S_DISPLAY_ANNOUNCEMENTS_RVS -->5<!-- ELSEIF S_TOPIC_ICONS and not S_DISPLAY_ANNOUNCEMENTS_RVS -->4<!-- ELSE -->3<!-- ENDIF -->">{TOTAL_ANNOUNCEMENTS}
<!-- IF AP_PAGE_NUMBER --><!-- IF AP_PAGINATION --> &bull; {AP_PAGE_NUMBER} &bull; <span>{AP_PAGINATION}</span><!-- ELSE --> &bull; {AP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --></td> <!-- IF AP_PAGE_NUMBER --><!-- IF AP_PAGINATION --> &bull; {AP_PAGE_NUMBER} &bull; {AP_PAGINATION}<!-- ELSE --> &bull; {AP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --></td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
</table> </table>

4
styles/subsilver2/template/portal/modules/news_center.html
View File

@@ -56,9 +56,9 @@
<hr /> <hr />
<table width="100%" cellspacing="0"> <table width="100%" cellspacing="0">
<tr> <tr>
<td class="gensmall" valign="middle" align="right" nowrap="nowrap"> <td class="gensmall portal-pagination" valign="middle" align="right" nowrap="nowrap">
{TOTAL_NEWS} {TOTAL_NEWS}
<!-- IF NP_PAGE_NUMBER --><!-- IF NP_PAGINATION --> &bull; {NP_PAGE_NUMBER} &bull; <span>{NP_PAGINATION}</span><!-- ELSE --> &bull; {NP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --></td> <!-- IF NP_PAGE_NUMBER --><!-- IF NP_PAGINATION --> &bull; {NP_PAGE_NUMBER} &bull; {NP_PAGINATION}<!-- ELSE --> &bull; {NP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --></td>
</tr> </tr>
</table> </table>
<!-- ENDIF --> <!-- ENDIF -->

4
styles/subsilver2/template/portal/modules/news_compact_center.html
View File

@@ -53,8 +53,8 @@
<!-- IF news_row.S_LAST_ROW --> <!-- IF news_row.S_LAST_ROW -->
<!-- IF NP_PAGINATION or TOTAL_NEWS --> <!-- IF NP_PAGINATION or TOTAL_NEWS -->
<tr class="row<!-- IF news_row.S_ROW_COUNT is even -->2<!-- ELSE -->1<!-- ENDIF -->"> <tr class="row<!-- IF news_row.S_ROW_COUNT is even -->2<!-- ELSE -->1<!-- ENDIF -->">
<td class="gensmall" valign="middle" align="right" nowrap="nowrap" colspan="<!-- IF S_TOPIC_ICONS and S_DISPLAY_NEWS_RVS -->6<!-- ELSEIF not S_TOPIC_ICONS and S_DISPLAY_NEWS_RVS -->5<!-- ELSEIF S_TOPIC_ICONS and not S_DISPLAY_NEWS_RVS -->4<!-- ELSE -->3<!-- ENDIF -->">{TOTAL_NEWS} <td class="gensmall portal-pagination" valign="middle" align="right" nowrap="nowrap" colspan="<!-- IF S_TOPIC_ICONS and S_DISPLAY_NEWS_RVS -->6<!-- ELSEIF not S_TOPIC_ICONS and S_DISPLAY_NEWS_RVS -->5<!-- ELSEIF S_TOPIC_ICONS and not S_DISPLAY_NEWS_RVS -->4<!-- ELSE -->3<!-- ENDIF -->">{TOTAL_NEWS}
<!-- IF NP_PAGE_NUMBER --><!-- IF NP_PAGINATION --> &bull; {NP_PAGE_NUMBER} &bull; <span>{NP_PAGINATION}</span><!-- ELSE --> &bull; {NP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --></td> <!-- IF NP_PAGE_NUMBER --><!-- IF NP_PAGINATION --> &bull; {NP_PAGE_NUMBER} &bull; {NP_PAGINATION}<!-- ELSE --> &bull; {NP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --></td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
</table> </table>

13
styles/subsilver2/theme/portal.css
View File

@@ -159,3 +159,16 @@
margin-left: -1px; margin-left: -1px;
} }
} }
.portal-pagination ul {
display: inline-block;
list-style: none !important;
margin-left: 5px;
}
.portal-pagination ul li {
display: inline-block !important;
padding: 0;
font-size: 100%;
line-height: normal;
}