From 88eb8c924ce35124560df71a58b8353309f2d25c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 1 Feb 2009 19:34:11 +0000 Subject: Reduced width and realigned anon_notice --- theme/base/css/display.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 809c1ba6f..0ba4f7628 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -240,10 +240,9 @@ display:none; #site_notice { position:absolute; -right:0; -top:49px; -float:right; -width:300px; +top:65px; +right:18px; +width:250px; } #page_notice { clear:both; -- cgit v1.2.3-54-g00ecf From 4f1345620a5df2a618dc2139249786335589abca Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 2 Feb 2009 14:14:14 +0000 Subject: Better cross-browser support for page and text zoom-in/out. --- lib/action.php | 2 +- theme/base/css/display.css | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/lib/action.php b/lib/action.php index dcf98f669..15a44ad1b 100644 --- a/lib/action.php +++ b/lib/action.php @@ -257,7 +257,7 @@ class Action extends HTMLOutputter // lawsuit function showBody() { $this->elementStart('body', array('id' => $this->trimmed('action'))); - $this->elementStart('div', 'wrap'); + $this->elementStart('div', array('id' => 'wrap')); $this->showHeader(); $this->showCore(); $this->showFooter(); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 0ba4f7628..db669c088 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -20,8 +20,6 @@ font-family:sans-serif; font-size:1em; line-height:1.65; position:relative; -margin:0 auto; -width:71.714em; } h1,h2,h3,h4,h5,h6 { text-transform:uppercase; @@ -253,6 +251,7 @@ margin-bottom:18px; #anon_notice { float:left; width:432px; +width:28.052em; padding:11px; border-radius:7px; -moz-border-radius:7px; @@ -360,9 +359,10 @@ margin-right:4px; } #wrap { -float:left; margin:0 auto; width:71.714em; +width:1003px; +overflow:hidden; } #core { @@ -390,9 +390,9 @@ float:left; } #aside_primary { -width:284px; +width:280px; float:left; -margin-left:2px; +margin-left:4px; padding:18px; border-radius:7px; -moz-border-radius:7px; @@ -748,7 +748,7 @@ border-radius:4px; /* NOTICES */ #notices_primary { float:left; -width:644px; +width:100%; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; @@ -1153,3 +1153,4 @@ clear:both; #form_settings_avatar .form_actions { margin-bottom:0; } + -- cgit v1.2.3-54-g00ecf From 5f004c0158f228531230bb6f2f668e368b69a9f3 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 2 Feb 2009 16:33:47 +0000 Subject: Added "Edit" entity_action. Updated theme files. --- actions/showstream.php | 24 +++++++++++++++-------- theme/base/css/display.css | 2 ++ theme/default/css/display.css | 43 +++++++----------------------------------- theme/default/css/ie.css | 9 +++++++++ theme/identica/css/display.css | 38 ++++--------------------------------- 5 files changed, 38 insertions(+), 78 deletions(-) create mode 100644 theme/default/css/ie.css (limited to 'theme/base/css/display.css') diff --git a/actions/showstream.php b/actions/showstream.php index eab1fc0a2..ecd952635 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -312,14 +312,22 @@ class ShowstreamAction extends Action } $this->elementEnd('div'); - //XXX: entity_actions doesn't need to be outputted if entity is looking at their own profile $this->elementStart('div', 'entity_actions'); $this->element('h2', null, _('User actions')); $this->elementStart('ul'); - $this->elementStart('li', array('class' => 'entity_subscribe')); $cur = common_current_user(); + + if ($cur && $cur->id == $this->profile->id) { + $this->elementStart('li', 'entity_edit'); + $this->element('a', array('href' => common_local_url('profilesettings'), + 'title' => _('Edit profile settings')), + _('Edit')); + $this->elementEnd('li'); + } + if ($cur) { if ($cur->id != $this->profile->id) { + $this->elementStart('li', 'entity_subscribe'); if ($cur->isSubscribed($this->profile)) { $usf = new UnsubscribeForm($this, $this->profile); $usf->show(); @@ -327,24 +335,24 @@ class ShowstreamAction extends Action $sf = new SubscribeForm($this, $this->profile); $sf->show(); } + $this->elementEnd('li'); } } else { + $this->elementStart('li', 'entity_subscribe'); $this->showRemoteSubscribeLink(); + $this->elementEnd('li'); } - $this->elementEnd('li'); - -// common_profile_new_message_nudge($cur, $this->user, $this->profile); $user = User::staticGet('id', $this->profile->id); if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) { - $this->elementStart('li', array('class' => 'entity_send-a-message')); + $this->elementStart('li', 'entity_send-a-message'); $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)), 'title' => _('Send a direct message to this user')), _('Message')); $this->elementEnd('li'); if ($user->email && $user->emailnotifynudge) { - $this->elementStart('li', array('class' => 'entity_nudge')); + $this->elementStart('li', 'entity_nudge'); $nf = new NudgeForm($this, $user); $nf->show(); $this->elementEnd('li'); @@ -353,7 +361,7 @@ class ShowstreamAction extends Action if ($cur && $cur->id != $this->profile->id) { $blocked = $cur->hasBlocked($this->profile); - $this->elementStart('li', array('class' => 'entity_block')); + $this->elementStart('li', 'entity_block'); if ($blocked) { $ubf = new UnblockForm($this, $this->profile); $ubf->show(); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index db669c088..207be17f3 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -605,12 +605,14 @@ display:block; .form_user_block input.submit, .form_user_unblock input.submit, .entity_send-a-message a, +.entity_edit a, .form_user_nudge input.submit, .entity_nudge p { border:0; padding-left:20px; } +.entity_edit a, .entity_send-a-message a, .entity_nudge p { padding:4px 4px 4px 23px; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 97a6a12a8..faff64967 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -92,12 +92,6 @@ color:#333; color:#000; } -#form_notice #notice_data-attach_view { -background-image:url(../images/icons/twotone/green/paper-clip.gif); -background-repeat:no-repeat; -background-position:0 45%; -background-color:transparent; -} #nav_register a { text-decoration:none; @@ -123,8 +117,6 @@ background-color:rgba(255, 255, 255, 0.7); } - - #page_notice .error { background-color:#F7E8E8; } @@ -144,8 +136,6 @@ background-color:#A9BF4F; } - - #export_data li a { background-repeat:no-repeat; background-position:0 45%; @@ -164,6 +154,7 @@ background-image:url(../../base/images/icons/icon_vcard.gif); } +.entity_edit a, .entity_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, @@ -185,6 +176,9 @@ color:#fff; background-color:#97BFD1; } +.entity_edit a { +background-image:url(../images/icons/twotone/green/edit.gif); +} .entity_send-a-message a { background-image:url(../images/icons/twotone/green/quote.gif); } @@ -204,30 +198,6 @@ background-image:url(../images/icons/twotone/green/shield.gif); background-color:#fcfcfc; } -.notice-data a span { -background-color:transparent; -background-repeat:no-repeat; -background-position:0 45%; -} -.notice_video .notice-data a span { -background-image:url(../images/icons/twotone/green/camera.gif); -} -.notice_audio .notice-data a span { -background-image:url(../images/icons/twotone/green/music.gif); -} -.notice_image .notice-data a span { -background-image:url(../images/icons/twotone/green/search.gif); -} -.notice_event .notice-data a span { -background-image:url(../images/icons/twotone/green/calendar.gif); -} -.notice_location .notice-data a span { -background-image:url(../images/icons/twotone/green/flag.gif); -} -.notice_document .notice-data a span { -background-image:url(../images/icons/twotone/green/document.gif); -} - .notice-options .notice_reply a, .notice-options form input.submit { background-color:transparent; @@ -274,12 +244,13 @@ background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 4 .pagination .nav_prev a, .pagination .nav_next a { background-repeat:no-repeat; +border-color:#D1D9E4; } .pagination .nav_prev a { background-image:url(../images/icons/twotone/green/arrow-left.gif); -background-position:0 45%; +background-position:10% 45%; } .pagination .nav_next a { background-image:url(../images/icons/twotone/green/arrow-right.gif); -background-position:100% 45%; +background-position:90% 45%; } diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css new file mode 100644 index 000000000..2b06768ea --- /dev/null +++ b/theme/default/css/ie.css @@ -0,0 +1,9 @@ +/* IE specific styles */ + +.notice-options input.submit { +color:#fff; +} + +#site_nav_local_views a { +background-color:#ACCCDA; +} diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index beb5a2c13..39b839d26 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -92,12 +92,6 @@ color:#333; color:#000; } -#form_notice #notice_data-attach_view { -background-image:url(../images/icons/twotone/green/paper-clip.gif); -background-repeat:no-repeat; -background-position:0 45%; -background-color:transparent; -} #nav_register a { text-decoration:none; @@ -123,8 +117,6 @@ background-color:rgba(255, 255, 255, 0.7); } - - #page_notice .error { background-color:#F7E8E8; } @@ -144,8 +136,6 @@ background-color:#9BB43E; } - - #export_data li a { background-repeat:no-repeat; background-position:0 45%; @@ -164,6 +154,7 @@ background-image:url(../../base/images/icons/icon_vcard.gif); } +.entity_edit a, .entity_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, @@ -185,6 +176,9 @@ color:#fff; background-color:#87B4C8; } +.entity_edit a { +background-image:url(../images/icons/twotone/green/edit.gif); +} .entity_send-a-message a { background-image:url(../images/icons/twotone/green/quote.gif); } @@ -204,30 +198,6 @@ background-image:url(../images/icons/twotone/green/shield.gif); background-color:#fcfcfc; } -.notice-data a span { -background-color:transparent; -background-repeat:no-repeat; -background-position:0 45%; -} -.notice_video .notice-data a span { -background-image:url(../images/icons/twotone/green/camera.gif); -} -.notice_audio .notice-data a span { -background-image:url(../images/icons/twotone/green/music.gif); -} -.notice_image .notice-data a span { -background-image:url(../images/icons/twotone/green/search.gif); -} -.notice_event .notice-data a span { -background-image:url(../images/icons/twotone/green/calendar.gif); -} -.notice_location .notice-data a span { -background-image:url(../images/icons/twotone/green/flag.gif); -} -.notice_document .notice-data a span { -background-image:url(../images/icons/twotone/green/document.gif); -} - .notice-options .notice_reply a, .notice-options form input.submit { background-color:transparent; -- cgit v1.2.3-54-g00ecf From 99fba4932d774e9891d29f18f2d8417a323bce1d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 2 Feb 2009 17:02:58 +0000 Subject: Ticket 1044 -- Removed border-top, reduced padding, changed notice count from 6 to 5, removed nickname. --- lib/popularnoticesection.php | 2 +- theme/base/css/display.css | 9 ++++++--- theme/default/css/display.css | 1 - theme/identica/css/display.css | 1 - 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php index 89daaa563..5734d8001 100644 --- a/lib/popularnoticesection.php +++ b/lib/popularnoticesection.php @@ -31,7 +31,7 @@ if (!defined('LACONICA')) { exit(1); } -define('NOTICES_PER_SECTION', 6); +define('NOTICES_PER_SECTION', 5); /** * Base class for sections showing lists of notices diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 207be17f3..242818c9a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1064,13 +1064,16 @@ margin-bottom:0; } .section .notice { -padding-top:11px; -padding-bottom:11px; +padding-top:7px; +padding-bottom:7px; +border-top:0; } .section .notice:first-child { padding-top:0; -border-top:0; +} +.section .notice .fn { +display:none; } diff --git a/theme/default/css/display.css b/theme/default/css/display.css index faff64967..6c6b514a6 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -67,7 +67,6 @@ color:#002E6E; .profile { border-top-color:#D1D9E4; } -.section .notice, .section .profile { border-top-color:#97BFD1; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 39b839d26..40eeab2a6 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -67,7 +67,6 @@ color:#002E6E; .profile { border-top-color:#CEE1E9; } -.section .notice, .section .profile { border-top-color:#87B4C8; } -- cgit v1.2.3-54-g00ecf From 8463d233976ecf06df60494ec061bcaf36819408 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 4 Feb 2009 14:35:34 +0000 Subject: http://laconi.ca/trac/ticket/1112 -- Removed only the author fn from display. --- theme/base/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 242818c9a..e2a2a965c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1072,7 +1072,7 @@ border-top:0; .section .notice:first-child { padding-top:0; } -.section .notice .fn { +.section .notice .author .fn { display:none; } -- cgit v1.2.3-54-g00ecf From 593d41f78b8caa94208abdd5787ef26280460b61 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 4 Feb 2009 16:45:46 +0000 Subject: Using overflow:hidden for long strings that don't contain any whitespace. This is both a preventive measure for user content that is abused (i.e., leaking text into other page components) and for aesthetics (requested by @evan) --- theme/base/css/display.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e2a2a965c..638b09520 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -24,6 +24,7 @@ position:relative; h1,h2,h3,h4,h5,h6 { text-transform:uppercase; margin-bottom:7px; +overflow:hidden; } h1 { font-size:1.4em; @@ -508,6 +509,7 @@ min-height:123px; float:left; margin-bottom:18px; margin-left:0; +overflow:hidden; } .entity_profile dt, #entity_statistics dt { @@ -767,6 +769,10 @@ padding-left:28px; margin-right:11px; } +.fn { +overflow:hidden; +} + .notice .author .fn { font-weight:bold; } @@ -791,7 +797,7 @@ text-decoration:underline; .notice .entry-title { float:left; width:100%; -overflow:auto; +overflow:hidden; } #shownotice .notice .entry-title { font-size:2.2em; -- cgit v1.2.3-54-g00ecf From b43bdda312fb10501597251f406e58b5b907d480 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 4 Feb 2009 18:18:25 +0000 Subject: Removing extra margin after .section .notice .author. --- theme/base/css/display.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 638b09520..60eaa8f22 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1078,6 +1078,10 @@ border-top:0; .section .notice:first-child { padding-top:0; } + +.section .notice .author { +margin-right:0; +} .section .notice .author .fn { display:none; } -- cgit v1.2.3-54-g00ecf From ac23321a4039eeffe2d7fedf2a45504b97b49b70 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 6 Feb 2009 06:27:04 +0000 Subject: Added primary and secondary form actions. Fixed markup for form_notice_delete --- actions/deletenotice.php | 15 ++++++++------- theme/base/css/display.css | 13 ++++++++++--- theme/default/css/display.css | 6 +++++- theme/identica/css/display.css | 6 +++++- 4 files changed, 28 insertions(+), 12 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/actions/deletenotice.php b/actions/deletenotice.php index d4b8e50e5..16e2df889 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -103,17 +103,18 @@ class DeletenoticeAction extends DeleteAction function showContent() { - $this->elementStart('form', array('id' => 'notice_delete_form', + $this->elementStart('form', array('id' => 'form_notice_delete', + 'class' => 'form_settings', 'method' => 'post', 'action' => common_local_url('deletenotice'))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Delete notice')); $this->hidden('token', common_session_token()); $this->hidden('notice', $this->trimmed('notice')); - $this->elementStart('p'); - $this->element('span', array('id' => 'confirmation_text'), - _('Are you sure you want to delete this notice?')); - $this->submit('yes', _('Yes')); - $this->submit('no', _('No')); - $this->elementEnd('p'); + $this->element('p', null, _('Are you sure you want to delete this notice?')); + $this->submit('form_action-yes', _('Yes'), 'submit form_action-primary', 'yes'); + $this->submit('form_action-no', _('No'), 'submit form_action-secondary', 'no'); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 60eaa8f22..f6e3c0fc7 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -152,7 +152,8 @@ font-weight:bold; #form_remote_subscribe legend, #form_openid_login legend, #form_search legend, -#form_invite legend { +#form_invite legend, +#form_notice_delete legend { display:none; } @@ -179,6 +180,7 @@ float:left; width:90%; } + #form_login p.form_guide, #form_register #settings_rememberme p.form_guide, #form_openid_login #settings_rememberme p.form_guide, @@ -194,12 +196,16 @@ border-radius:4px; padding:0 7px; } + +.form_settings input.form_action-secondary { +margin-left:29px; +padding:0; +} + #form_search .submit { margin-left:11px; } - - address { float:left; margin-bottom:18px; @@ -1169,3 +1175,4 @@ clear:both; margin-bottom:0; } + diff --git a/theme/default/css/display.css b/theme/default/css/display.css index da1ba6717..854202956 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -34,6 +34,9 @@ border-color:#aaa; border-color:#97BFD1; } +.form_settings input.form_action-secondary { +background:none; +} input.submit, #form_notice.warning #notice_text-count, @@ -59,7 +62,8 @@ div.notice-options input, .form_user_unblock input.submit, .entity_send-a-message a, .form_user_nudge input.submit, -.entity_nudge p { +.entity_nudge p, +.form_settings input.form_action-secondary { color:#002E6E; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 6fcd730a9..9f6499013 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -34,6 +34,9 @@ border-color:#aaa; border-color:#ddd; } +.form_settings input.form_action-secondary { +background:none; +} input.submit, #form_notice.warning #notice_text-count, @@ -59,7 +62,8 @@ div.notice-options input, .form_user_unblock input.submit, .entity_send-a-message a, .form_user_nudge input.submit, -.entity_nudge p { +.entity_nudge p, +.form_settings input.form_action-secondary { color:#002E6E; } -- cgit v1.2.3-54-g00ecf From 8ec312043f8f4026d560e2cd0805200cb6c0f31a Mon Sep 17 00:00:00 2001 From: Meitar Moscovitz Date: Sat, 7 Feb 2009 04:03:25 +1100 Subject: Add a link to the group search page from a user's own group list. I've seen a request or two pop up for this on the Laconica group on Identica, and I'd personally like there to be a link to the search page from my own groups listing, as I often find myself looking for one and end up at my browser's address bar. --- actions/usergroups.php | 6 ++++++ theme/base/css/display.css | 2 +- theme/default/css/display.css | 5 ++++- theme/identica/css/display.css | 5 ++++- 4 files changed, 15 insertions(+), 3 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/actions/usergroups.php b/actions/usergroups.php index 58cf7eeb6..ded4ba76b 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -125,6 +125,12 @@ class UsergroupsAction extends Action _('Create a new group')); $this->elementEnd('p'); + $this->elementStart('p', array('id' => 'group_search')); + $this->element('a', array('href' => common_local_url('groupsearch'), + 'class' => 'more'), + _('Search for more groups')); + $this->elementEnd('p'); + $offset = ($this->page-1) * GROUPS_PER_PAGE; $limit = GROUPS_PER_PAGE + 1; diff --git a/theme/base/css/display.css b/theme/base/css/display.css index f6e3c0fc7..3b72d00ce 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -947,7 +947,7 @@ padding:0; -#new_group { +#new_group, #group_search { margin-bottom:18px; } #new_group a { diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 854202956..85b5aa13e 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -238,7 +238,10 @@ background-color:#fcfcfc; #new_group a { background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; } - +#usergroups #new_group { +float: left; +margin-right: 2em; +} .pagination .nav_prev a, .pagination .nav_next a { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 9f6499013..576a2e14b 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -238,7 +238,10 @@ background-color:#fcfcfc; #new_group a { background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; } - +#usergroups #new_group { +float: left; +margin-right: 2em; +} .pagination .nav_prev a, .pagination .nav_next a { -- cgit v1.2.3-54-g00ecf