Browse Source

Implemented display of aggregated sessions.

pull/48/head
Simon Eisenmann 11 years ago
parent
commit
99ddea7fe4
  1. 46
      src/styles/components/_buddylist.scss
  2. 9
      static/partials/buddyactions.html

46
src/styles/components/_buddylist.scss

@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
cursor: pointer;
display: block;
font-size: 13px;
height: 66px;
min-height: 66px;
overflow: hidden;
position: relative;
text-align: left;
@ -164,6 +164,16 @@ @@ -164,6 +164,16 @@
top: 0;
}
}
.buddyPictureSmall {
margin:0px;
margin-left:-4px;
height:30px;
width:30px;
margin-right:4px;
.#{$fa-css-prefix} {
line-height: 30px;
}
}
.buddy1 {
color: $componentfg1;
font-weight: bold;
@ -187,11 +197,19 @@ @@ -187,11 +197,19 @@
white-space: nowrap;
display: none;
}
.buddy3 {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
display: inline-block;
width:160px;
text-align:left;
}
}
.buddy .buddyactions {
background: $buddylist-action-background;
bottom: 0px;
height: 66px;
line-height: 66px;
position: absolute;
right: -125px;
@ -206,3 +224,27 @@ @@ -206,3 +224,27 @@
font-size: 2em;
}
}
.buddy .buddysessions {
margin-top: 56px;
display:none;
ul {
padding-top: 10px;
margin-left: 20px;
padding-left: 0px;
border-left: 1px dotted $bordercolor;
}
ul li {
margin-bottom: 1px;
margin-top: 1px;
margin-left: -4px;
list-style-type: none;
}
.currentsession .buddy3 {
font-weight: bold;
}
}
.buddy.hovered .buddysessions {
display: block;
}

9
static/partials/buddyactions.html

@ -1,4 +1,11 @@ @@ -1,4 +1,11 @@
<div class="buddyactions active">
<div class="buddyhover">
<div class="buddyactions active">
<a class="btn btn-info" title="{{_('Start video call')}}"><i class="fa fa-eye"></i></a>
<a class="btn btn-info" title="{{_('Start chat')}}" ng-click="doChat(session.Id); $event.stopPropagation()"><i class="fa fa-comments-o"></i></a>
</div>
<div class="buddysessions" ng-if="session.count>1">
<ul>
<li ng-repeat="(id, s) in session.sessions" ng-class="{currentsession: s.Id === session.Id}"><!--<div class="buddyPicture buddyPictureSmall"><i class="fa fa-user fa-2x"/><img ng-show="s.Status.buddyPicture" alt ng-src="{{s.Status.buddyPicture}}" width="30" height="30"/></div>--><span class="btn-group"><a class="btn btn-sm btn-default buddy3" ng-click="$event.stopPropagation()"><span>{{s.Status.displayName}}, {{s.Ua}}</span></a><a class="btn btn-sm btn-default" title="{{_('Start video call')}}" ng-click="doCall(s.Id); $event.stopPropagation()"><i class="fa fa-eye"></i></a><a class="btn btn-sm btn-default" title="{{_('Start chat')}}" ng-click="doChat(s.Id); $event.stopPropagation()"><i class="fa fa-comments-o"></i></a></span></li>
</ul>
</div>
</div>

Loading…
Cancel
Save