GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' into testing

Browse Source
This commit is contained in:
Evan Prodromou 2011-05-30 15:37:46 -04:00
commit 412adfb587
4 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
actions/apitimelinementions.php
View File

@ -193,10 +193,18 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
{ {
$notices = array(); $notices = array();
$notice = $this->user->getReplies( if (empty($this->auth_user)) {
($this->page - 1) * $this->count, $this->count, $profile = null;
$this->since_id, $this->max_id } else {
); $profile = $this->auth_user->getProfile();
}
$stream = new ReplyNoticeStream($this->user->id, $profile);
$notice = $stream->getNotices(($this->page - 1) * $this->count,
$this->count,
$this->since_id,
$this->max_id);
while ($notice->fetch()) { while ($notice->fetch()) {
$notices[] = clone($notice); $notices[] = clone($notice);

5
actions/replies.php
View File

@ -85,7 +85,10 @@ class RepliesAction extends OwnerDesignAction
common_set_returnto($this->selfUrl()); common_set_returnto($this->selfUrl());
$this->notice = $this->user->getReplies(($this->page-1) * NOTICES_PER_PAGE, $stream = new ReplyNoticeStream($this->user->id,
Profile::current());
$this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE,
NOTICES_PER_PAGE + 1); NOTICES_PER_PAGE + 1);
if($this->page > 1 && $this->notice->N == 0){ if($this->page > 1 && $this->notice->N == 0){

1
plugins/MobileProfile/MobileProfilePlugin.php
View File

@ -339,6 +339,7 @@ class MobileProfilePlugin extends WAP20Plugin
$("#navtoggle").text( $("#navtoggle").text(
text == "Show Navigation" ? "Hide Navigation" : "Show Navigation"); text == "Show Navigation" ? "Hide Navigation" : "Show Navigation");
}); });
$(".checkbox-wrapper").unbind("click");
});' });'
); );
} }

33
theme/neo/css/mp-screen.css
View File

@ -120,6 +120,10 @@ address img + .fn {
color: #333; color: #333;
font-size: 1em; font-size: 1em;
margin-bottom: 0px; margin-bottom: 0px;
background: none;
text-transform: none;
letter-spacing: 0;
padding-bottom: 0;
} }
#site_nav_local_views li { #site_nav_local_views li {
@ -240,6 +244,12 @@ address img + .fn {
left: 270px; left: 270px;
} }
.form_notice .error,
.form_notice .success,
.form_notice .notice-status {
width: 285px;
}
/*input type=file no good in /*input type=file no good in
iPhone/iPod Touch, Android, Opera Mini Simulator iPhone/iPod Touch, Android, Opera Mini Simulator
@ -254,6 +264,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
clear: left; clear: left;
float: left; float: left;
width: 200px; width: 200px;
z-index: 2;
} }
.form_notice .checkbox-wrapper { .form_notice .checkbox-wrapper {
@ -262,7 +273,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
} }
.checkbox-wrapper label.checkbox { .checkbox-wrapper label.checkbox {
display: none; display: none !important;
} }
.checkbox-wrapper #notice_private { .checkbox-wrapper #notice_private {
@ -283,6 +294,10 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
width: 300px; width: 300px;
} }
.input_form .form_settings label {
display: inline;
}
.input_form .form_settings li input { .input_form .form_settings li input {
width: 292px; width: 292px;
} }
@ -295,6 +310,11 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
display: none; display: none;
} }
#event-startdate, #event-starttime, #event-enddate, #event-endtime {
width: 120px;
margin-right: 12px;
}
.input_form .form_settings .submit { .input_form .form_settings .submit {
font-size: 1em; font-size: 1em;
margin: 10px 0; margin: 10px 0;
@ -305,7 +325,8 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
.form_notice #notice_action-submit { .form_notice #notice_action-submit {
text-align: center; text-align: center;
left: 0px; left: 0px;
top: 192px; top: 100%;
margin-top: -45px;
width: 80px; width: 80px;
font-size: 1em; font-size: 1em;
} }
@ -406,8 +427,8 @@ margin-left:0 !important;
content: '\003E'; content: '\003E';
} }
.notice .addressees:empty:before { .notice .addressees:empty {
content: none; display: none;
} }
.user_in .notice div.entry-content { .user_in .notice div.entry-content {
@ -426,6 +447,10 @@ ul.qna-dummy {
width: 220px; width: 220px;
} }
.threaded-replies #answer-form fieldset {
width: 220px;
}
.threaded-replies #qna-answer-submit { .threaded-replies #qna-answer-submit {
float: left; float: left;
clear: left; clear: left;