From 70f01b2b3409d801e35f9067256eef885b2143ec Mon Sep 17 00:00:00 2001 From: Samantha Doherty Date: Fri, 27 May 2011 11:50:49 -0400 Subject: [PATCH 1/6] Remove privacy checkbox replacement from Mobile Profile. --- plugins/MobileProfile/MobileProfilePlugin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 796bd3b529..196a262095 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -339,6 +339,7 @@ class MobileProfilePlugin extends WAP20Plugin $("#navtoggle").text( text == "Show Navigation" ? "Hide Navigation" : "Show Navigation"); }); + $(".checkbox-wrapper").unbind("click"); });' ); } From 1264db7f788e27f6f17edcda042b13a001972eea Mon Sep 17 00:00:00 2001 From: Samantha Doherty Date: Fri, 27 May 2011 12:07:24 -0400 Subject: [PATCH 2/6] A little more style fixing for MobileProfile. --- theme/neo/css/mp-screen.css | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/theme/neo/css/mp-screen.css b/theme/neo/css/mp-screen.css index 559e71ce00..0dabae74cd 100644 --- a/theme/neo/css/mp-screen.css +++ b/theme/neo/css/mp-screen.css @@ -120,6 +120,10 @@ address img + .fn { color: #333; font-size: 1em; margin-bottom: 0px; + background: none; + text-transform: none; + letter-spacing: 0; + padding-bottom: 0; } #site_nav_local_views li { @@ -240,6 +244,12 @@ address img + .fn { left: 270px; } +.form_notice .error, +.form_notice .success, +.form_notice .notice-status { + width: 285px; +} + /*input type=file no good in iPhone/iPod Touch, Android, Opera Mini Simulator @@ -254,6 +264,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator clear: left; float: left; width: 200px; + z-index: 2; } .form_notice .checkbox-wrapper { @@ -262,7 +273,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator } .checkbox-wrapper label.checkbox { - display: none; + display: none !important; } .checkbox-wrapper #notice_private { @@ -283,6 +294,10 @@ iPhone/iPod Touch, Android, Opera Mini Simulator width: 300px; } +.input_form .form_settings label { + display: inline; +} + .input_form .form_settings li input { width: 292px; } @@ -295,6 +310,11 @@ iPhone/iPod Touch, Android, Opera Mini Simulator display: none; } +#event-startdate, #event-starttime, #event-enddate, #event-endtime { + width: 120px; + margin-right: 12px; +} + .input_form .form_settings .submit { font-size: 1em; margin: 10px 0; @@ -305,7 +325,8 @@ iPhone/iPod Touch, Android, Opera Mini Simulator .form_notice #notice_action-submit { text-align: center; left: 0px; - top: 192px; + top: 100%; + margin-top: -45px; width: 80px; font-size: 1em; } @@ -406,8 +427,8 @@ margin-left:0 !important; content: '\003E'; } -.notice .addressees:empty:before { - content: none; +.notice .addressees:empty { + display: none; } .user_in .notice div.entry-content { @@ -426,6 +447,10 @@ ul.qna-dummy { width: 220px; } +.threaded-replies #answer-form fieldset { + width: 220px; +} + .threaded-replies #qna-answer-submit { float: left; clear: left; From 5a9d969f222a4982ee2f5c8089617b49a88916a1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 30 May 2011 11:22:36 -0400 Subject: [PATCH 3/6] use ReplyNoticeStream for replies page --- actions/replies.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/actions/replies.php b/actions/replies.php index 7ae2d0eb76..385ca4c6cc 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -85,8 +85,11 @@ class RepliesAction extends OwnerDesignAction common_set_returnto($this->selfUrl()); - $this->notice = $this->user->getReplies(($this->page-1) * NOTICES_PER_PAGE, - NOTICES_PER_PAGE + 1); + $stream = new ReplyNoticeStream($this->user->id, + Profile::current()); + + $this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE, + NOTICES_PER_PAGE + 1); if($this->page > 1 && $this->notice->N == 0){ // TRANS: Server error when page not found (404) From d44000077de839b86338f203639c5bd0baab5b3e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 30 May 2011 11:22:52 -0400 Subject: [PATCH 4/6] use ReplyNoticeStream for mentions API --- actions/apitimelinementions.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index ecd2a1a0e6..6afb11f860 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -193,10 +193,13 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction { $notices = array(); - $notice = $this->user->getReplies( - ($this->page - 1) * $this->count, $this->count, - $this->since_id, $this->max_id - ); + $stream = new ReplyNoticeStream($this->user->id, + Profile::current()); + + $notice = $stream->getNotices(($this->page - 1) * $this->count, + $this->count, + $this->since_id, + $this->max_id); while ($notice->fetch()) { $notices[] = clone($notice); From 650af0a27102e5e9067850c88e5b8a446b44f045 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 30 May 2011 15:09:42 -0400 Subject: [PATCH 5/6] get the correct context for apitimelinementions --- actions/apitimelinementions.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index 6afb11f860..25e08dd0e3 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -193,8 +193,13 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction { $notices = array(); - $stream = new ReplyNoticeStream($this->user->id, - Profile::current()); + if (empty($this->auth_user)) { + $profile = null; + } else { + $profile = $this->auth_user->profile; + } + + $stream = new ReplyNoticeStream($this->user->id, $profile); $notice = $stream->getNotices(($this->page - 1) * $this->count, $this->count, From d544c78276e6b822e94e7714a98f73b941189185 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 30 May 2011 15:29:18 -0400 Subject: [PATCH 6/6] correctly get profile for scope in apitimelinementions --- actions/apitimelinementions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index 25e08dd0e3..2b5053a84f 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -196,7 +196,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction if (empty($this->auth_user)) { $profile = null; } else { - $profile = $this->auth_user->profile; + $profile = $this->auth_user->getProfile(); } $stream = new ReplyNoticeStream($this->user->id, $profile);