[Vtigercrm-commits] [vtiger-commits] r9957 - in /vtigercrm/branches/5.0.3: ./ Smarty/templates/ modules/Settings/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Tue Dec 12 05:20:12 EST 2006
Author: richie
Date: Tue Dec 12 03:19:59 2006
New Revision: 9957
Log:
Mail Merge templates moved to settings module
Added:
vtigercrm/branches/5.0.3/modules/Settings/deletewordtemplate.php (with props)
vtigercrm/branches/5.0.3/modules/Settings/listwordtemplates.php
vtigercrm/branches/5.0.3/modules/Settings/mailmergedownloadfile.php (with props)
vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php (with props)
vtigercrm/branches/5.0.3/modules/Settings/upload.php (with props)
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl
vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
vtigercrm/branches/5.0.3/index.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl Tue Dec 12 03:19:59 2006
@@ -22,14 +22,14 @@
<!-- DISPLAY -->
<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
- <form action="index.php?module=Users&action=add2db" method="post" enctype="multipart/form-data">
+ <form action="index.php?module=Settings&action=savewordtemplate" method="post" enctype="multipart/form-data">
<input type="hidden" name="return_module" value="Settings">
<input type="hidden" name="parenttab" value="{$PARENTTAB}">
<input type="hidden" name="MAX_FILE_SIZE" value="{$MAX_FILE_SIZE}">
<input type="hidden" name="action">
<tr>
- <td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
- <td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_WORD_TEMPLATES}</a> > {$UMOD.LBL_NEW_TEMPLATE} </b></td>
+ <td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Settings" width="48" height="48" border=0 title="Settings"></td>
+ <td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_WORD_TEMPLATES}</a> > {$UMOD.LBL_NEW_TEMPLATE} </b></td>
</tr>
<tr>
<td valign=top class="small">{$MOD.LBL_MAIL_MERGE_DESC}</td>
@@ -45,7 +45,7 @@
<tr>
<td class="big"><strong>{$UMOD.LBL_NEW_TEMPLATE}</strong><br>{$ERRORFLAG}</br></td>
<td class="small" align=right>
- <input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='add2db'; this.form.parenttab.value='Settings'" class="crmButton small save" />
+ <input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='savewordtemplate'; this.form.parenttab.value='Settings'" class="crmButton small save" />
<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" tabindex="5" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" />
</td>
</tr>
@@ -66,10 +66,10 @@
<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_MODULENAMES}</strong></td>
<td class="cellText small" valign=top>
<select name="target_module" size=1 class="small" tabindex="3">
- <option value="Leads">{$APP.COMBO_LEADS}</option>
- <option value="Accounts">{$APP.COMBO_ACCOUNTS}</option>
- <option value="Contacts">{$APP.COMBO_CONTACTS}</option>
- <option value="HelpDesk">{$APP.COMBO_HELPDESK}</option>
+ <option value="Leads" {$LEADS_SELECTED}>{$APP.COMBO_LEADS}</option>
+ <option value="Accounts" {$ACCOUNTS_SELECTED}>{$APP.COMBO_ACCOUNTS}</option>
+ <option value="Contacts" {$CONTACTS_SELECTED}>{$APP.COMBO_CONTACTS}</option>
+ <option value="HelpDesk" {$HELPDESK_SELECTED}>{$APP.COMBO_HELPDESK}</option>
</select>
</td>
</tr>
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 Tue Dec 12 03:19:59 2006
@@ -104,7 +104,7 @@
<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'}
+ {if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'SettingsAjax'}
<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=Settings&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
@@ -161,7 +161,7 @@
<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td></tr>
{/if}
- {if $smarty.request.action eq 'Announcements' || $smarty.request.action eq 'UsersAjax' }
+ {if $smarty.request.action eq 'Announcements' || $smarty.request.action eq 'SettingsAjax' }
<tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>
{else}
<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>
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 Tue Dec 12 03:19:59 2006
@@ -68,8 +68,8 @@
<!-- icon 3-->
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
</tr>
<tr>
@@ -82,8 +82,8 @@
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
</tr>
<tr>
<td class="small" valign=top>{$MOD.LBL_GROUP_DESCRIPTION}</td>
@@ -98,9 +98,9 @@
<!-- icon 5-->
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
-
- <td class=big valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
+
+ <td class=big valign=top><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
</tr>
<tr>
<td class="small" valign=top>{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
@@ -112,8 +112,8 @@
<!-- icon 6 -->
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
</tr>
<tr>
<td class="small" valign=top>{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
@@ -125,8 +125,8 @@
<!-- icon 7-->
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}audit.gif" alt="{$MOD.LBL_AUDIT_TRAIL}" title="{$MOD.LBL_AUDIT_TRAIL}"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}audit.gif" alt="{$MOD.LBL_AUDIT_TRAIL}" title="{$MOD.LBL_AUDIT_TRAIL}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td>
</tr>
<tr>
@@ -140,8 +140,8 @@
<!-- icon 8-->
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoLoginHistory.gif" alt="{$MOD.LBL_LOGIN_HISTORY_DETAILS}" width="48" height="48" border=0 title="{$MOD.LBL_LOGIN_HISTORY_DETAILS}"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoLoginHistory.gif" alt="{$MOD.LBL_LOGIN_HISTORY_DETAILS}" width="48" height="48" border=0 title="{$MOD.LBL_LOGIN_HISTORY_DETAILS}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td>
</tr>
<tr>
<td class="small" valign=top>{$MOD.LBL_LOGIN_HISTORY_DESCRIPTION}</td>
@@ -192,8 +192,8 @@
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <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>
+ <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>
</tr>
<tr>
<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>
@@ -455,8 +455,8 @@
<!-- icon 9-->
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoTwoTabConfig.gif" alt="{$MOD.LBL_DEFAULT_MODULE_VIEW}" width="48" height="48" border=0 title="{$MOD.LBL_DEFAULT_MODULE_VIEW}"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings"><img src="{$IMAGE_PATH}set-IcoTwoTabConfig.gif" alt="{$MOD.LBL_DEFAULT_MODULE_VIEW}" width="48" height="48" border=0 title="{$MOD.LBL_DEFAULT_MODULE_VIEW}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td>
</tr>
<tr>
<td class="small" valign=top>{$MOD.LBL_DEFAULT_MODULE_VIEW_DESC}</td>
@@ -478,8 +478,8 @@
<table border=0 cellspacing=0 cellpadding=5 width=100%>
<tr>
- <td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
- <td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td>
+ <td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
+ <td class=big valign=top><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td>
</tr>
<tr>
<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
Modified: vtigercrm/branches/5.0.3/index.php
==============================================================================
--- vtigercrm/branches/5.0.3/index.php (original)
+++ vtigercrm/branches/5.0.3/index.php Tue Dec 12 03:19:59 2006
@@ -280,7 +280,10 @@
ereg("^RecalculateSharingRules",$action) ||
(ereg("^body",$action) && ereg("^Webmails",$module)) ||
(ereg("^dlAttachments",$action) && ereg("^Webmails",$module)) ||
- (ereg("^DetailView",$action) && ereg("^Webmails",$module) ))
+ (ereg("^DetailView",$action) && ereg("^Webmails",$module) ) ||
+ ereg("^savewordtemplate",$action))
+
+
{
$skipHeaders=true;
//skip headers for all these invocations as they are mostly popups
More information about the vtigercrm-commits
mailing list