<!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][12059] trunk/src/bp-templates/bp-nouveau: BP Nouveau: avoid empty links in the Group Invites UI</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/12059">12059</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/12059","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-05 06:32:09 +0000 (Sat, 05 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: avoid empty links in the Group Invites UI
See <a href="http://buddypress.trac.wordpress.org/ticket/7794">#7794</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesinvitesindexphp">trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesgroupsfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaujsbuddypressgroupinvitesjs">trunk/src/bp-templates/bp-nouveau/js/buddypress-group-invites.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesinvitesindexphp"></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/common/js-templates/invites/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php 2018-05-05 06:21:08 UTC (rev 12058)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php 2018-05-05 06:32:09 UTC (rev 12059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,8 +88,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-bp-invites-selection">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="#" title="{{data.name}}">
- <img src="{{data.avatar}}" class="avatar" alt="{{data.name}}" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="#uninvite-user-{{data.id}}" title="{{data.name}}">
+ <img src="{{data.avatar}}" class="avatar" title="{{data.name}}"/>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</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-05 06:21:08 UTC (rev 12058)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php 2018-05-05 06:32:09 UTC (rev 12059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,13 +112,32 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Init the Group invites nav
</span><span class="cx" style="display: block; padding: 0 10px"> $invites_nav = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'members' => array( 'id' => 'members', 'caption' => __( 'All Members', 'buddypress' ), 'order' => 5 ),
- 'invited' => array( 'id' => 'invited', 'caption' => __( 'Pending Invites', 'buddypress' ), 'order' => 90, 'hide' => (int) ! $show_pending ),
- 'invites' => array( 'id' => 'invites', 'caption' => __( 'Send Invites', 'buddypress' ), 'order' => 100, 'hide' => 1 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'members' => array(
+ 'id' => 'members',
+ 'caption' => __( 'All Members', 'buddypress' ),
+ 'order' => 5,
+ ),
+ 'invited' => array(
+ 'id' => 'invited',
+ 'caption' => __( 'Pending Invites', 'buddypress' ),
+ 'order' => 90,
+ 'hide' => (int) ! $show_pending,
+ ),
+ 'invites' => array(
+ 'id' => 'invites',
+ 'caption' => __( 'Send Invites', 'buddypress' ),
+ 'order' => 100,
+ 'hide' => 1,
+ 'href' => '#send-invites-editor',
+ ),
</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 ( bp_is_active( 'friends' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $invites_nav['friends'] = array( 'id' => 'friends', 'caption' => __( 'My Friends', 'buddypress' ), 'order' => 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $invites_nav['friends'] = array(
+ 'id' => 'friends',
+ 'caption' => __( 'My Friends', 'buddypress' ),
+ 'order' => 0,
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true === bp_nouveau_groups_disallow_all_members_invites() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $invites_nav['members'] );
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaujsbuddypressgroupinvitesjs"></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/js/buddypress-group-invites.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/js/buddypress-group-invites.js 2018-05-05 06:21:08 UTC (rev 12058)
+++ trunk/src/bp-templates/bp-nouveau/js/buddypress-group-invites.js 2018-05-05 06:32:09 UTC (rev 12059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.navItems.add( {
</span><span class="cx" style="display: block; padding: 0 10px"> id : item.id,
</span><span class="cx" style="display: block; padding: 0 10px"> name : item.caption,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- href : '#',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ href : item.href || '#members-list',
</ins><span class="cx" style="display: block; padding: 0 10px"> active : activeView,
</span><span class="cx" style="display: block; padding: 0 10px"> hide : _.isUndefined( item.hide ) ? 0 : item.hide
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -806,6 +806,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.model.on( 'change:selected', this.removeView, this );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.el.id = 'uninvite-user-' + this.model.get( 'id' );
</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"> removeSelection: function( event ) {
</span></span></pre>
</div>
</div>
</body>
</html>