Commit 8bb3a816 authored by root's avatar root Committed by samba

Patch buddypress

parent aac9f0cf
......@@ -1028,7 +1028,7 @@ function bp_activity_feed_item_title() {
$content = $activities_template->activity->content;
$content = explode( '<span', $content );
$title = trim( strip_tags( html_entity_decode( utf8_encode( $content[0] ) ) ) );
$title = trim(html_entity_decode(strip_tags($content[0]),ENT_COMPAT, 'UTF-8' ));
if ( ':' == substr( $title, -1 ) )
$title = substr( $title, 0, -1 );
......@@ -1068,7 +1068,7 @@ function bp_activity_feed_item_description() {
else
$content = $activities_template->activity->action . ' ' . $activities_template->activity->content;
return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ) ) );
return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ), ENT_COMPAT, 'UTF-8' ) );
}
?>
\ No newline at end of file
?>
......@@ -419,7 +419,7 @@ function bp_blogs_record_post( $post_id, $post, $user_id = false ) {
if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
// Record this in activity streams
$post_permalink = get_permalink( $post_id );
$activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
$activity_action = sprintf( __( '[%s] %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
$activity_content = $post->post_content;
bp_blogs_record_activity( array(
......
......@@ -211,13 +211,13 @@ function bp_core_fetch_avatar( $args = '' ) {
'css_id' => false,
'alt' => '',
'email' => false,
'no_grav' => null,
'no_grav' => true,
'html' => true,
'title' => '',
'extra_attr' => '',
'scheme' => null,
'rating' => get_option( 'avatar_rating' ),
'force_default' => false,
'force_default' => false
) );
/* Set item_id ***********************************************************/
......
......@@ -17,7 +17,7 @@ body {
padding: 0;
width: 100%;
margin: 0 auto;
background: url( ../images/60pc_black.png );
background: #333;
height: 25px;
}
body#bp-default #wp-admin-bar .padder {
......@@ -144,7 +144,7 @@ body {
}
#wp-admin-bar ul li ul a {
color: #eee;
color: #fff;
}
#wp-admin-bar ul li ul li {
......@@ -213,4 +213,4 @@ body {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
\ No newline at end of file
}
......@@ -78,25 +78,33 @@ body {
margin: 0 auto;
width: 95%;
}
.padder {
padding: 19px;
}
div#container {
background: #fff;
border-right: 1px solid #e0e0e0;
border-bottom: 1px solid #e0e0e0;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
border-radius: 6px;
overflow: hidden;
position: relative;
width: 100%;
}
body.activity-permalink div#container {
background: none;
border: none;
body.activity-permalink {
min-width: 960px;
max-width: 1250pc;
width: 90%;
}
h1, h2, h3, h4, h5, h6 {
margin: 5px 0 15px 0;
}
h1 { font-size: 28px; margin-bottom: 25px; }
h2 { font-size: 24px; margin-bottom: 20px; }
h3 { font-size: 20px; }
h4 { font-size: 16px; margin-bottom: 15px; }
h5 { font-size: 14px; margin-bottom: 0; }
h6 { font-size: 12px; margin-bottom: 0; }
a { color: #000; text-decoration: none; }
a:hover { color: #ff0000; }
a:active { color: #888; }
a:focus { outline: 1px dotted #ccc; }
.padder { padding: 19px; }
.clear { clear: left; }
p { margin-bottom: 15px; }
p:last-child { margin-bottom: 0; }
/*--------------------------------------------------------------
2.1 - Content
......@@ -111,23 +119,17 @@ div#content {
float: left;
width: 100%;
}
div#content .padder {
border-right: 1px solid #ddd;
-moz-border-radius-topleft: 6px;
-webkit-border-top-left-radius: 6px;
-moz-border-radius-bottomleft: 6px;
-webkit-border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
border-bottom-left-radius: 6px;
margin-right: 225px;
}
div#content .one-column {
border-right: 0 none;
margin-right: 0;
}
div#content .left-menu {
float: left;
width: 170px;
img.avatar {
background: #ffffff;
padding: 4px;
border: 1px solid #ddd;
/* Round Corners (native in Safari, Firefox and Chrome) */
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
/* Add the Shadow */
-moz-box-shadow: 2px 2px 2px #dddddd;
-webkit-box-shadow: 2px 2px 2px #dddddd;
}
div#content .main-column {
margin-left: 190px;
......@@ -157,6 +159,9 @@ textarea {
color: #fff;
height: auto;
margin-bottom: 20px;
min-width: 960px;
max-width: 1250px;
height: 100px;
padding-top: 25px;
position: relative;
z-index: 1000;
......@@ -193,6 +198,82 @@ textarea {
font-size: 26px;
text-decoration: none;
}
#header #search-bar {
position: absolute;
top: 25px;
right: 0;
width: 100%;
text-align: right;
}
#header h1 {
line-height: 230%;
}
#header #search-bar .padder {
padding: 10px 20px;
}
#header #search-bar input[type=text] {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border: 1px inset #888;
padding: 2px;
margin-right: 4px;
}
#header #search-bar input[type=submit] {
font-size: 11px;
padding: 1px 4px;
margin-left: 4px;
}
#header h1 {
position: absolute;
bottom: 0;
left: 20px;
width: 44%;
margin: 0 0 -5px 0;
}
#header h1 a {
color: #fff;
font-size: 26px;
text-decoration: none;
}
/* > Navigation
-------------------------------------------------------------- */
ul#nav {
margin: 0;
padding: 0;
position: absolute;
right: 15px;
list-style: none;
bottom: 0;
max-width: 65%;
}
ul#nav li {
float: left;
margin: 0 5px 0 0;
}
ul#nav li a {
display: block;
color: #fff;
text-decoration: none;
padding: 5px 15px;
background: #333;
-moz-border-radius-topleft: 3px;
-webkit-border-top-left-radius: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-right-radius: 3px;
}
ul#nav li.selected a, ul#nav li.current_page_item a {
background: #f5f5f5;
color: #555;
}
ul#nav a:focus { outline: none; }
/*--------------------------------------------------------------
......@@ -274,8 +355,104 @@ div#sidebar ul#bp-nav {
clear: left;
margin: 15px -16px;
}
div#sidebar ul#bp-nav li {
padding: 10px 15px;
div#item-header div#item-header-content { margin-left: 170px; }
div#item-header h2 {
font-size: 28px;
margin: 0 0 15px 0;
line-height: 120%;
}
div#item-header h2 a {
text-decoration: none;
color: #777;
}
div#item-header img.avatar {
float: left;
margin: 0 15px 25px 0;
}
div#item-header h2 { margin-bottom: 5px; }
div#item-header span.activity, div#item-header h2 span.highlight {
vertical-align: middle;
font-size: 11px;
font-weight: normal;
line-height: 170%;
margin-bottom: 7px;
}
div#item-header h2 span.highlight { font-size: 16px; }
div#item-header h2 span.highlight span {
position: relative;
top: -2px;
right: -2px;
font-weight: bold;
font-size: 11px;
background: #f00;
color: #fff;
padding: 1px 4px;
margin-bottom: 2px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
vertical-align: middle;
cursor: pointer;
display: none;
}
div#item-header div#item-meta {
font-size: 14px;
color: #aaa;
padding-bottom: 10px;
overflow: hidden;
margin: 15px 0 5px 0;
}
div#item-header div#item-actions {
float: right;
width: 20%;
margin: 0 0 15px 15px;
text-align: right;
}
div#item-header div#item-actions h3 {
font-size: 12px;
margin: 0 0 5px 0;
}
div#item-header ul {
overflow: hidden;
margin-bottom: 15px;
}
div#item-header ul h5, div#item-header ul span, div#item-header ul hr {
display: none;
}
div#item-header ul li {
float: right;
}
div#item-header ul img.avatar, div#item-header ul.avatars img.avatar {
width: 30px;
height: 30px;
margin: 2px;
}
div#item-header div.generic-button, div#item-header a.button {
float: left;
margin: 10px 10px 0 0;
}
div#item-header div#message.info {
line-height: 80%;
}
/* > Item Lists (Activity, Friend, Group lists)
-------------------------------------------------------------- */
ul.item-list {
width: 100%;
}
div#sidebar h3.widgettitle {
background: #eaeaea;
......@@ -361,18 +538,16 @@ textarea {
resize: vertical;
}
/*--------------------------------------------------------------
3.1 - Text
--------------------------------------------------------------*/
big {
font-size: 18px;
}
del {
text-decoration: line-through;
}
ins {
background: #fff9db;
span.activity, div#message p {
display: inline-block;
font-size: 11px;
font-weight: normal;
background: #e3e3e3;
border-bottom: 1px solid #ababab;
border-right: 1px solid #ababab;
color: #ff0000;
padding: 1px 8px;
margin-top: 6px;
text-decoration: none;
}
sub {
......@@ -777,16 +952,104 @@ div.comment-meta em {
#reply-title {
margin-top: 0;
}
#reply-title small {
float: right;
font-size: 11px;
font-weight: normal;
}
#reply-title small a {
margin-right: 0;
}
.commentlist ul.children {
background: #f5f5f5;
body.activity-permalink .activity-list li .activity-content {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
background: #fff;
padding: 15px;
border-bottom: 1px solid #ddd;
border-right: 1px solid #ddd;
margin-left: 135px;
font-size: 16px;
line-height: 150%;
min-height: 35px;
margin-right: 0;
}
body.activity-permalink .activity-list li .activity-header > p {
background: url( ../images/activity_arrow.gif ) top left no-repeat;
margin-left: -35px;
padding: 5px 0 0 38px;
height: 35px;
margin-bottom: 0;
}
.activity-list .activity-content .activity-header,
.activity-list .activity-content .comment-header {
font-size: 11px;
color: #888;
line-height: 220%;
}
.activity-list .activity-content .activity-header img.avatar {
float: none !important;
margin: 0 5px -8px 0 !important;
}
.activity-list .activity-header a:first-child, span.highlight {
background: #e3e3e3;
border-bottom: 1px solid #ababab;
border-right: 1px solid #ababab;
color: #333;
padding: 3px 8px;
text-decoration: none;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
margin-right: 3px;
}
.activity-list .activity-header a:first-child:hover {
background: #ababab !important;
color: #fff !important;
}
.activity-list .activity-content a:first-child:focus { outline: none; }
.activity-list .activity-content span.time-since {
color: #bbb;
}
.activity-list .activity-content span.activity-header-meta a {
background: none;
padding: 0;
font-size: 11px;
margin: 0;
border: none;
color: #aaa;
text-decoration: underline;
}
.activity-list .activity-content span.activity-header-meta a:hover {
color: inherit;
text-decoration: none;
}
.activity-list .activity-content .activity-inner,
.activity-list .activity-content blockquote {
margin: 15px 0 15px 5px;
overflow: hidden;
}
body.activity-permalink .activity-content .activity-inner,
body.activity-permalink .activity-content blockquote {
margin-top: 5px;
}
/* Backwards compatibility. */
.activity-inner > .activity-inner { margin: 0 !important; }
.activity-inner > blockquote { margin: 0 !important; }
.activity-list .activity-content img.thumbnail {
float: left;
margin: 0 10px 5px 0;
border: 2px solid #eee;
}
.activity-list li.load-more {
margin: 15px 0 !important;
padding: 10px 15px !important;
background: #f0f0f0 !important;
text-align: center;
font-size: 1.2em;
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
......@@ -805,25 +1068,41 @@ div.comment-meta em {
}
.commentlist ul.children div.comment-meta {
font-size: 11px;
margin: 0 0 10px 0;
}
.commentlist ul.children li {
border-top: 2px solid #fffeff;
padding-top: 10px;
}
.commentlist ul.children li:first-child {
border-top: none;
}
.commentlist ul.children ul li:first-child {
border-top: 2px solid #fffeff;
}
#respond {
background-color: #fafafa;
border: 1px solid #e5e5e5;
background: #e3e3e3;
border-bottom: 1px solid #ababab;
border-right: 1px solid #ababab;
color: #f00;
padding: 4px 8px;
text-decoration: none;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
padding: 15px;
margin-right: 3px;
}
.activity-list div.activity-meta a.acomment-reply {
background: #e3e3e3;
border-bottom: 1px solid #ababab;
border-right: 1px solid #ababab;
color: #000;
}
div.activity-meta a:focus { outline: none; }
div.activity-meta a:hover {
background: #aaa;
color: #fff;
border-color: #aaa;
}
div.activity-meta a.acomment-reply:hover {
background: #ababab;
color: #fff;
border-color: #ababab;
}
div.activity-comments {
position: relative;
margin: 0 0 0 75px;
width: auto;
overflow: hidden; /* IE fix */
}
#respond .avb img {
float: inherit;
......@@ -2436,4 +2715,4 @@ body.register div.page ul {
.field-visibility-settings legend,
.field-visibility-settings-toggle {
font-style: italic;
}
\ No newline at end of file
}
......@@ -36,7 +36,7 @@ get_header( 'buddypress' ); ?>
<ul>
<?php do_action( 'bp_before_activity_type_tab_all' ); ?>
<li class="selected" id="activity-all"><a href="<?php bp_activity_directory_permalink(); ?>" title="<?php esc_attr_e( 'The public activity for everyone on this site.', 'buddypress' ); ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
<li class="selected" id="activity-all"><a href="<?php bp_activity_directory_permalink(); ?>" title="<?php esc_attr_e( 'The public activity for everyone on this site.', 'buddypress' ); ?>"><?php printf( __( 'All People <span>%s</span>', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
<?php if ( is_user_logged_in() ) : ?>
......@@ -125,7 +125,7 @@ get_header( 'buddypress' ); ?>
<?php endif; ?>
<option value="new_member"><?php _e( 'New Members', 'buddypress' ); ?></option>
<option value="new_member"><?php _e( 'New People', 'buddypress' ); ?></option>
<?php do_action( 'bp_activity_filter_options' ); ?>
......
......@@ -4,6 +4,7 @@
<?php do_action( 'bp_before_footer' ); ?>
<div id="footer">
<?php if ( is_active_sidebar( 'first-footer-widget-area' ) || is_active_sidebar( 'second-footer-widget-area' ) || is_active_sidebar( 'third-footer-widget-area' ) || is_active_sidebar( 'fourth-footer-widget-area' ) ) : ?>
<div id="footer-widgets">
<?php get_sidebar( 'footer' ); ?>
......@@ -11,8 +12,8 @@
<?php endif; ?>
<div id="site-generator" role="contentinfo">
<?php do_action( 'bp_dtheme_credits' ); ?>
<p><?php printf( __( 'Proudly powered by <a href="%1$s">WordPress</a> and <a href="%2$s">BuddyPress</a>.', 'buddypress' ), 'http://wordpress.org', 'http://buddypress.org' ); ?></p>
<?php do_action( 'bp_dtheme_credits' ) ?>
<p><?php printf( __( '%s is proudly powered by <a href="http://wordpress.org">WordPress</a> and <a href="http://buddypress.org">BuddyPress</a> and <a href="http://autistici.org"><img src="/wp-content/uploads/2010/08/autistici.org_.png" /></a>', 'buddypress' ), get_bloginfo( 'name' ) ); ?></p>
</div>
<?php do_action( 'bp_footer' ); ?>
......@@ -25,4 +26,4 @@
</body>
</html>
\ No newline at end of file
</html>
......@@ -17,7 +17,47 @@
<?php do_action( 'bp_before_header' ); ?>
<div id="header">
<div id="search-bar" role="search">
<h1 id="logo"><a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>">Information disorder was not enough</a></h1>
<ul id="nav">