<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [3222] branches/1.2/bp-themes/bp-default:
Normalize loop template files.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3222</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-29 00:17:07 +0000 (Sun, 29 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Normalize loop template files. Add bottom pagination. Fixes #2472. Props sorich87.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpthemesbpdefault_inccssdefaultcss">branches/1.2/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#branches12bpthemesbpdefaultblogsblogsloopphp">branches/1.2/bp-themes/bp-default/blogs/blogs-loop.php</a></li>
<li><a href="#branches12bpthemesbpdefaultforumsforumsloopphp">branches/1.2/bp-themes/bp-default/forums/forums-loop.php</a></li>
<li><a href="#branches12bpthemesbpdefaultgroupsgroupsloopphp">branches/1.2/bp-themes/bp-default/groups/groups-loop.php</a></li>
<li><a href="#branches12bpthemesbpdefaultmembersmembersloopphp">branches/1.2/bp-themes/bp-default/members/members-loop.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/_inc/css/default.css (3221 => 3222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/_inc/css/default.css 2010-08-28 23:59:16 UTC (rev 3221)
+++ branches/1.2/bp-themes/bp-default/_inc/css/default.css 2010-08-29 00:17:07 UTC (rev 3222)
</span><span class="lines">@@ -603,6 +603,10 @@
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+div#pag-bottom {
+ margin-top: 5px;
+}
+
</ins><span class="cx"> /* > Error / Success Messages
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="lines">@@ -1756,4 +1760,4 @@
</span><span class="cx"> }
</span><span class="cx"> #footer a {
</span><span class="cx"> color: #bbb;
</span><del>- }
</del><span class="cx">\ No newline at end of file
</span><ins>+ }
</ins></span></pre></div>
<a id="branches12bpthemesbpdefaultblogsblogsloopphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/blogs/blogs-loop.php (3221 => 3222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/blogs/blogs-loop.php 2010-08-28 23:59:16 UTC (rev 3221)
+++ branches/1.2/bp-themes/bp-default/blogs/blogs-loop.php 2010-08-29 00:17:07 UTC (rev 3222)
</span><span class="lines">@@ -4,18 +4,20 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_has_blogs( bp_ajax_querystring( 'blogs' ) ) ) : ?>
</span><span class="cx">
</span><del>- <div class="pagination">
</del><ins>+ <div id="pag-top" class="pagination">
</ins><span class="cx">
</span><del>- <div class="pag-count" id="blog-dir-count">
</del><ins>+ <div class="pag-count" id="blog-dir-count-top">
</ins><span class="cx"> <?php bp_blogs_pagination_count() ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="pagination-links" id="blog-dir-pag">
</del><ins>+ <div class="pagination-links" id="blog-dir-pag-top">
</ins><span class="cx"> <?php bp_blogs_pagination_links() ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_blogs_list' ) ?>
+
</ins><span class="cx"> <ul id="blogs-list" class="item-list">
</span><span class="cx"> <?php while ( bp_blogs() ) : bp_the_blog(); ?>
</span><span class="cx">
</span><span class="lines">@@ -53,6 +55,18 @@
</span><span class="cx">
</span><span class="cx"> <?php bp_blog_hidden_fields() ?>
</span><span class="cx">
</span><ins>+ <div id="pag-bottom" class="pagination">
+
+ <div class="pag-count" id="blog-dir-count-bottom">
+ <?php bp_blogs_pagination_count() ?>
+ </div>
+
+ <div class="pagination-links" id="blog-dir-pag-bottom">
+ <?php bp_blogs_pagination_links() ?>
+ </div>
+
+ </div>
+
</ins><span class="cx"> <?php else: ?>
</span><span class="cx">
</span><span class="cx"> <div id="message" class="info">
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultforumsforumsloopphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/forums/forums-loop.php (3221 => 3222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/forums/forums-loop.php 2010-08-28 23:59:16 UTC (rev 3221)
+++ branches/1.2/bp-themes/bp-default/forums/forums-loop.php 2010-08-29 00:17:07 UTC (rev 3222)
</span><span class="lines">@@ -1,12 +1,16 @@
</span><ins>+<?php /* Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() */ ?>
+
+<?php do_action( 'bp_before_forums_loop' ) ?>
+
</ins><span class="cx"> <?php if ( bp_has_forum_topics( bp_ajax_querystring( 'forums' ) ) ) : ?>
</span><span class="cx">
</span><del>- <div class="pagination">
</del><ins>+ <div id="pag-top" class="pagination">
</ins><span class="cx">
</span><del>- <div id="post-count" class="pag-count">
</del><ins>+ <div class="pag-count" id="topic-count-top">
</ins><span class="cx"> <?php bp_forum_pagination_count() ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="pagination-links" id="topic-pag">
</del><ins>+ <div class="pagination-links" id="topic-pag-top">
</ins><span class="cx"> <?php bp_forum_pagination() ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -73,10 +77,24 @@
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_directory_forums_list' ) ?>
</span><span class="cx">
</span><ins>+ <div id="pag-bottom" class="pagination">
+
+ <div class="pag-count" id="topic-count-bottom">
+ <?php bp_forum_pagination_count() ?>
+ </div>
+
+ <div class="pagination-links" id="topic-pag-bottom">
+ <?php bp_forum_pagination() ?>
+ </div>
+
+ </div>
+
</ins><span class="cx"> <?php else: ?>
</span><span class="cx">
</span><span class="cx"> <div id="message" class="info">
</span><span class="cx"> <p><?php _e( 'Sorry, there were no forum topics found.', 'buddypress' ) ?></p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<?php endif;?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php endif;?>
+
+<?php do_action( 'bp_after_forums_loop' ) ?>
</ins></span></pre></div>
<a id="branches12bpthemesbpdefaultgroupsgroupsloopphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/groups/groups-loop.php (3221 => 3222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/groups/groups-loop.php 2010-08-28 23:59:16 UTC (rev 3221)
+++ branches/1.2/bp-themes/bp-default/groups/groups-loop.php 2010-08-29 00:17:07 UTC (rev 3222)
</span><span class="lines">@@ -4,18 +4,20 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_has_groups( bp_ajax_querystring( 'groups' ) ) ) : ?>
</span><span class="cx">
</span><del>- <div class="pagination">
</del><ins>+ <div id="pag-top" class="pagination">
</ins><span class="cx">
</span><del>- <div class="pag-count" id="group-dir-count">
</del><ins>+ <div class="pag-count" id="group-dir-count-top">
</ins><span class="cx"> <?php bp_groups_pagination_count() ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="pagination-links" id="group-dir-pag">
</del><ins>+ <div class="pagination-links" id="group-dir-pag-top">
</ins><span class="cx"> <?php bp_groups_pagination_links() ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_groups_list' ) ?>
+
</ins><span class="cx"> <ul id="groups-list" class="item-list">
</span><span class="cx"> <?php while ( bp_groups() ) : bp_the_group(); ?>
</span><span class="cx">
</span><span class="lines">@@ -49,12 +51,26 @@
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx"> </ul>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_groups_loop' ) ?>
</del><ins>+ <?php do_action( 'bp_after_directory_groups_list' ) ?>
</ins><span class="cx">
</span><ins>+ <div id="pag-bottom" class="pagination">
+
+ <div class="pag-count" id="group-dir-count-bottom">
+ <?php bp_groups_pagination_count() ?>
+ </div>
+
+ <div class="pagination-links" id="group-dir-pag-bottom">
+ <?php bp_groups_pagination_links() ?>
+ </div>
+
+ </div>
+
</ins><span class="cx"> <?php else: ?>
</span><span class="cx">
</span><span class="cx"> <div id="message" class="info">
</span><span class="cx"> <p><?php _e( 'There were no groups found.', 'buddypress' ) ?></p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<?php endif; ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php endif; ?>
+
+<?php do_action( 'bp_after_groups_loop' ) ?>
</ins></span></pre></div>
<a id="branches12bpthemesbpdefaultmembersmembersloopphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/members/members-loop.php (3221 => 3222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/members/members-loop.php 2010-08-28 23:59:16 UTC (rev 3221)
+++ branches/1.2/bp-themes/bp-default/members/members-loop.php 2010-08-29 00:17:07 UTC (rev 3222)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_has_members( bp_ajax_querystring( 'members' ) ) ) : ?>
</span><span class="cx">
</span><del>- <div class="pagination">
</del><ins>+ <div id="pag-top" class="pagination">
</ins><span class="cx">
</span><del>- <div class="pag-count" id="member-dir-count">
</del><ins>+ <div class="pag-count" id="member-dir-count-top">
</ins><span class="cx"> <?php bp_members_pagination_count() ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="pagination-links" id="member-dir-pag">
</del><ins>+ <div class="pagination-links" id="member-dir-pag-top">
</ins><span class="cx"> <?php bp_members_pagination_links() ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -64,6 +64,18 @@
</span><span class="cx">
</span><span class="cx"> <?php bp_member_hidden_fields() ?>
</span><span class="cx">
</span><ins>+ <div id="pag-bottom" class="pagination">
+
+ <div class="pag-count" id="member-dir-count-bottom">
+ <?php bp_members_pagination_count() ?>
+ </div>
+
+ <div class="pagination-links" id="member-dir-pag-bottom">
+ <?php bp_members_pagination_links() ?>
+ </div>
+
+ </div>
+
</ins><span class="cx"> <?php else: ?>
</span><span class="cx">
</span><span class="cx"> <div id="message" class="info">
</span><span class="lines">@@ -72,4 +84,4 @@
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<?php do_action( 'bp_after_members_loop' ) ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php do_action( 'bp_after_members_loop' ) ?>
</ins></span></pre>
</div>
</div>
</body>
</html>