GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

common_start_element -> common_element_start

Browse Source 
darcs-hash:20080517170430-84dde-74f42b52695699f646b65b939f78fbbe95a05c7e.gz
This commit is contained in:
Evan Prodromou 2008-05-17 13:04:30 -04:00
parent 3617ede805
commit 1a15570339
13 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/all.php
View File

@ -40,12 +40,12 @@ class AllAction extends ShowstreamAction {
$notice->find(); $notice->find();
common_start_element('div', 'notices'); common_element_start('div', 'notices');
while ($notice->fetch()) { while ($notice->fetch()) {
$this->show_notice($notice); $this->show_notice($notice);
} }
common_end_element('div'); common_element_end('div');
} }
} }

3
actions/avatar.php
View File

@ -46,7 +46,7 @@ class AvatarAction extends SettingsAction {
'height' => AVATAR_PROFILE_SIZE)); 'height' => AVATAR_PROFILE_SIZE));
} }
common_start_element('form', array('enctype' => 'multipart/form-data', common_element_start('form', array('enctype' => 'multipart/form-data',
'method' => 'POST', 'method' => 'POST',
'id' => 'avatar', 'id' => 'avatar',
'action' => 'action' =>
@ -62,6 +62,7 @@ class AvatarAction extends SettingsAction {
'type' => 'submit', 'type' => 'submit',
'id' => 'submit'), 'id' => 'submit'),
_t('Upload')); _t('Upload'));
common_element_end('form');
} }
function handle_post() { function handle_post() {

3
actions/login.php
View File

@ -53,7 +53,7 @@ class LoginAction extends Action {
if (!is_null($error)) { if (!is_null($error)) {
common_element('div', array('class' => 'error'), $msg); common_element('div', array('class' => 'error'), $msg);
} }
common_start_element('form', array('method' => 'POST', common_element_start('form', array('method' => 'POST',
'id' => 'login', 'id' => 'login',
'action' => common_local_url('login'))); 'action' => common_local_url('login')));
common_element('label', array('for' => 'username'), common_element('label', array('for' => 'username'),
@ -74,5 +74,6 @@ class LoginAction extends Action {
'type' => 'button', 'type' => 'button',
'id' => 'cancel'), 'id' => 'cancel'),
_t('Cancel')); _t('Cancel'));
common_element_end('form');
} }
} }

4
actions/newnotice.php
View File

@ -54,11 +54,11 @@ class NewnoticeAction extends Action {
} }
function show_form() { function show_form() {
common_start_element('form', array('id' => 'newnotice', 'method' => 'POST', common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
'action' => common_local_url('newnotice'))); 'action' => common_local_url('newnotice')));
common_element('span', 'nickname', $profile->nickname); common_element('span', 'nickname', $profile->nickname);
common_element('textarea', array('rows' => 4, 'cols' => 80, 'id' => 'content')); common_element('textarea', array('rows' => 4, 'cols' => 80, 'id' => 'content'));
common_element('input', array('type' => 'submit'), 'Send'); common_element('input', array('type' => 'submit'), 'Send');
common_end_element('form'); common_element_end('form');
} }
} }

3
actions/password.php
View File

@ -25,7 +25,7 @@ class PasswordAction extends SettingsAction {
common_show_header(_t('Change password')); common_show_header(_t('Change password'));
$this->settings_menu(); $this->settings_menu();
$this->message($msg, $success); $this->message($msg, $success);
common_start_element('form', array('method' => 'POST', common_element_start('form', array('method' => 'POST',
'id' => 'password', 'id' => 'password',
'action' => 'action' =>
common_local_url('password'))); common_local_url('password')));
@ -40,6 +40,7 @@ class PasswordAction extends SettingsAction {
'type' => 'button', 'type' => 'button',
'id' => 'cancel'), 'id' => 'cancel'),
_t('Cancel')); _t('Cancel'));
common_element_end('form');
} }
function handle_post() { function handle_post() {

3
actions/profilesettings.php
View File

@ -25,7 +25,7 @@ class ProfilesettingsAction extends SettingsAction {
common_show_header(_t('Profile settings')); common_show_header(_t('Profile settings'));
$this->settings_menu(); $this->settings_menu();
$this->message($msg, $success); $this->message($msg, $success);
common_start_element('form', array('method' => 'POST', common_element_start('form', array('method' => 'POST',
'id' => 'profilesettings', 'id' => 'profilesettings',
'action' => 'action' =>
common_local_url('profilesettings'))); common_local_url('profilesettings')));
@ -43,6 +43,7 @@ class ProfilesettingsAction extends SettingsAction {
'type' => 'button', 'type' => 'button',
'id' => 'cancel'), 'id' => 'cancel'),
_t('Cancel')); _t('Cancel'));
common_element_end('form');
common_show_footer(); common_show_footer();
} }

