<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2354] trunk/bp-themes/bp-default/_inc:
Fixes #1556 - missing comment delete ajax loader.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2354</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-19 11:57:47 +0000 (Tue, 19 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1556 - missing comment delete ajax loader.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (2353 => 2354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-19 11:40:44 UTC (rev 2353)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-19 11:57:47 UTC (rev 2354)
</span><span class="lines">@@ -130,9 +130,7 @@
</span><span class="cx"> <div class="acomment-meta">
</span><span class="cx"> <?php echo bp_core_get_userlink( $bp->loggedin_user->id ) ?> &middot; <?php echo bp_core_time_since( time() ) ?> &middot;
</span><span class="cx"> <a class="acomment-reply" href="#acomment-<?php echo $comment_id ?>" id="acomment-reply-<?php echo attribute_escape( $_POST['form_id'] ) ?>"><?php _e( 'Reply', 'buddypress' ) ?></a>
</span><del>- <?php if ( is_site_admin() || $bp->loggedin_user->id == $comment->user_id ) : ?>
- &middot; <a href="<?php echo wp_nonce_url( $bp->activity->id . '/delete/?cid=' . $comment_id, 'delete_activity_comment' ) ?>" class="delete acomment-delete"><?php _e( 'Delete', 'buddypress' ) ?></a>
- <?php endif; ?>
</del><ins>+ &middot; <a href="<?php echo wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/' . $comment_id, 'bp_activity_delete_link' ) ?>" class="item-button delete-activity confirm"><?php _e( 'Delete', 'buddypress' ) ?></a>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="acomment-content">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2353 => 2354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-19 11:40:44 UTC (rev 2353)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-19 11:57:47 UTC (rev 2354)
</span><span class="lines">@@ -52,12 +52,6 @@
</span><span class="cx"> border: 2px solid #eee;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.ajax-loader {
- background: url( ../images/ajax-loader.gif ) center left no-repeat !important;
- padding: 8px;
- display: none;
-}
-
</del><span class="cx"> /* > Admin Bar
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="lines">@@ -609,6 +603,22 @@
</span><span class="cx"> margin: 0 0 10px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* > AJAX Loaders
+-------------------------------------------------------------- */
+
+.ajax-loader {
+ background: url( ../images/ajax-loader.gif ) center left no-repeat !important;
+ padding: 8px;
+ display: none;
+}
+
+a.loading {
+ background-image: url( ../images/ajax-loader.gif );
+ background-position: 95% 50%;
+ padding-right: 25px;
+ background-repeat: no-repeat;
+}
+
</ins><span class="cx"> /* > Buttons
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="lines">@@ -1171,13 +1181,6 @@
</span><span class="cx"> border-radius: 4px;
</span><span class="cx"> margin-right: 3px;
</span><span class="cx"> }
</span><del>- .activity-list div.activity-meta a.loading {
- background-image: url( ../images/ajax-loader.gif );
- background-position: 95% 50%;
- padding-right: 25px;
- background-repeat: no-repeat;
- }
-
</del><span class="cx"> .activity-list div.activity-meta a.acomment-reply {
</span><span class="cx"> background: #FFF9DB;
</span><span class="cx"> border-bottom: 1px solid #FFE8C4;
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2353 => 2354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-01-19 11:40:44 UTC (rev 2353)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-01-19 11:57:47 UTC (rev 2354)
</span><span class="lines">@@ -389,6 +389,8 @@
</span><span class="cx"> comment_id = comment_id[1].split('&');
</span><span class="cx"> comment_id = comment_id[0];
</span><span class="cx">
</span><ins>+ target.addClass('loading');
+
</ins><span class="cx"> /* Remove any error messages */
</span><span class="cx"> j('div.activity-comments ul div.error').remove();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>