<!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][12537] trunk/src/bp-templates/bp-nouveau: Add a new customizer setting to adapt BP Layout to wide alignments</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/12537">12537</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/12537","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-01-25 06:38:57 +0000 (Sat, 25 Jan 2020)</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'>Add a new customizer setting to adapt BP Layout to wide alignments
The blocks editor introduced the `align-wide` theme feature. For themes supporting this feature, the BP Nouveau template pack will now use the wide alignment to display its content by default. To manage this space use, BP Nouveau also includes a new customizer setting to edit this alignement into the BP Nouveau > General BP Settings section.
Props pooja1210
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8182">#8182</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaucommonstyles_bp_generic_and_typographyscss">trunk/src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaucssbuddypressrtlcss">trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaucssbuddypresscss">trunk/src/bp-templates/bp-nouveau/css/buddypress.css</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludescustomizerphp">trunk/src/bp-templates/bp-nouveau/includes/customizer.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludestemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaucommonstyles_bp_generic_and_typographyscss"></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/common-styles/_bp_generic_and_typography.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss 2020-01-25 06:18:04 UTC (rev 12536)
+++ trunk/src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss 2020-01-25 06:38:57 UTC (rev 12537)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,13 +64,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .entry-header {
</span><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- max-width: none;
</del><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">- .entry-content,
- .entry .entry-content > * {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .entry-content {
</ins><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- max-width: none;
</del><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"> // 2017 has a very large top padding we'll reduce that for bp screens
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaucssbuddypressrtlcss"></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/css/buddypress-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css 2020-01-25 06:18:04 UTC (rev 12536)
+++ trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css 2020-01-25 06:38:57 UTC (rev 12537)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,12 +89,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> body.buddypress .entry-header {
</span><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- max-width: none;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body.buddypress .entry-content,
- body.buddypress .entry .entry-content > * {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ body.buddypress .entry-content {
</ins><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- max-width: none;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> body.buddypress .site-content {
</span><span class="cx" style="display: block; padding: 0 10px"> padding-top: 2.5em;
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaucssbuddypresscss"></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/css/buddypress.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/css/buddypress.css 2020-01-25 06:18:04 UTC (rev 12536)
+++ trunk/src/bp-templates/bp-nouveau/css/buddypress.css 2020-01-25 06:38:57 UTC (rev 12537)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,12 +89,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> body.buddypress .entry-header {
</span><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- max-width: none;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body.buddypress .entry-content,
- body.buddypress .entry .entry-content > * {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ body.buddypress .entry-content {
</ins><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- max-width: none;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> body.buddypress .site-content {
</span><span class="cx" style="display: block; padding: 0 10px"> padding-top: 2.5em;
</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 2020-01-25 06:18:04 UTC (rev 12536)
+++ trunk/src/bp-templates/bp-nouveau/includes/customizer.php 2020-01-25 06:38:57 UTC (rev 12537)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,6 +202,16 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_theme_supports( 'align-wide' ) ) {
+ $settings['bp_nouveau_appearance[global_alignment]'] = array(
+ 'index' => 'global_alignment',
+ 'capability' => 'bp_moderate',
+ 'sanitize_callback' => 'sanitize_html_class',
+ 'transport' => 'refresh',
+ 'type' => 'option',
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add the settings
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $settings as $id_setting => $setting_args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,6 +306,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $controls = apply_filters( 'bp_nouveau_customizer_controls', $controls );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_theme_supports( 'align-wide' ) ) {
+ $controls['global_alignment'] = array(
+ 'label' => __( 'Select the BuddyPress container width for your site.', 'buddypress' ),
+ 'section' => 'bp_nouveau_general_settings',
+ 'settings' => 'bp_nouveau_appearance[global_alignment]',
+ 'type' => 'select',
+ 'choices' => array(
+ 'alignnone' => __( 'Default width', 'buddypress' ),
+ 'alignwide' => __( 'Wide width', 'buddypress' ),
+ 'alignfull' => __( 'Full width', 'buddypress' ),
+ ),
+ );
+ }
+
</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="trunksrcbptemplatesbpnouveauincludesfunctionsphp"></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/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/functions.php 2020-01-25 06:18:04 UTC (rev 12536)
+++ trunk/src/bp-templates/bp-nouveau/includes/functions.php 2020-01-25 06:38:57 UTC (rev 12537)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,6 +625,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_nouveau_get_appearance_settings( $option = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $default_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'avatar_style' => 0,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'global_alignment' => 'alignwide',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_front_page' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_front_bio' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_nav_display' => 0, // O is default (horizontally). 1 is vertically.
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludestemplatetagsphp"></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/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2020-01-25 06:18:04 UTC (rev 12536)
+++ trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2020-01-25 06:38:57 UTC (rev 12537)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1489,6 +1489,11 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $global_alignment = bp_nouveau_get_temporary_setting( 'global_alignment', bp_nouveau_get_appearance_settings( 'global_alignment' ) );
+ if ( $global_alignment && 'alignnone' !== $global_alignment && current_theme_supports( 'align-wide' ) ) {
+ $classes[] = $global_alignment;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = array_map( 'sanitize_html_class', $classes );
</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>