summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-08-13 12:22:58 -0700
committerEvan Prodromou <evan@status.net>2010-08-13 12:22:58 -0700
commit9b7536351b1efa5bf222fad1fb92b6dc9e33156f (patch)
treea46240fd6f23acedfc4388aca87afd6effd0402a
parente6da476c1650fbb9e4cca5f2d9a418b3186d5d06 (diff)
hide the Whats Up Nickname if notice title enabled
-rw-r--r--lib/noticeform.php3
-rw-r--r--plugins/NoticeTitle/NoticeTitlePlugin.php1
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 84c20a5b3..514066356 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -169,7 +169,8 @@ class NoticeForm extends Form
function formData()
{
if (Event::handle('StartShowNoticeFormData', array($this))) {
- $this->out->element('label', array('for' => 'notice_data-text'),
+ $this->out->element('label', array('for' => 'notice_data-text',
+ 'id' => 'notice_data-text-label'),
sprintf(_('What\'s up, %s?'), $this->user->nickname));
// XXX: vary by defined max size
$this->out->element('textarea', array('id' => 'notice_data-text',
diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
index 115e1c14c..18ffed4be 100644
--- a/plugins/NoticeTitle/NoticeTitlePlugin.php
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -137,6 +137,7 @@ class NoticeTitlePlugin extends Plugin
function onStartShowNoticeFormData($form)
{
+ $form->out->element('style', null, 'label#notice_data-text-label { display: none }');
$form->out->element('input', array('type' => 'text',
'id' => 'notice_title',
'name' => 'notice_title',