Changeset 1198

Timestamp:

03/03/2008 06:16:23 AM (18 years ago)

Author:

sambauers

Message:

Built-in Avatar/Gravatar support using pluggable function.

Clean up layout/CSS for post author display.

Properly clear infobox in topic and stop "strikethrough" effect in IE.

Show email address on profile to 'manage_users' privilege holders. Fixes #792

Location:

trunk

Files:

• bb-admin/options-general.php (modified) (2 diffs)
• bb-includes/pluggable.php (modified) (1 diff)
• bb-includes/template-functions.php (modified) (3 diffs)
• bb-templates/kakumei/post.php (modified) (1 diff)
• bb-templates/kakumei/profile.php (modified) (1 diff)
• bb-templates/kakumei/style.css (modified) (5 diffs)
• bb-templates/kakumei/topic.php (modified) (2 diffs)

trunk/bb-admin/options-general.php

@@ -67 +67 @@
 $selected[bb_get_option('mod_rewrite')] = ' selected="selected"';
 ?>
-                <option value="0"<?php echo $selected[0]; ?>><?php _e('None') ?>&nbsp;&nbsp;&nbsp;.../forums.php?id=1</option>
-                <option value="1"<?php echo $selected[1]; ?>><?php _e('Numeric') ?>&nbsp;&nbsp;&nbsp;.../forums/1</option>
-                <option value="slugs"<?php echo $selected['slugs']; ?>><?php _e('Name based') ?>&nbsp;&nbsp;&nbsp;.../forums/first-forum</option>
+                <option value="0"<?php echo $selected[0]; ?>><?php _e('None'); ?>&nbsp;&nbsp;&nbsp;.../forums.php?id=1</option>
+                <option value="1"<?php echo $selected[1]; ?>><?php _e('Numeric'); ?>&nbsp;&nbsp;&nbsp;.../forums/1</option>
+                <option value="slugs"<?php echo $selected['slugs']; ?>><?php _e('Name based'); ?>&nbsp;&nbsp;&nbsp;.../forums/first-forum</option>
+<?php
+unset($selected);
+?>
             </select>
         </div>
@@ -122 +125 @@
     </fieldset>
     <fieldset>
+        <legend><?php _e('Avatars'); ?></legend>
+        <p>
+            <?php _e('bbPress includes built-in support for <a href="http://gravatar.com/">Gravatars</a>, you can enable this feature here.'); ?>
+        </p>
+        <label for="avatars_show">
+            <?php _e('Show avatars:') ?>
+        </label>
+        <div>
+<?php
+$checked = array();
+$checked[bb_get_option('avatars_show')] = ' checked="checked"';
+?>
+            <input type="checkbox" class="checkbox" name="avatars_show" id="avatars_show" value="1"<?php echo $checked[1]; ?> />
+<?php
+unset($checked);
+?>
+        </div>
+        <label for="avatars_rating">
+            <?php _e('Gravatar maximum rating:'); ?>
+        </label>
+        <div>
+            <select name="avatars_rating" id="avatars_rating">
+<?php
+$selected = array();
+$selected[bb_get_option('avatars_rating')] = ' selected="selected"';
+?>
+                <option value="0"<?php echo $selected[0]; ?>><?php _e('None'); ?></option>
+                <option value="X"<?php echo $selected['X']; ?>><?php _e('X'); ?></option>
+                <option value="R"<?php echo $selected['R']; ?>><?php _e('R'); ?></option>
+                <option value="PG"<?php echo $selected['PG']; ?>><?php _e('PG'); ?></option>
+                <option value="G"<?php echo $selected['G']; ?>><?php _e('G'); ?></option>
+<?php
+unset($selected);
+?>
+            </select>
+            <p>
+                <img src="http://site.gravatar.com/images/gravatars/ratings/3.gif" alt="Rated X" style="height:30px; width:30px; float:left; margin-right:10px;" />
+                <?php _e('X rated gravatars may contain hardcore sexual imagery or extremely disturbing violence.'); ?>
+            </p>
+            <p>
+                <img src="http://site.gravatar.com/images/gravatars/ratings/2.gif" alt="Rated R" style="height:30px; width:30px; float:left; margin-right:10px;" />
+                <?php _e('R rated gravatars may contain such things as harsh profanity, intense violence, nudity, or hard drug use.'); ?>
+            </p>
+            <p>
+                <img src="http://site.gravatar.com/images/gravatars/ratings/1.gif" alt="Rated PG" style="height:30px; width:30px; float:left; margin-right:10px;" />
+                <?php _e('PG rated gravatars may contain rude gestures, provocatively dressed individuals, the lesser swear words, or mild violence.'); ?>
+            </p>
+            <p>
+                <img src="http://site.gravatar.com/images/gravatars/ratings/0.gif" alt="Rated G" style="height:30px; width:30px; float:left; margin-right:10px;" />
+                <?php _e('A G rated gravatar is suitable for display on all websites with any audience type.'); ?>
+            </p>
+        </div>
+    </fieldset>
+    <fieldset>
         <?php bb_nonce_field( 'options-general-update' ); ?>
         <input type="hidden" name="action" id="action" value="update" />

