split private messages into two modules - "message" is just for message lists, "mail" is for reading and writing conversations. This is so we can Comanchify it cleanly.

This commit is contained in:
friendica
2013-12-21 23:47:44 -08:00
parent aa312f72bf
commit d32bbaf599
15 changed files with 133 additions and 427 deletions

100
view/css/mod_mail.css Normal file
View File

@@ -0,0 +1,100 @@
/* message */
#mail-list-wrapper {
border-top: 1px solid #ccc;
padding: 5px 5px 5px 5px;
}
span.mail-list {
float: left;
width: 20%;
}
img.mail-list-sender-photo {
height: 24px;
width: 24px;
float: left;
margin-right: 30px;
}
.mail-list-remove {
width: 5% !important;
}
/* message/new */
#prvmail-to-label,
#prvmail-subject-label,
#prvmail-expires-label,
#prvmail-message-label {
margin-bottom: 10px;
margin-top: 20px;
}
#prvmail-submit {
float: left;
margin-top: 10px;
margin-right: 30px;
}
#prvmail-upload-wrapper,
#prvmail-attach-wrapper,
#prvmail-link-wrapper,
#prvmail-expire-wrapper,
#prvmail-encrypt-wrapper,
#prvmail-rotator-wrapper {
float: left;
margin-top: 10px;
margin-right: 10px;
width: 24px;
cursor: pointer;
}
#prvmail-end {
clear: both;
}
/* message/id */
.mail-conv-outside-wrapper {
margin-top: 30px;
}
.mail-conv-sender,
.mail-conv-detail {
float: left;
}
.mail-conv-detail {
margin-left: 20px;
width: 500px;
}
.mail-conv-subject {
font-size: 1.4em;
margin: 10px 0;
}
.mail-conv-delete-wrapper {
float: right;
margin-right: 30px;
margin-top: 15px;
}
.mail-conv-delete-icon {
border: none;
}
.mail-conv-recall-wrapper {
float: right;
margin-right: 10px;
margin-top: 15px;
}
.mail-conv-outside-wrapper-end {
clear: both;
}
.mail-conv-break {
clear: both;
}

13
view/js/mod_mail.js Normal file
View File

@@ -0,0 +1,13 @@
$(document).ready(function() {
var a;
a = $("#recip").autocomplete({
serviceUrl: baseurl + '/acl',
minChars: 2,
width: 250,
id: 'recip-ac',
onSelect: function(value,data) {
$("#recip-complete").val(data);
},
});
});

3
view/pdl/mod_mail.pdl Normal file
View File

@@ -0,0 +1,3 @@
[region=aside]
[widget=vcard][/widget]
[/region]

View File

@@ -8,9 +8,9 @@
<div class="mail-conv-date">{{$mail.date}}</div>
<div class="mail-conv-subject">{{$mail.subject}}</div>
<div class="mail-conv-body">{{$mail.body}}</div>
<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
{{if $mail.can_recall}}
<div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="message/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
<div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
{{/if}}
<div class="mail-conv-outside-wrapper-end"></div>
</div>

View File

@@ -1,7 +1,7 @@
<div class="generic-content-wrapper" id="mail-list-wrapper">
<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
<span class="mail-list">{{$from_name}}</span>
<span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
<span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span>
<span class="mail-list" title="{{$date}}">{{$date}}</span>
<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
<div class="clear">&nbsp;</div>

View File

@@ -1,7 +1,7 @@
<h3>{{$header}}</h3>
<div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" >
<form id="prvmail-form" action="mail" method="post" >
{{$parent}}