Removed horizontal nav from avatar edit view and debug string from sidebar. Added...

git-svn-id: http://code.elgg.org/elgg/trunk@5286 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/profile/profile_lib.php b/mod/profile/profile_lib.php
index d92ad29b3ea3ec0fd0c32b8898d2eb063969fea0..c52ad0fcf04b215d12e8e9f5e75790fed765e8c6 100644 (file)
--- 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 44a6d4e745b4e720d3005d0ac03640cf9516cee0..8a78be3d935f71a451e09aeab0060cb83a30adaf 100644 (file)
--- 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 b475b6bddc3300a9cacb4f8407c2edd5ede22daa..3820ca7fd50d50fc1651cb52bf5af2737c1624e1 100644 (file)
--- 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;
+}
 
 
 /* ***************************************