Merge branch 'MDL-49984-master' of git://github.com/barbararamiro/moodle

lib/myprofilelib.php

@@ -76,7 +76,8 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
                     $systemcontext)) {
             $url = new moodle_url('/user/editadvanced.php', array('id' => $user->id, 'course' => $courseid,
                 'returnto' => 'profile'));
-            $node = new core_user\output\myprofile\node('contact', 'editprofile', get_string('editmyprofile'), null, $url);
+            $node = new core_user\output\myprofile\node('contact', 'editprofile', get_string('editmyprofile'), null, $url,
+                null, null, 'editprofile');
             $tree->add_node($node);
         } else if ((has_capability('moodle/user:editprofile', $usercontext) && !is_siteadmin($user))
                    || ($iscurrentuser && has_capability('moodle/user:editownprofile', $systemcontext))) {
@@ -95,7 +96,7 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
                     }
                 }
                 $node = new core_user\output\myprofile\node('contact', 'editprofile',
-                        get_string('editmyprofile'), null, $url);
+                        get_string('editmyprofile'), null, $url, null, null, 'editprofile');
                 $tree->add_node($node);
             }
         }
@@ -258,8 +259,8 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
                     } else {
                         $url = new moodle_url('/user/profile.php', array('id' => $user->id, 'showallcourses' => 1));
                     }
-                    $courselisting .= html_writer::tag('li', html_writer::link($url, get_string('viewmore'),
-                            array('title' => get_string('viewmore'))));
+                    $courselisting .= html_writer::tag('li', html_writer::link($url, get_string('viewmore') ,
+                            array('title' => get_string('viewmore'))), array('class' => 'viewmore'));
                     break;
                 }
             }

theme/bootstrapbase/config.php

@@ -93,8 +93,8 @@ $THEME->layouts = array(
     ),
     // My public page.
     'mypublic' => array(
-        'file' => 'columns3.php',
-        'regions' => array('side-pre', 'side-post'),
+        'file' => 'columns2.php',
+        'regions' => array('side-pre'),
         'defaultregion' => 'side-pre',
     ),
     'login' => array(

theme/bootstrapbase/less/moodle/core.less

@@ -1890,7 +1890,7 @@ ul.badges {
 .badges li {
     position: relative;
     display: inline-block;
-    padding-bottom: 2em;
+    padding-top: 1em;
     text-align: center;
     vertical-align: top;
     width: 150px;

theme/bootstrapbase/less/moodle/user.less

@@ -3,16 +3,28 @@
     text-align: center;
     margin: 10px;
 }
+.userprofile .page-context-header {
+    margin-bottom: 10px;
+}
 .userprofile .description {
-    margin-bottom: 20px;
+    margin-top: 10px;
+    margin-bottom: 30px;
 }
-
 .userprofile .profile_tree {
     .content-columns(2);
 }
 .userprofile .profile_tree section {
     display: inline-block;
     width: 100%;
+    border: 1px solid #ddd;
+    border-radius: @baseBorderRadius;
+    padding: 0 15px;
+    margin-bottom: 20px;
+    box-sizing: border-box;
+}
+.userprofile .profile_tree section h3 {
+    font-size: round(@baseFontSize * 1.30);
+    line-height: @baseLineHeight;
 }
 .userprofile dl.list {
     .dl-horizontal;
@@ -25,36 +37,35 @@
     float: left;
     clear: none;
 }
-#page-user-profile .node_category, .path-user .node_category {
+#page-user-profile .node_category,
+.path-user .node_category {
+    ul {
+        margin-left: 0;
+        margin-right: 0;
+        list-style: none;
+    }
     li {
-        list-style-type: square;
-
-        &.contentnode {
-            list-style-type: none;
-        }
+        margin-top: 5px;
+    }
+    .editprofile,
+    .viewmore {
+        text-align: right;
     }
-}
-#page-user-profile.dir-ltr .node_category .contentnode, .path-user.dir-ltr .node_category .contentnode {
-    margin-left: -25px;
-}
-#page-user-profile.dir-rtl .node_category .contentnode , .path-user.dir-rtl .node_category .contentnode {
-    margin-right: -25px;
 }
 
 .dir-rtl {
-    .userprofile .description {
-        margin-right:0;
-    }
     .user-box {
         float:right;
     }
-    .userprofile dl.list dt {
-        float:right;
-        text-align: left;
-        padding-left: 10px;
+    .userprofile .node_category {
+        .editprofile,
+        .viewmore {
+            text-align: left;
+        }
     }
-    .userprofile dl.list dd {
+    .userprofile dl dd {
         margin-left:0;
+        margin-right: 10px;
     }
 }