[Vtigercrm-commits] [vtiger-commits] r11044 - in /vtigercrm/branches/5.0.3: include/language/en_us.lang.php modules/Emails/language/en_us.lang.php modules/Webmails/MailParse.php modules/Webmails/body.php themes/bluelagoon/images/box_T.gif
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Fri May 25 16:45:35 EDT 2007
Author: richie
Date: Fri May 25 14:45:22 2007
New Revision: 11044
Log:
the date string trimmed, image for popup chat replaced and scroll in fullview cleared -Sri
Modified:
vtigercrm/branches/5.0.3/include/language/en_us.lang.php
vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php
vtigercrm/branches/5.0.3/modules/Webmails/body.php
vtigercrm/branches/5.0.3/themes/bluelagoon/images/box_T.gif
Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Fri May 25 14:45:22 2007
@@ -379,7 +379,7 @@
'Contacts' => 'Contacts',
'Potentials' => 'Potentials',
'Products' => 'Products',
-'Emails' => 'Emails',
+'Emails' => 'Email',
'HelpDesk' => 'Trouble Tickets',
'Activities' => 'Activities',
'Events' => 'Events',
Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Fri May 25 14:45:22 2007
@@ -147,7 +147,7 @@
'LBL_MAILSELECT_INFO2'=>'Select the Email ID types to which,the email should be sent',
'LBL_MULTIPLE'=>'Multiple',
'LBL_COMPOSE_EMAIL'=>'Compose E-Mail',
-'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Email Client',
+'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Webmail Client',
//Added for 5.0.3
'TITLE_VTIGERCRM_MAIL'=>'vtigerCRM Mail',
@@ -162,7 +162,7 @@
'LBL_BCC_EMAIL_ERROR'=>'Your bcc mailid is not proper',
'LBL_NO_RCPTS_EMAIL_ERROR'=>'No recepients specified',
'LBL_CONF_MAILSERVER_ERROR'=>'Please configure your outgoing mailserver under Settings ---> Outgoing Server link',
-'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Email Client',
+'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Webmail Client',
'LBL_MAILSELECT_INFO3'=>'You don\'t have permission to view email id(s) of the selected Record(s).',
'LBL_NO_RECORDS' => 'No Records in this folder',
//Added for script alerts
Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Fri May 25 14:45:22 2007
@@ -101,13 +101,13 @@
if ($mails[$start_message]->deleted)
{
$listview_entries[$num][] = '<td nowrap align="left" style="cursor:pointer;" id="deleted_subject_'.$num.'" onclick="load_webmail(\''.$num.'\');"><s><a href="javascript:;" >'.substr($mails[$start_message]->subject,0,40).'</a></s></td>';
- $listview_entries[$num][] = '<td nowrap align="left" style="cursor:pointer;" onClick="load_webmail(\''.$num.'\');" nowrap id="deleted_date_'.$num.'"><s>'.substr($mails[$start_message]->date,0,30).'</s></td>';
+ $listview_entries[$num][] = '<td nowrap align="left" style="cursor:pointer;" onClick="load_webmail(\''.$num.'\');" nowrap id="deleted_date_'.$num.'"><s>'.substr($mails[$start_message]->date,0,25).'</s></td>';
$listview_entries[$num][] = '<td nowrap align="left" id="deleted_from_'.$num.'" style="cursor:pointer;" onClick="load_webmail(\''.$num.'\');"><s>'.substr($from,0,20).'</s></td>';
}
elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent)
{
$listview_entries[$num][] = '<td nowrap align="left" onclick="load_webmail(\''.$num.'\');" style="cursor:pointer;" ><a href="javascript:;" id="ndeleted_subject_'.$num.'"><font id="fnt_subject_'.$num.'" color="green">'.substr($mails[$start_message]->subject,0,40).'</font></a></td>';
- $listview_entries[$num][] = '<td nowrap align="left" nowrap id="ndeleted_date_'.$num.'" style="cursor:pointer;" onClick="load_webmail(\''.$num.'\');" ><font id="fnt_date_'.$num.'" color="green">'.substr($mails[$start_message]->date,0,30).' </font></td>';
+ $listview_entries[$num][] = '<td nowrap align="left" nowrap id="ndeleted_date_'.$num.'" style="cursor:pointer;" onClick="load_webmail(\''.$num.'\');" ><font id="fnt_date_'.$num.'" color="green">'.substr($mails[$start_message]->date,0,25).' </font></td>';
$listview_entries[$num][] = '<td nowrap align="left" id="ndeleted_from_'.$num.'"><font id="fnt_from_'.$num.'" style="cursor:pointer;" onClick="load_webmail(\''.$num.'\');" >'.substr($from,0,20).'</font></td>';
}
else
@@ -134,7 +134,7 @@
//Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Ends
$listview_entries[$num][] = '<td nowrap align="left" onclick="load_webmail(\''.$num.'\');" style="cursor:pointer;" ><a href="javascript:;" id="ndeleted_subject_'.$num.'">'.substr($mails[$start_message]->subject,0,40).'</a></td>';
- $listview_entries[$num][] = '<td npwrap align="left" nowrap id="ndeleted_date_'.$num.'" style="cursor:pointer;" onClick="load_webmail(\''.$num.'\');" >'.substr($mails[$start_message]->date,0,30).'</td>';
+ $listview_entries[$num][] = '<td npwrap align="left" nowrap id="ndeleted_date_'.$num.'" style="cursor:pointer;" onClick="load_webmail(\''.$num.'\');" >'.substr($mails[$start_message]->date,0,25).'</td>';
$listview_entries[$num][] = '<td nowrap align="left" id="ndeleted_from_'.$num.'" style="cursor:pointer;" onClick="load_webmail(\''.$num.'\');" >'.substr($from,0,20).'</td>';
}
Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Fri May 25 14:45:22 2007
@@ -60,7 +60,7 @@
<tr><td width="100%" align="left"> <b><?php echo $mod_strings['LBL_CC'];?></b><?php echo $cc;?></td></tr>
<tr><td align="left" width="100%"> <b><?php echo $mod_strings['LBL_SUBJECT'];?></b><?php echo $subject;?></td></tr>
- <tr><td align="left" width="100%"> <b><?php echo $mod_strings['LBL_DATE'];?></b><?php echo $date;?>
+ <tr><td align="left" width="100%"> <b><?php echo $mod_strings['LBL_DATE'];?></b><?php echo substr($date,0,25);?>
<?php if(!$_REQUEST['fullview']) {?>
<span style="float:right" colspan="2"><a href="javascript:;" onclick="OpenComposer('<?php echo $mailid;?>','full_view')"> Full Email View</a></span>
<?php } ?>
@@ -103,7 +103,7 @@
if(!$_REQUEST['fullview'])
echo '<div style="overflow:auto;height:400px;padding:5;">';
else
- echo '<div style="overflow:auto;height:460px;padding:5;">';
+ echo '<div style="padding:5;">';
echo $content['body'];
//test added by Richie
Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/images/box_T.gif
==============================================================================
Binary files - no diff available.
More information about the vtigercrm-commits
mailing list