eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge from dev/0.7.x

This commit is contained in:
Evan Prodromou 2009-02-04 15:40:36 -05:00
parent 2bd52059db df41b1307f
commit a97f8f6a43
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/newnotice.php
View File

@ -90,7 +90,7 @@ class NewnoticeAction extends Action
$this->clientError(_('Not logged in.')); $this->clientError(_('Not logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') { } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
// CSRF protection - token set in common_notice_form() // CSRF protection
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$this->clientError(_('There was a problem with your session token. '. $this->clientError(_('There was a problem with your session token. '.

2
lib/error.php
View File

@ -111,7 +111,7 @@ class ErrorAction extends Action
function showBody() function showBody()
{ {
$this->elementStart('body', array('id' => 'error')); $this->elementStart('body', array('id' => 'error'));
$this->elementStart('div', 'wrap'); $this->elementStart('div', array('id' => 'wrap'));
$this->showHeader(); $this->showHeader();
$this->showCore(); $this->showCore();
$this->showFooter(); $this->showFooter();

2
lib/facebookaction.php
View File

@ -168,7 +168,7 @@ class FacebookAction extends Action
function showBody() function showBody()
{ {
$this->elementStart('div', 'wrap'); $this->elementStart('div', array('id' => 'wrap'));
$this->showHeader(); $this->showHeader();
$this->showCore(); $this->showCore();
$this->showFooter(); $this->showFooter();

12
theme/base/css/display.css
View File

@ -24,6 +24,7 @@ position:relative;
h1,h2,h3,h4,h5,h6 { h1,h2,h3,h4,h5,h6 {
text-transform:uppercase; text-transform:uppercase;
margin-bottom:7px; margin-bottom:7px;
overflow:hidden;
} }
h1 { h1 {
font-size:1.4em; font-size:1.4em;
@ -508,6 +509,7 @@ min-height:123px;
float:left; float:left;
margin-bottom:18px; margin-bottom:18px;
margin-left:0; margin-left:0;
overflow:hidden;
} }
.entity_profile dt, .entity_profile dt,
#entity_statistics dt { #entity_statistics dt {
@ -767,6 +769,10 @@ padding-left:28px;
margin-right:11px; margin-right:11px;
} }
.fn {
overflow:hidden;
}
.notice .author .fn { .notice .author .fn {
font-weight:bold; font-weight:bold;
} }
@ -791,7 +797,7 @@ text-decoration:underline;
.notice .entry-title { .notice .entry-title {
float:left; float:left;
width:100%; width:100%;
overflow:auto; overflow:hidden;
} }
#shownotice .notice .entry-title { #shownotice .notice .entry-title {
font-size:2.2em; font-size:2.2em;
@ -1072,6 +1078,10 @@ border-top:0;
.section .notice:first-child { .section .notice:first-child {
padding-top:0; padding-top:0;
} }
.section .notice .author {
margin-right:0;
}
.section .notice .author .fn { .section .notice .author .fn {
display:none; display:none;
} }