4
actions/public.php
View File

@ -46,13 +46,13 @@ class PublicAction extends StreamAction {
$notice->find(); $notice->find();
common_start_element('div', 'notices'); common_element_start('div', 'notices');
while ($notice->fetch()) { while ($notice->fetch()) {
$this->show_notice($notice); $this->show_notice($notice);
} }
common_end_element('div'); common_element_end('div');
} }
} }

2
actions/register.php
View File

@ -101,7 +101,7 @@ class RegisterAction extends Action {
common_show_header(_t('Login')); common_show_header(_t('Login'));
common_element_start('form', array('method' => 'POST', common_element_start('form', array('method' => 'POST',
'id' => 'login', 'id' => 'login',
'action' => common_local_url('login'))); 'action' => common_local_url('register')));
common_element('label', array('for' => 'username'), common_element('label', array('for' => 'username'),
_t('Name')); _t('Name'));
common_element('input', array('name' => 'username', common_element('input', array('name' => 'username',

16
actions/shownotice.php
View File

@ -50,7 +50,7 @@ class ShownoticeAction extends Action {
function show_notice($notice) { function show_notice($notice) {
$profile = $notice->getProfile(); $profile = $notice->getProfile();
# XXX: RDFa # XXX: RDFa
common_start_element('div', array('class' => 'notice')); common_element_start('div', array('class' => 'notice'));
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
if ($avatar) { if ($avatar) {
common_element('img', array('src' => $avatar->url, common_element('img', array('src' => $avatar->url,
@ -61,17 +61,17 @@ class ShownoticeAction extends Action {
($profile->fullname) ? $profile->fullname : ($profile->fullname) ? $profile->fullname :
$profile->nickname)); $profile->nickname));
} }
common_start_element('a', array('href' => $profile->profileurl, common_element('a', array('href' => $profile->profileurl,
'class' => 'nickname', 'class' => 'nickname',
'title' => 'title' =>
($profile->fullname) ? $profile->fullname : ($profile->fullname) ? $profile->fullname :
$profile->nickname), $profile->nickname),
$profile->nickname); $profile->nickname);
# FIXME: URL, image, video, audio # FIXME: URL, image, video, audio
common_element('span', array('class' => 'content'), common_element('span', array('class' => 'content'),
$notice->content); $notice->content);
common_element('span', array('class' => 'date'), common_element('span', array('class' => 'date'),
common_date_string($notice->created)); common_date_string($notice->created));
common_end_element('div'); common_element_end('div');
} }
} }

34
actions/showstream.php
View File

@ -77,15 +77,15 @@ class ShowstreamAction extends StreamAction {
} }
function notice_form() { function notice_form() {
common_start_element('form', array('id' => 'newnotice', 'method' => 'POST', common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
'action' => common_local_url('newnotice'))); 'action' => common_local_url('newnotice')));
common_element('textarea', array('rows' => 4, 'cols' => 80, 'id' => 'content')); common_element('textarea', array('rows' => 4, 'cols' => 80, 'id' => 'content'));
common_element('input', array('type' => 'submit'), 'Send'); common_element('input', array('type' => 'submit'), 'Send');
common_end_element('form'); common_element_end('form');
} }
function show_profile($profile) { function show_profile($profile) {
common_start_element('div', 'profile'); common_element_start('div', 'profile');
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
if ($avatar) { if ($avatar) {
common_element('img', array('src' => $avatar->url, common_element('img', array('src' => $avatar->url,
@ -113,42 +113,42 @@ class ShowstreamAction extends StreamAction {
} }
function show_subscribe_form($profile) { function show_subscribe_form($profile) {
common_start_element('form', array('id' => 'subscribe', 'method' => 'POST', common_element_start('form', array('id' => 'subscribe', 'method' => 'POST',
'action' => common_local_url('subscribe'))); 'action' => common_local_url('subscribe')));
common_element('input', array('id' => 'subscribeto', common_element('input', array('id' => 'subscribeto',
'name' => 'subscribeto', 'name' => 'subscribeto',
'type' => 'hidden', 'type' => 'hidden',
'value' => $profile->nickname)); 'value' => $profile->nickname));
common_element('input', array('type' => 'submit'), _t('subscribe')); common_element('input', array('type' => 'submit'), _t('subscribe'));
common_end_element('form'); common_element_end('form');
} }
function show_unsubscribe_form($profile) { function show_unsubscribe_form($profile) {
common_start_element('form', array('id' => 'unsubscribe', 'method' => 'POST', common_element_start('form', array('id' => 'unsubscribe', 'method' => 'POST',
'action' => common_local_url('unsubscribe'))); 'action' => common_local_url('unsubscribe')));
common_element('input', array('id' => 'unsubscribeto', common_element('input', array('id' => 'unsubscribeto',
'name' => 'unsubscribeto', 'name' => 'unsubscribeto',
'type' => 'hidden', 'type' => 'hidden',
'value' => $profile->nickname)); 'value' => $profile->nickname));
common_element('input', array('type' => 'submit'), _t('unsubscribe')); common_element('input', array('type' => 'submit'), _t('unsubscribe'));
common_end_element('form'); common_element_end('form');
} }
function show_subscriptions($profile) { function show_subscriptions($profile) {
# XXX: add a limit # XXX: add a limit
$subs = $profile->getLink('id', 'subscription', 'subscriber'); $subs = $profile->getLink('id', 'subscription', 'subscriber');
common_start_element('div', 'subscriptions'); common_element_start('div', 'subscriptions');
$cnt = 0; $cnt = 0;
while ($subs->fetch()) { while ($subs->fetch()) {
$cnt++; $cnt++;
if ($cnt % SUBSCRIPTIONS_PER_ROW == 1) { if ($cnt % SUBSCRIPTIONS_PER_ROW == 1) {
common_start_element('div', 'row'); common_element_start('div', 'row');
} }
common_start_element('a', array('title' => $subs->fullname || common_element_start('a', array('title' => $subs->fullname ||
$subs->nickname, $subs->nickname,
'href' => $subs->profileurl, 'href' => $subs->profileurl,
'class' => 'subscription')); 'class' => 'subscription'));
@ -157,10 +157,10 @@ class ShowstreamAction extends StreamAction {
'width' => AVATAR_MINI_SIZE, 'width' => AVATAR_MINI_SIZE,
'height' => AVATAR_MINI_SIZE, 'height' => AVATAR_MINI_SIZE,
'class' => 'avatar mini')); 'class' => 'avatar mini'));
common_end_element('a'); common_element_end('a');
if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) { if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) {
common_end_element('div'); common_element_end('div');
} }
if ($cnt == SUBSCRIPTIONS) { if ($cnt == SUBSCRIPTIONS) {
@ -173,7 +173,7 @@ class ShowstreamAction extends StreamAction {
'class' => 'moresubscriptions'), 'class' => 'moresubscriptions'),
_t('All subscriptions')); _t('All subscriptions'));
common_end_element('div'); common_element_end('div');
} }
function show_statistics($profile) { function show_statistics($profile) {
@ -192,14 +192,14 @@ class ShowstreamAction extends StreamAction {
$notice_count = $notice->count(); $notice_count = $notice->count();
# Other stats...? # Other stats...?
common_start_element('dl', 'statistics'); common_element_start('dl', 'statistics');
common_element('dt', _t('Subscriptions')); common_element('dt', _t('Subscriptions'));
common_element('dd', $subs_count); common_element('dd', $subs_count);
common_element('dt', _t('Subscribers')); common_element('dt', _t('Subscribers'));
common_element('dd', $subbed_count); common_element('dd', $subbed_count);
common_element('dt', _t('Notices')); common_element('dt', _t('Notices'));
common_element('dd', $notice_count); common_element('dd', $notice_count);
common_end_element('dl'); common_element_end('dl');
} }
function show_notices($profile) { function show_notices($profile) {
@ -215,13 +215,13 @@ class ShowstreamAction extends StreamAction {
$notice->find(); $notice->find();
common_start_element('div', 'notices'); common_element_start('div', 'notices');
while ($notice->fetch()) { while ($notice->fetch()) {
$this->show_notice($notice); $this->show_notice($notice);
} }
common_end_element('div'); common_element_end('div');
} }
function show_last_notice($profile) { function show_last_notice($profile) {

12
actions/subscribed.php
View File

@ -50,17 +50,17 @@ class SubscribedAction extends Action {
$subs_count = $subs->find(); $subs_count = $subs->find();
common_start_element('div', 'subscriptions'); common_element_start('div', 'subscriptions');
$idx = 0; $idx = 0;
while ($subs->fetch()) { while ($subs->fetch()) {
$idx++; $idx++;
if ($idx % SUBSCRIPTIONS_PER_ROW == 1) { if ($idx % SUBSCRIPTIONS_PER_ROW == 1) {
common_start_element('div', 'row'); common_element_start('div', 'row');
} }
common_start_element('a', array('title' => $subs->fullname || common_element_start('a', array('title' => $subs->fullname ||
$subs->nickname, $subs->nickname,
'href' => $subs->profileurl, 'href' => $subs->profileurl,
'class' => 'subscription')); 'class' => 'subscription'));
@ -69,12 +69,12 @@ class SubscribedAction extends Action {
'width' => AVATAR_STREAM_SIZE, 'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE,
'class' => 'avatar stream')); 'class' => 'avatar stream'));
common_end_element('a'); common_element_end('a');
# XXX: subscribe form here # XXX: subscribe form here
if ($idx % SUBSCRIPTIONS_PER_ROW == 0) { if ($idx % SUBSCRIPTIONS_PER_ROW == 0) {
common_end_element('div'); common_element_end('div');
} }
if ($idx == SUBSCRIPTIONS_PER_PAGE) { if ($idx == SUBSCRIPTIONS_PER_PAGE) {
@ -99,6 +99,6 @@ class SubscribedAction extends Action {
'class' => 'next'), 'class' => 'next'),
_t('Next')); _t('Next'));
} }
common_end_element('div'); common_element_end('div');
} }
} }

12
actions/subscriptions.php
View File

@ -47,17 +47,17 @@ class SubscriptionsAction extends Action {
$subs_count = $subs->find(); $subs_count = $subs->find();
common_start_element('div', 'subscriptions'); common_element_start('div', 'subscriptions');
$idx = 0; $idx = 0;
while ($subs->fetch()) { while ($subs->fetch()) {
$idx++; $idx++;
if ($idx % SUBSCRIPTIONS_PER_ROW == 1) { if ($idx % SUBSCRIPTIONS_PER_ROW == 1) {
common_start_element('div', 'row'); common_element_start('div', 'row');
} }
common_start_element('a', array('title' => $subs->fullname || common_element_start('a', array('title' => $subs->fullname ||
$subs->nickname, $subs->nickname,
'href' => $subs->profileurl, 'href' => $subs->profileurl,
'class' => 'subscription')); 'class' => 'subscription'));
@ -66,12 +66,12 @@ class SubscriptionsAction extends Action {
'width' => AVATAR_STREAM_SIZE, 'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE,
'class' => 'avatar stream')); 'class' => 'avatar stream'));
common_end_element('a'); common_element_end('a');
# XXX: subscribe form here # XXX: subscribe form here
if ($idx % SUBSCRIPTIONS_PER_ROW == 0) { if ($idx % SUBSCRIPTIONS_PER_ROW == 0) {
common_end_element('div'); common_element_end('div');
} }
if ($idx == SUBSCRIPTIONS_PER_PAGE) { if ($idx == SUBSCRIPTIONS_PER_PAGE) {
@ -96,6 +96,6 @@ class SubscriptionsAction extends Action {
'class' => 'next'), 'class' => 'next'),
_t('Next')); _t('Next'));
} }
common_end_element('div'); common_element_end('div');
} }
} }

