Skip to content

Commit

Permalink
Update pagination function
Browse files Browse the repository at this point in the history
  • Loading branch information
Yannick committed Dec 7, 2014
1 parent 10672fb commit 311c84a
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 53 deletions.
8 changes: 2 additions & 6 deletions backstage/bans.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,9 +343,7 @@
<h3 class="panel-title"><?php echo $lang['Results head'] ?></h3>
</div>
<div class="panel-body">
<ul class="pagination">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>
</div>
<table class="table table-striped table-hover">
<thead>
Expand Down Expand Up @@ -389,9 +387,7 @@
</tbody>
</table>
<div class="panel-body">
<ul class="pagination">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>
</div>
</div>
<?php
Expand Down
24 changes: 6 additions & 18 deletions backstage/users.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,7 @@
<h3 class="panel-title"><?php echo $lang['Results head'] ?></h3>
</div>
<div class="panel-body">
<ul class="pagination">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>
</div>
<table class="table table-striped table-hover">
<thead>
Expand Down Expand Up @@ -173,9 +171,7 @@
</tbody>
</table>
<div class="panel-body">
<ul class="pagination">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>
</div>
</div>
<?php
Expand Down Expand Up @@ -214,9 +210,7 @@
<h3 class="panel-title"><?php echo $lang['Results head'] ?></h3>
</div>
<div class="panel-body">
<ul class="pagination">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>
</div>
<table class="table table-striped table-hover">
<thead>
Expand Down Expand Up @@ -286,9 +280,7 @@
</tbody>
</table>
<div class="panel-body">
<ul class="pagination">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>
</div>
</div>
<?php
Expand Down Expand Up @@ -808,9 +800,7 @@
</div>
<form id="search-users-form" action="users.php" method="post">
<div class="panel-body">
<ul class="pagination">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>
<?php if ($can_action): ?>
<span class="btn-toolbar pull-right">
<div class="btn-group">
Expand Down Expand Up @@ -872,9 +862,7 @@
</tbody>
</table>
<div class="panel-body">
<ul class="pagination">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>
<?php if ($can_action): ?>
<span class="btn-toolbar pull-right">
<div class="btn-group">
Expand Down
10 changes: 5 additions & 5 deletions include/functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -941,9 +941,9 @@ function paginate($num_pages, $cur_page, $link) {
$link_to_all = true;
}

if ($num_pages <= 1)
$pages = array('');
else {
if ($num_pages <= 1) {
return '';
} else {
// Add a previous page link
if ($num_pages > 1 && $cur_page > 1)
$pages[] = '<li><a rel="prev" '.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.($cur_page - 1).'">&laquo;</a></li>';
Expand Down Expand Up @@ -979,9 +979,9 @@ function paginate($num_pages, $cur_page, $link) {
$pages[] = '<li><a rel="next" '.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.($cur_page +1).'">&raquo;</a></li>';
else
$pages[] = '<li class="disabled"><span>&raquo;</span></li>';
}

return implode(' ', $pages);
return '<ul class="pagination">'.implode(' ', $pages).'</ul>';
}
}


Expand Down
2 changes: 1 addition & 1 deletion style/Core/templates/views/moderate-form.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div>
<div class="jumbotron<?php echo $item_status ?>"<?php echo $jumbo_style ?>>
<div class="container">
<h2>Moderating <?php echo luna_htmlspecialchars($cur_forum['forum_name']) ?></h2><span class="pull-right"><ul class="pagination"><?php echo $paging_links ?></ul></span>
<h2>Moderating <?php echo luna_htmlspecialchars($cur_forum['forum_name']) ?></h2><span class="pull-right"><?php echo $paging_links ?></span>
</div>
</div>
<div class="container">
Expand Down
10 changes: 3 additions & 7 deletions style/Core/templates/views/moderate-topic.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
</div>
</div>
<div class="col-sm-6">
<ul class="pagination">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>
</div>
</div>

Expand Down Expand Up @@ -109,10 +107,8 @@
</div>
</div>
<div class="col-sm-6">
<ul class="pagination">
<?php echo $paging_links ?>
<div class="btn-group"><input type="submit" class="btn btn-primary" name="split_posts" value="<?php echo $lang['Split'] ?>"<?php echo $button_status ?> /><input type="submit" class="btn btn-primary" name="delete_posts" value="<?php echo $lang['Delete'] ?>"<?php echo $button_status ?> /></div>
</ul>
<?php echo $paging_links ?>
<div class="btn-group"><input type="submit" class="btn btn-primary" name="split_posts" value="<?php echo $lang['Split'] ?>"<?php echo $button_status ?> /><input type="submit" class="btn btn-primary" name="delete_posts" value="<?php echo $lang['Delete'] ?>"<?php echo $button_status ?> /></div>
</div>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion style/Sunrise/forum.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div>
<div class="jumbotron<?php echo $item_status ?>"<?php echo $jumbo_style ?>>
<div class="container">
<h2><?php echo luna_htmlspecialchars($cur_forum['forum_name']) ?></h2><span class="pull-right"><?php echo $post_link ?><ul class="pagination"><?php echo $paging_links ?></ul></span>
<h2><?php echo luna_htmlspecialchars($cur_forum['forum_name']) ?></h2><span class="pull-right"><?php echo $post_link ?><?php echo $paging_links ?></span>
</div>
</div>
<div class="container">
Expand Down
4 changes: 2 additions & 2 deletions style/Sunrise/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
</div>
<div class="col-sm-9">
<?php draw_section_info($id); ?>
<ul class="pagination"><?php echo $paging_links ?></ul>
<?php echo $paging_links ?>
<?php draw_index_topics_list($id) ?>
<ul class="pagination"><?php echo $paging_links ?></ul>
<?php echo $paging_links ?>
</div>
</div>
4 changes: 1 addition & 3 deletions style/Sunrise/search-results.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
<div class="container">
<h2><?php echo $lang['Search'] ?></h2>
<span class="pull-right">
<ul class="pagination">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>
</span>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions style/Sunrise/thread.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

<div class="row-nav">
<a class="btn btn-primary" href="viewforum.php?id=<?php echo $cur_topic['forum_id'] ?>"><span class="fa fa-chevron-left"></span> <?php echo luna_htmlspecialchars($cur_topic['forum_name']) ?></a>
<ul class="pagination pull-right">
<span class="pull-right">
<?php echo $paging_links ?>
</ul>
</span>
</div>

<?php draw_topic_list(); ?>
Expand All @@ -22,7 +22,7 @@

<div class="row-nav">
<a class="btn btn-primary" href="viewforum.php?id=<?php echo $cur_topic['forum_id'] ?>"><span class="fa fa-chevron-left"></span> <?php echo luna_htmlspecialchars($cur_topic['forum_name']) ?></a>
<ul class="pagination pull-right">
<span class="pull-right">
<?php echo $paging_links ?>
</ul>
</span>
</div>
8 changes: 2 additions & 6 deletions style/Sunrise/users.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,10 @@
</div>
</div>
<div class="container">
<ul class="pagination pagination-user">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>

<div class="userlist row">
<?php draw_user_list() ?>
</div>

<ul class="pagination pagination-user">
<?php echo $paging_links ?>
</ul>
<?php echo $paging_links ?>

0 comments on commit 311c84a

Please sign in to comment.