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

This commit is contained in:
Robin Millette 2009-01-23 04:03:11 +00:00
commit 11b99b8144
6 changed files with 39 additions and 6 deletions

View File

@ -95,9 +95,11 @@ class GroupsAction extends Action
function showContent()
{
$this->elementStart('p', array('id' => 'new_group'));
$this->element('a', array('href' => common_local_url('newgroup'),
'id' => 'new_group'),
'class' => 'more'),
_('Create a new group'));
$this->elementEnd('p');
$offset = ($this->page-1) * GROUPS_PER_PAGE;
$limit = GROUPS_PER_PAGE + 1;

View File

@ -215,7 +215,7 @@ class PublicAction extends Action
$m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
'[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))');
$this->elementStart('div', 'anonymous');
$this->elementStart('div', array('id' => 'anon_notice'));
$this->raw(common_markup_to_html($m));
$this->elementEnd('div');
}

View File

@ -538,7 +538,7 @@ class ShowstreamAction extends Action
'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
'[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
$this->user->nickname, $this->user->nickname);
$this->elementStart('div', 'anonymous');
$this->elementStart('div', array('id' => 'anon_notice'));
$this->raw(common_markup_to_html($m));
$this->elementEnd('div');
}

View File

@ -234,6 +234,22 @@ clear:both;
margin-bottom:18px;
}
#anon_notice {
float:left;
width:432px;
padding:11px;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
border-width:2px;
border-style:solid;
line-height:1.5;
font-size:1.1em;
font-weight:bold;
}
#footer {
float:left;
width:64%;
@ -378,7 +394,6 @@ border-radius:7px;
/*Start: FORM NOTICE*/
#form_notice {
width:384px;
width:458px;
float:left;
position:relative;
@ -395,7 +410,6 @@ display:none;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
width:377px;
width:370px;
height:67px;
line-height:1.5;
@ -1088,6 +1102,11 @@ border-top:0;
.tag-cloud {
list-style-type:none;
}
.aside .tag-cloud {
font-size:0.8em;
}
.tag-cloud li {
display:inline;
margin-right:7px;

View File

@ -1 +0,0 @@

View File

@ -119,6 +119,19 @@ background-color:#F7E8E8;
background-color:#EFF3DC;
}
#anon_notice {
background-color:#97BFD1;
color:#fff;
}
#showstream #anon_notice {
background-color:#A9BF4F;
}
#export_data li a {
background-repeat:no-repeat;
background-position:0 45%;