From 6f6aed821387075de8c22da55c5620c04cda0dc1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Tue, 20 May 2008 13:47:59 -0400
Subject: better forms for new theme
darcs-hash:20080520174759-84dde-7206aeef3246b2304d463b121a6b17c7f3f2f6d5.gz
---
actions/login.php | 16 ++--------------
actions/newnotice.php | 4 ++--
actions/password.php | 5 +----
actions/profilesettings.php | 5 +----
actions/register.php | 33 +++++----------------------------
actions/showstream.php | 4 ++--
6 files changed, 13 insertions(+), 54 deletions(-)
(limited to 'actions')
diff --git a/actions/login.php b/actions/login.php
index c9d887300..89d06ee4d 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -61,24 +61,12 @@ class LoginAction extends Action {
common_element_start('form', array('method' => 'POST',
'id' => 'login',
'action' => common_local_url('login')));
- common_element('label', array('for' => 'nickname'),
- _t('Name'));
- common_element('input', array('name' => 'nickname',
- 'type' => 'text',
- 'id' => 'nickname'));
- common_element('label', array('for' => 'password'),
- _t('Password'));
- common_element('input', array('name' => 'password',
- 'type' => 'password',
- 'id' => 'password'));
+ common_input('nickname', _t('Nickname'));
+ common_password('password', _t('Password'));
common_element('input', array('name' => 'submit',
'type' => 'submit',
'id' => 'submit',
'value' => _t('Login')));
- common_element('input', array('name' => 'cancel',
- 'type' => 'button',
- 'id' => 'cancel',
- 'value' => _t('Cancel')));
common_element_end('form');
common_show_footer();
}
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 8ea28360a..fed3278a4 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -57,11 +57,11 @@ class NewnoticeAction extends Action {
common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
'action' => common_local_url('newnotice')));
common_element('span', 'nickname', $profile->nickname);
- common_element('textarea', array('rows' => 4, 'cols' => 80,
+ common_element('textarea', array('rows' => 3, 'cols' => 60,
'name' => 'content',
'id' => 'content'),
' ');
- common_element('input', array('type' => 'submit', 'value' => 'Send'));
+ common_submit('submit', _t('Send'));
common_element_end('form');
common_show_footer();
}
diff --git a/actions/password.php b/actions/password.php
index 4174b6d01..6eba136ce 100644
--- a/actions/password.php
+++ b/actions/password.php
@@ -34,10 +34,7 @@ class PasswordAction extends SettingsAction {
common_password('oldpassword', _t('Old password'));
common_password('newpassword', _t('New password'));
common_password('confirm', _t('Confirm'));
- common_element('input', array('name' => 'submit',
- 'type' => 'submit',
- 'id' => 'submit',
- 'value' => _t('Change')));
+ common_submit('submit', _t('Change'));
common_element_end('form');
common_show_footer();
}
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 15c455fe2..ab8175901 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -46,10 +46,7 @@ class ProfilesettingsAction extends SettingsAction {
($this->arg('bio')) ? $this->arg('bio') : $profile->bio);
common_input('location', _t('Location'),
($this->arg('location')) ? $this->arg('location') : $profile->location);
- common_element('input', array('name' => 'submit',
- 'type' => 'submit',
- 'id' => 'submit',
- 'value' => _t('Save')));
+ common_submit('submit', _t('Save'));
common_element_end('form');
common_show_footer();
}
diff --git a/actions/register.php b/actions/register.php
index fcf371d3a..f9402b98f 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -107,34 +107,11 @@ class RegisterAction extends Action {
common_element_start('form', array('method' => 'POST',
'id' => 'login',
'action' => common_local_url('register')));
- common_element('label', array('for' => 'nickname'),
- _t('Name'));
- common_element('input', array('name' => 'nickname',
- 'type' => 'text',
- 'id' => 'nickname'));
- common_element('label', array('for' => 'password'),
- _t('Password'));
- common_element('input', array('name' => 'password',
- 'type' => 'password',
- 'id' => 'password'));
- common_element('label', array('for' => 'confirm'),
- _t('Confirm'));
- common_element('input', array('name' => 'confirm',
- 'type' => 'password',
- 'id' => 'confirm'));
- common_element('label', array('for' => 'email'),
- _t('Email'));
- common_element('input', array('name' => 'email',
- 'type' => 'text',
- 'id' => 'email'));
- common_element('input', array('name' => 'submit',
- 'type' => 'submit',
- 'id' => 'submit',
- 'value' => _t('Register')));
- common_element('input', array('name' => 'cancel',
- 'type' => 'button',
- 'id' => 'cancel',
- 'value' => _t('Cancel')));
+ common_input('nickname', _t('Nickname'));
+ common_password('password', _t('Password'));
+ common_password('confirm', _t('Confirm'));
+ common_input('email', _t('Email'));
+ common_submit('submit', _t('Register'));
common_element_end('form');
common_show_footer();
}
diff --git a/actions/showstream.php b/actions/showstream.php
index 6cd4773ee..0db76806d 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -83,11 +83,11 @@ class ShowstreamAction extends StreamAction {
function notice_form() {
common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
'action' => common_local_url('newnotice')));
- common_element('textarea', array('rows' => 4, 'cols' => 80,
+ common_element('textarea', array('rows' => 3, 'cols' => 60,
'name' => 'content',
'id' => 'content'),
' ');
- common_element('input', array('type' => 'submit', 'value' => 'Send'));
+ common_submit('submit', _t('Send'));
common_element_end('form');
}
--
cgit v1.2.3-54-g00ecf