[Vtigercrm-commits] [vtiger-commits] r5863 - in /vtigercrm/branches/5.0_postgresql_integration: Smarty/templates/ modules/Contacts/ modules/Emails/ modules/Import/language/ modules/Rss/language/ modules/Settings/language/ modules/Users/ modules/Users/language/ soap/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Wed May 10 18:20:15 EDT 2006
Author: jeffk
Date: Wed May 10 16:20:02 2006
New Revision: 5863
Log:
refs #752. merge trunk changesets [5850] through [5862]
Modified:
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldCombo.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldEntries.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldList.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ImportStep1.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ImportStep2.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Importerror.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefDetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RoleDetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RoleEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Rss.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RssFeeds.tpl
vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/Contact.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php
vtigercrm/branches/5.0_postgresql_integration/modules/Import/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Rss/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Settings/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateSharingRule.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/soap/contactserialize.php
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldCombo.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldCombo.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldCombo.tpl Wed May 10 16:20:02 2006
@@ -11,13 +11,13 @@
<tr>
<td align="right"><img src="{$IMAGE_PATH}one.gif" /></td>
- <td><b class="lvtHeaderText">Select Module</b></td>
+ <td><b class="lvtHeaderText">{$MOD.LBL_SELECT_MODULE}</b></td>
</tr>
<tr>
<form name="selectModule">
<td> </td>
<td>
- Select the CRM module to show CustomFields :
+ {$MOD.LBL_SELECT_CF_TEXT}
<select name="pick_module" class="importBox" onChange="getCustomFieldList(this)">
{foreach key=sel_value item=value from=$MODULES}
{if $MODULE eq $sel_value}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldEntries.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldEntries.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldEntries.tpl Wed May 10 16:20:02 2006
@@ -11,7 +11,7 @@
<table width="100%"><tr>
<td align="right" valign="top" width="5%" rowspan="2"><img src="{$IMAGE_PATH}two.gif" width="29" height="31" /></td>
<td>
- <b class="lvtHeaderText">Custom Fields in {$MODULE}</b>
+ <b class="lvtHeaderText">{$MOD.CustomFields} in {$MODULE}</b>
</td>
</tr>
<tr>
@@ -22,15 +22,15 @@
<input type="hidden" name="parenttab" value="Settings">
<input type="hidden" name="mode">
<table width="95%" border="0" cellpadding="5" cellspacing="0">
- <tr><td align="right"><input type="button" value=" New Custom Field " onClick="getCreateCustomFieldForm('{$MODULE}','','','')" class="classBtn"/></td></tr>
+ <tr><td align="right"><input type="button" value=" {$MOD.NewCustomField} " onClick="getCreateCustomFieldForm('{$MODULE}','','','')" class="classBtn"/></td></tr>
</table>
<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="95%">
<tbody>
<tr>
<td class="lvtCol" width="5%">#</td>
- <td class="lvtCol" width="35%">Field Label </td>
- <td class="lvtCol" width="50%">Field Type </td>
- <td class="lvtCol" width="10%">Tools</td>
+ <td class="lvtCol" width="35%">{$MOD.FieldLabel}</td>
+ <td class="lvtCol" width="50%">{$MOD.FieldType}</td>
+ <td class="lvtCol" width="10%">{$MOD.LBL_CURRENCY_TOOL}</td>
</tr>
{foreach item=entries key=id from=$CFENTRIES}
<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
@@ -46,8 +46,8 @@
<tr>
<td style="padding:5px;" width="5%" >
<img src="{$IMAGE_PATH}mapping.gif" align="absmiddle" /> </td>
- <td><span class="genHeaderSmall">Field Mapping</span><br />
- Field Mapping allows you to ....
+ <td><span class="genHeaderSmall">{$MOD.LBL_FIELD_MAPPING}</span><br />
+ {$MOD.LBL_FIELD_MAPPING} allows you to ....
</td>
</tr>
<tr><td colspan="2" align="right"><input input title="{$MOD.CUSTOMFIELDMAPPING}" class="classBtn" onclick="CustomFieldMapping();" type="button" name="ListLeadCustomFieldMapping" value="{$MOD.CUSTOMFIELDMAPPING}"></td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldList.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldList.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldList.tpl Wed May 10 16:20:02 2006
@@ -72,9 +72,9 @@
<img src="{$IMAGE_PATH}mapping.gif" align="left" />
</td>
<td style="padding:5px;border-bottom:2px dotted #AAAAAA;">
- <span class="genHeaderGrayBig">Custom Field Settings</span>
+ <span class="genHeaderGrayBig">{$MOD.LBL_CUSTOM_FIELD_SETTINGS}</span>
<br />
- <span class="big">Create and Manage user defined fields......</span>
+ <span class="big">{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}</span>
</td>
</tr>
<tr><td colspan="2"> </td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ImportStep1.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ImportStep1.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ImportStep1.tpl Wed May 10 16:20:02 2006
@@ -67,7 +67,7 @@
</tr>
<tr bgcolor="#ECECEC"><td align="left" valign="top" colspan="2"> </td></tr>
<tr bgcolor="#ECECEC">
- <td align="right" valign="top" width="25%"><b>File Location : </b></td>
+ <td align="right" valign="top" width="25%"><b>{$MOD.LBL_FILE_LOCATION} </b></td>
<td align="left" valign="top" width="75%">
<input type="file" name="userfile" size="40" />
<input type="checkbox" name="has_header"{$HAS_HEADER_CHECKED} /> {$MOD.LBL_HAS_HEADER}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ImportStep2.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ImportStep2.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ImportStep2.tpl Wed May 10 16:20:02 2006
@@ -77,14 +77,14 @@
</tr>
<tr bgcolor="#ECECEC">
<td align="left" style="padding-left:40px;">
- <span class="genHeaderGray">Step 2 of 3 : </span>
- <span class="genHeaderSmall">{$MODULE} List & Mapping </span>
+ <span class="genHeaderGray">{$MOD.LBL_STEP_2_3} </span>
+ <span class="genHeaderSmall">{$MODULE} {$MOD.LBL_LIST_MAPPING} </span>
</td>
</tr>
<tr bgcolor="#ECECEC">
<td align="left" style="padding-left:40px;">
- The following tables shows the imported {$MODULE} and other details.
- To map the fields, Select the corresponding in combo boxes for each {$MODULE}.
+ {$MOD.LBL_STEP_2_MSG} {$MODULE} {$MOD.LBL_STEP_2_MSG1}
+ {$MOD.LBL_STEP_2_TXT} {$MODULE}.
</td>
</tr>
<tr bgcolor="#ECECEC">
@@ -93,16 +93,16 @@
<tr bgcolor="#ECECEC">
<td align="left" style="padding-left:40px;" >
<input type="checkbox" name="use_saved_mapping" id="saved_map_checkbox" onclick="ActivateCheckBox()" />
- Use Saved Mapping : {$SAVED_MAP_LISTS}
+ {$MOD.LBL_USE_SAVED_MAPPING} {$SAVED_MAP_LISTS}
</td>
</tr>
<tr bgcolor="#ECECEC">
<td align="left"style="padding-left:40px;padding-right:40px;">
<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%" >
<tr bgcolor="white">
- <td width="25%" class="lvtCol" align="center"><b>Mapping</b></td>
+ <td width="25%" class="lvtCol" align="center"><b>{$MOD.LBL_MAPPING}</b></td>
{if $HASHEADER eq 1}
- <td width="25%" bgcolor="#E1E1E1" ><b>Headers :</b></td>
+ <td width="25%" bgcolor="#E1E1E1" ><b>{$MOD.LBL_HEADERS}</b></td>
<td width="25%" ><b>{$MOD.LBL_ROW} 1</b></td>
<td width="25%" ><b>{$MOD.LBL_ROW} 2</b></td>
{else}
@@ -147,17 +147,17 @@
</tr>
<tr bgcolor="#ECECEC">
<td align="left" style="padding-left:40px;" >
- <input type="checkbox" id="save_map" name="save_map" onclick="set_readonly(this.form)" />
- Save above Mapping as :
- <input type="text" readonly id="save_map_as" name="save_map_as" value="" class="importBox" >
+ <input type="checkbox" name="save_map" onclick="set_readonly(this.form)" />
+ {$MOD.LBL_SAVE_AS_CUSTOM}
+ <input type="text" readonly name="save_map_as" value="" class="importBox" >
</td>
</tr>
<tr bgcolor="#ECECEC"><td><hr /></td></tr>
<tr bgcolor="#ECECEC">
<td align="right" style="padding-right:40px;" >
- <input type="submit" name="button" value=" ‹ Back " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='2'; return true;" />
+ <input type="submit" name="button" value=" ‹ {$MOD.LBL_BACK} " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='2'; return true;" />
- <input type="submit" name="button" value=" Import Now › " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='4'; return validate_import_map()" />
+ <input type="submit" name="button" value=" {$MOD.LBL_IMPORT_NOW} › " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='4'; return verify_data(Import)" />
</td>
</tr>
<tr bgcolor="#ECECEC"><td align="right" > </td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Importerror.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Importerror.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Importerror.tpl Wed May 10 16:20:02 2006
@@ -28,7 +28,7 @@
<tr bgcolor="#ECECEC"><td colspan="2" align="left" valign="top"> </td></tr>
<tr bgcolor="#ECECEC">
<td colspan="2" align="left" valign="top" style="padding-left:40px;">
- <span class="genHeaderSmall">Import Error:</span>
+ <span class="genHeaderSmall">{$MOD.LBL_MODULE_NAME} {$MOD.LBL_ERROR}</span>
</td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefDetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefDetailView.tpl Wed May 10 16:20:02 2006
@@ -25,7 +25,7 @@
<td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
<td class="showPanelBg" valign="top" width="100%">
<div class="small" style="padding: 10px;">
- <span class="lvtHeaderText">My Preferences </span> <br>
+ <span class="lvtHeaderText">{$APP.LBL_MY_PREFERENCES}</span> <br>
<hr noshade="noshade" size="1"><br>
<form name="DetailView" method="POST" action="index.php" ENCTYPE="multipart/form-data" id="form">
<input type="hidden" name="module" value="Users">
@@ -51,8 +51,8 @@
<table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
<tr>
<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap"> </td>
- <td width="75" align="center" nowrap="nowrap" class="dvtSelectedCell" id="pi" onclick="fnLoadValues('pi','mi','mnuTab','mnuTab2')"><b>My Details</b></td>
- <td class="dvtUnSelectedCell" style="width: 100px;" align="center" nowrap="nowrap"><a href="index.php?action=AddMailAccount&module=Settings&record={$ID}"> <b>My Mail Server Details </a></b></td>
+ <td width="75" align="center" nowrap="nowrap" class="dvtSelectedCell" id="pi" onclick="fnLoadValues('pi','mi','mnuTab','mnuTab2')"><b>{$MOD.LBL_MY_DETAILS}</b></td>
+ <td class="dvtUnSelectedCell" style="width: 100px;" align="center" nowrap="nowrap"><a href="index.php?action=AddMailAccount&module=Settings&record={$ID}"> <b>{$MOD.LBL_MY_MAIL_SERVER_DET}</a></b></td>
<td class="dvtTabCache" nowrap="nowrap"> </td>
</tr>
@@ -80,34 +80,34 @@
</td>
</tr>
<tr>
- <td colspan="4" class="detailedViewHeader"><b>My Details </b> </td>
- </tr>
- <tr>
- <td class="dvtCellLabel" align="right" width="25%"><span class="style1"><font color='red'>*</font></span>User Name</td>
+ <td colspan="4" class="detailedViewHeader"><b>{$MOD.LBL_MY_DETAILS}</b> </td>
+ </tr>
+ <tr>
+ <td class="dvtCellLabel" align="right" width="25%"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_NAME}</td>
<td width="30%" class="dvtCellInfo">{$USER_NAME}</td>
- <td width="25%" class="dvtCellLabel" align="right">Admin</td>
+ <td width="25%" class="dvtCellLabel" align="right">{$UMOD.LBL_ADMIN}</td>
<td width="25%" class="dvtCellInfo">
<input type="checkbox" name="is_admin" DISABLED {$IS_ADMIN}>
</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">First Name</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_FIRST_NAME}</td>
<td width="30%" class="dvtCellInfo" nowrap>{$FIRST_NAME}</td>
- <td width="25%" align="right" class="dvtCellLabel">My Group Name </td>
+ <td width="25%" align="right" class="dvtCellLabel">My {$UMOD.LBL_GROUP_NAME} </td>
<td width="25%" class="dvtCellInfo">{$GROUPASSIGNED}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>Last Name </td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_LAST_NAME}</td>
<td class="dvtCellInfo">{$LAST_NAME}</td>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>My Role </td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>My {$UMOD.LBL_USER_ROLE}</td>
<td class="dvtCellInfo">{$ROLEASSIGNED}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>E-Mail Id</td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_EMAIL}</td>
<td class="dvtCellInfo"><a href="mailto:{$EMAIL1}" target="_blank">{$EMAIL1}</a></td>
{* <td width="30%" align=left class="dvtCellInfo"><input name="pass" type="button" class="classBtn" id="pass" value=" Change Now... " onclick="fnvshobj(this,'roleLay');"/></td>*}
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>My Status </td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>My {$UMOD.LBL_STATUS}</td>
<td class="dvtCellInfo">{$STATUS}</td>
</tr>
<tr><td colspan="4"> </td></tr>
@@ -115,15 +115,15 @@
<td colspan="4" class="detailedViewHeader"><b>My Defaults</b> </td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right" width="25%">Default Activity View </td>
+ <td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_ACTIVITY_VIEW}</td>
<td width="30%" class="dvtCellInfo">{$ACTIVITY_VIEW}</td>
- <td width="25%" class="dvtCellLabel" align="right">Default Calendar View </td>
+ <td width="25%" class="dvtCellLabel" align="right">{$UMOD.LBL_COLOR}</td>
<td width="25%" class="dvtCellInfo">{$COLORASSIGNED}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Default Lead View </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_LEAD_VIEW}</td>
<td width="30%" class="dvtCellInfo" nowrap>{$LEAD_VIEW}</td>
- <td width="25%" align="right" class="dvtCellLabel">Default Currency </td>
+ <td width="25%" align="right" class="dvtCellLabel">{$UMOD.LBL_CURRENCY_NAME}</td>
<td width="25%" class="dvtCellInfo">{$CURRENCY_NAME}</td>
</tr>
<tr><td colspan="4"> </td></tr>
@@ -131,45 +131,45 @@
<td colspan="4" class="detailedViewHeader"><b>My Designation & Contact Details </b> </td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right" width="25%">Title</td>
+ <td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_TITLE}</td>
<td width="30%" class="dvtCellInfo">{$TITLE}</td>
- <td width="25%" class="dvtCellLabel" align="right">Office Phone </td>
+ <td width="25%" class="dvtCellLabel" align="right">{$UMOD.LBL_OFFICE_PHONE}</td>
<td width="25%" class="dvtCellInfo">{$PHONE_WORK}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Department</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_DEPARTMENT}</td>
<td width="30%" class="dvtCellInfo" nowrap>{$DEPARTMENT}</td>
- <td width="25%" align="right" class="dvtCellLabel">Mobile</td>
+ <td width="25%" align="right" class="dvtCellLabel">{$UMOD.LBL_MOBILE_PHONE}</td>
<td width="25%" class="dvtCellInfo">{$PHONE_MOBILE}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Reports To </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_REPORTS_TO}</td>
<td class="dvtCellInfo">{$REPORTS_TO_NAME}{$REPORTS_TO_ID}</td>
- <td class="dvtCellLabel" align="right">Other</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_PHONE}</td>
<td class="dvtCellInfo">{$PHONE_OTHER}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Other Email </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_EMAIL}</td>
<td width="30%" align=left class="dvtCellInfo">{$EMAIL2}</td>
- <td class="dvtCellLabel" align="right">Fax</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_FAX}</td>
<td class="dvtCellInfo">{$PHONE_FAX}</td>
</tr>
<tr>
<td class="dvtCellLabel" align="right">Chat IDs </td>
<td width="30%" align=left class="dvtCellInfo">{$YAHOO_ID}</td>
- <td class="dvtCellLabel" align="right">Home Phone </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_HOME_PHONE}</td>
<td class="dvtCellInfo">{$PHONE_HOME}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Date Format </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_DATE_FORMAT}</td>
<td width="30%" align=left class="dvtCellInfo">{$DATE_FORMAT}</td>
- <td class="dvtCellLabel" align="right">Notes</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_NOTES}</td>
<td class="dvtCellInfo">{$DESCRIPTION}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Signature</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_SIGNATURE}</td>
<td width="30%" align=left class="dvtCellInfo">{$SIGNATURE}</td>
<td class="dvtCellLabel" align="right"> </td>
<td class="dvtCellInfo"> </td>
@@ -180,23 +180,23 @@
<td colspan="4" class="detailedViewHeader"><b>My Postal Address </b> </td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right" width="25%">Street Address </td>
+ <td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_ADDRESS}</td>
<td width="30%" colspan="3" class="dvtCellInfo">{$ADDRESS_STREET}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">City</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_CITY}</td>
<td width="30%" colspan="3" nowrap class="dvtCellInfo">{$ADDRESS_CITY}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">State</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_STATE}</td>
<td colspan="3" class="dvtCellInfo">{$ADDRESS_STATE}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Postal Code </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_POSTAL_CODE}</td>
<td width="30%" colspan="3" align=left class="dvtCellInfo">{$ADDRESS_POSTALCODE}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Country</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_COUNTRY}</td>
<td width="30%" colspan="3" align=left class="dvtCellInfo">{$ADDRESS_COUNTRY}</td>
</tr>
<tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefEditView.tpl Wed May 10 16:20:02 2006
@@ -32,7 +32,7 @@
<td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
<td class="showPanelBg" valign="top" width="100%">
<div class="small" style="padding: 10px;">
- <span class="lvtHeaderText">My Preferences </span> <br>
+ <span class="lvtHeaderText">{$APP.LBL_MY_PREFERENCES}</span> <br>
<hr noshade="noshade" size="1"><br>
<form name="EditView" method="POST" action="index.php" ENCTYPE="multipart/form-data">
<input type="hidden" name="module" value="Users">
@@ -58,8 +58,8 @@
<table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
<tr>
<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap"> </td>
- <td width="75" align="center" nowrap="nowrap" class="dvtSelectedCell" id="pi" onclick="fnLoadValues('pi','mi','mnuTab','mnuTab2')"><b>My Details</b></td>
- <td class="dvtUnSelectedCell" style="width: 100px;" align="center" nowrap="nowrap" ><a href="index.php?action=AddMailAccount&module=Settings&record={$ID}"><b>My Mail Server Details </a></b></td>
+ <td width="75" align="center" nowrap="nowrap" class="dvtSelectedCell" id="pi" onclick="fnLoadValues('pi','mi','mnuTab','mnuTab2')"><b>{$MOD.LBL_MY_DETAILS}</b></td>
+ <td class="dvtUnSelectedCell" style="width: 100px;" align="center" nowrap="nowrap" ><a href="index.php?action=AddMailAccount&module=Settings&record={$ID}"><b>{$MOD.LBL_MY_MAIL_SERVER_DET}</a></b></td>
<td class="dvtTabCache" nowrap="nowrap"> </td>
</tr>
@@ -80,39 +80,39 @@
<!-- General details -->
<table width="100%" border="0" cellspacing="0" cellpadding="5">
<tr>
- <td colspan="4" class="detailedViewHeader"><b>My Details </b> </td>
+ <td colspan="4" class="detailedViewHeader"><b>{$MOD.LBL_MY_DETAILS}</b> </td>
</tr>
<tr>
<td class="dvtCellLabel" align="right" width="25%">
- <span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_USER_NAME} </td>
+ <span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_NAME} </td>
<td width="30%" class="dvtCellInfo">
<input type="text" name="user_name" value='{$USER_NAME}' class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"{$USERNAME_READONLY} /></td>
- <td width="25%" class="dvtCellLabel" align="right">Admin</td>
+ <td width="25%" class="dvtCellLabel" align="right">{$UMOD.LBL_ADMIN}</td>
<td width="25%" class="dvtCellInfo">
<input type="checkbox" name="is_admin" {$DISABLED} {$IS_ADMIN}>
</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">First Name</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_FIRST_NAME}</td>
<td width="30%" class="dvtCellInfo" nowrap>
<input type="text" name="first_name" value='{$FIRST_NAME}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
<td class="dvtCellLabel" align="right">
- <span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_LAST_NAME}</td>
+ <span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_LAST_NAME}</td>
<td class="dvtCellInfo">
<input type="text" name="last_name" value='{$LAST_NAME}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
<tr>
<td class="dvtCellLabel" align="right">
- <span class="style1"><font color='red'>*</font></span>My Role</td>
+ <span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>My {$UMOD.LBL_USER_ROLE}</td>
<td class="dvtCellInfo">{$USER_ROLE}</td>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>E-Mail Id</td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_EMAIL}</td>
<td class="dvtCellInfo"><input type="text" name="email1" value='{$EMAIL1}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
<tr>
{* <td width="30%" align=left class="dvtCellInfo"><input name="pass" type="button" class="classBtn" id="pass" value=" Change Now... " onclick="fnvshobj(this,'roleLay');"/></td>*}
<td class="dvtCellLabel" align="right">
- <span class="style1"><font color='red'>*</font></span>My Status</td>
+ <span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>My {$UMOD.LBL_STATUS}</td>
{$USER_STATUS_OPTIONS}
</tr>
<tr><td colspan="4"> </td></tr>
@@ -120,15 +120,15 @@
<td colspan="4" class="detailedViewHeader"><b>My Defaults</b> </td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right" width="25%">Default Activity View </td>
+ <td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_ACTIVITY_VIEW}</td>
<td width="30%" class="dvtCellInfo">{$ACTIVITY_VIEW}</td>
- <td width="25%" class="dvtCellLabel" align="right">Default Calendar View </td>
+ <td width="25%" class="dvtCellLabel" align="right">{$UMOD.LBL_COLOR} </td>
<td width="25%"> {$CAL_COLOR}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Default Lead View </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_LEAD_VIEW}</td>
<td width="30%" class="dvtCellInfo" nowrap>{$LEAD_VIEW}</td>
- <td width="25%" align="right" class="dvtCellLabel">Default Currency </td>
+ <td width="25%" align="right" class="dvtCellLabel">{$UMOD.LBL_CURRENCY_NAME}</td>
<td width="25%" class="dvtCellInfo">{$CURRENCY_NAME}</td>
</tr>
<tr><td colspan="4"> </td></tr>
@@ -136,36 +136,36 @@
<td colspan="4" class="detailedViewHeader"><b>My Designation & Contact Details </b> </td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right" width="25%">Title</td>
+ <td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_TITLE}</td>
<td width="30%" class="dvtCellInfo">
<input type="text" name="title" value='{$TITLE}' class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" /></td>
- <td width="25%" class="dvtCellLabel" align="right">Office Phone </td>
+ <td width="25%" class="dvtCellLabel" align="right">{$UMOD.LBL_OFFICE_PHONE}</td>
<td width="25%" class="dvtCellInfo">
<input type="text" name="phone_work" value='{$PHONE_WORK}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Department</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_DEPARTMENT}</td>
<td width="30%" class="dvtCellInfo" nowrap>
<input type="text" name="department" value='{$DEPARTMENT}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
- <td width="25%" align="right" class="dvtCellLabel">Mobile</td>
+ <td width="25%" align="right" class="dvtCellLabel">{$UMOD.LBL_MOBILE_PHONE}</td>
<td width="25%" class="dvtCellInfo">
<input type="text" value='{$PHONE_MOBILE}' name="phone_mobile" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Reports To </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_REPORTS_TO}</td>
<td class="dvtCellInfo">
<input readonly name='reports_to_name' class="small" type="text" value='{$REPORTS_TO_NAME}'><input name='reports_to_id' type="hidden" value='{$REPORTS_TO_ID}'> <input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='Change' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");'></td>
- <td class="dvtCellLabel" align="right">Other</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_PHONE}</td>
<td class="dvtCellInfo">
<input type="text" name="phone_other" value='{$PHONE_OTHER}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Other Email </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_EMAIL}</td>
<td width="30%" align=left class="dvtCellInfo">
<input type="text" name="email2" value='{$EMAIL2}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
- <td class="dvtCellLabel" align="right">Fax</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_FAX}</td>
<td class="dvtCellInfo">
<input type="text" name="phone_fax" value='{$PHONE_FAX}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
@@ -173,21 +173,21 @@
<td class="dvtCellLabel" align="right">Chat IDs </td>
<td width="30%" align=left class="dvtCellInfo">
<input type="text" name="yahoo_id" value='{$YAHOO_ID}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
- <td class="dvtCellLabel" align="right">Home Phone </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_HOME_PHONE}</td>
<td class="dvtCellInfo">
<input type="text" name="phone_home" value='{$PHONE_HOME}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Date Format </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_DATE_FORMAT}</td>
<td width="30%" align=left class="dvtCellInfo">{$DATE_FORMAT}</td>
<td class="dvtCellLabel" align="right"> </td>
<td class="dvtCellInfo"> </td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Signature</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_SIGNATURE}</td>
<td width="30%" align=left class="dvtCellInfo">
<textarea name="signature" rows="3" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" >{$SIGNATURE}</textarea></td>
- <td class="dvtCellLabel" align="right">Notes</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_NOTES}</td>
<td class="dvtCellInfo">
<textarea name="description" rows="3" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" >{$DESCRIPTION}</textarea></td>
</tr>
@@ -197,27 +197,27 @@
<td colspan="4" class="detailedViewHeader"><b>My Postal Address </b> </td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right" width="25%">Street Address </td>
+ <td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_ADDRESS}</td>
<td width="30%" colspan="3" class="dvtCellInfo">
<textarea name="address_street" rows="3" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" >{$ADDRESS_STREET}</textarea></td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">City</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_CITY}</td>
<td width="30%" colspan="3" nowrap class="dvtCellInfo">
<input type="text" name="address_city" value='{$ADDRESS_CITY}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">State</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_STATE}</td>
<td colspan="3" class="dvtCellInfo">
<input type="text" value='{$ADDRESS_STATE}' name="address_state" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Postal Code </td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_POSTAL_CODE}</td>
<td width="30%" colspan="3" align=left class="dvtCellInfo">
<input type="text" value='{$ADDRESS_POSTALCODE}' name="address_postalcode" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right">Country</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_COUNTRY}</td>
<td width="30%" colspan="3" align=left class="dvtCellInfo">
<input type="text" value='{$ADDRESS_COUNTRY}' name="address_country" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
@@ -274,7 +274,7 @@
</div>
- <div id="mnuTab2">
+ {* <div id="mnuTab2">
<table class="dvtContentSpace" border="0" cellpadding="3" cellspacing="0" width="100%">
<tr>
<td align="left">
@@ -367,7 +367,7 @@
</tr>
</table>
- </div>
+ </div>*}
</td>
</tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RoleDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RoleDetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RoleDetailView.tpl Wed May 10 16:20:02 2006
@@ -28,7 +28,7 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
<tr>
<td class="showPanelBg" valign="top" width="95%" style="padding-left:20px; "><br />
- <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > Role of {$ROLE_NAME} </b></span>
+ <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_USER_ROLE} of {$ROLE_NAME} </b></span>
<hr noshade="noshade" size="1" />
</td>
</tr>
@@ -37,30 +37,30 @@
<td width="95%" style="padding-left:20px;" valign="top"> <table width="95%" cellpadding="5" cellspacing="0" class="leadTable" align="center">
<tr>
<td style="padding:5px;border-bottom:2px dotted #CCCCCC;" width="5%" ><img src="{$IMAGE_PATH}roles.gif" align="absmiddle" /> </td>
- <td style="padding:5px;border-bottom:2px dotted #AAAAAA;"><span class="genHeaderGrayBig">{$ROLE_NAME} Role</span><br />
- <span class="big">Detail view of {$ROLE_NAME} Role</span> </td>
+ <td style="padding:5px;border-bottom:2px dotted #AAAAAA;"><span class="genHeaderGrayBig">{$ROLE_NAME} {$CMOD.LBL_USER_ROLE}</span><br />
+ <span class="big">{$CMOD.LBL_DETAIL_VIEW} {$ROLE_NAME} {$CMOD.LBL_USER_ROLE}</span> </td>
</tr>
<tr><td colspan="2"> </td></tr>
<tr>
<td colspan="2" >
<table width="100%" cellpadding="5" cellspacing="0" border="0" >
<tr>
- <td colspan="4" class="detailedViewHeader"><b>Group Details</b></td>
+ <td colspan="4" class="detailedViewHeader"><b>{$CMOD.LBL_GROUP_DETAILS}</b></td>
</tr>
<tr>
<td class="dvtCellLabel" width="5%"> </td>
- <td class="dvtCellLabel" align="right" width="25%"><b>Role Name :</b></td>
+ <td class="dvtCellLabel" align="right" width="25%"><b>{$CMOD.LBL_ROLE_NAME} :</b></td>
<td class="dvtCellInfo" align="left" width="25%">{$ROLE_NAME}</td>
<td class="dvtCellInfo" width="45%"> </td>
</tr>
<tr><td colspan="4" class="dvtCellInfo"> </td></tr>
<tr>
- <td colspan="4" class="detailedViewHeader"><b>Member List</b></td>
+ <td colspan="4" class="detailedViewHeader"><b>{$CMOD.LBL_MEMBER_LIST}</b></td>
</tr>
<tr>
<td class="dvtCellLabel" align="left"><img src="{$IMAGE_PATH}profile_icon.gif" align="top"></td>
- <td class="dvtCellLabel" align="right" valign="top"><b>Associated profiles :</b></td>
+ <td class="dvtCellLabel" align="right" valign="top"><b>{$CMOD.LBL_ASSOCIATED_PROFILES}</b></td>
<td colspan="2" align="left" class="dvtCellInfo">
{foreach item=elements from=$ROLEINFO.profileinfo}
<a href="index.php?module=Users&action=profilePrivileges&parenttab=Settings&profileid={$elements.0}&mode=view">{$elements.1}</a><br>
@@ -70,7 +70,7 @@
{if $ROLEINFO.userinfo.0 neq ''}
<tr>
<td class="dvtCellLabel" align="left"><img src="{$IMAGE_PATH}user_icon.gif" align="top"></td>
- <td class="dvtCellLabel" align="right" valign="top"><b>Associated Users :</b></td>
+ <td class="dvtCellLabel" align="right" valign="top"><b>{$CMOD.LBL_ASSOCIATED_USERS}</b></td>
<td colspan="2" align="left" class="dvtCellInfo">
{foreach item=elements from=$ROLEINFO.userinfo}
<a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$elements.0}">{$elements.1}</a><br>
@@ -82,9 +82,9 @@
<tr>
<td colspan="4" class="dvtCellInfo" align="center">
<!-- <input title="Back" accessKey="C" class="classBtn" onclick="window.history.back();" type="button" name="New" value=" < Back " > -->
- <input value=" Edit " title="Edit" accessKey="E" class="classBtn" type="submit" name="Edit" >
+ <input value=" {$APP.LBL_EDIT_BUTTON_LABEL} " title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" type="submit" name="Edit" >
- <input title="Delete" accessKey="D" class="classBtn" onclick="DeleteRole('{$ROLEID}')" type="button" name="Delete" value="Delete">
+ <input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="classBtn" onclick="DeleteRole('{$ROLEID}')" type="button" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">
</td>
</tr>
<tr><td colspan="2"> </td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RoleEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RoleEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RoleEditView.tpl Wed May 10 16:20:02 2006
@@ -66,8 +66,8 @@
<td class="genHeaderSmall" style="padding-right: 10px;" align="right" nowrap valign="top" width="15%">
<img src="{$IMAGE_PATH}one.gif" align="absmiddle">
</td>
- <td align="left" nowrap="nowrap" width="85%"><b>Role Name</b><br>
- Specify a name for new role :
+ <td align="left" nowrap="nowrap" width="85%"><b>{$CMOD.LBL_ROLE_NAME}</b><br>
+ {$CMOD.LBL_SPECIFY_ROLE_NAME}
<input type="text" name="roleName" class="importBox" value="{$ROLENAME}">
</td>
</tr>
@@ -76,7 +76,7 @@
<td class="genHeaderSmall" style="padding-right: 10px;" align="right" nowrap valign="top">
<img src="{$IMAGE_PATH}two.gif" align="absmiddle">
</td>
- <td><b>Assign Profile(s)</b><br>Select the Profiles below and click on assign button </td>
+ <td><b>{$CMOD.LBL_ASSIGN_PROFILE}</b><br>{$CMOD.LBL_PROFILE_SELECT_TEXT}</td>
</tr>
<tr>
<td class="genHeaderSmall" style="padding-right: 10px;" align="right" valign="top"> </td>
@@ -88,7 +88,7 @@
<table align="center" border="0" cellpadding="0" cellspacing="0" width="75%">
<tbody>
<tr>
- <td align="center"><b>Profiles Available</b><br>
+ <td align="center"><b>{$CMOD.LBL_PROFILES_AVLBL}</b><br>
<select id="availList" name="availList" size="10" multiple style="width: 150px;">
{foreach item=element from=$PROFILELISTS}
<option value="{$element.0}">{$element.1}</option>
@@ -101,7 +101,7 @@
<br><br>
<input type="button" name="Button1" value=" ‹‹ " class="classBtn" onClick="delColumn()">
</td>
- <td align="center"><b>Assigned Profiles </b><br>
+ <td align="center"><b>{$CMOD.LBL_ASSIGN_PROFILES}</b><br>
<select id="selectedColumns" name="selectedColumns" multiple size="10" style="width: 150px;">
{foreach item=element from=$SELPROFILELISTS}
<option value="{$element.0}">{$element.1}</option>
@@ -119,13 +119,13 @@
</tr>
<tr>
<td align="right" nowrap><img src="{$IMAGE_PATH}three.gif" align="absmiddle"></td>
- <td><b>Reports to Role</b><br>{$PARENTNAME}</td>
+ <td><b>{$CMOD.LBL_REPORTS_TO_ROLE}</b><br>{$PARENTNAME}</td>
</tr>
<tr><td colspan="2" style="border-bottom: 1px dashed rgb(204, 204, 204);"> </td></tr>
<tr>
<td colspan="2" align="center">
- <input value=" Save " name="Next" type="submit" class="classBtn" onClick="return validate()" >
- <input value=" Cancel " name="Cancel" type="button" class="classBtn" onClick="window.history.back()">
+ <input value=" {$APP.LBL_SAVE_BUTTON_LABEL} " name="Next" type="submit" class="classBtn" onClick="return validate()" >
+ <input value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" type="button" class="classBtn" onClick="window.history.back()">
</td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Rss.tpl Wed May 10 16:20:02 2006
@@ -75,7 +75,7 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
<tr>
<td class="showPanelBg" valign="top" width="95%" style="padding-left:20px; "><br />
- <span class="lvtHeaderText">Tools > Rss </span>
+ <span class="lvtHeaderText">{$CATEGORY} > {$MODULE} </span>
<hr noshade="noshade" size="1" />
</td>
@@ -98,7 +98,7 @@
<tr>
<td style="padding:10px;vertical-align:middle;" width="28%">
- <img src='{$IMAGEPATH}rssroot.gif' align='absmiddle'/><a href="javascript:;" onClick="fnvshobj(this,'PopupLay');" title='{$APP.LBL_ADD_RSS_FEEDS}'>Add Rss Feed</a>
+ <img src='{$IMAGEPATH}rssroot.gif' align='absmiddle'/><a href="javascript:;" onClick="fnvshobj(this,'PopupLay');" title='{$APP.LBL_ADD_RSS_FEEDS}'>{$MOD.LBL_ADD_RSS_FEED}</a>
</td>
<td width="2%"> </td>
<td width="60%"><img src="{$IMAGEPATH}rssimage.gif" width="176" height="44" align="right"/></td>
@@ -154,23 +154,23 @@
<div id="PopupLay">
<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
- <td class="genHeaderSmall" align="left"><img src="{$IMAGEPATH}rssroot.gif" width="24" height="22" align="absmiddle" /> Add RSS Feed</td>
+ <td class="genHeaderSmall" align="left"><img src="{$IMAGEPATH}rssroot.gif" width="24" height="22" align="absmiddle" /> {$MOD.LBL_ADD_RSS_FEED}</td>
<td align="right"><a href="javascript:fninvsh('PopupLay');"><img src="{$IMAGEPATH}close.gif" border="0" align="absmiddle" /></a></td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
<tr>
- <td align="right" width="30%"><b>Feed :</b></td>
+ <td align="right" width="30%"><b>{$MOD.LBL_FEED}</b></td>
<td align="left" width="70%"><input type="text" id="rssurl" class="txtBox" /></td>
</tr>
<tr>
- <td align="right"><b>Category : </b></td>
+ <td align="right"><b>{$MOD.LBL_CATEGORY}</b></td>
<td align="left"><select id="rsscategory" class="importBox" style="width:100%">{$RSSCATEG}</select></td>
</tr>
<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;"> </td></tr>
<tr>
<td colspan="2" align="center">
- <input type="button" name="save" value=" Save " class="classBtn" onClick="SaveRssFeeds();"/>
+ <input type="button" name="save" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " class="classBtn" onClick="SaveRssFeeds();"/>
</td>
</tr>
<tr><td colspan="2" style="border-top:1px dashed #CCCCCC;"> </td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RssFeeds.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RssFeeds.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RssFeeds.tpl Wed May 10 16:20:02 2006
@@ -10,10 +10,10 @@
********************************************************************************/
-->*}
<table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr><td colspan="2" class="subHdr"><b>Feeds list from : {$TITLE}</b></td></tr>
+ <tr><td colspan="2" class="subHdr"><b>{$MOD.LBL_FEEDS_LIST} {$TITLE}</b></td></tr>
<tr class="delBg"><td>
- <input type="button" name="delete" value=" Delete " class="classBtn" onClick="DeleteRssFeeds('{$ID}');"/></td>
- <td align="right"><input type="button" name="setdefault" value=" Set As Default " class="classBtn" onClick="makedefaultRss('{$ID}');"/>
+ <input type="button" name="delete" value=" {$MOD.LBL_DELETE_BUTTON} " class="classBtn" onClick="DeleteRssFeeds('{$ID}');"/></td>
+ <td align="right"><input type="button" name="setdefault" value=" {$MOD.LBL_SET_DEFAULT_BUTTON} " class="classBtn" onClick="makedefaultRss('{$ID}');"/>
</td></tr>
<tr><td colspan="2" align="left"><div id="rssScroll">{$RSSDETAILS}</div></td></tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/Contact.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/Contact.php Wed May 10 16:20:02 2006
@@ -197,7 +197,7 @@
{
global $log;
$log->debug("Entering get_contacts1(".$user_name.",".$email_address.") method ...");
- $query = "select users.user_name,groups.groupname, contactdetails.lastname last_name,contactdetails.firstname first_name,contactdetails.contactid as id, contactdetails.salutation as salutation, contactdetails.email as email1,contactdetails.title as title,contactdetails.mobile as phone_mobile,account.accountname as account_name,account.accountid as account_id from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join users on users.id=crmentity.smownerid left join account on account.accountid=contactdetails.accountid left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid where user_name='" .$user_name ."' and crmentity.deleted=0 and contactdetails.email like '%" .$email_address ."%' limit 50";
+ $query = "select users.user_name, contactdetails.lastname last_name,contactdetails.firstname first_name,contactdetails.contactid as id, contactdetails.salutation as salutation, contactdetails.email as email1,contactdetails.title as title,contactdetails.mobile as phone_mobile,account.accountname as account_name,account.accountid as account_id from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join users on users.id=crmentity.smownerid left join account on account.accountid=contactdetails.accountid left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid where user_name='" .$user_name ."' and crmentity.deleted=0 and contactdetails.email like '%" .$email_address ."%' limit 50";
$log->debug("Exiting get_contacts1 method ...");
return $this->process_list_query1($query);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php Wed May 10 16:20:02 2006
@@ -45,6 +45,10 @@
var $date_start;
var $time_start;
var $module_id="emailid";
+
+ var $rel_users_table = "salesmanactivityrel";
+ var $rel_contacts_table = "cntactivityrel";
+ var $rel_serel_table = "seactivityrel";
var $table_name = "activity";
var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel');
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Import/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Import/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Import/language/en_us.lang.php Wed May 10 16:20:02 2006
@@ -112,7 +112,7 @@
'LBL_DATABASE_FIELD'=>'Database Field',
'LBL_HEADER_ROW'=>'Header Row',
'LBL_ROW'=>'Row',
-'LBL_SAVE_AS_CUSTOM'=>'Save as Custom Mapping:',
+'LBL_SAVE_AS_CUSTOM'=>'Save as Custom Mapping :',
'LBL_CONTACTS_NOTE_1'=>'Either Last Name or Full Name must be mapped.',
'LBL_CONTACTS_NOTE_2'=>'If Full Name is mapped, then First Name and Last Name are ignored.',
'LBL_CONTACTS_NOTE_3'=>'If Full Name is mapped, then the data in Full Name will be split into First Name and Last Name when inserted into the database.',
@@ -147,7 +147,19 @@
//Added for patch2 - Products Import Notes
'LBL_PRODUCTS_NOTE_1'=>'Product Name must be mapped',
-'LBL_PRODUCTS_NOTE_2'=>'Before import please check whether a single column has been mapped twice'
+'LBL_PRODUCTS_NOTE_2'=>'Before import please check whether a single column has been mapped twice',
+
+//Added for version 5
+'LBL_FILE_LOCATION'=>'File Location :',
+'LBL_STEP_2_3'=>'Step 2 of 3 :',
+'LBL_LIST_MAPPING'=>'List & Mapping',
+'LBL_STEP_2_MSG'=>'The following tables shows the imported',
+'LBL_STEP_2_MSG1'=>'and other details.',
+'LBL_STEP_2_TXT'=>'To map the fields, Select the corresponding in combo boxes for each',
+'LBL_USE_SAVED_MAPPING'=>'Use Saved Mapping :',
+'LBL_MAPPING'=>'Mapping',
+'LBL_HEADERS'=>'Headers :'
+
);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Rss/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Rss/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Rss/language/en_us.lang.php Wed May 10 16:20:02 2006
@@ -30,6 +30,15 @@
'LBL_STARRED_RSS'=>'Starred Feeds',
'LBL_POP_CRM_RSS'=>'Popular CRM Related Feeds',
-'LBL_ALL_RSS_FEEDS'=>'All RSS Feeds'
+'LBL_ALL_RSS_FEEDS'=>'All RSS Feeds',
+
+'LBL_CATEGORY'=>'Category :',
+'LBL_FEED'=>'Feed :',
+'LBL_ADD_RSS_FEED'=>'Add Rss Feed',
+'LBL_DELETE_BUTTON'=>'Delete',
+'LBL_SET_DEFAULT_BUTTON'=>'Set As Default',
+'LBL_FEEDS_LIST'=>'Feeds list from :'
+
+
);
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Settings/language/en_us.lang.php Wed May 10 16:20:02 2006
@@ -170,6 +170,8 @@
'FieldType'=>'Field Type',
+'FieldLabel'=>'Field Label',
+
'Delete'=>'Del',
'NEW'=>'New',
@@ -357,8 +359,6 @@
'LBL_EVENT_FIELD_ACCESS'=>'Event Field Access',
-'LBL_CAMPAIGN_FIELD_ACCESS'=>'Campaign Field Access',
-
'LBL_DELETE_DEMO_DATA'=>'Delete Demo Data',
'LBL_DELETE_DEMO_DATA_INFO'=>'- Delete the Demo Data which is created at the time of installation',
@@ -369,26 +369,29 @@
'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings',
-'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'- Create and Manage user defined fields',
+'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined fields...',
+
+'LBL_SELECT_MODULE'=>'Select Module',
+
+'LBL_SELECT_CF_TEXT'=>'Select the CRM module to show CustomFields :',
+
+
+
+'LBL_PICKLIST_SETTINGS'=>'Picklist Settings',
+
+'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist fields',
'LBL_EDIT'=>'Editing',
-
-'LBL_PICKLIST_SETTINGS'=>'Picklist Settings',
-
-'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist fields',
-
-
-
'LBL_COMMUNICATION_TEMPLATES'=>'Communication Templates',
-'LBL_CREATE_EMAIL_TEMPLATES'=>' - Create Email Templates',
+'LBL_CREATE_EMAIL_TEMPLATES'=>'Creating Email Template',
'LBL_UPLOAD_MSWORD_TEMPLATES'=>' - Upload MS Word Templates for Mail Merge',
'LBL_SCHEDULE_EMAIL_NOTIFICATION'=>' - Schedule Email Notifications',
-
+'LBL_EXPAND_CLOSE_MENU'=>'Expand/Close Menu',
'LBL_CONFIGURATION'=>'Configuration',
@@ -545,6 +548,7 @@
'LBL_CONTACT_FIELD'=>'Contact Field',
'LBL_POTENTIAL_FIELD'=>'Potential Field',
'CUSTOMFIELDMAPPING'=>'Custom Field Mapping',
+'LBL_FIELD_MAPPING'=>'Field Mapping',
'LBL_LEAD_FIELD'=>'Lead Field',
//After 4.2 GA
'LBL_TEXT_AREA'=>'Text Area',
@@ -572,10 +576,7 @@
'LBL_PICKLIST_AVAILINFO1'=>'The picklists available in',
'LBL_PICKLIST_AVAILINFO2'=>'are shown below. Click Edit to modify the contents of the list.',
'LBL_EDIT_PICKLIST'=>'Edit Pick List',
-'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.',
-'LBL_SELECT_MODULE'=>'Select Module',
-'LBL_SELECT_CRM_MODULE'=>'Select the CRM module',
-'LBL_EDIT'=>'Edit',
+'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.'
);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateSharingRule.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateSharingRule.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/CreateSharingRule.php Wed May 10 16:20:02 2006
@@ -106,7 +106,7 @@
<input type="hidden" name="shareId" value="'.$shareid.'">
<input type="hidden" name="mode" value="'.$mode.'">
- <div id="orgLay">
+ <div id="orgLay" style="display:block;">
<table width="100%" border="0" cellpadding="3" cellspacing="0">
<tr>
<td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="60%">'.$sharing_module.' - Add Custom Privilege Rule</td>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/language/en_us.lang.php Wed May 10 16:20:02 2006
@@ -275,6 +275,15 @@
'LBL_TITLE_ROLE_NAME'=>'New Role',
'LBL_ROLE_NAME'=>'Role Name',
'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile',
+'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :',
+'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)',
+'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button',
+'LBL_PROFILES_AVLBL'=>'Profiles Available',
+'LBL_ASSIGN_PROFILES'=>'Assigned Profiles',
+'LBL_REPORTS_TO_ROLE'=>'Reports to Role',
+'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
+'LBL_ASSOCIATED_USERS'=>'Associated Users :',
+
//Added fields in OrgSharingDetailsView.php
'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing Privileges',
@@ -431,7 +440,6 @@
'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select fields to be shown'
-
);
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/soap/contactserialize.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/soap/contactserialize.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/soap/contactserialize.php Wed May 10 16:20:02 2006
@@ -1467,6 +1467,7 @@
$email_subject = str_replace("'", "''", $email_subject);
//fixed subject issue 9/6/05
+ $email->column_fields[activitytype]='Emails';
$email->column_fields[subject]=$email_subject;
$email->column_fields[assigned_user_id] = $user_id;
$email->column_fields[date_start] = $date_sent;
More information about the vtigercrm-commits
mailing list