tobias/friendica
1
0
Fork 0
Code Pull requests Activity

some more work on private messages mail_display.tpl & mail_conv.tpl

Browse source
This commit is contained in:
rabuzarus 2016-05-12 02:49:55 +02:00
commit 12cf9c2914
6 changed files with 112 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

36
css/style.css
View file

@ -1701,6 +1701,42 @@ ul.viewcontact_wrapper > li {
}
/* private mail */
.mail-thread {
max-height: calc(100vh - 200px);
}
#mail-conversation {
overflow-y: auto;
max-height: calc(100vh - 400px);
max-height: auto;
/*height: 500px;*/
margin-bottom: 0px;
}
#mail-conversation.can-reply {
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
}
.mail-conv-wrapper .media .contact-photo-wrapper {
height: 48px;
width: 48px;
}
.mail-thread #prvmail-to-label,
.mail-thread #prvmail-subject-label {
display: none;
}
.mail-thread #prvmail-message-label > label {
display:none;
}
.mail-thread #prvmail-message-label textarea {
border-top: none;
margin-top: -10px;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
max-height: 120px;
}
.mail-conv-wrapper {
padding: 15px;
border-bottom: 1px solid rgba(238, 238, 238, 0.95)
}
#prvmail-end {
clear:both;
}

21
templates/mail_conv.tpl Normal file
View file

@ -0,0 +1,21 @@
<div id="mail_conv-{{$mail.id}}" class="mail-conv-wrapper message-{{$mail.id}}">
<div class="media">
<div class="pull-left contact-photo-wrapper">
<a href="{{$mail.from_url}}">
<img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" />
</a>
</div>
<div class="media-body">
<div class="text-muted time mail-ago pull-right" title="{{$mail.date}}" data-toggle="tooltip">{{$mail.date}}</div>
<div class="mail-conv-delete-end"></div>
<h4 class="media-heading"><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></h4>
<div class="mail-body">
{{$mail.body}}
</div>
{{*<a href="message/dropconv/{{$mail.id}}" onclick="return confirmDelete();" title="{{$delete}}" class="close pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >&times;</a> *}}
</div>
</div>
<div class="mail-conv-wrapper-end"></div>
</div>

19
templates/mail_display.tpl Normal file
View file

@ -0,0 +1,19 @@
<div id="mail-thread-{{$thread_id}}" class="mail-thread">
{{$brauchenwas}}
<h4 class="headding">{{$thread_subject}}</h3>
<div id="mail-conversation" class="panel panel-default {{if $canreply }}can-reply{{/if}}">
{{foreach $mails as $mail}}
{{include file="mail_conv.tpl"}}
{{/foreach}}
</div>
<div id="mail-reply">
{{if $canreply}}
{{include file="prv_message.tpl"}}
{{else}}
{{$unknown_text}}
{{/if}}
</div>
</div>

30
templates/mail_list.tpl Normal file
View file

@ -0,0 +1,30 @@
<div class="mail-list-outside-wrapper">
<div class="media">
<div class="media-left">
<a href="{{$from_url}}">
<img class="media-object" src="{{$from_photo}}" alt="{{$from_name}}" style="min-width:80px; min-height:80px; width:80px; height:80px; max-width:80px; max-height:80px;" />
</a>
</div>
<div class="media-body">
<div class="text-muted time ago pull-right" title="{{$date}}">{{$ago}}</div>
<h5 class="media-heading">{{$from_name}}</h5>
<a href="message/{{$id}}">
<h4>{{$subject}}</h4>
</a>
<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="close pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >&times;</a>
<p class="text-muted">{{$count}}</p>
</div>
</div>
</div>
<div class="mail-list-delete-end"></div>
<div class="mail-list-outside-wrapper-end"></div>

5
templates/msg-header.tpl
View file

@ -55,6 +55,11 @@ else
$("#comment-edit-text-input").bbco_autocomplete('bbcode');
{{/if}}
//var objDiv = document.getElementById("mail-conversation");
//objDiv.scrollTop = objDiv.scrollHeight;
$('#mail-conversation').perfectScrollbar();
$('#mail-conversation').scrollTop($('#mail-conversation')[0].scrollHeight);
});
</script>

2
templates/prv_message.tpl
View file

@ -31,7 +31,7 @@
<textarea rows="8" cols="72" class="prvmail-text form-control" id="comment-edit-text-input" name="body" tabindex="12">{{$text}}</textarea>
</div>
<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills pull-left">
<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
<li>
<a class="icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
<i class="fa fa-picture-o"></i>