From 0ecdd5363df5e80464f80f58347102d2f1adb4fe Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 23:49:12 +0000 Subject: Profile settings styles --- actions/profilesettings.php | 30 +++++++++++++++++++++++++----- theme/base/css/display.css | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/actions/profilesettings.php b/actions/profilesettings.php index c31f76227..12251b83b 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -84,52 +84,72 @@ class ProfilesettingsAction extends AccountSettingsAction $profile = $user->getProfile(); $this->elementStart('form', array('method' => 'POST', - 'id' => 'profilesettings', + 'id' => 'form_settings_profile', + 'class' => 'form_settings', 'action' => common_local_url('profilesettings'))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Profile information')); $this->hidden('token', common_session_token()); # too much common patterns here... abstractable? + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('nickname', _('Nickname'), ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname, _('1-64 lowercase letters or numbers, no punctuation or spaces')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('fullname', _('Full name'), ($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('homepage', _('Homepage'), ($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage, _('URL of your homepage, blog, or profile on another site')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->textarea('bio', _('Bio'), ($this->arg('bio')) ? $this->arg('bio') : $profile->bio, _('Describe yourself and your interests in 140 chars')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('location', _('Location'), ($this->arg('location')) ? $this->arg('location') : $profile->location, _('Where you are, like "City, State (or Region), Country"')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('tags', _('Tags'), ($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()), _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated')); - + $this->elementEnd('li'); + $this->elementStart('li'); $language = common_language(); $this->dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), true, $language); - + $this->elementEnd('li'); $timezone = common_timezone(); $timezones = array(); foreach(DateTimeZone::listIdentifiers() as $k => $v) { $timezones[$v] = $v; } + $this->elementStart('li'); $this->dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), true, $timezone); - + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('autosubscribe', _('Automatically subscribe to whoever '. 'subscribes to me (best for non-humans)'), ($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe); - + $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 15377a7b5..396d12ef0 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -109,9 +109,23 @@ margin-bottom:29px; font-style:italic; } + +.form_settings .form_datas li { +width:100%; +float:left; +} + .form_login label, -.form_settings label { +.form_settings .form_datas label, +.form_login input, +.form_settings .form_datas input { margin-right:11px; +float:left; +} + +.form_settings label { +margin-top:7px; +width:123px; } .form_actions label { @@ -123,16 +137,31 @@ display:inline; font-weight:bold; } +#form_settings_profile legend { +display:none; +} + +.form_settings .form_datas p.form_guide { +clear:both; +margin-left:134px; +margin-bottom:0; +} + .form_settings p { -margin-bottom:18px; +margin-bottom:11px; } #settings_email_address { margin-bottom:29px; } +.form_settings input.checkbox { +margin-top:3px; +} .form_settings label.checkbox { font-weight:normal; +width:auto; +margin-top:0; } /* FORM SETTINGS */ -- cgit v1.2.3-54-g00ecf From 4687f6dac93a9f7b1f276eda7677821c5069433b Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 23:52:37 +0000 Subject: Other settings markup --- actions/othersettings.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/actions/othersettings.php b/actions/othersettings.php index f35630f36..cbb2c0cb9 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -83,11 +83,14 @@ class OthersettingsAction extends AccountSettingsAction { $user = common_current_user(); - $this->element('h2', null, _('URL Auto-shortening')); + $this->elementStart('form', array('method' => 'post', - 'id' => 'othersettings', + 'id' => 'form_settings_other', + 'class' => 'form_settings', 'action' => common_local_url('othersettings'))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('URL Auto-shortening')); $this->hidden('token', common_session_token()); // I18N @@ -104,12 +107,15 @@ class OthersettingsAction extends AccountSettingsAction 'metamark.net' => 'metamark.net' ); + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), false, $user->urlshorteningservice); - + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('save', _('Save')); - + $this->elementEnd('fieldset'); $this->elementEnd('form'); } -- cgit v1.2.3-54-g00ecf From cb35bd606149d01ba533a5198b65e6d88f76c81d Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 00:02:31 +0000 Subject: Reduced h1, legend font-size --- theme/base/css/display.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 396d12ef0..5d2ef324a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -17,7 +17,7 @@ width:1004px; width:71.714em; } h1 { -font-size:2.1em; +font-size:1.7em; line-height:1.1; margin-bottom:0.25em; } @@ -39,7 +39,7 @@ font-weight:bold; legend { font-weight:bold; -font-size:1.6em; +font-size:1.5em; text-transform:uppercase; } form { -- cgit v1.2.3-54-g00ecf From 620d0594fc5603d42292fcc5d43ccf20366f4fe8 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 00:58:43 +0000 Subject: Reusing @class form_settings --- actions/login.php | 1 - theme/base/css/display.css | 2 -- 2 files changed, 3 deletions(-) diff --git a/actions/login.php b/actions/login.php index 224b30f6f..e92087a28 100644 --- a/actions/login.php +++ b/actions/login.php @@ -131,7 +131,6 @@ class LoginAction extends Action { $this->elementStart('form', array('method' => 'post', 'id' => 'form_login', - 'class' => 'form_login', 'action' => common_local_url('login'))); $this->elementStart('fieldset'); $this->element('legend', null, _('Login to site')); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5d2ef324a..435cb1576 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -115,9 +115,7 @@ width:100%; float:left; } -.form_login label, .form_settings .form_datas label, -.form_login input, .form_settings .form_datas input { margin-right:11px; float:left; -- cgit v1.2.3-54-g00ecf From 88c7da66f0102b0890d52a53aba47c02a16fa5c2 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 01:02:42 +0000 Subject: Minor cleanup for login style --- actions/login.php | 1 + theme/base/css/display.css | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/actions/login.php b/actions/login.php index e92087a28..c213e2ab5 100644 --- a/actions/login.php +++ b/actions/login.php @@ -131,6 +131,7 @@ class LoginAction extends Action { $this->elementStart('form', array('method' => 'post', 'id' => 'form_login', + 'class' => 'form_settings', 'action' => common_local_url('login'))); $this->elementStart('fieldset'); $this->element('legend', null, _('Login to site')); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 435cb1576..35a146fa7 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -149,10 +149,6 @@ margin-bottom:0; margin-bottom:11px; } -#settings_email_address { -margin-bottom:29px; -} - .form_settings input.checkbox { margin-top:3px; } @@ -162,6 +158,10 @@ width:auto; margin-top:0; } +#form_login p.form_guide { +margin-left:0; +} + /* FORM SETTINGS */ -- cgit v1.2.3-54-g00ecf From ffb1bb1fbbab8ac25a725c1848d2607519959130 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 01:14:14 +0000 Subject: notice div.entry-content notice-options styles --- theme/base/css/display.css | 18 ++++++++++++++---- theme/identica/css/display.css | 8 +++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 35a146fa7..2af6cc67d 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -742,6 +742,7 @@ display:inline; clear:left; float:left; width:48%; +font-size:0.95em; } .notice div.entry-content a, .notice .notice-options a, @@ -800,13 +801,22 @@ outline:none; padding-left:2%; float:left; width:50%; +position:relative; } +.notice-options .notice_delete, .notice-options .notice_reply, .notice-options .notice_favorite { -float:left; -margin-right:11px; +position:absolute; +top:0; +} +.notice-options .notice_favorite { +left:0; } .notice-options .notice_reply { +left:29px; +} +.notice-options .notice_delete { +left:76px; } .notice-options .notice_reply dt { display:none; @@ -825,11 +835,11 @@ border:0; .notice-options .notice_reply a, .notice-options .notice_delete a { text-decoration:none; -padding-left:20px; +padding-left:16px; } .notice-options .notice_delete { -float:right; + } .notice-options form input.submit { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4af7cf239..9896529ab 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -180,12 +180,14 @@ background:transparent url(../images/icons/twotone/green/favourite.gif) no-repea background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } -div.entry-content, div.notice-options { -opacity:0.2; +opacity:0.3; font-family:sans-serif; } -div.entry-content a, + +div.entry-content { +color:#333; +} div.notice-options a, div.notice-options input { font-family:sans-serif; -- cgit v1.2.3-54-g00ecf From 245f317bbdfd10a44adedafd27a1be5b79bf7921 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 01:52:54 +0000 Subject: Tweaking notice div.entry-content which impacts notice-option input --- theme/base/css/display.css | 6 ++++++ theme/identica/css/display.css | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 2af6cc67d..e4b83a0fa 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -752,6 +752,7 @@ font-size:0.95em; .notice .notice-options a, .notice .notice-options input { float:left; +font-size:1.025em; } #laconicat .notice div.entry-content { @@ -802,6 +803,11 @@ padding-left:2%; float:left; width:50%; position:relative; +font-size:0.95em; +} + +.notice-options a { +float:left; } .notice-options .notice_delete, .notice-options .notice_reply, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 9896529ab..6880e756e 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -182,7 +182,6 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 div.notice-options { opacity:0.3; -font-family:sans-serif; } div.entry-content { -- cgit v1.2.3-54-g00ecf From c1a247358d08c666a838f74ca3d7a54906445746 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 02:34:30 +0000 Subject: Outline for notice-option anchor --- theme/base/css/display.css | 11 +++++++++-- theme/identica/css/display.css | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e4b83a0fa..789eaee4c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -162,6 +162,12 @@ margin-top:0; margin-left:0; } + +.form_settings .form_note { +-moz-border-radius:4px; +padding:0 7px; +} + /* FORM SETTINGS */ @@ -769,7 +775,7 @@ display:inline; display:none; } .notice div.entry-content .timestamp a { - +display:inline-block; } .notice div.entry-content .device dt { text-transform:lowercase; @@ -831,6 +837,7 @@ display:none; .notice-options input, .notice-options a { text-indent:-9999px; +outline:none; } .notice-options .notice_reply a, @@ -850,7 +857,7 @@ padding-left:16px; .notice-options form input.submit { cursor:pointer; -padding:2px 0 2px 17px; +padding:2px 0 2px 10px; } .notice-options .notice_delete dt, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 6880e756e..d3d28001a 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -203,6 +203,9 @@ background-color:#fcfcfc; opacity:1; } +.form_settings .form_note { +background-color:#A9BF4F; +} /*END: NOTICES */ -- cgit v1.2.3-54-g00ecf From 4b1cc73a583ce8b73760f6e709c0fc794af1b471 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 03:12:39 +0000 Subject: Favor/Disfavor form @class Created icon, and add style JS selector change Fixed return actions --- actions/disfavor.php | 2 +- actions/favor.php | 2 +- actions/login.php | 6 +++--- js/util.js | 8 ++++---- lib/disfavorform.php | 6 +++--- lib/favorform.php | 4 ++-- theme/base/css/display.css | 10 ++++++---- theme/identica/css/display.css | 9 ++++++--- 8 files changed, 26 insertions(+), 21 deletions(-) diff --git a/actions/disfavor.php b/actions/disfavor.php index fc36f7c75..3e3e4a547 100644 --- a/actions/disfavor.php +++ b/actions/disfavor.php @@ -69,7 +69,7 @@ class DisfavorAction extends Action $user->blowFavesCache(); if ($this->boolean('ajax')) { - common_start_html('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); $this->element('title', null, _('Add to favorites')); $this->elementEnd('head'); diff --git a/actions/favor.php b/actions/favor.php index 8d751a7a9..afda93cff 100644 --- a/actions/favor.php +++ b/actions/favor.php @@ -68,7 +68,7 @@ class FavorAction extends Action $user->blowFavesCache(); if ($this->boolean('ajax')) { - common_start_html('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); $this->element('title', null, _('Disfavor favorite')); $this->elementEnd('head'); diff --git a/actions/login.php b/actions/login.php index c213e2ab5..4e580d360 100644 --- a/actions/login.php +++ b/actions/login.php @@ -107,13 +107,13 @@ class LoginAction extends Action function showForm($error=null) { - $this->error = $error; - $this->showPage(); + $this->error = $error; + $this->showPage(); } function title() { - return _('Login'); + return _('Login'); } function showPageNotice() diff --git a/js/util.js b/js/util.js index 6fe477075..0a03b86c2 100644 --- a/js/util.js +++ b/js/util.js @@ -81,10 +81,10 @@ $(document).ready(function(){ this.appendChild(ajax); } - $("form.favor").ajaxForm(favoptions); - $("form.disfavor").ajaxForm(disoptions); - $("form.favor").each(addAjaxHidden); - $("form.disfavor").each(addAjaxHidden); + $("form.form_favor").ajaxForm(favoptions); + $("form.form_disfavor").ajaxForm(disoptions); + $("form.form_favor").each(addAjaxHidden); + $("form.form_disfavor").each(addAjaxHidden); $("#nudge").ajaxForm ({ dataType: 'xml', beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled"); diff --git a/lib/disfavorform.php b/lib/disfavorform.php index ffca0cd8b..d0c3b1832 100644 --- a/lib/disfavorform.php +++ b/lib/disfavorform.php @@ -88,7 +88,7 @@ class DisfavorForm extends Form function action() { - common_local_url('disfavor'); + return common_local_url('disfavor'); } /** @@ -136,7 +136,7 @@ class DisfavorForm extends Form function formClass() { - return 'disfavor'; + return 'form_disfavor'; } -} \ No newline at end of file +} diff --git a/lib/favorform.php b/lib/favorform.php index 37e13fb1c..f3a7a9756 100644 --- a/lib/favorform.php +++ b/lib/favorform.php @@ -88,7 +88,7 @@ class FavorForm extends Form function action() { - common_local_url('favor'); + return common_local_url('favor'); } /** @@ -148,6 +148,6 @@ class FavorForm extends Form function formClass() { - return 'notice_favorite'; + return 'form_favor'; } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 789eaee4c..9146a2bf5 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -817,11 +817,13 @@ float:left; } .notice-options .notice_delete, .notice-options .notice_reply, -.notice-options .notice_favorite { +.notice-options .form_favor, +.notice-options .form_disfavor { position:absolute; top:0; } -.notice-options .notice_favorite { +.notice-options .form_favor, +.notice-options .form_disfavor { left:0; } .notice-options .notice_reply { @@ -861,11 +863,11 @@ padding:2px 0 2px 10px; } .notice-options .notice_delete dt, -.notice-options .notice_favorite legend { +.notice-options .form_favor legend { display:none; } .notice-options .notice_delete fieldset, -.notice-options .notice_favorite fieldset { +.notice-options .form_favor fieldset { border:0; padding:0; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d3d28001a..832862551 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -62,7 +62,7 @@ border-color:#fff; background-color:rgba(255, 255, 255, 0.2); } #site_nav_local_views a:hover { -background-color:rgba(255, 255, 255, 0.7);: +background-color:rgba(255, 255, 255, 0.7); } @@ -87,7 +87,7 @@ background-image:url(../../base/images/icons/icon_atom.jpg); } #export_data li a.foaf { background-image:url(../../base/images/icons/icon_foaf.gif); -=} +} #export_data li a.export_vcard { background-image:url(../../base/images/icons/icon_vcard.gif); } @@ -173,9 +173,12 @@ background-color:transparent; .notice-options .notice_reply a { background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%; } -.notice-options form.notice_favorite input.submit { +.notice-options form.form_favor input.submit { background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%; } +.notice-options form.form_disfavor input.submit { +background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; +} .notice-options .notice_delete a { background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } -- cgit v1.2.3-54-g00ecf