8
lib/stream.php
View File

@ -31,9 +31,9 @@ class StreamAction extends Action {
function show_notice($notice) { function show_notice($notice) {
$profile = $notice->getProfile(); $profile = $notice->getProfile();
# XXX: RDFa # XXX: RDFa
common_start_element('div', array('class' => 'notice')); common_element_start('div', array('class' => 'notice'));
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
common_start_element('a', array('href' => $profile->profileurl)); common_element_start('a', array('href' => $profile->profileurl));
common_element('img', array('src' => ($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR, common_element('img', array('src' => ($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR,
'class' => 'avatar stream', 'class' => 'avatar stream',
'width' => AVATAR_STREAM_SIZE, 'width' => AVATAR_STREAM_SIZE,
@ -41,7 +41,7 @@ class StreamAction extends Action {
'alt' => 'alt' =>
($profile->fullname) ? $profile->fullname : ($profile->fullname) ? $profile->fullname :
$profile->nickname)); $profile->nickname));
common_end_element('a'); common_element_end('a');
common_element('a', array('href' => $profile->profileurl, common_element('a', array('href' => $profile->profileurl,
'class' => 'nickname'), 'class' => 'nickname'),
$profile->nickname); $profile->nickname);
@ -51,6 +51,6 @@ class StreamAction extends Action {
common_element('a', array('class' => 'notice', common_element('a', array('class' => 'notice',
'href' => $noticeurl), 'href' => $noticeurl),
common_date_string($notice->created)); common_date_string($notice->created));
common_end_element('div'); common_element_end('div');
} }
} }