diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 26 | ||||
| -rw-r--r-- | view/js/mod_mail.js | 7 | ||||
| -rw-r--r-- | view/tpl/channel.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/mail_conv.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/message_side.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/msg-header.tpl | 5 | ||||
| -rw-r--r-- | view/tpl/prv_message.tpl | 3 |
7 files changed, 16 insertions, 37 deletions
diff --git a/view/js/main.js b/view/js/main.js index 6c418b213..0897fbd21 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -537,7 +537,7 @@ function closeMenu(theID) { } function markRead(notifType) { - $.get('ping?f=&markRead='+notifType); + $.get('notifications?f=&markRead='+notifType); $('.' + notifType + '-button').fadeOut(function() { $("." + notifType + "-update").html('0'); $('#nav-' + notifType + '-menu').html(''); @@ -548,7 +548,7 @@ function markRead(notifType) { } function markItemRead(itemId) { - $.get('ping?f=&markItemRead='+itemId); + $.get('notifications?f=&markItemRead='+itemId); $('.unseen-wall-indicator-'+itemId).remove(); } @@ -1446,24 +1446,6 @@ function preview_post() { return true; } -function preview_mail() { - $("#mail-preview").val("1"); - $("#mail-preview-content").show(); - $.post( - "mail", - $("#prvmail-form").serialize(), - function(data) { - if(data.preview) { - $("#mail-preview-content").html(data.preview); - $("#mail-preview-content" + " a").click(function() { return false; }); - } - }, - "json" - ); - $("#mail-preview").val("0"); - return true; -} - function bin2hex(s) { // Converts the binary representation of data to hex // @@ -1817,7 +1799,7 @@ function sse_bs_notifications(e, replace, followup) { function sse_handleNotifications(obj, replace, followup) { - var primary_notifications = ['dm', 'home', 'intros', 'register', 'mail', 'notify', 'files']; + var primary_notifications = ['dm', 'home', 'intros', 'register', 'notify', 'files']; var secondary_notifications = ['network', 'forums', 'all_events', 'pubs']; var all_notifications = primary_notifications.concat(secondary_notifications); @@ -1951,7 +1933,7 @@ function sse_updateNotifications(type, mid) { } function sse_setNotificationsStatus() { - var primary_notifications = ['dm', 'home', 'intros', 'register', 'mail', 'notify', 'files']; + var primary_notifications = ['dm', 'home', 'intros', 'register', 'notify', 'files']; var secondary_notifications = ['network', 'forums', 'all_events', 'pubs']; var all_notifications = primary_notifications.concat(secondary_notifications); diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js deleted file mode 100644 index 917e5414c..000000000 --- a/view/js/mod_mail.js +++ /dev/null @@ -1,7 +0,0 @@ -$(document).ready(function() { - $("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) { - $("#recip-complete").val(data.xid); - }); - $('#prvmail-text').bbco_autocomplete('bbcode'); - $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); -}); diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 63e09ec05..0ff52831d 100644 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -37,10 +37,6 @@ <div class="channel-notifications-wrapper"> {{if !$channel.delegate}} <div class="channel-notification"> - <i class="fa fa-fw fa-envelope{{if $channel.mail != 0}} text-danger{{/if}}"></i> - {{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}} - </div> - <div class="channel-notification"> <i class="fa fa-fw fa-user{{if $channel.intros != 0}} text-danger{{/if}}"></i> {{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}} </div> diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index b0497fe99..adc7734ec 100644 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -24,9 +24,11 @@ <i class="fa fa-cog"></i> </button> <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}"> - {{if $mail.can_recall}} + {{** if $mail.can_recall}} <a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i> {{$mail.recall}}</a> - {{/if}} + {{/if **}} + <a class="dropdown-item" href="mail/{{$mail.id}}/download" id="mail-conv-download-icon-{{$mail.id}}"><i class="fa fa-fw fa-download"></i> {{$mail.download}}</a> + <div class="dropdown-divider"></div> <a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i> {{$mail.delete}}</a> {{if $mail.can_recall}} <div class="dropdown-divider"></div> diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index 2ac61bf76..a45d1d177 100644 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -4,6 +4,8 @@ <li class="nav-item"><a href="{{$combined.url}}" class="nav-link{{if $combined.sel}} active{{/if}}">{{$combined.label}}</a></li> <li class="nav-item"><a href="{{$inbox.url}}" class="nav-link{{if $inbox.sel}} active{{/if}}">{{$inbox.label}}</a></li> <li class="nav-item"><a href="{{$outbox.url}}" class="nav-link{{if $outbox.sel}} active{{/if}}">{{$outbox.label}}</a></li> +{{** <li class="nav-item"><a href="{{$new.url}}" class="nav-link{{if $new.sel}} active{{/if}}">{{$new.label}}</a></li> +**}} </ul> </div> diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index e8542b087..d49303453 100644 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -1,3 +1,4 @@ +{{** <script src="vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script> <script src="vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js"></script> <script src="vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js"></script> @@ -73,9 +74,9 @@ function addmailtext(data) { var currentText = $("#prvmail-text").val(); $("#prvmail-text").val(currentText + data); - } + } </script> - +**}} diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index b8c81539d..ea7de0b4c 100644 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -1,3 +1,5 @@ +{{** + {{if $new}} <div class="generic-content-wrapper"> <div class="section-title-wrapper"> @@ -105,3 +107,4 @@ </div> </div> {{/if}} +**}} |