From 5da9511c317648da6beb5fa2752f084166b88adc Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 19:42:08 +0000 Subject: Markup and styles for the Register page --- theme/base/css/display.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 7433a45e4..b5c47e1bb 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -136,7 +136,8 @@ font-weight:bold; } #form_settings_profile legend, -#form_login legend { +#form_login legend, +#form_register legend { display:none; } @@ -159,7 +160,8 @@ width:auto; margin-top:0; } -#form_login p.form_guide { +#form_login p.form_guide, +#form_register #settings_rememberme p.form_guide { margin-left:0; } -- cgit v1.2.3-54-g00ecf From d46c2cc8a70d83f7bf761ea8c778a8cd56d8e692 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 20:36:50 +0000 Subject: IM settings markup and style. Added confirmed/unconfirmed styles --- actions/emailsettings.php | 4 ++-- actions/imsettings.php | 42 +++++++++++++++++++++++++++--------------- theme/base/css/display.css | 9 +++------ theme/identica/css/display.css | 11 +++++++++++ 4 files changed, 43 insertions(+), 23 deletions(-) (limited to 'theme/base') diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 8b8a5351e..7ae62fb55 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -95,14 +95,14 @@ class EmailsettingsAction extends AccountSettingsAction $this->hidden('token', common_session_token()); if ($user->email) { - $this->element('p', array('id' => 'email_confirmed'), $user->email); + $this->element('p', array('id' => 'form_confirmed'), $user->email); $this->element('p', array('class' => 'form_note'), _('Current confirmed email address.')); $this->hidden('email', $user->email); $this->submit('remove', _('Remove')); } else { $confirm = $this->getConfirmation(); if ($confirm) { - $this->element('p', array('id' => 'email_unconfirmed'), $confirm->address); + $this->element('p', array('id' => 'form_unconfirmed'), $confirm->address); $this->element('p', array('class' => 'form_note'), _('Awaiting confirmation on this address. '. 'Check your inbox (and spam box!) for a message '. diff --git a/actions/imsettings.php b/actions/imsettings.php index 98951ac30..edbd81b57 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -86,36 +86,35 @@ class ImsettingsAction extends ConnectSettingsAction { $user = common_current_user(); $this->elementStart('form', array('method' => 'post', - 'id' => 'imsettings', + 'id' => 'form_settings_im', + 'class' => 'form_settings', 'action' => common_local_url('imsettings'))); + $this->elementStart('fieldset', array('id' => 'settings_im_address')); + $this->element('legend', null, _('Address')); $this->hidden('token', common_session_token()); - $this->element('h2', null, _('Address')); - if ($user->jabber) { - $this->elementStart('p'); - $this->element('span', 'address confirmed', $user->jabber); - $this->element('span', 'input_instructions', + $this->element('p', 'form_confirmed', $user->jabber); + $this->element('p', 'form_note', _('Current confirmed Jabber/GTalk address.')); $this->hidden('jabber', $user->jabber); - $this->elementEnd('p'); $this->submit('remove', _('Remove')); } else { $confirm = $this->getConfirmation(); if ($confirm) { - $this->elementStart('p'); - $this->element('span', 'address unconfirmed', $confirm->address); - $this->element('span', 'input_instructions', + $this->element('p', 'form_unconfirmed', $confirm->address); + $this->element('p', 'form_note', sprintf(_('Awaiting confirmation on this address. '. 'Check your Jabber/GTalk account for a '. 'message with further instructions. '. '(Did you add %s to your buddy list?)'), jabber_daemon_address())); $this->hidden('jabber', $confirm->address); - $this->elementEnd('p'); $this->submit('cancel', _('Cancel')); } else { + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('jabber', _('IM Address'), ($this->arg('jabber')) ? $this->arg('jabber') : null, sprintf(_('Jabber or GTalk address, '. @@ -123,27 +122,40 @@ class ImsettingsAction extends ConnectSettingsAction 'First, make sure to add %s to your '. 'buddy list in your IM client or on GTalk.'), jabber_daemon_address())); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('add', _('Add')); } } - - $this->element('h2', null, _('Preferences')); - + $this->elementEnd('fieldset'); + + $this->elementStart('fieldset', array('id' => 'settings_im_preferences')); + $this->element('legend', null, _('Preferences')); + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->checkbox('jabbernotify', _('Send me notices through Jabber/GTalk.'), $user->jabbernotify); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('updatefrompresence', _('Post a notice when my Jabber/GTalk status changes.'), $user->updatefrompresence); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('jabberreplies', _('Send me replies through Jabber/GTalk '. 'from people I\'m not subscribed to.'), $user->jabberreplies); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('jabbermicroid', _('Publish a MicroID for my Jabber/GTalk address.'), $user->jabbermicroid); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('save', _('Save')); - + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b5c47e1bb..2857070f8 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -79,11 +79,12 @@ top:2px; left:0; } -#page_notice .error { -background-color:#F7E8E8; +#page_notice .error, +#page_notice .success { padding:4px 7px; -moz-border-radius:4px; } + form label.submit { display:none; } @@ -666,10 +667,6 @@ border-top:1px dashed #D1D9E4; list-style-type:none; /*margin-bottom:11px;*/ } -.notices li.over { -background-color:#fcfcfc; -} - /* NOTICES */ #notices_primary { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 832862551..0235c2d7d 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -71,6 +71,12 @@ background-color:rgba(255, 255, 255, 0.7); background-color:#fff; } +#page_notice .error { +background-color:#F7E8E8; +} +#page_notice .success { +background-color:#EFF3DC; +} @@ -135,6 +141,11 @@ color:#555; /* NOTICES */ +.notices li.over { +background-color:#fcfcfc; +} + + .notice div.entry-content a { } -- cgit v1.2.3-54-g00ecf From 061de33e576ac542459fd48ab61877eece05ea39 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 21:14:47 +0000 Subject: SMS settings markup and styles. Minor check with twitter settings form_datas --- actions/smssettings.php | 33 +++++++++++++++++++-------------- actions/twittersettings.php | 2 +- theme/base/css/display.css | 18 +++++++++++++----- 3 files changed, 33 insertions(+), 20 deletions(-) (limited to 'theme/base') diff --git a/actions/smssettings.php b/actions/smssettings.php index 845266d18..489fd1f58 100644 --- a/actions/smssettings.php +++ b/actions/smssettings.php @@ -93,37 +93,42 @@ class SmssettingsAction extends ConnectSettingsAction $this->hidden('token', common_session_token()); if ($user->sms) { - $this->elementStart('p'); $carrier = $user->getCarrier(); - $this->element('span', 'address confirmed', + $this->element('p', 'form_confirmed', $user->sms . ' (' . $carrier->name . ')'); - $this->element('span', 'input_instructions', + $this->element('p', 'form_guide', _('Current confirmed SMS-enabled phone number.')); $this->hidden('sms', $user->sms); $this->hidden('carrier', $user->carrier); - $this->elementEnd('p'); $this->submit('remove', _('Remove')); } else { $confirm = $this->getConfirmation(); if ($confirm) { $carrier = Sms_carrier::staticGet($confirm->address_extra); - $this->elementStart('p'); - $this->element('span', 'address unconfirmed', + $this->element('p', 'form_unconfirmed', $confirm->address . ' (' . $carrier->name . ')'); - $this->element('span', 'input_instructions', + $this->element('p', 'form_guide', _('Awaiting confirmation on this phone number.')); $this->hidden('sms', $confirm->address); $this->hidden('carrier', $confirm->address_extra); - $this->elementEnd('p'); $this->submit('cancel', _('Cancel')); + + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('code', _('Confirmation code'), null, _('Enter the code you received on your phone.')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('confirm', _('Confirm')); } else { + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('sms', _('SMS Phone number'), ($this->arg('sms')) ? $this->arg('sms') : null, _('Phone number, no punctuation or spaces, '. 'with area code')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->carrierSelect(); $this->submit('add', _('Add')); } @@ -131,14 +136,13 @@ class SmssettingsAction extends ConnectSettingsAction $this->elementEnd('fieldset'); if ($user->sms) { - $this->element('h2', null, _('Incoming email')); + $this->elementStart('fieldset', array('id' => 'settings_sms_incoming_email')); + $this->element('legend', null, _('Incoming email')); if ($user->incomingemail) { - $this->elementStart('p'); - $this->element('span', 'address', $user->incomingemail); - $this->element('span', 'input_instructions', + $this->element('p', 'form_unconfirmed', $user->incomingemail); + $this->element('p', 'form_note', _('Send email to this address to post new notices.')); - $this->elementEnd('p'); $this->submit('removeincoming', _('Remove')); } @@ -146,6 +150,7 @@ class SmssettingsAction extends ConnectSettingsAction _('Make a new email address for posting to; '. 'cancels the old one.')); $this->submit('newincoming', _('New')); + $this->elementEnd('fieldset'); } $this->elementStart('fieldset', array('id' => 'settings_sms_preferences')); @@ -443,7 +448,7 @@ class SmssettingsAction extends ConnectSettingsAction $cnt = $carrier->find(); - $this->elementStart('ul'); + $this->elementStart('ul', 'form_datas'); $this->elementStart('li'); $this->element('label', array('for' => 'carrier'), _('Mobile carrier')); $this->elementStart('select', array('name' => 'carrier', diff --git a/actions/twittersettings.php b/actions/twittersettings.php index 597623c80..079099123 100644 --- a/actions/twittersettings.php +++ b/actions/twittersettings.php @@ -133,7 +133,7 @@ class TwittersettingsAction extends ConnectSettingsAction array('id' => 'settings_twitter_preferences')); $this->element('legend', null, _('Preferences')); - $this->elementStart('ul'); + $this->elementStart('ul', 'form_datas'); $this->elementStart('li'); $this->checkbox('noticesync', _('Automatically send my notices to Twitter.'), diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 2857070f8..08805c1e0 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -116,15 +116,19 @@ width:100%; float:left; } -.form_settings .form_datas label, +.form_settings .form_datas label { +float:left; +} +.form_settings .form_datas textarea, +.form_settings .form_datas select, .form_settings .form_datas input { -margin-right:11px; +margin-left:11px; float:left; } .form_settings label { margin-top:7px; -width:123px; +width:152px; } .form_actions label { @@ -144,7 +148,7 @@ display:none; .form_settings .form_datas p.form_guide { clear:both; -margin-left:134px; +margin-left:163px; margin-bottom:0; } @@ -154,11 +158,15 @@ margin-bottom:11px; .form_settings input.checkbox { margin-top:3px; +margin-left:0; } .form_settings label.checkbox { font-weight:normal; -width:auto; margin-top:0; +margin-right:0; +margin-left:11px; +float:left; +width:90%; } #form_login p.form_guide, -- cgit v1.2.3-54-g00ecf From 7749228f52d914d4949cb5fa139cdd6ade4ead6e Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 21:22:31 +0000 Subject: OpenID settings remove style --- actions/openidsettings.php | 4 ++-- theme/base/css/display.css | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'theme/base') diff --git a/actions/openidsettings.php b/actions/openidsettings.php index 257aac8d0..126d2c992 100644 --- a/actions/openidsettings.php +++ b/actions/openidsettings.php @@ -124,7 +124,7 @@ class OpenidsettingsAction extends AccountSettingsAction if ($cnt == 1 && !$user->password) { - $this->element('p', null, + $this->element('p', 'form_guide', _('Removing your only OpenID '. 'would make it impossible to log in! ' . 'If you need to remove it, '. @@ -162,7 +162,7 @@ class OpenidsettingsAction extends AccountSettingsAction $this->element('input', array('type' => 'submit', 'id' => 'remove'.$idx, 'name' => 'remove', - 'class' => 'submit', + 'class' => 'submit remove', 'value' => _('Remove'))); $this->elementEnd('fieldset'); $this->elementEnd('form'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 08805c1e0..76e52ffc9 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -84,18 +84,11 @@ left:0; padding:4px 7px; -moz-border-radius:4px; } - form label.submit { display:none; } -form .error_message { -display:block; -} -.form_response { -margin-bottom:18px; -} - -form input.submit { +.form_settings input.remove { +margin-left:11px; } -- cgit v1.2.3-54-g00ecf From 6b23a9ed2f35e487847fe80b588eb3a967aaecb8 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 21:34:57 +0000 Subject: Disfavor markup/style --- lib/disfavorform.php | 12 ++++++++++++ theme/base/css/display.css | 9 ++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'theme/base') diff --git a/lib/disfavorform.php b/lib/disfavorform.php index f339f215a..45a9ddb1d 100644 --- a/lib/disfavorform.php +++ b/lib/disfavorform.php @@ -103,6 +103,18 @@ class DisfavorForm extends Form common_session_token()); } + + /** + * Legend of the Form + * + * @return void + */ + function formLegend() + { + $this->out->element('legend', null, _('Disfavor this notice')); + } + + /** * Data elements * diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 76e52ffc9..0041baf44 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -860,15 +860,18 @@ padding-left:16px; .notice-options form input.submit { cursor:pointer; -padding:2px 0 2px 10px; +width:16px; +padding:2px 0; } .notice-options .notice_delete dt, -.notice-options .form_favor legend { +.notice-options .form_favor legend, +.notice-options .form_disfavor legend { display:none; } .notice-options .notice_delete fieldset, -.notice-options .form_favor fieldset { +.notice-options .form_favor fieldset, +.notice-options .form_disfavor fieldset { border:0; padding:0; } -- cgit v1.2.3-54-g00ecf From 910bd332430b0af233ae78b330994520d4b59c97 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 00:10:42 +0000 Subject: Minimal cross browser styling (mostly IE7). w00t! --- lib/action.php | 2 +- theme/base/css/display.css | 28 ++++++++++++++++++---------- theme/identica/css/display.css | 18 +++++++++++++++--- 3 files changed, 34 insertions(+), 14 deletions(-) (limited to 'theme/base') diff --git a/lib/action.php b/lib/action.php index 3d61afde2..c463c8459 100644 --- a/lib/action.php +++ b/lib/action.php @@ -138,7 +138,7 @@ class Action extends HTMLOutputter // lawsuit if (file_exists(theme_file('ie'.$ver.'.css'))) { // Yes, IE people should be put in jail. $this->comment('[if lte IE '.$ver.']> Date: Mon, 19 Jan 2009 00:48:12 +0000 Subject: Cross-browser stuff --- lib/action.php | 2 ++ theme/base/css/display.css | 35 ++++++++++++++++++++++++++++++----- theme/base/css/ie.css | 26 ++++++++++++++++++++++++++ theme/base/css/ie7.css | 5 +++++ theme/identica/css/display.css | 4 ++++ 5 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 theme/base/css/ie.css create mode 100644 theme/base/css/ie7.css (limited to 'theme/base') diff --git a/lib/action.php b/lib/action.php index c463c8459..9cd2d5a18 100644 --- a/lib/action.php +++ b/lib/action.php @@ -134,6 +134,8 @@ class Action extends HTMLOutputter // lawsuit 'type' => 'text/css', 'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION, 'media' => 'screen, projection, tv')); + $this->comment('[if IE]> Date: Mon, 19 Jan 2009 01:04:22 +0000 Subject: text-shadow for local a --- theme/base/css/display.css | 1 + 1 file changed, 1 insertion(+) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 06860e30d..716f3256f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -272,6 +272,7 @@ padding:4px 11px; border-width:1px; border-style:solid; border-bottom:0; +text-shadow: 4px 4px 4px #ddd; font-weight:bold; } #site_nav_local_views .nav { -- cgit v1.2.3-54-g00ecf From 0b5f0f4faaf04fdf13dbd5dea1f081b9e1cc6071 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 03:09:13 +0000 Subject: Renamed form_datas to form_data --- actions/emailsettings.php | 4 ++-- actions/imsettings.php | 4 ++-- actions/login.php | 2 +- actions/openidsettings.php | 2 +- actions/othersettings.php | 2 +- actions/profilesettings.php | 2 +- actions/register.php | 2 +- actions/smssettings.php | 8 ++++---- actions/twittersettings.php | 4 ++-- lib/noticeform.php | 2 +- theme/base/css/display.css | 22 +++++++++++----------- 11 files changed, 27 insertions(+), 27 deletions(-) (limited to 'theme/base') diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 7ae62fb55..b84acb214 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -110,7 +110,7 @@ class EmailsettingsAction extends AccountSettingsAction $this->hidden('email', $confirm->address); $this->submit('cancel', _('Cancel')); } else { - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('email', _('Email Address'), ($this->arg('email')) ? $this->arg('email') : null, @@ -146,7 +146,7 @@ class EmailsettingsAction extends AccountSettingsAction $this->elementStart('fieldset', array('id' => 'settings_email_preferences')); $this->element('legend', null, _('Preferences')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->checkbox('emailnotifysub', _('Send me notices of new subscriptions through email.'), diff --git a/actions/imsettings.php b/actions/imsettings.php index edbd81b57..e0f5ede3a 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -113,7 +113,7 @@ class ImsettingsAction extends ConnectSettingsAction $this->hidden('jabber', $confirm->address); $this->submit('cancel', _('Cancel')); } else { - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('jabber', _('IM Address'), ($this->arg('jabber')) ? $this->arg('jabber') : null, @@ -131,7 +131,7 @@ class ImsettingsAction extends ConnectSettingsAction $this->elementStart('fieldset', array('id' => 'settings_im_preferences')); $this->element('legend', null, _('Preferences')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->checkbox('jabbernotify', _('Send me notices through Jabber/GTalk.'), diff --git a/actions/login.php b/actions/login.php index 9fa501a5d..11cf1f02a 100644 --- a/actions/login.php +++ b/actions/login.php @@ -223,7 +223,7 @@ class LoginAction extends Action 'action' => common_local_url('login'))); $this->elementStart('fieldset'); $this->element('legend', null, _('Login to site')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('nickname', _('Nickname')); $this->elementEnd('li'); diff --git a/actions/openidsettings.php b/actions/openidsettings.php index 126d2c992..92469d20f 100644 --- a/actions/openidsettings.php +++ b/actions/openidsettings.php @@ -95,7 +95,7 @@ class OpenidsettingsAction extends AccountSettingsAction $this->element('p', 'form_guide', _('If you want to add an OpenID to your account, ' . 'enter it in the box below and click "Add".')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->element('label', array('for' => 'openid_url'), _('OpenID URL')); diff --git a/actions/othersettings.php b/actions/othersettings.php index cbb2c0cb9..b542233ca 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -107,7 +107,7 @@ class OthersettingsAction extends AccountSettingsAction 'metamark.net' => 'metamark.net' ); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), diff --git a/actions/profilesettings.php b/actions/profilesettings.php index 12251b83b..6dd4775e5 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -93,7 +93,7 @@ class ProfilesettingsAction extends AccountSettingsAction # too much common patterns here... abstractable? - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('nickname', _('Nickname'), ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname, diff --git a/actions/register.php b/actions/register.php index 08243c1e2..159daaa73 100644 --- a/actions/register.php +++ b/actions/register.php @@ -343,7 +343,7 @@ class RegisterAction extends Action $this->hidden('code', $code); } - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('nickname', _('Nickname'), $this->trimmed('nickname'), _('1-64 lowercase letters or numbers, '. diff --git a/actions/smssettings.php b/actions/smssettings.php index 489fd1f58..f89cbe1ab 100644 --- a/actions/smssettings.php +++ b/actions/smssettings.php @@ -113,7 +113,7 @@ class SmssettingsAction extends ConnectSettingsAction $this->hidden('carrier', $confirm->address_extra); $this->submit('cancel', _('Cancel')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('code', _('Confirmation code'), null, _('Enter the code you received on your phone.')); @@ -121,7 +121,7 @@ class SmssettingsAction extends ConnectSettingsAction $this->elementEnd('ul'); $this->submit('confirm', _('Confirm')); } else { - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('sms', _('SMS Phone number'), ($this->arg('sms')) ? $this->arg('sms') : null, @@ -156,7 +156,7 @@ class SmssettingsAction extends ConnectSettingsAction $this->elementStart('fieldset', array('id' => 'settings_sms_preferences')); $this->element('legend', null, _('Preferences')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->checkbox('smsnotify', _('Send me notices through SMS; '. @@ -448,7 +448,7 @@ class SmssettingsAction extends ConnectSettingsAction $cnt = $carrier->find(); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->element('label', array('for' => 'carrier'), _('Mobile carrier')); $this->elementStart('select', array('name' => 'carrier', diff --git a/actions/twittersettings.php b/actions/twittersettings.php index 079099123..efc8215cd 100644 --- a/actions/twittersettings.php +++ b/actions/twittersettings.php @@ -104,7 +104,7 @@ class TwittersettingsAction extends ConnectSettingsAction $this->elementStart('fieldset', array('id' => 'settings_twitter_account')); $this->element('legend', null, _('Twitter Account')); $this->hidden('token', common_session_token()); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); if ($fuser) { $this->elementStart('li'); $this->element('span', 'twitter_user', $fuser->nickname); @@ -133,7 +133,7 @@ class TwittersettingsAction extends ConnectSettingsAction array('id' => 'settings_twitter_preferences')); $this->element('legend', null, _('Preferences')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->checkbox('noticesync', _('Automatically send my notices to Twitter.'), diff --git a/lib/noticeform.php b/lib/noticeform.php index d6a3aa9c2..f0205f1c1 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -123,7 +123,7 @@ class NoticeForm extends Form { $user = common_current_user(); - $this->out->elementStart('ul', 'form_datas'); + $this->out->elementStart('ul', 'form_data'); $this->out->elementStart('li', array('id' => 'notice_text')); $this->out->element('label', array('for' => 'notice_data-text'), sprintf(_('What\'s up, %s?'), $user->nickname)); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 716f3256f..d659a4b4c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -114,17 +114,17 @@ font-style:italic; } -.form_settings .form_datas li { +.form_settings .form_data li { width:100%; float:left; } -.form_settings .form_datas label { +.form_settings .form_data label { float:left; } -.form_settings .form_datas textarea, -.form_settings .form_datas select, -.form_settings .form_datas input { +.form_settings .form_data textarea, +.form_settings .form_data select, +.form_settings .form_data input { margin-left:11px; float:left; } @@ -149,7 +149,7 @@ font-weight:bold; display:none; } -.form_settings .form_datas p.form_guide { +.form_settings .form_data p.form_guide { clear:both; margin-left:163px; margin-bottom:0; @@ -424,7 +424,7 @@ display:block; font-size:1.3em; margin-bottom:7px; } -#form_notice .form_datas li { +#form_notice .form_data li { float:left; } @@ -979,12 +979,12 @@ background-color:#D1D9E4; #user_actions #user_subscribe .form_note, -#user_actions #user_subscribe .form_datas, +#user_actions #user_subscribe .form_data, #user_actions #user_subscribe .form_actions label { display:none; } #form_user-relationship .form_note, -#form_user-relationship .form_datas, +#form_user-relationship .form_data, #form_user-relationship .form_actions label { display:block; } @@ -992,7 +992,7 @@ display:block; #user_actions #user-relationship_submit { margin-bottom:0; } -#form_user-relationship .form_datas li label { +#form_user-relationship .form_data li label { margin-right:11px; } @@ -1070,7 +1070,7 @@ font-size:2.2em; -#form_settings_photo .form_datas { +#form_settings_photo .form_data { clear:both; } -- cgit v1.2.3-54-g00ecf From 1a6d120f28d232f3c6684450b197203fe297a605 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 03:16:50 +0000 Subject: margin-bottom for global nav for more space --- theme/base/css/display.css | 1 + 1 file changed, 1 insertion(+) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d659a4b4c..22e1e7b9e 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -213,6 +213,7 @@ margin-bottom:29px; #site_nav_global_primary { float:right; margin-right:18px; +margin-bottom:11px; } #site_nav_global_primary ul li { display:inline; -- cgit v1.2.3-54-g00ecf From ea2e908bc0bf875b9e3967d0143f116e0c8b0885 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 03:20:41 +0000 Subject: More space for the counter --- theme/base/css/display.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 22e1e7b9e..1d22901fe 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -418,7 +418,7 @@ width:377px; width:370px; height:86px; line-height:1.5; -padding:7px 7px 14px 7px; +padding:7px 7px 16px 7px; } #form_notice label { display:block; @@ -441,7 +441,7 @@ margin-left:4px; #form_notice .form_note { position:absolute; -top:116px; +top:120px; right:98px; z-index:9; } -- cgit v1.2.3-54-g00ecf From 2fb53cdae446313546b7e65dccfef046fb7150da Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 03:54:46 +0000 Subject: Cleaning styles --- theme/base/css/display.css | 25 ++++++++++++++----------- theme/default/css/display.css | 27 +++++++++++---------------- theme/identica/css/display.css | 27 +++++++++++---------------- 3 files changed, 36 insertions(+), 43 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 1d22901fe..e9799160c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -696,6 +696,12 @@ border-top:1px dashed #D1D9E4; list-style-type:none; /*margin-bottom:11px;*/ } +.notices li.hover { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + /* NOTICES */ #notices_primary { @@ -761,20 +767,17 @@ display:inline; #laconicat .notice p.entry-content { /*margin-left:199px;*/ } -.notice p.entry-content a { - -} -.notice p.entry-content a:hover { - -} -.notice p.entry-content .tag a { - +.notice p.entry-content a:visited { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; } -.notice p.entry-content .tag a:hover { - +.notice p.entry-content .vcard a { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; } - .notice div.entry-content { /*border:1px solid blue;*/ clear:left; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 877c833fe..2d3cd9dc9 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -38,15 +38,9 @@ color:#002E6E; .notice p.entry-content a:visited { background-color:#fcfcfc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } .notice p.entry-content .vcard a { background-color:#fcfffc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } #aside_primary, @@ -78,8 +72,16 @@ font-weight:bold; padding:2px 4px; } +#content, #site_nav_local_views a { border-color:#fff; +} +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + +#site_nav_local_views a { background-color:rgba(255, 255, 255, 0.2); } #site_nav_local_views a:hover { @@ -87,10 +89,6 @@ background-color:rgba(255, 255, 255, 0.7); } -#content, -#site_nav_local_views .current a { -background-color:#fff; -} #page_notice .error { @@ -193,7 +191,9 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 div.notice-options { opacity:0.3; } - +.notices li.hover div.notice-options { +opacity:1; +} div.entry-content { color:#333; } @@ -204,11 +204,6 @@ font-family:sans-serif; .notices li.hover { background-color:#fcfcfc; } -.notices li.hover div.entry-content, -.notices li.hover div.notice-options { -opacity:1; -} - /*END: NOTICES */ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 877c833fe..2d3cd9dc9 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -38,15 +38,9 @@ color:#002E6E; .notice p.entry-content a:visited { background-color:#fcfcfc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } .notice p.entry-content .vcard a { background-color:#fcfffc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } #aside_primary, @@ -78,8 +72,16 @@ font-weight:bold; padding:2px 4px; } +#content, #site_nav_local_views a { border-color:#fff; +} +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + +#site_nav_local_views a { background-color:rgba(255, 255, 255, 0.2); } #site_nav_local_views a:hover { @@ -87,10 +89,6 @@ background-color:rgba(255, 255, 255, 0.7); } -#content, -#site_nav_local_views .current a { -background-color:#fff; -} #page_notice .error { @@ -193,7 +191,9 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 div.notice-options { opacity:0.3; } - +.notices li.hover div.notice-options { +opacity:1; +} div.entry-content { color:#333; } @@ -204,11 +204,6 @@ font-family:sans-serif; .notices li.hover { background-color:#fcfcfc; } -.notices li.hover div.entry-content, -.notices li.hover div.notice-options { -opacity:1; -} - /*END: NOTICES */ -- cgit v1.2.3-54-g00ecf From 6967e3ec86b421066cd3d5be74a103a3b394937c Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 04:19:14 +0000 Subject: Setting up a way to deal with different logo sizes. --- theme/base/css/display.css | 7 ++----- theme/default/css/display.css | 9 ++++++++- theme/identica/css/display.css | 7 +++++++ 3 files changed, 17 insertions(+), 6 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e9799160c..e337f1c98 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -195,13 +195,11 @@ float:left; margin-bottom:18px; margin-left:18px; } -address .fn, -address .email { -display:none; +address.vcard img.logo { +margin-right:0; } - #header { width:100%; position:relative; @@ -399,7 +397,6 @@ border-radius:7px; width:384px; width:458px; float:left; -margin-left:68px; position:relative; line-height:1; } diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 2d3cd9dc9..3c579cec7 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -2,12 +2,19 @@ html, body, a:active { -background-color:#ddd; +background-color:#777; } body { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size:1em; } +address { +margin-right:71px; +} +address .fn { +display:none; +} + input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 2d3cd9dc9..d5a5ce956 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -8,6 +8,13 @@ body { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size:1em; } +address { +margin-right:71px; +} +address .fn { +display:none; +} + input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } -- cgit v1.2.3-54-g00ecf From 838502dfd9894e409714c512f83179bab68446d7 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 04:46:18 +0000 Subject: timestamp anchor spacing for IE --- theme/base/css/ie.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme/base') diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index ef64da953..9baa953b3 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -22,5 +22,5 @@ margin-left:-7px; } .notice div.entry-content .timestamp a { -display:inline; +margin-right:4px; } \ No newline at end of file -- cgit v1.2.3-54-g00ecf