Merge "Bug 1594298 - Fixed sidebar notification links showing under profile icon"

htdocs/lib/mahara.php

@@ -3435,7 +3435,7 @@ function profile_sideblock() {
         if ($authobj->authname == 'xmlrpc') {
             $peer = get_peer($authobj->wwwroot);
             if ($SESSION->get('mnetuser')) {
-                $data['mnetloggedinfrom'] = '<span class="icon icon-external-link moodle-login"></span>' . get_string('youhaveloggedinfrom1', 'auth.xmlrpc', $authobj->wwwroot, $peer->name);
+                $data['mnetloggedinfrom'] = '<span class="icon left icon-external-link moodle-login"></span>' . get_string('youhaveloggedinfrom1', 'auth.xmlrpc', $authobj->wwwroot, $peer->name);
             }
             else {
                 $data['peer'] = array('name' => $peer->name, 'wwwroot' => $peer->wwwroot);

htdocs/theme/raw/sass/_custom.scss

@@ -341,10 +341,6 @@
     }
 }
 
-.moodle-login.icon {
-    margin: 10px;
-}
-
 .containobjectionable {
     background-color: #FEE7E7;
 }

htdocs/theme/raw/sass/components/_list-group.scss

-// // modiufications for list elements such a list of pages, collections
+// // modifications for list elements such a list of pages, collections
 
 // Left panel
 .list-group {
@@ -90,21 +90,15 @@ h4.list-group-item-heading {
         color: $state-warning-text;
 
     }
-    &.list-group-item-profile-notification {
-        padding-right: 70px;
-        word-wrap: normal;
-        word-break: break-all;
-        white-space: normal;
-        a {
-            display: table-row;
-        }
-        div,
-        > span {
-            display: table-cell;
-        }
-        &#invitedgroups + #pendingfriends {
-            padding-right: 0;
-        }
+}
+
+// Sidebar notification item styles
+.list-group-item-profile-notification {
+    word-wrap: normal;
+    word-break: break-all;
+    white-space: normal;
+    &:first-child {
+        padding-right: 80px;
     }
 }
 
@@ -139,6 +133,19 @@ h4.list-group-item-heading {
             color: darken($brand-default, 40%);
         }
     }
+
+    // Online user link see onlineusers.tpl
+    .online-user {
+        position: relative;
+        padding-left: 50px;
+        min-height: 50px;
+
+        .user-icon {
+            position: absolute;
+            left: 20px;
+            top: 15px;
+        }
+    }
 }
 
 // list-group-item with btn-group

htdocs/theme/raw/templates/sideblocks/onlineusers.tpl

@@ -7,12 +7,14 @@
     <ul class="list-group">
         {foreach from=$sbdata.users item=user}
             <li class="list-group-item list-unstyled list-group-item-link">
-                <a href="{profile_url($user)}" class="">
+                <a href="{profile_url($user)}" class="online-user">
                     <span class="user-icon">
                         <img src="{$user->profileiconurl}" alt="{str tag=profileimagetext arg1=$user|display_default_name}" class="profile-icon-container">
                     </span>
-                    {$user|display_name}
-                {if $user->loggedinfrom} ({$user->loggedinfrom}){/if}
+                    <span class="user-name">
+                        {$user|display_name}
+                        {if $user->loggedinfrom} ({$user->loggedinfrom}){/if}
+                    </span>
                 </a>
             </li>
         {/foreach}

htdocs/theme/raw/templates/sideblocks/profile.tpl

@@ -7,16 +7,14 @@
         </h3>
     <div class="list-group">
         {if $sbdata.mnetloggedinfrom}
-            <div class="sidebar-content">
-                <p>{$sbdata.mnetloggedinfrom|clean_html|safe}</p>
+            <div class="list-group-item list-group-item-profile-notification">
+                {$sbdata.mnetloggedinfrom|clean_html|safe}
             </div>
         {/if}
         {if $sbdata.invitedgroups}
             <div id="invitedgroups" class="list-group-item list-group-item-warning list-group-item-profile-notification">
                 <a href="{$WWWROOT}group/mygroups.php?filter=invite">
-                    <div>
-                        <span id="invitedgroupscount" class="label label-warning">{$sbdata.invitedgroups}</span>
-                    </div>
+                    <span id="invitedgroupscount" class="label label-warning">{$sbdata.invitedgroups}</span>
                     <span id="invitedgroupsmessage">{$sbdata.invitedgroupsmessage}</span>
                 </a>
             </div>
@@ -24,9 +22,7 @@
         {if $sbdata.pendingfriends}
             <div id="pendingfriends" class="list-group-item list-group-item-warning list-group-item-profile-notification">
                 <a href="{$WWWROOT}user/myfriends.php?filter=pending">
-                    <div>
-                        <span id="pendingfriendscount" class="label label-warning">{$sbdata.pendingfriends}</span>
-                    </div>
+                    <span id="pendingfriendscount" class="label label-warning">{$sbdata.pendingfriends}</span>
                     <span id="pendingfriendsmessage">{$sbdata.pendingfriendsmessage}</span>
                 </a>
             </div>