trunk/bb-includes/pluggable.php

@@ -428 +428 @@
 endif;
 
+if ( !function_exists( 'bb_get_avatar' ) ) :
+/**
+ * bb_get_avatar() - Get avatar for a user
+ *
+ * Retrieve the avatar for a user provided a user ID or email address
+ *
+ * @since 0.8.4
+ * @param int|string $id_or_email A user ID or email address
+ * @param int $size Size of the avatar image
+ * @param string $default URL to a default image to use if no avatar is available
+ * @return string <img> tag for the user's avatar
+*/
+function bb_get_avatar( $id_or_email, $size = '80', $default = '' ) {
+    if ( !bb_get_option('avatars_show') )
+        return false;
+
+    if ( !$email = bb_get_user_email($id_or_email) )
+        $email = $id_or_email;
+
+    if ( !$email )
+        $email = '';
+
+    if ( empty($default) )
+        $default = 'http://www.gravatar.com/avatar.php?gravatar_id=ad516503a11cd5ca435acc9bb6523536&size=' . $size;
+        // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
+    $default = urlencode( $default );
+
+    if ( !empty($email) ) {
+        $out = 'http://www.gravatar.com/avatar.php?gravatar_id=';
+        $out .= md5( $email );
+        $out .= '&amp;size=' . $size;
+        $out .= '&amp;default=' . $default;
+
+        $rating = bb_get_option('avatars_rating');
+        if ( !empty( $rating ) )
+            $out .= '&amp;rating=' . $rating;
+
+        $avatar = '<img alt="" src="' . $out . '" class="avatar avatar-' . $size . '" height="' . $size . '" width="' . $size . '" />';
+    } else {
+        $avatar = '<img alt="" src="' . $default . '" />';
+    }
+
+    return apply_filters('bb_get_avatar', $avatar, $id_or_email, $size, $default);
+}
+endif;
 ?>

trunk/bb-includes/template-functions.php

@@ -4 +4 @@
     global $bb, $bbdb, $bb_current_user, $page, $bb_cache,
         $posts, $bb_post, $post_id, $topics, $topic, $topic_id,
-        $forums, $forum, $forum_id, $tags, $tag, $tag_name, $user, $user_id, $view;
+        $forums, $forum, $forum_id, $tags, $tag, $tag_name, $user, $user_id, $view,
+        $del_class, $bb_alt;
 
     if ( $globals )
@@ -1150 +1151 @@
 }
 
+function post_author_avatar( $size = '48', $default = '', $post_id = 0 ) {
+    if ( ! bb_get_option('show_avatars') )
+        return false;
+    
+    $author_id = get_post_author_id( $post_id );
+    if ( $link = get_user_link( $author_id ) ) {
+        echo '<a href="' . attribute_escape( $link ) . '">' . bb_get_avatar( $author_id, $size, $default ) . '</a>';
+    } else {
+        echo bb_get_avatar( $author_id, $size, $default );
+    }
+}
+
 function post_text( $post_id = 0 ) {
     echo apply_filters( 'post_text', get_post_text( $post_id ), get_post_id( $post_id ) );
@@ -1423 +1436 @@
     if ( is_array( $profile_info_keys ) ) {
         foreach ( $profile_info_keys as $key => $label ) {
-            if ( 'user_email' != $key && isset($user->$key) && '' !== $user->$key && 'http://' != $user->$key ) {
+            if (
+                ( 'user_email' != $key || ( 'user_email' == $key && bb_current_user_can( 'edit_users' ) ) )
+                && isset($user->$key)
+                && '' !== $user->$key
+                && 'http://' != $user->$key
+            ) {
                 echo "\t<dt>{$label[1]}</dt>\n";
                 echo "\t<dd>" . make_clickable($user->$key) . "</dd>\n";

trunk/bb-templates/kakumei/post.php

@@ -1 +1 @@
         <div class="threadauthor">
-            <p><strong><?php post_author_link(); ?></strong><br />
-              <small><?php post_author_title(); ?></small></p>
+            <?php post_author_avatar(); ?>
+            <p>
+                <strong><?php post_author_link(); ?></strong><br />
+                <small><?php post_author_title(); ?></small>
+            </p>
         </div>
         
-        <div class="threadpost">
+        <div<?php alt_class('post', 'threadpost ' . $del_class); ?>>
             <div class="post"><?php post_text(); ?></div>
             <div class="poststuff"><?php printf( __('Posted %s ago'), bb_get_post_time() ); ?> <a href="<?php post_anchor_link(); ?>">#</a> <?php post_ip_link(); ?> <?php post_edit_link(); ?> <?php post_delete_link(); ?></div>

trunk/bb-templates/kakumei/profile.php

@@ -2 +2 @@
 
 <h3 class="bbcrumb"><a href="<?php bb_option('uri'); ?>"><?php bb_option('name'); ?></a> &raquo; <?php _e('Profile') ?></h3>
+<div id="useravatar"><?php echo bb_get_avatar( $user->ID ); ?></div>
 <h2 id="userlogin"><?php echo get_user_name( $user->ID ); ?></h2>
 

trunk/bb-templates/kakumei/style.css

@@ -40 +40 @@
 
 h2 { font-size: 1.5em; }
+
+img.avatar { border: 1px solid #ddd; }
 
 /* Structure
@@ -233 +235 @@
 
 #thread {
-    background: #eee;
     list-style: none;
-    margin: 0 0 0 100px;
+    margin: 0;
     padding: 0;
 }
 
 #thread li {
-    padding: 1.5em 1.0em;
     line-height: 1.5em;
+    clear: both;
+    /* Hack to force padding on .threadauthor on IE */
+    border-top: 1px solid #fff;
 }
 
@@ -249 +252 @@
 
 .threadauthor {
-    margin-left: -110px;
-    overflow: hidden;
-    position: absolute;
-    width: 95px;
-}
+    float: left;
+    padding: 1em 0 0 1em;
+    width: 120px;
+}
+
+.threadauthor p { margin: 0; }
 
 .threadauthor small { font: 11px Verdana, Arial, Helvetica, sans-serif; }
 
+.threadpost {
+    padding: 1.5em 1em;
+    margin-left: 140px;
+    background-color: #eee;
+    -moz-border-radius: 6px;
+    -khtml-border-radius: 6px;
+    -webkit-border-radius: 6px;
+    border-radius: 6px;
+}
+
+.threadpost.alt {
+    background-color: transparent;
+}
 
 #thread .post blockquote {
@@ -387 +404 @@
     position: relative;
     top: -10px;
-    -moz-border-bottom-left-radius: 6px;
+    -moz-border-radius-bottomleft: 6px;
     -khtml-border-bottom-left-radius: 6px;
     -webkit-border-bottom-left-radius: 6px;
     border-bottom-left-radius: 6px;
-    -moz-border-bottom-right-radius: 6px;
+    -moz-border-radius-bottomright: 6px;
     -khtml-border-bottom-right-radius: 6px;
     -webkit-border-bottom-right-radius: 6px;
@@ -405 +422 @@
     background: #e4f3e1;
 }
+
+#useravatar { margin-bottom: 1em; }
+
+#useravatar img { display: block; border-width: 3px; border-style: double; }
 
 #userinfo { margin-top: 10px; }

trunk/bb-templates/kakumei/topic.php

@@ -22 +22 @@
 <?php topic_tags(); ?>
 
-<br clear="all" />
+<div style="clear:both;"></div>
 </div>
 <?php do_action('under_title', ''); ?>
@@ -33 +33 @@
 
 <?php foreach ($posts as $bb_post) : $del_class = post_del_class(); ?>
-    <li id="post-<?php post_id(); ?>"<?php alt_class('post', $del_class); ?>>
+    <li id="post-<?php post_id(); ?>">
 <?php bb_post_template(); ?>
     </li>