From b7dd4d2ad1e93771cdff11198e7fdf81ca8633de Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 23:13:22 +0000 Subject: Fix to put @class current on the navigation of the page viewed --- lib/action.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/action.php') diff --git a/lib/action.php b/lib/action.php index 5ff536dab..fce9df4da 100644 --- a/lib/action.php +++ b/lib/action.php @@ -566,7 +566,7 @@ class Action extends HTMLOutputter // lawsuit $lattrs['class'] = 'current'; } - $this->elementStart('li', (is_null($id)) ? null : array('id' => $id), $lattrs); + $this->elementStart('li', (is_null($id)) ? $lattrs : array_merge(array('id' => $id), $lattrs)); $attrs['href'] = $url; if ($title) { $attrs['title'] = $title; -- cgit v1.2.3-54-g00ecf From 9881932d0734f515dc03e71551cfa7d04472f9a9 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 23:23:02 +0000 Subject: Minor --- lib/action.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/action.php') diff --git a/lib/action.php b/lib/action.php index fce9df4da..1622047c0 100644 --- a/lib/action.php +++ b/lib/action.php @@ -565,8 +565,8 @@ class Action extends HTMLOutputter // lawsuit if ($is_selected) { $lattrs['class'] = 'current'; } - - $this->elementStart('li', (is_null($id)) ? $lattrs : array_merge(array('id' => $id), $lattrs)); + (is_null($id)) ? $lattrs : $lattrs['id'] = $id; + $this->elementStart('li', $lattrs); $attrs['href'] = $url; if ($title) { $attrs['title'] = $title; -- cgit v1.2.3-54-g00ecf From b9fb70ee70ecd465f5843241b308f2b8680120f6 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 00:46:33 +0000 Subject: Markup clean up and styles --- actions/emailsettings.php | 7 +++---- actions/openidsettings.php | 15 ++++++++------- lib/action.php | 3 +-- theme/base/css/display.css | 4 ++++ 4 files changed, 16 insertions(+), 13 deletions(-) (limited to 'lib/action.php') diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 090df30dd..355470815 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -90,7 +90,7 @@ class EmailsettingsAction extends SettingsAction 'action' => common_local_url('emailsettings'))); - $this->elementStart('fieldset',array('id' => 'settings_email_address')); + $this->elementStart('fieldset', array('id' => 'settings_email_address')); $this->element('legend', null, _('Address')); $this->hidden('token', common_session_token()); @@ -123,7 +123,7 @@ class EmailsettingsAction extends SettingsAction $this->elementEnd('fieldset'); if ($user->email) { - $this->elementStart('fieldset',array('id' => 'settings_email_incoming')); + $this->elementStart('fieldset', array('id' => 'settings_email_incoming')); $this->element('legend',_('Incoming email')); if ($user->incomingemail) { $this->elementStart('p'); @@ -180,9 +180,8 @@ class EmailsettingsAction extends SettingsAction $user->emailmicroid); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->elementEnd('fieldset'); - $this->submit('save', _('Save')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/actions/openidsettings.php b/actions/openidsettings.php index f24c81795..6f17f154c 100644 --- a/actions/openidsettings.php +++ b/actions/openidsettings.php @@ -85,11 +85,11 @@ class OpenidsettingsAction extends SettingsAction $user = common_current_user(); $this->elementStart('form', array('method' => 'post', - 'id' => 'form_openid_add', + 'id' => 'form_settings_openid_add', 'class' => 'form_settings', 'action' => common_local_url('openidsettings'))); - $this->elementStart('fieldset'); + $this->elementStart('fieldset', array('id' => 'settings_openid_add')); $this->element('legend', null, _('Add OpenID')); $this->hidden('token', common_session_token()); $this->element('p', 'form_guide', @@ -105,7 +105,7 @@ class OpenidsettingsAction extends SettingsAction $this->elementEnd('li'); $this->elementEnd('ul'); $this->element('input', array('type' => 'submit', - 'id' => 'add', + 'id' => 'settings_openid_add_action-submit', 'name' => 'add', 'class' => 'submit', 'value' => _('Add'))); @@ -139,7 +139,7 @@ class OpenidsettingsAction extends SettingsAction } else { - $this->element('p', null, + $this->element('p', 'form_guide', _('You can remove an OpenID from your account '. 'by clicking the button marked "Remove".')); $idx = 0; @@ -147,10 +147,11 @@ class OpenidsettingsAction extends SettingsAction while ($oid->fetch()) { $this->elementStart('form', array('method' => 'POST', - 'id' => 'openiddelete' . $idx, + 'id' => 'form_settings_openid_delete' . $idx, + 'class' => 'form_settings', 'action' => common_local_url('openidsettings'))); - $this->elementStart('p'); + $this->elementStart('fieldset'); $this->hidden('token', common_session_token()); $this->element('a', array('href' => $oid->canonical), $oid->display); @@ -163,7 +164,7 @@ class OpenidsettingsAction extends SettingsAction 'name' => 'remove', 'class' => 'submit', 'value' => _('Remove'))); - $this->elementEnd('p'); + $this->elementEnd('fieldset'); $this->elementEnd('form'); $idx++; } diff --git a/lib/action.php b/lib/action.php index 1622047c0..35f6f2e3e 100644 --- a/lib/action.php +++ b/lib/action.php @@ -565,8 +565,7 @@ class Action extends HTMLOutputter // lawsuit if ($is_selected) { $lattrs['class'] = 'current'; } - (is_null($id)) ? $lattrs : $lattrs['id'] = $id; - $this->elementStart('li', $lattrs); + $this->elementStart('li', (is_null($id)) ? $lattrs : $lattr['id'] = $id); $attrs['href'] = $url; if ($title) { $attrs['title'] = $title; diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 294119c55..3aee52088 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -99,6 +99,10 @@ form input.submit { /* FORM SETTINGS */ +.form_settings { +margin-bottom:29px; +} + .form_settings fieldset { padding:0; border:0; -- cgit v1.2.3-54-g00ecf From e7687c66b21fec1a2db524842505d229ce896e72 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 06:33:45 +0000 Subject: Using @id instead of @class for navigation li --- lib/action.php | 5 ++++- lib/personalgroupnav.php | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'lib/action.php') diff --git a/lib/action.php b/lib/action.php index 35f6f2e3e..71520b84e 100644 --- a/lib/action.php +++ b/lib/action.php @@ -565,7 +565,10 @@ class Action extends HTMLOutputter // lawsuit if ($is_selected) { $lattrs['class'] = 'current'; } - $this->elementStart('li', (is_null($id)) ? $lattrs : $lattr['id'] = $id); + + (is_null($id)) ? $lattrs : $lattrs['id'] = $id; + + $this->elementStart('li', $lattrs); $attrs['href'] = $url; if ($title) { $attrs['title'] = $title; diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php index 5d727a505..63e6138df 100644 --- a/lib/personalgroupnav.php +++ b/lib/personalgroupnav.php @@ -91,28 +91,28 @@ class PersonalGroupNav extends Widget $user_profile = false; } - $this->out->elementStart('ul', array('id' => 'nav_views')); + $this->out->elementStart('ul', array('class' => 'nav')); $this->out->menuItem(common_local_url('all', array('nickname' => $nickname)), _('Personal'), sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)), - $action == 'all'); + $action == 'all', 'nav_timeline_personal'); $this->out->menuItem(common_local_url('replies', array('nickname' => $nickname)), _('Replies'), sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)), - $action == 'replies'); + $action == 'replies', 'nav_timeline_replies'); $this->out->menuItem(common_local_url('showstream', array('nickname' => $nickname)), _('Profile'), ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname, - $action == 'showstream'); + $action == 'showstream', 'nav_profile'); $this->out->menuItem(common_local_url('showfavorites', array('nickname' => $nickname)), _('Favorites'), sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')), - $action == 'showfavorites'); + $action == 'showfavorites', 'nav_timeline_favorites'); $cur = common_current_user(); -- cgit v1.2.3-54-g00ecf