aboutsummaryrefslogtreecommitdiff
path: root/views/default/forms
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-10-02 11:17:56 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-10-02 11:17:56 -0700
commitdd55b4b87cb1c89ceeb45ccf49ce648339a86041 (patch)
tree035059f5f06a2f6595110aff7c620380b46af103 /views/default/forms
parentbfdb9bb8a87a29038ba1ae25355684ae19678fdd (diff)
parentad016fd1254aa03afa7c24fdb82b35faa3c5019f (diff)
downloadelgg-dd55b4b87cb1c89ceeb45ccf49ce648339a86041.tar.gz
elgg-dd55b4b87cb1c89ceeb45ccf49ce648339a86041.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'views/default/forms')
-rw-r--r--views/default/forms/avatar/crop.php16
-rw-r--r--views/default/forms/useradd.php11
2 files changed, 12 insertions, 15 deletions
diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 9fcae25c4..1f39ff73c 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">
@@ -61,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>
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'))); ?>