[Vtigercrm-commits] [vtiger-commits] r5930 - in /vtigercrm/trunk/Smarty/templates: ComposeEmail.tpl EmailDetails.tpl Emails.tpl
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Fri May 12 11:58:12 EDT 2006
Author: don
Date: Fri May 12 09:58:07 2006
New Revision: 5930
Log:
code modified to fix the emails issues
Modified:
vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
vtigercrm/trunk/Smarty/templates/EmailDetails.tpl
vtigercrm/trunk/Smarty/templates/Emails.tpl
Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Fri May 12 09:58:07 2006
@@ -44,7 +44,7 @@
<td colspan="3">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td width="143"><img src="{$IMAGE_PATH}composeMail.jpg" width="143"></td>
+ <td width="143"><img src="{$IMAGE_PATH}composeMail.jpg"></td>
<td background="{$IMAGE_PATH}mailHdr.jpg" style="background-repeat:repeat-x;" width="100%"> </td>
<td width="86"><img src="{$IMAGE_PATH}mailTitle.jpg"></td>
</tr>
@@ -55,10 +55,10 @@
{foreach item=elements from=$row}
{if $elements.2.0 eq 'parent_id'}
<tr>
- <td class="lvtCol" style="padding: 5px;" align="right" width="15%"><b>To : </b></td>
+ <td class="lvtCol" style="padding: 5px;" align="right"><b>{$MOD.LBL_TO}</b></td>
<td class="dvtCellLabel" style="padding: 5px;">
- <input name="{$elements.2.0}" type="hidden" value="{$elements.3.1}">
- <textarea id="parent_name" cols="50">{$elements.3.0}</textarea>
+ <input name="{$elements.2.0}" type="hidden" value="{$IDLISTS}">
+ <textarea id="parent_name" cols="70">{$TO_MAIL}</textarea>
</td>
<td class="dvtCellLabel" style="padding: 5px;" align="left">
<select name="parent_type">
@@ -74,23 +74,23 @@
</td>
</tr>
<tr>
- <td class="lvtCol" style="padding: 5px;" align="right">Cc : </td>
+ <td class="lvtCol" style="padding: 5px;" align="right">{$MOD.LBL_CC}</td>
<td class="dvtCellLabel" style="padding: 5px;">
- <input name="ccmail" class="txtBox" type="text" style="width:99%">
+ <input name="ccmail" class="txtBox" type="text" value="{$CC_MAIL}" style="width:99%">
</td>
- <td class="dvtCellLabel" width="25%"> </td>
+ <td class="dvtCellLabel"> </td>
</tr>
<tr>
- <td class="lvtCol" style="padding: 5px;" align="right">Bcc : </td>
+ <td class="lvtCol" style="padding: 5px;" align="right">{$MOD.LBL_BCC}</td>
<td class="dvtCellLabel" style="padding: 5px;">
- <input name="bccmail" class="txtBox" type="text" style="width:99%">
+ <input name="bccmail" class="txtBox" type="text" value="{$BCC_MAIL}" style="width:99%">
</td>
- <td class="dvtCellLabel" width="25%"> </td>
+ <td class="dvtCellLabel"> </td>
</tr>
{elseif $elements.2.0 eq 'subject'}
<tr>
<td class="lvtCol" style="padding: 5px;" align="right" nowrap><font color="red">*</font>{$elements.1.0} :</td>
- <td colspan="2" class="dvtCellLabel" style="padding: 5px;"><input type="text" class="txtBox" name="{$elements.2.0}" value="{$elements.3.1}"></td>
+ <td colspan="2" class="dvtCellLabel" style="padding: 5px;"><input type="text" class="txtBox" name="{$elements.2.0}" value="{$elements.3.0}"></td>
</tr>
{elseif $elements.2.0 eq 'filename'}
Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Fri May 12 09:58:07 2006
@@ -9,17 +9,29 @@
*
********************************************************************************/
-->*}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" valign="top">
<tr>
<td class="forwardBg">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
+ {if $BLOCKS neq ''}
<td width="75%">
- <input type="button" name="reply" value=" {$MOD.LBL_REPLY_BUTTON} " class="classWebBtn" />
- <input type="button" name="forward" value=" {$MOD.LBL_FORWARD_BUTTON} " class="classWebBtn" />
- <input type="button" name="download" value=" {$MOD.LBL_DOWNLOAD_ATTCH_BUTTON} " class="classWebBtn" onclick="fnvshobj(this,'reportLay');" onmouseout="fninvsh('reportLay')" />
+ <input type="button" name="forward" value=" {$MOD.LBL_FORWARD_BUTTON} " class="classWebBtn" onClick=OpenCompose('{$ID}','forward')>
+ <input type="button" name="Send" value=" {$MOD.LBL_SEND} " class="classWebBtn" onClick=OpenCompose('{$ID}','edit')>
+ {foreach item=row from=$BLOCKS}
+ {foreach item=elements key=title from=$row}
+ {if $title eq 'Attachment'}
+ {if $elements.value ne ''}
+ <input type="button" name="download" value=" {$MOD.LBL_DOWNLOAD_ATTCH_BUTTON} " class="classWebBtn" onclick="fnvshobj(this,'reportLay')"/>
+ {/if}
+ {/if}
+ {/foreach}
+ {/foreach}
</td>
<td width="25%" align="right"><input type="button" name="Button" value=" {$APP.LBL_DELETE_BUTTON} " class="classWebBtn" onClick="DeleteEmail('{$ID}')"/></td>
+ {else}
+ <td colspan="2"> </td>
+ {/if}
</tr>
</table>
</td>
@@ -30,9 +42,10 @@
{foreach item=elements key=title from=$row}
{if $title eq 'Subject'}
<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr><td width="20%" align="right"><b>{$MOD.LBL_FROM}</b></td><td width="2%"> </td><td> </td></tr>
- <tr><td align="right">{$MOD.LBL_CC}</td><td> </td><td> </td></tr>
- <tr><td align="right"><b>{$MOD.LBL_SUBJECT}</b></td><td> </td><td>{$BLOCKS.3.Subject.value}</td></tr>
+ <tr><td width="20%" align="right"><b>{$MOD.LBL_TO}</b></td><td width="2%"> </td><td>{$TO_MAIL} </td></tr>
+ <tr><td align="right">{$MOD.LBL_CC}</td><td> </td><td> {$CC_MAIL}</td></tr>
+ <tr><td align="right">{$MOD.LBL_BCC}</td><td> </td><td> {$BCC_MAIL}</td></tr>
+ <tr><td align="right"><b>{$MOD.LBL_SUBJECT}</b></td><td> </td><td>{$elements.value}</td></tr>
<tr><td align="right" style="border-bottom:1px solid #666666;" colspan="3"> </td></tr>
</table>
{elseif $title eq 'Description'}
@@ -45,3 +58,20 @@
</td>
</tr>
</table>
+{foreach item=row from=$BLOCKS}
+ {foreach item=elements key=title from=$row}
+ {if $title eq 'Attachment'}
+ <div id="reportLay" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
+ <table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF">
+ <tr>
+ <td>
+ {$elements.value}
+ </td>
+ </tr>
+ <tr><td style="padding:5px;"> </td></tr>
+ </table>
+ </div>
+ {/if}
+ {/foreach}
+{/foreach}
+
Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Emails.tpl Fri May 12 09:58:07 2006
@@ -54,7 +54,32 @@
document.getElementById("subjectsetter").innerHTML='';
document.getElementById("email_con").innerHTML=response.responseText;
}
+
{/literal}
+function ShowFolders(folderid)
+{ldelim}
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ switch(folderid)
+ {ldelim}
+ case 1:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_ALLMAILS}';
+ break;
+ case 2:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_TO_CONTACTS}';
+ break;
+ case 3:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_TO_ACCOUNTS}';
+ break;
+ case 4:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_TO_LEADS}';
+ break;
+ case 5:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_TO_USERS}';
+ break;
+ {rdelim}
+ var urlstring ="module=Emails&ajax=true&action=EmailsAjax&file=ListView&folderid="+folderid;
+ ajaxObj.process("index.php?",urlstring);
+{rdelim}
</script>
<script language="JavaScript" type="text/javascript" src="modules/Emails/Email.js"></script>
<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
@@ -89,7 +114,7 @@
</td>
<td width="10%">
<img src="{$IMAGE_PATH}compose.gif" align="absmiddle" />
- <a href="javascript:openPopUp('xComposeEmail',this,'index.php?module=Emails&action=EmailsAjax&file=EditView','createemailWin',655,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no');" class="webMnu">{$MOD.LBL_COMPOSE}</a>
+ <a href="javascript:;" onClick="OpenCompose('','create');" class="webMnu">{$MOD.LBL_COMPOSE}</a>
</td>
<td width="10%">
<img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />
@@ -103,7 +128,7 @@
<tr>
<td width="28%" bgcolor="#949494"><span class="subHdr"><b>{$MOD.LBL_EMAIL_FOLDERS}</b></span> </td>
<td width="2%"> </td>
- <td width="60%" class="subHdr"><strong>{$MOD.LBL_MAILS}</strong></td>
+ <td width="60%" class="subHdr"><span id="mail_fldrname"><strong>{$MOD.LBL_ALLMAILS}</strong></span></td>
</tr>
<tr>
<td rowspan="6" valign="top" bgcolor="#FFFFFF" style="padding:10px; ">
@@ -119,18 +144,18 @@
<img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" /> <b class="txtGreen">{$MOD.LBL_SENT_MAILS}</b>
<ul style="list-style-type:none;">
<li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="javascript:;" onClick="ShowFolders('allmails')" class="webMnu">{$MOD.LBL_ALLMAILS}</a> <b></b>
- <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="javascript:;" onClick="ShowFolders('Contacts')" class="webMnu">{$MOD.LBL_TO_CONTACTS}</a> <b></b>
- </li>
- <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="javascript:;" onClick="ShowFolders('Accounts')" class="webMnu">{$MOD.LBL_TO_ACCOUNTS}</a> <b></b>
- </li>
- <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="javascript:;" onClick="ShowFolders('Leads')" class="webMnu">{$MOD.LBL_TO_LEADS}</a>
- </li>
- <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="javascript:;" onClick="ShowFolders('Users')" class="webMnu">{$MOD.LBL_TO_USERS}</a>
+ <a href="javascript:;" onClick="ShowFolders(1)" class="webMnu">{$MOD.LBL_ALLMAILS}</a> <b></b>
+ <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
+ <a href="javascript:;" onClick="ShowFolders(2)" class="webMnu">{$MOD.LBL_TO_CONTACTS}</a> <b></b>
+ </li>
+ <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
+ <a href="javascript:;" onClick="ShowFolders(3)" class="webMnu">{$MOD.LBL_TO_ACCOUNTS}</a> <b></b>
+ </li>
+ <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
+ <a href="javascript:;" onClick="ShowFolders(4)" class="webMnu">{$MOD.LBL_TO_LEADS}</a>
+ </li>
+ <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
+ <a href="javascript:;" onClick="ShowFolders(5)" class="webMnu">{$MOD.LBL_TO_USERS}</a>
</li>
</ul><br />
</td>
@@ -140,7 +165,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<input name="idlist" type="hidden">
<tr>
- <td width="25%"><input type="button" name="Button2" value=" {$MOD.LBL_QUALIFY_BUTTON}" class="classWebBtn" onClick="return massDelete();"/>
+ <td width="25%"><input type="button" name="Button2" value=" {$APP.LBL_DELETE_BUTTON}" class="classWebBtn" onClick="return massDelete();"/>
</td>
<td width="75%" align="right">
<font color="#000000">{$APP.LBL_SEARCH}</font> <input type="text" name="srch" class="importBox" />
@@ -192,4 +217,13 @@
</table>
<!-- END -->
<div id="status" style="display:none;position:absolute;background-color:#bbbbbb;left:887px;top:0px;height:17px;white-space:nowrap;"">Processing Request...</div>
-
+<script>
+function OpenCompose(id,mode)
+{ldelim}
+ if(id != '')
+ url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id;
+ else
+ url = 'index.php?module=Emails&action=EmailsAjax&file=EditView';
+ openPopUp('xComposeEmail',this,url,'createemailWin',775,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no');
+{rdelim}
+</script>
More information about the vtigercrm-commits
mailing list