From ac55efeecfb4c95ddd808c70edc6f1ec62218930 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 30 May 2011 16:20:34 -0400 Subject: [PATCH 1/6] Don't show empty addressees in noticelistitem --- lib/noticelistitem.php | 64 ++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php index 2d41e53017..b56cd28092 100644 --- a/lib/noticelistitem.php +++ b/lib/noticelistitem.php @@ -229,31 +229,44 @@ class NoticeListItem extends Widget function showAddressees() { - $this->out->elementStart('span', 'addressees'); + $ga = $this->getGroupAddressees(); + $pa = $this->getProfileAddressees(); - $cnt = $this->showGroupAddressees(true); - $cnt = $this->showProfileAddressees($cnt == 0); + $a = array_merge($ga, $pa); - $this->out->elementEnd('span', 'addressees'); + if (!empty($a)) { + $this->out->elementStart('span', 'addressees'); + $first = true; + foreach ($a as $addr) { + if (!$first) { + // TRANS: Separator in profile addressees list. + $this->out->text(_m('SEPARATOR',', ')); + } else { + // TRANS: Start of profile addressees list. + $first = false; + } + $text = $addr['text']; + unset($addr['text']); + $this->out->element('a', $addr, $text); + } + $this->out->elementEnd('span', 'addressees'); + } } - function showGroupAddressees($first) + function getGroupAddressees() { + $ga = array(); + $groups = $this->getGroups(); foreach ($groups as $group) { - if (!$first) { - $this->out->text( _m('SEPARATOR',', ')); - } else { - $first = false; - } - $this->out->element('a', array('href' => $group->homeUrl(), - 'title' => $group->nickname, - 'class' => 'addressee group'), - $group->getBestName()); + $ga[] = array('href' => $group->homeUrl(), + 'title' => $group->nickname, + 'class' => 'addressee group', + 'text' => $group->getBestName()); } - return count($groups); + return $ga; } function getGroups() @@ -261,25 +274,20 @@ class NoticeListItem extends Widget return $this->notice->getGroups(); } - function showProfileAddressees($first) + function getProfileAddressees() { + $pa = array(); + $replies = $this->getReplyProfiles(); foreach ($replies as $reply) { - if (!$first) { - // TRANS: Separator in profile addressees list. - $this->out->text(_m('SEPARATOR',', ')); - } else { - // TRANS: Start of profile addressees list. - $first = false; - } - $this->out->element('a', array('href' => $reply->profileurl, - 'title' => $reply->nickname, - 'class' => 'addressee account'), - $reply->getBestName()); + $pa[] = array('href' => $reply->profileurl, + 'title' => $reply->nickname, + 'class' => 'addressee account', + 'text' => $reply->getBestName()); } - return count($replies); + return $pa; } function getReplyProfiles() From a0266089538e9f07528210a7d1ab39028e8558c3 Mon Sep 17 00:00:00 2001 From: Samantha Doherty Date: Tue, 31 May 2011 12:14:26 -0400 Subject: [PATCH 2/6] Only use mobile doctype on actual mobile devices. --- plugins/MobileProfile/MobileProfilePlugin.php | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 196a262095..e149573e88 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -49,6 +49,7 @@ class MobileProfilePlugin extends WAP20Plugin { public $DTD = null; public $serveMobile = false; + public $reallyMobile = false; public $mobileFeatures = array(); function __construct($DTD='http://www.wapforum.org/DTD/xhtml-mobile10.dtd') @@ -160,6 +161,7 @@ class MobileProfilePlugin extends WAP20Plugin $this->setMobileFeatures($httpuseragent); $this->serveMobile = true; + $this->reallyMobile = true; break; } } @@ -201,21 +203,28 @@ class MobileProfilePlugin extends WAP20Plugin header('Content-Type: '.$type); - $action->extraHeaders(); - if (preg_match("/.*\/.*xml/", $type)) { - // Required for XML documents - $action->xw->startDocument('1.0', 'UTF-8'); - } - $action->xw->writeDTD('html', - '-//WAPFORUM//DTD XHTML Mobile 1.0//EN', - $this->DTD); + if ($this->reallyMobile) { - $language = $action->getLanguage(); + $action->extraHeaders(); + if (preg_match("/.*\/.*xml/", $type)) { + // Required for XML documents + $action->xw->startDocument('1.0', 'UTF-8'); + } + $action->xw->writeDTD('html', + '-//WAPFORUM//DTD XHTML Mobile 1.0//EN', + $this->DTD); - $action->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml', + $language = $action->getLanguage(); + + $action->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml', 'xml:lang' => $language)); - return false; + return false; + + } else { + return true; + } + } function setMobileFeatures($useragent) From dddb6185f3bd29a7da20c0338e0df85409e3698b Mon Sep 17 00:00:00 2001 From: Samantha Doherty Date: Tue, 31 May 2011 12:42:28 -0400 Subject: [PATCH 3/6] Last bit of style cleanup for addressees and mobile profile. --- theme/base/css/display.css | 4 ---- theme/base/css/ie.css | 9 +++++++++ theme/base/images/icons/arrow_right.png | Bin 0 -> 182 bytes theme/neo/css/mp-screen.css | 4 ---- 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 theme/base/images/icons/arrow_right.png diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 6ae14d2c7d..40656b7cf9 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -418,10 +418,6 @@ address .poweredby { content: '\25B8'; } -.notice .addressees:empty:before { - content: none; -} - .fn { overflow: hidden; } diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index a1144b489b..337d96e7df 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -99,12 +99,21 @@ line-height:auto; filter: alpha(opacity=0); } +.notice .addressees:before { + content: '\003E'; +} + /* IE7 */ *+html .input_forms { margin-bottom: -20px; } +.notice .addressees { + background: url(../images/icons/arrow_right.png) no-repeat top left; + padding-left: 16px; +} + /* IE6 */ #content { diff --git a/theme/base/images/icons/arrow_right.png b/theme/base/images/icons/arrow_right.png new file mode 100644 index 0000000000000000000000000000000000000000..cefa7c2c7aa272f2399c4fd7c1adaa243d7cd520 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|3OrpLLo80e zy=2JM93as0&_9>&{w>XHo>9u&|%bE8j9=VHT`g0GkCiCxvX Date: Tue, 31 May 2011 12:48:59 -0400 Subject: [PATCH 4/6] Oops; tiny mistake in IE7 addressee stylin. --- theme/base/css/ie.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index 337d96e7df..c6ddbac654 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -109,7 +109,7 @@ line-height:auto; margin-bottom: -20px; } -.notice .addressees { +*+html .notice .addressees { background: url(../images/icons/arrow_right.png) no-repeat top left; padding-left: 16px; } From 712ba64fa6a4e862a0ceaf945482f568db7271ab Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 31 May 2011 11:46:50 -0700 Subject: [PATCH 5/6] Apply upstream fix to MSN library for darkip Upstream fix http://code.google.com/p/phpmsnclass/source/diff?spec=svn52&old=47&r=52&format=unidiff&path=%2Ftrunk%2Fphpmsnclassv2%2Fmsn.class.php --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 3d10c25b2c..5675eb5c2f 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -2973,7 +2973,7 @@ X-OIM-Sequence-Num: 1 // t=tick&p= // binary secret // RST2: messenger.msn.com - // t=tick + // t=tick // RST3: contacts.msn.com // t=tick&p= // RST4: messengersecure.live.com @@ -2985,7 +2985,7 @@ X-OIM-Sequence-Num: 1 preg_match("#". "(.*)(.*)". "(.*)(.*)". - "(.*)(.*)". + "(.*)(.*)". "(.*)(.*)". "(.*)(.*)". "(.*)(.*)". From 60a1b0a15acad9688777d751a002d4861ae07ae3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 31 May 2011 17:00:23 -0400 Subject: [PATCH 6/6] Change 'listening to your notices' to 'following you' --- lib/mail.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/mail.php b/lib/mail.php index eaef2285b5..6c6450ab50 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -240,14 +240,13 @@ function mail_subscribe_notify_profile($listenee, $other) $headers['To'] = $name . ' <' . $listenee->email . '>'; // TRANS: Subject of new-subscriber notification e-mail. // TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename. - $headers['Subject'] = sprintf(_('%1$s is now listening to '. - 'your notices on %2$s.'), + $headers['Subject'] = sprintf(_('%1$s is now following you on %2$s.'), $other->getBestName(), common_config('site', 'name')); // TRANS: Main body of new-subscriber notification e-mail. // TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename. - $body = sprintf(_('%1$s is now listening to your notices on %2$s.'), + $body = sprintf(_('%1$s is now following you on %2$s.'), $long_name, common_config('site', 'name')) . mail_profile_block($other) .