aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-04 18:09:46 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-04 18:09:46 +0000
commit7dc0e1c44e15189687636ef8632c41aa58a2b1be (patch)
treebd329d7fb64e5b73a1b5c0dbd0fec26f84914b3d
parent1852b00a819721c9d7399e7fa42321d582bb32af (diff)
downloadelgg-7dc0e1c44e15189687636ef8632c41aa58a2b1be.tar.gz
elgg-7dc0e1c44e15189687636ef8632c41aa58a2b1be.tar.bz2
Removed horizontal nav from avatar edit view and debug string from sidebar. Added temp fix for large avatar upload image scaling
git-svn-id: http://code.elgg.org/elgg/trunk@5286 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/profile/profile_lib.php1
-rw-r--r--mod/profile/start.php2
-rw-r--r--mod/profile/views/default/profile/css.php4
3 files changed, 5 insertions, 2 deletions
diff --git a/mod/profile/profile_lib.php b/mod/profile/profile_lib.php
index d92ad29b3..c52ad0fcf 100644
--- a/mod/profile/profile_lib.php
+++ b/mod/profile/profile_lib.php
@@ -57,7 +57,6 @@ function profile_get_user_profile_html($user, $section = 'activity') {
*/
function profile_get_user_edit_content($user, $page) {
$section = (isset($page[2])) ? $page[2] : 'details';
- $content = elgg_view('profile/profile_navigation', array('section' => $section, 'entity' => $user));
switch ($section) {
case 'icon':
diff --git a/mod/profile/start.php b/mod/profile/start.php
index 44a6d4e74..8a78be3d9 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -154,7 +154,7 @@ function profile_page_handler($page) {
}
$content = profile_get_user_edit_content($user, $page);
- $content = elgg_view_layout($layout, 'asdf', $content);
+ $content = elgg_view_layout($layout, '', $content);
break;
default:
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index b475b6bdd..3820ca7fd 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -276,6 +276,10 @@ form#edit_profile {
width: 100px;
height: 100px;
}
+/* @todo fix image cropping */
+#avatar_cropping img.current_user_avatar {
+ max-width:560px;
+}
/* ***************************************