diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-08-25 10:00:38 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-08-25 10:00:38 -0700 |
| commit | dccc333c765bb28da55b4a55d9c916acdb88413a (patch) | |
| tree | bdd26a0b4cd85241a19b7fcb2c0770f0ac3eb9f0 /views/default/forms/avatar | |
| parent | ec7b94a64aef23b85866ecdac8e8acc712d29bb6 (diff) | |
| parent | 003cb81c7888f4d2fd763e5814027c6f8d71186f (diff) | |
| download | elgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.gz elgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.bz2 | |
Merge branch 'master' of github.com:brettp/Elgg
Diffstat (limited to 'views/default/forms/avatar')
| -rw-r--r-- | views/default/forms/avatar/crop.php | 5 | ||||
| -rw-r--r-- | views/default/forms/avatar/upload.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php index 3deec66bd..dc5e3d77f 100644 --- a/views/default/forms/avatar/crop.php +++ b/views/default/forms/avatar/crop.php @@ -11,7 +11,7 @@ $master_image = $vars['entity']->getIcon('master'); <div class="clearfix"> <img id="user-avatar" class="mrl" src="<?php echo $master_image; ?>" alt="<?php echo elgg_echo('avatar'); ?>" /> </div> -<div> +<div class="elgg-foot"> <?php $coords = array('x1', 'x2', 'y1', 'y2'); foreach ($coords as $coord) { @@ -25,7 +25,8 @@ 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.8.min.js"></script> +<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"> diff --git a/views/default/forms/avatar/upload.php b/views/default/forms/avatar/upload.php index b099b8c4c..d91e8575e 100644 --- a/views/default/forms/avatar/upload.php +++ b/views/default/forms/avatar/upload.php @@ -10,7 +10,7 @@ <label><?php echo elgg_echo("avatar:upload"); ?></label><br /> <?php echo elgg_view("input/file",array('name' => 'avatar')); ?> </div> -<div class="elgg-form-footer"> +<div class="elgg-foot"> <?php echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid)); ?> <?php echo elgg_view('input/submit', array('value' => elgg_echo('upload'))); ?> </div> |