<!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>[3883] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums: Forums Theme: Simplify view stack for easier display.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3883">3883</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3883","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jmdodd</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-30 18:27:46 +0000 (Tue, 30 Aug 2016)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Forums Theme: Simplify view stack for easier display.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumspagehomepagephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-homepage.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php    2016-08-30 18:26:52 UTC (rev 3882)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php      2016-08-30 18:27:46 UTC (rev 3883)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,20 +88,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Register these bbPress views:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *  View: All Topics
- *  @ToDo View: Not Resolved
- *  @ToDo View: modlook
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *  View: All topics
+ *  View: Tagged modlook
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @uses bbp_register_view() To register the view
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_support_custom_views() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        bbp_register_view( 'all-topics', __( 'All Topics', 'wporg-forums' ), array( 'order' => 'DESC' ), false );
-//     bbp_register_view( 'support-forum-no', __( 'Not Resolved', 'wporg-forums' ), array( 'post_status' => 'closed' ), false );
-//     bbp_register_view( 'taggedmodlook', __( 'Tagged modlook', 'wporg-forums' ), array( 'topic-tag' => 'modlook' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_register_view( 'all-topics', __( 'All topics', 'wporg-forums' ), array( 'order' => 'DESC' ), false );
+       if ( get_current_user_id() && current_user_can( 'moderate' ) ) {
+               bbp_register_view( 'taggedmodlook', __( 'Tagged modlook', 'wporg-forums' ), array( 'topic-tag' => 'modlook' ) );
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bbp_register_views', 'wporg_support_custom_views' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Display an ordered list of bbPress views
+ */
+function wporg_support_get_views() {
+       $all = bbp_get_views();
+       $ordered = array(
+               'all-topics',
+               'no-replies',
+               'support-forum-no',
+               'taggedmodlook',
+       );
+       $found = array();
+       foreach ( $ordered as $view ) {
+               if ( array_key_exists( $view, $all ) ) {
+                       $found[] = $view;
+               }
+       }
+       $view_iterator = 0;
+       $view_count    = count( $found );
+
+       foreach ( $found as $view ) : $view_iterator++; ?>
+
+               <li class="view"><a href="<?php bbp_view_url( $view ); ?>"><?php bbp_view_title( $view ); ?></a></li>
+
+               <?php if ( $view_iterator < $view_count ) : ?>|<?php endif; ?>
+
+       <?php endforeach;
+
+       // Unset variables
+       unset( $view_count, $view_iterator, $view, $found, $all, $ordered );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px">  * Custom Body Classes
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @uses get_body_class() To add the `wporg-support` class
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumspagehomepagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-homepage.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-homepage.php        2016-08-30 18:26:52 UTC (rev 3882)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-homepage.php  2016-08-30 18:27:46 UTC (rev 3883)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,23 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div id="viewdiv">
</span><span class="cx" style="display: block; padding: 0 10px">                                <ul id="views">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-                                       <?php
-                                       $view_iterator = 0;
-                                       $topic_views   = array_keys( array_reverse( bbp_get_views() ) );
-                                       $view_count    = count( $topic_views );
-
-                                       foreach ( $topic_views as $view ) : $view_iterator++; ?>
-
-                                               <li class="view"><a href="<?php bbp_view_url( $view ); ?>"><?php bbp_view_title( $view ); ?></a></li>
-
-                                               <?php if ( $view_iterator < $view_count ) : ?>|<?php endif; ?>
-
-                                       <?php endforeach;
-
-                                       // Unset variables
-                                       unset( $view_count, $topic_views ); ?>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php wporg_support_get_views(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                 </ul>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- #viewdiv -->
</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- #col-6 -->
</span></span></pre>
</div>
</div>

</body>
</html>