[Vtigercrm-commits] [vtiger-commits] r10993 - in /vtigercrm/branches/5.0.3/Smarty/templates: CreateWordTemplate.tpl Settings/ProxyServer.tpl

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed May 23 14:05:41 2007
New Revision: 10993

Log:
 fix for - Cancel button is not working properly in Mail Merge Templates, Fixes #3918 -sri

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl

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 Wed May 23 14:05:41 2007
@@ -46,7 +46,7 @@
 						<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='savewordtemplate'; this.form.parenttab.value='Settings'" class="crmButton small save" />&nbsp;
-							&nbsp;<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" />
+							&nbsp;<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" tabindex="5"  onclick="javascript:document.location.href='index.php?module=Settings&action=listwordtemplates&parenttab=Settings'"  type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" />
 						</td>
 					</tr>
 					</table>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Wed May 23 14:05:41 2007
@@ -50,7 +50,7 @@
 						{else}
 						<td class="small" align=right>
 							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='Save'; return validate()">&nbsp;&nbsp;
-						    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
+						    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="javascript:document.location.href='index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings'" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
 						</td>
 						{/if}
 					</tr>