summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsarven <csarven@plantard.controlezvous.ca>2009-01-21 07:14:43 +0000
committersarven <csarven@plantard.controlezvous.ca>2009-01-21 07:14:43 +0000
commit92e2f3babc89863518b8711a1b62661752d806f5 (patch)
tree125858c9f6520508de0fd8e0cf12778d185eb152
parent27b627c09451c099b18a7cde90f6a028f820046c (diff)
Added @title to user_action inputs and anchor and form legends
-rw-r--r--actions/showstream.php5
-rw-r--r--lib/blockform.php14
-rw-r--r--lib/nudgeform.php14
-rw-r--r--lib/subscribeform.php13
-rw-r--r--lib/unblockform.php13
-rw-r--r--lib/unsubscribeform.php12
6 files changed, 64 insertions, 7 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index 6ed6abc9e..76249d14d 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -331,8 +331,9 @@ class ShowstreamAction extends Action
$user = User::staticGet('id', $this->profile->id);
if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
$this->elementStart('li', array('id' => 'user_send-a-message'));
- $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))),
- _('Send a message'));
+ $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)),
+ 'title' => _('Send a direct message to this user')),
+ _('Message'));
$this->elementEnd('li');
if ($user->email && $user->emailnotifynudge) {
diff --git a/lib/blockform.php b/lib/blockform.php
index b7790681d..ea22c1cec 100644
--- a/lib/blockform.php
+++ b/lib/blockform.php
@@ -112,6 +112,18 @@ class BlockForm extends Form
return common_local_url('block');
}
+
+ /**
+ * Legend of the Form
+ *
+ * @return void
+ */
+ function formLegend()
+ {
+ $this->out->element('legend', null, _('Block this user'));
+ }
+
+
/**
* Data elements of the form
*
@@ -138,6 +150,6 @@ class BlockForm extends Form
function formActions()
{
- $this->out->submit('submit', _('Block'));
+ $this->out->submit('submit', _('block'), 'submit', null, _('Block this user'));
}
}
diff --git a/lib/nudgeform.php b/lib/nudgeform.php
index 6374a7698..7380462a7 100644
--- a/lib/nudgeform.php
+++ b/lib/nudgeform.php
@@ -105,6 +105,18 @@ class NudgeForm extends Form
array('nickname' => $this->profile->nickname));
}
+
+ /**
+ * Legend of the Form
+ *
+ * @return void
+ */
+ function formLegend()
+ {
+ $this->out->element('legend', null, _('Nudge this user'));
+ }
+
+
/**
* Action elements
*
@@ -113,6 +125,6 @@ class NudgeForm extends Form
function formActions()
{
- $this->out->submit('submit', _('Send a nudge'));
+ $this->out->submit('submit', _('Nudge'), 'submit', null, _('Send a nudge to this user'));
}
}
diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index 231e740a7..c65134e46 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -104,6 +104,17 @@ class SubscribeForm extends Form
return common_local_url('subscribe');
}
+
+ /**
+ * Legend of the Form
+ *
+ * @return void
+ */
+ function formLegend()
+ {
+ $this->out->element('legend', null, _('Subscribe to this user'));
+ }
+
/**
* Data elements of the form
*
@@ -125,6 +136,6 @@ class SubscribeForm extends Form
function formActions()
{
- $this->out->submit('submit', _('Subscribe'));
+ $this->out->submit('submit', _('Subscribe'), 'submit', null, _('Subscribe to this user'));
}
}
diff --git a/lib/unblockform.php b/lib/unblockform.php
index 025011a82..6a8831b29 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -111,6 +111,17 @@ class UnblockForm extends Form
}
/**
+ * Legend of the Form
+ *
+ * @return void
+ */
+ function formLegend()
+ {
+ $this->out->element('legend', null, _('Unblock this user'));
+ }
+
+
+ /**
* Data elements of the form
*
* @return void
@@ -136,6 +147,6 @@ class UnblockForm extends Form
function formActions()
{
- $this->out->submit('submit', _('Unblock'));
+ $this->out->submit('submit', _('Unblock'), 'submit', null, _('Unblock this user'));
}
}
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index 092369db7..ce91a1340 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -104,6 +104,16 @@ class UnsubscribeForm extends Form
}
/**
+ * Legend of the Form
+ *
+ * @return void
+ */
+ function formLegend()
+ {
+ $this->out->element('legend', null, _('Unsubscribe from this user'));
+ }
+
+ /**
* Data elements of the form
*
* @return void
@@ -124,6 +134,6 @@ class UnsubscribeForm extends Form
function formActions()
{
- $this->out->submit('submit', _('Unsubscribe'));
+ $this->out->submit('submit', _('Unsubscribe'), 'submit', null, _('Unsubscribe from this user'));
}
}