From caaf237de8e07cecf9d1bbe20e98ca5c1a957f34 Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 14 Jan 2009 22:19:17 +0000 Subject: Base theme stylesheet includes layout, and typography information Identica theme stylesheet includes colour and background information --- theme/base/css/display.css | 1081 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1081 insertions(+) create mode 100644 theme/base/css/display.css (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css new file mode 100644 index 000000000..5fc24779b --- /dev/null +++ b/theme/base/css/display.css @@ -0,0 +1,1081 @@ +/* theme: base */ +* { margin:0; padding:0; } +img { display:block; border:0; } +a abbr { cursor: pointer; border-bottom:0; } +table { border-collapse:collapse; } +ol { list-style-position:inside; } +html { font-size: 87.5%; background-color:#fff; height:100%; } +body { +background-color:#fff; +color:#000; +font-family:sans-serif; +font-size:1em; +line-height:1.65; +position:relative; +margin:0 auto; +width:1004px; +width:71.714em; +max-width:100%; +} +h1 { +font-size:2.1em; +line-height:1.1; +margin-bottom:0.25em; +} +h2 { font-size:1.3em; } +h3 { font-size:1.2em; } +h4 { font-size:1.1em; } +h5 { font-size:1em; } +h6 { font-size:0.9em; } +h1,h2,h3,h4,h5,h6 { + text-transform:uppercase; + margin-bottom:7px; +} +legend { font-weight:bold; } +input, textarea, select, option { +padding:4px; +font-family:sans-serif; +font-size:1em; +-moz-border:radius:4px; +} +select, option { +padding-bottom:0; +} +fieldset { +padding:11px; +} +input:focus, textarea:focus, select:focus { +border-width:2px; +border-style: solid; +-moz-border:radius:4px; +} +caption { +font-weight:bold; +} +.opened { display: block !important;} +.closed { display: none !important;} +span.required { font-weight:bold; } +form ul li { +list-style-type:none; +margin:0 0 18px 0; +} +form label { +font-weight:bold; +/*margin:0 0 11px 0;*/ +} +form ul li input { +} +form .error { +margin-right:11px; +} +form label.submit { +display:none; +} +form .error_message { +display:block; +} +.form_response { +margin-bottom:18px; +} +.form_response dt { +} +.form_response dd { +} + +form input.remove, +form input.submit { +-moz-border-radius:4px; +} +form input.submit { +} + + + + +/* FORM SETTINGS */ +.form_settings fieldset { +padding:0; +border:0; +} +.form_settings legend { +display:none; +} +.form_settings .form_datas label { +display:block; +} + +.form_guide { +font-style:italic; +} + +.form_settings .form_actions label { +display:none; +} + +.form_settings #settings_autosubscribe label { +display:inline; +font-weight:bold; +} + + + +/* FORM SETTINGS */ + + + + +address { +float:left; +margin-bottom:18px; +} +address .fn, +address .email { +display:none; +} + + + +#header { +width:100%; +position:relative; +float:left; +padding-top:18px; +margin-bottom:29px; +} + +#site_nav_global_primary { +float:right; +} +#site_nav_global_primary ul li { +display:inline; +margin-left:11px; +} + + +.system_notice dt { +font-weight:bold; +text-transform:uppercase; +display:none; +} + +#site_notice { +position:absolute; +right:0; +top:49px; +float:right; +width:322px; +} +#page_notice { +clear:both; +margin-bottom:18px; +} + + + + +#footer { +float:left; +width:100%; +padding-bottom:11px; +} + + + +#site_nav_local_views { +width:100%; +float:left; +} +#site_nav_local_views dt { +display:none; +} +#site_nav_local_views li { +float:left; +margin-right:18px; +list-style-type:none; +} +#site_nav_local_views a { +float:left; +text-decoration:none; +padding:4px 11px; +-moz-border-radius-topleft:4px; +-moz-border-radius-topright:4px; +border-width:1px; +border-style:dashed; +border-bottom:0; +} +#site_nav_local_views .nav { +float:left; +width:100%; +} + + +#site_nav_global_primary dt, +#site_nav_global_secondary dt { +display:none; +} +/* +#site_nav_global_primary .current a { +font-weight:bold; +border-style:solid; +} +*/ +#site_nav_global_secondary { +margin-bottom:11px; +} + +#site_nav_global_secondary ul li { +display:inline; +margin-right:11px; +} +#export_data li a { +padding-left:20px; +} +#export_data li a.foaf { +padding-left:30px; +} +#export_data li a.export_vcard { +padding-left:28px; +} + + + +#export_data ul { +display:inline; +} +#export_data li { +list-style-type:none; +display:inline; +margin-left:11px; +} +#export_data li:first-child { +margin-left:0; +} + + + + +#licenses dt { +font-weight:bold; +display:none; +} +#licenses dd { +margin-bottom:11px; +} + + +#site_content_license_cc p { +float:left; +margin-left:10%; +width:90%; +} +#site_content_license_cc img { +float:left; +margin-left:-100%; +} + + +#wrap { + float:left; + margin:0 auto; + width:1004px; + width:71.714em; +} + + +#core { +position:relative; +width:100%; +float:left; +margin-bottom:1em; +} + +#content { +width:644px; +padding:18px; +float:left; +-moz-border-radius:7px; +-moz-border-radius-topleft:0; +} + +#content_inner { +position:relative; +} + +#supplemental_primary { +width:300px; +float:left; +margin-left:2px; +padding:18px 4px 18px 18px; +-moz-border-radius:7px; +} + + + + +/*Start: FORM NOTICE*/ +#form_notice { +width:384px; +float:left; +margin-left:86px; +position:relative; +line-height:1; +} +#form_notice fieldset { +border:0; +padding:0; +} +#form_notice legend { +display:none; +} +#form_notice textarea { +-moz-border-radius:4px; +width:304px; +height:95px; +line-height:1.5; +padding:7px 7px 14px 7px; +} +#form_notice label { +display:block; +font-size:1.3em; +margin-bottom:7px; +} +#form_notice .form_datas li { +float:left; +} + +#form_notice #notice_attach_file label, +#form_notice #notice_submit label { +display:none; +} + +#form_notice #notice_attachment { +margin-top:25px; +margin-left:4px; +} + +#form_notice .form_note { +position:absolute; +top:125px; +right:98px; +z-index:9; +} + +#form_notice .form_note dt { +font-weight:bold; +display:none; +} +#notice_text-count { +font-weight:bold; +line-height:1.15; +} + +#form_notice #notice_data-attach_view { +/*position:absolute;*/ +top:25px; +right:30px; +margin-left:4px; +padding:0; +cursor:pointer; +width:16px; +height:16px; +border:0; +text-indent:-9999px; +} +#form_notice .form_actions { +position:absolute; +top:107px; +right:0; +} +#form_notice li { +margin-bottom:0; +} +/*end FORM NOTICE*/ + + + + + +/* user_profile */ +#user_profile { +position:relative; +width:633px; +min-height:123px; +float:left; +margin-bottom:17px; +margin-left:0; +} +#user_profile dt, +#user_statistics dt { +font-weight:bold; +} +#user_profile .user_depiction { +float:left; +position:absolute; +top:0; +left:0; +width:96px; +} +#user_profile .user_fn, +#user_profile .user_nickname, +#user_profile .user_location, +#user_profile .user_url, +#user_profile .user_note, +#user_profile .user_tags { +float:left; +clear:left; +margin-left:125px; +width:322px; +margin-bottom:4px; +} + +#user_profile .user_fn, +#user_profile .user_nickname { +width:auto; +clear:none; +} +#user_profile .user_nickname { +margin-left:11px; +} +#user_profile .user_nickname .nickname { +font-style:italic; +font-weight:bold; +margin-left:4px; +margin-right:4px; +} + +#user_profile .user_nickname dd:before { +content: "("; +} +#user_profile .user_nickname dd:after { +content: ")"; +} + +#user_profile dt { +display:none; +} +#user_profile h2 { +display:none; +} +/* user_profile */ + +/*user_actions*/ +#user_actions { +clear:left; +float:left; +position:absolute; +top:0; +right:0; +} +#user_actions h2 { +display:none; +} +#user_actions ul { +list-style-type:none; +} +#user_actions li { +border-top-width:1px; +border-top-style:dotted; +} +#user_actions li:first-child { +border-top:0; +} +#user_actions fieldset { +border:0; +padding:0; +} +#user_actions legend { +display:none; +} + +#user_actions a, +#user_actions input.submit { +display:block; +text-align:left; +padding:4px 0 4px 19px; +} +#user_actions a { +text-decoration:none; +} +#user_subscribe a, +#TB_window input.submit, +#user_actions input.submit { +border:0; +cursor:pointer; +padding-left:16px; +width:100%; +font-size:0.9em; +} + +#user_subscribe a { +width:auto; +padding-left:20px; +} + +#user_subscribe a, +#TB_window input.submit, +.form_user_subscribe input.submit { +font-weight:bold; +} + + + +#user_send-a-message form { +clear:left; +width:322px; +margin-top:18px; +} + +#user_send-a-message textarea { +width:96%; +} + +.user_tags ul { +list-style-type:none; +} +.user_tags li { +display:inline; +margin-right:1em; +float:left; +} + + + +.aside .section { +margin-bottom:29px; +clear:both; +} +.aside .section h2 { +text-transform:uppercase; +font-size:1em; +} + +#user_statistics dt, +#user_statistics dd { +display:inline; +} +#user_statistics dt:after { +content: ":"; +} + + +#user_subscriptions, +#user_subscriptions-common { +float:left; +} +#user_subscriptions ul.users { +width:220px; +float:left; +} +#user_subscriptions .users li { +list-style-type:none; +float:left; +margin-right:7px; +margin-bottom:7px; +} +#user_subscriptions .users li .photo { +width:24px; +height:24px; +margin-right:0; +} +#user_subscriptions .users li .fn { +display:none; +} +.aside .section .more { +clear:both; +} + + + + + +/* NOTICE */ +.notice { +position:relative; +padding-top:18px; +padding-bottom:18px; +clear:both; +float:left; +width:644px; +width:96.699%; +width:100%; +border-top:1px dashed #D1D9E4; +/*-moz-border-radius:7px;*/ +} +.notices li { +list-style-type:none; +/*margin-bottom:11px;*/ +} + + +/* NOTICES */ +#notices_primary { +float:left; +width:644px; +-moz-border-radius:7px; +} +#notices_primary h2 { +display:none; +} +.notice-data a span { +display:block; +padding-left:28px; +} + + +.notice .author { +float:left; +width:96px; +width:199px; +margin-left:-217px; +margin-left:-199px; +} +.notice .author a { +} +.notice .author:after { +content:":"; +} + +.vcard .photo { +display:inline; +margin-right:11px; +margin-right:4px; +vertical-align:top; +} +.vcard .url { +text-decoration:none; +} +.vcard .fn { +border-bottom-width:1px; +border-bottom-style:dotted; +font-style:italic; +} +.vcard .fn:hover { +border-bottom-width:1px; +border-bottom-style:solid; +} + + +.notice .entry-title { +float:left; +margin-bottom:11px; +margin-left:217px; +margin-left:199px; +} +.notice p.entry-content { +float:left; +width:427px; +width:100%; +} + +.notice_video p.entry-content, +.notice_audio p.entry-content, +.notice_image p.entry-content, +.notice_location p.entry-content, +.notice_event p.entry-content, +.notice_document p.entry-content { +width:322px; +width:75.41%; +} +#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 .tag a:hover { + +} + + +.notice div.entry-content { +/*border:1px solid blue;*/ +clear:left; +float:left; +margin-left:11px; +margin-left:0; +margin-bottom:4px; +width:199px; +width:149px; +} +.notice div.entry-content, +.notice .notice-options a, +.notice .notice-options input { +font-size:0.9em; +} + + +#laconicat .notice div.entry-content { +/*margin-left:0;*/ +} + +.notice div.entry-content dl, +.notice div.entry-content dt, +.notice div.entry-content dd { +display:inline; +} +.notice div.entry-content .timestamp dt, +.notice div.entry-content .response dt { +display:none; +} +.notice div.entry-content .timestamp { + +} +.notice div.entry-content .device dt { +text-transform:lowercase; +} +.notice div.entry-content a { +text-decoration:none; +border-bottom-width:1px; +border-bottom-style:dotted; +} +.notice div.entry-content a:hover { +border-bottom-width:1px; +border-bottom-style:solid; +} + + + +.notice-data { +position:absolute; +top:18px; +right:0; +min-height:50px; +margin-bottom:4px; +} +.notice .entry-content .notice-data dt { +display:none; +} + +.notice-data a { +display:block; +outline:none; +} + + + +.notice-options { +margin-left:18px; +margin-left:260px; +margin-left:304px; +margin-left:18px; +margin-left:50px; +float:left; +} +.notice-options .reply, +.notice-options .notice_delete , +.notice-options .notice_favorite { +float:left; +margin-right:11px; +} +.notice-options .reply dt { +display:none; +} +.notice-options .reply a, +.notice-options form input.submit { +display:block; +border:0; +border-bottom-width:1px; +border-bottom-style:dotted; +padding-left:20px; + +} +.notice-options .reply a { +text-decoration:none; +} +.notice-options form input.submit { +cursor:pointer; +width:16px; +width:auto; +height:16px; +height:auto; +padding-top:0; +padding-right:0; +padding-bottom:0; +} + +.notice-options .notice_delete legend, +.notice-options .notice_favorite legend { +display:none; +} +.notice-options .notice_delete fieldset, +.notice-options .notice_favorite fieldset { +border:0; +padding:0; +} + + +.notice-options form.notice_delete { +margin-left:2em; +} +/*END: NOTICES */ + + + + + +.pagination dt { +font-weight:bold; +display:none; +} + +.pagination .nav { +float:left; +width:100%; +list-style-type:none; +} + +.pagination .nav_prev { +float:left; +} +.pagination .nav_next { +float:right; +} + +.pagination a { +display:block; +text-decoration:none; +font-weight:bold; +padding:7px; +border:1px dotted #D1D9E4; +border-bottom:0; +} + +.pagination .nav_prev a { +-moz-border-radius-topright:4px; +padding-left:20px; +border-left:0; +} +.pagination .nav_next a { +-moz-border-radius-topleft:4px; +padding-right:20px; +border-right:0; +} + + +/* END: NOTICE */ + + + + + + + +/*START: LOAD ALONG WITH JS*/ +.notice .in-reply-to { + width:98%; + margin-left:2%; +} +.notice .in-reply-to li { +background-color:#F7F9FB; +} +.notice .in-reply-to li .in-reply-to li { +background-color:#E4E9F0; +} +.notice .in-reply-to li .in-reply-to li .in-reply-to li { +background-color:#D1D9E4; +} + + + +#user_actions #user_subscribe .form_note, +#user_actions #user_subscribe .form_datas, +#user_actions #user_subscribe .form_actions label { +display:none; +} +#form_user-relationship .form_note, +#form_user-relationship .form_datas, +#form_user-relationship .form_actions label { +display:block; +} + +#user_actions #user-relationship_submit { +margin-bottom:0; +} +#form_user-relationship .form_datas li label { +margin-right:11px; +} + +#user_relationship_xfn { +/*z-index:1000; +position:absolute; +width:521px; +height:322px;*/ +display:none; +} +#user_relationship_xfn fieldset { +background-color:#fff; +} + +/*END: LOAD ALONG WITH JS*/ + + + +/* TOP_POSTERS */ +#top-posters caption { +text-align:left; +text-transform:uppercase; +} + +#top-posters thead { +display:none; +} +#top-poster_user { +width:199px; +} +#top-poster_number-of-notices { +width:123px; +} +#top-posters tbody td { +padding-right:11px; +padding-bottom:4px; +} +#top-posters img { +margin-right:7px; +height:24px; +width:24px; +} + + + +/* tagcloud */ +#tagcloud ul { +list-style-type:none; +} +#tagcloud ul li { +display:inline; +margin-right:7px; +line-height:1.4; +} + +#tagcloud.section dt { +text-transform:uppercase; +font-weight:bold; +} +#tagcloud .weight_1 { +font-size:1em; +} +#tagcloud .weight_2 { +font-size:1.3em; +} +#tagcloud .weight_3 { +font-size:1.6em; +} +#tagcloud .weight_4 { +font-size:1.9em; +} +#tagcloud .weight_5 { +font-size:2.2em; +} + + + +#form_settings_photo .form_datas { +clear:both; +} + + + + +#photo_original, +#photo_preview { +float:left; +} +#photo_preview, +#settings_photo_action-crop { +margin-left:29px; +} +#photo_preview_view { +height:96px; +width:96px; +overflow:hidden; +} + + + + +.section .groups, +#users_featured ul { +list-style-type:none; +} +.section .groups li, +#users_featured li { +margin-top:11px; +float:left; +width:100%; +} +.section .groups li:first-child, +#users_featured li:first-child { +margin-top:0; +} + +.section .groups .vcard, +#users_featured .vcard { +float:left; +margin-bottom:-23px; +} + +.section .groups dl, +#users_featured dl { +float:left; +margin-left:63px; +clear:left; +} +.section .groups dt, +#users_featured dt { +display:none; +font-weight:bold; +} + + + +#home.logged_out h1 { +display:none; +} + +#home #intro { +margin-bottom:29px; +float:left; +width:100%; +} + +#home #intro p { +margin-bottom:18px; +font-size:1.8em; +} + +#home #intro #guide_steps { +list-style-type:none; +} +#home #intro #guide_steps li { +float:left; +margin-left:18px; +} +#home #intro #guide_steps li:first-child { +margin-left:0; +} +#home #intro #guide_steps li a { +display:block; +float:left; +width:185px; +height:109px; +border-width:1px; +border-style:dotted; +text-decoration:none; +-moz-border-radius:7px; +padding:7px; +font-size:1.6em; +font-weight:bold; +text-align:center; +} + + +c +#testimonials { +clear:both; +} -- cgit v1.2.3-54-g00ecf From 7bb074898f0be7e606eeb9844adcba001c571b38 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 20:15:11 +0000 Subject: Up to date --- theme/base/css/display.css | 3 ++- theme/identica/css/display.css | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5fc24779b..8b2e2f801 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -127,6 +127,7 @@ font-weight:bold; address { float:left; margin-bottom:18px; +margin-left:18px; } address .fn, address .email { @@ -316,7 +317,7 @@ padding:18px 4px 18px 18px; #form_notice { width:384px; float:left; -margin-left:86px; +margin-left:68px; position:relative; line-height:1; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4659c7f2a..f6a4747c7 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -83,16 +83,16 @@ background-repeat:no-repeat; background-position:0 45%; } #export_data li a.rss { -background-image:url(../images/icons/icon_rss.jpg); +background-image:url(../../base/images/icons/icon_rss.jpg); } #export_data li a.atom { -background-image:url(../images/icons/icon_atom.jpg); +background-image:url(../../base/images/icons/icon_atom.jpg); } #export_data li a.foaf { -background-image:url(../images/icons/icon_foaf.gif); +background-image:url(../../base/images/icons/icon_foaf.gif); =} #export_data li a.export_vcard { -background-image:url(../images/icons/icon_vcard.gif); +background-image:url(../../base/images/icons/icon_vcard.gif); } -- cgit v1.2.3-54-g00ecf From 07e84976c2f4038f36570d969c4be63b134cf60d Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 22:02:58 +0000 Subject: Changed from supplemental_primary to aside_primary --- theme/base/css/display.css | 2 +- theme/identica/css/display.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 8b2e2f801..8685bdc87 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -302,7 +302,7 @@ float:left; position:relative; } -#supplemental_primary { +#aside_primary { width:300px; float:left; margin-left:2px; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index f6a4747c7..4f2ba4652 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -29,7 +29,7 @@ color:#002E6E; -#supplemental_primary { +#aside_primary { background-color:#CEE1E9; } -- cgit v1.2.3-54-g00ecf From 03221906071c7669b6c1d8a7ab5afc0deb4f26f8 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 02:49:51 +0000 Subject: Readjusted location and size for logo, form_notice, site_nav_global_primary --- theme/base/css/display.css | 6 +++++- 1 file changed, 5 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 8685bdc87..b58a5b09c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -316,6 +316,7 @@ padding:18px 4px 18px 18px; /*Start: FORM NOTICE*/ #form_notice { width:384px; +width:458px; float:left; margin-left:68px; position:relative; @@ -331,7 +332,9 @@ display:none; #form_notice textarea { -moz-border-radius:4px; width:304px; +width:377px; height:95px; +height:86px; line-height:1.5; padding:7px 7px 14px 7px; } @@ -357,6 +360,7 @@ margin-left:4px; #form_notice .form_note { position:absolute; top:125px; +top:116px; right:98px; z-index:9; } @@ -385,6 +389,7 @@ text-indent:-9999px; #form_notice .form_actions { position:absolute; top:107px; +top:98px; right:0; } #form_notice li { @@ -1076,7 +1081,6 @@ text-align:center; } -c #testimonials { clear:both; } -- cgit v1.2.3-54-g00ecf From 944876181cdd3fa1d44e517d6c103fd2ec3a8783 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 04:50:44 +0000 Subject: NoticeOver styles --- theme/base/css/display.css | 11 ++++++----- theme/identica/css/display.css | 19 ++++++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b58a5b09c..b039dc110 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -36,7 +36,7 @@ input, textarea, select, option { padding:4px; font-family:sans-serif; font-size:1em; --moz-border:radius:4px; +-moz-border-radius:4px; } select, option { padding-bottom:0; @@ -47,7 +47,7 @@ padding:11px; input:focus, textarea:focus, select:focus { border-width:2px; border-style: solid; --moz-border:radius:4px; +-moz-border-radius:4px; } caption { font-weight:bold; @@ -611,6 +611,9 @@ border-top:1px dashed #D1D9E4; list-style-type:none; /*margin-bottom:11px;*/ } +.notices li.over { +background-color:#fcfcfc; +} /* NOTICES */ @@ -786,11 +789,9 @@ display:none; .notice-options form input.submit { display:block; border:0; -border-bottom-width:1px; -border-bottom-style:dotted; padding-left:20px; - } + .notice-options .reply a { text-decoration:none; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 7e0c6d7b4..6ae85449a 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -176,8 +176,6 @@ background-image:url(../images/icons/twotone/green/document.gif); .notice-options .reply a, .notice-options form input.submit { background-color:transparent; -color:#333333; -border-bottom-color:#ccc; } .notice-options .reply a { background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%; @@ -188,6 +186,20 @@ background:transparent url(../images/icons/twotone/green/favourite.gif) no-repea .notice-options form.notice_delete input.submit { background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } + +.notice-options a, +.notice-options input { +opacity:0.1; +} +.notices li.hover { +background-color:#fcfcfc; +} +.notices li.hover .notice-options a, +.notices li.hover .notice-options input { +opacity:1; +} + + /*END: NOTICES */ @@ -221,6 +233,3 @@ background-color:#0f0; background-color:#00f; } - - - -- cgit v1.2.3-54-g00ecf From 0b8131deec0b6fb2056b065462a22437e9ba6962 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 15:43:30 +0000 Subject: Removed max-width:100% --- theme/base/css/display.css | 1 - 1 file changed, 1 deletion(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b039dc110..d56b41693 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -15,7 +15,6 @@ position:relative; margin:0 auto; width:1004px; width:71.714em; -max-width:100%; } h1 { font-size:2.1em; -- cgit v1.2.3-54-g00ecf From 4549e577ac2c349881c7a411c0e25d5bdd0a0c51 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 15:52:17 +0000 Subject: Updating Creative Commons text and image --- lib/action.php | 10 +++++----- lib/common.php | 2 +- theme/base/css/display.css | 11 +++++++---- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/lib/action.php b/lib/action.php index 792b9c057..129a4b24b 100644 --- a/lib/action.php +++ b/lib/action.php @@ -436,16 +436,16 @@ class Action extends HTMLOutputter // lawsuit $this->element('dt', array('id' => 'site_content_license'), _('Laconica software license')); $this->elementStart('dd', array('id' => 'site_content_license_cc')); $this->elementStart('p'); - $this->text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the ')); + $this->element('img', array('id' => 'license_cc', + 'src' => common_config('license', 'image'), + 'alt' => common_config('license', 'title'))); + $this->text(_('All criti.ca content and data are available under the ')); $this->element('a', array('class' => 'license', 'rel' => 'external license', 'href' => common_config('license', 'url')), common_config('license', 'title')); - $this->text(_('. Contributors should be attributed by full name or nickname.')); + $this->text(_('license.')); $this->elementEnd('p'); - $this->element('img', array('id' => 'license_cc', - 'src' => common_config('license', 'image'), - 'alt' => common_config('license', 'title'))); $this->elementEnd('dd'); } diff --git a/lib/common.php b/lib/common.php index 2ef26cfc6..05fef045a 100644 --- a/lib/common.php +++ b/lib/common.php @@ -79,7 +79,7 @@ $config = 'license' => array('url' => 'http://creativecommons.org/licenses/by/3.0/', 'title' => 'Creative Commons Attribution 3.0', - 'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'), + 'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'), 'mail' => array('backend' => 'mail', 'params' => null), diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d56b41693..87a3a01e0 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -253,6 +253,9 @@ margin-left:0; +#licenses { +font-size:0.9em; +} #licenses dt { font-weight:bold; @@ -260,17 +263,17 @@ display:none; } #licenses dd { margin-bottom:11px; +line-height:1.5; } #site_content_license_cc p { -float:left; -margin-left:10%; width:90%; } #site_content_license_cc img { -float:left; -margin-left:-100%; +display:inline; +vertical-align:top; +margin-right:4px; } -- cgit v1.2.3-54-g00ecf From 1b625dcfd70c2f0e3f17e819a95d0fd816c1440a Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 16:07:19 +0000 Subject: footer width --- theme/base/css/display.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 87a3a01e0..4d7611b30 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -175,7 +175,7 @@ margin-bottom:18px; #footer { float:left; -width:100%; +width:68%; padding-bottom:11px; } @@ -268,7 +268,6 @@ line-height:1.5; #site_content_license_cc p { -width:90%; } #site_content_license_cc img { display:inline; -- cgit v1.2.3-54-g00ecf From 8abf9351860408db930ce9f423f94baa97ed5f56 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 17:50:14 +0000 Subject: .notice style update --- theme/base/css/display.css | 59 ++++++++++++------------------------------ theme/identica/css/display.css | 5 +--- 2 files changed, 18 insertions(+), 46 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 4d7611b30..2892ca4f1 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -633,11 +633,7 @@ padding-left:28px; .notice .author { -float:left; -width:96px; -width:199px; -margin-left:-217px; -margin-left:-199px; +margin-right:11px; } .notice .author a { } @@ -647,34 +643,29 @@ content:":"; .vcard .photo { display:inline; -margin-right:11px; -margin-right:4px; -vertical-align:top; +margin-right:7px; +margin-bottom:7px; +float:left; } .vcard .url { text-decoration:none; } +.vcard .url:hover { +text-decoration:underline; +} .vcard .fn { -border-bottom-width:1px; -border-bottom-style:dotted; font-style:italic; } .vcard .fn:hover { -border-bottom-width:1px; -border-bottom-style:solid; + } .notice .entry-title { float:left; -margin-bottom:11px; -margin-left:217px; -margin-left:199px; } .notice p.entry-content { -float:left; -width:427px; -width:100%; +display:inline; } .notice_video p.entry-content, @@ -683,8 +674,6 @@ width:100%; .notice_location p.entry-content, .notice_event p.entry-content, .notice_document p.entry-content { -width:322px; -width:75.41%; } #laconicat .notice p.entry-content { /*margin-left:199px;*/ @@ -707,11 +696,7 @@ width:75.41%; /*border:1px solid blue;*/ clear:left; float:left; -margin-left:11px; -margin-left:0; -margin-bottom:4px; -width:199px; -width:149px; +width:48%; } .notice div.entry-content, .notice .notice-options a, @@ -741,12 +726,9 @@ text-transform:lowercase; } .notice div.entry-content a { text-decoration:none; -border-bottom-width:1px; -border-bottom-style:dotted; } .notice div.entry-content a:hover { -border-bottom-width:1px; -border-bottom-style:solid; +text-decoration:underline; } @@ -770,11 +752,7 @@ outline:none; .notice-options { -margin-left:18px; -margin-left:260px; -margin-left:304px; -margin-left:18px; -margin-left:50px; +margin-left:2%; float:left; } .notice-options .reply, @@ -783,6 +761,9 @@ float:left; float:left; margin-right:11px; } +.notice-options .reply { +margin-top:1px; +} .notice-options .reply dt { display:none; } @@ -790,21 +771,15 @@ display:none; .notice-options form input.submit { display:block; border:0; -padding-left:20px; } .notice-options .reply a { text-decoration:none; +padding-left:20px; } .notice-options form input.submit { cursor:pointer; -width:16px; -width:auto; -height:16px; -height:auto; -padding-top:0; -padding-right:0; -padding-bottom:0; +padding:0 0 0 17px; } .notice-options .notice_delete legend, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 6ae85449a..1eba97a45 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -130,10 +130,8 @@ color:#555; .vcard .fn { -border-bottom-color:#ccc; } .vcard .fn:hover { -border-bottom-color:#555; } @@ -142,10 +140,8 @@ border-bottom-color:#555; /* NOTICES */ .notice div.entry-content a { color:#333; -border-bottom-color:#ccc; } .notice div.entry-content a:hover { -border-bottom-color:#555; } @@ -190,6 +186,7 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 .notice-options a, .notice-options input { opacity:0.1; +color:#333; } .notices li.hover { background-color:#fcfcfc; -- cgit v1.2.3-54-g00ecf From 05b69a290ddddf91a407fe4603361b53bff009e3 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 18:04:04 +0000 Subject: Removed : after username --- 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 2892ca4f1..b8b260266 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -638,7 +638,7 @@ margin-right:11px; .notice .author a { } .notice .author:after { -content:":"; +/*content:":";*/ } .vcard .photo { -- cgit v1.2.3-54-g00ecf From f46fd284e4395a113cdcc6e019d6f1b4b9ef8ff6 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 16 Jan 2009 23:41:46 +0000 Subject: Update to forms and email settings --- actions/emailsettings.php | 50 +++++++++++++++++++++++++++++++++------------- lib/htmloutputter.php | 21 +++++-------------- lib/settingsgroupnav.php | 4 ++-- theme/base/css/display.css | 9 ++++++++- 4 files changed, 51 insertions(+), 33 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 4cd63a9d3..d03d5ff84 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -85,42 +85,46 @@ class EmailsettingsAction extends SettingsAction $user = common_current_user(); $this->elementStart('form', array('method' => 'post', - 'id' => 'emailsettings', + 'id' => 'form_settings_email', + 'class' => 'form_settings', 'action' => common_local_url('emailsettings'))); - + $this->elementStart('fieldset'); + $this->element('legend', null, _('Email settings')); $this->hidden('token', common_session_token()); + $this->elementStart('div', array('id' => 'settings_email_address')); $this->element('h2', null, _('Address')); if ($user->email) { - $this->elementStart('p'); - $this->element('span', 'address confirmed', $user->email); - $this->element('span', 'input_instructions', - _('Current confirmed email address.')); + $this->element('p', array('id' => 'email_confirmed', $user->email)); + $this->element('p', array('class' => 'form_note'), _('Current confirmed email address.')); $this->hidden('email', $user->email); - $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', - _('Awaiting confirmation on this address. '. - 'Check your inbox (and spam box!) for a message '. - 'with further instructions.')); + $this->element('p', array('id' => 'email_unconfirmed'), $confirm->address); + $this->element('p', array('class' => 'form_note'), + _('Awaiting confirmation on this address. '. + 'Check your inbox (and spam box!) for a message '. + 'with further instructions.')); $this->hidden('email', $confirm->address); - $this->elementEnd('p'); $this->submit('cancel', _('Cancel')); } else { + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('email', _('Email Address'), ($this->arg('email')) ? $this->arg('email') : null, _('Email address, like "UserName@example.org"')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('add', _('Add')); } } + $this->elementEnd('div'); + $this->elementStart('div', array('id' => 'settings_email_incoming')); if ($user->email) { $this->element('h2', null, _('Incoming email')); @@ -140,31 +144,49 @@ class EmailsettingsAction extends SettingsAction $this->elementEnd('p'); $this->submit('newincoming', _('New')); } + $this->elementEnd('div'); + $this->elementStart('div', array('id' => 'settings_email_preferences')); $this->element('h2', null, _('Preferences')); + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->checkbox('emailnotifysub', _('Send me notices of new subscriptions through email.'), $user->emailnotifysub); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('emailnotifyfav', _('Send me email when someone '. 'adds my notice as a favorite.'), $user->emailnotifyfav); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('emailnotifymsg', _('Send me email when someone sends me a private message.'), $user->emailnotifymsg); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('emailnotifynudge', _('Allow friends to nudge me and send me an email.'), $user->emailnotifynudge); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('emailpost', _('I want to post notices by email.'), $user->emailpost); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('emailmicroid', _('Publish a MicroID for my email address.'), $user->emailmicroid); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->elementEnd('div'); $this->submit('save', _('Save')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index eb8a612e4..37853f345 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -155,20 +155,17 @@ class HTMLOutputter extends XMLOutputter function input($id, $label, $value=null, $instructions=null) { - $this->elementStart('p'); $this->element('label', array('for' => $id), $label); $attrs = array('name' => $id, 'type' => 'text', - 'class' => 'input_text', 'id' => $id); if ($value) { $attrs['value'] = htmlspecialchars($value); } $this->element('input', $attrs); if ($instructions) { - $this->element('span', 'input_instructions', $instructions); + $this->element('p', 'form_guide', $instructions); } - $this->elementEnd('p'); } /** @@ -192,7 +189,6 @@ class HTMLOutputter extends XMLOutputter function checkbox($id, $label, $checked=false, $instructions=null, $value='true', $disabled=false) { - $this->elementStart('p'); $attrs = array('name' => $id, 'type' => 'checkbox', 'class' => 'checkbox', @@ -213,9 +209,8 @@ class HTMLOutputter extends XMLOutputter $label); $this->text(' '); if ($instructions) { - $this->element('span', 'input_instructions', $instructions); + $this->element('p', 'form_guide', $instructions); } - $this->elementEnd('p'); } /** @@ -240,7 +235,6 @@ class HTMLOutputter extends XMLOutputter function dropdown($id, $label, $content, $instructions=null, $blank_select=false, $selected=null) { - $this->elementStart('p'); $this->element('label', array('for' => $id), $label); $this->elementStart('select', array('id' => $id, 'name' => $id)); if ($blank_select) { @@ -257,9 +251,8 @@ class HTMLOutputter extends XMLOutputter } $this->elementEnd('select'); if ($instructions) { - $this->element('span', 'input_instructions', $instructions); + $this->element('p', 'form_guide', $instructions); } - $this->elementEnd('p'); } /** @@ -296,7 +289,6 @@ class HTMLOutputter extends XMLOutputter function password($id, $label, $instructions=null) { - $this->elementStart('p'); $this->element('label', array('for' => $id), $label); $attrs = array('name' => $id, 'type' => 'password', @@ -304,9 +296,8 @@ class HTMLOutputter extends XMLOutputter 'id' => $id); $this->element('input', $attrs); if ($instructions) { - $this->element('span', 'input_instructions', $instructions); + $this->element('p', 'form_guide', $instructions); } - $this->elementEnd('p'); } /** @@ -348,7 +339,6 @@ class HTMLOutputter extends XMLOutputter function textarea($id, $label, $content=null, $instructions=null) { - $this->elementStart('p'); $this->element('label', array('for' => $id), $label); $this->element('textarea', array('rows' => 3, 'cols' => 40, @@ -356,8 +346,7 @@ class HTMLOutputter extends XMLOutputter 'id' => $id), ($content) ? $content : ''); if ($instructions) { - $this->element('span', 'input_instructions', $instructions); + $this->element('p', 'form_guide', $instructions); } - $this->elementEnd('p'); } } diff --git a/lib/settingsgroupnav.php b/lib/settingsgroupnav.php index 044c74552..bd66c65a6 100644 --- a/lib/settingsgroupnav.php +++ b/lib/settingsgroupnav.php @@ -94,7 +94,7 @@ class SettingsGroupNav extends Widget _('Other options'))); $action_name = $this->action->trimmed('action'); - $this->action->elementStart('ul', array('id' => 'nav_views')); + $this->action->elementStart('ul', array('class' => 'nav')); foreach ($menu as $menuaction => $menudesc) { if ($menuaction == 'imsettings' && @@ -104,7 +104,7 @@ class SettingsGroupNav extends Widget $this->action->menuItem(common_local_url($menuaction), $menudesc[0], $menudesc[1], - $action_name == $menuaction); + $action_name === $menuaction); } $this->action->elementEnd('ul'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b8b260266..027cb1666 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -100,7 +100,7 @@ border:0; display:none; } .form_settings .form_datas label { -display:block; + } .form_guide { @@ -116,6 +116,13 @@ display:inline; font-weight:bold; } +.form_settings p { +margin-bottom:18px; +} + +#settings_email_address { +margin-bottom:29px; +} /* FORM SETTINGS */ -- cgit v1.2.3-54-g00ecf From 0a5125675b4165be4c8278edf8d30f33483081fa Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 00:01:53 +0000 Subject: Updates to form styling --- actions/emailsettings.php | 28 ++++++++++++---------------- lib/htmloutputter.php | 2 +- theme/base/css/display.css | 13 ++++++++++++- 3 files changed, 25 insertions(+), 18 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/actions/emailsettings.php b/actions/emailsettings.php index d03d5ff84..090df30dd 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -89,12 +89,10 @@ class EmailsettingsAction extends SettingsAction 'class' => 'form_settings', 'action' => common_local_url('emailsettings'))); - $this->elementStart('fieldset'); - $this->element('legend', null, _('Email settings')); - $this->hidden('token', common_session_token()); - $this->elementStart('div', array('id' => 'settings_email_address')); - $this->element('h2', null, _('Address')); + $this->elementStart('fieldset',array('id' => 'settings_email_address')); + $this->element('legend', null, _('Address')); + $this->hidden('token', common_session_token()); if ($user->email) { $this->element('p', array('id' => 'email_confirmed', $user->email)); @@ -122,12 +120,11 @@ class EmailsettingsAction extends SettingsAction $this->submit('add', _('Add')); } } - $this->elementEnd('div'); - - $this->elementStart('div', array('id' => 'settings_email_incoming')); - if ($user->email) { - $this->element('h2', null, _('Incoming email')); + $this->elementEnd('fieldset'); + if ($user->email) { + $this->elementStart('fieldset',array('id' => 'settings_email_incoming')); + $this->element('legend',_('Incoming email')); if ($user->incomingemail) { $this->elementStart('p'); $this->element('span', 'address', $user->incomingemail); @@ -143,11 +140,12 @@ class EmailsettingsAction extends SettingsAction 'cancels the old one.')); $this->elementEnd('p'); $this->submit('newincoming', _('New')); + $this->elementEnd('fieldset'); } - $this->elementEnd('div'); - $this->elementStart('div', array('id' => 'settings_email_preferences')); - $this->element('h2', null, _('Preferences')); + + $this->elementStart('fieldset', array('id' => 'settings_email_preferences')); + $this->element('legend', null, _('Preferences')); $this->elementStart('ul', 'form_datas'); $this->elementStart('li'); @@ -182,11 +180,9 @@ class EmailsettingsAction extends SettingsAction $user->emailmicroid); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->elementEnd('div'); + $this->elementEnd('fieldset'); $this->submit('save', _('Save')); - - $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 37853f345..71f17604b 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -204,7 +204,7 @@ class HTMLOutputter extends XMLOutputter } $this->element('input', $attrs); $this->text(' '); - $this->element('label', array('class' => 'checkbox_label', + $this->element('label', array('class' => 'checkbox', 'for' => $id), $label); $this->text(' '); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 027cb1666..294119c55 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -64,6 +64,13 @@ font-weight:bold; } form ul li input { } + +form input.checkbox { +position:relative; +top:2px; +left:0; +} + form .error { margin-right:11px; } @@ -97,7 +104,8 @@ padding:0; border:0; } .form_settings legend { -display:none; +font-size:1.6em; +text-transform:uppercase; } .form_settings .form_datas label { @@ -124,6 +132,9 @@ margin-bottom:18px; margin-bottom:29px; } +#settings_email_preferences label { +font-weight:normal; +} /* FORM SETTINGS */ -- 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 'theme/base/css/display.css') 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 b2f16c523466f40589712a173a35c1b0bf54ea99 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 01:08:55 +0000 Subject: SMS form settings --- actions/smssettings.php | 24 +++++++++++++++--------- theme/base/css/display.css | 7 ++----- 2 files changed, 17 insertions(+), 14 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/actions/smssettings.php b/actions/smssettings.php index d7c621b13..6d3c54942 100644 --- a/actions/smssettings.php +++ b/actions/smssettings.php @@ -88,7 +88,7 @@ class SmssettingsAction extends SettingsAction 'action' => common_local_url('smssettings'))); - $this->elementStart('fieldset'); + $this->elementStart('fieldset', array('id' => 'settings_sms_address')); $this->element('legend', null, _('Address')); $this->hidden('token', common_session_token()); @@ -142,21 +142,25 @@ class SmssettingsAction extends SettingsAction $this->submit('removeincoming', _('Remove')); } - $this->elementStart('p'); - $this->element('span', 'input_instructions', + $this->element('p', 'form_guide', _('Make a new email address for posting to; '. 'cancels the old one.')); - $this->elementEnd('p'); $this->submit('newincoming', _('New')); } - $this->elementStart('fieldset', array('id' => 'sms_preferences')); + $this->elementStart('fieldset', array('id' => 'settings_sms_preferences')); $this->element('legend', null, _('Preferences')); + + + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->checkbox('smsnotify', _('Send me notices through SMS; '. 'I understand I may incur '. 'exorbitant charges from my carrier.'), $user->smsnotify); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('save', _('Save')); @@ -440,8 +444,9 @@ class SmssettingsAction extends SettingsAction $cnt = $carrier->find(); - $this->elementStart('p'); - $this->element('label', array('for' => 'carrier')); + $this->elementStart('ul'); + $this->elementStart('li'); + $this->element('label', array('for' => 'carrier'), _('Mobile carrier')); $this->elementStart('select', array('name' => 'carrier', 'id' => 'carrier')); $this->element('option', array('value' => 0), @@ -451,13 +456,14 @@ class SmssettingsAction extends SettingsAction $carrier->name); } $this->elementEnd('select'); - $this->elementEnd('p'); - $this->element('span', 'input_instructions', + $this->element('p', 'form_guide', sprintf(_('Mobile carrier for your phone. '. 'If you know a carrier that accepts ' . 'SMS over email but isn\'t listed here, ' . 'send email to let us know at %s.'), common_config('site', 'email'))); + $this->elementEnd('li'); + $this->elementEnd('ul'); } /** diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 3aee52088..fce4c7b86 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -99,13 +99,10 @@ form input.submit { /* FORM SETTINGS */ -.form_settings { -margin-bottom:29px; -} - .form_settings fieldset { padding:0; border:0; +margin-bottom:29px; } .form_settings legend { font-size:1.6em; @@ -136,7 +133,7 @@ margin-bottom:18px; margin-bottom:29px; } -#settings_email_preferences label { +.form_settings label.checkbox { font-weight:normal; } -- cgit v1.2.3-54-g00ecf From 996eb1da4ea043360dbc7accf9254537d59c7df5 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 02:13:02 +0000 Subject: site nav local views styles -- rgba background color --- theme/base/css/display.css | 3 ++- theme/identica/css/display.css | 4 ++++ 2 files changed, 6 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 fce4c7b86..fb7e71acd 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -219,8 +219,9 @@ padding:4px 11px; -moz-border-radius-topleft:4px; -moz-border-radius-topright:4px; border-width:1px; -border-style:dashed; +border-style:solid; border-bottom:0; +font-weight:bold; } #site_nav_local_views .nav { float:left; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index c2eb4ef65..aed4f95e5 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -59,6 +59,10 @@ background-color:transparent; #site_nav_local_views a { 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);: } /* -- cgit v1.2.3-54-g00ecf From 607e65be81d6b42990706884f96fa024301c7893 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 02:32:13 +0000 Subject: Delete notice markup and styles --- lib/noticelist.php | 14 ++++++++------ theme/base/css/display.css | 17 +++++++++-------- theme/identica/css/display.css | 6 +++--- 3 files changed, 20 insertions(+), 17 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/lib/noticelist.php b/lib/noticelist.php index fde93a3b6..1283e43e4 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -438,7 +438,7 @@ class NoticeListItem extends Widget $reply_url = common_local_url('newnotice', array('replyto' => $this->profile->nickname)); - $this->out->elementStart('dl', 'reply'); + $this->out->elementStart('dl', 'notice_reply'); $this->out->element('dt', null, _('Reply to this notice')); $this->out->elementStart('dd'); $this->out->element('a', array('href' => $reply_url, @@ -459,11 +459,13 @@ class NoticeListItem extends Widget if ($user && $this->notice->profile_id == $user->id) { $deleteurl = common_local_url('deletenotice', array('notice' => $this->notice->id)); - $this->out->elementStart('a', array('class' => 'deletenotice', - 'href' => $deleteurl, - 'title' => _('delete'))); - $this->out->raw(' ×'); - $this->out->elementEnd('a'); + $this->out->elementStart('dl', 'notice_delete'); + $this->out->element('dt', null, _('Delete this notice')); + $this->out->elementStart('dd'); + $this->out->element('a', array('href' => $deleteurl, + 'title' => _('delete')), _('Delete')); + $this->out->elementEnd('dd'); + $this->out->elementEnd('dl'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index fb7e71acd..20e66c351 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -775,25 +775,26 @@ outline:none; margin-left:2%; float:left; } -.notice-options .reply, +.notice-options .notice_reply, .notice-options .notice_delete , .notice-options .notice_favorite { float:left; margin-right:11px; } -.notice-options .reply { +.notice-options .notice_reply { margin-top:1px; } -.notice-options .reply dt { +.notice-options .notice_reply dt { display:none; } -.notice-options .reply a, +.notice-options .notice_reply a, .notice-options form input.submit { display:block; border:0; } -.notice-options .reply a { +.notice-options .notice_reply a, +.notice-options .notice_delete a { text-decoration:none; padding-left:20px; } @@ -802,7 +803,7 @@ cursor:pointer; padding:0 0 0 17px; } -.notice-options .notice_delete legend, +.notice-options .notice_delete dt, .notice-options .notice_favorite legend { display:none; } @@ -813,8 +814,8 @@ padding:0; } -.notice-options form.notice_delete { -margin-left:2em; +.notice-options .notice_delete { +margin-left:3em; } /*END: NOTICES */ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index aed4f95e5..94e97d414 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -173,17 +173,17 @@ background-image:url(../images/icons/twotone/green/flag.gif); background-image:url(../images/icons/twotone/green/document.gif); } -.notice-options .reply a, +.notice-options .notice_reply a, .notice-options form input.submit { background-color:transparent; } -.notice-options .reply a { +.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 { background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%; } -.notice-options form.notice_delete input.submit { +.notice-options .notice_delete a { background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } -- cgit v1.2.3-54-g00ecf From 1df4a3831358753c59b996305a54bd2366450079 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 03:09:00 +0000 Subject: notice vcard url and a:visited style --- theme/base/css/display.css | 4 ++-- theme/identica/css/display.css | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 20e66c351..ce7f69b35 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -851,12 +851,12 @@ border-bottom:0; } .pagination .nav_prev a { --moz-border-radius-topright:4px; +-moz-border-radius-topright:7px; padding-left:20px; border-left:0; } .pagination .nav_next a { --moz-border-radius-topleft:4px; +-moz-border-radius-topleft:7px; padding-right:20px; border-right:0; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 94e97d414..1bb2ca01b 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -26,6 +26,17 @@ color:#EC008C; a { color:#002E6E; } +a:active { +background-color:#ddd; +} +.notice p.entry-content a:visited { +background-color:#fcfcfc; +-moz-border-radius:4px; +} +.notice p.entry-content .vcard a { +background-color:#fcfffc; +-moz-border-radius:4px; +} -- cgit v1.2.3-54-g00ecf From 05b00cc7df22d2e998d642e91fee6cea317a9b83 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 16:22:36 +0000 Subject: Login styles --- actions/login.php | 14 +++++++++- theme/base/css/display.css | 68 +++++++++++++++++++++------------------------- 2 files changed, 44 insertions(+), 38 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/actions/login.php b/actions/login.php index 23ab16676..224b30f6f 100644 --- a/actions/login.php +++ b/actions/login.php @@ -130,15 +130,27 @@ class LoginAction extends Action function showContent() { $this->elementStart('form', array('method' => 'post', - 'id' => 'login', + 'id' => 'form_login', + 'class' => 'form_login', 'action' => common_local_url('login'))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Login to site')); + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('nickname', _('Nickname')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->password('password', _('Password')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('rememberme', _('Remember me'), false, _('Automatically login in the future; ' . 'not for shared computers!')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('submit', _('Login')); $this->hidden('token', common_session_token()); + $this->elementEnd('fieldset'); $this->elementEnd('form'); $this->elementStart('p'); $this->element('a', array('href' => common_local_url('recoverpassword')), diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ce7f69b35..afddefd27 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -30,30 +30,38 @@ h1,h2,h3,h4,h5,h6 { text-transform:uppercase; margin-bottom:7px; } -legend { font-weight:bold; } +caption { +font-weight:bold; +} +.opened { display: block !important;} +.closed { display: none !important;} + + +legend { +font-weight:bold; +font-size:1.6em; +text-transform:uppercase; +} input, textarea, select, option { padding:4px; font-family:sans-serif; font-size:1em; -moz-border-radius:4px; } -select, option { -padding-bottom:0; -} -fieldset { -padding:11px; -} input:focus, textarea:focus, select:focus { border-width:2px; border-style: solid; --moz-border-radius:4px; } -caption { -font-weight:bold; + +select, option { +padding-bottom:0; } -.opened { display: block !important;} -.closed { display: none !important;} -span.required { font-weight:bold; } +fieldset { +padding:0; +border:0; +margin-bottom:29px; +} + form ul li { list-style-type:none; margin:0 0 18px 0; @@ -71,8 +79,10 @@ top:2px; left:0; } -form .error { -margin-right:11px; +#page_notice .error { +background-color:#F7E8E8; +padding:4px 7px; +-moz-border-radius:4px; } form label.submit { display:none; @@ -83,15 +93,7 @@ display:block; .form_response { margin-bottom:18px; } -.form_response dt { -} -.form_response dd { -} -form input.remove, -form input.submit { --moz-border-radius:4px; -} form input.submit { } @@ -99,24 +101,16 @@ form input.submit { /* FORM SETTINGS */ -.form_settings fieldset { -padding:0; -border:0; -margin-bottom:29px; -} -.form_settings legend { -font-size:1.6em; -text-transform:uppercase; -} -.form_settings .form_datas label { - -} - .form_guide { font-style:italic; } -.form_settings .form_actions label { +.form_login label, +.form_settings label { +margin-right:11px; +} + +.form_actions label { display:none; } -- cgit v1.2.3-54-g00ecf From f28f1108a98cb33404513f760d1a40e9e98d85b9 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 16:42:54 +0000 Subject: Opacity on notice div.entry-content and div.notice-options --- theme/base/css/display.css | 6 ++++-- theme/identica/css/display.css | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index afddefd27..213f0c0d2 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -59,9 +59,7 @@ padding-bottom:0; fieldset { padding:0; border:0; -margin-bottom:29px; } - form ul li { list-style-type:none; margin:0 0 18px 0; @@ -101,6 +99,10 @@ form input.submit { /* FORM SETTINGS */ +.form_settings fieldset { +margin-bottom:29px; +} + .form_guide { font-style:italic; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 1bb2ca01b..d1338e709 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -198,16 +198,16 @@ background:transparent url(../images/icons/twotone/green/favourite.gif) no-repea background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } -.notice-options a, -.notice-options input { -opacity:0.1; +div.entry-content, +div.notice-options { +opacity:0.2; color:#333; } .notices li.hover { background-color:#fcfcfc; } -.notices li.hover .notice-options a, -.notices li.hover .notice-options input { +.notices li.hover div.entry-content, +.notices li.hover div.notice-options { opacity:1; } -- cgit v1.2.3-54-g00ecf From 6cc3f78cf309a80c72156c673dceac21dde63603 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 20:06:56 +0000 Subject: Typography update to input and anchors on div.entry-content and div.notice-options --- theme/base/css/display.css | 35 ++++++++++++++++++----------------- theme/identica/css/display.css | 39 +++++++++++++++------------------------ 2 files changed, 33 insertions(+), 41 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 213f0c0d2..b0a41cede 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -42,6 +42,8 @@ font-weight:bold; font-size:1.6em; text-transform:uppercase; } +form { +} input, textarea, select, option { padding:4px; font-family:sans-serif; @@ -714,12 +716,15 @@ clear:left; float:left; width:48%; } -.notice div.entry-content, +.notice div.entry-content a, .notice .notice-options a, .notice .notice-options input { -font-size:0.9em; -} +} +.notice .notice-options a, +.notice .notice-options input { +float:left; +} #laconicat .notice div.entry-content { /*margin-left:0;*/ @@ -734,17 +739,16 @@ display:inline; .notice div.entry-content .response dt { display:none; } -.notice div.entry-content .timestamp { +.notice div.entry-content .timestamp a { } .notice div.entry-content .device dt { text-transform:lowercase; } .notice div.entry-content a { -text-decoration:none; + } .notice div.entry-content a:hover { -text-decoration:underline; } @@ -765,20 +769,17 @@ display:block; outline:none; } - - .notice-options { -margin-left:2%; +padding-left:2%; float:left; +width:50%; } .notice-options .notice_reply, -.notice-options .notice_delete , .notice-options .notice_favorite { float:left; margin-right:11px; } .notice-options .notice_reply { -margin-top:1px; } .notice-options .notice_reply dt { display:none; @@ -788,15 +789,19 @@ display:none; display:block; border:0; } - .notice-options .notice_reply a, .notice-options .notice_delete a { text-decoration:none; padding-left:20px; } + +.notice-options .notice_delete { +float:right; +} + .notice-options form input.submit { cursor:pointer; -padding:0 0 0 17px; +padding:2px 0 2px 17px; } .notice-options .notice_delete dt, @@ -809,10 +814,6 @@ border:0; padding:0; } - -.notice-options .notice_delete { -margin-left:3em; -} /*END: NOTICES */ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d1338e709..4af7cf239 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -1,28 +1,17 @@ /* theme: identica */ html { - background-color:#ddd; +background-color:#ddd; } body { - font-family: sans-serif; - font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; - font-size:1em; - +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +font-size:1em; } input, textarea, select, option { - font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } input:focus, textarea:focus, select:focus { border-color:#B2D0DD; } -form span.required { color:#f00; } -form .error { -background-color:#f00; -color:#fff; -} -form .error_message { -color:#EC008C; -} - a { color:#002E6E; } @@ -76,13 +65,6 @@ background-color:rgba(255, 255, 255, 0.2); background-color:rgba(255, 255, 255, 0.7);: } -/* -#site_nav_global_primary .current a { -font-weight:bold; -border-color:#ccc; -border-style:solid; -} -*/ #content, #site_nav_local_views .current a { @@ -154,7 +136,7 @@ color:#555; /* NOTICES */ .notice div.entry-content a { -color:#333; + } .notice div.entry-content a:hover { } @@ -201,7 +183,16 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 div.entry-content, div.notice-options { opacity:0.2; -color:#333; +font-family:sans-serif; +} +div.entry-content a, +div.notice-options a, +div.notice-options input { +font-family:sans-serif; +} +div.notice-options input { +color:#002E6E; + } .notices li.hover { background-color:#fcfcfc; -- cgit v1.2.3-54-g00ecf From e93807d0e47266805fcf26738a11f23b5e689d18 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 17 Jan 2009 20:48:09 +0000 Subject: Removed notice-options text labels :( --- theme/base/css/display.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b0a41cede..15377a7b5 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -784,6 +784,12 @@ margin-right:11px; .notice-options .notice_reply dt { display:none; } + +.notice-options input, +.notice-options a { +text-indent:-9999px; +} + .notice-options .notice_reply a, .notice-options form input.submit { display:block; -- cgit v1.2.3-54-g00ecf 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(-) (limited to 'theme/base/css/display.css') 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 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(-) (limited to 'theme/base/css/display.css') 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(-) (limited to 'theme/base/css/display.css') 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(-) (limited to 'theme/base/css/display.css') 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(-) (limited to 'theme/base/css/display.css') 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(-) (limited to 'theme/base/css/display.css') 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(-) (limited to 'theme/base/css/display.css') 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(-) (limited to 'theme/base/css/display.css') 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 From fbae20812329cb4c5a1eabdb5e746488680d1b08 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 16:01:10 +0000 Subject: Display noned legend of the login fieldset. --- theme/base/css/display.css | 3 ++- 1 file changed, 2 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 9146a2bf5..6f7f9aedf 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -135,7 +135,8 @@ display:inline; font-weight:bold; } -#form_settings_profile legend { +#form_settings_profile legend, +#form_login legend { display:none; } -- cgit v1.2.3-54-g00ecf From 00daeeba643121a51065ff7b6e55d6661d3bad24 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 16:06:12 +0000 Subject: Reduced h1 font-size again --- theme/base/css/display.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 6f7f9aedf..7433a45e4 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -16,30 +16,30 @@ margin:0 auto; width:1004px; width:71.714em; } +h1,h2,h3,h4,h5,h6 { + text-transform:uppercase; + margin-bottom:7px; +} h1 { -font-size:1.7em; -line-height:1.1; -margin-bottom:0.25em; +font-size:1.4em; +line-height:1; +margin-bottom:18px; } h2 { font-size:1.3em; } h3 { font-size:1.2em; } h4 { font-size:1.1em; } h5 { font-size:1em; } h6 { font-size:0.9em; } -h1,h2,h3,h4,h5,h6 { - text-transform:uppercase; - margin-bottom:7px; -} + caption { font-weight:bold; } .opened { display: block !important;} .closed { display: none !important;} - legend { font-weight:bold; -font-size:1.5em; +font-size:1.3em; text-transform:uppercase; } form { -- cgit v1.2.3-54-g00ecf 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 --- actions/register.php | 31 +++++++++++++++++++++++++++---- theme/base/css/display.css | 6 ++++-- 2 files changed, 31 insertions(+), 6 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/actions/register.php b/actions/register.php index b15aea08e..f0d47f19b 100644 --- a/actions/register.php +++ b/actions/register.php @@ -332,22 +332,32 @@ class RegisterAction extends Action } $this->elementStart('form', array('method' => 'post', - 'id' => 'login', + 'id' => 'form_register', + 'class' => 'form_settings', 'action' => common_local_url('register'))); - + $this->elementStart('fieldset'); + $this->element('legend', null, 'Account settings'); $this->hidden('token', common_session_token()); if ($code) { $this->hidden('code', $code); } + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('nickname', _('Nickname'), $this->trimmed('nickname'), _('1-64 lowercase letters or numbers, '. 'no punctuation or spaces. Required.')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->password('password', _('Password'), _('6 or more characters. Required.')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->password('confirm', _('Confirm'), _('Same as password above. Required.')); + $this->elementEnd('li'); + $this->elementStart('li'); if ($invite && $invite->address_type == 'email') { $this->input('email', _('Email'), $invite->address, _('Used only for updates, announcements, '. @@ -357,26 +367,36 @@ class RegisterAction extends Action _('Used only for updates, announcements, '. 'and password recovery')); } + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('fullname', _('Full name'), $this->trimmed('fullname'), _('Longer name, preferably your "real" name')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('homepage', _('Homepage'), $this->trimmed('homepage'), _('URL of your homepage, blog, '. 'or profile on another site')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->textarea('bio', _('Bio'), $this->trimmed('bio'), _('Describe yourself and your '. 'interests in 140 chars')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('location', _('Location'), $this->trimmed('location'), _('Where you are, like "City, '. 'State (or Region), Country"')); + $this->elementEnd('li'); + $this->elementStart('li', array('id' => 'settings_rememberme')); $this->checkbox('rememberme', _('Remember me'), $this->boolean('rememberme'), _('Automatically login in the future; '. 'not for shared computers!')); - $this->elementStart('p'); + $this->elementEnd('li'); $attrs = array('type' => 'checkbox', 'id' => 'license', 'name' => 'license', @@ -384,14 +404,17 @@ class RegisterAction extends Action if ($this->boolean('license')) { $attrs['checked'] = 'checked'; } + $this->elementStart('li'); $this->element('input', $attrs); $this->text(_('My text and files are available under ')); $this->element('a', array('href' => common_config('license', 'url')), $config['license']['title']); $this->text(_(' except this private data: password, '. 'email address, IM address, phone number.')); - $this->elementEnd('p'); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('submit', _('Register')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } 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/css/display.css') 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/css/display.css') 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/css/display.css') 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/css/display.css') 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/css/display.css') 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/css/display.css') 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/css/display.css') 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/css/display.css') 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/css/display.css') 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/css/display.css') 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/css/display.css') 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/css/display.css') 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 93a5865b2bb4965847abb383a49059022ca3177a Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 18:24:30 +0000 Subject: Bolding address fn for cases where there is no logo. --- theme/base/css/display.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e337f1c98..59429cf72 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -198,6 +198,9 @@ margin-left:18px; address.vcard img.logo { margin-right:0; } +address .fn { +font-weight:bold; +} #header { -- cgit v1.2.3-54-g00ecf From 96dc058bfa499e4acf9248b116eada2009d72371 Mon Sep 17 00:00:00 2001 From: sarven Date: Tue, 20 Jan 2009 05:58:35 +0000 Subject: Using nickname only for uid --- actions/showstream.php | 17 +++++++++-------- theme/base/css/display.css | 17 ++++++++++------- 2 files changed, 19 insertions(+), 15 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/actions/showstream.php b/actions/showstream.php index b877f5df3..1d79ea30d 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -239,6 +239,15 @@ class ShowstreamAction extends Action $this->elementEnd('dd'); $this->elementEnd('dl'); + $this->elementStart('dl', 'user_nickname'); + $this->element('dt', null, _('Nickname')); + $this->elementStart('dd'); + $this->element('a', array('href' => $this->profile->profileurl, + 'rel' => 'me', 'class' => 'nickname url uid'), + $this->profile->nickname); + $this->elementEnd('dd'); + $this->elementEnd('dl'); + if ($this->profile->fullname) { $this->elementStart('dl', 'user_fn'); $this->element('dt', null, _('Full name')); @@ -247,14 +256,6 @@ class ShowstreamAction extends Action $this->elementEnd('dd'); $this->elementEnd('dl'); } - $this->elementStart('dl', 'user_nickname'); - $this->element('dt', null, _('Nickname')); - $this->elementStart('dd'); - $this->element('a', array('href' => $this->profile->profileurl, - 'rel' => 'me', 'class' => 'fn nickname url uid'), - $this->profile->nickname); - $this->elementEnd('dd'); - $this->elementEnd('dl'); if ($this->profile->location) { $this->elementStart('dl', 'user_location'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 59429cf72..406ba3f9a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -489,7 +489,7 @@ margin-bottom:0; /* user_profile */ #user_profile { position:relative; -width:633px; +width:475px; min-height:123px; float:left; margin-bottom:17px; @@ -514,7 +514,7 @@ width:96px; #user_profile .user_tags { float:left; clear:left; -margin-left:125px; +margin-left:113px; width:322px; margin-bottom:4px; } @@ -524,21 +524,24 @@ margin-bottom:4px; width:auto; clear:none; } -#user_profile .user_nickname { +#user_profile .user_fn { margin-left:11px; +margin-left:4px; +margin-right:4px; +font-weight:bold; } #user_profile .user_nickname .nickname { font-style:italic; font-weight:bold; -margin-left:4px; -margin-right:4px; } -#user_profile .user_nickname dd:before { +#user_profile .user_fn dd:before { content: "("; +font-weight:normal; } -#user_profile .user_nickname dd:after { +#user_profile .user_fn dd:after { content: ")"; +font-weight:normal; } #user_profile dt { -- cgit v1.2.3-54-g00ecf From 9c43974d23dd55ce81797f789d59c16c90b5e854 Mon Sep 17 00:00:00 2001 From: sarven Date: Tue, 20 Jan 2009 20:46:45 +0000 Subject: fn font-style normal --- theme/base/css/display.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 406ba3f9a..3c776aea0 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -528,7 +528,10 @@ clear:none; margin-left:11px; margin-left:4px; margin-right:4px; +} +#user_profile .user_fn .fn { font-weight:bold; +font-style:normal; } #user_profile .user_nickname .nickname { font-style:italic; -- cgit v1.2.3-54-g00ecf From bb4a6a514bb62a0fef2314512c121951a40437e7 Mon Sep 17 00:00:00 2001 From: sarven Date: Tue, 20 Jan 2009 22:36:57 +0000 Subject: user_actions form markup and styling --- actions/showstream.php | 1 + lib/blockform.php | 15 ++++++++++++++- lib/subscribeform.php | 2 +- lib/unblockform.php | 13 ++++++++++++- lib/unsubscribeform.php | 2 +- theme/base/css/display.css | 30 ++++++++++++------------------ theme/identica/css/display.css | 35 +++++++++++++++++++++++------------ 7 files changed, 64 insertions(+), 34 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/actions/showstream.php b/actions/showstream.php index 1d79ea30d..d550ec295 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -22,6 +22,7 @@ * @category Personal * @package Laconica * @author Evan Prodromou + * @author Sarven Capadisli * @copyright 2008-2009 Control Yourself, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://laconi.ca/ diff --git a/lib/blockform.php b/lib/blockform.php index 51e43f8b5..b7790681d 100644 --- a/lib/blockform.php +++ b/lib/blockform.php @@ -88,6 +88,19 @@ class BlockForm extends Form return 'block-' . $this->profile->id; } + + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_user_block'; + } + + /** * Action of the form * @@ -127,4 +140,4 @@ class BlockForm extends Form { $this->out->submit('submit', _('Block')); } -} \ No newline at end of file +} diff --git a/lib/subscribeform.php b/lib/subscribeform.php index 8b69efd1a..231e740a7 100644 --- a/lib/subscribeform.php +++ b/lib/subscribeform.php @@ -89,7 +89,7 @@ class SubscribeForm extends Form function formClass() { - return 'form_subscribe'; + return 'form_user_subscribe'; } diff --git a/lib/unblockform.php b/lib/unblockform.php index 4cb9ae4f5..025011a82 100644 --- a/lib/unblockform.php +++ b/lib/unblockform.php @@ -88,6 +88,17 @@ class UnblockForm extends Form return 'unblock-' . $this->profile->id; } + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_user_unblock'; + } + /** * Action of the form * @@ -127,4 +138,4 @@ class UnblockForm extends Form { $this->out->submit('submit', _('Unblock')); } -} \ No newline at end of file +} diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php index b222f0e54..092369db7 100644 --- a/lib/unsubscribeform.php +++ b/lib/unsubscribeform.php @@ -89,7 +89,7 @@ class UnsubscribeForm extends Form function formClass() { - return 'form_unsubscribe'; + return 'form_user_unsubscribe'; } /** diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 3c776aea0..fc1f35e35 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -570,8 +570,7 @@ display:none; list-style-type:none; } #user_actions li { -border-top-width:1px; -border-top-style:dotted; +margin-bottom:4px; } #user_actions li:first-child { border-top:0; @@ -584,34 +583,29 @@ padding:0; display:none; } -#user_actions a, #user_actions input.submit { display:block; text-align:left; -padding:4px 0 4px 19px; +cursor:pointer; +width:100%; } #user_actions a { text-decoration:none; } -#user_subscribe a, -#TB_window input.submit, -#user_actions input.submit { -border:0; -cursor:pointer; -padding-left:16px; -width:100%; -font-size:0.9em; -} -#user_subscribe a { -width:auto; + + +.form_user_block input.submit, +.form_user_unblock input.submit { +border:0; padding-left:20px; } -#user_subscribe a, -#TB_window input.submit, + + +#user_subscribe input.submit, .form_user_subscribe input.submit { -font-weight:bold; + } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d5a5ce956..eb5f78b9e 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -125,30 +125,41 @@ background-image:url(../../base/images/icons/icon_vcard.gif); /*user_actions*/ #user_actions li { -border-top-color:#eee; +/*border-top-color:#eee;*/ } -#user_subscribe a, -#TB_window input.submit, -.form_user_subscribe input.submit { -background-image: url(../images/icons/twotone/green/shield.gif); -background-position: 0 45%; + + +.form_user_send-a-message input.submit, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit { +background-position: 0 40%; background-repeat: no-repeat; +background-color:transparent; } +.form_user_subscribe input.submit, .form_user_unsubscribe input.submit { -background-color:#647819; +background-color:#A9BF4F; color:#fff; } +.form_user_unsubscribe input.submit { +background-color:#97BFD1; +} + #user_send-a-message a { -background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat; +background-image:url(../images/icons/twotone/green/quote.gif); } .form_user_nudge input.submit { -background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat; +background-image:url(../images/icons/twotone/green/mail.gif); } -.form_user_block input.submit { -background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat; +.form_user_block input.submit, +.form_user_unblock input.submit { +background-image:url(../images/icons/twotone/green/shield.gif); +color:#000; } + /* NOTICES */ .notices li.over { background-color:#fcfcfc; @@ -242,4 +253,4 @@ background-color:#0f0; } #home #intro #step_create-a-community a { background-color:#00f; -} \ No newline at end of file +} -- cgit v1.2.3-54-g00ecf From b8c4d0cad686fc942bf02dd6d4d8c39ca2158ea8 Mon Sep 17 00:00:00 2001 From: sarven Date: Tue, 20 Jan 2009 22:50:51 +0000 Subject: p and ul style for doc pages --- theme/base/css/display.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index fc1f35e35..ec193b9b6 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -679,6 +679,8 @@ clear:both; + + /* NOTICE */ .notice { position:relative; @@ -961,8 +963,12 @@ border-right:0; - - +#doc #content_inner p { +margin-bottom:18px; +} +#doc #content_inner ul { +list-style-position:inside; +} /*START: LOAD ALONG WITH JS*/ -- cgit v1.2.3-54-g00ecf From caeb74c9a5598147a77d0bb250d8fde67ad929ad Mon Sep 17 00:00:00 2001 From: sarven Date: Tue, 20 Jan 2009 22:55:46 +0000 Subject: Styles for nested
  • s --- theme/base/css/display.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'theme/base/css/display.css') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ec193b9b6..61ce2d043 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -963,12 +963,20 @@ border-right:0; +/*If there is hentry on #content_inner, this doesn't need to be specific to #doc */ #doc #content_inner p { margin-bottom:18px; } +#doc #content_inner ol, #doc #content_inner ul { list-style-position:inside; } +#doc #content_inner li { +margin-bottom:18px; +} +#doc #content_inner li li { +margin-left:18px; +} /*START: LOAD ALONG WITH JS*/ -- cgit v1.2.3-54-g00ecf From 96e40e06493148757896c7f6061e9cbb2d8c2ceb Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 01:10:11 +0000 Subject: profilelist markup and styles --- lib/profilelist.php | 32 ++++++++++++++++++++++++-------- theme/base/css/display.css | 42 ++++++++++++++++++++++++++++++++++++++---- theme/identica/css/display.css | 5 +++-- 3 files changed, 65 insertions(+), 14 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/lib/profilelist.php b/lib/profilelist.php index 973df7bb6..b2a9925c1 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -106,32 +106,48 @@ class ProfileList extends Widget 'alt' => ($this->profile->fullname) ? $this->profile->fullname : $this->profile->nickname)); - $this->out->elementStart('span', 'nickname'); + $hasFN = ($this->profile->fullname) ? 'nickname' : 'fn nickname'; + $this->out->elementStart('span', $hasFN); $this->out->raw($this->highlight($this->profile->nickname)); $this->out->elementEnd('span'); $this->out->elementEnd('a'); if ($this->profile->fullname) { + $this->out->elementStart('dl', 'user_fn'); + $this->out->element('dt', null, 'Full name'); + $this->out->elementStart('dd'); $this->out->elementStart('span', 'fn'); $this->out->raw($this->highlight($this->profile->fullname)); $this->out->elementEnd('span'); + $this->out->elementEnd('dd'); + $this->out->elementEnd('dl'); } if ($this->profile->location) { - $this->out->elementStart('span', 'location'); + $this->out->elementStart('dl', 'user_location'); + $this->out->element('dt', null, _('Location')); + $this->out->elementStart('dd', 'location'); $this->out->raw($this->highlight($this->profile->location)); - $this->out->elementEnd('span'); + $this->out->elementEnd('dd'); + $this->out->elementEnd('dl'); } if ($this->profile->homepage) { - $this->out->elementStart('p', 'website'); - $this->out->elementStart('a', array('href' => $this->profile->homepage)); + $this->out->elementStart('dl', 'user_url'); + $this->out->element('dt', null, _('URL')); + $this->out->elementStart('dd'); + $this->out->elementStart('a', array('href' => $this->profile->homepage, + 'class' => 'url')); $this->out->raw($this->highlight($this->profile->homepage)); $this->out->elementEnd('a'); - $this->out->elementEnd('p'); + $this->out->elementEnd('dd'); + $this->out->elementEnd('dl'); } if ($this->profile->bio) { - $this->out->elementStart('p', 'bio'); + $this->out->elementStart('dl', 'user_note'); + $this->out->element('dt', null, _('Note')); + $this->out->elementStart('dd', 'note'); $this->out->raw($this->highlight($this->profile->bio)); - $this->out->elementEnd('p'); + $this->out->elementEnd('dd'); + $this->out->elementEnd('dl'); } # If we're on a list with an owner (subscriptions or subscribers)... diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 61ce2d043..f0bf6bfc1 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -62,7 +62,9 @@ font-weight:bold; textarea { overflow:auto; } -select, option { +select { +} +option { padding-bottom:0; } fieldset { @@ -526,14 +528,13 @@ clear:none; } #user_profile .user_fn { margin-left:11px; -margin-left:4px; margin-right:4px; } #user_profile .user_fn .fn { font-weight:bold; font-style:normal; } -#user_profile .user_nickname .nickname { +#user_profile .nickname { font-style:italic; font-weight:bold; } @@ -553,8 +554,13 @@ display:none; #user_profile h2 { display:none; } + /* user_profile */ + + + + /*user_actions*/ #user_actions { clear:left; @@ -677,12 +683,40 @@ clear:both; +.profile #user_profile { +margin-bottom:0; +min-height:60px; +} +.profile .form_user_unsubscribe { +float:right; +} +.profiles { +list-style-type:none; +} +.profile #user_profile .user_location { +width:auto; +clear:none; +margin-left:11px; +} +.profile #user_profile dl, +.profile #user_profile dd { +display:inline; +float:none; +} +.profile #user_profile .user_note, +.profile #user_profile .user_url { +margin-left:55px; +clear:none; +display:block; +width:auto; +} /* NOTICE */ -.notice { +.notice, +.profile { position:relative; padding-top:18px; padding-bottom:18px; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index eb5f78b9e..e3b5310f7 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -39,7 +39,9 @@ color:#fff; } a, -div.notice-options input { +div.notice-options input, +.form_user_block input.submit, +.form_user_unblock input.submit { color:#002E6E; } @@ -155,7 +157,6 @@ background-image:url(../images/icons/twotone/green/mail.gif); .form_user_block input.submit, .form_user_unblock input.submit { background-image:url(../images/icons/twotone/green/shield.gif); -color:#000; } -- cgit v1.2.3-54-g00ecf From e9b9795eeb30837ddddd980eaea9d11c055cb843 Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 02:52:16 +0000 Subject: (dis)favor form method call fix --- actions/disfavor.php | 5 ++++- actions/favor.php | 4 +++- theme/base/css/display.css | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'theme/base/css/display.css') diff --git a/actions/disfavor.php b/actions/disfavor.php index 3e3e4a547..d4a189d19 100644 --- a/actions/disfavor.php +++ b/actions/disfavor.php @@ -19,6 +19,8 @@ if (!defined('LACONICA')) { exit(1); } +require_once INSTALLDIR.'/lib/favorform.php'; + class DisfavorAction extends Action { @@ -74,7 +76,8 @@ class DisfavorAction extends Action $this->element('title', null, _('Add to favorites')); $this->elementEnd('head'); $this->elementStart('body'); - common_favor_form($notice); + $favor = new FavorForm($this, $notice); + $favor->show(); $this->elementEnd('body'); $this->elementEnd('html'); } else { diff --git a/actions/favor.php b/actions/favor.php index afda93cff..92756366d 100644 --- a/actions/favor.php +++ b/actions/favor.php @@ -20,6 +20,7 @@ if (!defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/mail.php'); +require_once INSTALLDIR.'/lib/disfavorform.php'; class FavorAction extends Action { @@ -73,7 +74,8 @@ class FavorAction extends Action $this->element('title', null, _('Disfavor favorite')); $this->elementEnd('head'); $this->elementStart('body'); - common_disfavor_form($notice); + $disfavor = new DisFavorForm($this, $notice); + $disfavor->show(); $this->elementEnd('body'); $this->elementEnd('html'); } else { diff --git a/theme/base/css/display.css b/theme/base/css/display.css index f0bf6bfc1..d2480be14 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -706,7 +706,7 @@ float:none; } .profile #user_profile .user_note, .profile #user_profile .user_url { -margin-left:55px; +margin-left:59px; clear:none; display:block; width:auto; @@ -767,8 +767,8 @@ margin-right:11px; .vcard .photo { display:inline; -margin-right:7px; -margin-bottom:7px; +margin-right:11px; +margin-bottom:11px; float:left; } .vcard .url { -- cgit v1.2.3-54-g00ecf