From 767c7d293d967a45481e31f09022c13d077eb037 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 23 Jan 2009 10:51:49 +0000 Subject: [PATCH 01/13] trac750 Better CSS file organization and linking fore the FB app --- lib/facebookaction.php | 24 +- lib/facebookutil.php | 32 - theme/base/css/facebookapp.base.css | 285 ------ theme/identica/css/facebookapp.theme.css | 1177 ---------------------- 4 files changed, 19 insertions(+), 1499 deletions(-) delete mode 100644 theme/base/css/facebookapp.base.css delete mode 100644 theme/identica/css/facebookapp.theme.css diff --git a/lib/facebookaction.php b/lib/facebookaction.php index 92130e1998..c781b86f40 100644 --- a/lib/facebookaction.php +++ b/lib/facebookaction.php @@ -95,21 +95,35 @@ class FacebookAction extends Action function showStylesheets() { + // Add a timestamp to the file so Facebook cache wont ignore our changes + $ts = filemtime(INSTALLDIR.'/theme/base/css/display.css'); $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', - 'href' => getFacebookBaseCSS())); - + 'href' => theme_path('css/display.css', 'base') . '?ts=' . $ts)); + + $theme = common_config('site', 'theme'); + + $ts = filemtime(INSTALLDIR. '/theme/' . $theme .'/css/display.css'); + $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', - 'href' => getFacebookThemeCSS())); + 'href' => theme_path('css/display.css', null) . '?ts=' . $ts)); + + $ts = filemtime(INSTALLDIR.'/theme/base/css/facebookapp.css'); + + $this->element('link', array('rel' => 'stylesheet', + 'type' => 'text/css', + 'href' => theme_path('css/facebookapp.css', 'base') . '?ts=' . $ts)); } function showScripts() { + // Add a timestamp to the file so Facebook cache wont ignore our changes + $ts = filemtime(INSTALLDIR.'/js/facebookapp.js'); + $this->element('script', array('type' => 'text/javascript', - 'src' => getFacebookJS()), - ' '); + 'src' => common_path('js/facebookapp.js') . '?ts=' . $ts)); } /** diff --git a/lib/facebookutil.php b/lib/facebookutil.php index a2a2d7cb1b..b4c73da87a 100644 --- a/lib/facebookutil.php +++ b/lib/facebookutil.php @@ -45,38 +45,6 @@ function getFacebook() return new Facebook($apikey, $secret); } -function startFBML($indent = true) -{ - global $xw; - $xw = new XMLWriter(); - $xw->openURI('php://output'); - $xw->setIndent($indent); -} - -function getFacebookBaseCSS() -{ - # Add a timestamp to the CSS file so Facebook cache wont ignore our changes - $ts = filemtime(INSTALLDIR.'/theme/base/css/facebookapp.base.css'); - $cssurl = theme_path('css/facebookapp.base.css', 'base') . "?ts=$ts"; - return $cssurl; -} - -function getFacebookThemeCSS() -{ - # Add a timestamp to the CSS file so Facebook cache wont ignore our changes - $ts = filemtime(theme_file('css/facebookapp.theme.css')); - $cssurl = theme_path('css/facebookapp.theme.css') . "?ts=$ts"; - return $cssurl; -} - -function getFacebookJS() { - - # Add a timestamp to the FBJS file so Facebook cache wont ignore our changes - $ts = filemtime(INSTALLDIR.'/js/facebookapp.js'); - $jsurl = common_path('js/facebookapp.js') . "?ts=$ts"; - return $jsurl; -} - function updateProfileBox($facebook, $flink, $notice) { $fbaction = new FacebookAction($output='php://output', $indent=true, $facebook, $flink); $fbaction->updateProfileBox($notice); diff --git a/theme/base/css/facebookapp.base.css b/theme/base/css/facebookapp.base.css deleted file mode 100644 index eb7b47a127..0000000000 --- a/theme/base/css/facebookapp.base.css +++ /dev/null @@ -1,285 +0,0 @@ -/* 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 deleted file mode 100644 index 716f3256f5..0000000000 --- a/theme/identica/css/facebookapp.theme.css +++ /dev/null @@ -1,1177 +0,0 @@ -/* 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; -} From 65ecb9c452cd60664436fa059d6e8f2d70b2c4f7 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 11:02:26 +0000 Subject: [PATCH 02/13] Giving more avatars per line --- theme/base/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 36e72a74f0..7d31c772d1 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -650,7 +650,7 @@ content: ":"; } .section ul.entities { -width:220px; +width:280px; float:left; } .section .entities li { From 8ebc19727a05102bd7d593eb56f39857fa384ae4 Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 11:20:47 +0000 Subject: [PATCH 03/13] Cursor pointer for input.submit --- theme/base/css/display.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 7d31c772d1..ba86fef910 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -61,6 +61,7 @@ border-radius:4px; input.submit { font-weight:bold; +cursor:pointer; } textarea { overflow:auto; @@ -453,7 +454,6 @@ top:25px; right:30px; margin-left:4px; padding:0; -cursor:pointer; width:16px; height:16px; border:0; @@ -586,7 +586,6 @@ display:none; .entity_actions input.submit { display:block; text-align:left; -cursor:pointer; width:100%; } .entity_actions a, @@ -918,7 +917,6 @@ padding-left:16px; } .notice-options form input.submit { -cursor:pointer; width:16px; padding:2px 0; } From 7fa5e224388f05b5747f48055641f504634aaa0d Mon Sep 17 00:00:00 2001 From: sarven Date: Fri, 23 Jan 2009 11:42:38 +0000 Subject: [PATCH 04/13] Twitter settings styles --- actions/twittersettings.php | 29 ++++++++++++++++------------- theme/base/css/display.css | 7 ++++++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/actions/twittersettings.php b/actions/twittersettings.php index 0c109ab53a..bb0bc5946a 100644 --- a/actions/twittersettings.php +++ b/actions/twittersettings.php @@ -104,18 +104,20 @@ 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_data'); if ($fuser) { - $this->elementStart('li'); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li', array('id' => 'settings_twitter_remove')); $this->element('span', 'twitter_user', $fuser->nickname); $this->element('a', array('href' => $fuser->uri), $fuser->uri); $this->element('p', 'form_guide', _('Current verified Twitter account.')); $this->hidden('flink_foreign_id', $flink->foreign_id); - $this->submit('remove', _('Remove')); $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->submit('remove', _('Remove')); } else { - $this->elementStart('li'); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li', array('id' => 'settings_twitter_login')); $this->input('twitter_username', _('Twitter user name'), ($this->arg('twitter_username')) ? $this->arg('twitter_username') : @@ -125,8 +127,8 @@ class TwittersettingsAction extends ConnectSettingsAction $this->elementStart('li'); $this->password('twitter_password', _('Twitter password')); $this->elementend('li'); + $this->elementEnd('ul'); } - $this->elementEnd('ul'); $this->elementEnd('fieldset'); $this->elementStart('fieldset', @@ -224,10 +226,10 @@ class TwittersettingsAction extends ConnectSettingsAction $friends_count = count($friends); if ($friends_count > 0) { - - $this->element('h3', null, _('Twitter Friends')); - $this->elementStart('div', array('id' => 'subscriptions')); - $this->elementStart('ul', array('id' => 'subscriptions_avatars')); + $this->elementStart('div', array('id' => 'entity_subscriptions', + 'class' => 'section')); + $this->element('h2', null, _('Twitter Friends')); + $this->elementStart('ul', 'entities users xoxo'); for ($i = 0; $i < min($friends_count, SUBSCRIPTIONS); $i++) { @@ -238,13 +240,12 @@ class TwittersettingsAction extends ConnectSettingsAction continue; } - $this->elementStart('li'); + $this->elementStart('li', 'vcard'); $this->elementStart('a', array('title' => ($other->fullname) ? $other->fullname : $other->nickname, 'href' => $other->profileurl, - 'rel' => 'contact', - 'class' => 'subscription')); + 'class' => 'url')); $avatar = $other->getAvatar(AVATAR_MINI_SIZE); @@ -255,10 +256,12 @@ class TwittersettingsAction extends ConnectSettingsAction $this->element('img', array('src' => $avatar_url, 'width' => AVATAR_MINI_SIZE, 'height' => AVATAR_MINI_SIZE, - 'class' => 'avatar mini', + 'class' => 'avatar photo', 'alt' => ($other->fullname) ? $other->fullname : $other->nickname)); + + $this->element('span', 'fn nickname', $other->nickname); $this->elementEnd('a'); $this->elementEnd('li'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ba86fef910..efa3d2afa6 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -121,6 +121,10 @@ float:left; margin-left:11px; float:left; } +.form_settings .form_data input.submit { +margin-left:0; +} + .form_settings label { margin-top:2px; width:152px; @@ -176,7 +180,8 @@ width:90%; #form_login p.form_guide, #form_register #settings_rememberme p.form_guide, -#form_openid_login #settings_rememberme p.form_guide { +#form_openid_login #settings_rememberme p.form_guide, +#settings_twitter_remove p.form_guide { margin-left:0; } From 44d1e723dfaeb1ad5980f8b0b1744cd2b58ea9ce Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 23 Jan 2009 12:12:51 +0000 Subject: [PATCH 05/13] trac750 fixed dumb sql query that was pulling ancient notices --- lib/facebookutil.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/facebookutil.php b/lib/facebookutil.php index b4c73da87a..8454590d6c 100644 --- a/lib/facebookutil.php +++ b/lib/facebookutil.php @@ -32,7 +32,8 @@ function getFacebookNotices($since) 'FROM notice ' . 'JOIN foreign_link ' . 'WHERE notice.profile_id = foreign_link.user_id ' . - 'AND foreign_link.service = 2'; + 'AND foreign_link.service = 2 ' . + 'ORDER BY notice.created DESC'; // XXX: What should the limit be? return Notice::getStreamDirect($qry, 0, 100, 0, 0, null, $since); From 18eb40c98807e8c51e6a695e00a7ba03c004ac5f Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 24 Jan 2009 00:58:12 +0000 Subject: [PATCH 06/13] Search form markup and style --- actions/noticesearch.php | 76 +++++++++++++++++++++++++++----------- lib/searchaction.php | 16 +++++--- lib/searchgroupnav.php | 2 +- theme/base/css/display.css | 15 ++++++-- 4 files changed, 77 insertions(+), 32 deletions(-) diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 3c3fdca9f1..970d7cf882 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -8,6 +8,7 @@ * @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/ * @@ -90,7 +91,7 @@ class NoticesearchAction extends SearchAction } if ($cnt > 0) { $terms = preg_split('/[\s,]+/', $q); - $this->elementStart('ul', array('id' => 'notices')); + $this->elementStart('ul', array('class' => 'notices')); for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) { if ($notice->fetch()) { $this->showNotice($notice, $terms); @@ -147,23 +148,26 @@ class NoticesearchAction extends SearchAction return; } // XXX: RDFa - $this->elementStart('li', array('class' => 'notice_single', + $this->elementStart('li', array('class' => 'hentry notice', 'id' => 'notice-' . $notice->id)); + + $this->elementStart('div', 'entry-title'); + $this->elementStart('span', 'vcard author'); $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); $this->elementStart('a', array('href' => $profile->profileurl)); $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE), - 'class' => 'avatar stream', + 'class' => 'avatar photo', 'width' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE, 'alt' => ($profile->fullname) ? $profile->fullname : $profile->nickname)); + $this->element('span', 'nickname fn', $profile->nickname); $this->elementEnd('a'); - $this->element('a', array('href' => $profile->profileurl, - 'class' => 'nickname'), - $profile->nickname); + $this->elementEnd('span'); + // FIXME: URL, image, video, audio - $this->elementStart('p', array('class' => 'content')); + $this->elementStart('p', array('class' => 'entry-content')); if ($notice->rendered) { $this->raw($this->highlight($notice->rendered, $terms)); } else { @@ -173,20 +177,52 @@ class NoticesearchAction extends SearchAction $this->raw($this->highlight(common_render_content($notice->content, $notice), $terms)); } $this->elementEnd('p'); + $this->elementEnd('div'); + $noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); - $this->elementStart('p', 'time'); - $this->element('a', array('class' => 'permalink', - 'href' => $noticeurl, - 'title' => common_exact_date($notice->created)), - common_date_string($notice->created)); + $this->elementStart('div', 'entry-content'); + $this->elementStart('dl', 'timestamp'); + $this->element('dt', null, _('Published')); + $this->elementStart('dd', null); + $this->elementStart('a', array('rel' => 'bookmark', + 'href' => $noticeurl)); + $dt = common_date_iso8601($notice->created); + $this->element('abbr', array('class' => 'published', + 'title' => $dt), + common_date_string($notice->created)); + $this->elementEnd('a'); + $this->elementEnd('dd'); + $this->elementEnd('dl'); + $this->elementEnd('div'); + + $this->elementStart('div', 'notice-options'); if ($notice->reply_to) { - $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); - $this->text(' ('); - $this->element('a', array('class' => 'inreplyto', - 'href' => $replyurl), - _('in reply to...')); - $this->text(')'); + $replyurl = common_local_url('shownotice', + array('notice' => $this->notice->reply_to)); + $this->elementStart('dl', 'response'); + $this->element('dt', null, _('To')); + $this->elementStart('dd'); + $this->element('a', array('href' => $replyurl, + 'rel' => 'in-reply-to'), + _('in reply to')); + $this->elementEnd('dd'); + $this->elementEnd('dl'); } + + $reply_url = common_local_url('newnotice', + array('replyto' => $profile->nickname)); + + $this->elementStart('dl', 'notice_reply'); + $this->element('dt', null, _('Reply to this notice')); + $this->elementStart('dd'); + $this->elementStart('a', array('href' => $reply_url, + 'title' => _('Reply to this notice'))); + $this->text(_('Reply')); + $this->element('span', 'notice_id', $notice->id); + $this->elementEnd('a'); + $this->elementEnd('dd'); + $this->elementEnd('dl'); + $this->elementStart('a', array('href' => common_local_url('newnotice', array('replyto' => $profile->nickname)), @@ -194,10 +230,8 @@ class NoticesearchAction extends SearchAction 'title' => _('reply'), 'class' => 'replybutton')); $this->hidden('posttoken', common_session_token()); - - $this->raw('→'); $this->elementEnd('a'); - $this->elementEnd('p'); + $this->elementEnd('div'); $this->elementEnd('li'); } diff --git a/lib/searchaction.php b/lib/searchaction.php index 70e63146a6..fdfb8dc5ad 100644 --- a/lib/searchaction.php +++ b/lib/searchaction.php @@ -114,17 +114,21 @@ class SearchAction extends Action $q = $this->trimmed('q'); $page = $this->trimmed('page', 1); $this->elementStart('form', array('method' => 'get', - 'id' => 'login', + 'id' => 'form_search', + 'class' => 'form_settings', 'action' => common_local_url($this->trimmed('action')))); - $this->elementStart('p'); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Search site')); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); if (!isset($config['site']['fancy']) || !$config['site']['fancy']) { $this->hidden('action', $this->trimmed('action')); } - $this->input('q', '', $q); - $this->text(' '); + $this->input('q', 'Keyword(s)', $q); $this->submit('search', 'Search'); - - $this->elementEnd('p'); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->elementEnd('fieldset'); $this->elementEnd('form'); if ($q) { $this->showResults($q, $page); diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php index 9fe3c2379a..3ba3f9cd9a 100644 --- a/lib/searchgroupnav.php +++ b/lib/searchgroupnav.php @@ -82,7 +82,7 @@ class SearchGroupNav extends Widget $this->out->menuItem(common_local_url('noticesearch', $args), _('Notice'), _('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice'); $this->out->menuItem(common_local_url('groupsearch', $args), _('Group'), - _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_notice'); + _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_group'); $this->action->elementEnd('ul'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index efa3d2afa6..367396338f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -151,7 +151,8 @@ font-weight:bold; #editgroup legend, #form_tag_user legend, #form_remote_subscribe legend, -#form_openid_login legend { +#form_openid_login legend, +#form_search legend { display:none; } @@ -181,7 +182,8 @@ width:90%; #form_login p.form_guide, #form_register #settings_rememberme p.form_guide, #form_openid_login #settings_rememberme p.form_guide, -#settings_twitter_remove p.form_guide { +#settings_twitter_remove p.form_guide, +#form_search ul.form_data #q { margin-left:0; } @@ -192,6 +194,11 @@ border-radius:4px; padding:0 7px; } +#form_search .submit { +margin-left:11px; +} + + address { float:left; @@ -627,11 +634,11 @@ border-radius:4px; .entity_tags ul { list-style-type:none; +display:inline; } .entity_tags li { display:inline; -margin-right:1em; -float:left; +margin-right:4px; } .aside .section { From 4980f654a8bfc7118a927993107a7de41d42863a Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 24 Jan 2009 03:14:27 +0000 Subject: [PATCH 07/13] Notice search markup and style --- actions/noticesearch.php | 5 +++-- theme/base/css/display.css | 9 +++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 970d7cf882..a0d723b123 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -193,9 +193,7 @@ class NoticesearchAction extends SearchAction $this->elementEnd('a'); $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementEnd('div'); - $this->elementStart('div', 'notice-options'); if ($notice->reply_to) { $replyurl = common_local_url('shownotice', array('notice' => $this->notice->reply_to)); @@ -208,6 +206,9 @@ class NoticesearchAction extends SearchAction $this->elementEnd('dd'); $this->elementEnd('dl'); } + $this->elementEnd('div'); + + $this->elementStart('div', 'notice-options'); $reply_url = common_local_url('newnotice', array('replyto' => $profile->nickname)); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 367396338f..17700e64e3 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -374,7 +374,6 @@ margin-bottom:1em; #content { width:644px; -width:46em; padding:18px; float:left; border-radius:7px; @@ -391,11 +390,10 @@ float:left; } #aside_primary { -width:300px; -width:21.429em; +width:286px; float:left; margin-left:2px; -padding:18px 4px 18px 18px; +padding:18px; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; @@ -661,8 +659,8 @@ content: ":"; } .section ul.entities { -width:280px; float:left; +width:100%; } .section .entities li { list-style-type:none; @@ -761,7 +759,6 @@ border-radius:4px; #notices_primary { float:left; width:644px; -width:46em; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; From 0cdaf3e155db84f8b6319406038cc889357fd5d7 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 24 Jan 2009 03:18:34 +0000 Subject: [PATCH 08/13] Invitation markup and style --- actions/invite.php | 15 +++++++++++---- theme/base/css/display.css | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/actions/invite.php b/actions/invite.php index f4ad2f7c55..df6e3b7147 100644 --- a/actions/invite.php +++ b/actions/invite.php @@ -167,20 +167,27 @@ class InviteAction extends Action function showInviteForm() { $this->elementStart('form', array('method' => 'post', - 'id' => 'invite', + 'id' => 'form_invite', + 'class' => 'form_settings', 'action' => common_local_url('invite'))); + $this->elementStart('fieldset'); + $this->element('legend', null, 'Send an invitation'); $this->hidden('token', common_session_token()); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); $this->textarea('addresses', _('Email addresses'), $this->trimmed('addresses'), _('Addresses of friends to invite (one per line)')); - + $this->elementEnd('li'); + $this->elementStart('li'); $this->textarea('personal', _('Personal message'), $this->trimmed('personal'), _('Optionally add a personal message to the invitation.')); - + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('send', _('Send')); - + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 17700e64e3..bee8d829a2 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -152,7 +152,8 @@ font-weight:bold; #form_tag_user legend, #form_remote_subscribe legend, #form_openid_login legend, -#form_search legend { +#form_search legend, +#form_invite legend { display:none; } From 08030196ca2c0ff51ac0edd420f0e8046e676623 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 24 Jan 2009 03:23:40 +0000 Subject: [PATCH 09/13] new group markup in usergroups matching groups --- actions/usergroups.php | 4 +++- theme/base/css/display.css | 4 ++-- theme/default/css/display.css | 2 +- theme/identica/css/display.css | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/actions/usergroups.php b/actions/usergroups.php index 748585e1d0..58cf7eeb60 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -119,9 +119,11 @@ class UsergroupsAction 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/theme/base/css/display.css b/theme/base/css/display.css index bee8d829a2..d4e9742b2c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -946,10 +946,10 @@ padding:0; -#groups p { +#new_group { margin-bottom:18px; } -#groups #new_group a { +#new_group a { padding-left:20px; } diff --git a/theme/default/css/display.css b/theme/default/css/display.css index c68b0a3c44..d09204e954 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -262,7 +262,7 @@ background-color:#fcfcfc; /*END: NOTICES */ -#groups #new_group a { +#new_group a { background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index f61d063b69..33d133bd58 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -262,7 +262,7 @@ background-color:#fcfcfc; /*END: NOTICES */ -#groups #new_group a { +#new_group a { background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; } From 8e4f985e4502a14d66f84f9e5c8d4a54bb8e5594 Mon Sep 17 00:00:00 2001 From: sarven Date: Sat, 24 Jan 2009 03:45:44 +0000 Subject: [PATCH 10/13] Minor --- actions/showstream.php | 8 ++++---- theme/base/css/display.css | 10 +++++----- theme/identica/css/display.css | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/actions/showstream.php b/actions/showstream.php index c1ef8ba52c..eab1fc0a2d 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -316,7 +316,7 @@ class ShowstreamAction extends Action $this->elementStart('div', 'entity_actions'); $this->element('h2', null, _('User actions')); $this->elementStart('ul'); - $this->elementStart('li', array('id' => 'entity_subscribe')); + $this->elementStart('li', array('class' => 'entity_subscribe')); $cur = common_current_user(); if ($cur) { if ($cur->id != $this->profile->id) { @@ -337,14 +337,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' => 'entity_send-a-message')); + $this->elementStart('li', array('class' => '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' => 'entity_nudge')); + $this->elementStart('li', array('class' => 'entity_nudge')); $nf = new NudgeForm($this, $user); $nf->show(); $this->elementEnd('li'); @@ -353,7 +353,7 @@ class ShowstreamAction extends Action if ($cur && $cur->id != $this->profile->id) { $blocked = $cur->hasBlocked($this->profile); - $this->elementStart('li', array('id' => 'entity_block')); + $this->elementStart('li', array('class' => 'entity_block')); if ($blocked) { $ubf = new UnblockForm($this, $this->profile); $ubf->show(); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d4e9742b2c..b6a3102e58 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -600,7 +600,7 @@ text-align:left; width:100%; } .entity_actions a, -#entity_nudge p, +.entity_nudge p, .entity_remote_subscribe { text-decoration:none; font-weight:bold; @@ -609,15 +609,15 @@ display:block; .form_user_block input.submit, .form_user_unblock input.submit, -#entity_send-a-message a, +.entity_send-a-message a, .form_user_nudge input.submit, -#entity_nudge p { +.entity_nudge p { border:0; padding-left:20px; } -#entity_send-a-message a, -#entity_nudge p { +.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 33d133bd58..a307ea2901 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -54,9 +54,9 @@ a, div.notice-options input, .form_user_block input.submit, .form_user_unblock input.submit, -#entity_send-a-message a, +.entity_send-a-message a, .form_user_nudge input.submit, -#entity_nudge p { +.entity_nudge p { color:#002E6E; } @@ -160,11 +160,11 @@ background-image:url(../../base/images/icons/icon_vcard.gif); } -#entity_send-a-message a, +.entity_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, .form_user_unblock input.submit, -#entity_nudge p { +.entity_nudge p { background-position: 0 40%; background-repeat: no-repeat; background-color:transparent; @@ -181,10 +181,10 @@ color:#fff; background-color:#97BFD1; } -#entity_send-a-message a { +.entity_send-a-message a { background-image:url(../images/icons/twotone/green/quote.gif); } -#entity_nudge p, +.entity_nudge p, .form_user_nudge input.submit { background-image:url(../images/icons/twotone/green/mail.gif); } From a7d3f34204f53b6737650e1d5ebb00733d1f00b5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 24 Jan 2009 03:55:32 +0000 Subject: [PATCH 11/13] M --- theme/default/css/display.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/theme/default/css/display.css b/theme/default/css/display.css index d09204e954..fc52e9525f 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -54,9 +54,9 @@ a, div.notice-options input, .form_user_block input.submit, .form_user_unblock input.submit, -#entity_send-a-message a, +.entity_send-a-message a, .form_user_nudge input.submit, -#entity_nudge p { +.entity_nudge p { color:#002E6E; } @@ -160,11 +160,11 @@ background-image:url(../../base/images/icons/icon_vcard.gif); } -#entity_send-a-message a, +.entity_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, .form_user_unblock input.submit, -#entity_nudge p { +.entity_nudge p { background-position: 0 40%; background-repeat: no-repeat; background-color:transparent; @@ -181,10 +181,10 @@ color:#fff; background-color:#97BFD1; } -#entity_send-a-message a { +.entity_send-a-message a { background-image:url(../images/icons/twotone/green/quote.gif); } -#entity_nudge p, +.entity_nudge p, .form_user_nudge input.submit { background-image:url(../images/icons/twotone/green/mail.gif); } From 1a0719ae6cd0967b2d0ca70370baa3ea405bfa54 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 24 Jan 2009 04:56:04 +0000 Subject: [PATCH 12/13] filter tags styles --- theme/base/css/display.css | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b6a3102e58..9072d75ffd 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -954,6 +954,52 @@ padding-left:20px; } +#filter_tags { +margin-bottom:11px; +float:left; +} +#filter_tags dt { +display:none; +} +#filter_tags ul { +list-style-type:none; +} +#filter_tags ul li { +float:left; +margin-left:7px; +padding-left:7px; +border-left:1px solid #ddd; +} +#filter_tags ul li.child_1 { +margin-left:0; +border-left:0; +padding-left:0; +} +#filter_tags ul li#filter_tags_all a { +font-weight:bold; +margin-top:7px; +float:left; +} + +#filter_tags ul li#filter_tags_item label { +margin-right:7px; +} +#filter_tags ul li#filter_tags_item label, +#filter_tags ul li#filter_tags_item select { +display:inline; +} +#filter_tags ul li#filter_tags_item p { +float:left; +margin-left:38px; +} +#filter_tags ul li#filter_tags_item input { +position:relative; +top:3px; +left:3px; +} + + + .pagination { float:left; clear:both; From cf7908a9715fe91836aa41d5bcf9f32e33be8644 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 24 Jan 2009 05:03:32 +0000 Subject: [PATCH 13/13] M --- theme/base/css/display.css | 3 ++- theme/default/css/display.css | 3 +++ theme/identica/css/display.css | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 9072d75ffd..289329bbc9 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -968,7 +968,8 @@ list-style-type:none; float:left; margin-left:7px; padding-left:7px; -border-left:1px solid #ddd; +border-left-width:1px; +border-left-style:solid; } #filter_tags ul li.child_1 { margin-left:0; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index fc52e9525f..fb25d32d06 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -30,6 +30,9 @@ input, textarea, select, .entity_remote_subscribe { border-color:#aaa; } +#filter_tags ul li { +border-color:#97BFD1; +} input.submit, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index a307ea2901..19beb1f90b 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -30,6 +30,9 @@ input, textarea, select, .entity_remote_subscribe { border-color:#aaa; } +#filter_tags ul li { +border-color:#ddd; +} input.submit,