moved the avatar forms and actions into core from profile plugin

git-svn-id: http://code.elgg.org/elgg/trunk@7670 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 4 insertions, 102 deletions

diff --git a/mod/profile/views/default/profile/editicon.php b/mod/profile/views/default/profile/editicon.php
index 9eeaecb4a..878ec504b 100644
--- a/mod/profile/views/default/profile/editicon.php
+++ b/mod/profile/views/default/profile/editicon.php
@@ -12,8 +12,6 @@
 $currentuser = get_loggedin_user();
 ?>
 <div id="edit_profile_avatar">
-<!-- grab the required js for icon cropping -->
-<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js"></script>
 
 <p class="margin-top"><?php echo elgg_echo('profile:profilepictureinstructions'); ?></p>
 
@@ -30,112 +28,16 @@ $currentuser = get_loggedin_user();
 </div>
 
 <div id="avatar_upload">
-	<form action="<?php echo elgg_get_site_url(); ?>action/profile/iconupload" method="post" enctype="multipart/form-data">
-	<?php echo elgg_view('input/securitytoken'); ?>
-	<input type="hidden" name="username" value="<?php echo $currentuser->username; ?>" />
-	<p><label><?php echo elgg_echo("profile:editicon"); ?></label><br />
-	
-		<?php
-			
-			echo elgg_view("input/file",array('internalname' => 'profileicon'));
-		?>
-		<br /><input type="submit" class="submit-button" value="<?php echo elgg_echo("upload"); ?>" />
-	</p>
-	</form>
+<?php
+	echo elgg_view_form('avatar/upload', array('enctype' => 'multipart/form-data'), array('entity' => $currentuser));
+?>
 </div>
 	
 <div id="avatar_croppingtool">	
 <label><?php echo elgg_echo('profile:profilepicturecroppingtool'); ?></label><br />
-<p>	
-<?php
 
-    echo elgg_echo("profile:createicon:instructions");
-    
-    //display the current user photo
-     
-    $user_master_image = $currentuser->getIcon('master');
-    
+<?php echo elgg_view_form('avatar/crop', array(), array('entity' => get_loggedin_user()));
 ?>
-</p>
-<script type="text/javascript">
-
-    //function to 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' 
-         }); 
-    } 
-        
-    //variables for the newly cropped avatar
-    //var $x1, $y1, $x2, $y2, $w, $h;
-        
-        function selectChange(img, selection){
-           
-           //populate the form with the correct coordinates once a user has cropped their image
-           $('#x_1').val(selection.x1);
-           $('#x_2').val(selection.x2);
-           $('#y_1').val(selection.y1);
-           $('#y_2').val(selection.y2);
-           
-         }     
-         
-        $(document).ready(function () {
-            
-            //get the coordinates from the form
-            /*
-            var x_1 = $('#x_1').val();
-            var x_2 = $('#x_2').val();
-            var y_1 = $('#y_1').val();
-            var y_2 = $('#y_2').val();
-            var w = x_2 - x_1;
-            var h = y_2 - y_1;
-            selection = { x1: x_1, y1: y_1, x2: x_2, y2: y_2, width: w, height: h };
-            */
-            
-            $('<div id="user_avatar_preview"><img src="<?php echo $user_master_image; ?>" /></div>') 
-            .insertAfter($('#user_avatar'));
-            
-            $('<div id="user_avatar_preview_title"><label><?php echo elgg_echo('profile:preview'); ?></label></div>').insertBefore($('#user_avatar_preview'));
-        }); 
-        
-        $(window).load(function () { 
-            
-            //this produces the coordinates
-            $('#user_avatar').imgAreaSelect({ selectionOpacity: 0, onSelectEnd: selectChange });
-            //show the preview
-            $('#user_avatar').imgAreaSelect({ aspectRatio: '1:1', onSelectChange: preview });
-  
-        });
- 
-</script>
-
-<p>
-<img id="user_avatar" src="<?php echo $user_master_image; ?>" alt="<?php echo elgg_echo("profile:icon"); ?>" />
-</p>
-
-<div class="clearfloat"></div>
-
-<form action="<?php echo elgg_get_site_url(); ?>action/profile/cropicon" method="post" />
-	<?php echo elgg_view('input/securitytoken'); ?>
-	<input type="hidden" name="username" value="<?php echo get_loggedin_user()->username; ?>" />
-	<input type="hidden" name="x_1" value="<?php echo get_loggedin_user()->x1; ?>" id="x_1" />
-    <input type="hidden" name="x_2" value="<?php echo get_loggedin_user()->x2; ?>" id="x_2" />
-    <input type="hidden" name="y_1" value="<?php echo get_loggedin_user()->y1; ?>" id="y_1" />
-    <input type="hidden" name="y_2" value="<?php echo get_loggedin_user()->y2; ?>" id="y_2" />
-	<input type="submit" name="submit" value="<?php echo elgg_echo("profile:createicon"); ?>" />
-</form>
 
 </div>
 </div>