diff options
| author | Robin Millette <millette@plantard.controlezvous.ca> | 2009-01-23 03:32:12 +0000 |
|---|---|---|
| committer | Robin Millette <millette@plantard.controlezvous.ca> | 2009-01-23 03:32:12 +0000 |
| commit | c8b606f17e124febf79db5a5aac5c545454435a1 (patch) | |
| tree | 75fa89bd3c7eb448129bd0c58f3c269928f44607 | |
| parent | 63c5e34bed5e1552334ad2cd8baff9e84584cd2b (diff) | |
| parent | 13bd15b0b54fbdf1f95b27813a7dfc934525baae (diff) | |
Merge branch 'master' of /var/www/trunk
| -rw-r--r-- | actions/public.php | 4 | ||||
| -rw-r--r-- | actions/showgroup.php | 12 | ||||
| -rw-r--r-- | actions/showstream.php | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/actions/public.php b/actions/public.php index 395d28819..396b60e83 100644 --- a/actions/public.php +++ b/actions/public.php @@ -215,8 +215,8 @@ 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('p', 'anonymous'); + $this->elementStart('div', 'anonymous'); $this->raw(common_markup_to_html($m)); - $this->elementEnd('p'); + $this->elementEnd('div'); } } diff --git a/actions/showgroup.php b/actions/showgroup.php index 8d8fbe6be..72738d785 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -372,4 +372,16 @@ class ShowgroupAction extends Action $this->elementEnd('div'); } + + function showAnonymousMessage() + { + $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . + 'based on the Free Software [Laconica](http://laconi.ca/) tool. Its members share ' . + 'short messages about their life and interests. '. + '[Join now](%%%%action.register%%%%) to become part of this group and many more! ([Read more](%%%%doc.help%%%%))'), + $this->group->nickname); + $this->elementStart('div', 'anonymous'); + $this->raw(common_markup_to_html($m)); + $this->elementEnd('div'); + } } diff --git a/actions/showstream.php b/actions/showstream.php index 3bccdcb1a..3005cdd88 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -538,9 +538,9 @@ 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('p', 'anonymous'); + $this->elementStart('div', 'anonymous'); $this->raw(common_markup_to_html($m)); - $this->elementEnd('p'); + $this->elementEnd('div'); } } |