Commit feb53619 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
	js/util.min.js
parents 1598050f f0af9f45
......@@ -195,8 +195,21 @@ class AllAction extends ProfileAction
function showSections()
{
$ibs = new InviteButtonSection($this);
$ibs->show();
// Show invite button, as long as site isn't closed, and
// we have a logged in user.
if (!common_config('site', 'closed') && common_logged_in()) {
if (!common_config('site', 'private')) {
$ibs = new InviteButtonSection(
$this,
// TRANS: Button text for inviting more users to the StatusNet instance.
// TRANS: Less business/enterprise-oriented language for public sites.
_m('BUTTON', 'Send invite')
);
} else {
$ibs = new InviteButtonSection($this);
}
$ibs->show();
}
$pop = new PopularNoticeSection($this);
$pop->show();
// $pop = new InboxTagCloudSection($this, $this->user);
......
......@@ -227,8 +227,22 @@ class PublicAction extends Action
function showSections()
{
$ibs = new InviteButtonSection($this);
$ibs->show();
// Show invite button, as long as site isn't closed, and
// we have a logged in user.
if (!common_config('site', 'closed') && common_logged_in()) {
if (!common_config('site', 'private')) {
$ibs = new InviteButtonSection(
$this,
// TRANS: Button text for inviting more users to the StatusNet instance.
// TRANS: Less business/enterprise-oriented language for public sites.
_m('BUTTON', 'Send invite')
);
} else {
$ibs = new InviteButtonSection($this);
}
$ibs->show();
}
$pop = new PopularNoticeSection($this);
$pop->show();
$cloud = new PublicTagCloudSection($this);
......
......@@ -46,6 +46,19 @@ if (!defined('STATUSNET')) {
*/
class InviteButtonSection extends Section
{
protected $buttonText;
function __construct($out = null, $buttonText = null)
{
$this->out = $out;
if (empty($buttonText)) {
// TRANS: Default button text for inviting more users to the StatusNet instance.
$this->buttonText = _m('BUTTON', 'Invite more colleagues');
} else {
$this->buttonText = $buttonText;
}
}
function showTitle()
{
return false;
......@@ -53,11 +66,14 @@ class InviteButtonSection extends Section
function showContent()
{
$this->out->element('a',
array('href' => common_local_url('invite'),
'class' => 'invite_button'),
// TRANS: Button text for inviting more users to the StatusNet instance.
_m('BUTTON','Invite more colleagues'));
$this->out->element(
'a',
array(
'href' => common_local_url('invite'),
'class' => 'invite_button'
),
$this->buttonText
);
return false;
}
}
This diff is collapsed.
theme/base/default-avatar-mini.png

1.23 KB | W: | H:

theme/base/default-avatar-mini.png

1000 Bytes | W: | H:

theme/base/default-avatar-mini.png
theme/base/default-avatar-mini.png
theme/base/default-avatar-mini.png
theme/base/default-avatar-mini.png
  • 2-up
  • Swipe
  • Onion skin
theme/base/default-avatar-profile.png

8.79 KB | W: | H:

theme/base/default-avatar-profile.png

6.2 KB | W: | H:

theme/base/default-avatar-profile.png
theme/base/default-avatar-profile.png
theme/base/default-avatar-profile.png
theme/base/default-avatar-profile.png
  • 2-up
  • Swipe
  • Onion skin
theme/base/default-avatar-stream.png

3.38 KB | W: | H:

theme/base/default-avatar-stream.png

2.49 KB | W: | H:

theme/base/default-avatar-stream.png
theme/base/default-avatar-stream.png
theme/base/default-avatar-stream.png
theme/base/default-avatar-stream.png
  • 2-up
  • Swipe
  • Onion skin
theme/base/logo.png

12.7 KB | W: | H:

theme/base/logo.png

11.5 KB | W: | H:

theme/base/logo.png
theme/base/logo.png
theme/base/logo.png
theme/base/logo.png
  • 2-up
  • Swipe
  • Onion skin
theme/base/mobilelogo.png

3.92 KB | W: | H:

theme/base/mobilelogo.png

990 Bytes | W: | H:

theme/base/mobilelogo.png
theme/base/mobilelogo.png
theme/base/mobilelogo.png
theme/base/mobilelogo.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment