@@ -1037,6 +1037,10 @@ function display_user ($user_id="") { Joined <?php echo htmlentities($registrationtime); ?> </div> + <div class="row"> + Avatar (<a href="/help/#avatar">?</a>) + <img src="http://www.gravatar.com/avatar/<?php echo md5($USER->email()) ?>?s=32&d=identicon&r=g" width="32" height="32" alt="Avatar for <?php echo $name ?>"> + </div> <?php } www/docs/user/index.php @@ -483,7 +483,7 @@ class COMMENTLIST { // Add on the stuff for getting a user's details. if (isset($amount['user']) && $amount['user'] == true) { - $fieldsarr['users'] = array ('firstname', 'lastname', 'user_id'); + $fieldsarr['users'] = array ('firstname', 'lastname', 'user_id', 'email'); // Like doing "FROM comments, users" but it's easier to add // an "INNER JOIN..." automatically to the query. $join .= ' INNER JOIN users ON comments.user_id = users.user_id '; www/includes/easyparliament/commentlist.php @@ -2044,7 +2044,8 @@ class HANSARDLIST { c.body, c.posted, u.firstname, - u.lastname + u.lastname, + u.email FROM comments c, users u WHERE c.epobject_id = '" . mysql_escape_string($item_data['epobject_id']) . "' AND c.user_id = u.user_id @@ -2059,7 +2060,8 @@ class HANSARDLIST { 'user_id' => $q->field(0, 'user_id'), 'body' => $q->field(0, 'body'), 'posted' => $q->field(0, 'posted'), - 'username' => $q->field(0, 'firstname') .' '. $q->field(0, 'lastname') + 'username' => $q->field(0, 'firstname') .' '. $q->field(0, 'lastname'), + 'email' => $q->field(0, 'email') ); } www/includes/easyparliament/hansardlist.php @@ -8,6 +8,7 @@ <li><a href="#numbers">Why should I read in more depth than just the numbers?</a></li> <li><a href="#api">Do you have the data as a spreadsheet file, XML or in an API?</a></li> <li><a href="#regmem">What is the Register of Interests and how can I use it?</a></li> +<li><a href="#avatar">Where do the little pictures of commenters come from and how do I change mine?</a></li> </ul> @@ -128,4 +129,9 @@ Please note that for the Register of Interests we have been asked to make the fo </ul> </dd> +<dt><a name="avatar"></a>Where do the little pictures of commenters come from and how do I change mine?</dt> +<dd> +The little pictures beside commenter's names are called avatars. We use the <a href="http://www.gravatar.com/">Gravatar service</a> to show these. So, if you want to change your own, please <a href="http://www.gravatar.com/site/signup/">sign-up to Gravatar</a>. Just make sure that you use the same email address for your Gravatar as the email address you used when you registered with OpenAustralia. +</dd> + </dl> www/includes/easyparliament/staticpages/help.php @@ -121,8 +121,11 @@ if (isset($data['comments']) && count($data['comments']) > 0) { list($date, $time) = explode(' ', $comment['posted']); $date = format_date($date, SHORTDATEFORMAT); $time = format_time($time, TIMEFORMAT); + + // MD5 hash the user's email for their Gravatar + $usermailmd5 = md5($comment['email']); ?> - <a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><?php echo htmlentities($comment['firstname']) .' '. htmlentities($comment['lastname']); ?></a> + <img class=portrait src="http://www.gravatar.com/avatar/<?php echo $usermailmd5; ?>?s=32&d=identicon&r=g" width="32" height="32" alt="Avatar for <?php echo htmlentities($comment['firstname']) .' '. htmlentities($comment['lastname']); ?>"><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><?php echo htmlentities($comment['firstname']) .' '. htmlentities($comment['lastname']); ?></a> Posted on <?php echo $date; if (isset($comment['url'])) { www/includes/easyparliament/templates/html/comments.php @@ -21,12 +21,12 @@ if (isset($data['comments']) && count($data['comments']) > 0) { if ($this_page != 'home') $PAGE->page_links($data); $USERURL = new URL('userview'); ?> - <ul> + <table class="people" border="0" cellpadding="3" cellspacing="0"> <?php foreach ($data['comments'] as $n => $comment) { ?> - <li><?php + <tr><?php $commenttext = trim_characters($comment['body'], 0, 200); list($date, $time) = explode(' ', $comment['posted']); @@ -36,12 +36,15 @@ if (isset($data['comments']) && count($data['comments']) > 0) { $count = $n+1; $USERURL->insert(array('u'=>$comment['user_id'])); + + // MD5 hash the user's email for their Gravatar + $usermailmd5 = md5($comment['email']); - ?><a name="c<?php echo $count; ?>"></a><?php echo htmlentities($comment['firstname'] . ' ' . $comment['lastname']); ?>: <?php echo $commenttext; ?> (<?php echo relative_time($comment['posted']); ?>) <a href="<?php echo $comment['url']; ?>">Read comment</a> | <a href="<?php echo $USERURL->generate(); ?>" title="See more information about this user">All by this user</a> </li> + ?><td><img src="http://www.gravatar.com/avatar/<?php echo $usermailmd5; ?>?s=32&d=identicon&r=g" width="32" height="32" alt="Avatar for <?php echo htmlentities($comment['firstname']) .' '. htmlentities($comment['lastname']); ?>"></td><td style="font-size: 1em"><a name="c<?php echo $count; ?>"></a><?php echo htmlentities($comment['firstname'] . ' ' . $comment['lastname']); ?>: <?php echo $commenttext; ?> (<?php echo relative_time($comment['posted']); ?>) <a href="<?php echo $comment['url']; ?>">Read comment</a> | <a href="<?php echo $USERURL->generate(); ?>" title="See more information about this user">All by this user</a></td></tr> <?php } ?> - </ul> + </table> <?php if ($this_page == 'home') { www/includes/easyparliament/templates/html/comments_recent.php @@ -473,8 +473,11 @@ function generate_commentteaser (&$row, $major) { $linktext = 'Continue reading'; } } + + // MD5 hash the user's email for their Gravatar + $usermailmd5 = md5($comment['email']); - $html = '' . htmlentities($comment['username']) . ': ' . prepare_comment_for_display($commentbody); + $html = '<img style="float: left; padding: 3px;" src="http://www.gravatar.com/avatar/' . $usermailmd5 . '?s=32&d=identicon&r=g" width="32" height="32" alt="Avatar for ' . htmlentities($comment['username']) . '">' . htmlentities($comment['username']) . ': ' . prepare_comment_for_display($commentbody); if (isset($linktext)) { $html .= ' <a href="' . $row['commentsurl'] . '#c' . $comment['comment_id'] . '" title="See any comments posted about this">' . $linktext . '</a>'; www/includes/easyparliament/templates/html/hansard_gid.php d700031aca7d79bd430e671ce14edab50a3ca381 74ed7e58371b46bf8b89a3747c9261c2d72cd657 Matthew Landauer matthew@openaustralia.org http://github.com/mlandauer/twfy/commit/42d7cbad66207b29543956d1e2d3006edc065b54 42d7cbad66207b29543956d1e2d3006edc065b54

2009-11-06T23:04:15-08:00

Merge branch 'OA-339' 25a8635d3b2c8655771bdaf54df977d0913642bd Matthew Landauer matthew@openaustralia.org