harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timeago() works best with iso format. fix #118

Browse Source
This commit is contained in:
Mario Vavti 2015-11-03 11:19:22 +01:00
parent d13dae6b06
commit 43d8090182
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/widgets.php
View File

@ -642,7 +642,7 @@ function widget_conversations($arr) {
'subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'), 'subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
'delete' => t('Delete conversation'), 'delete' => t('Delete conversation'),
'body' => $rr['body'], 'body' => $rr['body'],
'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')), 'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
'seen' => $rr['seen'], 'seen' => $rr['seen'],
'selected' => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id'])) 'selected' => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id']))
); );

2
mod/mail.php
View File

@ -335,7 +335,7 @@ function mail_content(&$a) {
'recall' => t('Recall message'), 'recall' => t('Recall message'),
'can_recall' => (($channel['channel_hash'] == $message['from_xchan']) ? true : false), 'can_recall' => (($channel['channel_hash'] == $message['from_xchan']) ? true : false),
'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''), 'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''),
'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'), 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c'),
); );
$seen = $message['seen']; $seen = $message['seen'];

1
view/js/main.js
View File

@ -1156,7 +1156,6 @@ $(document).ready(function() {
numbers : aStr['t17'], numbers : aStr['t17'],
}; };
$(".autotime").timeago();
$("#toc").toc(); $("#toc").toc();
}); });

1
view/js/mod_mail.js
View File

@ -2,4 +2,5 @@ $(document).ready(function() {
$("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) { $("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) {
$("#recip-complete").val(data.xid); $("#recip-complete").val(data.xid);
}); });
$(".autotime").timeago()
}); });

2
view/tpl/prv_message.tpl
View File

@ -31,7 +31,7 @@
<div class="form-group"> <div class="form-group">
<label for="prvmail-text">{{$yourmessage}}</label> <label for="prvmail-text">{{$yourmessage}}</label>
<textarea class="form-control" id="prvmail-text" name="body"">{{$text}}</textarea> <textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea>
</div> </div>
<div id="prvmail-submit-wrapper" class="form-group"> <div id="prvmail-submit-wrapper" class="form-group">