[Vtigercrm-commits] [vtiger-commits] r10937 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Webmails/ themes/alphagrey/ themes/bluelagoon/ themes/images/ themes/woodspice/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Tue May 15 12:24:34 EDT 2007
Author: richie
Date: Tue May 15 10:24:00 2007
New Revision: 10937
Log:
* Integrated the ui changes for webmails
Added:
vtigercrm/branches/5.0.3/themes/alphagrey/webmail.css
vtigercrm/branches/5.0.3/themes/bluelagoon/webmail.css
vtigercrm/branches/5.0.3/themes/images/check_mail.gif (with props)
vtigercrm/branches/5.0.3/themes/images/compose.gif (with props)
vtigercrm/branches/5.0.3/themes/images/folder.gif (with props)
vtigercrm/branches/5.0.3/themes/images/folder1.gif (with props)
vtigercrm/branches/5.0.3/themes/images/folder2_.gif (with props)
vtigercrm/branches/5.0.3/themes/images/folder_.gif (with props)
vtigercrm/branches/5.0.3/themes/images/mail.gif (with props)
vtigercrm/branches/5.0.3/themes/images/mailsettings.gif (with props)
vtigercrm/branches/5.0.3/themes/images/mymail.gif (with props)
vtigercrm/branches/5.0.3/themes/images/newmail.gif (with props)
vtigercrm/branches/5.0.3/themes/images/opened_folder.gif (with props)
vtigercrm/branches/5.0.3/themes/images/openmail.gif (with props)
vtigercrm/branches/5.0.3/themes/images/sentmail.gif (with props)
vtigercrm/branches/5.0.3/themes/images/webmail_trash.gif (with props)
vtigercrm/branches/5.0.3/themes/woodspice/webmail.css
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/ListViewAjax.tpl
vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl
vtigercrm/branches/5.0.3/modules/Webmails/ListView.php
vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php
vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php
vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js
vtigercrm/branches/5.0.3/modules/Webmails/body.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListViewAjax.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListViewAjax.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListViewAjax.tpl Tue May 15 10:24:00 2007
@@ -15,9 +15,9 @@
</div>
<div id="show_msg" class="layerPopup" align="center" style="padding: 5px;font-weight:bold;width: 400px;display:none;z-index:10000"></div>
<form name="massdelete" method="post">
- <table class="rssTable" cellspacing="0" cellpadding="0" border="0" width="100%" id="message_table">
+ <table class="MatrixLayer1" cellspacing="1" cellpadding="3" border="0" width="100%" id="message_table">
<tr>
- <th><input type="checkbox" name="select_all" value="checkbox" onclick="toggleSelect(this.checked,'selected_id');"/></th>
+ <th class="tableHeadBg"><input type="checkbox" name="select_all" value="checkbox" onclick="toggleSelect(this.checked,'selected_id');"/></th>
{foreach item=element from=$LISTHEADER}
{$element}
{/foreach}
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Tue May 15 10:24:00 2007
@@ -11,13 +11,14 @@
-->*}
<!-- USER SETTINGS PAGE STARTS HERE -->
{include file='Buttons_List1.tpl'}
+<link rel="stylesheet" type="text/css" href="themes/{$THEME}/webmail.css">
<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
<tr>
<td valign=top align=right><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
<td class="showPanelBg" valign="top" width="95%" style="padding-left:20px; ">
<br>
<!-- module Select Table -->
- <table class="mailClient" width="100%" border="0" cellspacing="0" cellpadding="0">
+ <table class="settingsUI" width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="mailClientBg" width="7"> </td>
<td class="mailClientBg">
@@ -28,11 +29,11 @@
<table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr>
<td width="10%">
- <img src="{$IMAGE_PATH}check_mail.gif" align="absmiddle" />
+ <img src="themes/images/check_mail.gif" align="absmiddle" />
<a href="javascript:;" class="webMnu" onclick="check_for_new_mail('{$MAILBOX}');" >{$MOD.LBL_CHK_MAIL}</a>
</td>
<td width="10%">
- <img src="{$IMAGE_PATH}compose.gif" align="absmiddle" />
+ <img src="themes/images/compose.gif" align="absmiddle" />
<a href="javascript:;" onclick="OpenComposer('','create');" class="webMnu">{$MOD.LBL_COMPOSE}</a>
</td>
<td width="20%" nowrap>
@@ -53,8 +54,8 @@
<td width="80%" class="big mailSubHeader"><div id="nav"><span style="float:left">{$ACCOUNT} > {$MAILBOX}</span> <span style="float:right">{$NAVIGATION}</span></div></td>
</tr>
<tr>
- <td rowspan="6" class="hdrNameBg">
- <img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" /> <span style="cursor:pointer;"><b class="txtGreen">{$MOD.LBL_MY_MAILS}</b> <span id="folderOpts" style="position:absolute;display:none">{$MOD.ADD_FOLDER}</span></span>
+ <td rowspan="4" class="MatrixLayer1">
+ <img src="themes/images/mymail.gif" align="absmiddle" /> <span style="cursor:pointer;"><b class="txtGreen">{$MOD.LBL_MY_MAILS}</b> <span id="folderOpts" style="position:absolute;display:none">{$MOD.ADD_FOLDER}</span></span>
<div id="box_list">
<ul style="list-style-type:none;">
@@ -65,33 +66,33 @@
{/foreach}
</ul></div> <br />
- <img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" /> <b class="txtGreen">{$MOD.LBL_SENT_MAILS}</b>
+ <img src="themes/images/sentmail.gif" align="absmiddle" /> <b class="txtGreen">{$MOD.LBL_SENT_MAILS}</b>
<ul style="list-style-type:none;">
- <li class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'">
- <img src="{$IMAGE_PATH}emailOutFolder.gif" align="absmiddle" />
- <a href="index.php?module=Emails&action=ListView&parenttab=My Home Page&folderid=1&parenttab=My Home Page" class="webMnu">{$MOD.LBL_ALLMAILS}</a> <b></b>
- </li>
- <li class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'">
- <img src="{$IMAGE_PATH}emailOutFolder.gif" align="absmiddle" />
+ <li >
+ <img src="themes/images/opened_folder.gif" align="absmiddle" />
+ <a class="link" href="index.php?module=Emails&action=ListView&parenttab=My Home Page&folderid=1&parenttab=My Home Page" class="webMnu">{$MOD.LBL_ALLMAILS}</a> <b></b>
+ </li>
+ <li >
+ <img src="themes/images/opened_folder.gif" align="absmiddle" />
<a href="index.php?module=Emails&action=ListView&folderid=2&parenttab=My Home Page" class="webMnu">{$MOD.LBL_TO_CONTACTS}</a> <b></b>
</li>
- <li class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'">
- <img src="{$IMAGE_PATH}emailOutFolder.gif" align="absmiddle" />
+ <li >
+ <img src="themes/images/opened_folder.gif" align="absmiddle" />
<a href="index.php?module=Emails&action=ListView&folderid=3&parenttab=My Home Page" class="webMnu">{$MOD.LBL_TO_ACCOUNTS}</a>
</li>
- <li class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'">
- <img src="{$IMAGE_PATH}emailOutFolder.gif" align="absmiddle" />
+ <li >
+ <img src="themes/images/opened_folder.gif" align="absmiddle" />
<a href="index.php?module=Emails&action=ListView&folderid=4&parenttab=My Home Page" class="webMnu">{$MOD.LBL_TO_LEADS}</a>
</li>
- <li class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'">
- <img src="{$IMAGE_PATH}emailOutFolder.gif" align="absmiddle" />
+ <li >
+ <img src="themes/images/opened_folder.gif" align="absmiddle" />
<a href="index.php?module=Emails&action=ListView&folderid=5&parenttab=My Home Page" class="webMnu">{$MOD.LBL_TO_USERS}</a>
</li>
</ul><br />
- <img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" /> <b class="txtGreen">{$MOD.LBL_TRASH}</b>
+ <img src="themes/images/webmail_trash.gif" align="absmiddle" /> <b class="txtGreen">{$MOD.LBL_TRASH}</b>
<ul style="list-style-type:none;">
- <li class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'">
- <img src="{$IMAGE_PATH}webmail_trash.gif" align="absmiddle" />
+ <li>
+ <img src="themes/images/folder.gif" align="absmiddle" />
<a href="#" class="webMnu">{$MOD.LBL_JUNK_MAILS}</a> <b></b>
</li>
</ul>
@@ -130,9 +131,9 @@
<div id="show_msg" class="layerPopup" align="center" style="padding: 5px;font-weight:bold;width: 400px;display:none;z-index:10000"></div>
<!-- Table to display the mails list - Starts -->
<form name="massdelete" method="post">
- <table class="rssTable" cellspacing="0" cellpadding="0" border="0" width="100%" id="message_table">
- <tr>
- <th><input type="checkbox" name="select_all" value="checkbox" onclick="toggleSelect(this.checked,'selected_id');"/></th>
+ <table class="MatrixLayer1" cellspacing="1" cellpadding="3" border="0" width="100%" id="message_table">
+ <tr>
+ <th class='tableHeadBg'><input type="checkbox" name="select_all" value="checkbox" onclick="toggleSelect(this.checked,'selected_id');"/></th>
{foreach item=element from=$LISTHEADER}
{$element}
{/foreach}
@@ -159,7 +160,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="75%" nowrap>
- <span id="qualify_button"><input type="button" name="Qualify2" value=" {$MOD.LBL_QUALIFY_BUTTON} " class="crmbutton small create" /></span>
+ <span id="qualify_button"><input type="button" name="Qualify2" value=" {$MOD.LBL_QUALIFY_BUTTON} " class="buttonok" /></span>
<span id="reply_button"><input type="button" name="reply" value=" {$MOD.LBL_REPLY_TO_SENDER} " class="crmbutton small edit" /></span>
<span id="reply_button_all"><input type="button" name="reply" value=" {$MOD.LBL_REPLY_ALL} " class="crmbutton small edit" /></span>
<span id="forward_button"><input type="button" name="forward" value=" {$MOD.LBL_FORWARD_BUTTON} " class="crmbutton small edit" /></span>
@@ -173,14 +174,15 @@
</td>
</tr>
<tr style="visibility:hidden" class="previewWindow">
- <td height="300" bgcolor="#FFFFFF" valign="top" style="padding-top:10px;">
+ <td height="300" bgcolor="#FFFFFF" valign="top">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
</table>
<!-- Table to display the Header details (From, To, Subject and date) - Ends -->
- <div>
+ <div class="MatrixLayer2">
<span id="body_area" style="width:95%">
- <iframe id="email_description" width="100%" height="350" frameBorder="0"></iframe>
+ <iframe id="email_description" width="100%" height="500" scrolling="no" frameBorder="0"></iframe>
</span>
+ </div>
</td>
</tr>
</table>
Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue May 15 10:24:00 2007
@@ -176,7 +176,7 @@
var command;
var id;
var move_mail,change_box,mvmbox;
-
+var theme = "<?php echo $theme;?>";
addOnloadEvent(function() {
window.setTimeout("periodic_event()",box_refresh);
}
@@ -300,7 +300,7 @@
echo "</script>";
$search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM");
-$listview_header = array("<th width='10%'>".$mod_strings['LBL_INFO']."</th>","<th width='45%'>".$mod_strings['LBL_LIST_SUBJECT']."</th>","<th width='25%'>".$mod_strings['LABEL_DATE']."</th>","<th width='10%'>".$mod_strings['LABEL_FROM']."</th>","<th>".$mod_strings['LBL_DEL']."</th>");
+$listview_header = array("<th class='tableHeadBg' width='10%'>".$mod_strings['LBL_INFO']."</th>","<th class='tableHeadBg' width='45%'>".$mod_strings['LBL_LIST_SUBJECT']."</th>","<th class='tableHeadBg' width='25%'>".$mod_strings['LABEL_DATE']."</th>","<th class='tableHeadBg' width='10%'>".$mod_strings['LABEL_FROM']."</th>","<th class='tableHeadBg'>".$mod_strings['LBL_DEL']."</th>");
$listview_entries = array();
$displayed_msgs=0;
@@ -376,10 +376,10 @@
$tmpval = preg_replace(array("/\{.*?\}/i"),array(""),$val->name);
if(preg_match("/trash/i",$tmpval))
$img = "webmail_trash.gif";
- elseif(preg_match("/sent/i",$tmpval))
- $img = "emailOutFolder.gif";
+ elseif($_REQUEST["mailbox"] == $tmpval)
+ $img = "opened_folder.gif";
else
- $img = "emailInFolder.gif";
+ $img = "folder.gif";
$i++;
@@ -395,7 +395,7 @@
$_SESSION["mailboxes"][$tmpval] = $unread_msgs;
if($numEmails==0) {$num=$numEmails;} else {$num=($numEmails-1);}
- $folders .= '<li class="tabUnSelected" style="padding-left:0px;"><img src="'.$image_path.'/'.$img.'"align="absmiddle" /> <a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a> <span id="'.$tmpval.'_count" style="font-weight:bold">';
+ $folders .= '<li class="tabUnSelected" style="padding-left:0px;"><img src="themes/images/'.$img.'"align="absmiddle" /> <a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a> <span id="'.$tmpval.'_count" style="font-weight:bold">';
if($unread_msgs > 0)
$folders .= '(<span id="'.$tmpval.'_unread">'.$unread_msgs.'</span>)</span> <span id="remove_'.$tmpval.'" style="position:relative;display:none">Remove</span></li>';
@@ -405,7 +405,7 @@
if($box->messages==0) {$num=$box->messages;} else {$num=($box->messages-1);}
$boxes .= '<option value="'.$tmpval.'">'.$tmpval;
- $folders .= '<li class="lvtColData" onmouseover="this.className=\'lvtColDataHover\'" onmouseout="this.className=\'lvtColData\'"><img src="'.$image_path.'/'.$img.'" align="absmiddle" /> <a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a> <span id="'.$tmpval.'_count" style="font-weight:bold">';
+ $folders .= '<li ><img src="themes/images/'.$img.'" align="absmiddle" /> <a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a> <span id="'.$tmpval.'_count" style="font-weight:bold">';
if($box->unseen > 0)
$folders .= '(<span id="'.$tmpval.'_unread">'.$box->unseen.'</span>)</span></li>';
}
@@ -435,5 +435,6 @@
$smarty->assign("ACCOUNT", $MailBox->display_name);
$smarty->assign("BOXLIST",$folders);
$smarty->assign("DEGRADED_SERVICE",$degraded_service);
+$smarty->assign("THEME",$theme);
$smarty->display("Webmails.tpl");
?>
Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php Tue May 15 10:24:00 2007
@@ -81,14 +81,10 @@
if($start != 1){
$navigationOutput = "<a href='javascript:;' onClick=\"cal_navigation('".$mailbox."',1);\" ><img src='modules/Webmails/images/start.gif' border='0'></a> ";
$navigationOutput .= "<a href='javascript:;' onClick=\"cal_navigation('".$mailbox."',".($start-1).");\" ><img src='modules/Webmails/images/previous.gif' border='0'></a> ";
- //$navigationOutput = "<a href='index.php?module=Webmails&action=index&start=1&mailbox=".$mailbox."'><img src='modules/Webmails/images/start.gif' border='0'></a> ";
- //$navigationOutput .= "<a href='index.php?module=Webmails&action=index&start=".($start-1)."&mailbox=".$mailbox."'><img src='modules/Webmails/images/previous.gif' border='0'></a> ";
}
if($start <= ($numPages-1)){
$navigationOutput .= "<a href='javascript:;' onClick=\"cal_navigation('".$mailbox."',".($start+1).");\" ><img src='modules/Webmails/images/next.gif' border='0'></a> ";
$navigationOutput .= "<a href='javascript:;' onClick=\"cal_navigation('".$mailbox."',".$numPages.");\"><img src='modules/Webmails/images/end.gif' border='0'></a> ";
-// $navigationOutput .= "<a href='index.php?module=Webmails&action=index&start=".($start+1)."&mailbox=".$mailbox."'><img src='modules/Webmails/images/next.gif' border='0'></a> ";
-// $navigationOutput .= "<a href='index.php?module=Webmails&action=index&start=".$numPages."&mailbox=".$mailbox."'><img src='modules/Webmails/images/end.gif' border='0'></a>";
}
}
}
@@ -119,7 +115,7 @@
}
}
$search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM");
-$listview_header = array("<th width='10%'>".$mod_strings['LBL_INFO']."</th>","<th width='45%'>".$mod_strings['LBL_LIST_SUBJECT']."</th>","<th width='25%'>".$mod_strings['LABEL_DATE']."</th>","<th width='10%'>".$mod_strings['LABEL_FROM']."</th>","<th>".$mod_strings['LBL_DEL']."</th>");
+$listview_header = array("<th class='tableHeadBg' width='10%'>".$mod_strings['LBL_INFO']."</th>","<th class='tableHeadBg' width='45%'>".$mod_strings['LBL_LIST_SUBJECT']."</th>","<th class='tableHeadBg' width='25%'>".$mod_strings['LABEL_DATE']."</th>","<th class='tableHeadBg' width='10%'>".$mod_strings['LABEL_FROM']."</th>","<th class='tableHeadBg' >".$mod_strings['LBL_DEL']."</th>");
$listview_entries = array();
$displayed_msgs=0;
@@ -195,10 +191,10 @@
$tmpval = preg_replace(array("/\{.*?\}/i"),array(""),$val->name);
if(preg_match("/trash/i",$tmpval))
$img = "webmail_trash.gif";
- elseif(preg_match("/sent/i",$tmpval))
- $img = "emailOutFolder.gif";
+ elseif($_REQUEST["mailbox"] == $tmpval)
+ $img = "opened_folder.gif";
else
- $img = "emailInFolder.gif";
+ $img = "folder.gif";
$i++;
@@ -212,7 +208,7 @@
$_SESSION["mailboxes"][$tmpval] = $new_msgs;
if($numEmails==0) {$num=$numEmails;} else {$num=($numEmails-1);}
- $folders .= '<li class="tabUnSelected" style="padding-left:0px;"><img src="'.$_SESSION["folder_image_path"].'/'.$img.'"align="absmiddle" /> <a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a> <span id="'.$tmpval.'_count" style="font-weight:bold">';
+ $folders .= '<li class="tabUnSelected" style="padding-left:0px;"><img src="themes/images/'.$img.'" align="absmiddle" /> <a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a> <span id="'.$tmpval.'_count" style="font-weight:bold">';
if($unread_msgs > 0)
$folders .= '(<span id="'.$tmpval.'_unread">'.$unread_msgs.'</span>)</span> <span id="remove_'.$tmpval.'" style="position:relative;display:none">Remove</span></li>';
@@ -222,7 +218,7 @@
if($box->messages==0) {$num=$box->messages;} else {$num=($box->messages-1);}
$boxes .= '<option value="'.$tmpval.'">'.$tmpval;
- $folders .= '<li class="lvtColData" onmouseover="this.className=\'lvtColDataHover\'" onmouseout="this.className=\'lvtColData\'"><img src="'.$_SESSION["folder_image_path"].'/'.$img.'" align="absmiddle" /> <a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a> <span id="'.$tmpval.'_count" style="font-weight:bold">';
+ $folders .= '<li ><img src="themes/images/'.$img.'" align="absmiddle" /> <a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a> <span id="'.$tmpval.'_count" style="font-weight:bold">';
if($box->unseen > 0)
$folders .= '(<span id="'.$tmpval.'_unread">'.$box->unseen.'</span>)</span></li>';
}
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 Tue May 15 10:24:00 2007
@@ -33,21 +33,21 @@
$displayed_msgs++;
if ($mails[$start_message]->deleted && !$show_hidden)
{
- $flags = "<tr id='row_".$num."' class='mailSelected' style='display:none'><td width='2px'><input type='checkbox' class='msg_check'></td><td colspan='1'>";
+ $flags = "<tr id='row_".$num."' class='mailSelected' style='display:none' class=\"lvtColData\" bgcolor='#ffffff'><td width='2px'><input type='checkbox' class='msg_check'></td><td colspan='1'>";
$displayed_msgs--;
}
elseif ($mails[$start_message]->deleted && $show_hidden)
{
- $flags = "<tr id='row_".$num."' class='mailSelected'><td width='2px'><input type='checkbox' class='msg_check'></td><td colspan='1'>";
+ $flags = "<tr id='row_".$num."' class='mailSelected' class=\"lvtColData\" bgcolor='#ffffff'><td width='2px'><input type='checkbox' class='msg_check'></td><td colspan='1'>";
}
elseif (!$mails[$start_message]->seen || $mails[$start_message]->recent)
{
- $flags = "<tr class='mailSelected' id='row_".$num."'><td width='2px'><input type='checkbox' name='selected_id' onclick='toggleSelectAll(this.name,\"select_all\")' value='$num' class='msg_check'></td><td colspan='1'>";
+ $flags = "<tr id='row_".$num."' class='mailSelected' class=\"lvtColData\" bgcolor='#ffffff'><td width='2px'><input type='checkbox' name='selected_id' onclick='toggleSelectAll(this.name,\"select_all\")' value='$num' class='msg_check'></td><td colspan='1'>";
$new_msgs++;
}
else
{
- $flags = "<tr id='row_".$num."'><td width='2px'><input type='checkbox' name='selected_id' value='$num' onclick='toggleSelectAll(this.name,\"select_all\")' class='msg_check'></td><td colspan='1'>";
+ $flags = "<tr id='row_".$num."' class=\"lvtColData\" bgcolor='#ffffff'><td width='2px'><input type='checkbox' name='selected_id' value='$num' onclick='toggleSelectAll(this.name,\"select_all\")' class='msg_check'></td><td colspan='1'>";
}
@@ -65,19 +65,19 @@
// read/unread/forwarded/replied
if(!$mails[$start_message]->seen || $mails[$start_message]->recent)
{
- $flags.='<span id="unread_img_'.$num.'"><a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-unread.png" border="0" width="10" height="14" title="Unread"></a></span> ';
+ $flags.='<span id="unread_img_'.$num.'"><a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="themes/images/newmail.gif" border="0" width="12" height="10" title="Unread"></a></span> ';
}
elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject))
{
- $flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-replied.png" border="0" width="10" height="12" title="Replied" ></a> ';
+ $flags.='<a href="javascript:;" onclick="OpenComposer(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-replied.png" border="0" width="10" height="12" title="Replied" ></a> ';
}
elseif (preg_match("/^fw:/i",$mails[$start_message]->subject))
{
- $flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-forward.png" border="0" width="10" height="13" title="Forward" ></a> ';
+ $flags.='<a href="javascript:;" onclick="OpenComposer(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-forward.png" border="0" width="10" height="13" title="Forward" ></a> ';
}
else
{
- $flags.='<a href="javascript:;" onclick="OpenCompose(\''.$num.'\',\'reply\');"><img src="modules/Webmails/images/stock_mail-read.png" border="0" width="10" height="11" title="Read" ></a> ';
+ $flags.='<a href="javascript:;" onclick="OpenComposer(\''.$num.'\',\'reply\');"><img src="themes/images/openmail.jpg" border="0" width="12" height="12" title="Read" ></a> ';
}
// Set IMAP flag
Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Tue May 15 10:24:00 2007
@@ -32,24 +32,10 @@
$("unread_img_"+mid).removeChild($("unread_img_"+mid).firstChild);
$("unread_img_"+mid).appendChild(Builder.node('a',
{href: 'javascript:;', onclick: 'OpenComposer('+mid+',"reply")'},
- [Builder.node('img',{src: 'modules/Webmails/images/stock_mail-read.png', border: '0', width: '10', height: '11'})]
+ [Builder.node('img',{src: 'themes/images/openmail.jpg', border: '0', width: '12', height: '12'})]
));
}
node.className='read_email';
- /*if(webmail2 == null){
- $("from_addy").innerHTML = " "+webmail[mid]["from"];
- $("to_addy").innerHTML = " "+webmail[mid]["to"];
- $("webmail_subject").innerHTML = " "+webmail[mid]["subject"];
- $("webmail_date").innerHTML = " "+webmail[mid]["date"];
- $("webmail_cc").innerHTML = " "+webmail[mid]["cc"];
- }
- else{
- $("from_addy").innerHTML = " "+webmail2[mid]["from"];
- $("to_addy").innerHTML = " "+webmail2[mid]["to"];
- $("webmail_subject").innerHTML = " "+webmail2[mid]["subject"];
- $("webmail_date").innerHTML = " "+webmail2[mid]["date"];
- $("webmail_cc").innerHTML = " "+webmail2[mid]["cc"];
- }*/
//Fix for webmails body display in IE - dartagnanlaf
/*
new Ajax.Request(
@@ -65,7 +51,7 @@
*/
oiframe = $("email_description");
- oiframe.src = 'index.php?module=Webmails&action=body&mailid='+mid+'&mailbox='+mailbox;
+ oiframe.src = 'index.php?module=Webmails&action=body&theme='+theme+'&mailid='+mid+'&mailbox='+mailbox;
//$("body_area").appendChild(Builder.node('iframe',{src: 'index.php?module=Webmails&action=body&mailid='+mid+'&mailbox='+mailbox, width: '100%', height: '210', frameborder: '0'},'You must enable iframes'));
tmp = document.getElementsByClassName("previewWindow");
@@ -76,22 +62,22 @@
}
$("delete_button").removeChild($("delete_button").firstChild);
- $("delete_button").appendChild(Builder.node('input',{type: 'button', name: 'Button', value: 'Delete', className: 'crmbutton small delete', onclick: 'runEmailCommand(\'delete_msg\','+mid+')'}));
+ $("delete_button").appendChild(Builder.node('input',{type: 'button', name: 'Button', value: 'Delete', className: 'buttonok', onclick: 'runEmailCommand(\'delete_msg\','+mid+')'}));
$("reply_button_all").removeChild($("reply_button_all").firstChild);
- $("reply_button_all").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To All ', className: 'crmbutton small create', onclick: 'OpenComposer('+mid+',\'replyall\')'}));
+ $("reply_button_all").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To All ', className: 'buttonok', onclick: 'OpenComposer('+mid+',\'replyall\')'}));
$("reply_button").removeChild($("reply_button").firstChild);
- $("reply_button").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To Sender ', className: 'crmbutton small create', onclick: 'OpenComposer('+mid+',\'reply\')'}));
+ $("reply_button").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To Sender ', className: 'buttonok', onclick: 'OpenComposer('+mid+',\'reply\')'}));
$("forward_button").removeChild($("forward_button").firstChild);
- $("forward_button").appendChild(Builder.node('input',{type: 'button', name: 'forward', value: ' Forward ', className: 'crmbutton small create', onclick: 'OpenComposer('+mid+',\'forward\')'}));
+ $("forward_button").appendChild(Builder.node('input',{type: 'button', name: 'forward', value: ' Forward ', className: 'buttonok', onclick: 'OpenComposer('+mid+',\'forward\')'}));
$("qualify_button").removeChild($("qualify_button").firstChild);
- $("qualify_button").appendChild(Builder.node('input',{type: 'button', name: 'Qualify2', value: ' Qualify ', className: 'crmbutton small save', onclick: 'showRelationships('+mid+')'}));
+ $("qualify_button").appendChild(Builder.node('input',{type: 'button', name: 'Qualify2', value: ' Qualify ', className: 'buttonok', onclick: 'showRelationships('+mid+')'}));
$("download_attach_button").removeChild($("download_attach_button").firstChild);
- $("download_attach_button").appendChild(Builder.node('input',{type: 'button', name: 'download', value: ' Download Attachments ', className: 'crmbutton small save', onclick: 'displayAttachments('+mid+')'}));
+ $("download_attach_button").appendChild(Builder.node('input',{type: 'button', name: 'download', value: ' Download Attachments ', className: 'buttonok', onclick: 'displayAttachments('+mid+')'}));
//$("full_view").removeChild($("full_view").firstChild);
// $("full_view").appendChild(Builder.node('a',{href: 'javascript:;', onclick: 'OpenComposer('+mid+',\'full_view\')'},'Full Email View'));
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 Tue May 15 10:24:00 2007
@@ -41,15 +41,20 @@
for($i=0;$i<count($email->attname);$i++){
$attachment_links .= $email->anchor_arr[$i].decode_header($email->attname[$i])."</a></br>";
}
-$content['body'] = '<span id="webmail_body">'.$email->body.'</span>';
+$content['body'] = $email->body;
$content['attachtab'] = $email->attachtab;
-
+if(!$_REQUEST['fullview'])
+ $class_str = 'class="tableHeadBg"';
+else
+ $class_str = 'style="font-size:15px"';
+
?>
<script src="modules/Webmails/Webmails.js" type="text/javascript"></script>
<script src="include/js/general.js" type="text/javascript"></script>
+<link rel="stylesheet" type="text/css" href="themes/<?php echo $_REQUEST['theme'];?>/webmail.css">
<!-- Table to display the Header details (From, To, Subject and date) - Starts -->
- <table style="font-size:15px" width="100%" border="0" cellpadding="0" cellspacing="0">
+ <table <?php echo $class_str;?> width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td width="20%" align="right"><b><?php echo $mod_strings['LBL_FROM'];?></b></td><td id="from_addy"><?php echo $from;?></td></tr>
<tr><td width="20%" align="right"><b><?php echo $mod_strings['LBL_TO'];?></b></td><td id="to_addy"><?php echo $to;?></td></tr>
<tr><td width="20%" align="right"><b><?php echo $mod_strings['LBL_CC'];?></b></td><td id="webmail_cc"><?php echo $cc;?></td></tr>
@@ -57,7 +62,7 @@
<tr><td align="right"><b><?php echo $mod_strings['LBL_SUBJECT'];?></b></td><td id="webmail_subject"><?php echo $subject;?></td></tr>
<tr><td align="right"><b><?php echo $mod_strings['LBL_DATE'];?></b></td><td id="webmail_date"><?php echo $date;?></td>
<?php if(!$_REQUEST['fullview']) {?>
- <td id="full_view" nowrap><span style="float:right" colspan="2"><a href="javascript:;" onclick="OpenComposer('<?php echo $mailid;?>','full_view')"> Full Email View</a></span></td>
+ <td id="full_view" nowrap><span style="float:right" colspan="2"><a href="javascript:;" onclick="OpenComposer('<?php echo $mailid;?>','full_view')"> Full Email View</a></span></td>
<?php } ?>
<tr>
<?php if($_REQUEST['fullview'] && $email->has_attachments) {?>
@@ -92,6 +97,10 @@
}
//Need to put this along with the subject block*/
echo $email->att;
+if(!$_REQUEST['fullview'])
+ echo '<div style="overflow:auto;height:410px;">';
+else
+ echo '<div style="overflow:auto;height:450px;">';
echo $content['body'];
//test added by Richie
@@ -142,6 +151,7 @@
}
+echo '</div>';
//test ended by Richie
imap_close($MailBox->mbox);
More information about the vtigercrm-commits
mailing list