From d44a060c8b9dbd94919bcf0edcb4f794da63d094 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Fri, 30 Sep 2011 17:22:49 -0400
Subject: Fixes #3890 removed admin check in useradd form since it is only used
 by admins

---
 views/default/forms/useradd.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'views/default/forms')

diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php
index 66f8846e2..4f337e4e4 100644
--- a/views/default/forms/useradd.php
+++ b/views/default/forms/useradd.php
@@ -17,10 +17,6 @@ if (elgg_is_sticky_form('useradd')) {
 	}
 }
 
-$admin_option = false;
-if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
-	$admin_option = true;
-}
 ?>
 <div>
 	<label><?php echo elgg_echo('name');?></label><br />
@@ -67,18 +63,15 @@ if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
 	));
 	?>
 </div>
-
+<div>
 <?php 
-if ($admin_option) {
-	echo "<div>";
 	echo elgg_view('input/checkboxes', array(
 		'name' => "admin",
 		'options' => array(elgg_echo('admin_option') => 1),
 		'value' => $admin,
 	));
-	echo "</div>";
-}
 ?>
+</div>
 
 <div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('register'))); ?>
-- 
cgit v1.2.3


From a186ad16e258c6335e1757a20845c64056b87f15 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 1 Oct 2011 20:09:16 -0400
Subject: Fixes #3913 registering jquery.imgareaselect

---
 engine/lib/elgglib.php              | 3 +++
 views/default/forms/avatar/crop.php | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'views/default/forms')

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 7bdc5972a..c62175629 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -2031,7 +2031,10 @@ function elgg_init() {
 	elgg_register_js('elgg.userpicker', 'js/lib/userpicker.js');
 	elgg_register_js('elgg.friendspicker', 'js/lib/friends_picker.js');
 	elgg_register_js('jquery.easing', 'vendors/jquery/jquery.easing.1.3.packed.js');
+	elgg_register_js('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/scripts/jquery.imgareaselect.min.js');
 
+	elgg_register_css('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/css/imgareaselect-deprecated.css');
+	
 	// Trigger the shutdown:system event upon PHP shutdown.
 	register_shutdown_function('_elgg_shutdown_hook');
 
diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 9fcae25c4..b97db939c 100644
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -5,6 +5,9 @@
  * @uses $vars['entity']
  */
 
+elgg_load_js('jquery.imgareaselect');
+elgg_load_css('jquery.imgareaselect');
+
 $master_image = $vars['entity']->getIconUrl('master');
 
 ?>
@@ -25,8 +28,6 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 ?>
 </div>
 <!-- grab the required js for icon cropping -->
-<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.imgareaselect-0.9.8/scripts/jquery.imgareaselect.min.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.imgareaselect-0.9.8/css/imgareaselect-deprecated.css" media="screen" />
 <?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 
-- 
cgit v1.2.3


From 00433c37e49e1ca706809a1a5f1c515cd784fc22 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 1 Oct 2011 20:28:07 -0400
Subject: Fixes #3888 correcting initialization of avatar cropping library

---
 views/default/forms/avatar/crop.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'views/default/forms')

diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index b97db939c..1f39ff73c 100644
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -62,9 +62,12 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 		$('<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'));
 
-		// this produces the coordinates
-		$('#user-avatar').imgAreaSelect({ selectionOpacity: 0, onSelectEnd: selectChange });
-		// show the preview
-		$('#user-avatar').imgAreaSelect({ aspectRatio: '1:1', onSelectChange: preview });
+		// init the cropping
+		$('#user-avatar').imgAreaSelect({
+			selectionOpacity: 0,
+			aspectRatio: '1:1',
+			onSelectEnd: selectChange,
+			onSelectChange: preview
+		});
 	});
 </script>
-- 
cgit v1.2.3