<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][8673] trunk/src/bp-core: Improved image size detection for uploaded avatar images</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8673">8673</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-07-23 14:43:05 +0000 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improved image size detection for uploaded avatar images
This changeset introduces two fixes that improve the UX for the avatar upload
process with original images of various sizes:
- Be sensitive to the size of the original image when setting the initial
dimensions of the crop box. If the uploaded image is smaller than the
"full" avatar size, suggest a crop that contains the entire image; if
slightly larger than the "full" size, suggest a crop equivalent to the "full"
size.
- When a too-small image is uploaded, throw a message that suggests a larger
one.
See <a href="http://buddypress.trac.wordpress.org/ticket/5617">#5617</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreavatarsphp">trunk/src/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunksrcbpcorebpcorecssjsphp">trunk/src/bp-core/bp-core-cssjs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-avatars.php (8672 => 8673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-avatars.php 2014-07-23 13:42:48 UTC (rev 8672)
+++ trunk/src/bp-core/bp-core-avatars.php 2014-07-23 14:43:05 UTC (rev 8673)
</span><span class="lines">@@ -670,6 +670,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If the uploaded image is smaller than the "full" dimensions, throw
+ // a warning
+ $uploaded_image = @getimagesize( bp_core_avatar_upload_path() . buddypress()->avatar_admin->image->dir );
+ $full_width = bp_core_avatar_full_width();
+ $full_height = bp_core_avatar_full_height();
+ if ( isset( $uploaded_image[0] ) && $uploaded_image[0] < $full_width || $uploaded_image[1] < $full_height ) {
+ bp_core_add_message( sprintf( __( 'You have selected an image that is smaller than recommended. For best results, upload a picture larger than %d x %d pixels.', 'buddypress' ), $full_width, $full_height ), 'error' );
+ }
+
</ins><span class="cx"> // Set the url value for the image
</span><span class="cx"> $bp->avatar_admin->image->url = bp_core_avatar_url() . $bp->avatar_admin->image->dir;
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-cssjs.php (8672 => 8673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-cssjs.php 2014-07-23 13:42:48 UTC (rev 8672)
+++ trunk/src/bp-core/bp-core-cssjs.php 2014-07-23 14:43:05 UTC (rev 8673)
</span><span class="lines">@@ -83,11 +83,43 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Default cropper coordinates
</span><del>- $crop_left = round( $image[0] / 4 );
- $crop_top = round( $image[1] / 4 );
- $crop_right = $image[0] - $crop_left;
- $crop_bottom = $image[1] - $crop_top; ?>
</del><span class="cx">
</span><ins>+ // Smaller than full-width: cropper defaults to entire image
+ if ( $image[0] < $full_width ) {
+ $crop_left = 0;
+ $crop_right = $image[0];
+
+ // Less than 2x full-width: cropper defaults to full-width
+ } else if ( $image[0] < ( $full_width * 2 ) ) {
+ $padding_w = round( ( $image[0] - $full_width ) / 2 );
+ $crop_left = $padding_w;
+ $crop_right = $image[0] - $padding_w;
+
+ // Larger than 2x full-width: cropper defaults to 1/2 image width
+ } else {
+ $crop_left = round( $image[0] / 4 );
+ $crop_right = $image[0] - $crop_left;
+ }
+
+ // Smaller than full-height: cropper defaults to entire image
+ if ( $image[1] < $full_height ) {
+ $crop_top = 0;
+ $crop_bottom = $image[1];
+
+ // Less than double full-height: cropper defaults to full-height
+ } else if ( $image[1] < ( $full_height * 2 ) ) {
+ $padding_h = round( ( $image[1] - $full_height ) / 2 );
+ $crop_top = $padding_h;
+ $crop_bottom = $image[1] - $padding_h;
+
+ // Larger than 2x full-height: cropper defaults to 1/2 image height
+ } else {
+ $crop_top = round( $image[1] / 4 );
+ $crop_bottom = $image[1] - $crop_top;
+ }
+
+ ?>
+
</ins><span class="cx"> <script type="text/javascript">
</span><span class="cx"> jQuery(window).load( function(){
</span><span class="cx"> jQuery('#avatar-to-crop').Jcrop({
</span></span></pre>
</div>
</div>
</body>
</html>