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

Merge branch 'master' of /var/www/trunk

Browse Source
This commit is contained in:
Robin Millette 2009-01-22 05:08:28 +00:00
commit f06c5f7873
7 changed files with 64 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
actions/doc.php
View File

@ -67,6 +67,25 @@ class DocAction extends Action
$this->showPage();
}
// overrrided to add entry-title class
function showPageTitle() {
$this->element('h1', array('class' => 'entry-title'), $this->title());
}
// overrided to add hentry, and content-inner classes
function showContentBlock()
{
$this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
$this->showPageTitle();
$this->showPageNoticeBlock();
$this->elementStart('div', array('id' => 'content_inner',
'class' => 'entry-content'));
// show the actual content (forms, lists, whatever)
$this->showContent();
$this->elementEnd('div');
$this->elementEnd('div');
}
/**
* Display content.
*
@ -89,4 +108,3 @@ class DocAction extends Action
return ucfirst($this->title);
}
}

19
actions/register.php
View File

@ -248,6 +248,25 @@ class RegisterAction extends Action
return ($user !== false);
}
// overrrided to add entry-title class
function showPageTitle() {
$this->element('h1', array('class' => 'entry-title'), $this->title());
}
// overrided to add hentry, and content-inner class
function showContentBlock()
{
$this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
$this->showPageTitle();
$this->showPageNoticeBlock();
$this->elementStart('div', array('id' => 'content_inner',
'class' => 'entry-content'));
// show the actual content (forms, lists, whatever)
$this->showContent();
$this->elementEnd('div');
$this->elementEnd('div');
}
/**
* Instructions or a notice for the page
*

2
lib/groupeditform.php
View File

@ -147,7 +147,7 @@ class GroupEditForm extends Form
_('URL of the homepage or blog of the group or topic'));
$this->out->elementEnd('li');
$this->out->elementStart('li');
$this->out->textarea('description', _('description'),
$this->out->textarea('description', _('Description'),
($this->out->arg('description')) ? $this->out->arg('description') : $this->group->description,
_('Describe the group or topic in 140 chars'));
$this->out->elementEnd('li');

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

@ -547,6 +547,7 @@ margin-bottom:4px;
width:auto;
clear:none;
}
.entity_profile .entity_fn {
margin-left:11px;
margin-right:4px;
@ -584,11 +585,8 @@ display:none;
/*entity_actions*/
.entity_actions {
clear:left;
float:left;
position:absolute;
top:0;
right:0;
float:right;
}
.entity_actions h2 {
display:none;
@ -936,7 +934,7 @@ outline:none;
}
.notice-options .notice_reply a,
.notice-options form input.submit {
.notice-options input.submit {
display:block;
border:0;
}
@ -1019,18 +1017,18 @@ border-right:0;
/*If there is hentry on #content_inner, this doesn't need to be specific to #doc */
#doc #content_inner p {
/*If there is hentry on #content_inner, then this doesn't need to be specific to #doc or any other section */
.hentry .entry-content p {
margin-bottom:18px;
}
#doc #content_inner ol,
#doc #content_inner ul {
.hentry entry-content ol,
.hentry .entry-content ul {
list-style-position:inside;
}
#doc #content_inner li {
.hentry .entry-content li {
margin-bottom:18px;
}
#doc #content_inner li li {
.hentry .entry-content li li {
margin-left:18px;
}

6
theme/base/css/ie.css
View File

@ -3,7 +3,7 @@
#aside_primary {
padding-left:11px;
}
.notice-options form input.submit {
.notice-options input.submit {
font-size:0;
margin-top:3px;
height:16px;
@ -24,3 +24,7 @@ margin-left:-7px;
.notice div.entry-content .timestamp a {
margin-right:4px;
}
.entity_profile .entity_nickname {
padding-right:3px;
}

8
theme/base/css/ie6.css Normal file
View File

@ -0,0 +1,8 @@
/* IE6 specific styles */
.entity_profile .entity_nickname,
.entity_profile .entity_location,
.entity_profile .entity_url,
.entity_profile .entity_note,
.entity_profile .entity_tags {
margin-left:55px;
}