Skip to content
Browse files

Date fiddeling

  • Loading branch information...
1 parent bf5f151 commit 4a0e4c86f8a109b4c48e156c40255b26dd1ba117 @stefancrain stefancrain committed Jan 24, 2013
View
2 civicrm/custom/php/CRM/IMAP/AJAX.php
@@ -380,7 +380,7 @@ public static function cleanDate($date_string, $type){
return date("M d, Y", strtotime($date_string_short));
}else{
if ( (date("d", strtotime($date_string_short)) - date("d")) < 0 ){
- return date("M d h:i A", strtotime($date_string_short));
+ return date("M d @ h:i A", strtotime($date_string_short));
}else{
return 'Today @ '.date("h:i A", strtotime($date_string_short));
}
View
4 modules/nyss_imapper/nyss_imapper.css
@@ -47,11 +47,11 @@
.imapperbox .full h1 small{ color:#999; font-size: 20px;}
.imapperbox .full .list_header{ font-weight: bold;}
.imapperbox .full .checkboxieout{ left:5px; }
-/*.imapperbox .full .name,.imapperbox .full .email, .imapperbox .full .date { width:140px;}*/
.imapperbox .full .subject { width:330px;}
.name{min-width: 285px !important}
.forwarder,.Forwarder{ overflow: hidden;width: 100px;}
-.date{width: 110px !important; overflow: hidden;}
+.date{width: 100px !important; overflow: hidden; display: block; height: 32px;}
+.date span{float: left; margin: 8px 0;}
.checkbox_switch{ margin-left: 10px;}
#Activities .Actions{ width:155px !important;}
#Unmatched .Actions{ width:110px !important;}
View
4 modules/nyss_imapper/nyss_imapper.js
@@ -960,7 +960,7 @@ function buildMessageList() {
// messagesHtml += '<td class="email"></td>';
messagesHtml += '<td class="subject">'+short_subject(value.subject,40) +' '+icon+'</td>';
- messagesHtml += '<td class="date"><span data="'+value.date_long+'">'+value.date +'<span></td>';
+ messagesHtml += '<td class="date"><span data="'+value.date_long+'">'+value.date +'</span></td>';
// check for direct messages & not empty forwarded messages
if((value.status == 'direct' ) && (value.forwarder_email != '')){
@@ -1009,7 +1009,7 @@ function buildActivitiesList() {
messagesHtml += '<span class="emailbubble marginL10">'+short_subject(value.fromEmail,14)+'</span>';
messagesHtml +='</td>';
messagesHtml += '<td class="subject">'+short_subject(value.subject,50) +'</td>';
- messagesHtml += '<td class="date"><span data="'+value.date_long+'">'+value.date +'<span></td>';
+ messagesHtml += '<td class="date"><span data="'+value.date_long+'">'+value.date +'</span></td>';
messagesHtml += '<td class="forwarder">'+short_subject(value.forwarder,14)+'</td>';
messagesHtml += '<td class="Actions"> <span class="edit_match"><a href="#">Edit</a></span> | <span class="add_tag"><a href="#">Tag</a></span> | <span class="clear_activity"><a href="#">Clear</a></span> | <span class="delete"><a href="#">Delete</a></span></td> </tr>';
}

0 comments on commit 4a0e4c8

Please sign in to comment.
Something went wrong with that request. Please try again.