diff options
Diffstat (limited to 'mod/profile/views/default/profile')
-rw-r--r-- | mod/profile/views/default/profile/css.php | 32 | ||||
-rw-r--r-- | mod/profile/views/default/profile/editicon.php | 43 | ||||
-rwxr-xr-x | mod/profile/views/default/profile/profile_ownerblock.php | 2 |
3 files changed, 1 insertions, 76 deletions
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php index 537d9261e..812daf16d 100644 --- a/mod/profile/views/default/profile/css.php +++ b/mod/profile/views/default/profile/css.php @@ -308,38 +308,6 @@ p.visit_twitter a { border-top:1px solid #dedede; } - -/* *************************************** - user avatar upload & crop page -*************************************** */ -#avatar_upload { - height:145px; -} -#current_user_avatar { - float:left; - width:160px; - height:130px; - border-right:1px solid #cccccc; - margin:0 20px 0 0; -} -#avatar_croppingtool { - border-top: 1px solid #cccccc; - margin:20px 0 0 0; - padding:10px 0 0 0; -} -#user_avatar { - float: left; - margin-right: 20px; -} -#user_avatar_preview { - float: left; - position: relative; - overflow: hidden; - width: 100px; - height: 100px; -} - - /* *************************************** banned user *************************************** */ diff --git a/mod/profile/views/default/profile/editicon.php b/mod/profile/views/default/profile/editicon.php deleted file mode 100644 index 878ec504b..000000000 --- a/mod/profile/views/default/profile/editicon.php +++ /dev/null @@ -1,43 +0,0 @@ -<?php -/** - * Elgg profile icon edit form - * - * @package ElggProfile - * - * @uses $vars['entity'] The user entity - * @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now - */ - -// user is passed to view and set by caller (normally the page editicon) -$currentuser = get_loggedin_user(); -?> -<div id="edit_profile_avatar"> - -<p class="margin-top"><?php echo elgg_echo('profile:profilepictureinstructions'); ?></p> - -<div id="current_user_avatar"> - - <label><?php echo elgg_echo('profile:currentavatar'); ?></label> - <?php - - $user_avatar = $currentuser->getIcon('medium'); - echo "<img src=\"{$user_avatar}\" alt=\"avatar\" />"; - - ?> - -</div> - -<div id="avatar_upload"> -<?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 /> - -<?php echo elgg_view_form('avatar/crop', array(), array('entity' => get_loggedin_user())); -?> - -</div> -</div> diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/profile_ownerblock.php index 216734aa5..3fb5f509e 100755 --- a/mod/profile/views/default/profile/profile_ownerblock.php +++ b/mod/profile/views/default/profile/profile_ownerblock.php @@ -39,7 +39,7 @@ $profile_actions = ""; if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) { $profile_actions = "<div class='clearfix profile_actions'>"; $profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/details' class='action-button'>". elgg_echo('profile:edit') ."</a>"; - $profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/icon' class='action-button'>". elgg_echo('profile:editicon') ."</a>"; + $profile_actions .= "<a href='".elgg_get_site_url()."pg/avatar/edit/{$user->username}' class='action-button'>". elgg_echo('avatar:edit') ."</a>"; $profile_actions .= "</div>"; } else { $profile_actions = "<div class='profile_actions'>"; |