[Vtigercrm-commits] [vtiger-commits] r6593 - in /vtigercrm/trunk: Smarty/templates/Webmails.tpl index.php modules/Webmails/DetailView.php modules/Webmails/ListView.php modules/Webmails/webmails.js
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Sun May 28 03:55:41 EDT 2006
Author: mmbrich
Date: Sun May 28 01:55:40 2006
New Revision: 6593
Log:
added new DetailView for webmails to give a full-screen view of your email
Added:
vtigercrm/trunk/modules/Webmails/DetailView.php
Modified:
vtigercrm/trunk/Smarty/templates/Webmails.tpl
vtigercrm/trunk/index.php
vtigercrm/trunk/modules/Webmails/ListView.php
vtigercrm/trunk/modules/Webmails/webmails.js
Modified: vtigercrm/trunk/Smarty/templates/Webmails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Webmails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Webmails.tpl Sun May 28 01:55:40 2006
@@ -122,7 +122,7 @@
<div id="rssScroll">
<table class="rssTable" cellspacing="0" cellpadding="0" border="0" width="100%" id="message_table">
<tr>
- <th width="5%"><input type="checkbox" name="checkbox" value="checkbox" onclick="select_all();"/></th>
+ <th><input type="checkbox" name="checkbox" value="checkbox" onclick="select_all();"/></th>
{foreach item=element from=$LISTHEADER}
{$element}
{/foreach}
@@ -167,8 +167,9 @@
<tr><td width="20%" align="right"><b>{$MOD.LBL_FROM}</b></td><td id="from_addy"> </td></tr>
<tr><td width="20%" align="right"><b>{$MOD.LBL_TO}</b></td><td id="to_addy"> </td></tr>
<tr><td align="right"><b>{$MOD.LBL_SUBJECT}</b></td><td id="webmail_subject"></td></tr>
- <tr><td align="right"><b>{$MOD.LBL_DATE}</b></td><td id="webmail_date"></td></tr>
- <tr><td align="right" style="border-bottom:1px solid #666666;" colspan="2"> </td></tr>
+ <tr><td align="right"><b>{$MOD.LBL_DATE}</b></td><td id="webmail_date"></td>
+ <td id="full_view"><a href="javascript:;">Full Window View</a></td></tr>
+ <tr><td align="right" style="border-bottom:1px solid #666666;" colspan="3"> </td></tr>
</table>
<span id="body_area" style="width:95%"> </span></td>
</tr>
@@ -198,16 +199,19 @@
url = 'index.php?module=Emails&action=EmailsAjax&file=EditView';
break;
case 'forward':
- url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&forward=true&webmail=true&file=EditView';
+ url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&forward=true&webmail=true&file=EditView&mailbox={$MAILBOX}';
break;
case 'reply':
- url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&reply=single&webmail=true&file=EditView';
+ url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&reply=single&webmail=true&file=EditView&mailbox={$MAILBOX}';
break;
case 'replyall':
- url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&reply=all&webmail=true&file=EditView';
+ url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&reply=all&webmail=true&file=EditView&mailbox={$MAILBOX}';
break;
case 'attachments':
- url = 'index.php?module=Webmails&action=dlAttachments&mailid='+id;
+ url = 'index.php?module=Webmails&action=dlAttachments&mailid='+id+'&mailbox={$MAILBOX}';
+ break;
+ case 'full_view':
+ url = 'index.php?module=Webmails&action=DetailView&&record='+id+'&mailid='+id+'&mailbox={$MAILBOX}';
break;
{rdelim}
openPopUp('xComposeEmail',this,url,'createemailWin',830,662,'menubar=no,toolbar=no,location=no,status=no,resizable=yes,scrollbars=yes');
Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Sun May 28 01:55:40 2006
@@ -192,7 +192,7 @@
{
$log->info("About to take action ".$action);
$log->debug("in $action");
- if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action) || ereg("^RecalculateSharingRules",$action) || (ereg("^body",$action) && ereg("^Webmails",$module) ))
+ if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action) || ereg("^RecalculateSharingRules",$action) || (ereg("^body",$action) && ereg("^Webmails",$module)) || (ereg("^DetailView",$action) && ereg("^Webmails",$module) ))
{
$skipHeaders=true;
//skip headers for all these invocations as they are mostly popups
Modified: vtigercrm/trunk/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/ListView.php (original)
+++ vtigercrm/trunk/modules/Webmails/ListView.php Sun May 28 01:55:40 2006
@@ -161,14 +161,14 @@
$displayed_msgs++;
if ($mails[$start_message]->deleted && !$show_hidden) {
- $flags = "<tr id='row_".$num."' class='deletedRow' style='display:none'><td><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+ $flags = "<tr id='row_".$num."' class='deletedRow' style='display:none'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
$displayed_msgs--;
} elseif ($mails[$start_message]->deleted && $show_hidden)
- $flags = "<tr id='row_".$num."' class='deletedRow'><td><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+ $flags = "<tr id='row_".$num."' class='deletedRow'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
elseif (!$mails[$start_message]->seen || $mails[$start_message]->recent)
- $flags = "<tr class='unread_email' id='row_".$num."'><td><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+ $flags = "<tr class='unread_email' id='row_".$num."'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
else
- $flags = "<tr id='row_".$num."'><td><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
+ $flags = "<tr id='row_".$num."'><td width='2px'><input type='checkbox' name='checkbox_".$num."' class='msg_check'></td><td colspan='1'>";
// Attachment Icons
if(getAttachments($num,$mbox))
Modified: vtigercrm/trunk/modules/Webmails/webmails.js
==============================================================================
--- vtigercrm/trunk/modules/Webmails/webmails.js (original)
+++ vtigercrm/trunk/modules/Webmails/webmails.js Sun May 28 01:55:40 2006
@@ -42,6 +42,9 @@
$("download_attach_button").removeChild($("download_attach_button").firstChild);
$("download_attach_button").appendChild(Builder.node('input',{type: 'button', name: 'download', value: ' Download Attachments ', className: 'classWebBtn', onclick: 'displayAttachments('+mid+')'}));
+
+ $("full_view").removeChild($("full_view").firstChild);
+ $("full_view").appendChild(Builder.node('a',{href: 'javascript:;', onclick: 'OpenCompose('+mid+',\'full_view\')'},'Full Email View'));
}
function displayAttachments(mid) {
More information about the vtigercrm-commits
mailing list