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 ++++++++++++++++++++ theme/base/css/initial_states.css | 1 + theme/base/css/jquery.Jcrop.css | 45 + theme/base/css/thickbox.css | 163 +++ theme/base/images/icons/icon_atom.jpg | Bin 0 -> 1117 bytes theme/base/images/icons/icon_foaf.gif | Bin 0 -> 1144 bytes theme/base/images/icons/icon_rss.jpg | Bin 0 -> 1166 bytes theme/base/images/icons/icon_vcard.gif | Bin 0 -> 331 bytes theme/base/images/illustrations/illu_jcrop.gif | Bin 0 -> 329 bytes .../illustrations/illu_progress_loading-01.gif | Bin 0 -> 5886 bytes 10 files changed, 1290 insertions(+) create mode 100644 theme/base/css/display.css create mode 100644 theme/base/css/initial_states.css create mode 100644 theme/base/css/jquery.Jcrop.css create mode 100644 theme/base/css/thickbox.css create mode 100644 theme/base/images/icons/icon_atom.jpg create mode 100644 theme/base/images/icons/icon_foaf.gif create mode 100644 theme/base/images/icons/icon_rss.jpg create mode 100644 theme/base/images/icons/icon_vcard.gif create mode 100644 theme/base/images/illustrations/illu_jcrop.gif create mode 100644 theme/base/images/illustrations/illu_progress_loading-01.gif (limited to 'theme/base') 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; +} diff --git a/theme/base/css/initial_states.css b/theme/base/css/initial_states.css new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/theme/base/css/initial_states.css @@ -0,0 +1 @@ + diff --git a/theme/base/css/jquery.Jcrop.css b/theme/base/css/jquery.Jcrop.css new file mode 100644 index 000000000..6c6dfb503 --- /dev/null +++ b/theme/base/css/jquery.Jcrop.css @@ -0,0 +1,45 @@ +/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */ +.jcrop-holder +{ + text-align: left; +} + +.jcrop-vline, .jcrop-hline +{ + font-size: 0; + position: absolute; + background: #fff url(../images/illustrations/illu_jcrop.gif) top left repeat; + /* + opacity: .5; + *filter:alpha(opacity=50); + */ +} +.jcrop-vline { height: 100%; width: 1px !important; } +.jcrop-hline { width: 100%; height: 1px !important; } +.jcrop-handle { + font-size: 1px; + width: 7px !important; + height: 7px !important; + border: 1px #eee solid; + background-color: #333; + /*width: 9px; + height: 9px;*/ +} + +.jcrop-tracker { + /*background-color: gray;*/ + width: 100%; height: 100%; +} + +.custom .jcrop-vline, +.custom .jcrop-hline +{ + background: yellow; +} +.custom .jcrop-handle +{ + border-color: black; + background-color: #C7BB00; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; +} diff --git a/theme/base/css/thickbox.css b/theme/base/css/thickbox.css new file mode 100644 index 000000000..d24b9bedf --- /dev/null +++ b/theme/base/css/thickbox.css @@ -0,0 +1,163 @@ +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +*{padding: 0; margin: 0;} + +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +#TB_window { + font: 12px Arial, Helvetica, sans-serif; + color: #333333; +} + +#TB_secondLine { + font: 10px Arial, Helvetica, sans-serif; + color:#666666; +} + +#TB_window a:link {color: #666666;} +#TB_window a:visited {color: #666666;} +#TB_window a:hover {color: #000;} +#TB_window a:active {color: #666666;} +#TB_window a:focus{color: #666666;} + +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +#TB_overlay { + position: fixed; + z-index:100; + top: 0px; + left: 0px; + height:100%; + width:100%; +} + +.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;} +.TB_overlayBG { + background-color:#000; + filter:alpha(opacity=75); + -moz-opacity: 0.75; + opacity: 0.75; +} + +* html #TB_overlay { /* ie6 hack */ + position: absolute; + height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); +} + +#TB_window { + position: fixed; + background: #ffffff; + z-index: 102; + color:#000000; + display:none; + border: 4px solid #525252; + text-align:left; + top:50%; + left:50%; +} + +* html #TB_window { /* ie6 hack */ +position: absolute; +margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); +} + +#TB_window img#TB_Image { + display:block; + margin: 15px 0 0 15px; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + border-top: 1px solid #666; + border-left: 1px solid #666; +} + +#TB_caption{ + height:25px; + padding:7px 30px 10px 25px; + float:left; +} + +#TB_closeWindow{ + height:25px; + padding:11px 25px 10px 0; + float:right; +} + +#TB_closeAjaxWindow{ + padding:7px 10px 5px 0; + margin-bottom:1px; + text-align:right; + float:right; +} + +#TB_ajaxWindowTitle{ + float:left; + padding:7px 0 5px 10px; + margin-bottom:1px; +} + +#TB_title{ + background-color:#e8e8e8; + height:27px; +} + +#TB_ajaxContent{ + clear:both; + padding:2px 15px 15px 15px; + overflow:auto; + text-align:left; + line-height:1.4em; +} + +#TB_ajaxContent.TB_modal{ + padding:15px; +} + +#TB_ajaxContent p{ + padding:5px 0px 5px 0px; +} + +#TB_load{ + position: fixed; + display:none; + height:13px; + width:208px; + z-index:103; + top: 50%; + left: 50%; + margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ +} + +* html #TB_load { /* ie6 hack */ +position: absolute; +margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); +} + +#TB_HideSelect{ + z-index:99; + position:fixed; + top: 0; + left: 0; + background-color:#fff; + border:none; + filter:alpha(opacity=0); + -moz-opacity: 0; + opacity: 0; + height:100%; + width:100%; +} + +* html #TB_HideSelect { /* ie6 hack */ + position: absolute; + height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); +} + +#TB_iframeContent{ + clear:both; + border:none; + margin-bottom:-1px; + margin-top:1px; + _margin-bottom:1px; +} diff --git a/theme/base/images/icons/icon_atom.jpg b/theme/base/images/icons/icon_atom.jpg new file mode 100644 index 000000000..22853edc4 Binary files /dev/null and b/theme/base/images/icons/icon_atom.jpg differ diff --git a/theme/base/images/icons/icon_foaf.gif b/theme/base/images/icons/icon_foaf.gif new file mode 100644 index 000000000..f8f784423 Binary files /dev/null and b/theme/base/images/icons/icon_foaf.gif differ diff --git a/theme/base/images/icons/icon_rss.jpg b/theme/base/images/icons/icon_rss.jpg new file mode 100644 index 000000000..da23422d0 Binary files /dev/null and b/theme/base/images/icons/icon_rss.jpg differ diff --git a/theme/base/images/icons/icon_vcard.gif b/theme/base/images/icons/icon_vcard.gif new file mode 100644 index 000000000..6d52947f3 Binary files /dev/null and b/theme/base/images/icons/icon_vcard.gif differ diff --git a/theme/base/images/illustrations/illu_jcrop.gif b/theme/base/images/illustrations/illu_jcrop.gif new file mode 100644 index 000000000..72ea7ccb5 Binary files /dev/null and b/theme/base/images/illustrations/illu_jcrop.gif differ diff --git a/theme/base/images/illustrations/illu_progress_loading-01.gif b/theme/base/images/illustrations/illu_progress_loading-01.gif new file mode 100644 index 000000000..82290f483 Binary files /dev/null and b/theme/base/images/illustrations/illu_progress_loading-01.gif differ -- 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') 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') diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 8b8a5351e..7ae62fb55 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -95,14 +95,14 @@ class EmailsettingsAction extends AccountSettingsAction $this->hidden('token', common_session_token()); if ($user->email) { - $this->element('p', array('id' => 'email_confirmed'), $user->email); + $this->element('p', array('id' => 'form_confirmed'), $user->email); $this->element('p', array('class' => 'form_note'), _('Current confirmed email address.')); $this->hidden('email', $user->email); $this->submit('remove', _('Remove')); } else { $confirm = $this->getConfirmation(); if ($confirm) { - $this->element('p', array('id' => 'email_unconfirmed'), $confirm->address); + $this->element('p', array('id' => 'form_unconfirmed'), $confirm->address); $this->element('p', array('class' => 'form_note'), _('Awaiting confirmation on this address. '. 'Check your inbox (and spam box!) for a message '. diff --git a/actions/imsettings.php b/actions/imsettings.php index 98951ac30..edbd81b57 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -86,36 +86,35 @@ class ImsettingsAction extends ConnectSettingsAction { $user = common_current_user(); $this->elementStart('form', array('method' => 'post', - 'id' => 'imsettings', + 'id' => 'form_settings_im', + 'class' => 'form_settings', 'action' => common_local_url('imsettings'))); + $this->elementStart('fieldset', array('id' => 'settings_im_address')); + $this->element('legend', null, _('Address')); $this->hidden('token', common_session_token()); - $this->element('h2', null, _('Address')); - if ($user->jabber) { - $this->elementStart('p'); - $this->element('span', 'address confirmed', $user->jabber); - $this->element('span', 'input_instructions', + $this->element('p', 'form_confirmed', $user->jabber); + $this->element('p', 'form_note', _('Current confirmed Jabber/GTalk address.')); $this->hidden('jabber', $user->jabber); - $this->elementEnd('p'); $this->submit('remove', _('Remove')); } else { $confirm = $this->getConfirmation(); if ($confirm) { - $this->elementStart('p'); - $this->element('span', 'address unconfirmed', $confirm->address); - $this->element('span', 'input_instructions', + $this->element('p', 'form_unconfirmed', $confirm->address); + $this->element('p', 'form_note', sprintf(_('Awaiting confirmation on this address. '. 'Check your Jabber/GTalk account for a '. 'message with further instructions. '. '(Did you add %s to your buddy list?)'), jabber_daemon_address())); $this->hidden('jabber', $confirm->address); - $this->elementEnd('p'); $this->submit('cancel', _('Cancel')); } else { + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('jabber', _('IM Address'), ($this->arg('jabber')) ? $this->arg('jabber') : null, sprintf(_('Jabber or GTalk address, '. @@ -123,27 +122,40 @@ class ImsettingsAction extends ConnectSettingsAction 'First, make sure to add %s to your '. 'buddy list in your IM client or on GTalk.'), jabber_daemon_address())); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('add', _('Add')); } } - - $this->element('h2', null, _('Preferences')); - + $this->elementEnd('fieldset'); + + $this->elementStart('fieldset', array('id' => 'settings_im_preferences')); + $this->element('legend', null, _('Preferences')); + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->checkbox('jabbernotify', _('Send me notices through Jabber/GTalk.'), $user->jabbernotify); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('updatefrompresence', _('Post a notice when my Jabber/GTalk status changes.'), $user->updatefrompresence); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('jabberreplies', _('Send me replies through Jabber/GTalk '. 'from people I\'m not subscribed to.'), $user->jabberreplies); + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('jabbermicroid', _('Publish a MicroID for my Jabber/GTalk address.'), $user->jabbermicroid); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('save', _('Save')); - + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b5c47e1bb..2857070f8 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -79,11 +79,12 @@ top:2px; left:0; } -#page_notice .error { -background-color:#F7E8E8; +#page_notice .error, +#page_notice .success { padding:4px 7px; -moz-border-radius:4px; } + form label.submit { display:none; } @@ -666,10 +667,6 @@ border-top:1px dashed #D1D9E4; list-style-type:none; /*margin-bottom:11px;*/ } -.notices li.over { -background-color:#fcfcfc; -} - /* NOTICES */ #notices_primary { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 832862551..0235c2d7d 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -71,6 +71,12 @@ background-color:rgba(255, 255, 255, 0.7); background-color:#fff; } +#page_notice .error { +background-color:#F7E8E8; +} +#page_notice .success { +background-color:#EFF3DC; +} @@ -135,6 +141,11 @@ color:#555; /* NOTICES */ +.notices li.over { +background-color:#fcfcfc; +} + + .notice div.entry-content a { } -- cgit v1.2.3-54-g00ecf From 061de33e576ac542459fd48ab61877eece05ea39 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 21:14:47 +0000 Subject: SMS settings markup and styles. Minor check with twitter settings form_datas --- actions/smssettings.php | 33 +++++++++++++++++++-------------- actions/twittersettings.php | 2 +- theme/base/css/display.css | 18 +++++++++++++----- 3 files changed, 33 insertions(+), 20 deletions(-) (limited to 'theme/base') diff --git a/actions/smssettings.php b/actions/smssettings.php index 845266d18..489fd1f58 100644 --- a/actions/smssettings.php +++ b/actions/smssettings.php @@ -93,37 +93,42 @@ class SmssettingsAction extends ConnectSettingsAction $this->hidden('token', common_session_token()); if ($user->sms) { - $this->elementStart('p'); $carrier = $user->getCarrier(); - $this->element('span', 'address confirmed', + $this->element('p', 'form_confirmed', $user->sms . ' (' . $carrier->name . ')'); - $this->element('span', 'input_instructions', + $this->element('p', 'form_guide', _('Current confirmed SMS-enabled phone number.')); $this->hidden('sms', $user->sms); $this->hidden('carrier', $user->carrier); - $this->elementEnd('p'); $this->submit('remove', _('Remove')); } else { $confirm = $this->getConfirmation(); if ($confirm) { $carrier = Sms_carrier::staticGet($confirm->address_extra); - $this->elementStart('p'); - $this->element('span', 'address unconfirmed', + $this->element('p', 'form_unconfirmed', $confirm->address . ' (' . $carrier->name . ')'); - $this->element('span', 'input_instructions', + $this->element('p', 'form_guide', _('Awaiting confirmation on this phone number.')); $this->hidden('sms', $confirm->address); $this->hidden('carrier', $confirm->address_extra); - $this->elementEnd('p'); $this->submit('cancel', _('Cancel')); + + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('code', _('Confirmation code'), null, _('Enter the code you received on your phone.')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('confirm', _('Confirm')); } else { + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('sms', _('SMS Phone number'), ($this->arg('sms')) ? $this->arg('sms') : null, _('Phone number, no punctuation or spaces, '. 'with area code')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->carrierSelect(); $this->submit('add', _('Add')); } @@ -131,14 +136,13 @@ class SmssettingsAction extends ConnectSettingsAction $this->elementEnd('fieldset'); if ($user->sms) { - $this->element('h2', null, _('Incoming email')); + $this->elementStart('fieldset', array('id' => 'settings_sms_incoming_email')); + $this->element('legend', null, _('Incoming email')); if ($user->incomingemail) { - $this->elementStart('p'); - $this->element('span', 'address', $user->incomingemail); - $this->element('span', 'input_instructions', + $this->element('p', 'form_unconfirmed', $user->incomingemail); + $this->element('p', 'form_note', _('Send email to this address to post new notices.')); - $this->elementEnd('p'); $this->submit('removeincoming', _('Remove')); } @@ -146,6 +150,7 @@ class SmssettingsAction extends ConnectSettingsAction _('Make a new email address for posting to; '. 'cancels the old one.')); $this->submit('newincoming', _('New')); + $this->elementEnd('fieldset'); } $this->elementStart('fieldset', array('id' => 'settings_sms_preferences')); @@ -443,7 +448,7 @@ class SmssettingsAction extends ConnectSettingsAction $cnt = $carrier->find(); - $this->elementStart('ul'); + $this->elementStart('ul', 'form_datas'); $this->elementStart('li'); $this->element('label', array('for' => 'carrier'), _('Mobile carrier')); $this->elementStart('select', array('name' => 'carrier', diff --git a/actions/twittersettings.php b/actions/twittersettings.php index 597623c80..079099123 100644 --- a/actions/twittersettings.php +++ b/actions/twittersettings.php @@ -133,7 +133,7 @@ class TwittersettingsAction extends ConnectSettingsAction array('id' => 'settings_twitter_preferences')); $this->element('legend', null, _('Preferences')); - $this->elementStart('ul'); + $this->elementStart('ul', 'form_datas'); $this->elementStart('li'); $this->checkbox('noticesync', _('Automatically send my notices to Twitter.'), diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 2857070f8..08805c1e0 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -116,15 +116,19 @@ width:100%; float:left; } -.form_settings .form_datas label, +.form_settings .form_datas label { +float:left; +} +.form_settings .form_datas textarea, +.form_settings .form_datas select, .form_settings .form_datas input { -margin-right:11px; +margin-left:11px; float:left; } .form_settings label { margin-top:7px; -width:123px; +width:152px; } .form_actions label { @@ -144,7 +148,7 @@ display:none; .form_settings .form_datas p.form_guide { clear:both; -margin-left:134px; +margin-left:163px; margin-bottom:0; } @@ -154,11 +158,15 @@ margin-bottom:11px; .form_settings input.checkbox { margin-top:3px; +margin-left:0; } .form_settings label.checkbox { font-weight:normal; -width:auto; margin-top:0; +margin-right:0; +margin-left:11px; +float:left; +width:90%; } #form_login p.form_guide, -- cgit v1.2.3-54-g00ecf From 7749228f52d914d4949cb5fa139cdd6ade4ead6e Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 21:22:31 +0000 Subject: OpenID settings remove style --- actions/openidsettings.php | 4 ++-- theme/base/css/display.css | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'theme/base') diff --git a/actions/openidsettings.php b/actions/openidsettings.php index 257aac8d0..126d2c992 100644 --- a/actions/openidsettings.php +++ b/actions/openidsettings.php @@ -124,7 +124,7 @@ class OpenidsettingsAction extends AccountSettingsAction if ($cnt == 1 && !$user->password) { - $this->element('p', null, + $this->element('p', 'form_guide', _('Removing your only OpenID '. 'would make it impossible to log in! ' . 'If you need to remove it, '. @@ -162,7 +162,7 @@ class OpenidsettingsAction extends AccountSettingsAction $this->element('input', array('type' => 'submit', 'id' => 'remove'.$idx, 'name' => 'remove', - 'class' => 'submit', + 'class' => 'submit remove', 'value' => _('Remove'))); $this->elementEnd('fieldset'); $this->elementEnd('form'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 08805c1e0..76e52ffc9 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -84,18 +84,11 @@ left:0; padding:4px 7px; -moz-border-radius:4px; } - form label.submit { display:none; } -form .error_message { -display:block; -} -.form_response { -margin-bottom:18px; -} - -form input.submit { +.form_settings input.remove { +margin-left:11px; } -- cgit v1.2.3-54-g00ecf From 6b23a9ed2f35e487847fe80b588eb3a967aaecb8 Mon Sep 17 00:00:00 2001 From: sarven Date: Sun, 18 Jan 2009 21:34:57 +0000 Subject: Disfavor markup/style --- lib/disfavorform.php | 12 ++++++++++++ theme/base/css/display.css | 9 ++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'theme/base') diff --git a/lib/disfavorform.php b/lib/disfavorform.php index f339f215a..45a9ddb1d 100644 --- a/lib/disfavorform.php +++ b/lib/disfavorform.php @@ -103,6 +103,18 @@ class DisfavorForm extends Form common_session_token()); } + + /** + * Legend of the Form + * + * @return void + */ + function formLegend() + { + $this->out->element('legend', null, _('Disfavor this notice')); + } + + /** * Data elements * diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 76e52ffc9..0041baf44 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -860,15 +860,18 @@ padding-left:16px; .notice-options form input.submit { cursor:pointer; -padding:2px 0 2px 10px; +width:16px; +padding:2px 0; } .notice-options .notice_delete dt, -.notice-options .form_favor legend { +.notice-options .form_favor legend, +.notice-options .form_disfavor legend { display:none; } .notice-options .notice_delete fieldset, -.notice-options .form_favor fieldset { +.notice-options .form_favor fieldset, +.notice-options .form_disfavor fieldset { border:0; padding:0; } -- cgit v1.2.3-54-g00ecf From 910bd332430b0af233ae78b330994520d4b59c97 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 00:10:42 +0000 Subject: Minimal cross browser styling (mostly IE7). w00t! --- lib/action.php | 2 +- theme/base/css/display.css | 28 ++++++++++++++++++---------- theme/identica/css/display.css | 18 +++++++++++++++--- 3 files changed, 34 insertions(+), 14 deletions(-) (limited to 'theme/base') diff --git a/lib/action.php b/lib/action.php index 3d61afde2..c463c8459 100644 --- a/lib/action.php +++ b/lib/action.php @@ -138,7 +138,7 @@ class Action extends HTMLOutputter // lawsuit if (file_exists(theme_file('ie'.$ver.'.css'))) { // Yes, IE people should be put in jail. $this->comment('[if lte IE '.$ver.']> Date: Mon, 19 Jan 2009 00:48:12 +0000 Subject: Cross-browser stuff --- lib/action.php | 2 ++ theme/base/css/display.css | 35 ++++++++++++++++++++++++++++++----- theme/base/css/ie.css | 26 ++++++++++++++++++++++++++ theme/base/css/ie7.css | 5 +++++ theme/identica/css/display.css | 4 ++++ 5 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 theme/base/css/ie.css create mode 100644 theme/base/css/ie7.css (limited to 'theme/base') diff --git a/lib/action.php b/lib/action.php index c463c8459..9cd2d5a18 100644 --- a/lib/action.php +++ b/lib/action.php @@ -134,6 +134,8 @@ class Action extends HTMLOutputter // lawsuit 'type' => 'text/css', 'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION, 'media' => 'screen, projection, tv')); + $this->comment('[if IE]> Date: Mon, 19 Jan 2009 01:04:22 +0000 Subject: text-shadow for local a --- theme/base/css/display.css | 1 + 1 file changed, 1 insertion(+) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 06860e30d..716f3256f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -272,6 +272,7 @@ padding:4px 11px; border-width:1px; border-style:solid; border-bottom:0; +text-shadow: 4px 4px 4px #ddd; font-weight:bold; } #site_nav_local_views .nav { -- cgit v1.2.3-54-g00ecf From 323432aec3da49b23c3fb270e42427abea745101 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 01:48:04 +0000 Subject: Facebook base and theme stylesheets. Copy of site display.css files for now. --- theme/base/css/facebookapp.base.css | 285 ++++++++ theme/identica/css/facebookapp.theme.css | 1177 ++++++++++++++++++++++++++++++ 2 files changed, 1462 insertions(+) create mode 100644 theme/base/css/facebookapp.base.css create mode 100644 theme/identica/css/facebookapp.theme.css (limited to 'theme/base') diff --git a/theme/base/css/facebookapp.base.css b/theme/base/css/facebookapp.base.css new file mode 100644 index 000000000..eb7b47a12 --- /dev/null +++ b/theme/base/css/facebookapp.base.css @@ -0,0 +1,285 @@ +/* theme: identica */ +html { +background-color:#ddd; +} +body { +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +font-size:1em; +background-color:#ddd; +} +input, textarea, select, option { +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +} +input, textarea, select { +border-color:#aaa; +} + +input:focus, textarea:focus, select:focus { +border-color:#A9BF4F; +} +input.submit { +background-color:#A9BF4F; +color:#fff; +} + +a { +color:#002E6E; +} +a:active { +background-color:#ddd; +} +.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 { +background-color:#CEE1E9; +} + +#form_notice textarea { +} + +#form_notice label { +color:#88171A; +} +#notice_text-count { +color:#333; +} +#form_notice.warning #notice_text-count { +color:#000; +background-color:#A9BF4F; +} +#form_notice.warning #notice_data-text { +border-color:#A9BF4F; +} + +#form_notice #notice_data-attach_view { +background-image:url(../images/icons/twotone/green/paper-clip.gif); +background-repeat:no-repeat; +background-position:0 45%; +background-color:transparent; +} + + +#site_nav_global_primary a { +} +#form_notice .form_actions input.submit { +} +#nav_register a { +background-color:#A9BF4F; +color:#fff; +text-decoration:none; +font-weight:bold; +padding:2px 4px; + +} +#nav_login a { +} + + +#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); +} + + +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + + +#page_notice .error { +background-color:#F7E8E8; +} +#page_notice .success { +background-color:#EFF3DC; +} + +#export_data li a { +background-repeat:no-repeat; +background-position:0 45%; +} +#export_data li a.rss { +background-image:url(../../base/images/icons/icon_rss.jpg); +} +#export_data li a.atom { +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); +} + + +/*user_actions*/ +#user_actions li { +border-top-color:#eee; +} +#user_actions a { +color:#000; +} +#user_subscribe a, +#TB_window input.submit, +.form_user_subscribe input.submit { +background:#CEE1E9 url(../images/icons/twotone/green/shield.gif) 0 45% no-repeat; +} +.form_user_unsubscribe input.submit { +background-color:#647819; +color:#fff; +} +#user_send-a-message a { +background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat; +} +.form_user_nudge input.submit { +background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat; +} +.form_user_block input.submit { +background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat; +} + + +.user_tags .mark_hash { +color:#555; +} + + + +.vcard .fn { +} +.vcard .fn:hover { +} + + + + +/* NOTICES */ +.notices li.over { +background-color:#fcfcfc; +} + + +.notice div.entry-content a { + +} +.notice div.entry-content a:hover { +} + + +.notice-data a span { +background-color:transparent; +background-repeat:no-repeat; +background-position:0 45%; +} +.notice_video .notice-data a span { +background-image:url(../images/icons/twotone/green/camera.gif); +} +.notice_audio .notice-data a span { +background-image:url(../images/icons/twotone/green/music.gif); +} +.notice_image .notice-data a span { +background-image:url(../images/icons/twotone/green/search.gif); +} +.notice_event .notice-data a span { +background-image:url(../images/icons/twotone/green/calendar.gif); +} +.notice_location .notice-data a span { +background-image:url(../images/icons/twotone/green/flag.gif); +} +.notice_document .notice-data a span { +background-image:url(../images/icons/twotone/green/document.gif); +} + +.notice-options .notice_reply a, +.notice-options form input.submit { +background-color:transparent; +} +.notice-options .notice_reply a { +background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%; +} +.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%; +} + +div.notice-options { +opacity:0.3; +} + +div.entry-content { +color:#333; +} +div.notice-options a, +div.notice-options input { +font-family:sans-serif; +} +div.notice-options input { +color:#002E6E; + +} +.notices li.hover { +background-color:#fcfcfc; +} +.notices li.hover div.entry-content, +.notices li.hover div.notice-options { +opacity:1; +} + +.form_settings .form_note { +background-color:#A9BF4F; +} + +/*END: NOTICES */ + + + +.pagination .nav_prev a, +.pagination .nav_next a { +background-repeat:no-repeat; +} +.pagination .nav_prev a { +background-image:url(../images/icons/twotone/green/arrow-left.gif); +background-position:0 45%; +} +.pagination .nav_next a { +background-image:url(../images/icons/twotone/green/arrow-right.gif); +background-position:100% 45%; +} + + + +#home #intro #guide_steps li a { +border-color:#ccc; +color:#fff; +} +#home #intro #step_join-now a { +background-color:#f00; +} +#home #intro #step_start-a-group a { +background-color:#0f0; +} +#home #intro #step_create-a-community a { +background-color:#00f; +} + diff --git a/theme/identica/css/facebookapp.theme.css b/theme/identica/css/facebookapp.theme.css new file mode 100644 index 000000000..716f3256f --- /dev/null +++ b/theme/identica/css/facebookapp.theme.css @@ -0,0 +1,1177 @@ +/* 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; +} +h1,h2,h3,h4,h5,h6 { + text-transform:uppercase; + margin-bottom:7px; +} +h1 { +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; } + +caption { +font-weight:bold; +} +.opened { display: block !important;} +.closed { display: none !important;} + +legend { +font-weight:bold; +font-size:1.3em; +text-transform:uppercase; +} +form { +} +input, textarea, select, option { +padding:4px; +font-family:sans-serif; +font-size:1em; +} +input, textarea, select { +border-width:2px; +border-style: solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} +input.submit { +font-weight:bold; +} +textarea { +overflow:auto; +} +select, option { +padding-bottom:0; +} +fieldset { +padding:0; +border:0; +} +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 { +} + +input.checkbox { +position:relative; +top:2px; +left:0; +border:0; +} + +#page_notice .error, +#page_notice .success { +padding:4px 7px; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} +form label.submit { +display:none; +} +.form_settings input.remove { +margin-left:11px; +} + + + + +/* FORM SETTINGS */ +.form_settings fieldset { +margin-bottom:29px; +} + +.form_guide { +font-style:italic; +} + + +.form_settings .form_datas li { +width:100%; +float:left; +} + +.form_settings .form_datas label { +float:left; +} +.form_settings .form_datas textarea, +.form_settings .form_datas select, +.form_settings .form_datas input { +margin-left:11px; +float:left; +} + +.form_settings label { +margin-top:2px; +width:152px; +} + +.form_actions label { +display:none; +} + +.form_settings #settings_autosubscribe label { +display:inline; +font-weight:bold; +} + +#form_settings_profile legend, +#form_login legend, +#form_register legend { +display:none; +} + +.form_settings .form_datas p.form_guide { +clear:both; +margin-left:163px; +margin-bottom:0; +} + +.form_settings p { +margin-bottom:11px; +} + +.form_settings input.checkbox { +margin-top:3px; +margin-left:0; +} +.form_settings label.checkbox { +font-weight:normal; +margin-top:0; +margin-right:0; +margin-left:11px; +float:left; +width:90%; +} + +#form_login p.form_guide, +#form_register #settings_rememberme p.form_guide { +margin-left:0; +} + + +.form_settings .form_note { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +padding:0 7px; +} + +/* FORM SETTINGS */ + + + + +address { +float:left; +margin-bottom:18px; +margin-left: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; +margin-right:18px; +} +#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:64%; +padding:18px; +} + + + +#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; +-webkit-border-top-left-radius:4px; +-webkit-border-top-right-radius:4px; +border-width:1px; +border-style:solid; +border-bottom:0; +text-shadow: 4px 4px 4px #ddd; +font-weight:bold; +} +#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 { +font-size:0.9em; +} + +#licenses dt { +font-weight:bold; +display:none; +} +#licenses dd { +margin-bottom:11px; +line-height:1.5; +} + +#site_content_license_cc { +margin-bottom:0; +} +#site_content_license_cc img { +display:inline; +vertical-align:top; +margin-right:4px; +} + + +#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; +border-radius:7px; +-moz-border-radius:7px; +-moz-border-radius-topleft:0; +-webkit-border-radius:7px; +-webkit-border-top-left-radius:0; +} + +#content_inner { +position:relative; +width:100%; +float;left; +} + +#aside_primary { +width:300px; +float:left; +margin-left:2px; +padding:18px 4px 18px 18px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +} + + + + +/*Start: FORM NOTICE*/ +#form_notice { +width:384px; +width:458px; +float:left; +margin-left:68px; +position:relative; +line-height:1; +} +#form_notice fieldset { +border:0; +padding:0; +} +#form_notice legend { +display:none; +} +#form_notice textarea { +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +width:377px; +width:370px; +height:86px; +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:116px; +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; +bottom:0; +right:0; +} +#form_notice .form_actions input.submit { +width:60px; +padding:8px; +} + +#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; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +} +#notices_primary h2 { +display:none; +} +.notice-data a span { +display:block; +padding-left:28px; +} + + +.notice .author { +margin-right:11px; +} +.notice .author a { +} +.notice .author:after { +/*content:":";*/ +} + +.vcard .photo { +display:inline; +margin-right:7px; +margin-bottom:7px; +float:left; +} +.vcard .url { +text-decoration:none; +} +.vcard .url:hover { +text-decoration:underline; +} +.vcard .fn { +font-style:italic; +} +.vcard .fn:hover { + +} + + +.notice .entry-title { +float:left; +width:100%; +} +.notice p.entry-content { +display:inline; +} + +.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 { +} +#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; +width:48%; +font-size:0.95em; +} +.notice div.entry-content a, +.notice .notice-options a, +.notice .notice-options input { + +} +.notice .notice-options a, +.notice .notice-options input { +float:left; +font-size:1.025em; +} + +#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 a { +display:inline-block; +} +.notice div.entry-content .device dt { +text-transform:lowercase; +} +.notice div.entry-content a { + +} +.notice div.entry-content a:hover { +} + + + +.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 { +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, +.notice-options .form_favor, +.notice-options .form_disfavor { +position:absolute; +top:0; +} +.notice-options .form_favor, +.notice-options .form_disfavor { +left:0; +} +.notice-options .notice_reply { +left:29px; +} +.notice-options .notice_delete { +left:76px; +} +.notice-options .notice_reply dt { +display:none; +} + +.notice-options input, +.notice-options a { +text-indent:-9999px; +outline:none; +} + +.notice-options .notice_reply a, +.notice-options form input.submit { +display:block; +border:0; +} +.notice-options .notice_reply a, +.notice-options .notice_delete a { +text-decoration:none; +padding-left:16px; +} + +.notice-options .notice_delete { + +} + +.notice-options form input.submit { +cursor:pointer; +width:16px; +padding:2px 0; +} + +.notice-options .notice_delete dt, +.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_disfavor fieldset { +border:0; +padding:0; +} + +/*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:7px; +-webkit-border-top-right-radius:7px; +padding-left:20px; +border-left:0; +} +.pagination .nav_next a { +-moz-border-radius-topleft:7px; +-webkit-border-top-left-radius:7px; +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; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +padding:7px; +font-size:1.6em; +font-weight:bold; +text-align:center; +} + + +#testimonials { +clear:both; +} -- cgit v1.2.3-54-g00ecf From 0b5f0f4faaf04fdf13dbd5dea1f081b9e1cc6071 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 03:09:13 +0000 Subject: Renamed form_datas to form_data --- actions/emailsettings.php | 4 ++-- actions/imsettings.php | 4 ++-- actions/login.php | 2 +- actions/openidsettings.php | 2 +- actions/othersettings.php | 2 +- actions/profilesettings.php | 2 +- actions/register.php | 2 +- actions/smssettings.php | 8 ++++---- actions/twittersettings.php | 4 ++-- lib/noticeform.php | 2 +- theme/base/css/display.css | 22 +++++++++++----------- 11 files changed, 27 insertions(+), 27 deletions(-) (limited to 'theme/base') diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 7ae62fb55..b84acb214 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -110,7 +110,7 @@ class EmailsettingsAction extends AccountSettingsAction $this->hidden('email', $confirm->address); $this->submit('cancel', _('Cancel')); } else { - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('email', _('Email Address'), ($this->arg('email')) ? $this->arg('email') : null, @@ -146,7 +146,7 @@ class EmailsettingsAction extends AccountSettingsAction $this->elementStart('fieldset', array('id' => 'settings_email_preferences')); $this->element('legend', null, _('Preferences')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->checkbox('emailnotifysub', _('Send me notices of new subscriptions through email.'), diff --git a/actions/imsettings.php b/actions/imsettings.php index edbd81b57..e0f5ede3a 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -113,7 +113,7 @@ class ImsettingsAction extends ConnectSettingsAction $this->hidden('jabber', $confirm->address); $this->submit('cancel', _('Cancel')); } else { - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('jabber', _('IM Address'), ($this->arg('jabber')) ? $this->arg('jabber') : null, @@ -131,7 +131,7 @@ class ImsettingsAction extends ConnectSettingsAction $this->elementStart('fieldset', array('id' => 'settings_im_preferences')); $this->element('legend', null, _('Preferences')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->checkbox('jabbernotify', _('Send me notices through Jabber/GTalk.'), diff --git a/actions/login.php b/actions/login.php index 9fa501a5d..11cf1f02a 100644 --- a/actions/login.php +++ b/actions/login.php @@ -223,7 +223,7 @@ class LoginAction extends Action 'action' => common_local_url('login'))); $this->elementStart('fieldset'); $this->element('legend', null, _('Login to site')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('nickname', _('Nickname')); $this->elementEnd('li'); diff --git a/actions/openidsettings.php b/actions/openidsettings.php index 126d2c992..92469d20f 100644 --- a/actions/openidsettings.php +++ b/actions/openidsettings.php @@ -95,7 +95,7 @@ class OpenidsettingsAction extends AccountSettingsAction $this->element('p', 'form_guide', _('If you want to add an OpenID to your account, ' . 'enter it in the box below and click "Add".')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->element('label', array('for' => 'openid_url'), _('OpenID URL')); diff --git a/actions/othersettings.php b/actions/othersettings.php index cbb2c0cb9..b542233ca 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -107,7 +107,7 @@ class OthersettingsAction extends AccountSettingsAction 'metamark.net' => 'metamark.net' ); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), diff --git a/actions/profilesettings.php b/actions/profilesettings.php index 12251b83b..6dd4775e5 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -93,7 +93,7 @@ class ProfilesettingsAction extends AccountSettingsAction # too much common patterns here... abstractable? - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('nickname', _('Nickname'), ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname, diff --git a/actions/register.php b/actions/register.php index 08243c1e2..159daaa73 100644 --- a/actions/register.php +++ b/actions/register.php @@ -343,7 +343,7 @@ class RegisterAction extends Action $this->hidden('code', $code); } - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('nickname', _('Nickname'), $this->trimmed('nickname'), _('1-64 lowercase letters or numbers, '. diff --git a/actions/smssettings.php b/actions/smssettings.php index 489fd1f58..f89cbe1ab 100644 --- a/actions/smssettings.php +++ b/actions/smssettings.php @@ -113,7 +113,7 @@ class SmssettingsAction extends ConnectSettingsAction $this->hidden('carrier', $confirm->address_extra); $this->submit('cancel', _('Cancel')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('code', _('Confirmation code'), null, _('Enter the code you received on your phone.')); @@ -121,7 +121,7 @@ class SmssettingsAction extends ConnectSettingsAction $this->elementEnd('ul'); $this->submit('confirm', _('Confirm')); } else { - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('sms', _('SMS Phone number'), ($this->arg('sms')) ? $this->arg('sms') : null, @@ -156,7 +156,7 @@ class SmssettingsAction extends ConnectSettingsAction $this->elementStart('fieldset', array('id' => 'settings_sms_preferences')); $this->element('legend', null, _('Preferences')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->checkbox('smsnotify', _('Send me notices through SMS; '. @@ -448,7 +448,7 @@ class SmssettingsAction extends ConnectSettingsAction $cnt = $carrier->find(); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->element('label', array('for' => 'carrier'), _('Mobile carrier')); $this->elementStart('select', array('name' => 'carrier', diff --git a/actions/twittersettings.php b/actions/twittersettings.php index 079099123..efc8215cd 100644 --- a/actions/twittersettings.php +++ b/actions/twittersettings.php @@ -104,7 +104,7 @@ class TwittersettingsAction extends ConnectSettingsAction $this->elementStart('fieldset', array('id' => 'settings_twitter_account')); $this->element('legend', null, _('Twitter Account')); $this->hidden('token', common_session_token()); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); if ($fuser) { $this->elementStart('li'); $this->element('span', 'twitter_user', $fuser->nickname); @@ -133,7 +133,7 @@ class TwittersettingsAction extends ConnectSettingsAction array('id' => 'settings_twitter_preferences')); $this->element('legend', null, _('Preferences')); - $this->elementStart('ul', 'form_datas'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->checkbox('noticesync', _('Automatically send my notices to Twitter.'), diff --git a/lib/noticeform.php b/lib/noticeform.php index d6a3aa9c2..f0205f1c1 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -123,7 +123,7 @@ class NoticeForm extends Form { $user = common_current_user(); - $this->out->elementStart('ul', 'form_datas'); + $this->out->elementStart('ul', 'form_data'); $this->out->elementStart('li', array('id' => 'notice_text')); $this->out->element('label', array('for' => 'notice_data-text'), sprintf(_('What\'s up, %s?'), $user->nickname)); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 716f3256f..d659a4b4c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -114,17 +114,17 @@ font-style:italic; } -.form_settings .form_datas li { +.form_settings .form_data li { width:100%; float:left; } -.form_settings .form_datas label { +.form_settings .form_data label { float:left; } -.form_settings .form_datas textarea, -.form_settings .form_datas select, -.form_settings .form_datas input { +.form_settings .form_data textarea, +.form_settings .form_data select, +.form_settings .form_data input { margin-left:11px; float:left; } @@ -149,7 +149,7 @@ font-weight:bold; display:none; } -.form_settings .form_datas p.form_guide { +.form_settings .form_data p.form_guide { clear:both; margin-left:163px; margin-bottom:0; @@ -424,7 +424,7 @@ display:block; font-size:1.3em; margin-bottom:7px; } -#form_notice .form_datas li { +#form_notice .form_data li { float:left; } @@ -979,12 +979,12 @@ background-color:#D1D9E4; #user_actions #user_subscribe .form_note, -#user_actions #user_subscribe .form_datas, +#user_actions #user_subscribe .form_data, #user_actions #user_subscribe .form_actions label { display:none; } #form_user-relationship .form_note, -#form_user-relationship .form_datas, +#form_user-relationship .form_data, #form_user-relationship .form_actions label { display:block; } @@ -992,7 +992,7 @@ display:block; #user_actions #user-relationship_submit { margin-bottom:0; } -#form_user-relationship .form_datas li label { +#form_user-relationship .form_data li label { margin-right:11px; } @@ -1070,7 +1070,7 @@ font-size:2.2em; -#form_settings_photo .form_datas { +#form_settings_photo .form_data { clear:both; } -- cgit v1.2.3-54-g00ecf From 1a6d120f28d232f3c6684450b197203fe297a605 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 03:16:50 +0000 Subject: margin-bottom for global nav for more space --- theme/base/css/display.css | 1 + 1 file changed, 1 insertion(+) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d659a4b4c..22e1e7b9e 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -213,6 +213,7 @@ margin-bottom:29px; #site_nav_global_primary { float:right; margin-right:18px; +margin-bottom:11px; } #site_nav_global_primary ul li { display:inline; -- cgit v1.2.3-54-g00ecf From ea2e908bc0bf875b9e3967d0143f116e0c8b0885 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 03:20:41 +0000 Subject: More space for the counter --- theme/base/css/display.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 22e1e7b9e..1d22901fe 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -418,7 +418,7 @@ width:377px; width:370px; height:86px; line-height:1.5; -padding:7px 7px 14px 7px; +padding:7px 7px 16px 7px; } #form_notice label { display:block; @@ -441,7 +441,7 @@ margin-left:4px; #form_notice .form_note { position:absolute; -top:116px; +top:120px; right:98px; z-index:9; } -- cgit v1.2.3-54-g00ecf From 2fb53cdae446313546b7e65dccfef046fb7150da Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 03:54:46 +0000 Subject: Cleaning styles --- theme/base/css/display.css | 25 ++++++++++++++----------- theme/default/css/display.css | 27 +++++++++++---------------- theme/identica/css/display.css | 27 +++++++++++---------------- 3 files changed, 36 insertions(+), 43 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 1d22901fe..e9799160c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -696,6 +696,12 @@ border-top:1px dashed #D1D9E4; list-style-type:none; /*margin-bottom:11px;*/ } +.notices li.hover { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + /* NOTICES */ #notices_primary { @@ -761,20 +767,17 @@ display:inline; #laconicat .notice p.entry-content { /*margin-left:199px;*/ } -.notice p.entry-content a { - -} -.notice p.entry-content a:hover { - -} -.notice p.entry-content .tag a { - +.notice p.entry-content a:visited { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; } -.notice p.entry-content .tag a:hover { - +.notice p.entry-content .vcard a { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; } - .notice div.entry-content { /*border:1px solid blue;*/ clear:left; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 877c833fe..2d3cd9dc9 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -38,15 +38,9 @@ color:#002E6E; .notice p.entry-content a:visited { background-color:#fcfcfc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } .notice p.entry-content .vcard a { background-color:#fcfffc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } #aside_primary, @@ -78,8 +72,16 @@ font-weight:bold; padding:2px 4px; } +#content, #site_nav_local_views a { border-color:#fff; +} +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + +#site_nav_local_views a { background-color:rgba(255, 255, 255, 0.2); } #site_nav_local_views a:hover { @@ -87,10 +89,6 @@ background-color:rgba(255, 255, 255, 0.7); } -#content, -#site_nav_local_views .current a { -background-color:#fff; -} #page_notice .error { @@ -193,7 +191,9 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 div.notice-options { opacity:0.3; } - +.notices li.hover div.notice-options { +opacity:1; +} div.entry-content { color:#333; } @@ -204,11 +204,6 @@ font-family:sans-serif; .notices li.hover { background-color:#fcfcfc; } -.notices li.hover div.entry-content, -.notices li.hover div.notice-options { -opacity:1; -} - /*END: NOTICES */ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 877c833fe..2d3cd9dc9 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -38,15 +38,9 @@ color:#002E6E; .notice p.entry-content a:visited { background-color:#fcfcfc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } .notice p.entry-content .vcard a { background-color:#fcfffc; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; } #aside_primary, @@ -78,8 +72,16 @@ font-weight:bold; padding:2px 4px; } +#content, #site_nav_local_views a { border-color:#fff; +} +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + +#site_nav_local_views a { background-color:rgba(255, 255, 255, 0.2); } #site_nav_local_views a:hover { @@ -87,10 +89,6 @@ background-color:rgba(255, 255, 255, 0.7); } -#content, -#site_nav_local_views .current a { -background-color:#fff; -} #page_notice .error { @@ -193,7 +191,9 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 div.notice-options { opacity:0.3; } - +.notices li.hover div.notice-options { +opacity:1; +} div.entry-content { color:#333; } @@ -204,11 +204,6 @@ font-family:sans-serif; .notices li.hover { background-color:#fcfcfc; } -.notices li.hover div.entry-content, -.notices li.hover div.notice-options { -opacity:1; -} - /*END: NOTICES */ -- cgit v1.2.3-54-g00ecf From 6967e3ec86b421066cd3d5be74a103a3b394937c Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 04:19:14 +0000 Subject: Setting up a way to deal with different logo sizes. --- theme/base/css/display.css | 7 ++----- theme/default/css/display.css | 9 ++++++++- theme/identica/css/display.css | 7 +++++++ 3 files changed, 17 insertions(+), 6 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e9799160c..e337f1c98 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -195,13 +195,11 @@ float:left; margin-bottom:18px; margin-left:18px; } -address .fn, -address .email { -display:none; +address.vcard img.logo { +margin-right:0; } - #header { width:100%; position:relative; @@ -399,7 +397,6 @@ border-radius:7px; width:384px; width:458px; float:left; -margin-left:68px; position:relative; line-height:1; } diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 2d3cd9dc9..3c579cec7 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -2,12 +2,19 @@ html, body, a:active { -background-color:#ddd; +background-color:#777; } body { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size:1em; } +address { +margin-right:71px; +} +address .fn { +display:none; +} + input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 2d3cd9dc9..d5a5ce956 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -8,6 +8,13 @@ body { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size:1em; } +address { +margin-right:71px; +} +address .fn { +display:none; +} + input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } -- cgit v1.2.3-54-g00ecf From 838502dfd9894e409714c512f83179bab68446d7 Mon Sep 17 00:00:00 2001 From: sarven Date: Mon, 19 Jan 2009 04:46:18 +0000 Subject: timestamp anchor spacing for IE --- theme/base/css/ie.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme/base') diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index ef64da953..9baa953b3 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -22,5 +22,5 @@ margin-left:-7px; } .notice div.entry-content .timestamp a { -display:inline; +margin-right:4px; } \ No newline at end of file -- cgit v1.2.3-54-g00ecf 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') 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') 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') 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') 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') 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') 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') 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') 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 From 88297e7b240180b4cec0d455d5ecd7d03dffe973 Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 03:38:50 +0000 Subject: Direct message markup and style --- lib/messageform.php | 39 +++++++++++++++++++++++++++++---------- theme/base/css/display.css | 14 ++++++++++++++ 2 files changed, 43 insertions(+), 10 deletions(-) (limited to 'theme/base') diff --git a/lib/messageform.php b/lib/messageform.php index eca39cc06..61d3d75af 100644 --- a/lib/messageform.php +++ b/lib/messageform.php @@ -85,7 +85,7 @@ class MessageForm extends Form function id() { - return 'message_form'; + return 'form_notice'; } /** @@ -99,6 +99,18 @@ class MessageForm extends Form return common_local_url('newmessage'); } + + /** + * Legend of the Form + * + * @return void + */ + function formLegend() + { + $this->out->element('legend', null, _('Send a direct notice')); + } + + /** * Data elements * @@ -122,18 +134,20 @@ class MessageForm extends Form $mutual_users->free(); unset($mutual_users); + $this->out->elementStart('ul', 'form_data'); + $this->out->elementStart('li', array('id' => 'notice_to')); $this->out->dropdown('to', _('To'), $mutual, null, false, $this->to->id); + $this->out->elementEnd('li'); - $this->out->elementStart('p'); - - $this->out->element('textarea', array('id' => 'message_content', - 'cols' => 60, - 'rows' => 3, + $this->out->elementStart('li', array('id' => 'notice_text')); + $this->out->element('textarea', array('id' => 'notice_data-text', + 'cols' => 35, + 'rows' => 4, 'name' => 'content'), ($this->content) ? $this->content : ''); - - $this->out->elementEnd('p'); + $this->out->elementEnd('li'); + $this->out->elementEnd('ul'); } /** @@ -144,9 +158,14 @@ class MessageForm extends Form function formActions() { - $this->out->element('input', array('id' => 'message_send', + $this->out->elementStart('ul', 'form_actions'); + $this->out->elementStart('li', array('id' => 'notice_submit')); + $this->out->element('input', array('id' => 'notice_action-submit', + 'class' => 'submit', 'name' => 'message_send', 'type' => 'submit', 'value' => _('Send'))); + $this->out->elementEnd('li'); + $this->out->elementEnd('ul'); } -} \ No newline at end of file +} diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d2480be14..5b17fa53a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -482,6 +482,20 @@ padding:8px; #form_notice li { margin-bottom:0; } + +#form_notice #notice_to { +margin-bottom:7px; +} + +#notice_to label { +float:left; +margin-right:18px; +margin-top:11px; +} +#notice_to select { +float:left; +} + /*end FORM NOTICE*/ -- cgit v1.2.3-54-g00ecf From 27b627c09451c099b18a7cde90f6a028f820046c Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 06:54:17 +0000 Subject: Made user_actions styles more consistent --- actions/showstream.php | 2 +- theme/base/css/display.css | 15 ++++++++++----- theme/identica/css/display.css | 9 +++++---- 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'theme/base') diff --git a/actions/showstream.php b/actions/showstream.php index a411fae5b..6ed6abc9e 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -330,7 +330,7 @@ class ShowstreamAction extends Action $user = User::staticGet('id', $this->profile->id); if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) { - $this->elementStart('li', array('id' => 'user_send_a_new_message')); + $this->elementStart('li', array('id' => 'user_send-a-message')); $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))), _('Send a message')); $this->elementEnd('li'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5b17fa53a..c60097145 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -611,16 +611,25 @@ width:100%; } #user_actions a { text-decoration:none; +font-weight:bold; +width:100%; +display:block; } .form_user_block input.submit, -.form_user_unblock input.submit { +.form_user_unblock input.submit, +#user_send-a-message a, +.form_user_nudge input.submit { border:0; padding-left:20px; } +#user_send-a-message a { +padding:4px 4px 4px 23px; + +} #user_subscribe input.submit, @@ -631,13 +640,9 @@ padding-left:20px; #user_send-a-message form { -clear:left; -width:322px; -margin-top:18px; } #user_send-a-message textarea { -width:96%; } .user_tags ul { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index e3b5310f7..2b91c5504 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -41,7 +41,9 @@ color:#fff; a, div.notice-options input, .form_user_block input.submit, -.form_user_unblock input.submit { +.form_user_unblock input.submit, +#user_send-a-message a, +.form_user_nudge input.submit { color:#002E6E; } @@ -63,8 +65,7 @@ background-color:#CEE1E9; #notice_text-count { color:#333; } -#form_notice.warning #notice_text-count, -#user_actions a { +#form_notice.warning #notice_text-count { color:#000; } @@ -131,7 +132,7 @@ background-image:url(../../base/images/icons/icon_vcard.gif); } -.form_user_send-a-message input.submit, +#user_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, .form_user_unblock input.submit { -- cgit v1.2.3-54-g00ecf From 0b0f25ce93bdf583336266f3ef9851d6a3e843dd Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 18:35:45 +0000 Subject: Public tagcloud and tag cloud styles --- actions/publictagcloud.php | 34 ++++++++++++++++++++-------------- theme/base/css/display.css | 34 +++++++++++++++++++++------------- 2 files changed, 41 insertions(+), 27 deletions(-) (limited to 'theme/base') diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php index ec28edbad..6f5fc7541 100644 --- a/actions/publictagcloud.php +++ b/actions/publictagcloud.php @@ -103,7 +103,8 @@ class PublictagcloudAction extends Action $cnt = $tags->find(); if ($cnt > 0) { - $this->elementStart('p', 'tagcloud'); + $this->elementStart('div', array('id' => 'tagcloud', + 'class' => 'section')); $tw = array(); $sum = 0; @@ -114,36 +115,41 @@ class PublictagcloudAction extends Action ksort($tw); + $this->elementStart('dl'); + $this->element('dt', null, _('Tag cloud')); + $this->elementStart('dd'); + $this->elementStart('ul', 'tags xoxo tag-cloud'); foreach ($tw as $tag => $weight) { $this->showTag($tag, $weight, $weight/$sum); } - - $this->elementEnd('p'); + $this->elementEnd('ul'); + $this->elementEnd('dd'); + $this->elementEnd('dl'); + $this->elementEnd('div'); } } function showTag($tag, $weight, $relative) { - # XXX: these should probably tune to the size of the site if ($relative > 0.1) { - $cls = 'largest'; + $rel = 'tag-cloud-7'; } else if ($relative > 0.05) { - $cls = 'verylarge'; + $rel = 'tag-cloud-6'; } else if ($relative > 0.02) { - $cls = 'large'; + $rel = 'tag-cloud-5'; } else if ($relative > 0.01) { - $cls = 'medium'; + $rel = 'tag-cloud-4'; } else if ($relative > 0.005) { - $cls = 'small'; + $rel = 'tag-cloud-3'; } else if ($relative > 0.002) { - $cls = 'verysmall'; + $rel = 'tag-cloud-2'; } else { - $cls = 'smallest'; + $rel = 'tag-cloud-1'; } - $this->element('a', array('class' => "$cls weight-$weight relative-$relative", - 'href' => common_local_url('tag', array('tag' => $tag))), + $this->elementStart('li', $rel); + $this->element('a', array('href' => common_local_url('tag', array('tag' => $tag))), $tag); - $this->text(' '); + $this->elementEnd('li'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index c60097145..59f3240f1 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1110,33 +1110,41 @@ width:24px; /* tagcloud */ -#tagcloud ul { +.tag-cloud { list-style-type:none; } -#tagcloud ul li { +.tag-cloud li { display:inline; margin-right:7px; -line-height:1.4; +line-height:1; +} +.tag-cloud li a { +text-decoration:none; } - #tagcloud.section dt { text-transform:uppercase; font-weight:bold; } -#tagcloud .weight_1 { +.tag-cloud-1 { font-size:1em; } -#tagcloud .weight_2 { -font-size:1.3em; +.tag-cloud-2 { +font-size:1.5em; } -#tagcloud .weight_3 { -font-size:1.6em; +.tag-cloud-3 { +font-size:2em; +} +.tag-cloud-4 { +font-size:2.5em; +} +.tag-cloud-5 { +font-size:3em; } -#tagcloud .weight_4 { -font-size:1.9em; +.tag-cloud-6 { +font-size:3.5em; } -#tagcloud .weight_5 { -font-size:2.2em; +.tag-cloud-7 { +font-size:4em; } -- cgit v1.2.3-54-g00ecf From fd6549e438a719f3c884b517f26293da181f9a35 Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 18:37:02 +0000 Subject: Hid dt --- theme/base/css/display.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 59f3240f1..c16fa4ab0 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1147,6 +1147,11 @@ font-size:3.5em; font-size:4em; } +#publictagcloud #tagcloud.section dt { +display:none; +} + + #form_settings_photo .form_data { -- cgit v1.2.3-54-g00ecf From ac1cc954ae080dbbb906cae009148eb3796de43d Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 19:56:18 +0000 Subject: form_password markup and style --- actions/passwordsettings.php | 20 +++++++++++++++++--- theme/base/css/display.css | 3 ++- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'theme/base') diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php index f96da13bd..17b2de4e8 100644 --- a/actions/passwordsettings.php +++ b/actions/passwordsettings.php @@ -81,21 +81,35 @@ class PasswordsettingsAction extends AccountSettingsAction { $user = common_current_user(); $this->elementStart('form', array('method' => 'POST', - 'id' => 'password', + 'id' => 'form_password', + 'class' => 'form_settings', 'action' => common_local_url('profilesettings'))); - + $this->elementStart('fieldset'); + $this->element('legend', null, _('Password change')); $this->hidden('token', common_session_token()); + + $this->elementStart('ul', 'form_data'); // Users who logged in with OpenID won't have a pwd if ($user->password) { + $this->elementStart('li'); $this->password('oldpassword', _('Old password')); + $this->elementEnd('li'); } + $this->elementStart('li'); $this->password('newpassword', _('New password'), _('6 or more characters')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->password('confirm', _('Confirm'), _('same as password above')); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->submit('changepass', _('Change')); + + $this->elementEnd('fieldset'); $this->elementEnd('form'); } @@ -158,4 +172,4 @@ class PasswordsettingsAction extends AccountSettingsAction $this->showForm(_('Password saved.'), true); } -} \ No newline at end of file +} diff --git a/theme/base/css/display.css b/theme/base/css/display.css index c16fa4ab0..18205fceb 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -147,7 +147,8 @@ font-weight:bold; #form_settings_profile legend, #form_login legend, -#form_register legend { +#form_register legend, +#form_password legend { display:none; } -- cgit v1.2.3-54-g00ecf From 41f74218f2ab70b78ba96d386b41fb6a1f958f75 Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 20:33:37 +0000 Subject: Profile avatar settings --- actions/avatarsettings.php | 47 ++++++++++++++++++++++++++----------------- js/jcrop/jquery.Jcrop.go.js | 41 +++++++++++++++++++++++++++++++++++++ js/jcrop/jquery.Jcrop.pack.js | 8 ++++++++ js/jquery.Jcrop.go.js | 41 ------------------------------------- js/jquery.Jcrop.pack.js | 8 -------- theme/base/css/display.css | 28 +++++++++++++++++++------- 6 files changed, 98 insertions(+), 75 deletions(-) create mode 100644 js/jcrop/jquery.Jcrop.go.js create mode 100644 js/jcrop/jquery.Jcrop.pack.js delete mode 100644 js/jquery.Jcrop.go.js delete mode 100644 js/jquery.Jcrop.pack.js (limited to 'theme/base') diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index a9b381b0a..ffbeb5486 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -37,12 +37,13 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php'; /** * Upload an avatar * - * We use jQuery to crop the image after upload. + * We use jCrop plugin for jQuery to crop the image after upload. * * @category Settings * @package Laconica * @author Evan Prodromou * @author Zach Copley + * @author Sarven Capadisli * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://laconi.ca/ */ @@ -94,42 +95,43 @@ class AvatarsettingsAction extends AccountSettingsAction $original = $profile->getOriginalAvatar(); $this->elementStart('form', array('enctype' => 'multipart/form-data', - 'method' => 'POST', - 'id' => 'avatar', + 'method' => 'post', + 'id' => 'form_settings_avatar', + 'class' => 'form_settings', 'action' => common_local_url('avatarsettings'))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Avatar settings')); $this->hidden('token', common_session_token()); + $this->elementStart('ul', 'form_data'); if ($original) { - $this->elementStart('div', + $this->elementStart('li', array('id' => 'avatar_original', 'class' => 'avatar_view')); - $this->element('h3', null, _("Original:")); + $this->element('h2', null, _("Original")); $this->elementStart('div', array('id'=>'avatar_original_view')); $this->element('img', array('src' => $original->url, - 'class' => 'avatar original', 'width' => $original->width, 'height' => $original->height, 'alt' => $user->nickname)); $this->elementEnd('div'); - $this->elementEnd('div'); + $this->elementEnd('li'); } $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); if ($avatar) { - $this->elementStart('div', + $this->elementStart('li', array('id' => 'avatar_preview', 'class' => 'avatar_view')); - $this->element('h3', null, _("Preview:")); + $this->element('h2', null, _("Preview")); $this->elementStart('div', array('id'=>'avatar_preview_view')); $this->element('img', array('src' => $original->url,//$avatar->url, - 'class' => 'avatar profile', 'width' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE, 'alt' => $user->nickname)); $this->elementEnd('div'); - $this->elementEnd('div'); foreach (array('avatar_crop_x', 'avatar_crop_y', 'avatar_crop_w', 'avatar_crop_h') as $crop_info) { @@ -138,21 +140,28 @@ class AvatarsettingsAction extends AccountSettingsAction 'id' => $crop_info)); } $this->submit('crop', _('Crop')); + + $this->elementEnd('li'); } + $this->elementStart('li', array ('id' => 'settings_attach')); + $this->element('input', array('name' => 'avatarfile', + 'type' => 'file', + 'id' => 'avatarfile')); $this->element('input', array('name' => 'MAX_FILE_SIZE', 'type' => 'hidden', 'id' => 'MAX_FILE_SIZE', 'value' => MAX_AVATAR_SIZE)); + $this->elementEnd('li'); + $this->elementEnd('ul'); - $this->elementStart('p'); - - $this->element('input', array('name' => 'avatarfile', - 'type' => 'file', - 'id' => 'avatarfile')); - $this->elementEnd('p'); - + $this->elementStart('ul', 'form_actions'); + $this->elementStart('li'); $this->submit('upload', _('Upload')); + $this->elementEnd('li'); + $this->elementEnd('ul'); + + $this->elementEnd('fieldset'); $this->elementEnd('form'); } @@ -277,7 +286,7 @@ class AvatarsettingsAction extends AccountSettingsAction { parent::showStylesheets(); $jcropStyle = - common_path('js/jcrop/jquery.Jcrop.css?version='.LACONICA_VERSION); + common_path('theme/base/css/jquery.Jcrop.css?version='.LACONICA_VERSION); $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js new file mode 100644 index 000000000..d5176c14c --- /dev/null +++ b/js/jcrop/jquery.Jcrop.go.js @@ -0,0 +1,41 @@ + $(function(){ + jQuery("#avatar_original img").Jcrop({ + onChange: showPreview, + setSelect: [ 0, 0, $("#avatar_original img").attr("width"), $("#avatar_original img").attr("height") ], + onSelect: updateCoords, + aspectRatio: 1, + boxWidth: 480, + boxHeight: 480, + bgColor: '#000', + bgOpacity: .4 + }); + }); + + function showPreview(coords) { + var rx = 96 / coords.w; + var ry = 96 / coords.h; + + var img_width = $("#avatar_original img").attr("width"); + var img_height = $("#avatar_original img").attr("height"); + + $('#avatar_preview img').css({ + width: Math.round(rx *img_width) + 'px', + height: Math.round(ry * img_height) + 'px', + marginLeft: '-' + Math.round(rx * coords.x) + 'px', + marginTop: '-' + Math.round(ry * coords.y) + 'px' + }); + }; + + function updateCoords(c) { + $('#avatar_crop_x').val(c.x); + $('#avatar_crop_y').val(c.y); + $('#avatar_crop_w').val(c.w); + $('#avatar_crop_h').val(c.h); + }; + + function checkCoords() { + if (parseInt($('#avatar_crop_w').val())) return true; + alert('Please select a crop region then press submit.'); + return false; + }; + diff --git a/js/jcrop/jquery.Jcrop.pack.js b/js/jcrop/jquery.Jcrop.pack.js new file mode 100644 index 000000000..aa82e8abe --- /dev/null +++ b/js/jcrop/jquery.Jcrop.pack.js @@ -0,0 +1,8 @@ +/** + * Jcrop v.0.9.5 (packed) + * (c) 2008 Kelly Hallman and DeepLiquid.com + * More information: http://deepliquid.com/content/Jcrop.html + * Released under MIT License - this header must remain with code + */ + +eval(function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('$.1n=7(G,F){d G=G,F=F;g(1p(G)!==\'2d\')G=$(G)[0];g(1p(F)!==\'2d\')F={};g(!(\'2x\'1a F))F.2x=$.3d.3e?K:M;g(!(\'2c\'1a F))F.2c=$.3d.3e?K:M;d 4f={2x:K,3W:\'4C\',1f:4D,3T:\'4Y\',3x:.6,3O:.4,3P:.5,53:5,3N:9,3D:5,51:14,25:0,2c:M,3I:M,3B:M,30:M,3A:M,49:0,4p:0,4k:8,3V:20,3X:3,2f:K,3n:[0,0],2z:[0,0],2O:[0,0],2D:7(){},2G:7(){}};d j=4f;21(F);d $I=$(G).B({16:\'1b\'});47($I,j.49,j.4p);d S=$I.W(),L=$I.U(),$12=$(\'<12 />\').W(S).U(L).1f(1L(\'4F\')).B({16:\'4H\',4B:j.3T});g(j.1f)$12.1f(j.1f);$I.54($12);d $34=$(\'\').3Y(\'2N\',$I.3Y(\'2N\')).B(\'16\',\'1b\').W(S).U(L);d $2C=$(\'<12 />\').W(1t(V)).U(1t(V)).B({1l:59,16:\'1b\',4o:\'4g\'}).1P($34);d $2g=$(\'<12 />\').W(1t(V)).U(1t(V)).B({1l:5b});d $28=$(\'<12 />\').B({16:\'1b\',1l:55}).3U($I).1P($2C,$2g);d 23=j.4k;d $1S=$(\'<12 />\').1f(1L(\'3v\')).W(S+(23*2)).U(L+(23*2)).B({16:\'1b\',R:D(-23),P:D(-23),1l:3R,1z:0}).3q(48);d 1I,1Q;d 2u=2Q(G),1q,1B,3i,58,3h,1O;g(\'36\'1a j){1I=j.36[0]/S;1Q=j.36[1]/L}d E=7(){d A=0,u=0,q=0,m=0,Z,Y;7 1A(z){d z=2T(z);q=A=z[0];m=u=z[1]};7 1y(z){d z=2T(z);Z=z[0]-q;Y=z[1]-m;q=z[0];m=z[1]};7 3f(){k[Z,Y]};7 2b(2y){d Z=2y[0],Y=2y[1];g(0>A+Z)Z-=Z+A;g(0>u+Y)Y-=Y+u;g(LS){15=S;h=N.17((15-A)/1k);13=1Z<0?u-h:h+u}}1g{15=q;h=3c/1k;13=1Z<0?u-h:u+h;g(13<0){13=0;w=N.17((13-u)*1k);15=1V<0?A-w:w+A}1g g(13>L){13=L;w=N.17(13-u)*1k;15=1V<0?A-w:w+A}}k 4E=3g(1F(A,u,15,13))};7 2T(p){g(p[0]<0)p[0]=0;g(p[1]<0)p[1]=0;g(p[0]>S)p[0]=S;g(p[1]>L)p[1]=L;k[p[0],p[1]]};7 1F(A,u,q,m){d 2R=A,3r=q,3o=u,3l=m;g(q2q))q=(1U>0)?(A+2q):(A-2q);g(2n&&(N.17(22)>2n))m=(22>0)?(u+2n):(u-2n);g(2i&&(N.17(22)<2i))m=(22>0)?(u+2i):(u-2i);g(2m&&(N.17(1U)<2m))q=(1U>0)?(A+2m):(A-2m);g(A<0){q-=A;A-=A}g(u<0){m-=u;u-=u}g(q<0){A-=q;q-=q}g(m<0){u-=m;m-=m}g(q>S){d X=q-S;A-=X;q-=X}g(m>L){d X=m-L;u-=X;m-=X}g(A>S){d X=A-L;m-=X;u-=X}g(u>L){d X=u-L;m-=X;u-=X}k 3g(1F(A,u,q,m))};7 3g(a){k{x:a[0],y:a[1],q:a[2],m:a[3],w:a[2]-a[0],h:a[3]-a[1]}};k{1F:1F,1A:1A,1y:1y,3f:3f,2b:2b,2K:2K,Q:Q}}();d J=7(){d 4v,4z,4y,1R,2U=4x;d 2F={};d H={};d 2E=K;d 1i=j.3D;g(j.30){2F={R:1Y(\'3C\').B(\'R\',$.3d.3e?D(-1):D(0)),3Q:1Y(\'3C\'),P:1Y(\'3z\'),3L:1Y(\'3z\')}}g(j.3A){H.t=1W(\'n\');H.b=1W(\'s\');H.r=1W(\'e\');H.l=1W(\'w\')}j.3B&&2Y([\'n\',\'s\',\'e\',\'w\']);j.3I&&2Y([\'1M\',\'11\',\'1s\',\'2e\']);7 1Y(1u){d 1J=$(\'<12 />\').B({16:\'1b\',1z:j.3O}).1f(1L(1u));$2C.1P(1J);k 1J};7 2W(T,3y){d 1J=$(\'<12 />\').3q(3b(T)).B({3p:T+\'-2A\',16:\'1b\',1l:3y});$2g.1P(1J);k 1J};7 3J(T){k 2W(T,2U++).B({R:D(-1i+1),P:D(-1i+1),1z:j.3P}).1f(1L(\'H\'))};7 1W(T){d s=j.3N,o=1i,h=s,w=s,t=o,l=o;1E(T){C\'n\':C\'s\':w=1t(V);O;C\'e\':C\'w\':h=1t(V);O}k 2W(T,2U++).W(w).U(h).B({R:D(-t+1),P:D(-l+1)})};7 2Y(2J){4U(i 1a 2J)H[2J[i]]=3J(2J[i])};7 31(c){d 3a=N.1K((c.h/2)-1i),35=N.1K((c.w/2)-1i),4V=4W=-1i+1,2a=c.w-1i,1X=c.h-1i,x,y;\'e\'1a H&&H.e.B({R:D(3a),P:D(2a)})&&H.w.B({R:D(3a)})&&H.s.B({R:D(1X),P:D(35)})&&H.n.B({P:D(35)});\'1s\'1a H&&H.1s.B({P:D(2a)})&&H.2e.B({R:D(1X),P:D(2a)})&&H.1M.B({R:D(1X)});\'b\'1a H&&H.b.B({R:D(1X)})&&H.r.B({P:D(2a)})};7 3K(x,y){$34.B({R:D(-y),P:D(-x)});$28.B({R:D(y),P:D(x)})};7 2A(w,h){$28.W(w).U(h)};7 3s(){d p=E.Q();E.1A([p.x,p.y]);E.1y([p.q,p.m])};7 2I(){g(1R)k 1e()};7 1e(){d c=E.Q();2A(c.w,c.h);3K(c.x,c.y);j.30&&2F[\'3L\'].B({P:D(c.w-1)})&&2F[\'3Q\'].B({R:D(c.h-1)});2E&&31(c);1R||1w();j.2D(2H(c))};7 1w(){$28.1w();$I.B(\'1z\',j.3x);1R=M};7 1r(){1o();$28.1v();$I.B(\'1z\',1);1R=K};7 1v(){1r();$I.B(\'1z\',1);1R=K};7 2t(){2E=M;31(E.Q());$2g.1w()};7 1o(){2E=K;$2g.1v()};7 2o(v){(3h=v)?1o():2t()};7 1h(){d c=E.Q();2o(K);3s()};1o();$2C.1P($(\'<12 />\').1f(1L(\'3v\')).3q(3b(\'1N\')).B({3p:\'1N\',16:\'1b\',1l:4M,1z:0}));k{2I:2I,1e:1e,1r:1r,1w:1w,1v:1v,2t:2t,1o:1o,2o:2o,1h:1h}}();d 1j=7(){d 2w=7(){},2v=7(){},2L=j.2x;g(!2L){$1S.3k(2B).2S(26).4N(26)}7 4j(){g(2L){$(3t).3k(2B).2S(26)}$1S.B({1l:4G})}7 4i(){g(2L){$(3t).3H(\'3k\',2B).3H(\'2S\',26)}$1S.B({1l:3R})}7 2B(e){2w(2r(e))};7 26(e){e.2j();e.2k();g(1q){1q=K;2v(2r(e));j.2G(2H(E.Q()));4i();2w=7(){};2v=7(){}}k K};7 1G(1N,1h){1q=M;2w=1N;2v=1h;4j();k K};7 1x(t){$1S.B(\'3p\',t)};$I.4s($1S);k{1G:1G,1x:1x}}();d 33=7(){d $24=$(\'<4w 1u="4L" />\').B({16:\'1b\',P:\'-4O\'}).57(43).56(2f).5a(41),$3S=$(\'<12 />\').B({16:\'1b\',4o:\'4g\'}).1P($24);7 2l(){g(j.2c){$24.1w();$24.4Z()}};7 41(e){$24.1v()};7 2f(e){g(!j.2f)k;d 42=1O,1C;1O=e.4Q?M:K;g(42!=1O){g(1O&&1q){1C=E.Q();1B=1C.w/1C.h}1g 1B=0;J.1e()}e.2k();e.2j();k K};7 29(e,x,y){E.2b([x,y]);J.2I();e.2j();e.2k()};7 43(e){g(e.4T)k M;2f(e);d 2h=1O?10:1;1E(e.5d){C 37:29(e,-2h,0);O;C 39:29(e,2h,0);O;C 38:29(e,0,-2h);O;C 40:29(e,0,2h);O;C 27:J.1r();O;C 9:k M}k K};g(j.2c)$3S.3U($I);k{2l:2l}}();7 D(n){k\'\'+1m(n)+\'D\'};7 1t(n){k\'\'+1m(n)+\'%\'};7 1L(44){k j.3W+\'-\'+44};7 2Q(G){d z=$(G).2y();k[z.P,z.R]};7 2r(e){k[(e.4q-2u[0]),(e.4r-2u[1])]};7 46(1u){g(1u!=3i){1j.1x(1u);3i=1u}};7 4a(19,z){2u=2Q(G);1j.1x(19==\'1N\'?19:19+\'-2A\');g(19==\'1N\')k 1j.1G(4e(z),2P);d 1C=E.Q();E.1A(E.2K(4b(19)));1j.1G(45(19,1C),2P)};7 45(19,f){k 7(z){g(!j.25&&!1B)1E(19){C\'e\':z[1]=f.m;O;C\'w\':z[1]=f.m;O;C\'n\':z[0]=f.q;O;C\'s\':z[0]=f.q;O}1g 1E(19){C\'e\':z[1]=f.y+1;O;C\'w\':z[1]=f.y+1;O;C\'n\':z[0]=f.x+1;O;C\'s\':z[0]=f.x+1;O}E.1y(z);J.1e()}};7 4e(z){d 2M=z;33.2l();k 7(z){E.2b([z[0]-2M[0],z[1]-2M[1]]);2M=z;J.1e()}};7 4b(T){1E(T){C\'n\':k\'1M\';C\'s\':k\'11\';C\'e\':k\'11\';C\'w\':k\'1s\';C\'1s\':k\'1M\';C\'11\':k\'2e\';C\'2e\':k\'11\';C\'1M\':k\'1s\'}};7 3b(T){k 7(e){1q=M;4a(T,2r(e));e.2k();e.2j();k K}};7 47($G,w,h){d 11=$G.W(),1H=$G.U();g((11>w)&&w>0){11=w;1H=(w/$G.W())*$G.U()}g((1H>h)&&h>0){1H=h;11=(h/$G.U())*$G.W()}1I=$G.W()/11;1Q=$G.U()/1H;$G.W(11).U(1H)};7 2H(c){k{x:1m(c.x*1I),y:1m(c.y*1Q),q:1m(c.q*1I),m:1m(c.m*1Q),w:1m(c.w*1I),h:1m(c.h*1Q)}};7 2P(z){d c=E.Q();g(c.w>j.3n[0]&&c.h>j.3n[1]){J.2t();J.1h()}1g{J.1r()}1j.1x(\'2X\')};7 48(e){1q=M;2u=2Q(G);J.1r();J.1o();46(\'2X\');E.1A(2r(e));1j.1G(4c,2P);33.2l();e.2k();e.2j();k K};7 4c(z){E.1y(z);J.1e()};7 2Z(a){d A=a[0],u=a[1],q=a[2],m=a[3];g(3h)k;d 2s=E.1F(A,u,q,m);d c=E.Q();d 18=2p=[c.x,c.y,c.q,c.m];d 3w=j.3V;d x=18[0];d y=18[1];d q=18[2];d m=18[3];d 3Z=2s[0]-2p[0];d 4m=2s[1]-2p[1];d 4n=2s[2]-2p[2];d 4l=2s[3]-2p[3];d 1c=0;d 4h=j.3X;J.2o(M);d 3u=7(){k 7(){1c+=(V-1c)/4h;18[0]=x+((1c/V)*3Z);18[1]=y+((1c/V)*4m);18[2]=q+((1c/V)*4n);18[3]=m+((1c/V)*4l);g(1c=4K.8)1c=V;1d(18)}}();7 32(){4I.4t(3u,3w)};32()};7 1d(l){E.1A([l[0],l[1]]);E.1y([l[2],l[3]]);J.1e()};7 21(F){g(1p(F)!=\'2d\')F={};j=$.4X(j,F);g(1p(j.2D)!==\'7\')j.2D=7(){};g(1p(j.2G)!==\'7\')j.2G=7(){}};7 3m(){k 2H(E.Q())};7 2V(){k E.Q()};7 3E(F){21(F);g(\'1d\'1a F){1d(F.1d);J.1h()}};g(1p(F)!=\'2d\')F={};g(\'1d\'1a F){1d(F.1d);J.1h()}d 2q=j.2z[0]||0;d 2n=j.2z[1]||0;d 2m=j.2O[0]||0;d 2i=j.2O[1]||0;1j.1x(\'2X\');k{2Z:2Z,1d:1d,21:3E,3m:3m,2V:2V}};$.5e.1n=7(j){7 3G(1D){d 4d=j.4R||1D.2N;d I=4P 4S();d 1D=1D;I.50=7(){$(1D).1v().4A(I);1D.1n=$.1n(I,j)};I.2N=4d};g(1p(j)!==\'2d\')j={};1T.4J(7(){g(\'1n\'1a 1T){g(j==\'52\')k 1T.1n;1g 1T.1n.21(j)}1g 3G(1T)});k 1T};',62,325,'|||||||function||||||var|||if|||options|return||y2||||x2||||y1|||||pos|x1|css|case|px|Coords|opt|obj|handle|img|Selection|false|boundy|true|Math|break|left|getFixed|top|boundx|ord|height|100|width|delta|oy|ox||nw|div|yy||xx|position|abs|animat|mode|in|absolute|pcent|setSelect|update|addClass|else|done|hhs|Tracker|aspect|zIndex|parseInt|Jcrop|disableHandles|typeof|btndown|release|ne|pct|type|hide|show|setCursor|setCurrent|opacity|setPressed|aspectLock|fc|from|switch|flipCoords|activateHandlers|nh|xscale|jq|round|cssClass|sw|move|shift_down|append|yscale|awake|trk|this|xsize|rw|insertDragbar|south|insertBorder|rh||setOptions|ysize|bound|keymgr|aspectRatio|trackUp||sel|doNudge|east|moveOffset|keySupport|object|se|watchShift|hdl_holder|nudge|ymin|preventDefault|stopPropagation|watchKeys|xmin|ylimit|animMode|initcr|xlimit|mouseAbs|animto|enableHandles|docOffset|onDone|onMove|trackDocument|offset|maxSize|resize|trackMove|img_holder|onChange|seehandles|borders|onSelect|unscale|updateVisible|li|getCorner|trackDoc|lloc|src|minSize|doneSelect|getPos|xa|mouseup|rebound|hdep|tellScaled|dragDiv|crosshair|createHandles|animateTo|drawBorders|moveHandles|animateStart|KeyManager|img2|midhoriz|trueSize||||midvert|createDragger|rwa|browser|msie|getOffset|makeObj|animating|lastcurs|rha|mousemove|yb|tellSelect|minSelect|ya|cursor|mousedown|xb|refresh|document|animator|tracker|interv|bgOpacity|zi|vline|dragEdges|sideHandles|hline|handleOffset|setOptionsNew|getRect|attachWhenDone|unbind|cornerHandles|insertHandle|moveto|right|real_ratio|handleSize|borderOpacity|handleOpacity|bottom|290|keywrap|bgColor|insertBefore|animationDelay|baseClass|swingSpeed|attr|ix1||onBlur|init_shift|parseKey|cl|dragmodeHandler|myCursor|presize|newSelection|boxWidth|startDragMode|oppLockCorner|selectDrag|loadsrc|createMover|defaults|hidden|velocity|toBack|toFront|boundary|iy2|iy1|ix2|overflow|boxHeight|pageX|pageY|before|setTimeout|max|start|input|370|dragmode|end|after|backgroundColor|jcrop|null|last|holder|450|relative|window|each|99|radio|360|mouseout|30px|new|shiftKey|useImg|Image|ctrlKey|for|north|west|extend|black|focus|onload|edgeMargin|api|handlePad|wrap|300|keyup|keydown|dimmed|310|blur|320|min|keyCode|fn'.split('|'),0,{})) diff --git a/js/jquery.Jcrop.go.js b/js/jquery.Jcrop.go.js deleted file mode 100644 index e5d587354..000000000 --- a/js/jquery.Jcrop.go.js +++ /dev/null @@ -1,41 +0,0 @@ - $(function(){ - jQuery("#photo_original img").Jcrop({ - onChange: showPreview, - setSelect: [ 0, 0, $("#photo_original img").attr("width"), $("#photo_original img").attr("height") ], - onSelect: updateCoords, - aspectRatio: 1, - boxWidth: 480, - boxHeight: 480, - bgColor: '#000', - bgOpacity: .4 - }); - }); - - function showPreview(coords) { - var rx = 96 / coords.w; - var ry = 96 / coords.h; - - var img_width = $("#photo_original img").attr("width"); - var img_height = $("#photo_original img").attr("height"); - - $('#photo_preview img').css({ - width: Math.round(rx *img_width) + 'px', - height: Math.round(ry * img_height) + 'px', - marginLeft: '-' + Math.round(rx * coords.x) + 'px', - marginTop: '-' + Math.round(ry * coords.y) + 'px' - }); - }; - - function updateCoords(c) { - $('#photo_crop_x').val(c.x); - $('#photo_crop_y').val(c.y); - $('#photo_crop_w').val(c.w); - $('#photo_crop_h').val(c.h); - }; - - function checkCoords() { - if (parseInt($('#photo_crop_w').val())) return true; - alert('Please select a crop region then press submit.'); - return false; - }; - diff --git a/js/jquery.Jcrop.pack.js b/js/jquery.Jcrop.pack.js deleted file mode 100644 index aa82e8abe..000000000 --- a/js/jquery.Jcrop.pack.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Jcrop v.0.9.5 (packed) - * (c) 2008 Kelly Hallman and DeepLiquid.com - * More information: http://deepliquid.com/content/Jcrop.html - * Released under MIT License - this header must remain with code - */ - -eval(function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('$.1n=7(G,F){d G=G,F=F;g(1p(G)!==\'2d\')G=$(G)[0];g(1p(F)!==\'2d\')F={};g(!(\'2x\'1a F))F.2x=$.3d.3e?K:M;g(!(\'2c\'1a F))F.2c=$.3d.3e?K:M;d 4f={2x:K,3W:\'4C\',1f:4D,3T:\'4Y\',3x:.6,3O:.4,3P:.5,53:5,3N:9,3D:5,51:14,25:0,2c:M,3I:M,3B:M,30:M,3A:M,49:0,4p:0,4k:8,3V:20,3X:3,2f:K,3n:[0,0],2z:[0,0],2O:[0,0],2D:7(){},2G:7(){}};d j=4f;21(F);d $I=$(G).B({16:\'1b\'});47($I,j.49,j.4p);d S=$I.W(),L=$I.U(),$12=$(\'<12 />\').W(S).U(L).1f(1L(\'4F\')).B({16:\'4H\',4B:j.3T});g(j.1f)$12.1f(j.1f);$I.54($12);d $34=$(\'\').3Y(\'2N\',$I.3Y(\'2N\')).B(\'16\',\'1b\').W(S).U(L);d $2C=$(\'<12 />\').W(1t(V)).U(1t(V)).B({1l:59,16:\'1b\',4o:\'4g\'}).1P($34);d $2g=$(\'<12 />\').W(1t(V)).U(1t(V)).B({1l:5b});d $28=$(\'<12 />\').B({16:\'1b\',1l:55}).3U($I).1P($2C,$2g);d 23=j.4k;d $1S=$(\'<12 />\').1f(1L(\'3v\')).W(S+(23*2)).U(L+(23*2)).B({16:\'1b\',R:D(-23),P:D(-23),1l:3R,1z:0}).3q(48);d 1I,1Q;d 2u=2Q(G),1q,1B,3i,58,3h,1O;g(\'36\'1a j){1I=j.36[0]/S;1Q=j.36[1]/L}d E=7(){d A=0,u=0,q=0,m=0,Z,Y;7 1A(z){d z=2T(z);q=A=z[0];m=u=z[1]};7 1y(z){d z=2T(z);Z=z[0]-q;Y=z[1]-m;q=z[0];m=z[1]};7 3f(){k[Z,Y]};7 2b(2y){d Z=2y[0],Y=2y[1];g(0>A+Z)Z-=Z+A;g(0>u+Y)Y-=Y+u;g(LS){15=S;h=N.17((15-A)/1k);13=1Z<0?u-h:h+u}}1g{15=q;h=3c/1k;13=1Z<0?u-h:u+h;g(13<0){13=0;w=N.17((13-u)*1k);15=1V<0?A-w:w+A}1g g(13>L){13=L;w=N.17(13-u)*1k;15=1V<0?A-w:w+A}}k 4E=3g(1F(A,u,15,13))};7 2T(p){g(p[0]<0)p[0]=0;g(p[1]<0)p[1]=0;g(p[0]>S)p[0]=S;g(p[1]>L)p[1]=L;k[p[0],p[1]]};7 1F(A,u,q,m){d 2R=A,3r=q,3o=u,3l=m;g(q2q))q=(1U>0)?(A+2q):(A-2q);g(2n&&(N.17(22)>2n))m=(22>0)?(u+2n):(u-2n);g(2i&&(N.17(22)<2i))m=(22>0)?(u+2i):(u-2i);g(2m&&(N.17(1U)<2m))q=(1U>0)?(A+2m):(A-2m);g(A<0){q-=A;A-=A}g(u<0){m-=u;u-=u}g(q<0){A-=q;q-=q}g(m<0){u-=m;m-=m}g(q>S){d X=q-S;A-=X;q-=X}g(m>L){d X=m-L;u-=X;m-=X}g(A>S){d X=A-L;m-=X;u-=X}g(u>L){d X=u-L;m-=X;u-=X}k 3g(1F(A,u,q,m))};7 3g(a){k{x:a[0],y:a[1],q:a[2],m:a[3],w:a[2]-a[0],h:a[3]-a[1]}};k{1F:1F,1A:1A,1y:1y,3f:3f,2b:2b,2K:2K,Q:Q}}();d J=7(){d 4v,4z,4y,1R,2U=4x;d 2F={};d H={};d 2E=K;d 1i=j.3D;g(j.30){2F={R:1Y(\'3C\').B(\'R\',$.3d.3e?D(-1):D(0)),3Q:1Y(\'3C\'),P:1Y(\'3z\'),3L:1Y(\'3z\')}}g(j.3A){H.t=1W(\'n\');H.b=1W(\'s\');H.r=1W(\'e\');H.l=1W(\'w\')}j.3B&&2Y([\'n\',\'s\',\'e\',\'w\']);j.3I&&2Y([\'1M\',\'11\',\'1s\',\'2e\']);7 1Y(1u){d 1J=$(\'<12 />\').B({16:\'1b\',1z:j.3O}).1f(1L(1u));$2C.1P(1J);k 1J};7 2W(T,3y){d 1J=$(\'<12 />\').3q(3b(T)).B({3p:T+\'-2A\',16:\'1b\',1l:3y});$2g.1P(1J);k 1J};7 3J(T){k 2W(T,2U++).B({R:D(-1i+1),P:D(-1i+1),1z:j.3P}).1f(1L(\'H\'))};7 1W(T){d s=j.3N,o=1i,h=s,w=s,t=o,l=o;1E(T){C\'n\':C\'s\':w=1t(V);O;C\'e\':C\'w\':h=1t(V);O}k 2W(T,2U++).W(w).U(h).B({R:D(-t+1),P:D(-l+1)})};7 2Y(2J){4U(i 1a 2J)H[2J[i]]=3J(2J[i])};7 31(c){d 3a=N.1K((c.h/2)-1i),35=N.1K((c.w/2)-1i),4V=4W=-1i+1,2a=c.w-1i,1X=c.h-1i,x,y;\'e\'1a H&&H.e.B({R:D(3a),P:D(2a)})&&H.w.B({R:D(3a)})&&H.s.B({R:D(1X),P:D(35)})&&H.n.B({P:D(35)});\'1s\'1a H&&H.1s.B({P:D(2a)})&&H.2e.B({R:D(1X),P:D(2a)})&&H.1M.B({R:D(1X)});\'b\'1a H&&H.b.B({R:D(1X)})&&H.r.B({P:D(2a)})};7 3K(x,y){$34.B({R:D(-y),P:D(-x)});$28.B({R:D(y),P:D(x)})};7 2A(w,h){$28.W(w).U(h)};7 3s(){d p=E.Q();E.1A([p.x,p.y]);E.1y([p.q,p.m])};7 2I(){g(1R)k 1e()};7 1e(){d c=E.Q();2A(c.w,c.h);3K(c.x,c.y);j.30&&2F[\'3L\'].B({P:D(c.w-1)})&&2F[\'3Q\'].B({R:D(c.h-1)});2E&&31(c);1R||1w();j.2D(2H(c))};7 1w(){$28.1w();$I.B(\'1z\',j.3x);1R=M};7 1r(){1o();$28.1v();$I.B(\'1z\',1);1R=K};7 1v(){1r();$I.B(\'1z\',1);1R=K};7 2t(){2E=M;31(E.Q());$2g.1w()};7 1o(){2E=K;$2g.1v()};7 2o(v){(3h=v)?1o():2t()};7 1h(){d c=E.Q();2o(K);3s()};1o();$2C.1P($(\'<12 />\').1f(1L(\'3v\')).3q(3b(\'1N\')).B({3p:\'1N\',16:\'1b\',1l:4M,1z:0}));k{2I:2I,1e:1e,1r:1r,1w:1w,1v:1v,2t:2t,1o:1o,2o:2o,1h:1h}}();d 1j=7(){d 2w=7(){},2v=7(){},2L=j.2x;g(!2L){$1S.3k(2B).2S(26).4N(26)}7 4j(){g(2L){$(3t).3k(2B).2S(26)}$1S.B({1l:4G})}7 4i(){g(2L){$(3t).3H(\'3k\',2B).3H(\'2S\',26)}$1S.B({1l:3R})}7 2B(e){2w(2r(e))};7 26(e){e.2j();e.2k();g(1q){1q=K;2v(2r(e));j.2G(2H(E.Q()));4i();2w=7(){};2v=7(){}}k K};7 1G(1N,1h){1q=M;2w=1N;2v=1h;4j();k K};7 1x(t){$1S.B(\'3p\',t)};$I.4s($1S);k{1G:1G,1x:1x}}();d 33=7(){d $24=$(\'<4w 1u="4L" />\').B({16:\'1b\',P:\'-4O\'}).57(43).56(2f).5a(41),$3S=$(\'<12 />\').B({16:\'1b\',4o:\'4g\'}).1P($24);7 2l(){g(j.2c){$24.1w();$24.4Z()}};7 41(e){$24.1v()};7 2f(e){g(!j.2f)k;d 42=1O,1C;1O=e.4Q?M:K;g(42!=1O){g(1O&&1q){1C=E.Q();1B=1C.w/1C.h}1g 1B=0;J.1e()}e.2k();e.2j();k K};7 29(e,x,y){E.2b([x,y]);J.2I();e.2j();e.2k()};7 43(e){g(e.4T)k M;2f(e);d 2h=1O?10:1;1E(e.5d){C 37:29(e,-2h,0);O;C 39:29(e,2h,0);O;C 38:29(e,0,-2h);O;C 40:29(e,0,2h);O;C 27:J.1r();O;C 9:k M}k K};g(j.2c)$3S.3U($I);k{2l:2l}}();7 D(n){k\'\'+1m(n)+\'D\'};7 1t(n){k\'\'+1m(n)+\'%\'};7 1L(44){k j.3W+\'-\'+44};7 2Q(G){d z=$(G).2y();k[z.P,z.R]};7 2r(e){k[(e.4q-2u[0]),(e.4r-2u[1])]};7 46(1u){g(1u!=3i){1j.1x(1u);3i=1u}};7 4a(19,z){2u=2Q(G);1j.1x(19==\'1N\'?19:19+\'-2A\');g(19==\'1N\')k 1j.1G(4e(z),2P);d 1C=E.Q();E.1A(E.2K(4b(19)));1j.1G(45(19,1C),2P)};7 45(19,f){k 7(z){g(!j.25&&!1B)1E(19){C\'e\':z[1]=f.m;O;C\'w\':z[1]=f.m;O;C\'n\':z[0]=f.q;O;C\'s\':z[0]=f.q;O}1g 1E(19){C\'e\':z[1]=f.y+1;O;C\'w\':z[1]=f.y+1;O;C\'n\':z[0]=f.x+1;O;C\'s\':z[0]=f.x+1;O}E.1y(z);J.1e()}};7 4e(z){d 2M=z;33.2l();k 7(z){E.2b([z[0]-2M[0],z[1]-2M[1]]);2M=z;J.1e()}};7 4b(T){1E(T){C\'n\':k\'1M\';C\'s\':k\'11\';C\'e\':k\'11\';C\'w\':k\'1s\';C\'1s\':k\'1M\';C\'11\':k\'2e\';C\'2e\':k\'11\';C\'1M\':k\'1s\'}};7 3b(T){k 7(e){1q=M;4a(T,2r(e));e.2k();e.2j();k K}};7 47($G,w,h){d 11=$G.W(),1H=$G.U();g((11>w)&&w>0){11=w;1H=(w/$G.W())*$G.U()}g((1H>h)&&h>0){1H=h;11=(h/$G.U())*$G.W()}1I=$G.W()/11;1Q=$G.U()/1H;$G.W(11).U(1H)};7 2H(c){k{x:1m(c.x*1I),y:1m(c.y*1Q),q:1m(c.q*1I),m:1m(c.m*1Q),w:1m(c.w*1I),h:1m(c.h*1Q)}};7 2P(z){d c=E.Q();g(c.w>j.3n[0]&&c.h>j.3n[1]){J.2t();J.1h()}1g{J.1r()}1j.1x(\'2X\')};7 48(e){1q=M;2u=2Q(G);J.1r();J.1o();46(\'2X\');E.1A(2r(e));1j.1G(4c,2P);33.2l();e.2k();e.2j();k K};7 4c(z){E.1y(z);J.1e()};7 2Z(a){d A=a[0],u=a[1],q=a[2],m=a[3];g(3h)k;d 2s=E.1F(A,u,q,m);d c=E.Q();d 18=2p=[c.x,c.y,c.q,c.m];d 3w=j.3V;d x=18[0];d y=18[1];d q=18[2];d m=18[3];d 3Z=2s[0]-2p[0];d 4m=2s[1]-2p[1];d 4n=2s[2]-2p[2];d 4l=2s[3]-2p[3];d 1c=0;d 4h=j.3X;J.2o(M);d 3u=7(){k 7(){1c+=(V-1c)/4h;18[0]=x+((1c/V)*3Z);18[1]=y+((1c/V)*4m);18[2]=q+((1c/V)*4n);18[3]=m+((1c/V)*4l);g(1c=4K.8)1c=V;1d(18)}}();7 32(){4I.4t(3u,3w)};32()};7 1d(l){E.1A([l[0],l[1]]);E.1y([l[2],l[3]]);J.1e()};7 21(F){g(1p(F)!=\'2d\')F={};j=$.4X(j,F);g(1p(j.2D)!==\'7\')j.2D=7(){};g(1p(j.2G)!==\'7\')j.2G=7(){}};7 3m(){k 2H(E.Q())};7 2V(){k E.Q()};7 3E(F){21(F);g(\'1d\'1a F){1d(F.1d);J.1h()}};g(1p(F)!=\'2d\')F={};g(\'1d\'1a F){1d(F.1d);J.1h()}d 2q=j.2z[0]||0;d 2n=j.2z[1]||0;d 2m=j.2O[0]||0;d 2i=j.2O[1]||0;1j.1x(\'2X\');k{2Z:2Z,1d:1d,21:3E,3m:3m,2V:2V}};$.5e.1n=7(j){7 3G(1D){d 4d=j.4R||1D.2N;d I=4P 4S();d 1D=1D;I.50=7(){$(1D).1v().4A(I);1D.1n=$.1n(I,j)};I.2N=4d};g(1p(j)!==\'2d\')j={};1T.4J(7(){g(\'1n\'1a 1T){g(j==\'52\')k 1T.1n;1g 1T.1n.21(j)}1g 3G(1T)});k 1T};',62,325,'|||||||function||||||var|||if|||options|return||y2||||x2||||y1|||||pos|x1|css|case|px|Coords|opt|obj|handle|img|Selection|false|boundy|true|Math|break|left|getFixed|top|boundx|ord|height|100|width|delta|oy|ox||nw|div|yy||xx|position|abs|animat|mode|in|absolute|pcent|setSelect|update|addClass|else|done|hhs|Tracker|aspect|zIndex|parseInt|Jcrop|disableHandles|typeof|btndown|release|ne|pct|type|hide|show|setCursor|setCurrent|opacity|setPressed|aspectLock|fc|from|switch|flipCoords|activateHandlers|nh|xscale|jq|round|cssClass|sw|move|shift_down|append|yscale|awake|trk|this|xsize|rw|insertDragbar|south|insertBorder|rh||setOptions|ysize|bound|keymgr|aspectRatio|trackUp||sel|doNudge|east|moveOffset|keySupport|object|se|watchShift|hdl_holder|nudge|ymin|preventDefault|stopPropagation|watchKeys|xmin|ylimit|animMode|initcr|xlimit|mouseAbs|animto|enableHandles|docOffset|onDone|onMove|trackDocument|offset|maxSize|resize|trackMove|img_holder|onChange|seehandles|borders|onSelect|unscale|updateVisible|li|getCorner|trackDoc|lloc|src|minSize|doneSelect|getPos|xa|mouseup|rebound|hdep|tellScaled|dragDiv|crosshair|createHandles|animateTo|drawBorders|moveHandles|animateStart|KeyManager|img2|midhoriz|trueSize||||midvert|createDragger|rwa|browser|msie|getOffset|makeObj|animating|lastcurs|rha|mousemove|yb|tellSelect|minSelect|ya|cursor|mousedown|xb|refresh|document|animator|tracker|interv|bgOpacity|zi|vline|dragEdges|sideHandles|hline|handleOffset|setOptionsNew|getRect|attachWhenDone|unbind|cornerHandles|insertHandle|moveto|right|real_ratio|handleSize|borderOpacity|handleOpacity|bottom|290|keywrap|bgColor|insertBefore|animationDelay|baseClass|swingSpeed|attr|ix1||onBlur|init_shift|parseKey|cl|dragmodeHandler|myCursor|presize|newSelection|boxWidth|startDragMode|oppLockCorner|selectDrag|loadsrc|createMover|defaults|hidden|velocity|toBack|toFront|boundary|iy2|iy1|ix2|overflow|boxHeight|pageX|pageY|before|setTimeout|max|start|input|370|dragmode|end|after|backgroundColor|jcrop|null|last|holder|450|relative|window|each|99|radio|360|mouseout|30px|new|shiftKey|useImg|Image|ctrlKey|for|north|west|extend|black|focus|onload|edgeMargin|api|handlePad|wrap|300|keyup|keydown|dimmed|310|blur|320|min|keyCode|fn'.split('|'),0,{})) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 18205fceb..cfe445a98 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -148,7 +148,8 @@ font-weight:bold; #form_settings_profile legend, #form_login legend, #form_register legend, -#form_password legend { +#form_password legend, +#form_settings_avatar legend { display:none; } @@ -1161,21 +1162,34 @@ clear:both; - -#photo_original, -#photo_preview { +#form_settings_avatar li { +width:auto; +} +#form_settings_avatar input { +margin-left:0; +} +#avatar_original, +#avatar_preview { float:left; } -#photo_preview, -#settings_photo_action-crop { +#avatar_preview { margin-left:29px; } -#photo_preview_view { +#avatar_preview_view { height:96px; width:96px; +margin-bottom:18px; overflow:hidden; } +#settings_attach, +#form_settings_avatar .form_actions { +clear:both; +} + +#form_settings_avatar .form_actions { +margin-bottom:0; +} -- cgit v1.2.3-54-g00ecf From 4b42c3526985a497418db7fbcfe1e7912bb5474d Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 22:44:27 +0000 Subject: General markup and style cleanup --- actions/showgroup.php | 22 +++++++++++----------- actions/showstream.php | 6 +++--- lib/groupeditform.php | 18 +++++++++++++++--- lib/groupminilist.php | 6 +++--- lib/profileminilist.php | 4 ++-- theme/base/css/display.css | 8 +++++--- 6 files changed, 39 insertions(+), 25 deletions(-) (limited to 'theme/base') diff --git a/actions/showgroup.php b/actions/showgroup.php index c2cd3d295..bd9d4f175 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -195,13 +195,13 @@ class ShowgroupAction extends Action function showGroupProfile() { - $this->elementStart('div', array('id' => 'group_profile', + $this->elementStart('div', array('id' => 'user_profile', 'class' => 'vcard author')); $this->element('h2', null, _('Group profile')); - $this->elementStart('dl', 'group_depiction'); - $this->element('dt', null, _('Photo')); + $this->elementStart('dl', 'user_depiction'); + $this->element('dt', null, _('Avatar')); $this->elementStart('dd'); $logo = ($this->group->homepage_logo) ? @@ -215,7 +215,7 @@ class ShowgroupAction extends Action $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementStart('dl', 'group_nickname'); + $this->elementStart('dl', 'user_nickname'); $this->element('dt', null, _('Nickname')); $this->elementStart('dd'); $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn nickname url uid'; @@ -226,7 +226,7 @@ class ShowgroupAction extends Action $this->elementEnd('dl'); if ($this->group->fullname) { - $this->elementStart('dl', 'group_fn'); + $this->elementStart('dl', 'user_fn'); $this->element('dt', null, _('Full name')); $this->elementStart('dd'); $this->element('span', 'fn', $this->group->fullname); @@ -235,14 +235,14 @@ class ShowgroupAction extends Action } if ($this->group->location) { - $this->elementStart('dl', 'group_location'); + $this->elementStart('dl', 'user_location'); $this->element('dt', null, _('Location')); $this->element('dd', 'location', $this->group->location); $this->elementEnd('dl'); } if ($this->group->homepage) { - $this->elementStart('dl', 'group_url'); + $this->elementStart('dl', 'user_url'); $this->element('dt', null, _('URL')); $this->elementStart('dd'); $this->element('a', array('href' => $this->group->homepage, @@ -253,7 +253,7 @@ class ShowgroupAction extends Action } if ($this->group->description) { - $this->elementStart('dl', 'group_note'); + $this->elementStart('dl', 'user_note'); $this->element('dt', null, _('Note')); $this->element('dd', 'note', $this->group->description); $this->elementEnd('dl'); @@ -261,10 +261,10 @@ class ShowgroupAction extends Action $this->elementEnd('div'); - $this->elementStart('div', array('id' => 'group_actions')); + $this->elementStart('div', array('id' => 'user_actions')); $this->element('h2', null, _('Group actions')); $this->elementStart('ul'); - $this->elementStart('li', array('id' => 'group_subscribe')); + $this->elementStart('li', array('id' => 'user_subscribe')); $cur = common_current_user(); if ($cur) { if ($cur->isMember($this->group)) { @@ -361,4 +361,4 @@ class ShowgroupAction extends Action _('All members')); } } -} \ No newline at end of file +} diff --git a/actions/showstream.php b/actions/showstream.php index 9734c2907..b2b8b344c 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -410,7 +410,7 @@ class ShowstreamAction extends Action $this->elementStart('p'); $this->element('a', array('href' => common_local_url('subscriptions', array('nickname' => $this->profile->nickname)), - 'class' => 'mores'), + 'class' => 'more'), _('All subscriptions')); $this->elementEnd('p'); } @@ -439,7 +439,7 @@ class ShowstreamAction extends Action $this->elementStart('p'); $this->element('a', array('href' => common_local_url('subscribers', array('nickname' => $this->profile->nickname)), - 'class' => 'mores'), + 'class' => 'more'), _('All subscribers')); $this->elementEnd('p'); } @@ -521,7 +521,7 @@ class ShowstreamAction extends Action $this->elementStart('p'); $this->element('a', array('href' => common_local_url('usergroups', array('nickname' => $this->profile->nickname)), - 'class' => 'mores'), + 'class' => 'more'), _('All groups')); $this->elementEnd('p'); } diff --git a/lib/groupeditform.php b/lib/groupeditform.php index f6e326078..14205d250 100644 --- a/lib/groupeditform.php +++ b/lib/groupeditform.php @@ -78,9 +78,9 @@ class GroupEditForm extends Form function id() { if ($this->group) { - return 'group_edit-' . $this->group->id; + return 'form_group_edit-' . $this->group->id; } else { - return 'group_add'; + return 'form_group_add'; } } @@ -92,7 +92,7 @@ class GroupEditForm extends Form function formClass() { - return 'form_group_add'; + return 'form_settings'; } /** @@ -111,6 +111,18 @@ class GroupEditForm extends Form } } + + /** + * Name of the form + * + * @return void + */ + + function formLegend() + { + $this->out->element('legend', null, _('Create a new group')); + } + /** * Data elements of the form * diff --git a/lib/groupminilist.php b/lib/groupminilist.php index e4d4c68fd..f40a67b0c 100644 --- a/lib/groupminilist.php +++ b/lib/groupminilist.php @@ -49,7 +49,7 @@ class GroupMiniList extends GroupList { function show() { - $this->out->elementStart('ul', 'groups'); + $this->out->elementStart('ul', 'groups xoxo'); $cnt = 0; @@ -73,7 +73,7 @@ class GroupMiniList extends GroupList $this->group->fullname : $this->group->nickname, 'href' => $this->group->homeUrl(), - 'rel' => 'contact', + 'rel' => 'contact group', 'class' => 'url')); $logo = ($this->group->stream_logo) ? $this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE); @@ -85,7 +85,7 @@ class GroupMiniList extends GroupList 'alt' => ($this->group->fullname) ? $this->group->fullname : $this->group->nickname)); - $this->out->element('span', 'fn nickname', $this->group->nickname); + $this->out->element('span', 'fn org nickname', $this->group->nickname); $this->out->elementEnd('a'); $this->out->elementEnd('li'); } diff --git a/lib/profileminilist.php b/lib/profileminilist.php index c6970f808..f157a5529 100644 --- a/lib/profileminilist.php +++ b/lib/profileminilist.php @@ -49,7 +49,7 @@ class ProfileMiniList extends ProfileList { function show() { - $this->out->elementStart('ul', 'users'); + $this->out->elementStart('ul', 'users xoxo'); $cnt = 0; @@ -73,7 +73,7 @@ class ProfileMiniList extends ProfileList $this->profile->fullname : $this->profile->nickname, 'href' => $this->profile->profileurl, - 'rel' => 'contact', + 'rel' => 'contact member', 'class' => 'url')); $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE); $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)), diff --git a/theme/base/css/display.css b/theme/base/css/display.css index cfe445a98..287dd8140 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -149,7 +149,8 @@ font-weight:bold; #form_login legend, #form_register legend, #form_password legend, -#form_settings_avatar legend { +#form_settings_avatar legend, +#form_group_add legend { display:none; } @@ -189,6 +190,8 @@ border-radius:4px; padding:0 7px; } + + /* FORM SETTINGS */ @@ -691,9 +694,8 @@ margin-right:7px; margin-bottom:7px; } #user_subscriptions .users li .photo { -width:24px; -height:24px; margin-right:0; +margin-bottom:0; } #user_subscriptions .users li .fn { display:none; -- cgit v1.2.3-54-g00ecf From d72706ce9d44a12b27727b10cf570dfea7c7f896 Mon Sep 17 00:00:00 2001 From: sarven Date: Wed, 21 Jan 2009 23:33:52 +0000 Subject: Changed to @class entity_profile from @id user_profile. --- actions/showgroup.php | 3 +- actions/showstream.php | 2 +- lib/profilelist.php | 3 +- theme/base/css/display.css | 76 +++++++++++++++++++++++++++------------------- 4 files changed, 47 insertions(+), 37 deletions(-) (limited to 'theme/base') diff --git a/actions/showgroup.php b/actions/showgroup.php index bd9d4f175..41804c6ae 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -195,8 +195,7 @@ class ShowgroupAction extends Action function showGroupProfile() { - $this->elementStart('div', array('id' => 'user_profile', - 'class' => 'vcard author')); + $this->elementStart('div', 'entity_profile vcard author'); $this->element('h2', null, _('Group profile')); diff --git a/actions/showstream.php b/actions/showstream.php index b2b8b344c..20d429679 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -227,7 +227,7 @@ class ShowstreamAction extends Action function showProfile() { - $this->elementStart('div', array('id' => 'user_profile', 'class' => 'vcard author')); + $this->elementStart('div', 'entity_profile vcard author'); $this->element('h2', null, _('User profile')); $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); diff --git a/lib/profilelist.php b/lib/profilelist.php index f7ed5d19c..403cfe065 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -93,8 +93,7 @@ class ProfileList extends Widget $user = common_current_user(); - $this->out->elementStart('div', array('id' => 'user_profile', - 'class' => 'vcard')); + $this->out->elementStart('div', 'entity_profile vcard'); $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE); $this->out->elementStart('a', array('href' => $this->profile->profileurl, diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 287dd8140..ab287c04f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -150,7 +150,8 @@ font-weight:bold; #form_register legend, #form_password legend, #form_settings_avatar legend, -#form_group_add legend { +#newgroup legend, +#editgroup legend { display:none; } @@ -448,7 +449,7 @@ margin-left:4px; #form_notice .form_note { position:absolute; -top:120px; +top:118px; right:98px; z-index:9; } @@ -460,6 +461,7 @@ display:none; #notice_text-count { font-weight:bold; line-height:1.15; +padding:1px 2px; } #form_notice #notice_data-attach_view { @@ -508,7 +510,7 @@ float:left; /* user_profile */ -#user_profile { +.entity_profile { position:relative; width:475px; min-height:123px; @@ -516,23 +518,23 @@ float:left; margin-bottom:17px; margin-left:0; } -#user_profile dt, +.entity_profile dt, #user_statistics dt { font-weight:bold; } -#user_profile .user_depiction { +.entity_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 { +.entity_profile .user_fn, +.entity_profile .user_nickname, +.entity_profile .user_location, +.entity_profile .user_url, +.entity_profile .user_note, +.entity_profile .user_tags { float:left; clear:left; margin-left:113px; @@ -540,37 +542,37 @@ width:322px; margin-bottom:4px; } -#user_profile .user_fn, -#user_profile .user_nickname { +.entity_profile .user_fn, +.entity_profile .user_nickname { width:auto; clear:none; } -#user_profile .user_fn { +.entity_profile .user_fn { margin-left:11px; margin-right:4px; } -#user_profile .user_fn .fn { +.entity_profile .user_fn .fn { font-weight:bold; font-style:normal; } -#user_profile .nickname { +.entity_profile .nickname { font-style:italic; font-weight:bold; } -#user_profile .user_fn dd:before { +.entity_profile .user_fn dd:before { content: "("; font-weight:normal; } -#user_profile .user_fn dd:after { +.entity_profile .user_fn dd:after { content: ")"; font-weight:normal; } -#user_profile dt { +.entity_profile dt { display:none; } -#user_profile h2 { +.entity_profile h2 { display:none; } @@ -664,6 +666,8 @@ float:left; .aside .section { margin-bottom:29px; clear:both; +float:left; +width:100%; } .aside .section h2 { text-transform:uppercase; @@ -680,24 +684,25 @@ content: ":"; #user_subscriptions, -#user_subscriptions-common { -float:left; +#user_subscribers, +#user_groups, { + } -#user_subscriptions ul.users { +.section ul.users { width:220px; float:left; } -#user_subscriptions .users li { +.section .users li { list-style-type:none; float:left; margin-right:7px; margin-bottom:7px; } -#user_subscriptions .users li .photo { +.section .users li .photo { margin-right:0; margin-bottom:0; } -#user_subscriptions .users li .fn { +.section .users li .fn { display:none; } .aside .section .more { @@ -706,29 +711,36 @@ clear:both; -.profile #user_profile { +.profile .entity_profile { margin-bottom:0; min-height:60px; } +.profile .form_user_subscribe, .profile .form_user_unsubscribe { float:right; } +.profile .form_user_subscribe legend, +.profile .form_user_unsubscribe legend { +display:none; +} + + .profiles { list-style-type:none; } -.profile #user_profile .user_location { +.profile .entity_profile .user_location { width:auto; clear:none; margin-left:11px; } -.profile #user_profile dl, -.profile #user_profile dd { +.profile .entity_profile dl, +.profile .entity_profile dd { display:inline; float:none; } -.profile #user_profile .user_note, -.profile #user_profile .user_url { +.profile .entity_profile .user_note, +.profile .entity_profile .user_url { margin-left:59px; clear:none; display:block; -- cgit v1.2.3-54-g00ecf From a57f12b06c9972b4935b7e21a4c9ea1f34647eb3 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 00:04:13 +0000 Subject: selector name cleanup --- actions/showgroup.php | 22 ++++----- actions/showstream.php | 47 +++++++++---------- lib/blockform.php | 2 +- lib/groupminilist.php | 2 +- lib/profilelist.php | 10 ++-- lib/profileminilist.php | 2 +- theme/base/css/display.css | 101 ++++++++++++++++++----------------------- theme/identica/css/display.css | 8 ++-- 8 files changed, 91 insertions(+), 103 deletions(-) (limited to 'theme/base') diff --git a/actions/showgroup.php b/actions/showgroup.php index 41804c6ae..1af080c7e 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -199,7 +199,7 @@ class ShowgroupAction extends Action $this->element('h2', null, _('Group profile')); - $this->elementStart('dl', 'user_depiction'); + $this->elementStart('dl', 'entity_depiction'); $this->element('dt', null, _('Avatar')); $this->elementStart('dd'); @@ -214,10 +214,10 @@ class ShowgroupAction extends Action $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementStart('dl', 'user_nickname'); + $this->elementStart('dl', 'entity_nickname'); $this->element('dt', null, _('Nickname')); $this->elementStart('dd'); - $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn nickname url uid'; + $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid'; $this->element('a', array('href' => $this->group->homeUrl(), 'rel' => 'me', 'class' => $hasFN), $this->group->nickname); @@ -225,23 +225,23 @@ class ShowgroupAction extends Action $this->elementEnd('dl'); if ($this->group->fullname) { - $this->elementStart('dl', 'user_fn'); + $this->elementStart('dl', 'entity_fn'); $this->element('dt', null, _('Full name')); $this->elementStart('dd'); - $this->element('span', 'fn', $this->group->fullname); + $this->element('span', 'fn org', $this->group->fullname); $this->elementEnd('dd'); $this->elementEnd('dl'); } if ($this->group->location) { - $this->elementStart('dl', 'user_location'); + $this->elementStart('dl', 'entity_location'); $this->element('dt', null, _('Location')); $this->element('dd', 'location', $this->group->location); $this->elementEnd('dl'); } if ($this->group->homepage) { - $this->elementStart('dl', 'user_url'); + $this->elementStart('dl', 'entity_url'); $this->element('dt', null, _('URL')); $this->elementStart('dd'); $this->element('a', array('href' => $this->group->homepage, @@ -252,7 +252,7 @@ class ShowgroupAction extends Action } if ($this->group->description) { - $this->elementStart('dl', 'user_note'); + $this->elementStart('dl', 'entity_note'); $this->element('dt', null, _('Note')); $this->element('dd', 'note', $this->group->description); $this->elementEnd('dl'); @@ -260,10 +260,10 @@ class ShowgroupAction extends Action $this->elementEnd('div'); - $this->elementStart('div', array('id' => 'user_actions')); + $this->elementStart('div', 'entity_actions'); $this->element('h2', null, _('Group actions')); $this->elementStart('ul'); - $this->elementStart('li', array('id' => 'user_subscribe')); + $this->elementStart('li', array('id' => 'entity_subscribe')); $cur = common_current_user(); if ($cur) { if ($cur->isMember($this->group)) { @@ -341,7 +341,7 @@ class ShowgroupAction extends Action return; } - $this->elementStart('div', array('id' => 'user_subscriptions', + $this->elementStart('div', array('id' => 'entity_subscriptions', 'class' => 'section')); $this->element('h2', null, _('Members')); diff --git a/actions/showstream.php b/actions/showstream.php index 20d429679..f853f277d 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -169,14 +169,14 @@ class ShowstreamAction extends Action $this->element('link', array('rel' => 'alternate', 'href' => common_local_url('api', array('apiaction' => 'statuses', - 'method' => 'user_timeline.rss', + 'method' => 'entity_timeline.rss', 'argument' => $this->user->nickname)), 'type' => 'application/rss+xml', 'title' => sprintf(_('Notice feed for %s'), $this->user->nickname))); $this->element('link', array('rel' => 'alternate feed', 'href' => common_local_url('api', array('apiaction' => 'statuses', - 'method' => 'user_timeline.atom', + 'method' => 'entity_timeline.atom', 'argument' => $this->user->nickname)), 'type' => 'application/atom+xml', 'title' => sprintf(_('Notice feed for %s'), $this->user->nickname))); @@ -231,7 +231,7 @@ class ShowstreamAction extends Action $this->element('h2', null, _('User profile')); $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); - $this->elementStart('dl', 'user_depiction'); + $this->elementStart('dl', 'entity_depiction'); $this->element('dt', null, _('Photo')); $this->elementStart('dd'); $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE), @@ -242,7 +242,7 @@ class ShowstreamAction extends Action $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementStart('dl', 'user_nickname'); + $this->elementStart('dl', 'entity_nickname'); $this->element('dt', null, _('Nickname')); $this->elementStart('dd'); $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid'; @@ -253,7 +253,7 @@ class ShowstreamAction extends Action $this->elementEnd('dl'); if ($this->profile->fullname) { - $this->elementStart('dl', 'user_fn'); + $this->elementStart('dl', 'entity_fn'); $this->element('dt', null, _('Full name')); $this->elementStart('dd'); $this->element('span', 'fn', $this->profile->fullname); @@ -262,14 +262,14 @@ class ShowstreamAction extends Action } if ($this->profile->location) { - $this->elementStart('dl', 'user_location'); + $this->elementStart('dl', 'entity_location'); $this->element('dt', null, _('Location')); $this->element('dd', 'location', $this->profile->location); $this->elementEnd('dl'); } if ($this->profile->homepage) { - $this->elementStart('dl', 'user_url'); + $this->elementStart('dl', 'entity_url'); $this->element('dt', null, _('URL')); $this->elementStart('dd'); $this->element('a', array('href' => $this->profile->homepage, @@ -280,7 +280,7 @@ class ShowstreamAction extends Action } if ($this->profile->bio) { - $this->elementStart('dl', 'user_note'); + $this->elementStart('dl', 'entity_note'); $this->element('dt', null, _('Note')); $this->element('dd', 'note', $this->profile->bio); $this->elementEnd('dl'); @@ -288,7 +288,7 @@ class ShowstreamAction extends Action $tags = Profile_tag::getTags($this->profile->id, $this->profile->id); if (count($tags) > 0) { - $this->elementStart('dl', 'user_tags'); + $this->elementStart('dl', 'entity_tags'); $this->element('dt', null, _('Tags')); $this->elementStart('dd'); $this->elementStart('ul', 'tags xoxo'); @@ -307,10 +307,11 @@ class ShowstreamAction extends Action } $this->elementEnd('div'); - $this->elementStart('div', array('id' => 'user_actions')); + //XXX: entity_actions doesn't need to be outputted if entity is looking at their own profile + $this->elementStart('div', 'entity_actions'); $this->element('h2', null, _('User actions')); $this->elementStart('ul'); - $this->elementStart('li', array('id' => 'user_subscribe')); + $this->elementStart('li', array('id' => 'entity_subscribe')); $cur = common_current_user(); if ($cur) { if ($cur->id != $this->profile->id) { @@ -331,14 +332,14 @@ class ShowstreamAction extends Action $user = User::staticGet('id', $this->profile->id); if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) { - $this->elementStart('li', array('id' => 'user_send-a-message')); + $this->elementStart('li', array('id' => 'entity_send-a-message')); $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)), 'title' => _('Send a direct message to this user')), _('Message')); $this->elementEnd('li'); if ($user->email && $user->emailnotifynudge) { - $this->elementStart('li', array('id' => 'user_nudge')); + $this->elementStart('li', array('id' => 'entity_nudge')); $nf = new NudgeForm($this, $user); $nf->show(); $this->elementEnd('li'); @@ -347,7 +348,7 @@ class ShowstreamAction extends Action if ($cur && $cur->id != $this->profile->id) { $blocked = $cur->hasBlocked($this->profile); - $this->elementStart('li', array('id' => 'user_block')); + $this->elementStart('li', array('id' => 'entity_block')); if ($blocked) { $ubf = new UnblockForm($this, $this->profile); $ubf->show(); @@ -366,7 +367,7 @@ class ShowstreamAction extends Action $url = common_local_url('remotesubscribe', array('nickname' => $this->profile->nickname)); $this->element('a', array('href' => $url, - 'id' => 'user_subscribe_remote'), + 'id' => 'entity_subscribe_remote'), _('Subscribe')); } @@ -393,7 +394,7 @@ class ShowstreamAction extends Action { $profile = $this->user->getSubscriptions(0, PROFILES_PER_MINILIST + 1); - $this->elementStart('div', array('id' => 'user_subscriptions', + $this->elementStart('div', array('id' => 'entity_subscriptions', 'class' => 'section')); $this->element('h2', null, _('Subscriptions')); @@ -422,7 +423,7 @@ class ShowstreamAction extends Action { $profile = $this->user->getSubscribers(0, PROFILES_PER_MINILIST + 1); - $this->elementStart('div', array('id' => 'user_subscribers', + $this->elementStart('div', array('id' => 'entity_subscribers', 'class' => 'section')); $this->element('h2', null, _('Subscribers')); @@ -462,19 +463,19 @@ class ShowstreamAction extends Action $notices->profile_id = $this->profile->id; $notice_count = (int) $notices->count(); - $this->elementStart('div', array('id' => 'user_statistics', + $this->elementStart('div', array('id' => 'entity_statistics', 'class' => 'section')); $this->element('h2', null, _('Statistics')); // Other stats...? - $this->elementStart('dl', 'user_member-since'); + $this->elementStart('dl', 'entity_member-since'); $this->element('dt', null, _('Member since')); $this->element('dd', null, date('j M Y', strtotime($this->profile->created))); $this->elementEnd('dl'); - $this->elementStart('dl', 'user_subscriptions'); + $this->elementStart('dl', 'entity_subscriptions'); $this->elementStart('dt'); $this->element('a', array('href' => common_local_url('subscriptions', array('nickname' => $this->profile->nickname))), @@ -483,7 +484,7 @@ class ShowstreamAction extends Action $this->element('dd', null, (is_int($subs_count)) ? $subs_count : '0'); $this->elementEnd('dl'); - $this->elementStart('dl', 'user_subscribers'); + $this->elementStart('dl', 'entity_subscribers'); $this->elementStart('dt'); $this->element('a', array('href' => common_local_url('subscribers', array('nickname' => $this->profile->nickname))), @@ -492,7 +493,7 @@ class ShowstreamAction extends Action $this->element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0'); $this->elementEnd('dl'); - $this->elementStart('dl', 'user_notices'); + $this->elementStart('dl', 'entity_notices'); $this->element('dt', null, _('Notices')); $this->element('dd', null, (is_int($notice_count)) ? $notice_count : '0'); $this->elementEnd('dl'); @@ -504,7 +505,7 @@ class ShowstreamAction extends Action { $groups = $this->user->getGroups(0, GROUPS_PER_MINILIST + 1); - $this->elementStart('div', array('id' => 'user_groups', + $this->elementStart('div', array('id' => 'entity_groups', 'class' => 'section')); $this->element('h2', null, _('Groups')); diff --git a/lib/blockform.php b/lib/blockform.php index ea22c1cec..af766b823 100644 --- a/lib/blockform.php +++ b/lib/blockform.php @@ -150,6 +150,6 @@ class BlockForm extends Form function formActions() { - $this->out->submit('submit', _('block'), 'submit', null, _('Block this user')); + $this->out->submit('submit', _('Block'), 'submit', null, _('Block this user')); } } diff --git a/lib/groupminilist.php b/lib/groupminilist.php index f40a67b0c..fe38d0340 100644 --- a/lib/groupminilist.php +++ b/lib/groupminilist.php @@ -49,7 +49,7 @@ class GroupMiniList extends GroupList { function show() { - $this->out->elementStart('ul', 'groups xoxo'); + $this->out->elementStart('ul', 'entities groups xoxo'); $cnt = 0; diff --git a/lib/profilelist.php b/lib/profilelist.php index 403cfe065..73c129efe 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -112,7 +112,7 @@ class ProfileList extends Widget $this->out->elementEnd('a'); if ($this->profile->fullname) { - $this->out->elementStart('dl', 'user_fn'); + $this->out->elementStart('dl', 'entity_fn'); $this->out->element('dt', null, 'Full name'); $this->out->elementStart('dd'); $this->out->elementStart('span', 'fn'); @@ -122,7 +122,7 @@ class ProfileList extends Widget $this->out->elementEnd('dl'); } if ($this->profile->location) { - $this->out->elementStart('dl', 'user_location'); + $this->out->elementStart('dl', 'entity_location'); $this->out->element('dt', null, _('Location')); $this->out->elementStart('dd', 'location'); $this->out->raw($this->highlight($this->profile->location)); @@ -130,7 +130,7 @@ class ProfileList extends Widget $this->out->elementEnd('dl'); } if ($this->profile->homepage) { - $this->out->elementStart('dl', 'user_url'); + $this->out->elementStart('dl', 'entity_url'); $this->out->element('dt', null, _('URL')); $this->out->elementStart('dd'); $this->out->elementStart('a', array('href' => $this->profile->homepage, @@ -141,7 +141,7 @@ class ProfileList extends Widget $this->out->elementEnd('dl'); } if ($this->profile->bio) { - $this->out->elementStart('dl', 'user_note'); + $this->out->elementStart('dl', 'entity_note'); $this->out->element('dt', null, _('Note')); $this->out->elementStart('dd', 'note'); $this->out->raw($this->highlight($this->profile->bio)); @@ -155,7 +155,7 @@ class ProfileList extends Widget # Get tags $tags = Profile_tag::getTags($this->owner->id, $this->profile->id); - $this->out->elementStart('dl', 'user_tags'); + $this->out->elementStart('dl', 'entity_tags'); $this->out->elementStart('dt'); if ($user->id == $this->owner->id) { $this->out->element('a', array('href' => common_local_url('tagother', diff --git a/lib/profileminilist.php b/lib/profileminilist.php index f157a5529..56b768419 100644 --- a/lib/profileminilist.php +++ b/lib/profileminilist.php @@ -49,7 +49,7 @@ class ProfileMiniList extends ProfileList { function show() { - $this->out->elementStart('ul', 'users xoxo'); + $this->out->elementStart('ul', 'entities users xoxo'); $cnt = 0; diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ab287c04f..c622e2f22 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -509,7 +509,7 @@ float:left; -/* user_profile */ +/* entity_profile */ .entity_profile { position:relative; width:475px; @@ -519,22 +519,22 @@ margin-bottom:17px; margin-left:0; } .entity_profile dt, -#user_statistics dt { +#entity_statistics dt { font-weight:bold; } -.entity_profile .user_depiction { +.entity_profile .entity_depiction { float:left; position:absolute; top:0; left:0; width:96px; } -.entity_profile .user_fn, -.entity_profile .user_nickname, -.entity_profile .user_location, -.entity_profile .user_url, -.entity_profile .user_note, -.entity_profile .user_tags { +.entity_profile .entity_fn, +.entity_profile .entity_nickname, +.entity_profile .entity_location, +.entity_profile .entity_url, +.entity_profile .entity_note, +.entity_profile .entity_tags { float:left; clear:left; margin-left:113px; @@ -542,16 +542,16 @@ width:322px; margin-bottom:4px; } -.entity_profile .user_fn, -.entity_profile .user_nickname { +.entity_profile .entity_fn, +.entity_profile .entity_nickname { width:auto; clear:none; } -.entity_profile .user_fn { +.entity_profile .entity_fn { margin-left:11px; margin-right:4px; } -.entity_profile .user_fn .fn { +.entity_profile .entity_fn .fn { font-weight:bold; font-style:normal; } @@ -560,11 +560,11 @@ font-style:italic; font-weight:bold; } -.entity_profile .user_fn dd:before { +.entity_profile .entity_fn dd:before { content: "("; font-weight:normal; } -.entity_profile .user_fn dd:after { +.entity_profile .entity_fn dd:after { content: ")"; font-weight:normal; } @@ -576,47 +576,47 @@ display:none; display:none; } -/* user_profile */ +/* entity_profile */ -/*user_actions*/ -#user_actions { +/*entity_actions*/ +.entity_actions { clear:left; float:left; position:absolute; top:0; right:0; } -#user_actions h2 { +.entity_actions h2 { display:none; } -#user_actions ul { +.entity_actions ul { list-style-type:none; } -#user_actions li { +.entity_actions li { margin-bottom:4px; } -#user_actions li:first-child { +.entity_actions li:first-child { border-top:0; } -#user_actions fieldset { +.entity_actions fieldset { border:0; padding:0; } -#user_actions legend { +.entity_actions legend { display:none; } -#user_actions input.submit { +.entity_actions input.submit { display:block; text-align:left; cursor:pointer; width:100%; } -#user_actions a { +.entity_actions a { text-decoration:none; font-weight:bold; width:100%; @@ -627,35 +627,22 @@ display:block; .form_user_block input.submit, .form_user_unblock input.submit, -#user_send-a-message a, +#entity_send-a-message a, .form_user_nudge input.submit { border:0; padding-left:20px; } -#user_send-a-message a { +#entity_send-a-message a { padding:4px 4px 4px 23px; - -} - - -#user_subscribe input.submit, -.form_user_subscribe input.submit { - } -#user_send-a-message form { -} - -#user_send-a-message textarea { -} - -.user_tags ul { +.entity_tags ul { list-style-type:none; } -.user_tags li { +.entity_tags li { display:inline; margin-right:1em; float:left; @@ -674,11 +661,11 @@ text-transform:uppercase; font-size:1em; } -#user_statistics dt, -#user_statistics dd { +#entity_statistics dt, +#entity_statistics dd { display:inline; } -#user_statistics dt:after { +#entity_statistics dt:after { content: ":"; } @@ -688,21 +675,21 @@ content: ":"; #user_groups, { } -.section ul.users { +.section ul.entities { width:220px; float:left; } -.section .users li { +.section .entities li { list-style-type:none; float:left; margin-right:7px; margin-bottom:7px; } -.section .users li .photo { +.section .entities li .photo { margin-right:0; margin-bottom:0; } -.section .users li .fn { +.section .entities li .fn { display:none; } .aside .section .more { @@ -729,7 +716,7 @@ display:none; .profiles { list-style-type:none; } -.profile .entity_profile .user_location { +.profile .entity_profile .entity_location { width:auto; clear:none; margin-left:11px; @@ -739,8 +726,8 @@ margin-left:11px; display:inline; float:none; } -.profile .entity_profile .user_note, -.profile .entity_profile .user_url { +.profile .entity_profile .entity_note, +.profile .entity_profile .entity_url { margin-left:59px; clear:none; display:block; @@ -1065,9 +1052,9 @@ background-color:#D1D9E4; -#user_actions #user_subscribe .form_note, -#user_actions #user_subscribe .form_data, -#user_actions #user_subscribe .form_actions label { +.entity_actions #user_subscribe .form_note, +.entity_actions #user_subscribe .form_data, +.entity_actions #user_subscribe .form_actions label { display:none; } #form_user-relationship .form_note, @@ -1076,7 +1063,7 @@ display:none; display:block; } -#user_actions #user-relationship_submit { +.entity_actions #user-relationship_submit { margin-bottom:0; } #form_user-relationship .form_data li label { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 2b91c5504..c702c77e6 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -42,7 +42,7 @@ a, div.notice-options input, .form_user_block input.submit, .form_user_unblock input.submit, -#user_send-a-message a, +#entity_send-a-message a, .form_user_nudge input.submit { color:#002E6E; } @@ -55,7 +55,7 @@ background-color:#fcfffc; } #aside_primary, -#user_subscribe a, +#entity_subscribe a, #TB_window input.submit, .form_user_subscribe input.submit { background-color:#CEE1E9; @@ -132,7 +132,7 @@ background-image:url(../../base/images/icons/icon_vcard.gif); } -#user_send-a-message a, +#entity_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, .form_user_unblock input.submit { @@ -149,7 +149,7 @@ color:#fff; background-color:#97BFD1; } -#user_send-a-message a { +#entity_send-a-message a { background-image:url(../images/icons/twotone/green/quote.gif); } .form_user_nudge input.submit { -- cgit v1.2.3-54-g00ecf From 07b52e19beff39a7f7cb5de4ebb199f2d894ad08 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 00:12:16 +0000 Subject: Minor cleanup for future groups_related --- actions/showstream.php | 2 +- theme/base/css/display.css | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'theme/base') diff --git a/actions/showstream.php b/actions/showstream.php index f853f277d..1ea84cf21 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -384,10 +384,10 @@ class ShowstreamAction extends Action function showSections() { - $this->showStatistics(); $this->showSubscriptions(); $this->showSubscribers(); $this->showGroups(); + $this->showStatistics(); } function showSubscriptions() diff --git a/theme/base/css/display.css b/theme/base/css/display.css index c622e2f22..253cbfa38 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1194,34 +1194,34 @@ margin-bottom:0; -.section .groups, +#groups_related ul, #users_featured ul { list-style-type:none; } -.section .groups li, +#groups_related li, #users_featured li { margin-top:11px; float:left; width:100%; } -.section .groups li:first-child, +#groups_related li:first-child, #users_featured li:first-child { margin-top:0; } -.section .groups .vcard, +#groups_related .vcard, #users_featured .vcard { float:left; margin-bottom:-23px; } -.section .groups dl, +#groups_related dl, #users_featured dl { float:left; margin-left:63px; clear:left; } -.section .groups dt, +#groups_related dt, #users_featured dt { display:none; font-weight:bold; -- cgit v1.2.3-54-g00ecf From 03117fe3e84cfb7badb1f975ec15b8a97d575fd7 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 04:35:22 +0000 Subject: Cleanup.. some for IE and other for cascading --- lib/groupeditform.php | 2 +- theme/base/css/display.css | 22 ++++++++++------------ theme/base/css/ie.css | 8 ++++++-- theme/base/css/ie6.css | 8 ++++++++ theme/base/css/ie7.css | 2 +- 5 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 theme/base/css/ie6.css (limited to 'theme/base') diff --git a/lib/groupeditform.php b/lib/groupeditform.php index 14205d250..fe53918d1 100644 --- a/lib/groupeditform.php +++ b/lib/groupeditform.php @@ -147,7 +147,7 @@ class GroupEditForm extends Form _('URL of the homepage or blog of the group or topic')); $this->out->elementEnd('li'); $this->out->elementStart('li'); - $this->out->textarea('description', _('description'), + $this->out->textarea('description', _('Description'), ($this->out->arg('description')) ? $this->out->arg('description') : $this->group->description, _('Describe the group or topic in 140 chars')); $this->out->elementEnd('li'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 253cbfa38..073d2d40a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -547,6 +547,7 @@ margin-bottom:4px; width:auto; clear:none; } + .entity_profile .entity_fn { margin-left:11px; margin-right:4px; @@ -584,11 +585,8 @@ display:none; /*entity_actions*/ .entity_actions { -clear:left; -float:left; -position:absolute; -top:0; -right:0; +float:right; + } .entity_actions h2 { display:none; @@ -936,7 +934,7 @@ outline:none; } .notice-options .notice_reply a, -.notice-options form input.submit { +.notice-options input.submit { display:block; border:0; } @@ -1019,18 +1017,18 @@ border-right:0; -/*If there is hentry on #content_inner, this doesn't need to be specific to #doc */ -#doc #content_inner p { +/*If there is hentry on #content_inner, then this doesn't need to be specific to #doc or any other section */ +.hentry .entry-content p { margin-bottom:18px; } -#doc #content_inner ol, -#doc #content_inner ul { +.hentry entry-content ol, +.hentry .entry-content ul { list-style-position:inside; } -#doc #content_inner li { +.hentry .entry-content li { margin-bottom:18px; } -#doc #content_inner li li { +.hentry .entry-content li li { margin-left:18px; } diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index 9baa953b3..08b027b59 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -3,7 +3,7 @@ #aside_primary { padding-left:11px; } -.notice-options form input.submit { +.notice-options input.submit { font-size:0; margin-top:3px; height:16px; @@ -23,4 +23,8 @@ margin-left:-7px; .notice div.entry-content .timestamp a { margin-right:4px; -} \ No newline at end of file +} + +.entity_profile .entity_nickname { +padding-right:3px; +} diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css new file mode 100644 index 000000000..4a2316903 --- /dev/null +++ b/theme/base/css/ie6.css @@ -0,0 +1,8 @@ +/* IE6 specific styles */ +.entity_profile .entity_nickname, +.entity_profile .entity_location, +.entity_profile .entity_url, +.entity_profile .entity_note, +.entity_profile .entity_tags { +margin-left:55px; +} diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css index a6e2548ab..a6ee001e2 100644 --- a/theme/base/css/ie7.css +++ b/theme/base/css/ie7.css @@ -2,4 +2,4 @@ #form_notice textarea { width:370px; -} \ No newline at end of file +} -- cgit v1.2.3-54-g00ecf From a330bdac62ddbc15232bc65d65e869b224880e3f Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 06:33:38 +0000 Subject: Moved nudge response from util.php to nudge.php Adjusted some CSS --- actions/nudge.php | 3 ++- js/util.js | 20 ++++++++++---------- lib/util.php | 5 ----- theme/base/css/display.css | 22 ++++++++++------------ theme/identica/css/display.css | 8 ++++++-- 5 files changed, 28 insertions(+), 30 deletions(-) (limited to 'theme/base') diff --git a/actions/nudge.php b/actions/nudge.php index 456106459..ca6fd3761 100644 --- a/actions/nudge.php +++ b/actions/nudge.php @@ -42,6 +42,7 @@ require_once INSTALLDIR.'/lib/mail.php'; * @package Laconica * @author Evan Prodromou * @author Robin Millette + * @author Sarven Capadisli * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://laconi.ca/ */ @@ -93,7 +94,7 @@ class NudgeAction extends Action $this->element('title', null, _('Nudge sent')); $this->elementEnd('head'); $this->elementStart('body'); - common_nudge_response(); + $this->element('p', array('id' => 'nudge_response'), _('Nudge sent!')); $this->elementEnd('body'); $this->elementEnd('html'); } else { diff --git a/js/util.js b/js/util.js index bb68c2587..579b4952a 100644 --- a/js/util.js +++ b/js/util.js @@ -108,16 +108,16 @@ $(document).ready(function(){ $("form.form_group_join").each(addAjaxHidden); $("form.form_group_leave").each(addAjaxHidden); - $("#nudge").ajaxForm ({ dataType: 'xml', - beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled"); - $("form#nudge input[type=submit]").addClass("disabled"); - }, - success: function(xml) { $("#nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true)); - $("#nudge input[type=submit]").removeAttr("disabled"); - $("#nudge input[type=submit]").removeClass("disabled"); - } - }); - $("#nudge").each(addAjaxHidden); + $("#form_user_nudge").ajaxForm ({ dataType: 'xml', + beforeSubmit: function(xml) { $("#form_user_nudge input[type=submit]").attr("disabled", "disabled"); + $("#form_user_nudge input[type=submit]").addClass("disabled"); + }, + success: function(xml) { $("#form_user_nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true)); + $("#form_user_nudge input[type=submit]").removeAttr("disabled"); + $("#form_user_nudge input[type=submit]").removeClass("disabled"); + } + }); + $("#form_user_nudge").each(addAjaxHidden); var Subscribe = { dataType: 'xml', beforeSubmit: function(formData, jqForm, options) { $(".form_user_subscribe input[type=submit]").attr("disabled", "disabled"); diff --git a/lib/util.php b/lib/util.php index 4d4a3b20f..61f5d6c16 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1660,11 +1660,6 @@ function common_session_token() return $_SESSION['token']; } -function common_nudge_response() -{ - common_element('p', array('id' => 'nudge_response'), _('Nudge sent!')); -} - function common_cache_key($extra) { return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra; diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 073d2d40a..91789f4f1 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -17,8 +17,8 @@ width:1004px; width:71.714em; } h1,h2,h3,h4,h5,h6 { - text-transform:uppercase; - margin-bottom:7px; +text-transform:uppercase; +margin-bottom:7px; } h1 { font-size:1.4em; @@ -34,8 +34,6 @@ h6 { font-size:0.9em; } caption { font-weight:bold; } -.opened { display: block !important;} -.closed { display: none !important;} legend { font-weight:bold; @@ -56,6 +54,7 @@ border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; } + input.submit { font-weight:bold; } @@ -79,9 +78,6 @@ form label { font-weight:bold; /*margin:0 0 11px 0;*/ } -form ul li input { -} - input.checkbox { position:relative; top:2px; @@ -465,7 +461,7 @@ padding:1px 2px; } #form_notice #notice_data-attach_view { -/*position:absolute;*/ +position:absolute; top:25px; right:30px; margin-left:4px; @@ -614,10 +610,10 @@ text-align:left; cursor:pointer; width:100%; } -.entity_actions a { +.entity_actions a, +#entity_nudge p { text-decoration:none; font-weight:bold; -width:100%; display:block; } @@ -626,12 +622,14 @@ display:block; .form_user_block input.submit, .form_user_unblock input.submit, #entity_send-a-message a, -.form_user_nudge input.submit { +.form_user_nudge input.submit, +#entity_nudge p { border:0; padding-left:20px; } -#entity_send-a-message a { +#entity_send-a-message a, +#entity_nudge p { padding:4px 4px 4px 23px; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index c702c77e6..fa395b03b 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -22,6 +22,7 @@ input, textarea, select { border-color:#aaa; } + input.submit, #form_notice.warning #notice_text-count, #nav_register a, @@ -43,7 +44,8 @@ div.notice-options input, .form_user_block input.submit, .form_user_unblock input.submit, #entity_send-a-message a, -.form_user_nudge input.submit { +.form_user_nudge input.submit, +#entity_nudge p { color:#002E6E; } @@ -135,7 +137,8 @@ background-image:url(../../base/images/icons/icon_vcard.gif); #entity_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, -.form_user_unblock input.submit { +.form_user_unblock input.submit, +#entity_nudge p { background-position: 0 40%; background-repeat: no-repeat; background-color:transparent; @@ -152,6 +155,7 @@ background-color:#97BFD1; #entity_send-a-message a { background-image:url(../images/icons/twotone/green/quote.gif); } +#entity_nudge p, .form_user_nudge input.submit { background-image:url(../images/icons/twotone/green/mail.gif); } -- cgit v1.2.3-54-g00ecf From 01e7859a81b8f3f1aef75aae92607beabd2c9390 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 22 Jan 2009 17:12:23 +0100 Subject: Remove common code from Subscriptions, make tags link visible --- actions/subscriptions.php | 97 +++++++++------------------------------------- theme/base/css/display.css | 84 +++------------------------------------ 2 files changed, 24 insertions(+), 157 deletions(-) (limited to 'theme/base') diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 604428cf3..8d1462d49 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -2,7 +2,7 @@ /** * Laconica, the distributed open-source microblogging tool * - * User profile page + * List of a user's subscriptions * * PHP version 5 * @@ -19,7 +19,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . * - * @category Personal + * @category Social * @package Laconica * @author Evan Prodromou * @author Sarven Capadisli @@ -32,18 +32,10 @@ if (!defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/subsgroupnav.php'; - /** - * User profile page - * - * When I created this page, "show stream" seemed like the best name for it. - * Now, it seems like a really bad name. + * A list of the user's subscriptions * - * It shows a stream of the user's posts, plus lots of profile info, links - * to subscriptions and stuff, etc. - * - * @category Personal + * @category Social * @package Laconica * @author Evan Prodromou * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 @@ -52,62 +44,8 @@ require_once INSTALLDIR.'/lib/subsgroupnav.php'; if (!defined('LACONICA')) { exit(1); } -class SubscriptionsAction extends Action +class SubscriptionsAction extends GalleryAction { - var $profile = null; - var $user = null; - var $page = null; - - function prepare($args) - { - parent::prepare($args); - - // FIXME very similar code below - - $nickname_arg = $this->arg('nickname'); - $nickname = common_canonical_nickname($nickname_arg); - - // Permanent redirect on non-canonical nickname - - if ($nickname_arg != $nickname) { - $args = array('nickname' => $nickname); - if ($this->arg('page') && $this->arg('page') != 1) { - $args['page'] = $this->arg['page']; - } - common_redirect(common_local_url('subscriptions', $args), 301); - return false; - } - - $this->user = User::staticGet('nickname', $nickname); - - if (!$this->user) { - $this->clientError(_('No such user.'), 404); - return false; - } - - $this->profile = $this->user->getProfile(); - - if (!$this->profile) { - $this->serverError(_('User has no profile.')); - return false; - } - - $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; - - return true; - } - - function isReadOnly() - { - return true; - } - - function handle($args) - { - parent::handle($args); - $this->showPage(); - } - function title() { if ($this->page == 1) { @@ -134,21 +72,22 @@ class SubscriptionsAction extends Action } } - function showLocalNav() + function getAllTags() { - $nav = new SubGroupNav($this, $this->user); - $nav->show(); + return $this->getTags('subscribed', 'subscriber'); } function showContent() { + parent::showContent(); + $offset = ($this->page-1) * PROFILES_PER_PAGE; $limit = PROFILES_PER_PAGE + 1; $subscriptions = $this->user->getSubscriptions($offset, $limit); - if ($subs) { - $subscriptions_list = new SubscriptionsList($subscriptions, null, $this); + if ($subscriptions) { + $subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this); $subscriptions_list->show(); } @@ -170,16 +109,16 @@ class SubscriptionsList extends ProfileList return; } - $this->elementStart('form', array('id' => 'subedit-' . $profile->id, + $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id, 'method' => 'post', 'class' => 'subedit', 'action' => common_local_url('subedit'))); - $this->hidden('token', common_session_token()); - $this->hidden('profile', $profile->id); - $this->checkbox('jabber', _('Jabber'), $sub->jabber); - $this->checkbox('sms', _('SMS'), $sub->sms); - $this->submit('save', _('Save')); - $this->elementEnd('form'); + $this->out->hidden('token', common_session_token()); + $this->out->hidden('profile', $profile->id); + $this->out->checkbox('jabber', _('Jabber'), $sub->jabber); + $this->out->checkbox('sms', _('SMS'), $sub->sms); + $this->out->submit('save', _('Save')); + $this->out->elementEnd('form'); return; } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 91789f4f1..45affbaf6 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -36,7 +36,7 @@ font-weight:bold; } legend { -font-weight:bold; +font-weight:bold; font-size:1.3em; text-transform:uppercase; } @@ -99,9 +99,6 @@ display:none; margin-left:11px; } - - - /* FORM SETTINGS */ .form_settings fieldset { margin-bottom:29px; @@ -111,7 +108,6 @@ margin-bottom:29px; font-style:italic; } - .form_settings .form_data li { width:100%; float:left; @@ -179,7 +175,6 @@ width:90%; margin-left:0; } - .form_settings .form_note { border-radius:4px; -moz-border-radius:4px; @@ -187,13 +182,8 @@ border-radius:4px; padding:0 7px; } - - /* FORM SETTINGS */ - - - address { float:left; margin-bottom:18px; @@ -206,7 +196,6 @@ address .fn { font-weight:bold; } - #header { width:100%; position:relative; @@ -225,7 +214,6 @@ display:inline; margin-left:11px; } - .system_notice dt { font-weight:bold; text-transform:uppercase; @@ -244,17 +232,12 @@ clear:both; margin-bottom:18px; } - - - #footer { float:left; width:64%; padding:18px; } - - #site_nav_local_views { width:100%; float:left; @@ -286,7 +269,6 @@ float:left; width:100%; } - #site_nav_global_primary dt, #site_nav_global_secondary dt { display:none; @@ -315,8 +297,6 @@ padding-left:30px; padding-left:28px; } - - #export_data ul { display:inline; } @@ -329,8 +309,6 @@ margin-left:11px; margin-left:0; } - - #licenses { font-size:0.9em; } @@ -353,7 +331,6 @@ vertical-align:top; margin-right:4px; } - #wrap { float:left; margin:0 auto; @@ -361,7 +338,6 @@ margin-right:4px; width:71.714em; } - #core { position:relative; width:100%; @@ -396,9 +372,6 @@ border-radius:7px; -webkit-border-radius:7px; } - - - /*Start: FORM NOTICE*/ #form_notice { width:384px; @@ -501,10 +474,6 @@ float:left; /*end FORM NOTICE*/ - - - - /* entity_profile */ .entity_profile { position:relative; @@ -575,10 +544,6 @@ display:none; /* entity_profile */ - - - - /*entity_actions*/ .entity_actions { float:right; @@ -617,8 +582,6 @@ font-weight:bold; display:block; } - - .form_user_block input.submit, .form_user_unblock input.submit, #entity_send-a-message a, @@ -633,8 +596,6 @@ padding-left:20px; padding:4px 4px 4px 23px; } - - .entity_tags ul { list-style-type:none; } @@ -644,8 +605,6 @@ margin-right:1em; float:left; } - - .aside .section { margin-bottom:29px; clear:both; @@ -665,7 +624,6 @@ display:inline; content: ":"; } - #user_subscriptions, #user_subscribers, #user_groups, { @@ -692,8 +650,6 @@ display:none; clear:both; } - - .profile .entity_profile { margin-bottom:0; min-height:60px; @@ -708,7 +664,6 @@ float:right; display:none; } - .profiles { list-style-type:none; } @@ -730,8 +685,6 @@ display:block; width:auto; } - - /* NOTICE */ .notice, .profile { @@ -756,7 +709,6 @@ border-radius:4px; -webkit-border-radius:4px; } - /* NOTICES */ #notices_primary { float:left; @@ -773,7 +725,6 @@ display:block; padding-left:28px; } - .notice .author { margin-right:11px; } @@ -802,7 +753,6 @@ font-style:italic; } - .notice .entry-title { float:left; width:100%; @@ -875,8 +825,6 @@ text-transform:lowercase; .notice div.entry-content a:hover { } - - .notice-data { position:absolute; top:18px; @@ -966,10 +914,6 @@ padding:0; /*END: NOTICES */ - - - - .pagination dt { font-weight:bold; display:none; @@ -1010,11 +954,8 @@ padding-right:20px; border-right:0; } - /* END: NOTICE */ - - /*If there is hentry on #content_inner, then this doesn't need to be specific to #doc or any other section */ .hentry .entry-content p { margin-bottom:18px; @@ -1030,7 +971,6 @@ margin-bottom:18px; margin-left:18px; } - /*START: LOAD ALONG WITH JS*/ .notice .in-reply-to { width:98%; @@ -1046,8 +986,6 @@ background-color:#E4E9F0; background-color:#D1D9E4; } - - .entity_actions #user_subscribe .form_note, .entity_actions #user_subscribe .form_data, .entity_actions #user_subscribe .form_actions label { @@ -1079,8 +1017,6 @@ background-color:#fff; /*END: LOAD ALONG WITH JS*/ - - /* TOP_POSTERS */ #top-posters caption { text-align:left; @@ -1106,8 +1042,6 @@ height:24px; width:24px; } - - /* tagcloud */ .tag-cloud { list-style-type:none; @@ -1150,20 +1084,15 @@ font-size:4em; display:none; } - - - #form_settings_photo .form_data { clear:both; } - - #form_settings_avatar li { width:auto; } #form_settings_avatar input { -margin-left:0; +margin-left:0; } #avatar_original, #avatar_preview { @@ -1188,8 +1117,6 @@ clear:both; margin-bottom:0; } - - #groups_related ul, #users_featured ul { list-style-type:none; @@ -1223,8 +1150,6 @@ display:none; font-weight:bold; } - - #home.logged_out h1 { display:none; } @@ -1267,7 +1192,10 @@ font-weight:bold; text-align:center; } - #testimonials { clear:both; } + +.entity_tags dt { +display:block; +} \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 93925b8505f428f961ecf546e63744927bf63ad3 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 16:50:35 +0000 Subject: Mathching markup to user profilelist (entities) --- lib/grouplist.php | 22 +++++++++++----------- theme/base/css/display.css | 12 +++++++----- 2 files changed, 18 insertions(+), 16 deletions(-) (limited to 'theme/base') diff --git a/lib/grouplist.php b/lib/grouplist.php index dd10a2753..869e44897 100644 --- a/lib/grouplist.php +++ b/lib/grouplist.php @@ -66,7 +66,7 @@ class GroupList extends Widget function show() { - $this->out->elementStart('ul', 'groups'); + $this->out->elementStart('ul', 'profiles groups xoxo'); $cnt = 0; @@ -85,19 +85,19 @@ class GroupList extends Widget function showGroup() { - $this->out->elementStart('li', array('class' => 'group', + $this->out->elementStart('li', array('class' => 'profile', 'id' => 'group-' . $this->group->id)); $user = common_current_user(); - $this->out->elementStart('div', array('id' => 'group_group', - 'class' => 'vcard')); + $this->out->elementStart('div', 'entity_profile vcard'); $logo = ($this->group->stream_logo) ? $this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE); $this->out->elementStart('a', array('href' => $this->group->homeUrl(), - 'class' => 'url')); + 'class' => 'url', + 'rel' => 'group')); $this->out->element('img', array('src' => $logo, 'class' => 'photo avatar', 'width' => AVATAR_STREAM_SIZE, @@ -105,24 +105,24 @@ class GroupList extends Widget 'alt' => ($this->group->fullname) ? $this->group->fullname : $this->group->nickname)); - $hasFN = ($this->group->fullname) ? 'nickname' : 'fn nickname'; + $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid'; $this->out->elementStart('span', $hasFN); $this->out->raw($this->highlight($this->group->nickname)); $this->out->elementEnd('span'); $this->out->elementEnd('a'); if ($this->group->fullname) { - $this->out->elementStart('dl', 'group_fn'); + $this->out->elementStart('dl', 'entity_fn'); $this->out->element('dt', null, 'Full name'); $this->out->elementStart('dd'); - $this->out->elementStart('span', 'fn'); + $this->out->elementStart('span', 'fn org'); $this->out->raw($this->highlight($this->group->fullname)); $this->out->elementEnd('span'); $this->out->elementEnd('dd'); $this->out->elementEnd('dl'); } if ($this->group->location) { - $this->out->elementStart('dl', 'group_location'); + $this->out->elementStart('dl', 'entity_location'); $this->out->element('dt', null, _('Location')); $this->out->elementStart('dd', 'location'); $this->out->raw($this->highlight($this->group->location)); @@ -130,7 +130,7 @@ class GroupList extends Widget $this->out->elementEnd('dl'); } if ($this->group->homepage) { - $this->out->elementStart('dl', 'group_url'); + $this->out->elementStart('dl', 'entity_url'); $this->out->element('dt', null, _('URL')); $this->out->elementStart('dd'); $this->out->elementStart('a', array('href' => $this->group->homepage, @@ -141,7 +141,7 @@ class GroupList extends Widget $this->out->elementEnd('dl'); } if ($this->group->description) { - $this->out->elementStart('dl', 'group_note'); + $this->out->elementStart('dl', 'entity_note'); $this->out->element('dt', null, _('Note')); $this->out->elementStart('dd', 'note'); $this->out->raw($this->highlight($this->group->description)); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 45affbaf6..727fd94c4 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -655,10 +655,15 @@ margin-bottom:0; min-height:60px; } + +.profile .form_group_join, +.profile .form_group_leave, .profile .form_user_subscribe, .profile .form_user_unsubscribe { float:right; } +.profile .form_group_join legend, +.profile .form_group_leave legend, .profile .form_user_subscribe legend, .profile .form_user_unsubscribe legend { display:none; @@ -678,7 +683,8 @@ display:inline; float:none; } .profile .entity_profile .entity_note, -.profile .entity_profile .entity_url { +.profile .entity_profile .entity_url, +.profile .entity_profile .entity_tags { margin-left:59px; clear:none; display:block; @@ -1195,7 +1201,3 @@ text-align:center; #testimonials { clear:both; } - -.entity_tags dt { -display:block; -} \ No newline at end of file -- cgit v1.2.3-54-g00ecf From ead13846505be3e183ecf05f5897636f0d9e5755 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 16:57:37 +0000 Subject: .profile form.form_subscriptions_edit style --- actions/subscriptions.php | 2 +- theme/base/css/display.css | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'theme/base') diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 8d1462d49..bcc557891 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -111,7 +111,7 @@ class SubscriptionsList extends ProfileList $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id, 'method' => 'post', - 'class' => 'subedit', + 'class' => 'form_subcription_edit', 'action' => common_local_url('subedit'))); $this->out->hidden('token', common_session_token()); $this->out->hidden('profile', $profile->id); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 727fd94c4..23f04f761 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -684,13 +684,22 @@ float:none; } .profile .entity_profile .entity_note, .profile .entity_profile .entity_url, -.profile .entity_profile .entity_tags { +.profile .entity_profile .entity_tags, +.profile .entity_profile .form_subcription_edit { margin-left:59px; clear:none; display:block; width:auto; } +.profile .entity_profile .form_subcription_edit label { +font-weight:normal; +margin-right:11px; +} + + + + /* NOTICE */ .notice, .profile { -- cgit v1.2.3-54-g00ecf From 32debdac66eed90e5b93b29eda7cbc264e5dfa4e Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 17:49:55 +0000 Subject: Profile tag dt display inline and margin --- theme/base/css/display.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 23f04f761..e49f27dfb 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -691,6 +691,11 @@ clear:none; display:block; width:auto; } +.profile .entity_profile .entity_tags dt { +display:inline; +margin-right:11px; +} + .profile .entity_profile .form_subcription_edit label { font-weight:normal; -- cgit v1.2.3-54-g00ecf From 690273e20d98f33e43a490dc129a4d05dd06274c Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 19:43:08 +0000 Subject: notice stlye updates --- theme/base/css/display.css | 21 ++++++++++++++++++++- theme/identica/css/display.css | 2 ++ 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e49f27dfb..44dbff5da 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -754,6 +754,14 @@ margin-right:11px; /*content:":";*/ } +.notice .author .fn { +font-weight:bold; +} + +.notice .author .photo { +margin-bottom:0; +} + .vcard .photo { display:inline; margin-right:11px; @@ -806,7 +814,7 @@ border-radius:4px; /*border:1px solid blue;*/ clear:left; float:left; -width:48%; +/*width:48%;*/ font-size:0.95em; } .notice div.entry-content a, @@ -829,6 +837,10 @@ font-size:1.025em; .notice div.entry-content dd { display:inline; } +.notice div.entry-content .timestamp { +margin-left:59px; +} + .notice div.entry-content .timestamp dt, .notice div.entry-content .response dt { display:none; @@ -845,6 +857,11 @@ text-transform:lowercase; .notice div.entry-content a:hover { } + + + + + .notice-data { position:absolute; top:18px; @@ -867,6 +884,8 @@ float:left; width:50%; position:relative; font-size:0.95em; +width:12.5%; +float:right; } .notice-options a { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 66ee3c25d..5d07cfd9a 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -214,9 +214,11 @@ background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-re background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; } +div.entry-content, div.notice-options { opacity:0.3; } +.notices li.hover div.entry-content, .notices li.hover div.notice-options { opacity:1; } -- cgit v1.2.3-54-g00ecf From 9bab9ae078cab16cb2e19bf3272d4d5157e14264 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 20:39:13 +0000 Subject: Top posters section markup and stye --- lib/profilesection.php | 8 ++++---- lib/topposterssection.php | 11 ++++++++--- theme/base/css/display.css | 15 +++++++-------- 3 files changed, 19 insertions(+), 15 deletions(-) (limited to 'theme/base') diff --git a/lib/profilesection.php b/lib/profilesection.php index 14068b082..91a3dfa34 100644 --- a/lib/profilesection.php +++ b/lib/profilesection.php @@ -58,13 +58,13 @@ class ProfileSection extends Section $cnt = 0; - $this->out->elementStart('ul', 'entities users xoxo'); - + $this->out->elementStart('table'); + $this->out->elementStart('tbody'); while ($profiles->fetch() && ++$cnt <= PROFILES_PER_SECTION) { $this->showProfile($profiles); } - - $this->out->elementEnd('ul'); + $this->out->elementEnd('tbody'); + $this->out->elementEnd('table'); return ($cnt > PROFILES_PER_SECTION); } diff --git a/lib/topposterssection.php b/lib/topposterssection.php index 7a3d46aa5..4701ca83f 100644 --- a/lib/topposterssection.php +++ b/lib/topposterssection.php @@ -71,7 +71,9 @@ class TopPostersSection extends ProfileSection function showProfile($profile) { - $this->out->elementStart('li', 'vcard'); + $this->out->elementStart('tr'); + $this->out->elementStart('td'); + $this->out->elementStart('span', 'vcard'); $this->out->elementStart('a', array('title' => ($profile->fullname) ? $profile->fullname : $profile->nickname, @@ -87,11 +89,14 @@ class TopPostersSection extends ProfileSection $profile->fullname : $profile->nickname)); $this->out->element('span', 'fn nickname', $profile->nickname); + $this->out->elementEnd('span'); $this->out->elementEnd('a'); + $this->out->elementEnd('td'); if ($profile->value) { - $this->out->element('span', 'value', $profile->value); + $this->out->element('td', 'value', $profile->value); } - $this->out->elementEnd('li'); + + $this->out->elementEnd('tr'); } function title() diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 44dbff5da..c55b3fd23 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1057,28 +1057,27 @@ background-color:#fff; /*END: LOAD ALONG WITH JS*/ /* TOP_POSTERS */ -#top-posters caption { +#top_posters caption { text-align:left; text-transform:uppercase; } -#top-posters thead { +#top_posters thead { display:none; } -#top-poster_user { +#top_poster_user { width:199px; } -#top-poster_number-of-notices { +#top_poster_number-of-notices { width:123px; } -#top-posters tbody td { +#top_posters tbody td { padding-right:11px; padding-bottom:4px; } -#top-posters img { +#top_posters img { margin-right:7px; -height:24px; -width:24px; +margin-bottom:0; } /* tagcloud */ -- cgit v1.2.3-54-g00ecf From 785ffd5b9b70ea1614ba66b3c7b195f39027eeb6 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 21:03:59 +0000 Subject: Populat notices and some css cleanup --- js/util.js | 2 +- lib/noticesection.php | 38 +++++++++++++++++++------------------- theme/base/css/display.css | 24 +++++++++++++++++++----- theme/identica/css/display.css | 7 ++++++- 4 files changed, 45 insertions(+), 26 deletions(-) (limited to 'theme/base') diff --git a/js/util.js b/js/util.js index 579b4952a..de486cf74 100644 --- a/js/util.js +++ b/js/util.js @@ -184,7 +184,7 @@ $(document).ready(function(){ $("#form_notice").ajaxForm(PostNotice); $("#form_notice").each(addAjaxHidden); - $(".notice").hover( + $("#content .notice").hover( function () { $(this).addClass('hover'); }, diff --git a/lib/noticesection.php b/lib/noticesection.php index 9d1079070..7dfa0472d 100644 --- a/lib/noticesection.php +++ b/lib/noticesection.php @@ -54,13 +54,13 @@ class NoticeSection extends Section $cnt = 0; - $this->out->elementStart('table', 'notices'); + $this->out->elementStart('ul', 'notices'); while ($notices->fetch() && ++$cnt <= NOTICES_PER_SECTION) { $this->showNotice($notices); } - $this->out->elementEnd('table'); + $this->out->elementEnd('ul'); return ($cnt > NOTICES_PER_SECTION); } @@ -73,9 +73,15 @@ class NoticeSection extends Section function showNotice($notice) { $profile = $notice->getProfile(); - $this->out->elementStart('tr'); - $this->out->elementStart('td'); + $this->out->elementStart('li', 'hentry notice'); + $this->out->elementStart('div', 'entry-title'); $avatar = $profile->getAvatar(AVATAR_MINI_SIZE); + $this->out->elementStart('span', 'vcard author'); + $this->out->elementStart('a', array('title' => ($profile->fullname) ? + $profile->fullname : + $profile->nickname, + 'href' => $profile->noticeurl, + 'class' => 'url')); $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)), 'width' => AVATAR_MINI_SIZE, 'height' => AVATAR_MINI_SIZE, @@ -83,25 +89,19 @@ class NoticeSection extends Section 'alt' => ($profile->fullname) ? $profile->fullname : $profile->nickname)); - $this->out->elementEnd('a'); - $this->out->elementEnd('td'); - $this->out->elementStart('td'); - $this->out->elementStart('a', array('title' => ($profile->fullname) ? - $profile->fullname : - $profile->nickname, - 'href' => $profile->noticeurl, - 'rel' => 'contact member', - 'class' => 'url')); $this->out->element('span', 'fn nickname', $profile->nickname); - $this->out->elementEnd('td'); - $this->out->elementStart('td'); + $this->out->elementEnd('a'); + $this->out->elementEnd('span'); + + $this->out->elementStart('p', 'entry-content'); $this->out->raw($notice->rendered); - $this->out->elementEnd('td'); + $this->out->elementEnd('p'); if ($notice->value) { - $this->out->elementStart('td'); + $this->out->elementStart('p'); $this->out->text($notice->value); - $this->out->elementEnd('td'); + $this->out->elementEnd('p'); } - $this->out->elementEnd('tr'); + $this->out->elementEnd('div'); + $this->out->elementEnd('li'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index c55b3fd23..2208529c0 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -799,7 +799,7 @@ display:inline; #laconicat .notice p.entry-content { /*margin-left:199px;*/ } -.notice p.entry-content a:visited { +#content .notice p.entry-content a:visited { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; @@ -1061,7 +1061,6 @@ background-color:#fff; text-align:left; text-transform:uppercase; } - #top_posters thead { display:none; } @@ -1071,15 +1070,30 @@ width:199px; #top_poster_number-of-notices { width:123px; } -#top_posters tbody td { + +.section tbody td { padding-right:11px; -padding-bottom:4px; +padding-bottom:11px; } -#top_posters img { +.section .vcard .photo { margin-right:7px; margin-bottom:0; } +.section .notice { +padding-top:11px; +padding-bottom:11px; + +} + +.section .notice:first { +border-top:0; +} + + + + + /* tagcloud */ .tag-cloud { list-style-type:none; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index c16dc9fd7..b7ff0eb2d 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -49,7 +49,12 @@ div.notice-options input, color:#002E6E; } -.notice p.entry-content a:visited { +.notice, +.profile { +border-top-color:#97BFD1; +} + +#content .notice p.entry-content a:visited { background-color:#fcfcfc; } .notice p.entry-content .vcard a { -- cgit v1.2.3-54-g00ecf From f6f71ea0ee8b8efb288f9abdf62b7850a18fe7cd Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 21:07:11 +0000 Subject: Minor --- lib/topposterssection.php | 4 ++-- theme/base/css/display.css | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'theme/base') diff --git a/lib/topposterssection.php b/lib/topposterssection.php index 4701ca83f..786973093 100644 --- a/lib/topposterssection.php +++ b/lib/topposterssection.php @@ -73,7 +73,7 @@ class TopPostersSection extends ProfileSection { $this->out->elementStart('tr'); $this->out->elementStart('td'); - $this->out->elementStart('span', 'vcard'); + $this->out->elementStart('span', 'vcard'); $this->out->elementStart('a', array('title' => ($profile->fullname) ? $profile->fullname : $profile->nickname, @@ -89,7 +89,7 @@ class TopPostersSection extends ProfileSection $profile->fullname : $profile->nickname)); $this->out->element('span', 'fn nickname', $profile->nickname); - $this->out->elementEnd('span'); + $this->out->elementEnd('span'); $this->out->elementEnd('a'); $this->out->elementEnd('td'); if ($profile->value) { diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 2208529c0..5d2a0d3c4 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -716,7 +716,8 @@ float:left; width:644px; width:96.699%; width:100%; -border-top:1px dashed #D1D9E4; +border-top-width:1px; +border-top-style:dashed; /*-moz-border-radius:7px;*/ } .notices li { @@ -1086,7 +1087,8 @@ padding-bottom:11px; } -.section .notice:first { +.section .notice:first-child { +padding-top:0; border-top:0; } -- cgit v1.2.3-54-g00ecf From 251551fee68f8941b5f64ea4afbe34d13b09a77d Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 21:47:33 +0000 Subject: Group top post section and styles --- lib/groupsection.php | 14 +++++++++----- theme/base/css/display.css | 4 ++++ theme/identica/css/display.css | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) (limited to 'theme/base') diff --git a/lib/groupsection.php b/lib/groupsection.php index bf26ab48c..c19299493 100644 --- a/lib/groupsection.php +++ b/lib/groupsection.php @@ -58,13 +58,13 @@ class GroupSection extends Section $cnt = 0; - $this->out->elementStart('ul', 'entities group xoxo'); + $this->out->elementStart('table'); while ($profiles->fetch() && ++$cnt <= GROUPS_PER_SECTION) { $this->showGroup($profiles); } - $this->out->elementEnd('ul'); + $this->out->elementEnd('table'); return ($cnt > GROUPS_PER_SECTION); } @@ -76,7 +76,9 @@ class GroupSection extends Section function showGroup($group) { - $this->out->elementStart('li', 'vcard'); + $this->out->elementStart('tr'); + $this->out->elementStart('td'); + $this->out->elementStart('span', 'vcard'); $this->out->elementStart('a', array('title' => ($group->fullname) ? $group->fullname : $group->nickname, @@ -95,9 +97,11 @@ class GroupSection extends Section $group->nickname)); $this->out->element('span', 'fn org nickname', $group->nickname); $this->out->elementEnd('a'); + $this->out->elementEnd('span'); + $this->out->elementEnd('td'); if ($group->value) { - $this->out->element('span', 'value', $group->value); + $this->out->element('td', 'value', $group->value); } - $this->out->elementEnd('li'); + $this->out->elementEnd('tr'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5d2a0d3c4..3f34ee7b2 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -841,6 +841,10 @@ display:inline; .notice div.entry-content .timestamp { margin-left:59px; } +#showstream .notice div.entry-content .timestamp { +margin-left:0; +} + .notice div.entry-content .timestamp dt, .notice div.entry-content .response dt { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index c10f46fe9..dd623b217 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -226,7 +226,7 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 .notices div.entry-content, .notices div.notice-options { -opacity:0.3; +opacity:0.4; } .notices li.hover div.entry-content, .notices li.hover div.notice-options { -- cgit v1.2.3-54-g00ecf From e8e0c74f8a517f83248873e16fed8a96d72af54f Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 22 Jan 2009 22:48:20 +0000 Subject: Reduced top and bottom notice whitespace. Reduced form notice textarea height. --- theme/base/css/display.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 3f34ee7b2..596ce42f4 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -393,7 +393,7 @@ border-radius:7px; -webkit-border-radius:7px; width:377px; width:370px; -height:86px; +height:67px; line-height:1.5; padding:7px 7px 16px 7px; } @@ -418,7 +418,7 @@ margin-left:4px; #form_notice .form_note { position:absolute; -top:118px; +top:99px; right:98px; z-index:9; } @@ -709,8 +709,8 @@ margin-right:11px; .notice, .profile { position:relative; -padding-top:18px; -padding-bottom:18px; +padding-top:11px; +padding-bottom:11px; clear:both; float:left; width:644px; -- cgit v1.2.3-54-g00ecf From 2935e8c7ce3a9a31b9191d4a02cb8cab348c68e6 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 00:20:05 +0000 Subject: Minor markup fix --- actions/showgroup.php | 4 +++- lib/tagcloudsection.php | 5 +++++ theme/base/css/display.css | 15 ++------------- 3 files changed, 10 insertions(+), 14 deletions(-) (limited to 'theme/base') diff --git a/actions/showgroup.php b/actions/showgroup.php index 6e2f939f9..8d8fbe6be 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -351,7 +351,7 @@ class ShowgroupAction extends Action return; } - $this->elementStart('div', array('id' => 'entity_subscriptions', + $this->elementStart('div', array('id' => 'entity_members', 'class' => 'section')); $this->element('h2', null, _('Members')); @@ -369,5 +369,7 @@ class ShowgroupAction extends Action array('nickname' => $this->group->nickname))), _('All members')); } + + $this->elementEnd('div'); } } diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php index 1a7f721b2..178dd88ca 100644 --- a/lib/tagcloudsection.php +++ b/lib/tagcloudsection.php @@ -116,4 +116,9 @@ class TagCloudSection extends Section { return common_local_url('tag', array('tag' => $tag)); } + + function divId() + { + return 'tagcloud'; + } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 596ce42f4..46bce79ed 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -812,11 +812,11 @@ border-radius:4px; } .notice div.entry-content { -/*border:1px solid blue;*/ clear:left; float:left; -/*width:48%;*/ font-size:0.95em; +margin-left:59px; +width:70%; } .notice div.entry-content a, .notice .notice-options a, @@ -829,22 +829,11 @@ float:left; font-size:1.025em; } -#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 { -margin-left:59px; -} -#showstream .notice div.entry-content .timestamp { -margin-left:0; -} - .notice div.entry-content .timestamp dt, .notice div.entry-content .response dt { -- cgit v1.2.3-54-g00ecf From f3bbc9863b58c9a30d559bc423f693b774bdcc3b Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 00:25:47 +0000 Subject: Minor --- theme/base/css/display.css | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 46bce79ed..54a5b8833 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -818,11 +818,10 @@ font-size:0.95em; margin-left:59px; width:70%; } -.notice div.entry-content a, -.notice .notice-options a, -.notice .notice-options input { - +#showstream .notice div.entry-content { +margin-left:0; } + .notice .notice-options a, .notice .notice-options input { float:left; @@ -845,14 +844,6 @@ display:inline-block; .notice div.entry-content .device dt { text-transform:lowercase; } -.notice div.entry-content a { - -} -.notice div.entry-content a:hover { -} - - - -- cgit v1.2.3-54-g00ecf From 135f00c51bfd71e1ecb112f6813ed12c84549621 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 01:20:20 +0000 Subject: tag user profile and form markup and style --- actions/tagother.php | 68 +++++++++++++++++++++++++++++++++++----------- theme/base/css/display.css | 10 +++++-- 2 files changed, 59 insertions(+), 19 deletions(-) (limited to 'theme/base') diff --git a/actions/tagother.php b/actions/tagother.php index 5daf612fb..9a63fc438 100644 --- a/actions/tagother.php +++ b/actions/tagother.php @@ -73,48 +73,84 @@ class TagotherAction extends Action function showContent() { - $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); + $this->elementStart('div', 'entity_profile vcard author'); + $this->element('h2', null, _('User profile')); + $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); + $this->elementStart('dl', 'entity_depiction'); + $this->element('dt', null, _('Photo')); + $this->elementStart('dd'); $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE), - 'class' => 'avatar stream', + 'class' => 'photo avatar', 'width' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE, 'alt' => ($this->profile->fullname) ? $this->profile->fullname : $this->profile->nickname)); + $this->elementEnd('dd'); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_nickname'); + $this->element('dt', null, _('Nickname')); + $this->elementStart('dd'); $this->element('a', array('href' => $this->profile->profileurl, - 'class' => 'external profile nickname'), + 'class' => 'nickname'), $this->profile->nickname); + $this->elementEnd('dd'); + $this->elementEnd('dl'); if ($this->profile->fullname) { - $this->elementStart('div', 'fullname'); - if ($this->profile->homepage) { - $this->element('a', array('href' => $this->profile->homepage), - $this->profile->fullname); - } else { - $this->text($this->profile->fullname); - } - $this->elementEnd('div'); + $this->elementStart('dl', 'entity_fn'); + $this->element('dt', null, _('Full name')); + $this->elementStart('dd'); + $this->element('span', 'fn', $this->profile->fullname); + $this->elementEnd('dd'); + $this->elementEnd('dl'); } if ($this->profile->location) { - $this->element('div', 'location', $this->profile->location); + $this->elementStart('dl', 'entity_location'); + $this->element('dt', null, _('Location')); + $this->element('dd', 'location', $this->profile->location); + $this->elementEnd('dl'); + } + if ($this->profile->homepage) { + $this->elementStart('dl', 'entity_url'); + $this->element('dt', null, _('URL')); + $this->elementStart('dd'); + $this->element('a', array('href' => $this->profile->homepage, + 'rel' => 'me', 'class' => 'url'), + $this->profile->homepage); + $this->elementEnd('dd'); + $this->elementEnd('dl'); } if ($this->profile->bio) { - $this->element('div', 'bio', $this->profile->bio); + $this->elementStart('dl', 'entity_note'); + $this->element('dt', null, _('Note')); + $this->element('dd', 'note', $this->profile->bio); + $this->elementEnd('dl'); } + $this->elementEnd('div'); $this->elementStart('form', array('method' => 'post', - 'id' => 'tag_user', + 'id' => 'form_tag_user', + 'class' => 'form_settings', 'name' => 'tagother', 'action' => $this->selfUrl())); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Tag user')); $this->hidden('token', common_session_token()); $this->hidden('id', $this->profile->id); + + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); $this->input('tags', _('Tags'), ($this->arg('tags')) ? $this->arg('tags') : implode(' ', Profile_tag::getTags($user->id, $this->profile->id)), _('Tags for this user (letters, numbers, -, ., and _), comma- or space- separated')); - + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('save', _('Save')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } @@ -166,7 +202,7 @@ class TagotherAction extends Action $action = $user->isSubscribed($this->profile) ? 'subscriptions' : 'subscribers'; if ($this->boolean('ajax')) { - common_start_html('text/xml'); + $this->startHTML('text/xml'); $this->elementStart('head'); $this->element('title', null, _('Tags')); $this->elementEnd('head'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 54a5b8833..d829b71e4 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -41,6 +41,7 @@ font-size:1.3em; text-transform:uppercase; } form { +clear:both; } input, textarea, select, option { padding:4px; @@ -143,7 +144,8 @@ font-weight:bold; #form_password legend, #form_settings_avatar legend, #newgroup legend, -#editgroup legend { +#editgroup legend, +#form_tag_user legend { display:none; } @@ -347,6 +349,7 @@ margin-bottom:1em; #content { width:644px; +width:46em; padding:18px; float:left; border-radius:7px; @@ -364,6 +367,7 @@ float;left; #aside_primary { width:300px; +width:21.429em; float:left; margin-left:2px; padding:18px 4px 18px 18px; @@ -705,6 +709,7 @@ margin-right:11px; + /* NOTICE */ .notice, .profile { @@ -713,8 +718,6 @@ padding-top:11px; padding-bottom:11px; clear:both; float:left; -width:644px; -width:96.699%; width:100%; border-top-width:1px; border-top-style:dashed; @@ -734,6 +737,7 @@ border-radius:4px; #notices_primary { float:left; width:644px; +width:46em; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; -- cgit v1.2.3-54-g00ecf From 6d8cee6545ffd30f1c23afb64f8c48b020e5ad51 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 01:31:04 +0000 Subject: form clear fix --- theme/base/css/display.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d829b71e4..5cafd8c1f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -40,9 +40,6 @@ font-weight:bold; font-size:1.3em; text-transform:uppercase; } -form { -clear:both; -} input, textarea, select, option { padding:4px; font-family:sans-serif; @@ -96,14 +93,17 @@ border-radius:4px; form label.submit { display:none; } -.form_settings input.remove { -margin-left:11px; + +.form_settings { +clear:both; } -/* FORM SETTINGS */ .form_settings fieldset { margin-bottom:29px; } +.form_settings input.remove { +margin-left:11px; +} .form_guide { font-style:italic; @@ -184,7 +184,7 @@ border-radius:4px; padding:0 7px; } -/* FORM SETTINGS */ + address { float:left; -- cgit v1.2.3-54-g00ecf From 961c5af3cec8cf4fc3efe7e80b90ea69e6137cdd Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 03:47:32 +0000 Subject: Anonymous notice --- actions/groups.php | 4 +++- actions/public.php | 2 +- actions/showstream.php | 2 +- theme/base/css/display.css | 18 ++++++++++++++++-- theme/base/css/initial_states.css | 1 - theme/identica/css/display.css | 13 +++++++++++++ 6 files changed, 34 insertions(+), 6 deletions(-) delete mode 100644 theme/base/css/initial_states.css (limited to 'theme/base') diff --git a/actions/groups.php b/actions/groups.php index 6faa497fc..261f9b3aa 100644 --- a/actions/groups.php +++ b/actions/groups.php @@ -95,9 +95,11 @@ class GroupsAction extends Action function showContent() { + $this->elementStart('p', array('id' => 'new_group')); $this->element('a', array('href' => common_local_url('newgroup'), - 'id' => 'new_group'), + 'class' => 'more'), _('Create a new group')); + $this->elementEnd('p'); $offset = ($this->page-1) * GROUPS_PER_PAGE; $limit = GROUPS_PER_PAGE + 1; diff --git a/actions/public.php b/actions/public.php index 396b60e83..f5380589a 100644 --- a/actions/public.php +++ b/actions/public.php @@ -215,7 +215,7 @@ class PublicAction extends Action $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' . '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))'); - $this->elementStart('div', 'anonymous'); + $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); $this->elementEnd('div'); } diff --git a/actions/showstream.php b/actions/showstream.php index 3005cdd88..157ccdd0c 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -538,7 +538,7 @@ class ShowstreamAction extends Action 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' . '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), $this->user->nickname, $this->user->nickname); - $this->elementStart('div', 'anonymous'); + $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); $this->elementEnd('div'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5cafd8c1f..bc06c50ab 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -234,6 +234,22 @@ clear:both; margin-bottom:18px; } + +#anon_notice { +float:left; +width:432px; +padding:11px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-width:2px; +border-style:solid; +line-height:1.5; +font-size:1.1em; +font-weight:bold; +} + + #footer { float:left; width:64%; @@ -378,7 +394,6 @@ border-radius:7px; /*Start: FORM NOTICE*/ #form_notice { -width:384px; width:458px; float:left; position:relative; @@ -395,7 +410,6 @@ display:none; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; -width:377px; width:370px; height:67px; line-height:1.5; diff --git a/theme/base/css/initial_states.css b/theme/base/css/initial_states.css deleted file mode 100644 index 8b1378917..000000000 --- a/theme/base/css/initial_states.css +++ /dev/null @@ -1 +0,0 @@ - diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 62086d74e..5088d7ac7 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -119,6 +119,19 @@ background-color:#F7E8E8; background-color:#EFF3DC; } + +#anon_notice { +background-color:#97BFD1; +color:#fff; +} + +#showstream #anon_notice { +background-color:#A9BF4F; +} + + + + #export_data li a { background-repeat:no-repeat; background-position:0 45%; -- cgit v1.2.3-54-g00ecf From 8b7c71ac249a4d29f126c7dea556d4eaf465a928 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 03:51:35 +0000 Subject: Reduced .aside .tag-cloud font-size --- theme/base/css/display.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index bc06c50ab..ba1cc06f5 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1102,6 +1102,11 @@ border-top:0; .tag-cloud { list-style-type:none; } + +.aside .tag-cloud { +font-size:0.8em; +} + .tag-cloud li { display:inline; margin-right:7px; -- cgit v1.2.3-54-g00ecf From fbe6aa703e106dd46122f10c962204d28c94ea9e Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 04:08:12 +0000 Subject: Tag cloud font-size and line-height --- theme/base/css/display.css | 18 +++++++++++------- theme/identica/css/display.css | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ba1cc06f5..dd0b332f5 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1101,6 +1101,7 @@ border-top:0; /* tagcloud */ .tag-cloud { list-style-type:none; +text-align:center; } .aside .tag-cloud { @@ -1110,7 +1111,10 @@ font-size:0.8em; .tag-cloud li { display:inline; margin-right:7px; -line-height:1; +line-height:1.25; +} +.aside .tag-cloud li { +line-height:1.5; } .tag-cloud li a { text-decoration:none; @@ -1123,22 +1127,22 @@ font-weight:bold; font-size:1em; } .tag-cloud-2 { -font-size:1.5em; +font-size:1.25em; } .tag-cloud-3 { -font-size:2em; +font-size:1.75em; } .tag-cloud-4 { -font-size:2.5em; +font-size:2em; } .tag-cloud-5 { -font-size:3em; +font-size:2.25em; } .tag-cloud-6 { -font-size:3.5em; +font-size:2.75em; } .tag-cloud-7 { -font-size:4em; +font-size:3.25em; } #publictagcloud #tagcloud.section dt { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 5088d7ac7..f41a32508 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -123,6 +123,7 @@ background-color:#EFF3DC; #anon_notice { background-color:#97BFD1; color:#fff; +border-color:#fff; } #showstream #anon_notice { -- cgit v1.2.3-54-g00ecf From e2afca803df2de87fd242d6462938e7a29716a17 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 04:54:54 +0000 Subject: Cleanup --- theme/base/css/display.css | 237 ++++++----------------------------------- theme/identica/css/display.css | 36 +++---- 2 files changed, 47 insertions(+), 226 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index dd0b332f5..d5532a5c9 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1,4 +1,12 @@ -/* theme: base */ +/** theme: base + * + * @package Laconica + * @author Sarven Capadisli + * @copyright 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/ + */ + * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -13,7 +21,6 @@ font-size:1em; line-height:1.65; position:relative; margin:0 auto; -width:1004px; width:71.714em; } h1,h2,h3,h4,h5,h6 { @@ -34,7 +41,6 @@ h6 { font-size:0.9em; } caption { font-weight:bold; } - legend { font-weight:bold; font-size:1.3em; @@ -59,8 +65,6 @@ font-weight:bold; textarea { overflow:auto; } -select { -} option { padding-bottom:0; } @@ -74,7 +78,6 @@ margin:0 0 18px 0; } form label { font-weight:bold; -/*margin:0 0 11px 0;*/ } input.checkbox { position:relative; @@ -104,16 +107,10 @@ margin-bottom:29px; .form_settings input.remove { margin-left:11px; } - -.form_guide { -font-style:italic; -} - .form_settings .form_data li { width:100%; float:left; } - .form_settings .form_data label { float:left; } @@ -123,7 +120,6 @@ float:left; margin-left:11px; float:left; } - .form_settings label { margin-top:2px; width:152px; @@ -132,6 +128,9 @@ width:152px; .form_actions label { display:none; } +.form_guide { +font-style:italic; +} .form_settings #settings_autosubscribe label { display:inline; @@ -185,7 +184,6 @@ padding:0 7px; } - address { float:left; margin-bottom:18px; @@ -291,12 +289,7 @@ width:100%; #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; } @@ -350,10 +343,9 @@ margin-right:4px; } #wrap { - float:left; - margin:0 auto; - width:1004px; - width:71.714em; +float:left; +margin:0 auto; +width:71.714em; } #core { @@ -489,9 +481,9 @@ margin-top:11px; #notice_to select { float:left; } - /*end FORM NOTICE*/ + /* entity_profile */ .entity_profile { position:relative; @@ -559,9 +551,9 @@ display:none; .entity_profile h2 { display:none; } - /* entity_profile */ + /*entity_actions*/ .entity_actions { float:right; @@ -642,11 +634,6 @@ display:inline; content: ":"; } -#user_subscriptions, -#user_subscribers, -#user_groups, { - -} .section ul.entities { width:220px; float:left; @@ -721,9 +708,6 @@ margin-right:11px; } - - - /* NOTICE */ .notice, .profile { @@ -735,11 +719,9 @@ float:left; width:100%; border-top-width:1px; border-top-style:dashed; -/*-moz-border-radius:7px;*/ } .notices li { list-style-type:none; -/*margin-bottom:11px;*/ } .notices li.hover { border-radius:4px; @@ -767,11 +749,6 @@ padding-left:28px; .notice .author { margin-right:11px; } -.notice .author a { -} -.notice .author:after { -/*content:":";*/ -} .notice .author .fn { font-weight:bold; @@ -795,29 +772,20 @@ text-decoration:underline; } .vcard .fn { font-style:italic; -} -.vcard .fn:hover { - } .notice .entry-title { float:left; width:100%; } +#shownotice .notice .entry-title { +font-size:2.2em; +} + .notice p.entry-content { display:inline; } -.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 { -} -#laconicat .notice p.entry-content { -/*margin-left:199px;*/ -} #content .notice p.entry-content a:visited { border-radius:4px; -moz-border-radius:4px; @@ -932,10 +900,6 @@ text-decoration:none; padding-left:16px; } -.notice-options .notice_delete { - -} - .notice-options form input.submit { cursor:pointer; width:16px; @@ -953,9 +917,19 @@ display:none; border:0; padding:0; } - /*END: NOTICES */ + + +#groups p { +margin-bottom:18px; +} +#groups #new_group a { +padding-left:20px; +} + + + .pagination dt { font-weight:bold; display:none; @@ -995,10 +969,9 @@ border-left:0; padding-right:20px; border-right:0; } - /* END: NOTICE */ -/*If there is hentry on #content_inner, then this doesn't need to be specific to #doc or any other section */ + .hentry .entry-content p { margin-bottom:18px; } @@ -1013,67 +986,10 @@ margin-bottom:18px; margin-left:18px; } -/*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; -} -.entity_actions #user_subscribe .form_note, -.entity_actions #user_subscribe .form_data, -.entity_actions #user_subscribe .form_actions label { -display:none; -} -#form_user-relationship .form_note, -#form_user-relationship .form_data, -#form_user-relationship .form_actions label { -display:block; -} -.entity_actions #user-relationship_submit { -margin-bottom:0; -} -#form_user-relationship .form_data 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; -} - .section tbody td { padding-right:11px; padding-bottom:11px; @@ -1086,7 +1002,6 @@ margin-bottom:0; .section .notice { padding-top:11px; padding-bottom:11px; - } .section .notice:first-child { @@ -1095,19 +1010,14 @@ border-top:0; } - - - /* tagcloud */ .tag-cloud { list-style-type:none; text-align:center; } - .aside .tag-cloud { font-size:0.8em; } - .tag-cloud li { display:inline; margin-right:7px; @@ -1181,82 +1091,3 @@ clear:both; #form_settings_avatar .form_actions { margin-bottom:0; } - -#groups_related ul, -#users_featured ul { -list-style-type:none; -} -#groups_related li, -#users_featured li { -margin-top:11px; -float:left; -width:100%; -} -#groups_related li:first-child, -#users_featured li:first-child { -margin-top:0; -} - -#groups_related .vcard, -#users_featured .vcard { -float:left; -margin-bottom:-23px; -} - -#groups_related dl, -#users_featured dl { -float:left; -margin-left:63px; -clear:left; -} -#groups_related 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; -border-radius:7px; --moz-border-radius:7px; --webkit-border-radius:7px; -padding:7px; -font-size:1.6em; -font-weight:bold; -text-align:center; -} - -#testimonials { -clear:both; -} diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index f41a32508..17e2aee9e 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -1,4 +1,12 @@ -/* theme: identica */ +/** theme: identica + * + * @package Laconica + * @author Sarven Capadisli + * @copyright 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/ + */ + html, body, a:active { @@ -151,12 +159,6 @@ background-image:url(../../base/images/icons/icon_vcard.gif); } -/*user_actions*/ -#user_actions li { -/*border-top-color:#eee;*/ -} - - #entity_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, @@ -259,6 +261,10 @@ background-color:#fcfcfc; /*END: NOTICES */ +#groups #new_group a { +background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; +} + .pagination .nav_prev a, .pagination .nav_next a { @@ -272,19 +278,3 @@ background-position:0 45%; background-image:url(../images/icons/twotone/green/arrow-right.gif); background-position:100% 45%; } - - - -#home #intro #guide_steps li a { -border-color:#ccc; -color:#fff; -} -#home #intro #step_join-now a { -background-color:#f00; -} -#home #intro #step_start-a-group a { -background-color:#0f0; -} -#home #intro #step_create-a-community a { -background-color:#00f; -} -- cgit v1.2.3-54-g00ecf From 500ed2f5eb752a1a1e82d83c8c8b1c58897789b8 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 05:23:28 +0000 Subject: Cleanup --- actions/remotesubscribe.php | 16 ++++++++++++++-- actions/showstream.php | 2 +- theme/base/css/display.css | 16 ++++++++++++++-- theme/identica/css/display.css | 13 +++++++------ 4 files changed, 36 insertions(+), 11 deletions(-) (limited to 'theme/base') diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index 3c8346fbe..f727a63b8 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -92,14 +92,26 @@ class RemotesubscribeAction extends Action { # id = remotesubscribe conflicts with the # button on profile page - $this->elementStart('form', array('id' => 'remsub', 'method' => 'post', - 'action' => common_local_url('remotesubscribe'))); + $this->elementStart('form', array('id' => 'form_remote_subscribe', + 'method' => 'post', + 'class' => 'form_settings', + 'action' => common_local_url('remotesubscribe'))); + $this->elementStart('fieldset'); + $this->element('legend', 'Subscribe to a remote user'); $this->hidden('token', common_session_token()); + + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); $this->input('nickname', _('User nickname'), $this->nickname, _('Nickname of the user you want to follow')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('profile_url', _('Profile URL'), $this->profile_url, _('URL of your profile on another compatible microblogging service')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('submit', _('Subscribe')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/actions/showstream.php b/actions/showstream.php index 157ccdd0c..2fd56ad2e 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -367,7 +367,7 @@ class ShowstreamAction extends Action $url = common_local_url('remotesubscribe', array('nickname' => $this->profile->nickname)); $this->element('a', array('href' => $url, - 'id' => 'entity_subscribe_remote'), + 'class' => 'entity_remote_subscribe'), _('Subscribe')); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d5532a5c9..b4f3ffd54 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -144,7 +144,8 @@ font-weight:bold; #form_settings_avatar legend, #newgroup legend, #editgroup legend, -#form_tag_user legend { +#form_tag_user legend, +#form_remote_subscribe legend { display:none; } @@ -586,7 +587,8 @@ cursor:pointer; width:100%; } .entity_actions a, -#entity_nudge p { +#entity_nudge p, +.entity_remote_subscribe { text-decoration:none; font-weight:bold; display:block; @@ -606,6 +608,16 @@ padding-left:20px; padding:4px 4px 4px 23px; } +.entity_remote_subscribe { +padding:4px; +border-width:2px; +border-style:solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + + .entity_tags ul { list-style-type:none; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 17e2aee9e..f61d063b6 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -26,7 +26,8 @@ display:none; input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } -input, textarea, select { +input, textarea, select, +.entity_remote_subscribe { border-color:#aaa; } @@ -34,7 +35,8 @@ border-color:#aaa; input.submit, #form_notice.warning #notice_text-count, #nav_register a, -.form_settings .form_note { +.form_settings .form_note, +.entity_remote_subscribe { background-color:#A9BF4F; } @@ -43,7 +45,8 @@ input:focus, textarea:focus, select:focus, border-color:#A9BF4F; } input.submit, -#nav_register a { +#nav_register a, +.entity_remote_subscribe { color:#fff; } @@ -74,9 +77,7 @@ background-color:#fcfcfc; background-color:#fcfffc; } -#aside_primary, -#entity_subscribe a, -#TB_window input.submit { +#aside_primary { background-color:#CEE1E9; } -- cgit v1.2.3-54-g00ecf From c97980b14587327a0870f872305ecdd157896385 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 06:14:56 +0000 Subject: Missing closing li --- actions/avatarsettings.php | 13 ++++++------- theme/base/css/display.css | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'theme/base') diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 1db35237e..19f53b882 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -119,9 +119,8 @@ class AvatarsettingsAction extends AccountSettingsAction $this->elementStart('ul', 'form_data'); if ($original) { - $this->elementStart('li', - array('id' => 'avatar_original', - 'class' => 'avatar_view')); + $this->elementStart('li', array('id' => 'avatar_original', + 'class' => 'avatar_view')); $this->element('h2', null, _("Original")); $this->elementStart('div', array('id'=>'avatar_original_view')); $this->element('img', array('src' => $original->url, @@ -135,16 +134,16 @@ class AvatarsettingsAction extends AccountSettingsAction $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); if ($avatar) { - $this->elementStart('li', - array('id' => 'avatar_preview', - 'class' => 'avatar_view')); + $this->elementStart('li', array('id' => 'avatar_preview', + 'class' => 'avatar_view')); $this->element('h2', null, _("Preview")); $this->elementStart('div', array('id'=>'avatar_preview_view')); - $this->element('img', array('src' => $original->url,//$avatar->url, + $this->element('img', array('src' => $original->url, 'width' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE, 'alt' => $user->nickname)); $this->elementEnd('div'); + $this->elementEnd('li'); } $this->elementStart('li', array ('id' => 'settings_attach')); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b4f3ffd54..4eee3449b 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -226,7 +226,7 @@ position:absolute; right:0; top:49px; float:right; -width:322px; +width:300px; } #page_notice { clear:both; -- cgit v1.2.3-54-g00ecf From 493b77b2e11520b28551faa8efc63f0710556a91 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 06:49:14 +0000 Subject: Minor --- theme/base/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 4eee3449b..1769dc1c1 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -371,7 +371,7 @@ border-radius:7px; #content_inner { position:relative; width:100%; -float;left; +float:left; } #aside_primary { -- cgit v1.2.3-54-g00ecf