Merge pull request #2035 from FlxAlbroscheit/develop

Preview the last 5 conversations in message-sidebar
This commit is contained in:
Tobias Diekershoff 2015-11-08 16:03:04 +01:00
commit 631afe5810
5 changed files with 101 additions and 69 deletions

View file

@ -1,11 +1,10 @@
<div id="message-sidebar" class="widget">
<div id="message-new"><a href="{{$new.url}}" accesskey="m" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
<ul role="menu" class="message-ul">
{{foreach $tabs as $t}}
<li role="menuitem" class="tool"><a href="{{$t.url}}" {{if $t.accesskey}}accesskey="$t.accesskey"{{/if}} class="message-link{{if $t.sel}}message-selected{{/if}}">{{$t.label}}</a></li>
{{/foreach}}
</ul>
{{if $tabs}}
<div id="message-preview">
{{$tabs}}
</div>
{{/if}}
</div>

View file

@ -3476,5 +3476,9 @@ ul.menu-popup {
.videos .video-top-wrapper:hover .video-delete {
opacity: 1;
}
#message-preview .mail-list-sender-url, #message-preview .mail-list-delete {
display: none;
}
#message-preview .mail-list-outside-wrapper {
margin-top: 20px;
}

View file

@ -4146,5 +4146,9 @@ ul.notifications-menu-popup {
margin-left: 40px;
width: 130px;
}
#message-preview .mail-list-sender, #message-preview .mail-list-delete {
display:none;
}
#message-preview .mail-list-outside-wrapper {
margin-top: 20px;
}

View file

@ -3037,3 +3037,8 @@ a.mail-list-link {
/* upload/select popup */
.fbrowser.image .photo-album-image-wrapper { margin-left: 10px; }
#message-preview { margin-top: 15px; }
#message-preview span { width: 100%; }
#message-preview .mail-count, #message-preview .mail-delete { display:none; }
#message-preview .mail-list-wrapper { padding: 3px; }
#message-preview .mail-date { opacity:0.6; font-size:10px; }