<!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][12039] trunk/src/bp-templates/bp-nouveau: BP Nouveau: always include an invite screen to the Group create steps</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/12039">12039</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/12039","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>2018-05-02 16:46:28 +0000 (Wed, 02 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'>BP Nouveau: always include an invite screen to the Group create steps
As the Group Invites UI allows to invite friends or regular members, the Group create steps will include an invites screen even if the Friends component is not active.
Props hnla
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7781">#7781</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressgroupscreatephp">trunk/src/bp-templates/bp-nouveau/buddypress/groups/create.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesgroupsfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesgroupstemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludestemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/template-tags.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressgroupscreateinvitesphp">trunk/src/bp-templates/bp-nouveau/buddypress/groups/create-invites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaubuddypressgroupscreateinvitesphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/bp-templates/bp-nouveau/buddypress/groups/create-invites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/groups/create-invites.php 2018-05-02 16:18:33 UTC (rev 12038)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/groups/create-invites.php 2018-05-02 16:46:28 UTC (rev 12039)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,14 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
-* Group create step invite friends
-*
-* This template include provides the standard BP invites step screen content
-*
-* @since 3.0.0
-*/
-?>
-
-<?php bp_nouveau_user_feedback( 'create-invite-friends' ); ?>
-
-<?php
-bp_new_group_invite_friend_list( array( 'before' => '<ul class="friends-list create-group-invites">', 'after' => '</ul>' ) );
</del></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaubuddypressgroupscreatephp"></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/buddypress/groups/create.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/groups/create.php 2018-05-02 16:18:33 UTC (rev 12038)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/groups/create.php 2018-05-02 16:46:28 UTC (rev 12039)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bp_nouveau_groups_create_hook( 'before', 'content_template' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <form action="<?php bp_group_creation_form_action(); ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'group-invites' !== bp_get_groups_current_create_step() ) : ?>
+ <form action="<?php bp_group_creation_form_action(); ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
+ <?php else : ?>
+ <div id="create-group-form" class="standard-form">
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bp_nouveau_groups_create_hook( 'before' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +35,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bp_nouveau_groups_create_hook( 'after' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </form>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'group-invites' !== bp_get_groups_current_create_step() ) : ?>
+ </form><!-- #create-group-form -->
+ <?php else : ?>
+ </div><!-- #create-group-form -->
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bp_nouveau_groups_create_hook( 'after', 'content_template' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</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-02 16:18:33 UTC (rev 12038)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php 2018-05-02 16:46:28 UTC (rev 12039)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1066,11 +1066,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_nouveau_group_get_core_create_screens( $id = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // screen id => dynamic part of the hooks, nonce & specific template to use.
</span><span class="cx" style="display: block; padding: 0 10px"> $screens = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'group-details' => array( 'hook' => 'group_details_creation_step', 'nonce' => 'groups_create_save_group-details', 'template' => 'groups/single/admin/edit-details' ),
- 'group-settings' => array( 'hook' => 'group_settings_creation_step', 'nonce' => 'groups_create_save_group-settings', ),
- 'group-avatar' => array( 'hook' => 'group_avatar_creation_step', 'nonce' => 'groups_create_save_group-avatar', ),
- 'group-cover-image' => array( 'hook' => 'group_cover_image_creation_step', 'nonce' => 'groups_create_save_group-cover-image', ),
- 'group-invites' => array( 'hook' => 'group_invites_creation_step', 'nonce' => 'groups_create_save_group-invites', 'template' => 'groups/create-invites' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'group-details' => array(
+ 'hook' => 'group_details_creation_step',
+ 'nonce' => 'groups_create_save_group-details',
+ 'template' => 'groups/single/admin/edit-details',
+ ),
+ 'group-settings' => array(
+ 'hook' => 'group_settings_creation_step',
+ 'nonce' => 'groups_create_save_group-settings',
+ ),
+ 'group-avatar' => array(
+ 'hook' => 'group_avatar_creation_step',
+ 'nonce' => 'groups_create_save_group-avatar',
+ ),
+ 'group-cover-image' => array(
+ 'hook' => 'group_cover_image_creation_step',
+ 'nonce' => 'groups_create_save_group-cover-image',
+ ),
+ 'group-invites' => array(
+ 'hook' => 'group_invites_creation_step',
+ 'nonce' => 'groups_create_save_group-invites',
+ 'template' => 'common/js-templates/invites/index',
+ ),
</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"> if ( isset( $screens[ $id ] ) ) {
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesgroupstemplatetagsphp"></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/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/groups/template-tags.php 2018-05-02 16:18:33 UTC (rev 12038)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php 2018-05-02 16:46:28 UTC (rev 12039)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,8 +356,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- wp_nonce_field( $core_screen['nonce'] );
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,6 +411,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_after_group_creation_step_buttons' );
</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">+ /**
+ * Avoid nested forms with the Backbone views for the group invites step.
+ */
+ if ( 'group-invites' === bp_get_groups_current_create_step() ) {
+ printf(
+ '<form action="%s" method="post" enctype="multipart/form-data">',
+ bp_get_group_creation_form_action()
+ );
+ }
+
+ if ( ! empty( $core_screen['nonce'] ) ) {
+ wp_nonce_field( $core_screen['nonce'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<input type="hidden" name="group-id" id="group-id" value="%s" />',
</span><span class="cx" style="display: block; padding: 0 10px"> $is_group_create ? esc_attr( bp_get_new_group_id() ) : esc_attr( bp_get_group_id() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,6 +449,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_directory_groups_content' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Avoid nested forms with the Backbone views for the group invites step.
+ */
+ if ( 'group-invites' === bp_get_groups_current_create_step() ) {
+ echo '</form>';
+ }
</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="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 2018-05-02 16:18:33 UTC (rev 12038)
+++ trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2018-05-02 16:46:28 UTC (rev 12039)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1593,7 +1593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'group-subnav';
</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">- if ( bp_is_group() && 'send-invites' === bp_current_action() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( bp_is_group() && 'send-invites' === bp_current_action() ) || ( bp_is_group_create() && 'group-invites' === bp_get_groups_current_create_step() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'bp-invites-nav';
</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>