diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/widgets.css | 1 | ||||
| -rw-r--r-- | view/js/mod_mail.js | 1 | ||||
| -rw-r--r-- | view/pdl/mod_mail.pdl | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rwxr-xr-x | view/tpl/mail_display.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/mail_head.tpl | 16 | ||||
| -rwxr-xr-x | view/tpl/mail_list.tpl | 13 | ||||
| -rwxr-xr-x | view/tpl/message_side.tpl | 11 |
8 files changed, 31 insertions, 20 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css index c1b80dabb..516e59e6f 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -122,3 +122,4 @@ li:hover .group-edit-icon { #tasklist-new-summary { width: 250px; } + diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js index 16e06e6f5..704d0a460 100644 --- a/view/js/mod_mail.js +++ b/view/js/mod_mail.js @@ -2,5 +2,4 @@ $(document).ready(function() { $("#recip").contact_autocomplete(baseurl + '/acl', '', false, function(data) { $("#recip-complete").val(data.xid); }); - }); diff --git a/view/pdl/mod_mail.pdl b/view/pdl/mod_mail.pdl index d8f50ad7a..67632619e 100644 --- a/view/pdl/mod_mail.pdl +++ b/view/pdl/mod_mail.pdl @@ -1,3 +1,4 @@ [region=aside] -[widget=vcard][/widget] +[widget=mailmenu][/widget] +[widget=conversations][/widget] [/region] diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f75808eb7..efb5b39ba 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1305,6 +1305,10 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { padding: 0; } +.widget .conv-participants { + color: $font_colour; +} + .notif-item a { color: #000; } diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 062710f1d..bb89c96ec 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,6 +1,8 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> + <a class="btn btn-xs btn-danger pull-right" href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> <h2>{{$prvmsg_header}}</h2> + </div> <div class="section-content-wrapper"> {{foreach $mails as $mail}} diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl index 7bc854fff..d52fa40e0 100755 --- a/view/tpl/mail_head.tpl +++ b/view/tpl/mail_head.tpl @@ -1,10 +1,8 @@ -<div class="generic-content-wrapper"> - <div class="section-title-wrapper"> - <h2>{{$header}}</h2> - </div> - <div class="section-content-wrapper"> - {{foreach $messages as $message}} - {{include file="mail_list.tpl"}} - {{/foreach}} - </div> +<div class="widget"> + <h3>{{$header}}</h3> + <ul class="nav nav-pills nav-stacked"> + {{foreach $messages as $message}} + {{include file="mail_list.tpl"}} + {{/foreach}} + </ul> </div> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index e3f8ef75c..ad042eb59 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,6 +1,7 @@ -<a href="{{$message.from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$message.from_photo}}" alt="{{$message.from_name}}" /></a> -<span class="mail-list">{{$message.from_name}}</span> -<span class="mail-list {{if $message.seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$message.id}}" class="mail-link">{{$message.subject}}</a></span> -<span class="mail-list" title="{{$message.date}}">{{$message.date}}</span> -<span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$message.id}}" onclick="return confirmDelete();" title="{{$message.delete}}" class="btn btn-default btn-sm" ><i class="icon-trash mail-icons drop-icons"></i></a></span> -<div class="clear"></div> +<li> + <a href="mail/{{$message.id}}" class="mail-link"> + <span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br> + <span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br> + <span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span> + </a> +</li> diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index 3e32eae14..954ada215 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,13 +1,18 @@ <div class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills nav-stacked"> - <li><a href="{{$check.url}}"{{if $check.sel}} class="checkmessage-selected"{{/if}}>{{$check.label}}</a></li> - <li><a href="{{$new.url}}"{{if $new.sel}} class="newmessage-selected"{{/if}}>{{$new.label}}</a></li> + <li><a href="{{$check.url}}"{{if $check.sel}} class="active"{{/if}}>{{$check.label}}</a></li> + {{* + <li><a href="{{$combined.url}}"{{if $combined.sel}} class="active"{{/if}}>{{$combined.label}}</a></li> + <li><a href="{{$inbox.url}}"{{if $inbox.sel}} class="active"{{/if}}>{{$inbox.label}}</a></li> + <li><a href="{{$outbox.url}}"{{if $outbox.sel}} class="active"{{/if}}>{{$outbox.label}}</a></li> + *}} + <li><a href="{{$new.url}}"{{if $new.sel}} class="active"{{/if}}>{{$new.label}}</a></li> </ul> {{if $tabs}} <ul class="nav nav-pills nav-stacked"> {{foreach $tabs as $t}} - <li><a href="{{$t.url}}"{{if $t.sel}} class="message-selected"{{/if}}>{{$t.label}}</a></li> + <li><a href="{{$t.url}}"{{if $t.sel}} class="active"{{/if}}>{{$t.label}}</a></li> {{/foreach}} </ul> {{/if}} |