<!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][12048] trunk/src/bp-templates/bp-nouveau/includes: Nouveau: Don't add customizer controls/settings for inactive components.</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 { white-space: pre-line; 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://buddypress.trac.wordpress.org/changeset/12048">12048</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12048","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-05-03 16:29:34 +0000 (Thu, 03 May 2018)</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'>Nouveau: Don't add customizer controls/settings for inactive components.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7802">#7802</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveauincludesactivityfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesactivityloaderphp">trunk/src/bp-templates/bp-nouveau/includes/activity/loader.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesblogsfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/blogs/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludescustomizerphp">trunk/src/bp-templates/bp-nouveau/includes/customizer.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesgroupsfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveauincludesactivityfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php 2018-05-03 16:14:41 UTC (rev 12047)
+++ trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php 2018-05-03 16:29:34 UTC (rev 12048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,3 +499,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bp_nouveau_notifications_register_filter( $notification );
</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">+
+/**
+ * Add controls for the settings of the customizer for the activity component.
+ *
+ * @since 3.0.0
+ *
+ * @param array $controls Optional. The controls to add.
+ *
+ * @return array the controls to add.
+ */
+function bp_nouveau_activity_customizer_controls( $controls = array() ) {
+ return array_merge( $controls, array(
+ 'act_dir_layout' => array(
+ 'label' => __( 'Use column navigation for the Activity directory.', 'buddypress' ),
+ 'section' => 'bp_nouveau_dir_layout',
+ 'settings' => 'bp_nouveau_appearance[activity_dir_layout]',
+ 'type' => 'checkbox',
+ ),
+ 'act_dir_tabs' => array(
+ 'label' => __( 'Use tab styling for Activity directory navigation.', 'buddypress' ),
+ 'section' => 'bp_nouveau_dir_layout',
+ 'settings' => 'bp_nouveau_appearance[activity_dir_tabs]',
+ 'type' => 'checkbox',
+ ),
+ ) );
+}
</ins></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesactivityloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/activity/loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/activity/loader.php 2018-05-03 16:14:41 UTC (rev 12047)
+++ trunk/src/bp-templates/bp-nouveau/includes/activity/loader.php 2018-05-03 16:29:34 UTC (rev 12048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,6 +87,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function setup_filters() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register customizer controls.
+ add_filter( 'bp_nouveau_customizer_controls', 'bp_nouveau_activity_customizer_controls', 10, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Register activity scripts
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_nouveau_register_scripts', 'bp_nouveau_activity_register_scripts', 10, 1 );
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesblogsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/blogs/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/blogs/functions.php 2018-05-03 16:14:41 UTC (rev 12047)
+++ trunk/src/bp-templates/bp-nouveau/includes/blogs/functions.php 2018-05-03 16:29:34 UTC (rev 12048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,6 +170,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span><span class="cx" style="display: block; padding: 0 10px"> 'choices' => bp_nouveau_customizer_grid_choices(),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sites_dir_layout' => array(
+ 'label' => __( 'Use column navigation for the Sites directory.', 'buddypress' ),
+ 'section' => 'bp_nouveau_dir_layout',
+ 'settings' => 'bp_nouveau_appearance[sites_dir_layout]',
+ 'type' => 'checkbox',
+ ),
+ 'sites_dir_tabs' => array(
+ 'label' => __( 'Use tab styling for Sites directory navigation.', 'buddypress' ),
+ 'section' => 'bp_nouveau_dir_layout',
+ 'settings' => 'bp_nouveau_appearance[sites_dir_tabs]',
+ 'type' => 'checkbox',
+ ),
</ins><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">
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludescustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/customizer.php 2018-05-03 16:14:41 UTC (rev 12047)
+++ trunk/src/bp-templates/bp-nouveau/includes/customizer.php 2018-05-03 16:29:34 UTC (rev 12048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,13 +185,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'refresh',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'bp_nouveau_appearance[groups_dir_tabs]' => array(
- 'index' => 'groups_dir_tabs',
- 'capability' => 'bp_moderate',
- 'sanitize_callback' => 'absint',
- 'transport' => 'refresh',
- 'type' => 'option',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'bp_nouveau_appearance[sites_dir_layout]' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'index' => 'sites_dir_layout',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'bp_moderate',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,14 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting( $id_setting, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters the BuddyPress Nouveau customizer controls and their arguments.
- *
- * @since 3.0.0
- *
- * @param array $value Array of Customizer controls.
- */
- $controls = apply_filters( 'bp_nouveau_customizer_controls', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $controls = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'bp_site_avatars' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Use the round style for member and group avatars.', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'bp_nouveau_general_settings',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,13 +265,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span><span class="cx" style="display: block; padding: 0 10px"> 'choices' => bp_nouveau_customizer_grid_choices(),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'members_group_layout' => array(
- 'label' => __( 'Group > Members', 'buddypress' ),
- 'section' => 'bp_nouveau_loops_layout',
- 'settings' => 'bp_nouveau_appearance[members_group_layout]',
- 'type' => 'select',
- 'choices' => bp_nouveau_customizer_grid_choices(),
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'members_friends_layout' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Member > Friends', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'bp_nouveau_loops_layout',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,18 +272,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span><span class="cx" style="display: block; padding: 0 10px"> 'choices' => bp_nouveau_customizer_grid_choices(),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'act_dir_layout' => array(
- 'label' => __( 'Use column navigation for the Activity directory.', 'buddypress' ),
- 'section' => 'bp_nouveau_dir_layout',
- 'settings' => 'bp_nouveau_appearance[activity_dir_layout]',
- 'type' => 'checkbox',
- ),
- 'act_dir_tabs' => array(
- 'label' => __( 'Use tab styling for Activity directory navigation.', 'buddypress' ),
- 'section' => 'bp_nouveau_dir_layout',
- 'settings' => 'bp_nouveau_appearance[activity_dir_tabs]',
- 'type' => 'checkbox',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'members_dir_layout' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Use column navigation for the Members directory.', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'bp_nouveau_dir_layout',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,32 +284,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 'bp_nouveau_appearance[members_dir_tabs]',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'checkbox',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'group_dir_layout' => array(
- 'label' => __( 'Use column navigation for the Groups directory.', 'buddypress' ),
- 'section' => 'bp_nouveau_dir_layout',
- 'settings' => 'bp_nouveau_appearance[groups_dir_layout]',
- 'type' => 'checkbox',
- ),
- 'group_dir_tabs' => array(
- 'label' => __( 'Use tab styling for Groups directory navigation.', 'buddypress' ),
- 'section' => 'bp_nouveau_dir_layout',
- 'settings' => 'bp_nouveau_appearance[groups_dir_tabs]',
- 'type' => 'checkbox',
- ),
- 'sites_dir_layout' => array(
- 'label' => __( 'Use column navigation for the Sites directory.', 'buddypress' ),
- 'section' => 'bp_nouveau_dir_layout',
- 'settings' => 'bp_nouveau_appearance[sites_dir_layout]',
- 'type' => 'checkbox',
- ),
- 'sites_dir_tabs' => array(
- 'label' => __( 'Use tab styling for Sites directory navigation.', 'buddypress' ),
- 'section' => 'bp_nouveau_dir_layout',
- 'settings' => 'bp_nouveau_appearance[sites_dir_tabs]',
- 'type' => 'checkbox',
- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters the BuddyPress Nouveau customizer controls and their arguments.
+ *
+ * @since 3.0.0
+ *
+ * @param array $value Array of Customizer controls.
+ */
+ $controls = apply_filters( 'bp_nouveau_customizer_controls', $controls );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add the controls to the customizer's section
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $controls as $id_control => $control_args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $control_args['class'] ) ) {
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php 2018-05-03 16:14:41 UTC (rev 12047)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php 2018-05-03 16:29:34 UTC (rev 12048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -751,6 +751,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => 'refresh',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bp_nouveau_appearance[groups_dir_tabs]' => array(
+ 'index' => 'groups_dir_tabs',
+ 'capability' => 'bp_moderate',
+ 'sanitize_callback' => 'absint',
+ 'transport' => 'refresh',
+ 'type' => 'option',
+ ),
</ins><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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,6 +828,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span><span class="cx" style="display: block; padding: 0 10px"> 'choices' => bp_nouveau_customizer_grid_choices(),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'members_group_layout' => array(
+ 'label' => __( 'Group > Members', 'buddypress' ),
+ 'section' => 'bp_nouveau_loops_layout',
+ 'settings' => 'bp_nouveau_appearance[members_group_layout]',
+ 'type' => 'select',
+ 'choices' => bp_nouveau_customizer_grid_choices(),
+ ),
+ 'group_dir_layout' => array(
+ 'label' => __( 'Use column navigation for the Groups directory.', 'buddypress' ),
+ 'section' => 'bp_nouveau_dir_layout',
+ 'settings' => 'bp_nouveau_appearance[groups_dir_layout]',
+ 'type' => 'checkbox',
+ ),
+ 'group_dir_tabs' => array(
+ 'label' => __( 'Use tab styling for Groups directory navigation.', 'buddypress' ),
+ 'section' => 'bp_nouveau_dir_layout',
+ 'settings' => 'bp_nouveau_appearance[groups_dir_tabs]',
+ 'type' => 'checkbox',
+ ),
</ins><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">
</span></span></pre>
</div>
</div>
</body>
</html>