<!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" />
<title>[BuddyPress][4496] trunk/bp-themes/bp-default: Move next/previous page navigation links into a convenience function.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>4496</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-06-12 14:15:33 +0000 (Sun, 12 Jun 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move next/previous page navigation links into a convenience function. Props twentyeleven theme team for idea.
Also adds these navigation links to the top of the index template, to match archive and search templates.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultarchivephp">trunk/bp-themes/bp-default/archive.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
<li><a href="#trunkbpthemesbpdefaultindexphp">trunk/bp-themes/bp-default/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultsearchphp">trunk/bp-themes/bp-default/search.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefaultarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/archive.php (4495 => 4496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/archive.php        2011-06-12 14:04:48 UTC (rev 4495)
+++ trunk/bp-themes/bp-default/archive.php        2011-06-12 14:15:33 UTC (rev 4496)
</span><span class="lines">@@ -11,13 +11,8 @@
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php if ( have_posts() ) : ?&gt;
</span><span class="cx"> 
</span><del>-                                &lt;div id=&quot;nav-above&quot; class=&quot;navigation&quot;&gt;
</del><ins>+                                &lt;?php bp_dtheme_content_nav( 'nav-above' ); ?&gt;
</ins><span class="cx"> 
</span><del>-                                        &lt;div class=&quot;alignleft&quot;&gt;&lt;?php next_posts_link( __( '&amp;larr; Previous Entries', 'buddypress' ) ) ?&gt;&lt;/div&gt;
-                                        &lt;div class=&quot;alignright&quot;&gt;&lt;?php previous_posts_link( __( 'Next Entries &amp;rarr;', 'buddypress' ) ) ?&gt;&lt;/div&gt;
-
-                                &lt;/div&gt;
-
</del><span class="cx">                                 &lt;?php while (have_posts()) : the_post(); ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                         &lt;?php do_action( 'bp_before_blog_post' ) ?&gt;
</span><span class="lines">@@ -48,13 +43,8 @@
</span><span class="cx"> 
</span><span class="cx">                                 &lt;?php endwhile; ?&gt;
</span><span class="cx"> 
</span><del>-                                &lt;div id=&quot;nav-below&quot; class=&quot;navigation&quot;&gt;
</del><ins>+                                &lt;?php bp_dtheme_content_nav( 'nav-below' ); ?&gt;
</ins><span class="cx"> 
</span><del>-                                        &lt;div class=&quot;alignleft&quot;&gt;&lt;?php next_posts_link( __( '&amp;larr; Previous Entries', 'buddypress' ) ) ?&gt;&lt;/div&gt;
-                                        &lt;div class=&quot;alignright&quot;&gt;&lt;?php previous_posts_link( __( 'Next Entries &amp;rarr;', 'buddypress' ) ) ?&gt;&lt;/div&gt;
-
-                                &lt;/div&gt;
-
</del><span class="cx">                         &lt;?php else : ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                 &lt;h2 class=&quot;center&quot;&gt;&lt;?php _e( 'Not Found', 'buddypress' ) ?&gt;&lt;/h2&gt;
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (4495 => 4496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php        2011-06-12 14:04:48 UTC (rev 4495)
+++ trunk/bp-themes/bp-default/functions.php        2011-06-12 14:15:33 UTC (rev 4496)
</span><span class="lines">@@ -672,4 +672,22 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_sidebar_login_form', 'bp_dtheme_sidebar_login_redirect_to' );
</span><span class="cx"> endif;
</span><ins>+
+/**
+ * Display navigation to next/previous pages when applicable
+ *
+ * @global unknown $wp_query
+ * @param string $nav_id DOM ID for this navigation
+ * @since 1.3
+ */
+function bp_dtheme_content_nav( $nav_id ) {
+        global $wp_query;
+
+        if ( $wp_query-&gt;max_num_pages &gt; 1 ) : ?&gt;
+                &lt;div id=&quot;&lt;?php echo $nav_id; ?&gt;&quot; class=&quot;navigation&quot;&gt;
+                        &lt;div class=&quot;alignleft&quot;&gt;&lt;?php next_posts_link( __( '&amp;larr; Previous Entries', 'buddypress' ) ); ?&gt;&lt;/div&gt;
+                        &lt;div class=&quot;alignright&quot;&gt;&lt;?php previous_posts_link( __( 'Next Entries &amp;rarr;', 'buddypress' ) ); ?&gt;&lt;/div&gt;
+                &lt;/div&gt;&lt;!-- #&lt;?php echo $nav_id; ?&gt; --&gt;
+        &lt;?php endif;
+}
</ins><span class="cx"> ?&gt;
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/index.php (4495 => 4496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/index.php        2011-06-12 14:04:48 UTC (rev 4495)
+++ trunk/bp-themes/bp-default/index.php        2011-06-12 14:15:33 UTC (rev 4496)
</span><span class="lines">@@ -11,6 +11,8 @@
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php if ( have_posts() ) : ?&gt;
</span><span class="cx"> 
</span><ins>+                                &lt;?php bp_dtheme_content_nav( 'nav-above' ); ?&gt;
+
</ins><span class="cx">                                 &lt;?php while (have_posts()) : the_post(); ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                         &lt;?php do_action( 'bp_before_blog_post' ) ?&gt;
</span><span class="lines">@@ -41,13 +43,8 @@
</span><span class="cx"> 
</span><span class="cx">                                 &lt;?php endwhile; ?&gt;
</span><span class="cx"> 
</span><del>-                                &lt;div id=&quot;nav-below&quot; class=&quot;navigation&quot;&gt;
</del><ins>+                                &lt;?php bp_dtheme_content_nav( 'nav-below' ); ?&gt;
</ins><span class="cx"> 
</span><del>-                                        &lt;div class=&quot;alignleft&quot;&gt;&lt;?php next_posts_link( __( '&amp;larr; Previous Entries', 'buddypress' ) ) ?&gt;&lt;/div&gt;
-                                        &lt;div class=&quot;alignright&quot;&gt;&lt;?php previous_posts_link( __( 'Next Entries &amp;rarr;', 'buddypress' ) ) ?&gt;&lt;/div&gt;
-
-                                &lt;/div&gt;
-
</del><span class="cx">                         &lt;?php else : ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                 &lt;h2 class=&quot;center&quot;&gt;&lt;?php _e( 'Not Found', 'buddypress' ) ?&gt;&lt;/h2&gt;
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultsearchphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/search.php (4495 => 4496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/search.php        2011-06-12 14:04:48 UTC (rev 4495)
+++ trunk/bp-themes/bp-default/search.php        2011-06-12 14:15:33 UTC (rev 4496)
</span><span class="lines">@@ -13,10 +13,7 @@
</span><span class="cx"> 
</span><span class="cx">                                 &lt;h3 class=&quot;pagetitle&quot;&gt;&lt;?php _e( 'Search Results', 'buddypress' ) ?&gt;&lt;/h3&gt;
</span><span class="cx"> 
</span><del>-                                &lt;div id=&quot;nav-above&quot; class=&quot;navigation&quot;&gt;
-                                        &lt;div class=&quot;alignleft&quot;&gt;&lt;?php next_posts_link( __( '&amp;larr; Previous Entries', 'buddypress' ) ) ?&gt;&lt;/div&gt;
-                                        &lt;div class=&quot;alignright&quot;&gt;&lt;?php previous_posts_link( __( 'Next Entries &amp;rarr;', 'buddypress' ) ) ?&gt;&lt;/div&gt;
-                                &lt;/div&gt;
</del><ins>+                                &lt;?php bp_dtheme_content_nav( 'nav-above' ); ?&gt;
</ins><span class="cx"> 
</span><span class="cx">                                 &lt;?php while (have_posts()) : the_post(); ?&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -47,10 +44,7 @@
</span><span class="cx"> 
</span><span class="cx">                                 &lt;?php endwhile; ?&gt;
</span><span class="cx"> 
</span><del>-                                &lt;div id=&quot;nav-below&quot; class=&quot;navigation&quot;&gt;
-                                        &lt;div class=&quot;alignleft&quot;&gt;&lt;?php next_posts_link( __( '&amp;larr; Previous Entries', 'buddypress' ) ) ?&gt;&lt;/div&gt;
-                                        &lt;div class=&quot;alignright&quot;&gt;&lt;?php previous_posts_link( __( 'Next Entries &amp;rarr;', 'buddypress' ) ) ?&gt;&lt;/div&gt;
-                                &lt;/div&gt;
</del><ins>+                                &lt;?php bp_dtheme_content_nav( 'nav-below' ); ?&gt;
</ins><span class="cx"> 
</span><span class="cx">                         &lt;?php else : ?&gt;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>