[Vtigercrm-commits] [vtiger-commits] r5850 - in /vtigercrm/branches/5.0_postgresql_integration: Smarty/templates/ Smarty/templates/Settings/ include/utils/ modules/Calendar/ modules/Calendar/language/ modules/Emails/ modules/Emails/language/ modules/Import/ modules/Invoice/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/Quotes/ modules/Reports/language/ modules/SalesOrder/ modules/Settings/language/ modules/Users/ modules/Users/language/ modules/Vendors/ themes/blue/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Wed May 10 11:52:30 EDT 2006
Author: jeffk
Date: Wed May 10 09:51:54 2006
New Revision: 5850
Log:
refs #752. merge trunk changesets [5806] through [5849]
Removed:
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendar.php
Modified:
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateEmailTemplate.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateProfile.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateProfile1.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateWordTemplate.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailViewEmailTemplate.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailViewHidden.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EditProfile.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/FieldAccess.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/GroupDetailview.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/GroupEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ImportStep2.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListEmailTemplates.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListGroup.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListWordTemplates.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Popup.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ProfileDetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RelatedListsHidden.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportColumns.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportColumnsTotal.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportFilters.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportGrouping.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportRun.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportRunContents.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Reports.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsCustomize.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsStep0.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsStep1.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsType.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/CompanyInfo.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/ModuleOwnersContents.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/PickList.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/PickListContents.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/SettingsMenu.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserDetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserListView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserProfile.tpl
vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php
vtigercrm/branches/5.0_postgresql_integration/include/utils/UserInfoUtil.php
vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Appointment.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/CalendarAjax.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Import/Forms.php
vtigercrm/branches/5.0_postgresql_integration/modules/Import/ImportStep3.php
vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Products/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Reports/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Settings/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/DefaultFieldPermissions.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/EditDefOrgFieldLevelAccess.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/ListView.php
vtigercrm/branches/5.0_postgresql_integration/themes/blue/style.css
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl Wed May 10 09:51:54 2006
@@ -58,12 +58,7 @@
<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}">
- {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>
+ <textarea id="parent_name" cols="50">{$elements.3.0}</textarea>
</td>
<td class="dvtCellLabel" style="padding: 5px;" align="left">
<select name="parent_type">
@@ -72,9 +67,8 @@
{/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'>
+ <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&popuptype=set_return_emails","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>
</td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateEmailTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateEmailTemplate.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateEmailTemplate.tpl Wed May 10 09:51:54 2006
@@ -121,10 +121,10 @@
<td class="showPanelBg" valign="top" width="90%" style="padding-left:20px; "><br />
{if $EMODE eq 'edit'}
<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a>
- <a href="index.php?module=Users&action=detailviewemailtemplate&templateid={$TEMPLATEID}"> > Communication Templates > Editing Email Templates > {$TEMPLATENAME}</a></b></span>
+ <a href="index.php?module=Users&action=detailviewemailtemplate&templateid={$TEMPLATEID}"> > {$MOD.LBL_COMMUNICATION_TEMPLATES} > {$MOD.LBL_EDIT} {$MOD.EMAILTEMPLATES} > {$TEMPLATENAME}</a></b></span>
{else}
<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a>
- <a href="index.php?module=Users&action=listemailtemplates">> Communication Templates > Creating Email Templates > New</a></b> </span>
+ <a href="index.php?module=Users&action=listemailtemplates">> {$MOD.LBL_COMMUNICATION_TEMPLATES} > {$MOD.LBL_CREATE_EMAIL_TEMPLATES} > {$MOD.NEW}</a></b> </span>
{/if}
<hr noshade="noshade" size="1" />
</td>
@@ -145,9 +145,9 @@
<td width="5%" valign="top" align="right" nowrap>
<b><font color='red'>*</font>{$UMOD.LBL_TEMPLATE_NAME}</b><br />
<br />
- <b>Description:</b><br />
+ <b>{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_COLON}</b><br />
<br /><br />
- <b><font color='red'>*</font>Folder:</b>
+ <b><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font>{$UMOD.LBL_FOLDER}{$UMOD.LBL_COLON}</b>
</td>
<td width="85%" align="left" style="padding-left:10px;">
@@ -162,9 +162,9 @@
<option value="{$FOLDERNAME}" {$arr}>{$FOLDERNAME}</option>
{if $FOLDERNAME == 'Public'}
- <option value="Personal">Personal</option>
+ <option value="Personal">{$UMOD.LBL_PERSONAL}</option>
{else}
- <option value="Public">Public</option>
+ <option value="Public">{$UMOD.LBL_PUBLIC}</option>
{/if}
{/foreach}
@@ -197,12 +197,12 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
<tr><td style="color:#999999;">{$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}</td></tr>
- <tr><td><b><u>Available Merge Fields</u></b></td></tr>
+ <tr><td><b><u>{$UMOD.LBL_AVAILABLE_MERGE_FIELDS}</u></b></td></tr>
<tr><td> </td></tr>
<tr><td><b>{$UMOD.LBL_SELECT_FIELD_TYPE}</b></td></tr>
<tr><td><select class="detailedViewTextBox" id="entityType" ONCHANGE="modifyMergeFieldSelect(this, document.getElementById('mergeFieldSelect'));" tabindex="6">
- <OPTION VALUE="0" selected>--None--
+ <OPTION VALUE="0" selected>{$APP.LBL_NONE}
<OPTION VALUE="1">{$UMOD.LBL_CONTACT_FIELDS}
@@ -213,7 +213,7 @@
</select></td></tr>
<tr><td> </td></tr>
<tr><td><b>{$UMOD.LBL_SELECT_FIELD}</b></td></tr>
- <tr><td><select class="detailedViewTextBox" id="mergeFieldSelect" onchange="document.getElementById('mergeFieldValue').value=this.options[this.selectedIndex].value;" tabindex="7"><option value="0" selected>--None--</select></td></tr>
+ <tr><td><select class="detailedViewTextBox" id="mergeFieldSelect" onchange="document.getElementById('mergeFieldValue').value=this.options[this.selectedIndex].value;" tabindex="7"><option value="0" selected>{$APP.LBL_NONE}</select></td></tr>
<tr><td> </td></tr>
<tr><td><b>{$UMOD.LBL_MERGE_FIELD_VALUE}</b></td></tr>
@@ -250,11 +250,11 @@
<tr>
<td align="center">
- <input type="submit" value="Save" class="small" onclick="this.form.action.value='saveemailtemplate'" tabindex="9"/>
+ <input type="submit" value="{$APP.LBL_SAVE_BUTTON_LABEL}" class="small" onclick="this.form.action.value='saveemailtemplate'" tabindex="9"/>
{if $EMODE eq 'edit'}
- <input type="submit" value="Cancel" class="small" onclick="cancelForm(this.form)" tabindex="10"/>
+ <input type="submit" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="small" onclick="cancelForm(this.form)" tabindex="10"/>
{else}
- <input type="button" value="Cancel" class="small" onclick="window.history.back()" tabindex="10">
+ <input type="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="small" onclick="window.history.back()" tabindex="10">
{/if}
</td>
<td> </td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateProfile.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateProfile.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateProfile.tpl Wed May 10 09:51:54 2006
@@ -39,8 +39,9 @@
<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
</td>
<td style="border-bottom:1px dashed #CCCCCC;">
- <span class="genHeaderGrayBig">Basic details of Profile</span><br>
- <span class="genHeaderSmall">Step 1 Of 3</span>
+ <span class="genHeaderGrayBig">{$CMOD.LBL_BASIC_PROFILE_DETAILS}</span><br>
+ <span class="genHeaderSmall">{$CMOD.LBL_STEP_1_3}</span>
+
</td>
</tr>
</table>
@@ -48,7 +49,7 @@
<tr><td colspan="2"> </td></tr>
<tr>
<td align="right" width="25%" style="padding-right:10px;">
- <b style="color:#FF0000;font-size:16px;">*</b> <b>{$CMOD.LBL_NEW_PROFILE_NAME} : </b></td>
+ <b style="color:#FF0000;font-size:16px;">{$APP.LBL_REQUIRED_SYMBOL}</b> <b>{$CMOD.LBL_NEW_PROFILE_NAME} : </b></td>
<td width="75%" align="left" style="padding-left:10px;">
<input type="text" name="profile_name" id="pobox" value="{$PROFILENAME}" class="txtBox" /></td>
</tr>
@@ -60,9 +61,9 @@
<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;" height="75"> </td></tr>
<tr>
<td colspan="2" align="right">
- <input type="button" value=" ‹ Back " name="back" class="classBtnDisable" disabled />
- <input type="submit" value=" Next › " accessKey="N" class="classBtn" name="Next" onClick="return rolevalidate();"/>
- <input type="button" value=" Cancel " name="Cancel" onClick="window.history.back()"; class="classBtn"/>
+ <input type="button" value=" ‹ {$APP.LBL_BACK} " name="back" class="classBtnDisable" disabled />
+ <input type="submit" value=" {$APP.LNK_LIST_NEXT} › " class="classBtn" name="Next" onClick="return rolevalidate();"/>
+ <input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " title="{$APP.LBL_CANCEL_BUTTON_TITLE}" name="Cancel" onClick="window.history.back()"; class="classBtn"/>
</td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateProfile1.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateProfile1.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateProfile1.tpl Wed May 10 09:51:54 2006
@@ -41,8 +41,8 @@
<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
</td>
<td style="border-bottom:1px dashed #CCCCCC;">
- <span class="genHeaderGrayBig">Select Base Profile</span><br>
- <span class="genHeaderSmall">Step 2 Of 3</span>
+ <span class="genHeaderGrayBig">{$CMOD.LBL_SELECT_BASE_PROFILE}</span><br>
+ <span class="genHeaderSmall">{$CMOD.LBL_STEP_2_3}</span>
</td>
</tr>
</table>
@@ -56,11 +56,11 @@
<input name="radiobutton" type="radio" value="baseprofile" />
{/if}
</td>
- <td width="90%" align="left" style="padding-left:10px;">I would like to setup a base profile and edit privileges <b>(Recommened)</b></td>
+ <td width="90%" align="left" style="padding-left:10px;">{$CMOD.LBL_BASE_PROFILE_MESG}</td>
</tr>
<tr>
<td align="right" style="padding-right:10px;"> </td>
- <td align="left" style="padding-left:10px;">Base Profile:
+ <td align="left" style="padding-left:10px;">{$CMOD.LBL_BASE_PROFILE}
<select name="parentprofile" class="importBox">
{foreach item=combo from=$PROFILE_LISTS}
{if $PARENT_PROFILE eq $combo.1}
@@ -73,7 +73,7 @@
</td>
</tr>
<tr><td colspan="2"> </td></tr>
- <tr><td align="center" colspan="2"><b>( OR )</b></td></tr>
+ <tr><td align="center" colspan="2"><b>( {$CMOD.LBL_OR} )</b></td></tr>
<tr><td colspan="2"> </td></tr>
<tr>
<td align="right" style="padding-right:10px;">
@@ -83,14 +83,14 @@
<input name="radiobutton" type="radio" value="newprofile" />
{/if}
</td>
- <td align="left" style="padding-left:10px;">I will choose the privileges from scratch <b>(Advanced Users)</b></td>
+ <td align="left" style="padding-left:10px;">{$CMOD.LBL_BASE_PROFILE_MESG_ADV}</td>
</tr>
<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;" height="75"> </td></tr>
<tr>
<td colspan="2" align="right">
- <input type="Submit" value=" ‹ Back " name="back" onclick="this.form.action.value='CreateProfile';" class="classBtn"/>
- <input type="Submit" value=" Next › " accessKey="N" name="Next" class="classBtn"/>
- <input type="button" value=" Cancel " name="Cancel" class="classBtn"/>
+ <input type="Submit" value=" ‹ {$APP.LBL_BACK} " name="back" onclick="this.form.action.value='CreateProfile';" class="classBtn"/>
+ <input type="Submit" value=" {$APP.LNK_LIST_NEXT} › " name="Next" class="classBtn"/>
+ <input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " title="{$APP.LBL_CANCEL_BUTTON_TITLE}" name="Cancel" class="classBtn"/>
</td>
</tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateWordTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateWordTemplate.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CreateWordTemplate.tpl Wed May 10 09:51:54 2006
@@ -62,7 +62,7 @@
<td width="75%" colspan="2" >
<img src="{$IMAGE_PATH}fp2.gif" width="59" height="40" align="left"/>
<span class="genHeaderSmall">{$UMOD.LBL_SELECT_MODULE}</span><br />
- Select a module to assign this Template
+ {$UMOD.LBL_MERGE_MSG}
</td>
</tr>
<tr>
@@ -83,7 +83,7 @@
</td>
</tr>
<tr>
- <td align="right" valign="top"><b>{$UMOD.LBL_MERGE_FILE}</b></td>
+ <td align="right" valign="top"><font color="red">{$APP.LBL_REQUIRED_SYMBOL}</font><b>{$UMOD.LBL_MERGE_FILE}</b></td>
<td><input type="file" name="binFile" size="40" tabindex="3" /><br />(Eg - .doc, .rtf files)</td>
</tr>
<tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailViewEmailTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailViewEmailTemplate.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailViewEmailTemplate.tpl Wed May 10 09:51:54 2006
@@ -42,9 +42,9 @@
<tr><td width="75%" valign="middle" >
<img src="{$IMAGE_PATH}ViewTemplate.gif" align="left" />
<span class="genHeaderBig">{$TEMPLATENAME}</span><br />
- <span class="dashMnuUnSel">{$TEMPLATENAME} Template </span>
+ <span class="dashMnuUnSel">{$TEMPLATENAME} {$UMOD.LBL_TEMPLATE_HEADER} </span>
</td>
- <td width="25%" align="right" valign="bottom"><input type="submit" name="Button" value="Edit this template" class="small" onclick="this.form.action.value='editemailtemplate'"/></td>
+ <td width="25%" align="right" valign="bottom"><input type="submit" name="Button" value="{$UMOD.LBL_EDIT_TEMPLATE}" class="small" onclick="this.form.action.value='editemailtemplate'"/></td>
</tr>
</table>
</td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailViewHidden.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailViewHidden.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailViewHidden.tpl Wed May 10 09:51:54 2006
@@ -38,7 +38,7 @@
<input type="hidden" name="return_module">
<input type="hidden" name="parenttab" value="{$CATEGORY}">
<input type="hidden" name="return_action">
- <input type="hidden" name="return_id" value="{$ID}">
+ <input type="hidden" name="return_id">
<input type="hidden" name="reports_to_id">
<input type="hidden" name="opportunity_id">
<input type="hidden" name="contact_id" value="{$ID}">
@@ -76,7 +76,7 @@
<input type="hidden" name="action">
<input type="hidden" name="return_module">
<input type="hidden" name="return_action">
- <input type="hidden" name="return_id" value="{$ID}">
+ <input type="hidden" name="return_id">
<input type="hidden" name="lead_id" value="{$ID}">
<input type="hidden" name="parent_id" value="{$ID}">
<input type="hidden" name="email_directing_module">
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EditProfile.tpl Wed May 10 09:51:54 2006
@@ -34,8 +34,8 @@
<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
</td>
<td style="border-bottom:1px dashed #CCCCCC;">
- <span class="genHeaderGrayBig">Profile Privileges</span><br>
- <span class="genHeaderSmall">Step 3 Of 3</span>
+ <span class="genHeaderGrayBig">{$CMOD.LBL_PROFILE_PRIVILEGES}</span><br>
+ <span class="genHeaderSmall">{$CMOD.LBL_STEP_3_3}</span>
</td>
</tr>
{else}
@@ -47,7 +47,7 @@
<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
</td>
<td style="border-bottom:1px dashed #CCCCCC;">
- <span class="genHeaderGrayBig">Profile Privileges</span><br>
+ <span class="genHeaderGrayBig">{$CMOD.LBL_PROFILE_PRIVILEGES}</span><br>
<span class="genHeaderSmall">{$PROFILE_NAME}</span>
</td>
</tr>
@@ -81,11 +81,11 @@
<!-- tabs -->
<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
<tr>
- <td width="20%" id="prvPrfTab1" class="prvPrfSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');">Global Privileges</td>
- <td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');">Tab Privileges</td>
- <td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');">Standard Privileges</td>
- <td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');">Field Privileges</td>
- <td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');">Utilities</td>
+ <td width="20%" id="prvPrfTab1" class="prvPrfSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');">{$CMOD.LBL_GLOBAL_PRIVILEGES}</td>
+ <td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');">{$CMOD.LBL_TAB_PRIVILEGES}</td>
+ <td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');">{$CMOD.LBL_STANDARD_PRIVILEGES}</td>
+ <td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');">{$CMOD.LBL_FIELD_PRIVILEGES}</td>
+ <td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');">{$CMOD.LBL_UTILITIES}</td>
</tr>
</table>
<div id="global_privileges" style="display:block;">
@@ -99,8 +99,8 @@
<table border="0" cellspacing="0" cellpadding="2" class="small">
<tr>
<td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"/> </td>
- <td class="prvPrfBigText"><b> Global Privileges for "{$PROFILE_NAME}"</b> <br />
- <font class="small">Select the options below to change global privileges </font> </td>
+ <td class="prvPrfBigText"><b> {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
+ <font class="small">{$CMOD.LBL_GLOBAL_MESG_OPTION} </font> </td>
<td class="small" style="padding-left:10px" align="right"></td>
</tr>
</table>
@@ -124,22 +124,22 @@
<table border="0" cellspacing="0" cellpadding="2" width="100%" class="small">
<tr id="gva">
<td valign="top">{$GLOBAL_PRIV.0}</td>
- <td ><b>View all</b> </td>
+ <td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
</tr>
<tr >
<td valign="top"></td>
-<td width="100%" >Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM</td>
+<td width="100%" >{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
</tr>
<tr>
<td> </td>
</tr>
<tr>
<td valign="top">{$GLOBAL_PRIV.1}</td>
-<td ><b>Edit all</b> </td>
+<td ><b>{$CMOD.LBL_EDIT_ALL}</b> </td>
</tr>
<tr>
<td valign="top"></td>
-<td > Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM</td>
+<td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
</tr>
</table>
</td>
@@ -165,8 +165,8 @@
<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
</td>
<td class="prvPrfBigText">
-<b> Standard Privileges for "{$PROFILE_NAME}"</b> <br>
-<font class=small>Select the standard actions to be permitted </font>
+<b> {$CMOD.LBL_STANDARD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
+<font class=small>{$CMOD.LBL_STD_MESG_OPTION} </font>
</td>
</tr>
</table>
@@ -192,10 +192,10 @@
<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
<tr>
-<td>Entity</td>
-<td>Create/Edit</td>
-<td>Delete</td>
-<td>View</td>
+<td>{$CMOD.LBL_ENTITY}</td>
+<td>{$CMOD.LBL_CREATE_EDIT}</td>
+<td>{$CMOD.LBL_DELETE}</td>
+<td>{$CMOD.LBL_VIEW}</td>
</tr>
{foreach item=value from=$STANDARD_PRIV}
@@ -232,8 +232,8 @@
<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
</td>
<td class="prvPrfBigText">
-<b> Tab Privileges for "{$PROFILE_NAME}"</b> <br>
-<font class=small>Select the tabs/modules to be permitted </font>
+<b> {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
+<font class=small>{$CMOD.LBL_TAB_MESG_OPTION} </font>
</td>
</tr>
</table>
@@ -295,8 +295,8 @@
<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
</td>
<td class="prvPrfBigText">
-<b> Utility Privileges for "{$PROFILE_NAME}"</b> <br>
-<font class=small>Select the utility actions to be permitted </font>
+<b> {$CMOD.LBL_UTILITY_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
+<font class=small>{$CMOD.LBL_UTILITY_MESG_OPTION} </font>
</td>
</tr>
</table>
@@ -361,8 +361,8 @@
<tr>
<td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
-<td class="prvPrfBigText"><b> Field Privileges for "{$PROFILE_NAME}"</b> <br />
-<font class="small">Select the fields to be permitted </font> </td>
+<td class="prvPrfBigText"><b> {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
+<font class="small">{$CMOD.LBL_FIELD_MESG_OPTION} </font> </td>
</tr>
</table></td>
<td align="right" valign="bottom">
@@ -439,14 +439,14 @@
<tr>
<td colspan="2" align="center">
{if $MODE neq "edit"}
- <input type="submit" value=" ‹ Back " name="back" onclick="this.form.action.value='CreateProfile1'" class="classBtn" />
+ <input type="submit" value=" ‹ {$APP.LBL_BACK} " name="back" onclick="this.form.action.value='CreateProfile1'" class="classBtn" />
{/if}
{if $ACTION eq 'SaveProfile'}
- <input type="submit" value=" Finish " name="save" class="classBtn"/>
+ <input type="submit" value=" {$CMOD.LBL_FINISH_BUTTON} " name="save" class="classBtn"/>
{else}
- <input type="submit" value=" Save " name="save" class="classBtn"/>
+ <input type="submit" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " name="save" class="classBtn"/>
{/if}
- <input type="button" value=" Cancel " name="Cancel" class="classBtn"onClick="window.history.back();" />
+ <input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" class="classBtn"onClick="window.history.back();" />
</td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl Wed May 10 09:51:54 2006
@@ -10,23 +10,23 @@
********************************************************************************/
-->*}
<div id="rssScroll">
- <table class="rssTable" cellspacing="0" cellpadding="0">
- <tr>
- <th width="5%"><input type="checkbox" name="selectall" onClick=toggleSelect(this.checked,"selected_id")></th>
- {foreach item=element from=$LISTHEADER}
- <th>{$element}</th>
- {/foreach}
- </tr>
- {foreach key=id item=row from=$LISTENTITY}
- <tr onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'">
- <td>
- <input type="checkbox" NAME="selected_id" value= '{$id}' onClick=toggleSelectAll(this.name,"selectall")>
+ <table class="rssTable" cellspacing="0" cellpadding="0">
+ <tr>
+ <th width="5%"><input type="checkbox" name="selectall" onClick=toggleSelect(this.checked,"selected_id")></th>
+ {foreach item=element from=$LISTHEADER}
+ <th>{$element}</th>
+ {/foreach}
+ </tr>
+ {foreach key=id item=row from=$LISTENTITY}
+ <tr onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'">
+ <td>
+ <input type="checkbox" name="selected_id" value= '{$id}' onClick=toggleSelectAll(this.name,"selectall")>
</td>
- {foreach item=row_values from=$row}
- <td><b>{$row_values}</b></td>
- {/foreach}
- </tr>
- {/foreach}
- </table>
- </div>
+ {foreach item=row_values from=$row}
+ <td><b>{$row_values}</b></td>
+ {/foreach}
+ </tr>
+ {/foreach}
+ </table>
+</div>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl Wed May 10 09:51:54 2006
@@ -10,42 +10,38 @@
********************************************************************************/
-->*}
<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td> </td>
- <td class="forwardBg">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="75%">
- <input type="button" name="Qualify2" value=" {$MOD.LBL_QUALIFY_BUTTON} " class="classWebBtn" />
+<tr>
+ <td class="forwardBg">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <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')" />
- </td>
+ </td>
<td width="25%" align="right"><input type="button" name="Button" value=" {$APP.LBL_DELETE_BUTTON} " class="classWebBtn" onClick="DeleteEmail('{$ID}')"/></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td height="300" bgcolor="#FFFFFF" valign="top" style="padding-top:10px;">
- {foreach item=row from=$BLOCKS}
-{foreach item=elements key=title from=$row}
-{if $title eq 'Subject'}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+ </tr>
+ </table>
+ </td>
+</tr>
+<tr>
+ <td height="300" bgcolor="#FFFFFF" valign="top" style="padding-top:10px;">
+ {foreach item=row from=$BLOCKS}
+ {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 align="right" style="border-bottom:1px solid #666666;" colspan="3"> </td></tr>
+ <tr><td align="right" style="border-bottom:1px solid #666666;" colspan="3"> </td></tr>
+ </table>
+ {elseif $title eq 'Description'}
+ <div>
+ {$BLOCKS.4.Description.value}
+ </div>
+ {/if}
+ {/foreach}
+ {/foreach}
+ </td>
+</tr>
</table>
-{elseif $title eq 'Description'}
-<div>
-{$BLOCKS.4.Description.value}
-</div>
-{/if}
-{/foreach}
-{/foreach}
- </td>
- </tr>
-
-</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl Wed May 10 09:51:54 2006
@@ -59,9 +59,9 @@
<script language="JavaScript" type="text/javascript" src="modules/Emails/Email.js"></script>
<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
<tr>
- <td class="showPanelBg" valign="top" width="95%" style="padding-left:20px; "><br />
+ <td class="showPanelBg" valign="top" width="95%" style="padding-left:20px; "><br />
<span class="lvtHeaderText">{$CATEGORY} > {$MODULE} </span>
- <hr noshade="noshade" size="1" />
+ <hr noshade="noshade" size="1" />
</td>
<td width="5%" class="showPanelBg"> </td>
</tr>
@@ -69,121 +69,123 @@
<td width="95%" style="padding-left:20px;" valign="top">
<!-- module Select Table -->
<table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="7" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_left.jpg" align="top" /></td>
- <td bgcolor="#EBEBEB" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;height:6px;"></td>
- <td width="8" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_right.jpg" width="8" height="6" align="top" /></td>
- </tr>
- <tr>
- <td bgcolor="#EBEBEB" width="7"></td>
- <td bgcolor="#ECECEC" style="padding-left:10px;height:20px;vertical-align:middle;"><table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td colspan="3" style="padding:10px;vertical-align:middle;">
- <table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr>
- <td width="10%" >
- <img src="{$IMAGE_PATH}check_mail.gif" align="absmiddle" />
+ <td width="7" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_left.jpg" align="top" /></td>
+ <td bgcolor="#EBEBEB" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;height:6px;"></td>
+ <td width="8" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_right.jpg" width="8" height="6" align="top" /></td>
+ </tr>
+ <tr>
+ <td bgcolor="#EBEBEB" width="7"></td>
+ <td bgcolor="#ECECEC" style="padding-left:10px;height:20px;vertical-align:middle;">
+ <form name="massdelete" method="POST">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="3" style="padding:10px;vertical-align:middle;">
+ <table width="100%" cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td width="10%" >
+ <img src="{$IMAGE_PATH}check_mail.gif" align="absmiddle" />
<a href="#" class="webMnu" >{$MOD.LBL_CHK_MAIL}</a>
+ </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>
+ </td>
+ <td width="10%">
+ <img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />
+ <a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}" class="webMnu">{$MOD.LBL_SETTINGS}</a>
+ </td>
+ <td><img src="{$IMAGE_PATH}webmail_header.gif" align="right"/></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <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>
+ </tr>
+ <tr>
+ <td rowspan="6" valign="top" bgcolor="#FFFFFF" style="padding:10px; ">
+ <img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" /> <b class="txtGreen">{$MOD.LBL_INBOX}</b>
+ <ul style="list-style-type:none;">
+ <li><img src="{$IMAGE_PATH}webmail_downarrow.gif" align="absmiddle" />
+ <a href="index.php?module=Webmails&action=index" class="webMnu">{$MOD.LBL_QUAL_CONTACT}</a> <b></b>
+ </li>
+ <li><img src="{$IMAGE_PATH}webmail_downarrow.gif" align="absmiddle" />
+ <a href="index.php?module=Webmails&action=index" class="webMnu">{$MOD.LBL_MY_MAILS}</a> <b></b>
+ </li>
+ </ul><br />
+ <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>
+ </li>
+ </ul><br />
+ </td>
+ <td> </td>
+
+ <td class="delBg">
+ <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>
+ <td width="75%" align="right">
+ <font color="#000000">{$APP.LBL_SEARCH}</font> <input type="text" name="srch" class="importBox" />
+ <select name="optionSel" class="importBox"><option selected>in Subject</option></select>
+ <input type="button" name="find" value=" {$APP.LBL_FIND_BUTTON} " class="classWebBtn" />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td style="padding:1px;" align="left">
+ <div id="email_con">
+ {include file="EmailContents.tpl"}
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td height="5"></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="mailHdr" id="subjectsetter"> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td valign="top">
+ <div id="EmailDetails">
+ {include file="EmailDetails.tpl"}
+ </div>
+ </td>
+ </tr>
+ </table>
+ </form>
</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>
- </td>
- <td width="10%">
- <img src="{$IMAGE_PATH}webmail_settings.gif" align="absmiddle" />
- <a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}" class="webMnu">{$MOD.LBL_SETTINGS}</a>
- </td>
- <td><img src="{$IMAGE_PATH}webmail_header.gif" align="right"/></td>
+ <td bgcolor="#EBEBEB" width="8"></td>
</tr>
- </table>
- </td>
- </tr>
- <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>
- </tr>
- <tr>
- <td rowspan="6" valign="top" bgcolor="#FFFFFF" style="padding:10px; ">
- <img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" /> <b class="txtGreen">{$MOD.LBL_INBOX}</b>
- <ul style="list-style-type:none;">
- <li><img src="{$IMAGE_PATH}webmail_downarrow.gif" align="absmiddle" />
- <a href="index.php?module=Webmails&action=index" class="webMnu">{$MOD.LBL_QUAL_CONTACT}</a> <b></b>
- </li>
- <li><img src="{$IMAGE_PATH}webmail_downarrow.gif" align="absmiddle" />
- <a href="index.php?module=Webmails&action=index" class="webMnu">{$MOD.LBL_MY_MAILS}</a> <b></b>
- </li>
- <li><img src="{$IMAGE_PATH}webmail_trash.gif" align="absmiddle" />
- <a href="#" class="webMnu">....</a>
- </li>
- </ul><br />
- <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="index.php?module=Emails&action=ListView" class="webMnu">{$MOD.LBL_TO_LEADS}</a> <b></b>
- </li>
- <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="index.php?module=Emails&action=ListView" class="webMnu">{$MOD.LBL_TO_ACCOUNTS}</a> <b></b>
- </li>
- <li><img src="{$IMAGE_PATH}webmail_uparrow.gif" align="absmiddle" />
- <a href="index.php?module=Emails&action=ListView" class="webMnu">{$MOD.LBL_TO_CONTACTS}</a>
- </li>
- </ul><br />
- <img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" /> <b class="txtGreen">{$MOD.LBL_TRASH}</b>
- <ul style="list-style-type:none;">
- <li><img src="{$IMAGE_PATH}webmail_trash.gif" align="absmiddle" />
- <a href="#" class="webMnu">{$MOD.LBL_JUNK_MAILS}</a> <b></b>
- </li>
- </ul>
- </td>
- <td> </td>
- <td class="delBg"><table width="100%" border="0" cellspacing="0" cellpadding="0">
- <form name="massdelete" method="POST">
- <input name="idlist" type="hidden">
- <tr>
- <td width="25%"><input type="button" name="Button2" value=" {$APP.LBL_DELETE_BUTTON} " class="classWebBtn" onClick="return massDelete();"/>
- <input type="button" name="Qualify" value=" {$MOD.LBL_QUALIFY_BUTTON} " class="classWebBtn" />
- </td>
- <td width="75%" align="right">
- <font color="#000000">{$APP.LBL_SEARCH}</font> <input type="text" name="srch" class="importBox" />
- <select name="optionSel" class="importBox"><option selected>in Subject</option></select>
- <input type="button" name="find" value=" {$APP.LBL_FIND_BUTTON} " class="classWebBtn" />
- </td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td> </td>
- <td style="padding:1px;" align="left">
- <div id="email_con">
- {include file="EmailContents.tpl"}
- </div>
- </td>
- </tr>
- <tr>
- <td></td>
- <td height="5"></td>
- </tr>
- </form>
- <tr>
- <td> </td>
- <td class="mailHdr" id="subjectsetter"> </td>
- </tr>
- <tr><td colspan="2">
- <div id="EmailDetails">
- {include file="EmailDetails.tpl"}
- </div>
- </td></tr>
- </table>
- </td>
- <td bgcolor="#EBEBEB" width="8"></td>
- </tr>
- <tr>
- <td width="7" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom" /></td>
- <td bgcolor="#ECECEC" height="8" style="font-size:1px;" ></td>
- <td width="8" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom" /></td>
- </tr>
- </table><br />
+ <tr>
+ <td width="7" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom" /></td>
+ <td bgcolor="#ECECEC" height="8" style="font-size:1px;" ></td>
+ <td width="8" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom" /></td>
+ </tr>
+ </table><br />
</td>
<td> </td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/FieldAccess.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/FieldAccess.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/FieldAccess.tpl Wed May 10 09:51:54 2006
@@ -46,7 +46,7 @@
<td bgcolor="#ebebeb">
<table border="0" cellpadding="3" cellspacing="0" width="100%">
<tbody><tr>
- <td class="genHeaderSmall" height="25" valign="middle">Global Fields Manager</td>
+ <td class="genHeaderSmall" height="25" valign="middle">{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</td>
<td align="right"> </td>
</tr>
<tr><td colspan="2"></td></tr>
@@ -56,7 +56,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody><tr bgcolor="#ffffff">
<td style="padding: 10px;" align="left">
- <b>Select the Screen / Module :</b>
+ <b>{$CMOD.LBL_SELECT_SCREEN}</b>
<select name="selectmodule" style="width: 200px; font-size: 10px;" onChange="changemodules(this)">
{foreach item=module from=$FIELD_INFO}
@@ -88,8 +88,8 @@
{/if}
<table class="small" border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody><tr><td colspan="4" style="border-bottom: 1px dashed rgb(204, 204, 204);">
- <b>Fields Available in {$module} </b><br>
- Select or De-Select fields to be shown
+ <b>{$CMOD.LBL_FIELDS_AVLBL} {$module} </b><br>
+ {$CMOD.LBL_FIELDS_SELECT_DESELECT}
</td></tr>
<tr><td colspan="4"> </td></tr>
@@ -112,7 +112,7 @@
</td>
</tr>
<tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);padding:10px;" bgcolor="white" align="center">
- <input name="Cancel" value=" Cancel " class="classBtn" type="button" onClick="window.history.back();">
+ <input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="classBtn" type="button" onClick="window.history.back();">
</td></tr>
</tbody>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/GroupDetailview.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/GroupDetailview.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/GroupDetailview.tpl Wed May 10 09:51:54 2006
@@ -35,8 +35,8 @@
<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="{$IMAGEPATH}groups.gif" width="48" height="48" align="absmiddle" /> </td>
- <td style="padding:5px;border-bottom:2px dotted #AAAAAA;"><span class="genHeaderGrayBig">{$GROUPINFO.0.groupname} Group</span><br />
- <span class="big">Detail view of {$GROUPINFO.0.groupname} Group</span> </td>
+ <td style="padding:5px;border-bottom:2px dotted #AAAAAA;"><span class="genHeaderGrayBig">{$GROUPINFO.0.groupname} {$APP.LBL_GROUP}</span><br />
+ <span class="big">{$CMOD.LBL_DETAIL_VIEW} {$GROUPINFO.0.groupname} {$APP.LBL_GROUP}</span> </td>
</tr>
<tr>
<td colspan="2"> </td>
@@ -44,24 +44,24 @@
<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>Group Name :</b></td>
+ <td class="dvtCellLabel" align="right" width="25%"><b>{$CMOD.LBL_GROUP_NAME} {$CMOD.LBL_COLON}</b></td>
<td class="dvtCellInfo" align="left" width="25%">{$GROUPINFO.0.groupname}</td>
<td class="dvtCellInfo" width="45%"> </td>
</tr>
<tr>
<td class="dvtCellLabel" width="5%"> </td>
- <td class="dvtCellLabel" align="right"><b>Description :</b></td>
+ <td class="dvtCellLabel" align="right"><b>{$CMOD.LBL_DESCRIPTION} {$CMOD.LBL_COLON}</b></td>
<td colspan="2" align="left" class="dvtCellInfo">{$GROUPINFO.0.description}</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>
{foreach key=type item=details from=$GROUPINFO.1}
@@ -87,7 +87,7 @@
<img src="{$IMAGEPATH}groups_icon.gif" align="absmiddle">
</td>
{/if}
- <td class="dvtCellLabel" valign="top" align="right" width="15%"><b>{$type} : </b></td>
+ <td class="dvtCellLabel" valign="top" align="right" width="15%"><b>{$type} {$CMOD.LBL_COLON} </b></td>
<td class="dvtCellInfo" width="45%" colspan="2">
{foreach item=element from=$details}
<a href="index.php?module=Users&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
@@ -99,8 +99,8 @@
<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=" Delete " title="Delete" accessKey="D" class="classBtn" type="button" name="Delete" onClick="deletegroup('{$GROUPID}','{$GROUP_NAME}')";>
+ <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 value=" {$APP.LBL_DELETE_BUTTON_LABEL} " title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="classBtn" type="button" name="Delete" onClick="deletegroup('{$GROUPID}','{$GROUP_NAME}')";>
</td>
</tr>
</table></td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/GroupEditView.tpl Wed May 10 09:51:54 2006
@@ -135,7 +135,11 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
<tr>
<td class="showPanelBg" valign="top" width="100%" 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} > {$CMOD.LBL_CREATE_NEW_GROUP}</b></span>
+{if $MODE eq 'edit'}
+ <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_EDIT_GROUP}</b></span>
+{else}
+ <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP}</b></span>
+{/if}
<hr noshade="noshade" size="1"/>
</td>
</tr>
@@ -147,7 +151,11 @@
<tr>
<td align="left" style="padding:10px;border-bottom:1px dashed #CCCCCC;" colspan="3">
<img src="{$IMAGE_PATH}groups.gif" align="absmiddle">
- <span class="genHeaderGray">{$CMOD.LBL_CREATE_NEW_GROUP}</span>
+ {if $MODE eq 'edit'}
+ <span class="genHeaderGray">{$CMOD.LBL_EDIT_GROUP}</span>
+ {else}
+ <span class="genHeaderGray">{$CMOD.LBL_CREATE_NEW_GROUP}</span>
+ {/if}
</td>
</tr>
<tr>
@@ -158,7 +166,7 @@
<tr>
<td align="right"><img src="{$IMAGE_PATH}one.gif" align="absmiddle"> </td>
<td style="padding-right: 10px;" align="right" width="20%">
- <b>Group Name :</b></td>
+ <b>{$CMOD.LBL_GROUP_NAME} {$CMOD.LBL_COLON}</b></td>
<td style="padding-left: 10px;" align="left" width="80%">
<input name="groupName" class="importBox" style="width:40%;" type="text" value="{$GROUPNAME}">
</td>
@@ -167,7 +175,7 @@
<tr>
<td align="right"><img src="{$IMAGE_PATH}two.gif" align="absmiddle"></td>
<td style="padding-right: 10px;" align="right" valign="top">
- <b>Description : </b></td>
+ <b>{$CMOD.LBL_DESCRIPTION} {$CMOD.LBL_COLON} </b></td>
<td style="padding-left: 10px;" align="left">
<textarea name="description" class="txtBox" style="width:40%;" >{$DESCRIPTION}</textarea>
</td>
@@ -176,15 +184,15 @@
<tr>
<td align="right"><img src="{$IMAGE_PATH}three.gif" align="absmiddle"></td>
<td style="padding-right: 10px;" align="right">
- <b>Filters : </b></td>
+ <b>{$APP.LBL_VIEW} </b></td>
<td><select id="memberType" name="memberType" onchange="showOptions()">
- <option value="groups" selected>Groups</option>
- <option value="roles">Roles</option>
- <option value="rs">Roles and Subordinates</option>
- <option value="users">Users</option>
+ <option value="groups" selected>{$CMOD.LBL_GROUPS}</option>
+ <option value="roles">{$CMOD.LBL_ROLES}</option>
+ <option value="rs">{$CMOD.LBL_ROLES_SUBORDINATES}</option>
+ <option value="users">{$MOD.LBL_USERS}</option>
</select>
<input type="text" name="findStr">
- <input type="button" name="Find" value="Find" class="classBtn" onClick="showOptions()">
+ <input type="button" name="Find" value="{$APP.LBL_FIND_BUTTON}" class="classBtn" onClick="showOptions()">
</td>
</tr>
<tr><td colspan="3"> </td></tr>
@@ -193,7 +201,7 @@
<table align="center" border="0" cellpadding="0" cellspacing="0" width="75%">
<tbody>
<tr>
- <td align="center"><b>Member Available</b><br>
+ <td align="center"><b>{$CMOD.LBL_MEMBER_AVLBL}</b><br>
<select id="availList" name="availList" multiple size="10" style="width:200px; ">
</select>
<input type="hidden" name="selectedColumnsString"/>
@@ -202,7 +210,7 @@
<input type="button" name="Button" value=" ›› " onClick="addColumn()" class="classBtn"/><br /><br />
<input type="button" name="Button1" value=" ‹‹ " onClick="delColumn()" class="classBtn"/>
</td>
- <td align="center"><b>Selected Member</b><br>
+ <td align="center"><b>{$CMOD.LBL_MEMBER_SELECTED}</b><br>
<select id="selectedColumns" name="selectedColumns" multiple size="10" style="width:200px; ">
{foreach item=element from=$MEMBER}
<option value="{$element.0}">{$element.1}</option>
@@ -219,9 +227,13 @@
</tr>
<tr>
<td colspan="3" align="center">
- <input type="submit" class="classBtn" name="add" value="Add Group" onClick="return validate()">
+ {if $MODE eq 'edit'}
+ <input type="submit" class="classBtn" name="add" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " onClick="return validate()">
+ {else}
+ <input type="submit" class="classBtn" name="add" value="{$CMOD.LBL_ADD_GROUP_BUTTON}" onClick="return validate()">
+ {/if}
- <input type="button" class="classBtn" name="cancel" value="Cancel" onClick="window.history.back()">
+ <input type="button" class="classBtn" name="cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back()">
</td>
</tr>
</tbody></table>
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 09:51:54 2006
@@ -147,9 +147,9 @@
</tr>
<tr bgcolor="#ECECEC">
<td align="left" style="padding-left:40px;" >
- <input type="checkbox" name="save_map" onclick="set_readonly(this.form)" />
+ <input type="checkbox" id="save_map" name="save_map" onclick="set_readonly(this.form)" />
Save above Mapping as :
- <input type="text" readonly name="save_map_as" value="" class="importBox" >
+ <input type="text" readonly id="save_map_as" name="save_map_as" value="" class="importBox" >
</td>
</tr>
<tr bgcolor="#ECECEC"><td><hr /></td></tr>
@@ -157,7 +157,7 @@
<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=" Import Now › " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='4'; return verify_data(Import)" />
+ <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()" />
</td>
</tr>
<tr bgcolor="#ECECEC"><td align="right" > </td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListEmailTemplates.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListEmailTemplates.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListEmailTemplates.tpl Wed May 10 09:51:54 2006
@@ -89,11 +89,11 @@
<input name="action" type="hidden" value="deleteemailtemplate">
<tr><td colspan="4" style="border:0px;"> </td></tr>
<tr>
- <td colspan="2" align="left" style="border:0px;"><input type="submit" value="Delete" onclick="return massDelete();" class="classBtn" /></td>
+ <td colspan="2" align="left" style="border:0px;"><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="classBtn" /></td>
<td style="border:0px;"> </td>
<td align="right" style="border:0px;">
- <div align="right"><input type="submit" value="New Template" name="profile" class="classBtn" onclick="this.form.action.value='createemailtemplate';this.form.parenttab.value='Settings';"/></div>
+ <div align="right"><input type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile" class="classBtn" onclick="this.form.action.value='createemailtemplate';this.form.parenttab.value='Settings';"/></div>
</td>
</tr>
<tr>{*<td colspan="4" style="border:0px;"> </td>*}</tr>
@@ -117,7 +117,7 @@
{/if}
<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}" >{$template.templatename}</a></td>
<td>{$template.description}</td>
- <td><a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}">View Sample Email </a></td>
+ <td><a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}">{$UMOD.LNK_SAMPLE_EMAIL}</a></td>
</tr>
{/foreach}
@@ -133,7 +133,7 @@
</td>
<td style="border:0px">
- <div align="right"><a href="#">Go to Page Top</a></div>
+ <div align="right"><a href="#">{$UMOD.LNK_GO_TO_TOP}</a></div>
</td>
</tr>
</form>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListGroup.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListGroup.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListGroup.tpl Wed May 10 09:51:54 2006
@@ -36,7 +36,7 @@
<img src="{$IMAGE_PATH}groups.gif" align="absmiddle"> <span class="genHeaderGrayBig">{$CMOD.LBL_GROUP_NAME}</span>
</td>
<td style="border-bottom:1px dashed #CCCCCC;" width="50%" align="right">
- <input title="New" accessKey="C" class="classBtn" type="submit" name="New" value="New Group"/>
+ <input title="{$CMOD.LBL_NEW_GROUP}" class="classBtn" type="submit" name="New" value="{$CMOD.LBL_NEW_GROUP}"/>
</td>
</tr>
<tr><td colspan="2"> </td></tr>
@@ -55,8 +55,8 @@
<td >{$LIST_ENTRIES[entries].description}</td>
<td align="center" >
<a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$LIST_ENTRIES[entries].groupid}">
- <img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0" align="absmiddle"></a> |
- <a href="#" onClick="deletegroup('{$LIST_ENTRIES[entries].groupid}','{$LIST_ENTRIES[entries].groupname}')";><img src="{$IMAGE_PATH}delete.gif" border="0" align="absmiddle"></a>
+ <img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a> |
+ <a href="#" onClick="deletegroup('{$LIST_ENTRIES[entries].groupid}','{$LIST_ENTRIES[entries].groupname}')";><img src="{$IMAGE_PATH}delete.gif" alt="{$LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" align="absmiddle"></a>
</td>
</tr>
{/section}
@@ -97,8 +97,8 @@
{section name=entries loop=$LIST_ENTRIES}
<tr class="{cycle values="dvtCellInfo,dvtCellLabel"}">
<td nowrap>
- <img src="{$IMAGE_PATH}del.gif" border="0" height="15" width="15" onClick="deletegroup('{$LIST_ENTRIES[entries].groupid}','{$LIST_ENTRIES[entries].groupname}')";>
- <a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&mode=edit&groupId={$LIST_ENTRIES[entries].groupid}"><img src="{$IMAGE_PATH}edit.gif" alt="Edit" title="Edit" border="0"></a>
+ <img src="{$IMAGE_PATH}del.gif" alt="{$APP.LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" height="15" width="15" onClick="deletegroup('{$LIST_ENTRIES[entries].groupid}','{$LIST_ENTRIES[entries].groupname}')";>
+ <a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&mode=edit&groupId={$LIST_ENTRIES[entries].groupid}"><img src="{$IMAGE_PATH}edit.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0"></a>
</td>
<td nowrap><a href="index.php?module=Users&action=GroupDetailView&groupId={$LIST_ENTRIES[entries].groupid}">{$LIST_ENTRIES[entries].groupname}</a></td>
<td nowrap>{$LIST_ENTRIES[entries].description} </td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListView.tpl Wed May 10 09:51:54 2006
@@ -60,7 +60,34 @@
urlstring = urlstring +'action={$MODULE}Ajax&ajax=true';
ajaxObj.process("index.php?",urlstring);
{rdelim}
-
+function alphabetic(url)
+{ldelim}
+
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+
+ url_param = url.split('&');
+ for(plen=0; plen< url_param.length;plen++)
+ {ldelim}
+ url_var=url_param[plen];
+ if(url_var.search(/search_text/gi)!= -1)
+ {ldelim}
+ name_value = url_var.split('=');
+ document.basicSearch.search_text.value = name_value[1];
+ {rdelim}
+ else if(url_var.search(/search_field/gi)!= -1)
+ {ldelim}
+ name_value = url_var.split('=');
+ var oSfield = getObj("search_field");
+ for (os=0; os<oSfield.length;os++)
+ {ldelim}
+ if(oSfield[os].value == name_value[1])
+ oSfield.selectedIndex = os;
+ {rdelim}
+ {rdelim}
+
+ {rdelim}
+ ajaxObj.process("index.php?",url);
+{rdelim}
</script>
{include file='Buttons_List.tpl'}
@@ -84,7 +111,7 @@
</table>
</div>
<!-- SIMPLE SEARCH -->
-<div id="searchAcc" style="z-index:1;display:block;position:relative;">
+<div id="searchAcc" style="z-index:1;display:none;position:relative;">
<form name="basicSearch" action="index.php">
<table width="80%" cellpadding="5" cellspacing="0" style="border:1px dashed #CCCCCC;" class="small" align="center">
<tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListWordTemplates.tpl Wed May 10 09:51:54 2006
@@ -90,11 +90,11 @@
<tr><td colspan="6" style="border:0px;"> </td></tr>
<tr>
- <td colspan="2" align="left" style="border:0px;"><input type="submit" value="Delete" onclick="return massDelete();" class="classBtn" /></td>
+ <td colspan="2" align="left" style="border:0px;"><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="classBtn" /></td>
<td style="border:0px;"> </td>
<td align="right" colspan="3" style="border:0px;">
- <div align="right" ><input type="submit" value="New Template" name="profile" class="classBtn" onclick="this.form.action.value='upload';"/></div>
+ <div align="right" ><input type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile" class="classBtn" onclick="this.form.action.value='upload';"/></div>
</td>
</tr>
<tr>{*<td colspan="6" style="border:0px;"> </td>*}</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl Wed May 10 09:51:54 2006
@@ -37,8 +37,8 @@
<tr>
<td bgcolor="#ebebeb" width="7"></td>
<td style="padding-left: 10px; height: 20px; vertical-align: middle;" bgcolor="#ececec">
- view : <a href="javascript:show('customdiv');show('globaldiv');">Both</a> | <a href="javascript:hide('customdiv');show('globaldiv');" >Global Access Privileges</a> |
- <a href="javascript:show('customdiv');hide('globaldiv');">Custom Access Privileges</a>
+ {$CMOD.LBL_VIEW} : <a href="javascript:show('customdiv');show('globaldiv');">{$CMOD.LBL_BOTH}</a> | <a href="javascript:hide('customdiv');show('globaldiv');" >{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</a> |
+ <a href="javascript:show('customdiv');hide('globaldiv');">{$CMOD.LBL_CUSTOM_ACCESS_PRIVILEGES}</a>
</td>
<td bgcolor="#ebebeb" width="8"></td>
@@ -71,8 +71,8 @@
<input type="hidden" name="parenttab" value="Settings">
<tr>
<td class="genHeaderSmall" height="25" valign="middle">Global Access Privileges</td>
- <td align="right"><input class=small titlr="Recalculate" type="submit" name="recalculate" value="Recalculate" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')">
- <input class=small title="Edit" accessKey="C" type="submit" name="Edit" value={$CMOD.LBL_EDIT_PERMISSIONS}></td>
+ <td align="right"><input class=small title="{$CMOD.LBL_RECALCULATE_BUTTON}" type="submit" name="recalculate" value="{$CMOD.LBL_RECALCULATE_BUTTON}" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')">
+ <input class=small type="submit" name="Edit" value={$CMOD.LBL_EDIT_PERMISSIONS}></td>
</tr>
<tr><td colspan="2"></td></tr>
@@ -132,7 +132,7 @@
<table border="0" cellpadding="3" cellspacing="0" width="100%">
<tbody>
<tr>
- <td class="genHeaderSmall" colspan="2" height="25" valign="middle">Custom Access Privileges</td>
+ <td class="genHeaderSmall" colspan="2" height="25" valign="middle">{$CMOD.LBL_CUSTOM_ACCESS_PRIVILEGES}</td>
</tr>
<tr><td colspan="2"></td></tr>
<tr>
@@ -149,7 +149,7 @@
<img src="{$IMAGE_PATH}arrow.jpg" align="absmiddle">
<b>{$modulename}</b>
</td>
- <td align="right" colspan=2><input title="New" class="small" type="button" name="Create" value="Add Privileges" onClick="callEditDiv('{$modulename}','create','{$elements.0}')"></td>
+ <td align="right" colspan=2><input title="New" class="small" type="button" name="Create" value="{$CMOD.LBL_ADD_PRIVILEGES_BUTTON}" onClick="callEditDiv('{$modulename}','create','{$elements.0}')"></td>
</tr>
<tr>
<th class="lvtCol" nowrap width="9%">Rule No.</th>
@@ -183,9 +183,9 @@
</tr>
<tr>
<td colspan="2" style="padding: 20px;" bgcolor="#ffffff" align="center">
- No Custom Access Rules defined .
+ {$CMOD.LBL_CUSTOM_ACCESS_MESG}
<a href="javascript:onClick=callEditDiv('{$modulename}','create','')">Click here</a>
- to create a new Rule
+ {$CMOD.LBL_CREATE_RULE_MESG}
</td>
</tr>
</tbody>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingEditView.tpl Wed May 10 09:51:54 2006
@@ -34,7 +34,7 @@
<input type="hidden" name="action" value="SaveOrgSharing">
<input type="hidden" name="parenttab" value="Settings">
<tr>
- <td class="genHeaderSmall" height="25" valign="middle">Global Access Privileges</td>
+ <td class="genHeaderSmall" height="25" valign="middle">{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</td>
<td align="right"><input class="small" title="Save" accessKey="C" type="submit" name="Save" value="{$CMOD.LBL_SAVE_PERMISSIONS}"></td>
</tr>
<tr><td colspan="2" height="20"> </td></tr>
@@ -55,7 +55,7 @@
</tr>
<tr><td colspan="2" height="20"> </td></tr>
<tr>
- <td align="center" colspan=2><input class="small" title="Cancel" accessKey="C" type="button" name="Cancel" value="Cancel" onClick="window.history.back();"></td>
+ <td align="center" colspan=2><input class="small" title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" type="button" name="Cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back();"></td>
</tr>
</form>
</tbody>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Popup.tpl Wed May 10 09:51:54 2006
@@ -33,15 +33,13 @@
<tr style="background-color:#efefef">
<td >
<table border=0 cellspacing=0 cellpadding=2 width=100%>
- <tr>
- <script type="text/javascript" src="include/js/general.js"></script>
- <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
- <input name="module" type="hidden" value="{$RETURN_MODULE}">
- <input name="action" type="hidden" value="{$RETURN_ACTION}">
- <input name="pmodule" type="hidden" value="{$MODULE}">
- <input type="hidden" name="curr_row" value="{$CURR_ROW}">
- <input name="entityid" type="hidden" value="">
- <input name="idlist" type="hidden" value="">
+ <tr>
+ <input name="module" type="hidden" value="{$RETURN_MODULE}">
+ <input name="action" type="hidden" value="{$RETURN_ACTION}">
+ <input name="pmodule" type="hidden" value="{$MODULE}">
+ <input type="hidden" name="curr_row" value="{$CURR_ROW}">
+ <input name="entityid" type="hidden" value="">
+ <input name="idlist" type="hidden" value="">
{if $SELECT eq 'enable'}
<td><input class="small" type="button" value="Add Contacts" onclick="if(SelectAll()) window.close();"/></td>
{/if}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ProfileDetailView.tpl Wed May 10 09:51:54 2006
@@ -32,7 +32,7 @@
<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
</td>
<td style="border-bottom:1px dashed #CCCCCC;">
- <span class="genHeaderGrayBig">Detail View of Profile</span><br>
+ <span class="genHeaderGrayBig">{$CMOD.LBL_PROFILE_DETAIL_VIEW}</span><br>
<span class="genHeaderSmall">{$PROFILE_NAME}</span>
</td>
</tr>
@@ -59,11 +59,11 @@
<!-- tabs -->
<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
<tr>
- <td width="20%" id="prvPrfTab1" class="prvPrfSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');">Global Privileges</td>
- <td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');">Tab Privileges</td>
- <td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');">Standard Privileges</td>
- <td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');">Field Privileges</td>
- <td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');">Utilities</td>
+ <td width="20%" id="prvPrfTab1" class="prvPrfSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');">{$CMOD.LBL_GLOBAL_PRIVILEGES}</td>
+ <td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');">{$CMOD.LBL_TAB_PRIVILEGES}</td>
+ <td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');">{$CMOD.LBL_STANDARD_PRIVILEGES}</td>
+ <td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');">{$CMOD.LBL_FIELD_PRIVILEGES}</td>
+ <td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');">{$CMOD.LBL_UTILITIES}</td>
</tr>
</table>
<div id="global_privileges" style="display:block;">
@@ -78,8 +78,8 @@
<tr>
<td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"/> </td>
- <td class="prvPrfBigText"><b> Global Privileges for "{$PROFILE_NAME}"</b> <br />
- <font class="small">Select the options below to change global privileges </font> </td>
+ <td class="prvPrfBigText"><b> {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
+ <font class="small">{$CMOD.LBL_GLOBAL_MESG_OPTION} </font> </td>
<td class="small" style="padding-left:10px" align="right"></td>
</tr>
</table></td>
@@ -103,22 +103,22 @@
<table border="0" cellspacing="0" cellpadding="2" width="100%" class="small">
<tr id="gva">
<td valign="top">{$GLOBAL_PRIV.0}</td>
- <td ><b>View all</b> </td>
+ <td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
</tr>
<tr >
<td valign="top"></td>
- <td width="100%" >Allows "{$PROFILE_NAME}" to view all information / modules of vtiger CRM</td>
+ <td width="100%" >{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
</tr>
<tr>
<td> </td>
</tr>
<tr>
<td valign="top">{$GLOBAL_PRIV.1}</td>
- <td ><b>Edit all</b> </td>
+ <td ><b>{$CMOD.LBL_EDIT_ALL}</b> </td>
</tr>
<tr>
<td valign="top"></td>
- <td > Allows "{$PROFILE_NAME}" to edit all information / modules of vtiger CRM</td>
+ <td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
</tr>
</table>
</td>
@@ -144,8 +144,8 @@
<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
</td>
<td class="prvPrfBigText">
- <b> Standard Action Privileges for "{$PROFILE_NAME}"</b> <br>
- <font class=small>Select the standard actions to be permitted </font>
+ <b> {$CMOD.LBL_STANDARD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
+ <font class=small>{$CMOD.LBL_STD_MESG_OPTION} </font>
</td>
</tr>
</table>
@@ -171,10 +171,10 @@
<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
<tr>
- <td>Entity</td>
- <td>Create/Edit</td>
- <td>Delete</td>
- <td>View</td>
+ <td>{$CMOD.LBL_ENTITY}</td>
+ <td>{$CMOD.LBL_CREATE_EDIT}</td>
+ <td>{$CMOD.LBL_DELETE}</td>
+ <td>{$CMOD.LBL_VIEW}</td>
</tr>
{foreach item=value from=$STANDARD_PRIV}
@@ -211,8 +211,8 @@
<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
</td>
<td class="prvPrfBigText">
- <b> Tab Privileges for "{$PROFILE_NAME}"</b> <br>
- <font class=small>Select the tabs/modules to be permitted </font>
+ <b> {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
+ <font class=small>{$CMOD.LBL_TAB_MESG_OPTION} </font>
</td>
</tr>
</table>
@@ -275,8 +275,8 @@
<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
</td>
<td class="prvPrfBigText">
- <b> Utility Action Privileges for "{$PROFILE_NAME}"</b> <br>
- <font class=small>Select the utility actions to be permitted </font>
+ <b> {$CMOD.LBL_UTILITY_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
+ <font class=small>{$CMOD.LBL_UTILITY_MESG_OPTION} </font>
</td>
</tr>
</table>
@@ -341,8 +341,8 @@
<tr>
<td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
- <td class="prvPrfBigText"><b> Field Privileges for "{$PROFILE_NAME}"</b> <br />
- <font class="small">Select the fields to be permitted </font> </td>
+ <td class="prvPrfBigText"><b> {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
+ <font class="small">{$CMOD.LBL_FIELD_MESG_OPTION} </font> </td>
</tr>
</table></td>
<td align="right" valign="bottom">
@@ -419,8 +419,8 @@
<tr><td colspan="2"> </td></tr>
<tr>
<td colspan="2" align="center">
- <input type="submit" value=" Edit " name="edit" class="classBtn"/>
- <input type="button" value=" Cancel " name="Cancel" onClick="window.history.back();" class="classBtn"/>
+ <input type="submit" value=" {$APP.LBL_EDIT_BUTTON_LABEL} " name="edit" class="classBtn"/>
+ <input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" onClick="window.history.back();" class="classBtn"/>
</td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RelatedListsHidden.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RelatedListsHidden.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/RelatedListsHidden.tpl Wed May 10 09:51:54 2006
@@ -40,7 +40,6 @@
{$HIDDEN_PARENTS_LIST}
{elseif $MODULE eq 'Potentials'}
<input type="hidden" name="potential_id" value="{$id}">
- <input type="hidden" name="contact_id" value="{$id}">
{elseif $MODULE eq 'Quotes'}
<input type="hidden" name="quoteid" value="{$id}">
{elseif $MODULE eq 'SalesOrder'}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportColumns.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportColumns.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportColumns.tpl Wed May 10 09:51:54 2006
@@ -15,14 +15,14 @@
<table class="small" bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody><tr>
<td colspan="4">
- <span class="genHeaderGray">Select Columns </span><br>
- Select columns to Generate report
+ <span class="genHeaderGray">{$MOD.LBL_SELECT_COLUMNS}</span><br>
+ {$MOD.LBL_SELECT_COLUMNS_TO_GENERATE_REPORTS}
<hr>
</td>
</tr>
<tr>
- <td colspan="2" height="26"><b>Avaliable Fields</b></td>
- <td colspan="2"><b>Selected Fields</b></td>
+ <td colspan="2" height="26"><b>{$MOD.LBL_AVAILABLE_FIELDS}</b></td>
+ <td colspan="2"><b>{$MOD.LBL_SELECTED_FIELDS}</b></td>
</tr>
<tr>
<td style="padding-right: 5px;" align="right" width="40%">
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportColumnsTotal.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportColumnsTotal.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportColumnsTotal.tpl Wed May 10 09:51:54 2006
@@ -12,8 +12,8 @@
<table class="small" bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody><tr>
<td colspan="2">
- <span class="genHeaderGray">Calculations</span><br>
- Select Columns To Total
+ <span class="genHeaderGray">{$MOD.LBL_CALCULATIONS}</span><br>
+ {$MOD.LBL_SELECT_COLUMNS_TO_TOTAL}
<hr>
</td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportFilters.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportFilters.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportFilters.tpl Wed May 10 09:51:54 2006
@@ -18,8 +18,8 @@
<table class="small" bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody><tr>
<td colspan="2">
- <span class="genHeaderGray">Filters</span><br>
- Select Flters to Streamline Report Data
+ <span class="genHeaderGray">{$MOD.LBL_FILTERS}</span><br>
+ {$MOD.LBL_SELECT_FILTERS_TO_STREAMLINE_REPORT_DATA}
<hr>
</td>
</tr>
@@ -28,7 +28,7 @@
<tbody>
<tr>
<td class="detailedViewHeader" colspan="2" width="60%">
- <b>Standard Filter</b>
+ <b>{$MOD.LBL_STANDARD_FILTER}</b>
</td>
<td class="detailedViewHeader" width="20%"> </td>
<td class="detailedViewHeader" width="20%"> </td>
@@ -63,7 +63,7 @@
<td> </td>
<td> </td>
</tr>
- <tr><td colspan="2" class="detailedViewHeader"><b>Advanced Filter</b>
+ <tr><td colspan="2" class="detailedViewHeader"><b>{$MOD.LBL_ADVANCED_FILTER}</b>
</td>
<td class="detailedViewHeader"> </td>
<td class="detailedViewHeader"> </td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportGrouping.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportGrouping.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportGrouping.tpl Wed May 10 09:51:54 2006
@@ -12,8 +12,8 @@
<table class="small" bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody><tr>
<td colspan="2">
- <span class="genHeaderGray">Specify Grouping</span><br>
- Select columns to Group report
+ <span class="genHeaderGray">{$MOD.LBL_SPECIFY_GROUPING}</span><br>
+ {$MOD.LBL_SELECT_COLUMNS_TO_GROUP_REPORTS}
<hr>
</td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportRun.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportRun.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportRun.tpl Wed May 10 09:51:54 2006
@@ -43,11 +43,11 @@
<td style="border-left: 1px solid rgb(109, 109, 109);"></td>
<td style="padding: 10px; text-align: left;" width="70%">
<span class="genHeaderGrayBig">{$REPORTNAME}</span>
- ( <a href="javascript:;" onClick="editReport('{$REPORTID}');">Customize Report </a> )<br>
- <a href="index.php?module=Reports&action=ListView" class="reportMnu" style="border-bottom: 0px solid rgb(0, 0, 0);">< Back to Reports</a>
+ ( <a href="javascript:;" onClick="editReport('{$REPORTID}');">{$MOD.LBL_CUSTOMIZE_REPORT}</a> )<br>
+ <a href="index.php?module=Reports&action=ListView" class="reportMnu" style="border-bottom: 0px solid rgb(0, 0, 0);"><{$MOD.LBL_BACK_TO_REPORTS}</a>
</td>
<td style="border-left: 1px solid rgb(109, 109, 109); padding: 10px;" width="30%">
- <b>Select another Report : </b><br>
+ <b>{$MOD.LBL_SELECT_ANOTHER_REPORT} : </b><br>
<select name="another_report" class="detailedViewTextBox" onChange="selectReport()">
{foreach key=report_in_fld_id item=report_in_fld_name from=$REPINFOLDER}
{if $report_in_fld_id neq $REPORTID}
@@ -70,8 +70,8 @@
<table class="reportGenarateTable" align="center" cellpadding="0" cellspacing="0" width="90%">
<tbody><tr><td colspan="4"> </td></tr>
<tr>
- <td>Select Column : </td>
- <td>Select Time : </td>
+ <td>{$MOD.LBL_SELECT_COLUMN} : </td>
+ <td>{$MOD.LBL_SELECT_TIME} : </td>
<td>{$MOD.LBL_SF_STARTDATE} : </td>
<td>{$MOD.LBL_SF_ENDDATE} : </td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportRunContents.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportRunContents.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportRunContents.tpl Wed May 10 09:51:54 2006
@@ -63,7 +63,7 @@
<tbody><tr>
<td align="left" width="10%"><input class="classBtn" id="btnExport" name="btnExport" value="{$MOD.LBL_EXPORTPDF_BUTTON}" type="button" onClick="goToURL(CrearEnlace('CreatePDF',{$REPORTID}));" title="{$MOD.LBL_EXPORTPDF_BUTTON}"></td>
<td align="left" width="20%"><input class="classBtn" id="btnExport" name="btnExport" value="{$MOD.LBL_EXPORTXL_BUTTON}" type="button" onClick="goToURL(CrearEnlace('CreateXL',{$REPORTID}));" title="{$MOD.LBL_EXPORTXL_BUTTON}" ></td>
- <td align="left" width="70%"><input name="print" value=" Print Report " class="classBtn" type="button"></td>
+ <td align="left" width="70%"><input name="print" value="{$MOD.LBL_PRINT_REPORT}" class="classBtn" type="button"></td>
</tr>
</tbody>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Reports.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Reports.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Reports.tpl Wed May 10 09:51:54 2006
@@ -85,13 +85,13 @@
</tr>
<tr><td colspan="2"><hr></td></tr>
<tr>
- <td align="right" width="50%"><b>Folder Name : </b></td>
+ <td align="right" width="50%"><b>{$MOD.LBL_REP_FOLDER_NAME} : </b></td>
<td align="left"><input id="folder_name" name="folderName" class="txtBox" type="text"></td>
</tr>
<input id="folder_id" name="folderId" type="hidden" value=''>
<input id="fldrsave_mode" name="folderId" type="hidden" value='save'>
<tr>
- <td align="right" width="50%"><b>Folder Description : </b></td>
+ <td align="right" width="50%"><b>{$MOD.LBL_REP_FOLDER_DESC} : </b></td>
<td align="left"><input id="folder_desc" name="folderDesc" class="txtBox" type="text"></td>
</tr>
<tr><td style="border-bottom: 1px dashed rgb(204, 204, 204);" colspan="2"> </td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsCustomize.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsCustomize.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsCustomize.tpl Wed May 10 09:51:54 2006
@@ -58,7 +58,7 @@
<br />
{foreachelse}
<div align="center" style="position:relative;width:50%;height:30px;border:1px dashed #CCCCCC;background-color:#FFFFCC;padding:10px;">
- <a href="javascript:;" onclick="fnvshobj(this,'orgLay');">Click Here</a> to Add New Group
+ <a href="javascript:;" onclick="fnvshobj(this,'orgLay');">{$MOD.LBL_CLICK_HERE}</a> {$MOD.LBL_TO_ADD_NEW_GROUP}
</div>
{/foreach}
</form>
@@ -66,7 +66,7 @@
<div style="display: none; left: 193px; top: 106px;" id="folderLay" onmouseout="fninvsh('folderLay')" onmouseover="fnvshNrm('folderLay')">
<table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
- <tbody><tr><td style="border-bottom: 1px solid rgb(204, 204, 204); padding: 5px;"><b>Create New :</b></td></tr>
+ <tbody><tr><td style="border-bottom: 1px solid rgb(204, 204, 204); padding: 5px;"><b>{$MOD.LBL_CREATE_NEW} :</b></td></tr>
<tr>
<td>
{foreach item=folder from=$REPT_FOLDERS}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsStep0.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsStep0.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsStep0.tpl Wed May 10 09:51:54 2006
@@ -30,13 +30,13 @@
<tr>
<td width="25%" valign="top" bgcolor="#CCCCCC" >
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
- <tr><td id="step1label" class="lvtSel" height="30" style="padding-left:10px;">1. Report Details</td></tr>
- <tr><td id="step2label" class="lvtCol" height="30" style="padding-left:10px;">2. Relative Module </td></tr>
- <tr><td class="lvtCol" height="30" style="padding-left:10px;">3. Report Type </td></tr>
- <tr><td class="lvtCol" height="30" style="padding-left:10px;">4. Select Columns</td></tr>
- <tr><td class="lvtCol" height="30" style="padding-left:10px;">5. Specify Grouping</td></tr>
- <tr><td class="lvtCol" height="30" style="padding-left:10px;">6. Calculations</td></tr>
- <tr><td class="lvtCol" height="30" style="padding-left:10px;">7. Filters </td></tr>
+ <tr><td id="step1label" class="lvtSel" height="30" style="padding-left:10px;">1. {$MOD.LBL_REPORT_DETAILS}</td></tr>
+ <tr><td id="step2label" class="lvtCol" height="30" style="padding-left:10px;">2. {$MOD.LBL_RELATIVE_MODULE} </td></tr>
+ <tr><td class="lvtCol" height="30" style="padding-left:10px;">3.{$MOD.LBL_REPORT_TYPE} </td></tr>
+ <tr><td class="lvtCol" height="30" style="padding-left:10px;">4.{$MOD.LBL_SELECT_COLUMNS}</td></tr>
+ <tr><td class="lvtCol" height="30" style="padding-left:10px;">5. {$MOD.LBL_SPECIFY_GROUPING}</td></tr>
+ <tr><td class="lvtCol" height="30" style="padding-left:10px;">6. {$MOD.LBL_CALCULATIONS}</td></tr>
+ <tr><td class="lvtCol" height="30" style="padding-left:10px;">7. {$MOD.LBL_FILTERS} </td></tr>
</table>
</td>
<td width="75%" valign="top" style="padding:10px;" bgcolor="#CCCCCC" >
@@ -44,18 +44,18 @@
<table width="100%" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF" class="small">
<tr>
<td colspan="2">
- <span class="genHeaderGray">Report Details</span><br>
- Type the Name & Description for the Report<hr>
+ <span class="genHeaderGray">{$MOD.LBL_REPORT_DETAILS}</span><br>
+ {$MOD.LBL_TYPE_THE_NAME} & {$MOD.LBL_DESCRIPTION_FOR_REPORT}<hr>
</td>
</tr>
<tr>
- <td width="25%" align="right" style="padding-right:5px;"><b>Report Name : </b></td>
+ <td width="25%" align="right" style="padding-right:5px;"><b>{$MOD.LBL_REPORT_NAME} : </b></td>
<td width="75%" align="left" style="padding-left:5px;">
<input type="text" name="reportname" class="txtBox">
</td>
</tr>
<tr>
- <td width="25%" align="right" style="padding-right:5px;"><b>Report Folder : </b></td>
+ <td width="25%" align="right" style="padding-right:5px;"><b>{$MOD.LBL_REP_FOLDER} : </b></td>
<td width="75%" align="left" style="padding-left:5px;">
<select name="reportfolder" class="txtBox">
{foreach item=folder from=$REP_FOLDERS}
@@ -65,7 +65,7 @@
</td>
</tr>
<tr>
- <td align="right" style="padding-right:5px;" valign="top"><b>Description : </b></td>
+ <td align="right" style="padding-right:5px;" valign="top"><b>{$MOD.LBL_DESCRIPTION}: </b></td>
<td align="left" style="padding-left:5px;">
<textarea name="reportdes" class="txtBox" rows="5"></textarea>
</td>
@@ -79,12 +79,12 @@
<table class="small" bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody><tr>
<td colspan="2">
- <span class="genHeaderGray">Report Module</span><br>
- Select a relative module for this report<hr>
+ <span class="genHeaderGray">{$MOD.LBL_REPORT_MODULE}</span><br>
+ {$MOD.LBL_SELECT_RELATIVE_MODULE_FOR_REPORT}<hr>
</td>
</tr>
<tr>
- <td style="padding-right: 5px;" align="right" width="25%"><b>Module : </b></td>
+ <td style="padding-right: 5px;" align="right" width="25%"><b>{$MOD} : </b></td>
<td style="padding-left: 5px;" align="left" width="75%">
<select name="secondarymodule" class="txtBox">
<option value="">--None--</option>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsStep1.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsStep1.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsStep1.tpl Wed May 10 09:51:54 2006
@@ -36,13 +36,13 @@
<tr>
<td width="25%" valign="top" bgcolor="#CCCCCC" >
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
- <tr><td class="lvtCol" height="30" style="padding-left:10px;">1. Report Details</td></tr>
- <tr><td class="lvtCol" height="30" style="padding-left:10px;">2. Relative Module </td></tr>
- <tr><td id="step1label" class="lvtSel" height="30" style="padding-left:10px;">3. Report Type </td></tr>
- <tr><td id="step2label" class="lvtCol" height="30" style="padding-left:10px;">4. Select Columns</td></tr>
- <tr><td id="step3label" class="lvtCol" height="30" style="padding-left:10px;">5. Specify Grouping</td></tr>
- <tr><td id="step4label" class="lvtCol" height="30" style="padding-left:10px;">6. Calculations</td></tr>
- <tr><td id="step5label" class="lvtCol" height="30" style="padding-left:10px;">7. Filters </td></tr>
+ <tr><td class="lvtCol" height="30" style="padding-left:10px;">1. {$MOD.LBL_REPORT_DETAILS}</td></tr>
+ <tr><td class="lvtCol" height="30" style="padding-left:10px;">2. {$MOD.LBL_RELATIVE_MODULE} </td></tr>
+ <tr><td id="step1label" class="lvtSel" height="30" style="padding-left:10px;">3.{$MOD.LBL_RELATIVE_MODULE} </td></tr>
+ <tr><td id="step2label" class="lvtCol" height="30" style="padding-left:10px;">4.{$MOD.LBL_SELECT_COLUMNS}</td></tr>
+ <tr><td id="step3label" class="lvtCol" height="30" style="padding-left:10px;">5. {$MOD.LBL_SPECIFY_GROUPING}</td></tr>
+ <tr><td id="step4label" class="lvtCol" height="30" style="padding-left:10px;">6. {$MOD.LBL_CALCULATIONS}</td></tr>
+ <tr><td id="step5label" class="lvtCol" height="30" style="padding-left:10px;">7. {$MOD.LBL_FILTERS} </td></tr>
</table>
</td>
<td width="75%" valign="top" style="padding:10px;" bgcolor="#CCCCCC" >
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsType.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsType.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsType.tpl Wed May 10 09:51:54 2006
@@ -12,8 +12,8 @@
<table class="small" bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody><tr>
<td colspan="2">
- <span class="genHeaderGray">Report Type </span><br>
- Select the report type below
+ <span class="genHeaderGray"> {$MOD.LBL_REPORT_TYPE} </span><br>
+ {$MOD.LBL_SELECT_REPORT_TYPE_BELOW}
<hr>
</td>
</tr>
@@ -27,9 +27,9 @@
{else}
<input type="radio" name="reportType" value="tabular" onclick="hideTabs()">
{/if}
- <b>Tabular Format</b></td>
+ <b> {$MOD.LBL_TABULAR_FORMAT}</b></td>
</tr><tr><td style="padding-left: 25px;" align="left" valign="top" width="75%">
- Tabular reports are the simplest and fastest way to get a listing of your data.
+ {$MOD.LBL_TABULAR_REPORTS_ARE_SIMPLEST}
</td>
</tr>
<tr><td colspan="2"> </td></tr>
@@ -43,9 +43,9 @@
{else}
<input type="radio" name="reportType" value="summary" onclick="hideTabs()">
{/if}
- <b>Summary Report</b></td>
+ <b> {$MOD.LBL_SUMMARY_REPORT}</b></td>
</tr><tr><td style="padding-left: 25px;" align="left" valign="top" width="75%">
- Summary reports allow you to view your data along with subtotals and other summary information.
+ {$MOD.LBL_SUMMARY_REPORT_VIEW_DATA_WITH_SUBTOTALS}
</td>
</tr>
<tr><td colspan="2" height="183"> </td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/CompanyInfo.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/CompanyInfo.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/CompanyInfo.tpl Wed May 10 09:51:54 2006
@@ -1,140 +1,140 @@
-{*<!--
-/*********************************************************************************
- ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is: vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
- {include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" 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_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-
- <form action="index.php" method="post" name="company">
- <input type="hidden" name="module" value="Settings">
- <input type="hidden" name="parenttab" value="Settings">
- <input type="hidden" name="action">
- <table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
- <tbody><tr>
- <td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
- <td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
- <td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
- </tr>
- <tr>
-
- <td bgcolor="#ebebeb" width="7"></td>
- <td style="padding-left: 10px; padding-top: 10px; vertical-align: top;" bgcolor="#ececec">
- <table border="0" cellpadding="10" cellspacing="0" width="100%" class="small">
- <tbody><tr>
- <td rowspan="11" style="background-image: url({$ORGANIZATIONLOGOPATH}/{$ORGANIZATIONLOGONAME}); background-position: center; background-repeat: no-repeat;" bgcolor="#ffffff" width="25%"> </td>
- <td colspan="2" class="genHeaderBig" width="75%">{$ORGANIZATIONNAME}<br><hr>
- </td>
- </tr>
- <tr>
-
- <td align="right" width="25%"><b>{$MOD.LBL_ORGANIZATION_NAME} : </b></td>
- <td align="left" width="50%">{$ORGANIZATIONNAME}</td>
- </tr>
- <tr>
- <td align="right"><b>{$MOD.LBL_ORGANIZATION_ADDRESS} : </b></td>
- <td>{$ORGANIZATIONADDRESS}</td>
- </tr>
- <tr>
-
- <td align="right"><b>{$MOD.LBL_ORGANIZATION_CITY} : </b></td>
- <td>{$ORGANIZATIONCITY}</td>
- </tr>
- <tr>
- <td align="right"><b>{$MOD.LBL_ORGANIZATION_STATE} : </b></td>
- <td>{$ORGANIZATIONSTATE}</td>
- </tr>
- <tr>
-
- <td align="right"><b>{$MOD.LBL_ORGANIZATION_CODE} : </b></td>
- <td>{$ORGANIZATIONCODE}</td>
- </tr>
- <tr>
- <td align="right"><b>{$MOD.LBL_ORGANIZATION_COUNTRY} : </b></td>
- <td>{$ORGANIZATIONCOUNTRY}</td>
- </tr>
- <tr>
-
- <td colspan="2" style="padding-bottom: 0px; padding-top: 0px;" width="75%"><hr> </td>
- </tr>
- <tr>
- <td colspan="2" style="padding: 0px;" width="75%">
- <table border="0" cellpadding="10" cellspacing="0" width="100%" class="small">
- <tbody><tr>
- <td nowrap align="right" width="25%"><b>{$MOD.LBL_ORGANIZATION_PHONE} : </b></td>
- <td width="25%">{$ORGANIZATIONPHONE}</td>
-
- <td nowrap align="right" width="25%"><b>{$MOD.LBL_ORGANIZATION_WEBSITE} : </b></td>
- <td width="25%"><a href="http://{$ORGANIZATIONWEBSITE}" TARGET="_blank">{$ORGANIZATIONWEBSITE}</a></td>
- </tr>
- <tr>
- <td nowrap align="right"><b>{$MOD.LBL_ORGANIZATION_FAX} : </b></td>
- <td>{$ORGANIZATIONFAX}</td>
- <td nowrap align="right"><b>{$MOD.LBL_ORGANIZATION_LOGO} : </b></td>
-
- <td><a href="javascript:popitup('{$ORGANIZATIONLOGOPATH}/{$ORGANIZATIONLOGONAME}');">{$ORGANIZATIONLOGONAME}</a></td>
- </tr>
- </tbody></table></td>
- </tr>
- <tr>
- <td colspan="2" style="padding-top: 0px; padding-bottom: 0px;"><hr></td>
- </tr>
- <tr>
- <td colspan="2" align="center">
-
- <input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" onclick="this.form.action.value='EditCompanyDetails'" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON_LABEL}">
- </td>
- </tr>
- </tbody></table>
- </td>
- <td bgcolor="#ebebeb" width="8"></td>
- </tr>
- <tr>
-
- <td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
- <td style="font-size: 1px;" bgcolor="#ececec" height="8"></td>
- <td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
- </tr>
- </tbody></table>
- </form>
-
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;"> </td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
- {include file='SettingsSubMenu.tpl'}
-{literal}
-<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
-var win = null;
-function popitup(url)
-{
- newwindow=window.open(url,'name','height=300,width=450,left=550,top=20');
-
-}
-</SCRIPT>
-{/literal}
+{*<!--
+/*********************************************************************************
+ ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is: vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ *
+ ********************************************************************************/
+-->*}
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<style type="text/css">@import url(themes/blue/style.css);</style>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+ {include file='SettingsMenu.tpl'}
+<td width="75%" valign="top">
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
+<td class="showPanelBg" valign="top" width="100%" colspan="3" 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_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO}</b></span>
+<hr noshade="noshade" size="1" />
+</td>
+</tr>
+<tr>
+<td width="75%" style="padding-left:20px;" valign="top">
+
+ <form action="index.php" method="post" name="company">
+ <input type="hidden" name="module" value="Settings">
+ <input type="hidden" name="parenttab" value="Settings">
+ <input type="hidden" name="action">
+ <table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
+ <tbody><tr>
+ <td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
+ <td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
+ <td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
+ </tr>
+ <tr>
+
+ <td bgcolor="#ebebeb" width="7"></td>
+ <td style="padding-left: 10px; padding-top: 10px; vertical-align: top;" bgcolor="#ececec">
+ <table border="0" cellpadding="10" cellspacing="0" width="100%" class="small">
+ <tbody><tr>
+ <td rowspan="11" style="background-image: url({$ORGANIZATIONLOGOPATH}/{$ORGANIZATIONLOGONAME}); background-position: center; background-repeat: no-repeat;" bgcolor="#ffffff" width="25%"> </td>
+ <td colspan="2" class="genHeaderBig" width="75%">{$ORGANIZATIONNAME}<br><hr>
+ </td>
+ </tr>
+ <tr>
+
+ <td align="right" width="25%"><b>{$MOD.LBL_ORGANIZATION_NAME} : </b></td>
+ <td align="left" width="50%">{$ORGANIZATIONNAME}</td>
+ </tr>
+ <tr>
+ <td align="right"><b>{$MOD.LBL_ORGANIZATION_ADDRESS} : </b></td>
+ <td>{$ORGANIZATIONADDRESS}</td>
+ </tr>
+ <tr>
+
+ <td align="right"><b>{$MOD.LBL_ORGANIZATION_CITY} : </b></td>
+ <td>{$ORGANIZATIONCITY}</td>
+ </tr>
+ <tr>
+ <td align="right"><b>{$MOD.LBL_ORGANIZATION_STATE} : </b></td>
+ <td>{$ORGANIZATIONSTATE}</td>
+ </tr>
+ <tr>
+
+ <td align="right"><b>{$MOD.LBL_ORGANIZATION_CODE} : </b></td>
+ <td>{$ORGANIZATIONCODE}</td>
+ </tr>
+ <tr>
+ <td align="right"><b>{$MOD.LBL_ORGANIZATION_COUNTRY} : </b></td>
+ <td>{$ORGANIZATIONCOUNTRY}</td>
+ </tr>
+ <tr>
+
+ <td colspan="2" style="padding-bottom: 0px; padding-top: 0px;" width="75%"><hr> </td>
+ </tr>
+ <tr>
+ <td colspan="2" style="padding: 0px;" width="75%">
+ <table border="0" cellpadding="10" cellspacing="0" width="100%" class="small">
+ <tbody><tr>
+ <td nowrap align="right" width="25%"><b>{$MOD.LBL_ORGANIZATION_PHONE} : </b></td>
+ <td width="25%">{$ORGANIZATIONPHONE}</td>
+
+ <td nowrap align="right" width="25%"><b>{$MOD.LBL_ORGANIZATION_WEBSITE} : </b></td>
+ <td width="25%"><a href="http://{$ORGANIZATIONWEBSITE}" TARGET="_blank">{$ORGANIZATIONWEBSITE}</a></td>
+ </tr>
+ <tr>
+ <td nowrap align="right"><b>{$MOD.LBL_ORGANIZATION_FAX} : </b></td>
+ <td>{$ORGANIZATIONFAX}</td>
+ <td nowrap align="right"><b>{$MOD.LBL_ORGANIZATION_LOGO} : </b></td>
+
+ <td><a href="javascript:popitup('{$ORGANIZATIONLOGOPATH}/{$ORGANIZATIONLOGONAME}');">{$ORGANIZATIONLOGONAME}</a></td>
+ </tr>
+ </tbody></table></td>
+ </tr>
+ <tr>
+ <td colspan="2" style="padding-top: 0px; padding-bottom: 0px;"><hr></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+
+ <input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" onclick="this.form.action.value='EditCompanyDetails'" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON_LABEL}">
+ </td>
+ </tr>
+ </tbody></table>
+ </td>
+ <td bgcolor="#ebebeb" width="8"></td>
+ </tr>
+ <tr>
+
+ <td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
+ <td style="font-size: 1px;" bgcolor="#ececec" height="8"></td>
+ <td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
+ </tr>
+ </tbody></table>
+ </form>
+
+</td>
+<td width="1%" style="border-right:1px dotted #CCCCCC;"> </td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+ {include file='SettingsSubMenu.tpl'}
+{literal}
+<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
+var win = null;
+function popitup(url)
+{
+ newwindow=window.open(url,'name','height=300,width=450,left=550,top=20');
+
+}
+</SCRIPT>
+{/literal}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/ModuleOwnersContents.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/ModuleOwnersContents.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/ModuleOwnersContents.tpl Wed May 10 09:51:54 2006
@@ -32,8 +32,8 @@
<tr>
<th style="border-top: 1px solid rgb(204, 204, 204); height: 30px;" width="10%"><b>#</b></th>
- <th style="border-top: 1px solid rgb(204, 204, 204);" width="45%"><b>Module</b></th>
- <th style="border-top: 1px solid rgb(204, 204, 204);" width="45%"><b>Owned By </b></th>
+ <th style="border-top: 1px solid rgb(204, 204, 204);" width="45%"><b>{$MOD.LBL_MODULE}</b></th>
+ <th style="border-top: 1px solid rgb(204, 204, 204);" width="45%"><b>{$MOD.LBL_OWNER} </b></th>
</tr>
{if $MODULE_MODE neq 'edit'}
{foreach name=modulelists item=modules from=$USER_LIST}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/PickList.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/PickList.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/PickList.tpl Wed May 10 09:51:54 2006
@@ -118,13 +118,13 @@
<tr><td colspan="2"> </td></tr>
<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>
<td> </td>
<td>
- Select the CRM module :
+ {$MOD.LBL_SELECT_CRM_MODULE} :
<select name="pickmodule" class="importBox" onChange="changeModule(this);">
{foreach key=tabid item=module from=$MODULE_LISTS}
<option value="{$module}">{$module}</option>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/PickListContents.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/PickListContents.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/PickListContents.tpl Wed May 10 09:51:54 2006
@@ -18,7 +18,7 @@
{foreach item=picklistfields from=$picklists}
{if $picklistfields neq ''}
<td class="lvtCol" width="25%">{$picklistfields.fieldlabel}</td>
- <td class="lvtCol" width="5%"><a href="javascript:;" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');">Edit</a></td>
+ <td class="lvtCol" width="5%"><a href="javascript:;" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');">{$MOD.LBL_EDIT}</a></td>
{else}
<td class="lvtCol" colspan="2"> </td>
{/if}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/SettingsMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/SettingsMenu.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/SettingsMenu.tpl Wed May 10 09:51:54 2006
@@ -83,4 +83,4 @@
</table>
</div>
</td>
-<td width="1%" class="dock"><img src="{$IMAGE_PATH}/rhtArrow.gif" class="imgDoc" alt="Expand/Close Menu" title="Expand/Close Menu" onclick="fnSlide('slideMnu','one')" /></td>
+<td width="1%" class="dock"><img src="{$IMAGE_PATH}/rhtArrow.gif" class="imgDoc" alt="{$MOD.LBL_EXPAND_CLOSE_MENU}" title="{$MOD.LBL_EXPAND_CLOSE_MENU}" onclick="fnSlide('slideMnu','one')" /></td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserDetailView.tpl Wed May 10 09:51:54 2006
@@ -46,14 +46,14 @@
<td colspan="2" style="padding:5px;">
<span class="lvtHeaderText">
<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a>
- > {$MOD.LBL_USER_MANAGEMENT}</b></span>
+ > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
<hr noshade="noshade" size="1" />
</td>
</tr>
<tr>
<td width="5%"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
<td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
- <b class="small">Detail View of {$FIRST_NAME} {$LAST_NAME}</b>
+ <b class="small">{$UMOD.LBL_DETAIL_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
</td>
</tr>
</table>
@@ -100,34 +100,34 @@
<td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_USER_INFORMATION}</b></td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_USER_NAME} </td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_NAME} </td>
<td class="dvtCellInfo">{$USER_NAME} </td>
<td class="dvtCellLabel" align="right">{$UMOD.LBL_ADMIN} </td>
<td class="dvtCellInfo"><input type="checkbox" name="is_admin" DISABLED {$IS_ADMIN}/></td>
</tr>
{if $MODE eq 'edit'}
<tr>
- <td class="dvtCellLabel" align="right" width="20%"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_PASSWORD} </td>
+ <td class="dvtCellLabel" align="right" width="20%"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_PASSWORD} </td>
<td class="dvtCellInfo" width="20%"><input name="new_password" type="password" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
- <td class="dvtCellLabel" width="20%" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_CONFIRM_PASSWORD} </td>
+ <td class="dvtCellLabel" width="20%" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_CONFIRM_PASSWORD} </td>
<td class="dvtCellInfo" width="20%"><input name="confirm_new_password" type="password" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
{/if}
<tr>
<td class="dvtCellLabel" align="right">{$UMOD.LBL_FIRST_NAME} </td>
<td class="dvtCellInfo">{$FIRST_NAME} </td>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_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>
</tr>
<tr>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_USER_ROLE}</td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_ROLE}</td>
<td class="dvtCellInfo">{$ROLEASSIGNED} </td> <td class="dvtCellLabel" align="right">{$UMOD.LBL_GROUP_NAME}</td>
<td class="dvtCellInfo">{$GROUPASSIGNED} </td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_EMAIL}</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 class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_STATUS}</td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_STATUS}</td>
<td class="dvtCellInfo">{$STATUS} </td>
</tr>
@@ -139,7 +139,7 @@
<td span class="dvtCellInfo">{$LEAD_VIEW} </td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_COLOR}</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_COLOR}</td>
<td class="dvtCellInfo">{$COLORASSIGNED} </td>
<td class="dvtCellLabel" align="right">{$UMOD.LBL_CURRENCY_NAME}</td>
<td span class="dvtCellInfo">{$CURRENCY_NAME} </td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserEditView.tpl Wed May 10 09:51:54 2006
@@ -35,15 +35,22 @@
<td colspan="2" style="padding:5px;">
<span class="lvtHeaderText">
<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a>
- > {$MOD.LBL_USER_MANAGEMENT} > User</b></span>
+ > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
<hr noshade="noshade" size="1" />
</td>
</tr>
<tr>
<td width="5%"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
- <td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
- <b class="small">Edit View of {$FIRST_NAME} {$LAST_NAME}</b>
+ {if $MODE eq 'edit'}
+ <td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
+ <b class="small">{$UMOD.LBL_EDIT_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
</td>
+ {else}
+ <td width="95%"><span class="genHeaderGrayBig">{$UMOD.LBL_NEW_USER_BUTTON_LABEL}</span><br>
+ <b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
+ </td>
+ {/if}
+
</tr>
</table>
</td></tr>
@@ -91,39 +98,43 @@
<tr><td align="left">
<table width="99%" border="0" cellspacing="0" cellpadding="5" align="center" class="small">
<tr>
+ {if $MODE eq 'edit'}
+ <td colspan="4" class="detailedViewHeader"><b>{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}</b></td>
+ {else}
<td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
+ {/if}
</tr>
<tr>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_USER_NAME} </td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_NAME} </td>
<td 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 class="dvtCellLabel" align="right">{$UMOD.LBL_ADMIN} </td>
<td class="dvtCellInfo"><input type="checkbox" name="is_admin" {$DISABLED} {$IS_ADMIN}/></td>
</tr>
{if $MODE neq 'edit'}
<tr>
- <td class="dvtCellLabel" align="right" width="20%"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_PASSWORD} </td>
+ <td class="dvtCellLabel" align="right" width="20%"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_PASSWORD} </td>
<td class="dvtCellInfo" width="20%"><input name="new_password" type="password" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
- <td class="dvtCellLabel" width="20%" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_CONFIRM_PASSWORD} </td>
+ <td class="dvtCellLabel" width="20%" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_CONFIRM_PASSWORD} </td>
<td class="dvtCellInfo" width="20%"><input name="confirm_new_password" type="password" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
{/if}
<tr>
<td class="dvtCellLabel" align="right">{$UMOD.LBL_FIRST_NAME} </td>
<td class="dvtCellInfo"><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>
+ <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"><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>{$UMOD.LBL_USER_ROLE}</td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_ROLE}</td>
<td class="dvtCellInfo">{$USER_ROLE}</td>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_EMAIL}</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 class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_STATUS}</td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_STATUS}</td>
{$USER_STATUS_OPTIONS}
<td class="dvtCellInfo" colspan="2" > </td>
</tr>
@@ -135,7 +146,7 @@
<td span class="dvtCellInfo">{$LEAD_VIEW}</td>
</tr>
<tr>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>*</font></span>{$UMOD.LBL_COLOR}</td>
+ <td class="dvtCellLabel" align="right">{$UMOD.LBL_COLOR}</td>
<td> {$CAL_COLOR}</td>
<td class="dvtCellLabel" align="right">{$UMOD.LBL_CURRENCY_NAME}</td>
<td span class="dvtCellInfo">{$CURRENCY_NAME}</td>
@@ -151,7 +162,11 @@
<tr><td align="left">
<table width="99%" border="0" cellspacing="0" cellpadding="5" align="center" class="small">
<tr>
- <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
+ {if $MODE eq 'edit'}
+ <td colspan="4" class="detailedViewHeader"><b>{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}</b></td>
+ {else}
+ <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
+ {/if}
</tr>
<tr>
<td class="dvtCellLabel" align="right">{$UMOD.LBL_TITLE}</td>
@@ -218,7 +233,11 @@
<tr><td align="left">
<table width="99%" border="0" cellspacing="0" cellpadding="5" align="center" class="small">
<tr>
- <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
+ {if $MODE eq 'edit'}
+ <td colspan="4" class="detailedViewHeader"><b>{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}</b></td>
+ {else}
+ <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
+ {/if}
</tr>
<tr>
<td class="dvtCellLabel" align="right">{$UMOD.LBL_ADDRESS}</td>
@@ -262,8 +281,8 @@
<tr><td> </td></tr>
<tr>
<td><div align="center">
- <input title="Save [Alt+S]" accesskey="S" class="small" name="button" value=" Save " onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="submit" />
- <input title="Cancel [Alt+X]" accesskey="X" class="small" name="button" value=" Cancel " onclick="window.history.back()" style="width: 70px;" type="button" />
+ <input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small" name="button" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="submit" />
+ <input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small" name="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " onclick="window.history.back()" style="width: 70px;" type="button" />
</div></td>
</tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserListView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserListView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserListView.tpl Wed May 10 09:51:54 2006
@@ -26,7 +26,7 @@
<td colspan="2" style="padding:5px;">
<span class="lvtHeaderText">
<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a>
- > {$MOD.LBL_USER_MANAGEMENT} > Users</b></span>
+ > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
<hr noshade="noshade" size="1" />
</td>
</tr>
@@ -36,7 +36,7 @@
<tr>
<td colspan="2" align="left"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"> <span class="genHeaderGray">{$MOD.LBL_USER_MANAGEMENT}</span></td>
<td align="right" style="padding:5px; ">
- <input title='New User [Alt+N]' accessyKey='N' class='classBtn' type='submit' name='button' value='New User' >
+ <input title="{$CMOD.LBL_NEW_USER_BUTTON_TITLE}" accessyKey="{$CMOD.LBL_NEW_USER_BUTTON_KEY}" class='classBtn' type='submit' name='button' value="{$CMOD.LBL_NEW_USER_BUTTON_LABEL}" >
</td>
</tr>
<tr><td colspan="3" style="border-bottom:1px dashed #CCCCCC;"> </td></tr>
@@ -55,7 +55,7 @@
<tr><td align="right"><b>{$CMOD.LBL_TOTAL}</b></td>
<td align="left">{$USER_COUNT.user} {$CMOD.LBL_USERS}</td>
</tr>
- <tr><td align="right"><b>{$CMOD.LBL_ADMIN} : </b></td>
+ <tr><td align="right"><b>{$CMOD.LBL_ADMIN} {$CMOD.LBL_COLON}</b></td>
<td align="left">{$USER_COUNT.admin} {$CMOD.LBL_USERS}</td>
</tr>
<tr><td align="right"><b>{$CMOD.LBL_OTHERS}</b></td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserProfile.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserProfile.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/UserProfile.tpl Wed May 10 09:51:54 2006
@@ -36,7 +36,7 @@
<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
<span class="genHeaderGray">{$MOD.LBL_PROFILES}</span>
</td>
- <td align="right" style="border-bottom:1px dashed #CCCCCC;"><input title="New" accessKey="C" class="classBtn" type="submit" name="New" value="New Profile"/></td>
+ <td align="right" style="border-bottom:1px dashed #CCCCCC;"><input title="{$CMOD.LBL_NEW_PROFILE}" class="classBtn" type="submit" name="New" value="{$CMOD.LBL_NEW_PROFILE}"/></td>
</tr>
<tr><td colspan="3"> </td></tr>
<tr><td colspan="3">
Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php Wed May 10 09:51:54 2006
@@ -1178,12 +1178,12 @@
}
$temp_val = str_replace("'",'\"',$temp_val);
-
+
//Added to avoid the error when select SO from Invoice through AjaxEdit
if($module == 'SalesOrder')
$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific("'.$entity_id.'", "'.br2nl($temp_val).'","'.$_REQUEST['form'].'"); window.close()\'>'.$temp_val.'</a>';
else
- $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific("'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
+ $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific("'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
}
elseif($popuptype == "detailview")
{
@@ -1255,7 +1255,42 @@
//added by rdhital/Raju for better emails
elseif($popuptype == "set_return_emails")
{
- if ($module=='Accounts')
+ if ($module=='Accounts')
+ {
+ $accid =$adb->query_result($list_result,$list_result_count,'accountid');
+ //$value = '<a href="javascript: submitform('.$accid.');">'.$temp_val.'</a>';
+ $emailaddress=$adb->query_result($list_result,$list_result_count,"email1");
+ if($emailaddress == '')
+ $emailaddress=$adb->query_result($list_result,$list_result_count,"email2");
+
+ $querystr="select fieldid,fieldlabel,columnname from field where tabid=".getTabid($module)." and uitype=13;";
+ $queryres = $adb->query($querystr);
+ //Change this index 0 - to get the fieldid based on email1 or email2
+ $fieldid = $adb->query_result($queryres,0,'fieldid');
+
+$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); window.close(); \'>'.$name.'</a>';
+
+ }
+ elseif ($module=='Contacts' || $module=='Leads')
+ {
+ $firstname=$adb->query_result($list_result,$list_result_count,"firstname");
+ $lastname=$adb->query_result($list_result,$list_result_count,"lastname");
+ $name=$lastname.' '.$firstname;
+ $emailaddress=$adb->query_result($list_result,$list_result_count,"email");
+ if($emailaddress == '')
+ $emailaddress=$adb->query_result($list_result,$list_result_count,"yahooid");
+
+ $querystr="select fieldid,fieldlabel,columnname from field where tabid=".getTabid($module)." and uitype=13;";
+ $queryres = $adb->query($querystr);
+ //Change this index 0 - to get the fieldid based on email or yahooid
+ $fieldid = $adb->query_result($queryres,0,'fieldid');
+
+ //$value = '<a href="javascript: submitform('.$entity_id.');">'.$name.'</a>';
+ $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); window.close(); \'>'.$name.'</a>';
+
+
+ }
+ /* if ($module=='Accounts')
{
$accid =$adb->query_result($list_result,$list_result_count,'accountid');
$value = '<a href="javascript: submitform('.$accid.');">'.$temp_val.'</a>';
@@ -1267,7 +1302,7 @@
$name=$lastname.' '.$firstname;
$value = '<a href="javascript: submitform('.$entity_id.');">'.$name.'</a>';
- }
+ }*/
}
//code added by raju ends
Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/UserInfoUtil.php Wed May 10 09:51:54 2006
@@ -347,7 +347,7 @@
global $log;
$log->debug("Entering getDefaultSharingAction() method ...");
global $adb;
- //retreiving the standard permissions
+ //retreivin the standard permissions
$sql= "select * from def_org_share where editstatus in(0,1)";
$result = $adb->query($sql);
$permissionRow=$adb->fetch_array($result);
@@ -1573,6 +1573,12 @@
$permission = isReadWritePermittedBySharing($module,$tabid,$actionid,$record_id);
$log->debug("Exiting isPermitted method ...");
return $permission;
+ }
+ else
+ {
+ $permission = "yes";
+ $log->debug("Exiting isPermitted method ...");
+ return $permission;
}
}
else
@@ -4334,6 +4340,15 @@
}
$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+ }
+ elseif($module == 'Campaigns')
+ {
+ $sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%')";
+
+ if(sizeof($current_user_groups) > 0)
+ {
+ $sec_query .= " or (crmentity.smownerid in (0) and (groups.groupid in".getCurrentUserGroupList()."))) ";
+ }
}
else
{
@@ -4486,7 +4501,8 @@
'Quotes'=>'LBL_QUOTE_FIELD_ACCESS',
'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS',
'SalesOrder'=>'LBL_SO_FIELD_ACCESS',
- 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS'
+ 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS',
+ 'Campaigns'=>'LBL_CAMPAIGN_FIELD_ACCESS'
);
$log->debug("Exiting getFieldModuleAccessArray method ...");
Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/utils.php Wed May 10 09:51:54 2006
@@ -1017,6 +1017,10 @@
elseif($module == 'Invoice')
{
$query1="select groups.groupid from invoicegrouprelation inner join groups on groups.groupname = invoicegrouprelation.groupname where invoiceid=".$record;
+ }
+ elseif($module == 'Campaigns')
+ {
+ $query1="select groups.groupid from campaigngrouprelation inner join groups on groups.groupname = campaigngrouprelation.groupname where campaignid=".$record;
}
$result1=$adb->query($query1);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Appointment.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Appointment.php Wed May 10 09:51:54 2006
@@ -13,25 +13,28 @@
require_once('modules/Activities/Activity.php');
class Appointment
{
- var $db;
var $start_time;
var $end_time;
var $subject;
- var $participant = Array();
- var $participant_state = Array();
+ var $participant;
+ var $participant_state;
var $contact_name;
var $account_id;
var $account_name;
var $eventstatus;
var $activity_type;
- var $description = "";
+ var $description;
var $record;
+ var $image_name;
+ var $formatted_datetime;
function Appointment()
{
- $this->db = new PearDatabase();
+ $this->participant = Array();
+ $this->participant_state = Array();
+ $this->description = "";
}
- function read_appointment($userid, &$from_datetime, &$to_datetime)
+ function readAppointment($userid, &$from_datetime, &$to_datetime)
{
global $current_user,$adb;
$shared_ids = getSharedCalendarId($current_user->id,'shared');
@@ -53,31 +56,109 @@
$q .= " ORDER by activity.date_start,activity.time_start";
- /*$r = $adb->query($q);
+ $r = $adb->query($q);
$n = $adb->getRowCount($r);
$a = 0;
-
+ $list = Array();
while ( $a < $n )
{
- $o = &new Appointment();
+ $obj = &new Appointment();
$result = $adb->fetchByAssoc($r);
- echo '<pre>';print_r($result);echo '</pre>';
//echo '<pre>' print_r($result);echo '</pre>';
- //print_r($result);
- //$o->read_result($r,$a);
- $o->read_result($result);
+ $obj->readResult($result);
+ //$list_arr[$obj->record] = $obj;
$a++;
- if ( $o->see_ok() ) {
- //Get all participants
- //$o->read_participants();
- //print("GS --> see");
- $obj->callist[$o->record_id] = &$o;
- }
- unset($o);
- }*/
+ $list[] = $obj;
+ unset($obj);
+ }
+ usort($list,'compare');
+ //echo '<pre>';print_r($list);echo '</pre>';
+ return $list;
+ }
+
+ function readResult($act_array)
+ {
+ $format_sthour='';
+ $format_stmin='';
+ list($st_hour,$st_min,$st_sec) = split(":",$act_array["time_start"]);
+ if($st_hour <= 9 && strlen(trim($st_hour)) < 2)
+ {
+ $format_sthour= '0'.$st_hour;
+ }
+ else
+ {
+ $format_sthour= $st_hour;
+ }
+ if($st_min <= 9 && strlen(trim($st_min)) < 2)
+ {
+ $format_stmin= '0'.$st_min;
+ }
+ else
+ {
+ $format_stmin = $st_min;
+ }
+ list($styear,$stmonth,$stday) = explode("-",$act_array["date_start"]);
+ $startdate = $act_array["date_start"] .' ' . $format_sthour .":" . $format_stmin .":00";
+ $start_date_arr = Array(
+ 'min' => $format_stmin,
+ 'hour' => $format_sthour,
+ 'day' => $stday,
+ 'month' => $stmonth,
+ 'year' => $styear
+ );
+ //end time calculation
+ $end_hour = 0;
+ $end_min = $st_min + $act_array["duration_minutes"];
+ if($end_min <= 9) $end_min= '0'.$end_min;
+ if($end_min >= 60)
+ {
+ $end_min = $end_min%60;
+ if($end_min <= 9) $end_min= '0'.$end_min;
+ $end_hour++;
+ }
+ $end_hour = $end_hour + $st_hour + $act_array["duration_hours"];
+ if($end_hour <= 9) $end_hour= '0'.$end_hour;
+ if ($end_hour > 23) $end_hour = 23;
+ list($eyear,$emonth,$eday) = explode("-",$act_array["due_date"]);
+ $enddate = $act_array["date_start"] .' ' . $end_hour .":" . $end_min .":00";
+ $end_date_arr = Array(
+ 'min' => $end_min,
+ 'hour' => $end_hour,
+ 'day' => $eday,
+ 'month' => $emonth,
+ 'year' => $eyear
+ );
+
+ $this->description = $act_array["description"];
+ $this->start_time = new DateTime($start_date_arr,true);
+ $this->account_name = $act_array["accountname"];
+ $this->account_id = $act_array["accountid"];
+ $this->eventstatus = $act_array["eventstatus"];
+ $this->end_time = new DateTime($end_date_arr,true);
+ $this->subject = $act_array["subject"];
+ $this->activity_type = $act_array["activitytype"];
+ if($act_array["activitytype"] == 'Call')
+ {
+ $this->image_name = 'Calls.gif';
+ }
+ if($act_array["activitytype"] == 'Meeting')
+ {
+ $this->image_name = 'Meetings.gif';
+ }
+ $this->record = $act_array["activityid"];
+ $this->formatted_datetime= $act_array["date_start"].":".$st_hour;
return;
}
}
+
+function compare($a,$b)
+{
+ if ($a->start_time->ts == $b->start_time->ts)
+ {
+ return 0;
+ }
+ return ($a->start_time->ts < $b->start_time->ts) ? -1 : 1;
+}
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php Wed May 10 09:51:54 2006
@@ -133,7 +133,15 @@
}
$activities = Array();
- $activities = Appointment::read_appointment($current_user->id,$this->date_time,$end_datetime);
+ $activities = Appointment::readAppointment($current_user->id,$this->date_time,$end_datetime);
+ if(!empty($activities))
+ {
+ foreach($activities as $key=>$value)
+ {
+ if($this->view == 'day')
+ array_push($this->day_slice[$value->formatted_datetime]->activities, $value);
+ }
+ }
}
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/CalendarAjax.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/CalendarAjax.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/CalendarAjax.php Wed May 10 09:51:54 2006
@@ -50,6 +50,11 @@
$date_data['year'] = $_REQUEST['year'];
}
$calendar_arr['calendar'] = new Calendar($mysel,$date_data);
+ if ($mysel == 'day' || $mysel == 'week' || $mysel == 'month')
+ {
+ global $current_user;
+ $calendar_arr['calendar']->add_Activities($current_user);
+ }
$calendar_arr['view'] = $mysel;
if($type == 'hourview')
{
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php Wed May 10 09:51:54 2006
@@ -295,15 +295,19 @@
<span class="genHeaderBig">'.$hour.'</span>
<span class="genHeaderGray">'.$sub_str.'</span>
</td>
- <td style="border-bottom: 1px solid rgb(204, 204, 204);" onmouseover="show(\''.$hour.''.$sub_str.'\')" onmouseout="hide(\''.$hour.''.$sub_str.'\')" height="65">
+ <td style="border-bottom: 1px solid rgb(204, 204, 204); width:5%;" onmouseover="show(\''.$hour.''.$sub_str.'\')" onmouseout="hide(\''.$hour.''.$sub_str.'\')" height="65">
<div id="'.$hour.''.$sub_str.'" style="display: none;">
<a onClick="gshow(\'addEvent\')" href="javascript:void(0)"><img src="'.$cal['IMAGE_PATH'].'cal_add.jpg" border="0"></a>
</div>
- </td>';
+ </td>
+ <td style="border-bottom: 1px solid rgb(204, 204, 204);">';
+ //echo '<pre>';print_r($cal);echo '</pre>';
+
+ $dayview_layout .= getEventLayer($cal,$cal['calendar']->slices[$i]);
/*get events/tasks that has current date as starting time
*/
//$dayview_layout .=
- $dayview_layout .='
+ $dayview_layout .=' </td>
</tr>';
}
$dayview_layout .= '<tr><td style="border-right: 1px solid rgb(102, 102, 102);"> </td><td> </td></tr>
@@ -454,6 +458,47 @@
{
}
+
+function getEventLayer(& $cal,$slice)
+{
+ $eventlayer = '';
+ $arrow_img_name = '';
+ $act = $cal['calendar']->day_slice[$slice]->activities;
+ if(!empty($act))
+ {
+ for($i=0;$i<count($act);$i++)
+ {
+ $arrow_img_name = 'event'.$cal['calendar']->day_slice[$slice]->start_time->hour.'_'.$i;
+ $subject = $act[$i]->subject;
+ if(strlen($subject)>25)
+ $subject = substr($subject,0,25)."...";
+ $start_hour = $act[$i]->start_time->hour;
+ $account_name = $act[$i]->accountname;
+ $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name;
+ $eventlayer .='<div class ="eventLay" id="'.$cal['calendar']->day_slice[$slice]->start_time->hour.'_'.$i.'">
+ <table border="0" cellpadding="0" cellspacing="0" width="95%">
+ <tr onmouseover="show(\''.$arrow_img_name.'\');" onmouseout="hide(\''.$arrow_img_name.'\');">
+ <td align="left" width="5%"><img src="'.$image.'" align="right top"></td>
+ <td align="left" width="85%"><span class="fontBold">'.$account_name.'</span><br>
+ '.$start_hour.',<span class="orgTab">'.$subject.'</span>
+ <a href="#" class="webMnu">[More...]</a>
+
+ </td>
+ <td align="right" width="5%">
+ <div id="'.$arrow_img_name.'" style="display: none;">
+ <a href="#" onclick="fnvshobj(this,\'reportLay\');" onmouseout="fninvsh(\'reportLay\')">
+ <img src="'.$cal['IMAGE_PATH'].'cal_event.jpg" border="0"></a>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div><br>';
+ }
+ return $eventlayer;
+ }
+}
+
+
function getEventList(& $calendar,$start_date,$end_date,$info='')
{
$Entries = Array();
@@ -484,51 +529,93 @@
$duration_min = $adb->query_result($result,$i,"duration_minutes");
$start_time = $adb->query_result($result,$i,"time_start");
$end_time = '';
+ list($hour,$min) = explode(":",$start_time);
if($calendar['calendar']->hour_format == 'am/pm')
{
//echo $start_time;
- if($start_time>'12:00')
+ if($hour>'12')
{
- $time = explode(":",$start_time);
- $hour = $time[0] - 12;
- $min = $time[1];
- $start_time = $hour.":".$min."pm";
+ $hour = $hour - 12;
+ $start_hour = $hour;
+ if($start_hour <= 9 && strlen(trim($start_hour)) < 2)
+ $start_hour = "0".$start_hour;
+ $start_time = $start_hour.":".$min."pm";
$end_min = $min+$duration_min;
$end_hour = $hour+$duration_hour;
- if($end_min>60)
+ if($end_min>=60)
{
- $end_min = $end_min - 60;
- $end_hour = $end_hour + 1;
+ $end_min = $end_min%60;
+ $end_hour++;
}
- if($end_min == 0)
- $end_min = "00";
+ if($end_hour <= 9 && strlen(trim($end_hour)) < 2)
+ $end_hour = "0".$end_hour;
+ if($end_min <= 9 && strlen(trim($end_min)) < 2)
+ $end_min = "0".$end_min;
$end_time = $end_hour.":".$end_min."pm";
//echo $start_time;
}
+ elseif($hour == '12')
+ {
+ $start_hour = $hour;
+ if($start_hour <= 9 && strlen(trim($start_hour)) < 2)
+ $start_hour = "0".$start_hour;
+ $start_time = $start_hour.":".$min."pm";
+ $end_min = $min+$duration_min;
+ $end_hour = $hour+$duration_hour;
+ if($end_min>=60)
+ {
+ $end_min = $end_min%60;
+ $end_hour++;
+ }
+ if($end_hour>'12')
+ {
+ $end_hour = $end_hour - 12;
+ if($end_hour <= 9 && strlen(trim($end_hour)) < 2)
+ $end_hour = "0".$end_hour;
+ if($end_min <= 9 && strlen(trim($end_min)) < 2)
+ $end_min = "0".$end_min;
+ $end_time = $end_hour.":".$end_min."pm";
+ }
+ else
+ {
+ if($end_hour <= 9 && strlen(trim($end_hour)) < 2)
+ $end_hour = "0".$end_hour;
+ if($end_min <= 9 && strlen(trim($end_min)) < 2)
+ $end_min = "0".$end_min;
+ $end_time = $end_hour.":".$end_min."am";
+ }
+ }
else
{
- $time = explode(":",$start_time);
- $hour = $time[0];
- $min = $time[1];
- $start_time = $start_time."am";
+ $start_hour = $hour;
+ if($start_hour <= 9 && strlen(trim($start_hour)) < 2)
+ $start_hour = "0".$start_hour;
+ $start_time = $start_hour.":".$min."am";
$end_min = $min+$duration_min;
$end_hour = $hour+$duration_hour;
- if($end_min>60)
+ if($end_min>=60)
{
- $end_min = $end_min - 60;
- $end_hour = $end_hour + 1;
+ $end_min = $end_min%60;
+ $end_hour++;
}
- if($end_hour>'12')
+ if($end_hour>='12')
{
- $hour = $end_hour - 12;
- if($end_min == 0)
- $end_min = "00";
+ if($end_hour == '12' && $end_hour > '00')
+ $end_hour = $end_hour;
+ else
+ $end_hour = $end_hour - 12;
+ if($end_hour <= 9 && strlen(trim($end_hour)) < 2)
+ $end_hour = "0".$end_hour;
+ if($end_min <= 9 && strlen(trim($end_min)) < 2)
+ $end_min = "0".$end_min;
$end_time = $end_hour.":".$end_min."pm";
}
else
{
- if($end_min == 0)
- $end_min = "00";
+ if($end_hour <= 9 && strlen(trim($end_hour)) < 2)
+ $end_hour = "0".$end_hour;
+ if($end_min <= 9 && strlen(trim($end_min)) < 2)
+ $end_min = "0".$end_min;
$end_time = $end_hour.":".$end_min."am";
}
@@ -538,18 +625,19 @@
}
else
{
- $time = explode(":",$start_time);
- $hour = $time[0];
- $min = $time[1];
+ $hour = $hour;
+ $min = $min;
$end_min = $min+$duration_min;
$end_hour = $hour+$duration_hour;
- if($end_min>60)
+ if($end_min>=60)
{
- $end_min = $end_min - 60;
- $end_hour = $end_hour + 1;
+ $end_min = $end_min%60;
+ $end_hour++;
}
- if($end_min == 0)
- $end_min = "00";
+ if($end_hour <= 9 && strlen(trim($end_hour)) < 2)
+ $end_hour = "0".$end_hour;
+ if($end_min <= 9 && strlen(trim($end_min)) < 2)
+ $end_min = "0".$end_min;
$end_time = $end_hour.":".$end_min;
$element['starttime'] = $start_time;
$element['endtime'] = $end_time;
@@ -557,6 +645,8 @@
$contact_id = $adb->query_result($result,$i,"contactid");
$id = $adb->query_result($result,$i,"activityid");
$subject = $adb->query_result($result,$i,"subject");
+ if(strlen($subject)>25)
+ $subject = substr($subject,0,25)."...";
if($contact_id != '')
{
$contactname = getContactName($contact_id);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php Wed May 10 09:51:54 2006
@@ -88,6 +88,12 @@
'LBL_PREV_MON' => 'Previous Month',
'LBL_NEXT_MON' => 'Next Month',
+'LBL_YEAR'=>'Year',
+'LBL_YEAR_BUTTON_KEY'=>'Y',
+'LBL_MON_BUTTON_TITLE'=>'Year [Alt+Y]',
+'LBL_PREV_YEAR'=>'Previous Year',
+'LBL_NEXT_YEAR' => 'Next Year',
+
'LBL_APP_LOCATION' => 'Location',
'LBL_APP_IGNORE_TIME' => 'ignore above times',
'LBL_SUBJECT'=>'Subject:',
@@ -126,6 +132,42 @@
"November",
"December",
),
+
+'cal_weekdays_short'=>array(
+"Sun",
+"Mon",
+"Tue",
+"Wed",
+"Thu",
+"Fri",
+"Sat",
+),
+'cal_weekdays_long'=>array(
+"Sunday",
+"Monday",
+"Tuesday",
+"Wednesday",
+"Thursday",
+"Friday",
+"Saturday",
+),
+'cal_month_short'=>array(
+"",
+"Jan",
+"Feb",
+"Mar",
+"Apr",
+"May",
+"Jun",
+"Jul",
+"Aug",
+"Sep",
+"Oct",
+"Nov",
+"Dec",
+),
+
+
//DON'T CONVERT THESE THEY ARE MAPPINGS
'db_last_name' => 'LBL_LIST_LAST_NAME',
'db_first_name' => 'LBL_LIST_FIRST_NAME',
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js Wed May 10 09:51:54 2006
@@ -22,7 +22,6 @@
x = document.massdelete.selected_id.length;
idstring = "";
-
if ( x == undefined)
{
@@ -62,15 +61,20 @@
show("status");
var ajaxObj = new Ajax(ajaxSaveResponse);
var urlstring ="module=Users&action=massdelete&return_module=Emails&idlist="+idstring;
- ajaxObj.process("index.php?",urlstring);
+ ajaxObj.process("index.php?",urlstring);
}
else
{
return false;
}
}
+function ShowFolders(folder)
+{
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Emails&ajax=true&action=EmailsAjax&file=ListView&folder="+folder;
+ ajaxObj.process("index.php?",urlstring);
+}
-
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php Wed May 10 09:51:54 2006
@@ -27,13 +27,12 @@
require_once('include/logging.php');
require_once('include/utils/utils.php');
require_once('modules/CustomView/CustomView.php');
-
global $current_user;
-$submenu = array('LBL_EMAILS_TITLE'=>'index.php?module=Emails&action=ListView.php','LBL_WEBMAILS_TITLE'=>'index.php?module=Webmails&action=index&parenttab=My Home Page');
-
-$sec_arr = array('index.php?module=Emails&action=ListView.php'=>'Emails','index.php?module=Webmails&action=index&parenttab=parenttab=My Home Page'=>'Emails');
-
-if($_REQUEST['ajax'] == '')
+//$submenu = array('LBL_EMAILS_TITLE'=>'index.php?module=Emails&action=ListView.php','LBL_WEBMAILS_TITLE'=>'index.php?module=Webmails&action=index&parenttab=My Home Page');
+
+//$sec_arr = array('index.php?module=Emails&action=ListView.php'=>'Emails','index.php?module=Webmails&action=index&parenttab=parenttab=My Home Page'=>'Emails');
+
+/*if($_REQUEST['ajax'] == '')
{
if(isset($_REQUEST['smodule']) && $_REQUEST['smodule'] != '')
@@ -73,7 +72,7 @@
}
}
-}
+}*/
global $app_strings;
global $mod_strings;
@@ -113,9 +112,10 @@
//<<<<cutomview>>>>>>>
$oCustomView = new CustomView("Emails");
-$viewid = $oCustomView->getViewId($currentModule);
+$viewid = 20;
$customviewcombo_html = $oCustomView->getCustomViewCombo($viewid);
$viewnamedesc = $oCustomView->getCustomViewByCvid($viewid);
+
//<<<<<customview>>>>>
// Buttons and View options
@@ -158,19 +158,33 @@
}
//<<<<<<<<customview>>>>>>>>>
-
if(isset($where) && $where != '')
{
$list_query .= " AND " .$where;
}
-
+if($_REQUEST['folder'] =='Contacts')
+{
+ $list_query .= "AND seactivityrel.crmid in (select contactid from contactdetails)";
+}
+if($_REQUEST['folder'] =='Accounts')
+{
+ $list_query .= "AND seactivityrel.crmid in (select accountid from account)";
+}
+if($_REQUEST['folder'] =='Leads')
+{
+ $list_query .= "AND seactivityrel.crmid in (select leadid from leaddetails)";
+}
+if($_REQUEST['folder'] =='Users')
+{
+ $list_query .= "AND seactivityrel.crmid in (select id from users)";
+}
if(isset($order_by) && $order_by != '')
{
$tablename = getTableNameForField('Emails',$order_by);
$tablename = (($tablename != '')?($tablename."."):'');
-
- $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
-}
+ $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
+}
+
$list_result = $adb->query($list_query);
//Constructing the list view
@@ -221,7 +235,8 @@
$listview_header = getSearchListHeaderValues($focus,"Emails",$url_string,$sorder,$order_by,"",$oCustomView);
$smarty->assign("SEARCHLISTHEADER",$listview_header_search);
$listview_entries = getListViewEntries($focus,"Emails",$list_result,$navigation_array,"","","EditView","Delete",$oCustomView);
-$smarty->assign("LISTENTITY", $listview_entries); $smarty->assign("SELECT_SCRIPT", $view_script);
+$smarty->assign("LISTENTITY", $listview_entries);
+$smarty->assign("SELECT_SCRIPT", $view_script);
$navigationOutput = getTableHeaderNavigation($navigation_array,$url_string,"Emails","index",$viewid);
$alphabetical = AlphabeticalSearch($currentModule,'index','subject','true','basic',"","","","",$viewid);
@@ -232,7 +247,9 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
-
+if($_REQUEST['ajax'] != '')
+ $smarty->display("EmailContents.tpl");
+else
$smarty->display("Emails.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php Wed May 10 09:51:54 2006
@@ -133,7 +133,8 @@
'LBL_WEBMAILS_TITLE'=>'WebMails',
'LBL_EMAILS_TITLE'=>'Emails',
'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!<br> Check in My Accounts->List Mail Server -> List Mail Account',
-
+'LBL_ALLMAILS'=>'All Mails',
+'LBL_TO_USERS'=>'To Users',
);
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Import/Forms.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Import/Forms.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Import/Forms.php Wed May 10 09:51:54 2006
@@ -188,7 +188,7 @@
require_once('include/database/PearDatabase.php');
global $adb;
- $output = "<select name=\"colnum" . $colnum ."\">\n";
+ $output = "<select id=\"colnum" . $colnum ."\" name=\"colnum" . $colnum ."\">\n";
$output .= "<option value=\"-1\">". $mod_strings['LBL_DONT_MAP'] . "</option>";
$count = 0;
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Import/ImportStep3.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Import/ImportStep3.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Import/ImportStep3.php Wed May 10 09:51:54 2006
@@ -440,3 +440,59 @@
$smarty->display('ImportStep2.tpl');
?>
+<script language="javascript" type="text/javascript">
+function validate_import_map()
+{
+ var tagName;
+ var count = 0;
+ var required_count = 0;
+ var field_count = "<?php echo $field_count; ?>";
+ var required_fields = new Array();
+
+ <?php
+ foreach($focus->required_fields as $name => $index)
+ {
+ ?>
+ required_fields[count] = "<?php echo $name; ?>";
+ count = count + 1;
+ <?php
+ }
+ ?>
+ for(loop_count = 0; loop_count<field_count;loop_count++)
+ {
+ tagName = document.getElementById('colnum'+loop_count);
+ optionData = tagName.options[tagName.selectedIndex].value;
+ for(inner_loop = 0; inner_loop<required_fields.length;inner_loop++)
+ {
+ if(optionData == required_fields[inner_loop])
+ {
+ required_count = required_count +1;
+ }
+ }
+ }
+
+ var err_msg = '';
+ if(required_count != required_fields.length)
+ {
+ err_msg = "Please Map All Required Fileds";
+ }
+ else
+ {
+ //This is to check whether the save map name has been given or not when save map check box is checked
+ if(document.getElementById("save_map").checked == true)
+ {
+ if(trim(document.getElementById("save_map_as").value) == '')
+ {
+ err_msg = "Please Enter Save Map Name";
+ }
+ }
+ }
+ if(err_msg != '')
+ {
+ alert(err_msg);
+ return false;
+ }
+ else
+ return true;
+}
+</script>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/ListView.php Wed May 10 09:51:54 2006
@@ -179,9 +179,15 @@
$navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Invoice","index",$viewid);
$alphabetical = AlphabeticalSearch($currentModule,'index','subject','true','basic',"","","","",$viewid);
+$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html);
+$smarty->assign("VIEWID", $viewid);
+$smarty->assign("BUTTONS", $other_text);
$smarty->assign("ALPHABETICAL", $alphabetical);
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
+$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html);
+$smarty->assign("VIEWID", $viewid);
+$smarty->assign("BUTTONS", $other_text);
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/ListView.php Wed May 10 09:51:54 2006
@@ -206,6 +206,10 @@
$navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Potentials","index",$viewid);
$alphabetical = AlphabeticalSearch($currentModule,'index','potentialname','true','basic',"","","","",$viewid);
+$fieldnames = getAdvSearchfields($module);
+$criteria = getcriteria_options();
+$smarty->assign("CRITERIA", $criteria);
+$smarty->assign("FIELDNAMES", $fieldnames);
$smarty->assign("ALPHABETICAL", $alphabetical);
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/ListView.php Wed May 10 09:51:54 2006
@@ -145,6 +145,10 @@
$smarty->assign("LISTENTITY", $listview_entries);
$navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"PriceBooks","index",$viewid);
$alphabetical = AlphabeticalSearch($currentModule,'index','bookname','true','basic',"","","","",$viewid);
+$fieldnames = getAdvSearchfields($module);
+$criteria = getcriteria_options();
+$smarty->assign("CRITERIA", $criteria);
+$smarty->assign("FIELDNAMES", $fieldnames);
$smarty->assign("ALPHABETICAL", $alphabetical);
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Products/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Products/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Products/ListView.php Wed May 10 09:51:54 2006
@@ -162,6 +162,10 @@
$navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Products","index",$viewid);
$alphabetical = AlphabeticalSearch($currentModule,'index','productname','true','basic',"","","","",$viewid);
+$fieldnames = getAdvSearchfields($module);
+$criteria = getcriteria_options();
+$smarty->assign("CRITERIA", $criteria);
+$smarty->assign("FIELDNAMES", $fieldnames);
$smarty->assign("ALPHABETICAL", $alphabetical);
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/ListView.php Wed May 10 09:51:54 2006
@@ -179,9 +179,16 @@
$navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Quotes","index",$viewid);
$alphabetical = AlphabeticalSearch($currentModule,'index','subject','true','basic',"","","","",$viewid);
+$fieldnames = getAdvSearchfields($module);
+$criteria = getcriteria_options();
+$smarty->assign("CRITERIA", $criteria);
+$smarty->assign("FIELDNAMES", $fieldnames);
$smarty->assign("ALPHABETICAL", $alphabetical);
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
+$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html);
+$smarty->assign("VIEWID", $viewid);
+$smarty->assign("BUTTONS", $other_text);
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Reports/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Reports/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Reports/language/en_us.lang.php Wed May 10 09:51:54 2006
@@ -80,7 +80,37 @@
//Added for 5 Beta
'LBL_NO_PERMISSION'=>'Your profile dosen\'t allow you view the reports for one of the module(s)',
+'LBL_SELECT_COLUMNS_TO_GENERATE_REPORTS'=>'Select columns to generate reports',
+'LBL_AVAILABLE_FIELDS'=>'Available Fields',
+'LBL_SELECTED_FIELDS'=>'Selected Fields',
+'LBL_CALCULATIONS'=>'Calculations',
+'LBL_SELECT_COLUMNS_TO_TOTAL'=>'Select columns to Total',
+'LBL_SELECT_FILTERS_TO_STREAMLINE_REPORT_DATA'=>'Select Filters to Streamline Report Data',
+'LBL_SELECT_FILTERS'=>'Filters',
+'LBL_SELECT_COLUMNS_TO_GROUP_REPORTS'=>'Select columns to group reports',
+'LBL_BACK_TO_REPORTS'=>'Back to Reports',
+'LBL_SELECT_ANOTHER_REPORT'=>'Select Another Report',
+'LBL_SELECT_COLUMN'=>'Select Column',
+'LBL_SELECT_TIME'=>'Select Time',
+'LBL_PRINT_REPORT'=>'Print Report',
+'LBL_CLICK_HERE'=>'Click Here',
+'LBL_TO_ADD_NEW_GROUP'=>'to add new group',
+'LBL_CREATE_NEW'=>'Create New',
+'LBL_REPORT_DETAILS'=>'Report Details',
+'LBL_RELATIVE_MODULE'=>'Relative Module',
+'LBL_REPORT_TYPE'=>'Report Type',
+'LBL_REPORT_DETAILS'=>'Report Details',
+'LBL_TYPE_THE_NAME'=>'Type the Name',
+'LBL_DESCRIPTION_FOR_REPORT'=>'Description for the report',
+'LBL_REPORT_NAME'=>'Report Name',
+'LBL_DESCRIPTION'=>'Description',
+'LBL_REPORT_MODULE'=>'Report Module',
+'LBL_SELECT_RELATIVE_MODULE_FOR_REPORT'=>'Select Relative Module for Report',
+'LBL_SELECT_REPORT_TYPE_BELOW'=>'Select Report type Below',
+'LBL_TABULAR_FORMAT'=>'Tabular Format',
+'LBL_TABULAR_REPORTS_ARE_SIMPLEST'=>'Tabular Reports are the simplest and fastest way of getting your data',
+'LBL_SUMMARY_REPORT_VIEW_DATA_WITH_SUBTOTALS'=>'Summary reports allow you to view your data along with subtotals and other summary information',
-);
+)
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/ListView.php Wed May 10 09:51:54 2006
@@ -204,6 +204,10 @@
$navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"SalesOrder",'index',$viewid);
$alphabetical = AlphabeticalSearch($currentModule,'index','subject','true','basic',"","","","",$viewid);
+$fieldnames = getAdvSearchfields($module);
+$criteria = getcriteria_options();
+$smarty->assign("CRITERIA", $criteria);
+$smarty->assign("FIELDNAMES", $fieldnames);
$smarty->assign("ALPHABETICAL", $alphabetical);
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
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 09:51:54 2006
@@ -357,6 +357,8 @@
'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,6 +371,7 @@
'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'- Create and Manage user defined fields',
+'LBL_EDIT'=>'Editing',
'LBL_PICKLIST_SETTINGS'=>'Picklist Settings',
@@ -570,6 +573,9 @@
'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',
);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/DefaultFieldPermissions.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/DefaultFieldPermissions.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/DefaultFieldPermissions.php Wed May 10 09:51:54 2006
@@ -31,7 +31,7 @@
$image_path=$theme_path."images/";
require_once($theme_path.'layout_utils.php');
-$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Activities','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice');
+$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Activities','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
$allfields=Array();
foreach($field_module as $fld_module)
{
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/EditDefOrgFieldLevelAccess.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/EditDefOrgFieldLevelAccess.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/EditDefOrgFieldLevelAccess.php Wed May 10 09:51:54 2006
@@ -28,7 +28,7 @@
require_once($theme_path.'layout_utils.php');
-$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Activities','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice');
+$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Activities','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
$allfields=Array();
foreach($field_module as $fld_module)
{
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php Wed May 10 09:51:54 2006
@@ -1072,8 +1072,7 @@
-
- $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,0,0)");
+ $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,0,0)");
$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,1,0)");
$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,2,0)");
$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,3,0)");
@@ -1527,7 +1526,7 @@
//Inserting for all tabs
- $def_org_tabid= Array(2,4,6,7,9,10,13,16,20,21,22,23);
+ $def_org_tabid= Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
foreach($def_org_tabid as $def_tabid)
{
@@ -1560,6 +1559,7 @@
$this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
$this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
$this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
+ $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
//Populating the DataShare Related Modules
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 09:51:54 2006
@@ -23,6 +23,7 @@
'LBL_SEARCH_FORM_TITLE'=>'User Search',
'LBL_LIST_FORM_TITLE'=>'User List',
'LBL_NEW_FORM_TITLE'=>'New User',
+'LBL_CREATE_NEW_USER'=>'Create New User',
'LBL_USER'=>'Users:',
'LBL_LOGIN'=>'Login',
'LBL_USER_ROLE'=>'Role',
@@ -117,6 +118,7 @@
// Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php
'LBL_ROLES'=>'Roles',
+'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates',
'LBL_ROLE_NAME'=>'Role Name',
'LBL_CREATE_NEW_ROLE'=>'Create New Role',
@@ -130,7 +132,7 @@
'LBL_ENTITY'=>'Entity',
'LBL_CREATE_EDIT'=>'Create/Edit',
'LBL_DELETE'=>'Delete',
-'LBL_ALLOW'=>'Allow',
+'LBL_VIEW'=>'View',
'LBL_LEADS'=>'Leads',
'LBL_ACCOUNTS'=>'Accounts',
'LBL_CONTACTS'=>'Contacts',
@@ -157,16 +159,19 @@
'LBL_TEMPLATE_NAME'=>'Template Name',
'LBL_TEMPLATE_HEADER'=>'Template',
'LBL_TEMPLATE_DETAILS'=>'Template Details',
+'LBL_EDIT_TEMPLATE'=>'Edit Template',
'LBL_DESCRIPTION'=>'Description',
'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates',
-'LBL_MAILMERGE_TEMPLATES_LIST'=>'> Communication Templates > Mail Merge Templates',
+'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates',
'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template',
'LBL_DOWNLOAD_NOW'=>'Download Now',
'LBL_DOWNLOAD'=>'Download',
'LBL_SELECT_MODULE'=>'Select Module',
'LBL_MERGE_FILE'=>'File : ',
-
-
+'LBL_MERGE_MSG'=>'Select a module to assign this Template',
+
+'LNK_GO_TO_TOP'=>'Go to Page Top',
+'LNK_SAMPLE_EMAIL'=>'View Sample Email',
'LBL_COLON'=>':',
'LBL_EMAIL_TEMPLATE'=>'Email Template',
'LBL_NEW_TEMPLATE'=>'New Template',
@@ -195,13 +200,21 @@
// Added fields in createnewgroup.php
'LBL_CREATE_NEW_GROUP'=>'Create New Group',
'LBL_NEW_GROUP'=>'New Group',
+'LBL_EDIT_GROUP'=>'Edit Group',
'LBL_GROUP_NAME'=>'Group Name',
+'LBL_GROUP_DETAILS'=>'Group Details',
+'LBL_MEMBER_LIST'=>'Member List',
+'LBL_MEMBER_AVLBL'=>'Member Available',
+'LBL_MEMBER_SELECTED'=>'Selected Member',
'LBL_DESCRIPTION'=>'Description',
// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
+'LBL_DETAIL_VIEW'=>'Detail View of',
+'LBL_EDIT_VIEW'=>'Edit View of',
'LBL_GROUP_MEMBERS_LIST'=>'Group members list',
'LBL_GROUPS'=>'Groups',
+'LBL_ADD_GROUP_BUTTON'=>'Add Group',
'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
'LBL_NEW_WORD_TEMPLATE'=>'New Template',
@@ -226,6 +239,36 @@
'LBL_NEW_PROFILE'=>'New Profile',
'LBL_NEW_PROFILE_NAME'=>'Profile Name',
'LBL_PARENT_PROFILE'=>'Parent Profile',
+'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile',
+'LBL_STEP_1_3'=>'Step 1 of 3',
+'LBL_STEP_2_3'=>'Step 2 of 3',
+'LBL_STEP_3_3'=>'Step 3 of 3',
+'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile',
+'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
+'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges',
+'LBL_TAB_PRIVILEGES'=>'Tab Privileges',
+'LBL_FIELD_PRIVILEGES'=>'Field Privileges',
+'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges',
+'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges',
+'LBL_UTILITIES'=>'Utilities',
+'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges <b>(Recommended)</b>',
+'LBL_BASE_PROFILE'=>'Base Profile:',
+'LBL_OR'=>'OR',
+'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch <b>(Advanced Users)</b>',
+'LBL_FOR'=>'for',
+'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges',
+'LBL_VIEW_ALL'=>'View all',
+'LBL_EDIT_ALL'=>'Edit all',
+'LBL_ALLOW'=>'Allows',
+'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
+'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
+'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
+'LBL_TAB_MESG_OPTION'=>'Select the tabs/modules to be permitted',
+'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
+'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
+'LBL_FINISH_BUTTON'=>'Finish',
+'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
+
//Added fields in createrole.php
'LBL_HDR_ROLE_NAME'=>'Create New Role:',
@@ -369,7 +412,23 @@
'LBL_USER_LOGIN_ROLE'=>'User Login & Role',
'LBL_USER_MORE_INFN'=>'More Information',
'LBL_USER_ADDR_INFN'=>'Address Information',
-'LBL_USER_IMAGE'=>'User Image'
+'LBL_USER_IMAGE'=>'User Image',
+'LBL_USR'=>'Users',
+
+//Added for Access Privileges
+
+'LBL_GLOBAL_FIELDS_MANAGER'=>'Global Fields Manager',
+'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Global Access Privileges',
+'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Access Privileges',
+'LBL_BOTH'=>'Both',
+'LBL_VIEW'=>'view',
+'LBL_RECALCULATE_BUTTON'=>'Recalculate',
+'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges',
+'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .',
+'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
+'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
+'LBL_FIELDS_AVLBL'=>'Fields Available in',
+'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select fields to be shown'
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/ListView.php Wed May 10 09:51:54 2006
@@ -150,6 +150,10 @@
$smarty->assign("VIEWID", $viewid);
$navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Vendors","index",$viewid);
$alphabetical = AlphabeticalSearch($currentModule,'index','vendorname','true','basic',"","","","",$viewid);
+$fieldnames = getAdvSearchfields($module);
+$criteria = getcriteria_options();
+$smarty->assign("CRITERIA", $criteria);
+$smarty->assign("FIELDNAMES", $fieldnames);
$smarty->assign("ALPHABETICAL", $alphabetical);
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
Modified: vtigercrm/branches/5.0_postgresql_integration/themes/blue/style.css
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/themes/blue/style.css (original)
+++ vtigercrm/branches/5.0_postgresql_integration/themes/blue/style.css Wed May 10 09:51:54 2006
@@ -2034,14 +2034,14 @@
/* Calendar */
.calHdr{
- background-image:url(../images/cal_hdr.jpg);
+ background-image:url(images/cal_hdr.jpg);
background-repeat:repeat-x;
background-position:left top;
height:45px;
}
.calSel{
- background-image:url(../images/cal_sel.jpg);
+ background-image:url(images/cal_sel.jpg);
background-position:center;
background-repeat:no-repeat;
text-align:center;
@@ -2060,7 +2060,7 @@
.calTitle{
background-position:right top;
background-repeat:no-repeat;
- background-image:url(../images/cal_title.jpg);
+ background-image:url(images/cal_title.jpg);
width:150px;
}
@@ -2072,7 +2072,7 @@
padding:10px;
}
-#eventLay{
+.eventLay{
background-color:#DBF3FD;
position:relative;
left:0px;
@@ -2110,6 +2110,19 @@
#lstView{
display:none;
}
+
+.calendarNav{
+ font-size:12px;
+ color:#FFFFFF;
+ white-space:nowrap;
+ text-align:center;
+ font-weight:bold;
+ padding-left:10px;
+ padding-right:10px;
+ background-image:url(images/cal_nav.gif);
+ background-repeat:repeat-x;
+}
+
/* End of Calendar */
/* Level 2 Menu Selected*/
More information about the vtigercrm-commits
mailing list