aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-10-23 11:23:58 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-10-23 11:23:58 -0700
commit75f971f3f4dc2517cf4ec18fe29f12f3d3e8d30a (patch)
treea4672fb4a186c18c19a2c7cff62e70a508c433e7 /views
parent899c89f5a60764dc0af06443af8970de82756781 (diff)
downloadelgg-75f971f3f4dc2517cf4ec18fe29f12f3d3e8d30a.tar.gz
elgg-75f971f3f4dc2517cf4ec18fe29f12f3d3e8d30a.tar.bz2
Fixes #3914. Moved avatar cropping to ui.js.
Diffstat (limited to 'views')
-rw-r--r--views/default/css/elements/misc.php2
-rw-r--r--views/default/forms/avatar/crop.php49
2 files changed, 5 insertions, 46 deletions
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index ebac2b91f..d9622d34a 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -18,7 +18,7 @@
#avatar-croppingtool {
border-top: 1px solid #ccc;
}
-#user-avatar {
+#user-avatar-cropper {
float: left;
}
#user-avatar-preview {
diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 1f39ff73c..dd1640b1f 100644
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -12,7 +12,10 @@ $master_image = $vars['entity']->getIconUrl('master');
?>
<div class="clearfix">
- <img id="user-avatar" class="mrl" src="<?php echo $master_image; ?>" alt="<?php echo elgg_echo('avatar'); ?>" />
+ <img id="user-avatar-cropper" class="mrl" src="<?php echo $master_image; ?>" alt="<?php echo elgg_echo('avatar'); ?>" />
+ <div id="user-avatar-preview-title"><label><?php echo elgg_echo('avatar:preview'); ?></label></div>
+ <div id="user-avatar-preview"><img src="<?php echo $master_image; ?>" /></div>
+
</div>
<div class="elgg-foot">
<?php
@@ -27,47 +30,3 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
?>
</div>
-<!-- grab the required js for icon cropping -->
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-
- // display a preview of the users cropped section
- function preview(img, selection) {
- // catch for the first click on the image
- if (selection.width == 0 || selection.height == 0) {
- return;
- }
-
- var origWidth = $("#user-avatar").width(); //get the width of the users master photo
- var origHeight = $("#user-avatar").height(); //get the height of the users master photo
- var scaleX = 100 / selection.width;
- var scaleY = 100 / selection.height;
- $('#user-avatar-preview > img').css({
- width: Math.round(scaleX * origWidth) + 'px',
- height: Math.round(scaleY * origHeight) + 'px',
- marginLeft: '-' + Math.round(scaleX * selection.x1) + 'px',
- marginTop: '-' + Math.round(scaleY * selection.y1) + 'px'
- });
- }
-
- function selectChange(img, selection) {
- // populate the form with the correct coordinates once a user has cropped their image
- $('input[name=x1]').val(selection.x1);
- $('input[name=x2]').val(selection.x2);
- $('input[name=y1]').val(selection.y1);
- $('input[name=y2]').val(selection.y2);
- }
-
- $(document).ready(function() {
- $('<div id="user-avatar-preview"><img src="<?php echo $master_image; ?>" /></div>').insertAfter($('#user-avatar'));
- $('<div id="user-avatar-preview-title"><label><?php echo elgg_echo('avatar:preview'); ?></label></div>').insertBefore($('#user-avatar-preview'));
-
- // init the cropping
- $('#user-avatar').imgAreaSelect({
- selectionOpacity: 0,
- aspectRatio: '1:1',
- onSelectEnd: selectChange,
- onSelectChange: preview
- });
- });
-</script>