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. --- theme/identica/css/display.css | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) (limited to 'theme/identica/css/display.css') 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/identica/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 9abfe1848a32b8ff465b969d1b89f5d5383605ec Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 2 Feb 2009 17:21:33 +0000 Subject: Ticket 1029 -- Atom feed icon. Also updated the RSS icon to PNG version. --- theme/base/images/icons/icon_atom.jpg | Bin 1117 -> 0 bytes theme/base/images/icons/icon_atom.png | Bin 0 -> 820 bytes theme/base/images/icons/icon_rss.jpg | Bin 1166 -> 0 bytes theme/base/images/icons/icon_rss.png | Bin 0 -> 777 bytes theme/default/css/display.css | 8 ++------ theme/identica/css/display.css | 8 ++------ 6 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 theme/base/images/icons/icon_atom.jpg create mode 100644 theme/base/images/icons/icon_atom.png delete mode 100644 theme/base/images/icons/icon_rss.jpg create mode 100644 theme/base/images/icons/icon_rss.png (limited to 'theme/identica/css/display.css') diff --git a/theme/base/images/icons/icon_atom.jpg b/theme/base/images/icons/icon_atom.jpg deleted file mode 100644 index 22853edc4..000000000 Binary files a/theme/base/images/icons/icon_atom.jpg and /dev/null differ diff --git a/theme/base/images/icons/icon_atom.png b/theme/base/images/icons/icon_atom.png new file mode 100644 index 000000000..6a001f11a Binary files /dev/null and b/theme/base/images/icons/icon_atom.png differ diff --git a/theme/base/images/icons/icon_rss.jpg b/theme/base/images/icons/icon_rss.jpg deleted file mode 100644 index da23422d0..000000000 Binary files a/theme/base/images/icons/icon_rss.jpg and /dev/null differ diff --git a/theme/base/images/icons/icon_rss.png b/theme/base/images/icons/icon_rss.png new file mode 100644 index 000000000..0ccd1ce25 Binary files /dev/null and b/theme/base/images/icons/icon_rss.png differ diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 6c6b514a6..da1ba6717 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -140,18 +140,14 @@ background-repeat:no-repeat; background-position:0 45%; } #export_data li a.rss { -background-image:url(../../base/images/icons/icon_rss.jpg); +background-image:url(../../base/images/icons/icon_rss.png); } #export_data li a.atom { -background-image:url(../../base/images/icons/icon_atom.jpg); +background-image:url(../../base/images/icons/icon_atom.png); } #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); -} - .entity_edit a, .entity_send-a-message a, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 40eeab2a6..6fcd730a9 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -140,18 +140,14 @@ background-repeat:no-repeat; background-position:0 45%; } #export_data li a.rss { -background-image:url(../../base/images/icons/icon_rss.jpg); +background-image:url(../../base/images/icons/icon_rss.png); } #export_data li a.atom { -background-image:url(../../base/images/icons/icon_atom.jpg); +background-image:url(../../base/images/icons/icon_atom.png); } #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); -} - .entity_edit a, .entity_send-a-message a, -- 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/identica/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/identica/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