Commit 8ba1204f authored by Pat Kira's avatar Pat Kira

Bug 1594298 - Fixed sidebar notification links showing under profile icon

behatnotneeded: styling only

Change-Id: I9b88be45e97271fdb43e9cb9407caa619fa9c880
parent b8628d65
......@@ -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);
......
......@@ -341,10 +341,6 @@
}
}
.moodle-login.icon {
margin: 10px;
}
.containobjectionable {
background-color: #FEE7E7;
}
......
// // 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
......
......@@ -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}
......
......@@ -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>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment