summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-23 03:49:56 +0100
committerEvan Prodromou <evan@controlyourself.ca>2009-01-23 03:49:56 +0100
commiteb156741f83cb2beab1d02007ad4a3b440a5189a (patch)
treef4e200b8b2286d6fa0554fbbabd1994cfa7a55fe
parent4bd3eae79dec8fb99602a7a1aef0e96c17972778 (diff)
parent0905586355a4e3a8c924ab8dfb5e89818b6e6270 (diff)
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
-rw-r--r--js/util.js18
-rw-r--r--lib/noticelist.php8
-rw-r--r--theme/identica/css/display.css2
3 files changed, 23 insertions, 5 deletions
diff --git a/js/util.js b/js/util.js
index de486cf74..6ca5f8cbc 100644
--- a/js/util.js
+++ b/js/util.js
@@ -176,6 +176,7 @@ $(document).ready(function(){
counter();
$("#notices_primary .notice:first").css({display:"none"});
$("#notices_primary .notice:first").fadeIn(2500);
+ NoticeHover();
}
$("#notice_action-submit").removeAttr("disabled");
$("#notice_action-submit").removeClass("disabled");
@@ -184,6 +185,19 @@ $(document).ready(function(){
$("#form_notice").ajaxForm(PostNotice);
$("#form_notice").each(addAjaxHidden);
+ NoticeHover();
+
+ $('#content .notice').each(function() {
+ var notice = $(this);
+ $('.notice_reply', $(this)).click(function() {
+ var nickname = ($('.author .nickname', notice).length > 0) ? $('.author .nickname', notice) : $('.author .nickname');
+ NoticeReply(nickname.text(), $('.notice_id', notice).text());
+ return false;
+ });
+ });
+});
+
+function NoticeHover() {
$("#content .notice").hover(
function () {
$(this).addClass('hover');
@@ -192,9 +206,9 @@ $(document).ready(function(){
$(this).removeClass('hover');
}
);
-});
+}
-function doreply(nick,id) {
+function NoticeReply(nick,id) {
rgx_username = /^[0-9a-zA-Z\-_.]*$/;
if (nick.match(rgx_username)) {
replyto = "@" + nick + " ";
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 07912c552..8b0c5f322 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -22,6 +22,7 @@
* @category UI
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
* @copyright 2008 Control Yourself, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://laconi.ca/
@@ -440,8 +441,11 @@ class NoticeListItem extends Widget
$this->out->elementStart('dl', 'notice_reply');
$this->out->element('dt', null, _('Reply to this notice'));
$this->out->elementStart('dd');
- $this->out->element('a', array('href' => $reply_url,
- 'title' => _('Reply to this notice')), _('Reply'));
+ $this->out->elementStart('a', array('href' => $reply_url,
+ 'title' => _('Reply to this notice')));
+ $this->out->text(_('Reply'));
+ $this->out->element('span', 'notice_id', $this->notice->id);
+ $this->out->elementEnd('a');
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index dd623b217..62086d74e 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -62,7 +62,7 @@ border-top-color:#97BFD1;
#content .notice p.entry-content a:visited {
background-color:#fcfcfc;
}
-.notice p.entry-content .vcard a {
+#content .notice p.entry-content .vcard a {
background-color:#fcfffc;
}