[Vtigercrm-commits] [vtiger-commits] r9954 - in /vtigercrm/branches/5.0.3: Smarty/templates/SetMenu.tpl Smarty/templates/Settings.tpl Smarty/templates/Settings/InventoryNotify.tpl modules/Settings/language/en_us.lang.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Mon Dec 11 06:26:01 EST 2006
Author: richie
Date: Mon Dec 11 04:25:45 2006
New Revision: 9954
Log:
Inventory notification moved to settings
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl
vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Mon Dec 11 04:25:45 2006
@@ -87,27 +87,27 @@
<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'}
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
{/if}
- {if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'}
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
+ {if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'savewordtemplate' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'}
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
{/if}
- {if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'}
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
+ {if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'SettingsAjax'}
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
{/if}
{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
{/if}
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl Mon Dec 11 04:25:45 2006
@@ -192,8 +192,8 @@
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
- <td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Users&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Users&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
</tr>
<tr>
<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>
@@ -254,8 +254,8 @@
<!-- icon 11-->
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
</tr>
<tr>
@@ -268,8 +268,8 @@
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
</tr>
<tr>
<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
@@ -281,8 +281,8 @@
<!-- icon 13-->
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
</tr>
<tr>
@@ -295,8 +295,8 @@
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
</tr>
<tr>
<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/InventoryNotify.tpl Mon Dec 11 04:25:45 2006
@@ -104,7 +104,7 @@
'index.php',
{queue: {position: 'end', scope: 'command'},
method: 'post',
- postBody: 'action=UsersAjax&module=Users&file=SaveInventoryNotification¬ifysubject='+subject+'¬ifybody='+body+'&record='+id,
+ postBody: 'action=SettingsAjax&module=Settings&file=SaveInventoryNotification¬ifysubject='+subject+'¬ifybody='+body+'&record='+id,
onComplete: function(response) {
$("status").style.display="none";
}
@@ -119,7 +119,7 @@
'index.php',
{queue: {position: 'end', scope: 'command'},
method: 'post',
- postBody: 'action=UsersAjax&module=Users&file=EditInventoryNotification&record='+id,
+ postBody: 'action=SettingsAjax&module=Settings&file=EditInventoryNotification&record='+id,
onComplete: function(response) {
$("status").style.display="none";
$("editdiv").innerHTML=response.responseText;
Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Mon Dec 11 04:25:45 2006
@@ -510,12 +510,58 @@
'LBL_RSS_CATEGORY'=>'Rss Category',
+//Added for Web based Email client integration (post 4.0.1 release)
+
+'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account',
+'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]',
+'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M',
+'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account',
+'LBL_GENERAL_INFO'=>'General Information',
+'LBL_DISPLAY_NAME'=>'Display Name',
+'LBL_MAIL_PROTOCOL'=>'Mail Protocol',
+'LBL_LIST_PASSWORD'=>'Password',
+'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
'LBL_MAIL_SERVER_SETTINGS'=>'Outgoing Server',
+'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server',
+'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
+'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
+'LBL_TEST_BUTTON_KEY'=>'T',
+'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
+'LBL_DEFAULT'=>'Default',
+'LBL_IMAP2'=>'IMAP2',
+'LBL_IMAP4'=>'IMAP4',
+'LBL_POP'=>'POP',
+'LBL_IMAP'=>'IMAP',
+'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required<br>Items marked with <font color="red">* *</font> are not fully supported',
+'LBL_SSL_OPTIONS'=>'SSL Options',
+'LBL_TLS'=>'TLS',
+'LBL_NO_TLS'=>'No TLS',
+'LBL_CERT_VAL'=>'Certificate Validations',
+'LBL_INT_MAILER'=>'Use Internal Mailer?',
+'LBL_INT_MAILER_USE'=>'Yes',
+'LBL_INT_MAILER_NOUSE'=>'No',
+'LBL_VAL_SSL_CERT'=>'Validate SSL Cert',
+'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert',
+'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration',
+'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail',
+'LBL_LIST_MAIL_ACCOUNT'=>' List Mail Account',
'LBL_USAGEUNIT'=>'Usage Unit',
'LBL_GLACCT'=>'GL Account',
'LBL_QUOTE_STAGE'=>'Quote Stage',
'LBL_CARRIER'=>'Carrier',
'LBL_TAXCLASS'=>'Tax Class',
+'LBL_MY_DETAILS'=>'My Details',
+'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details',
+'LBL_EMAIL_ID'=>'Email ID',
+'LBL_NAME_EXAMPLE'=>'(example : John Fenner)',
+'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)',
+'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout',
+'LBL_1_MIN'=>'1 minute',
+'LBL_2_MIN'=>'2 minutes',
+'LBL_3_MIN'=>'3 minutes',
+'LBL_4_MIN'=>'4 minutes',
+'LBL_5_MIN'=>'5 minutes',
+'LBL_EMAILS_PER_PAGE'=>'Emails per Page',
//Added for Organization Details (4.2 release)
'LBL_ORGANIZATION_NAME'=>'Company Name',
@@ -695,6 +741,53 @@
'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
'LBL_ASSOCIATED_USERS'=>'Associated Users :',
+//Added while moving email templates from Users to Settings
+'LBL_EMAIL_TEMPLATES'=>'Email Templates',
+'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing',
+'LBL_LIST_SELECT'=>'Select',
+'LBL_EMAIL_TEMPLATE'=>'Email Template',
+'LBL_TEMPLATE_TOOLS'=>'Tools',
+'LBL_DELETE' => 'Delete',
+'LBL_NEW_TEMPLATE' =>'New Template',
+'LBL_FOLDER'=>'Folder',
+'LBL_NAME'=>'Name',
+'LBL_PERSONAL'=>'Personal',
+'LBL_PUBLIC'=>'Public',
+'LBL_ACCOUNT_FIELDS'=>'Account Fields',
+'LBL_CONTACT_FIELDS'=>'Contact Fields',
+'LBL_LEAD_FIELDS'=>'Lead Fields',
+'LBL_USER_FIELDS'=>'User Fields',
+'LNK_SAMPLE_EMAIL'=>'View Sample Email',
+//Added while moving Mail Merge templates from Users to Settings
+'LBL_TEMPLATE_FILE'=>'Template File',
+'LBL_MODULENAMES'=>'Module',
+'LBL_LIST_TOOLS'=>'Tools',
+'LBL_DOWNLOAD'=>'Download',
+'LBL_ADD_TEMPLATE'=>'Add Template',
+'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
+//Added while moving Notification Schedulers from Users to Settings
+'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification',
+'LBL_BIG_DEAL'=>'Big Deal Notification',
+'LBL_PENDING_TICKETS'=>'Pending Tickets Notification',
+'LBL_MANY_TICKETS'=>'Too many tickets Notification',
+'LBL_START_NOTIFICATION'=>'Support Start Notification',
+'LBL_SUPPORT_NOTICIATION'=>'Support End Notification',
+'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification',
+
+'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs',
+'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal',
+'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending',
+'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments',
+'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service',
+'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end',
+'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set',
+//Added while moving Inventory Notifications from Users to Settings
+'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the quantity mentioned in quote then this notification will be sent to the product handler',
+'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler',
+'Tools'=>'Tools',
+'QuoteNotification'=>'Product Stock Notification during Quote Generation',
+'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation',
+'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within { }',
);
More information about the vtigercrm-commits
mailing list