[Vtigercrm-commits] [vtiger-commits] r5741 - in /vtigercrm/trunk: Smarty/templates/ComposeEmail.tpl include/utils/EditViewUtils.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Thu May 4 14:24:45 EDT 2006
Author: saraj
Date: Thu May 4 12:24:38 2006
New Revision: 5741
Log:
* Modified to display the entities as red which dont have email id, when use sendmail from entity listview
Modified:
vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
vtigercrm/trunk/include/utils/EditViewUtils.php
Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Thu May 4 12:24:38 2006
@@ -27,84 +27,93 @@
<input type="hidden" name="popupaction" value="create">
<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
- <tr><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 background="{$IMAGE_PATH}mailHdr.jpg" style="background-repeat:repeat-x;" width="100%"> </td>
- <td width="86"><img src="{$IMAGE_PATH}mailTitle.jpg"></td>
- </tr>
- </table>
- </td></tr>
+ <tr>
+ <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 background="{$IMAGE_PATH}mailHdr.jpg" style="background-repeat:repeat-x;" width="100%"> </td>
+ <td width="86"><img src="{$IMAGE_PATH}mailTitle.jpg"></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
{foreach item=row from=$BLOCKS}
{foreach item=elements from=$row}
{if $elements.2.0 eq 'parent_id'}
- <tr>
+ <tr>
<td class="lvtCol" style="padding: 5px;" align="right" width="15%"><b>To : </b></td>
<td class="dvtCellLabel" style="padding: 5px;">
- <input name="{$elements.2.0}" type="hidden" value="{$elements.3.1}">
- <textarea readonly name="parent_name" class=txtBox" cols="50" rows="2">{$elements.3.0}</textarea>
- <select name="parent_type">
- {foreach key=labelval item=selectval from=$elements.1.0}
- <option value="{$labelval}" {$selectval}>{$labelval}</option>
- {/foreach}
- </select>
+ <input name="{$elements.2.0}" type="hidden" value="{$elements.3.1}">
+ {assign var=str_len value=$elements.3.0|count_characters:true}
+ {assign var=div_height value="35"}
+ {if $str_len gt 700}
+ {assign var=div_height value="50"}
+ {/if}
+ <div name="parent_name" style="width:97%;height:{$div_height}px;overflow:auto;background-color:white;padding:5px;border:1px solid #666666;">{$elements.3.0}</div>
+ </td>
+ <td class="dvtCellLabel" style="padding: 5px;" align="left">
+ <select name="parent_type">
+ {foreach key=labelval item=selectval from=$elements.1.0}
+ <option value="{$labelval}" {$selectval}>{$labelval}</option>
+ {/foreach}
+ </select>
+
<span class="lvtCol" style="padding: 3px;">
<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>
</span><span class="lvtCol" style="padding: 3px;"><input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
- </span>
+ </span>
+ </td>
+ </tr>
+ <tr>
+ <td class="lvtCol" style="padding: 5px;" align="right">Cc : </td>
+ <td class="dvtCellLabel" style="padding: 5px;">
+ <input name="ccmail" class="txtBox" type="text" style="width:99%">
+ </td>
+ <td class="dvtCellLabel" width="25%"> </td>
+ </tr>
+ <tr>
+ <td class="lvtCol" style="padding: 5px;" align="right">Bcc : </td>
+ <td class="dvtCellLabel" style="padding: 5px;">
+ <input name="bccmail" class="txtBox" type="text" style="width:99%">
</td>
<td class="dvtCellLabel" width="25%"> </td>
- </tr>
- <tr>
- <td class="lvtCol" style="padding: 5px;" align="right">CC:</td>
- <td class="dvtCellLabel" style="padding: 5px;">
-
- <input name="ccmail" class="txtBox" type="text">
- </td>
- <td class="dvtCellLabel" width="25%"> </td>
- </tr>
- <tr>
- <td class="lvtCol" style="padding: 5px;" align="right">BCC:</td>
- <td class="dvtCellLabel" style="padding: 5px;">
- <input name="bccmail" class="txtBox" type="text">
-
- </td>
- <td class="dvtCellLabel" width="25%"> </td>
- </tr>
+ </tr>
{elseif $elements.2.0 eq 'subject'}
- <tr>
+ <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>
- </tr>
+ </tr>
{elseif $elements.2.0 eq 'filename'}
- <tr>
-
+
+ <tr>
<td class="lvtCol" style="padding: 5px;" align="right" nowrap>{$elements.1.0} :</td>
<td class="dvtCellLabel" style="padding: 5px;">
- <input name="{$elements.2.0}" type="file" class="small" value="{$elements.3.1}"/>
- <input type="hidden" name="id" value=""/>{$elements.3.0}</td>
+ <input name="{$elements.2.0}" type="file" class="small" value="{$elements.3.1}" size="78"/>
+ <input type="hidden" name="id" value=""/>{$elements.3.0}
+ </td>
<td class="dvtCellLabel"> </td>
- </tr>
+ </tr>
{elseif $elements.2.0 eq 'description'}
- <tr>
+ <tr>
<td colspan="3" align="center" height="320">
- <input id="description___Config" value="" style="display: none;" type="hidden"><iframe id="description___Frame" src="include/fckeditor/editor/fckeditor.html?InstanceName=description&Toolbar=Default" frameborder="no" height="400" scrolling="no" width="100%"></iframe><textarea style="display: none;" class="detailedViewTextBox" name="description" cols="90" rows="8">{$elements.3.0}</textarea>
+ <input id="description___Config" value="" style="display: none;" type="hidden"><iframe id="description___Frame" src="include/fckeditor/editor/fckeditor.html?InstanceName=description&Toolbar=Default" frameborder="no" height="400" scrolling="no" width="100%"></iframe><textarea style="display: none;" class="detailedViewTextBox" name="description" cols="90" rows="8">{$elements.3.0}</textarea>
</td>
- </tr>
+ </tr>
{/if}
{/foreach}
{/foreach}
- <tr>
+ <tr>
<td colspan="3" class="lvtCol" style="padding: 5px;" align="center">
- <input title="Save [Alt+S]" accessKey="S" class="classBtn" onclick="this.form.action.value='Save';" type="submit" name="button" value="Save" >
- <input name="send" value=" Send " class="classBtn" type="submit" onclick="this.form.action.value='Save';this.form.send_mail.value='true';">
- <input name="cancel" value=" Cancel " class="classBtn" type="button" onClick="window.close()">
+ <input title="Save [Alt+S]" accessKey="S" class="classBtn" onclick="this.form.action.value='Save';" type="submit" name="button" value="Save" >
+ <input name="send" value=" Send " class="classBtn" type="submit" onclick="this.form.action.value='Save';this.form.send_mail.value='true';">
+ <input name="cancel" value=" Cancel " class="classBtn" type="button" onClick="window.close()">
</td>
- </tr>
-</tbody></table>
+ </tr>
+</tbody>
+</table>
</form>
</body>
</html>
Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Thu May 4 12:24:38 2006
@@ -721,7 +721,25 @@
$result=$adb->query($querystr);
$temp=$adb->query_result($result,0,'columnname');
$temp1=br2nl($myfocus->column_fields[$temp]);
- $parent_name.=$fullname.'<'.$temp1.'>; ';
+
+ //Modified to display the entities in red which don't have email id
+ if(strlen($temp_parent_name) > 150)
+ {
+ $parent_name .= '<br>';
+ $temp_parent_name = '';
+ }
+
+ if($temp1 != '')
+ {
+ $parent_name .= $fullname.'<'.$temp1.'>; ';
+ $temp_parent_name .= $fullname.'<'.$temp1.'>; ';
+ }
+ else
+ {
+ $parent_name .= "<b style='color:red'>".$fullname.'<'.$temp1.'>; '."</b>";
+ $temp_parent_name .= "<b style='color:red'>".$fullname.'<'.$temp1.'>; '."</b>";
+ }
+
}
}
}
More information about the vtigercrm-commits
mailing list