[Vtigercrm-commits] [vtiger-commits] r5743 - in /vtigercrm/trunk: Smarty/templates/ImportMap.tpl Smarty/templates/ImportStep1.tpl Smarty/templates/ImportStep2.tpl modules/Import/ImportSteplast.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Thu May 4 18:08:53 EDT 2006
Author: saraj
Date: Thu May 4 16:08:45 2006
New Revision: 5743
Log:
* Modified for UI changes and the unwanted tags have been removed and form tags has been put in correct location to avoid the error when click on any buttons
Modified:
vtigercrm/trunk/Smarty/templates/ImportMap.tpl
vtigercrm/trunk/Smarty/templates/ImportStep1.tpl
vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
vtigercrm/trunk/modules/Import/ImportSteplast.php
Modified: vtigercrm/trunk/Smarty/templates/ImportMap.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportMap.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportMap.tpl Thu May 4 16:08:45 2006
@@ -1,14 +1,27 @@
-{assign var="Firstrow" value=$FIRSTROW}
- <table border="0" style="background-color: rgb(204, 204, 204);" class="small" cellpadding="4" cellspacing="1" width="100%">
- {foreach name=iter item=row from=$Firstrow}
- {assign var="counter" value=$smarty.foreach.iter.iteration}
- {math assign="num" equation="x - y" x=$counter y=1}
- <tr bgcolor="white">
- <td class="lvtCol" align="center">
- {$SELECTFIELD[$counter]}
- </td>
- </tr>
- {/foreach}
- </table>
+{*<!--
+/*********************************************************************************
+** 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.
+*
+ ********************************************************************************/
+-->*}
+{assign var="Firstrow" value=$FIRSTROW}
+<table border="0" style="background-color: rgb(204, 204, 204);" class="small" cellpadding="0" cellspacing="1" width="100%">
+ {foreach name=iter item=row from=$Firstrow}
+ {assign var="counter" value=$smarty.foreach.iter.iteration}
+ {math assign="num" equation="x - y" x=$counter y=1}
+
+ <tr bgcolor="white">
+ <td class="lvtCol" align="center" height="30">
+ {$SELECTFIELD[$counter]}
+ </td>
+ </tr>
+ {/foreach}
+</table>
+
Modified: vtigercrm/trunk/Smarty/templates/ImportStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep1.tpl Thu May 4 16:08:45 2006
@@ -1,4 +1,14 @@
-
+{*<!--
+/*********************************************************************************
+** 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 type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
@@ -6,102 +16,104 @@
<!-- header - level 2 tabs -->
<br>
<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-
- <tr>
- <td style="height: 2px;"></td>
- </tr>
- <tr>
- <td style="padding-left:10px;padding-right:10px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
- </tr>
-</tbody>
+ <tbody>
+ <tr>
+ <td style="height: 2px;"></td>
+ </tr>
+ <tr>
+ <td style="padding-left:10px;padding-right:10px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
+ </tr>
+ </tbody>
</table>
-<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
- <tbody>
- <tr>
- <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif" /></td>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%" class="small">
+ <tbody>
+ <tr>
+ <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif" /></td>
+ <td class="showPanelBg" valign="top" width="100%">
- <td class="showPanelBg" valign="top" width="100%">
+ <table cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td width="75%" valign=top>
+ <form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
+ <input type="hidden" name="module" value="{$MODULE}">
+ <input type="hidden" name="step" value="2">
+ <input type="hidden" name="source" value="{$SOURCE}">
+ <input type="hidden" name="source_id" value="{$SOURCE_ID}">
+ <input type="hidden" name="action" value="Import">
+ <input type="hidden" name="return_module" value="{$RETURN_MODULE}">
+ <input type="hidden" name="return_id" value="{$RETURN_ID}">
+ <input type="hidden" name="return_action" value="{$RETURN_ACTION}">
+ <!-- IMPORT LEADS STARTS HERE -->
+ <br />
+ <table align="center" cellpadding="5" cellspacing="0" width="95%" class="leadTable small">
+ <tr>
+ <td colspan="2" bgcolor="#FFFFFF" height="50" valign="middle" align="left" class="genHeaderSmall">{$MOD.LBL_MODULE_NAME} {$MODULE}</td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td colspan="2" align="left" valign="top"> </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td colspan="2" align="left" valign="top" style="padding-left:40px;">
+ <span class="genHeaderGray">{$MOD.LBL_STEP_1}</span>
+ <span class="genHeaderSmall">{$MOD.LBL_STEP_1_TITLE}</span>
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td colspan="2" align="left" valign="top" style="padding-left:40px;">
+ {$MOD.LBL_STEP_1_TEXT}
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC"><td align="left" valign="top" colspan="2"> </td></tr>
+ <tr bgcolor="#ECECEC">
+ <td align="right" valign="top" width="25%"><b>File Location : </b></td>
+ <td align="left" valign="top" width="75%">
+ <input type="file" name="userfile" size="40" />
+ <input type="checkbox" name="has_header"{$HAS_HEADER_CHECKED} /> {$MOD.LBL_HAS_HEADER}
+ </td>
+ </tr>
+ {*<tr bgcolor="#ECECEC">
+
+ <td align="right" valign="top" width="25%"><b>Delimeter : </b></td>
+ <td align="left" valign="top" width="75%">
+ <input type="text" class="importBox" />
+ </td>
+ </tr>
+
+ <tr bgcolor="#ECECEC">
+ <td align="right" valign="top">
+ <b>Use Data Source :</b>
+ </td>
+ <td align="left" valign="top">
+ <input name="custom" type="radio" value="" /> Custom
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td align="right" valign="top"> </td>
+ <td align="left" valign="top"><input name="custom" type="radio" value="" />
+ Pre - Defined
+ </td>
+ </tr>*}
+ <tr bgcolor="#ECECEC"><td colspan="2" height="50"> </td></tr>
-<table cellpadding="0" cellspacing="0" width="100%">
-<tr>
-<td width="75%" valign=top>
-<form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
- <input type="hidden" name="module" value="{$MODULE}">
- <input type="hidden" name="step" value="2">
- <input type="hidden" name="source" value="{$SOURCE}">
- <input type="hidden" name="source_id" value="{$SOURCE_ID}">
- <input type="hidden" name="action" value="Import">
- <input type="hidden" name="return_module" value="{$RETURN_MODULE}">
- <input type="hidden" name="return_id" value="{$RETURN_ID}">
- <input type="hidden" name="return_action" value="{$RETURN_ACTION}">
-
-
-<!-- IMPORT LEADS STARTS HERE -->
-<br />
-<table align="center" cellpadding="5" cellspacing="0" width="95%" class="leadTable">
-<tr>
- <td colspan="2" bgcolor="#FFFFFF" height="50" valign="middle" align="left" class="genHeaderSmall">{$MOD.LBL_MODULE_NAME} {$MODULE}</td>
-</tr>
- <tr bgcolor="#ECECEC"><td colspan="2" align="left" valign="top"> </td></tr>
- <tr bgcolor="#ECECEC">
- <td colspan="2" align="left" valign="top" style="padding-left:40px;">
- <span class="genHeaderGray">{$MOD.LBL_STEP_1}</span>
- <span class="genHeaderSmall">{$MOD.LBL_STEP_1_TITLE}</span>
- </td>
- </tr>
- <tr bgcolor="#ECECEC">
-
- <td colspan="2" align="left" valign="top" style="padding-left:40px;">{$MOD.LBL_STEP_1_TEXT}
- </td>
- </tr>
- <tr bgcolor="#ECECEC"><td align="left" valign="top" colspan="2"> </td></tr>
- <tr bgcolor="#ECECEC">
- <td align="right" valign="top" width="25%"><b>File Location : </b></td>
- <td align="left" valign="top" width="75%">
- <input type="file" name="userfile" size="40" />
- <input type="checkbox" name="has_header"{$HAS_HEADER_CHECKED} /> {$MOD.LBL_HAS_HEADER}
- </td>
- </tr>
-{* <tr bgcolor="#ECECEC">
-
- <td align="right" valign="top" width="25%"><b>Delimeter : </b></td>
-
- <td align="left" valign="top" width="75%">
- <input type="text" class="importBox" />
- </td>
- </tr>
-
- <tr bgcolor="#ECECEC">
- <td align="right" valign="top">
- <b>Use Data Source :</b>
- </td>
- <td align="left" valign="top">
- <input name="custom" type="radio" value="" /> Custom
- </td>
- </tr>
- <tr bgcolor="#ECECEC">
- <td align="right" valign="top"> </td>
- <td align="left" valign="top"><input name="custom" type="radio" value="" />
- Pre - Defined </td>
- </tr>*}
- <tr bgcolor="#ECECEC"><td colspan="2" height="50"> </td></tr>
-
- <tr bgcolor="#ECECEC"><td colspan="2"><hr /></td></tr>
- <tr bgcolor="#ECECEC">
- <td colspan="2" align="right" style="padding-right:40px;">
- <input title="{$MOD.LBL_NEXT}" accessKey="" class="classBtn" type="submit" name="button" value=" {$MOD.LBL_NEXT} › " onclick="this.form.action.value='Import';this.form.step.value='3'; return verify_data(this.form);">
- </td>
- </tr>
- <tr bgcolor="#ECECEC"><td colspan="2" align="right" valign="top"> </td></tr>
-
-</table>
-<br />
-
- <!-- IMPORT LEADS ENDS HERE -->
-</form>
-</td></tr>
+ <tr bgcolor="#ECECEC"><td colspan="2"><hr /></td></tr>
+ <tr bgcolor="#ECECEC">
+ <td colspan="2" align="right" style="padding-right:40px;">
+ <input title="{$MOD.LBL_NEXT}" accessKey="" class="classBtn" type="submit" name="button" value=" {$MOD.LBL_NEXT} › " onclick="this.form.action.value='Import';this.form.step.value='3'; return verify_data(this.form);">
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td colspan="2" align="right" valign="top"> </td>
+ </tr>
+ </table>
+ </form>
+ <br />
+ <!-- IMPORT LEADS ENDS HERE -->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
Modified: vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep2.tpl Thu May 4 16:08:45 2006
@@ -1,3 +1,16 @@
+{*<!--
+/*********************************************************************************
+** 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 type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
<script type="text/javascript" src="include/js/general.js"></script>
<script>
@@ -23,140 +36,138 @@
<!-- header - level 2 tabs -->
<br>
<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-
- <tr>
- <td style="height: 2px;"></td>
- </tr>
- <tr>
- <td style="padding-left:10px;padding-right:10px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
- </tr>
-</tbody>
+ <tbody>
+ <tr>
+ <td style="height: 2px;"></td>
+ </tr>
+ <tr>
+ <td style="padding-left:10px;padding-right:10px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
+ </tr>
+ </tbody>
</table>
-<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
- <tbody>
- <tr>
- <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif" /></td>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%" class="small">
+<tbody>
+ <tr>
+ <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif" /></td>
+ <td class="showPanelBg" valign="top" width="100%">
+ <table cellpadding="0" cellspacing="0" width="100%" class="small">
+ <tr>
+ <td width="75%" valign=top>
+ <form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
+ <input type="hidden" name="module" value="{$MODULE}">
+ <input type="hidden" name="action" value="Import">
+ <input type="hidden" name="step" value="4">
+ <input type="hidden" name="has_header" value="{$HAS_HEADER}">
+ <input type="hidden" name="source" value="{$SOURCE}">
+ <input type="hidden" name="delimiter" value="{$DELIMITER}">
+ <input type="hidden" name="tmp_file" value="{$TMP_FILE}">
+ <input type="hidden" name="return_module" value="{$RETURN_MODULE}">
+ <input type="hidden" name="return_id" value="{$RETURN_ID}">
+ <input type="hidden" name="return_action" value="{$RETURN_ACTION}">
- <td class="showPanelBg" valign="top" width="100%">
-
-<table cellpadding="0" cellspacing="0" width="100%">
-<tr>
-<td width="75%" valign=top>
-<form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
- <input type="hidden" name="module" value="{$MODULE}">
- <input type="hidden" name="action" value="Import">
- <input type="hidden" name="step" value="4">
- <input type="hidden" name="has_header" value="{$HAS_HEADER}">
- <input type="hidden" name="source" value="{$SOURCE}">
- <input type="hidden" name="delimiter" value="{$DELIMITER}">
- <input type="hidden" name="tmp_file" value="{$TMP_FILE}">
- <input type="hidden" name="return_module" value="{$RETURN_MODULE}">
- <input type="hidden" name="return_id" value="{$RETURN_ID}">
- <input type="hidden" name="return_action" value="{$RETURN_ACTION}">
-
-<!-- IMPORT LEADS STARTS HERE -->
-<br />
-<table align="center" cellpadding="5" cellspacing="0" width="95%" class="leadTable">
-<tr>
- <td bgcolor="#FFFFFF" height="50" valign="middle" align="left" class="genHeaderSmall">{$MOD.LBL_MODULE_NAME} {$MODULE}</td>
-</tr>
-<tr bgcolor="#ECECEC"><td> </td></tr>
- <tr bgcolor="#ECECEC">
- <td align="left" style="padding-left:40px;">
- <span class="genHeaderGray">Step 2 of 3 : </span>
- <span class="genHeaderSmall">{$MODULE} List & Mapping </span>
- </td>
- </tr>
-
- <tr bgcolor="#ECECEC">
- <td align="left" style="padding-left:40px;">
- The following tables shows the imported {$MODULE} and other details.
- To map the fields, Select the corresponding in combo boxes for each {$MODULE}.
- </td>
- </tr>
- <tr bgcolor="#ECECEC"><td> </td></tr>
- <tr bgcolor="#ECECEC">
- <td align="left" style="padding-left:40px;" >
- <input type="checkbox" name="use_saved_mapping" id="saved_map_checkbox" onclick="ActivateCheckBox()" />
- Use Saved Mapping :
- {$SAVED_MAP_LISTS}
- </td>
- </tr>
- <tr bgcolor="#ECECEC">
- <td align="left"style="padding-left:40px;padding-right:40px;">
-
- <table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%" >
- <tr bgcolor="white">
- <td width="25%" class="lvtCol" align="center"><b>Mapping</b></td>
- {if $HASHEADER eq 1}
- <td width="25%" bgcolor="#E1E1E1" ><b>Headers :</b></td>
- <td width="25%" ><b>{$MOD.LBL_ROW} 1</b></td>
- <td width="25%" ><b>{$MOD.LBL_ROW} 2</b></td>
- {else}
- <td width="25%" ><b>{$MOD.LBL_ROW} 1</b></td>
- <td width="25%" ><b>{$MOD.LBL_ROW} 2</b></td>
- <td width="25%" ><b>{$MOD.LBL_ROW} 3</b></td>
- {/if}
-
- </tr>
- {assign var="Firstrow" value=$FIRSTROW}
- {assign var="Secondrow" value=$SECONDROW}
- {assign var="Thirdrow" value=$THIRDROW}
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td width="25%" valign="top">
- <div id="importmapform">
- {include file="ImportMap.tpl"}
- </div>
- </td>
- <td>
- <table border="0" cellpadding="8" cellspacing="1" width="100%" valign="top">
- {foreach name=iter item=row1 from=$Firstrow}
- {assign var="counter" value=$smarty.foreach.iter.iteration}
- {math assign="num" equation="x - y" x=$counter y=1}
- <tr bgcolor="white" >
- {if $HASHEADER eq 1}
- <td bgcolor="#E1E1E1" width="31%">{$row1}</td>
- <td width="30%">{$Secondrow[$num]}</td>
- <td >{$Thirdrow[$num]}</td>
- {else}
- <td width="31%" >{$row1}</td>
- <td width="30%" >{$Secondrow[$num]}</td>
- <td >{$Thirdrow[$num]}</td>
- {/if}
- </tr>
-
- {/foreach}
- </table></td></tr></table>
- <tr bgcolor="#ECECEC">
- <td align="left" style="padding-left:40px;" >
- <input type="checkbox" name="save_map" onclick="set_readonly(this.form)" />
- Save above Mapping as :
- <input type="text" readonly name="save_map_as" value="" class="importBox" >
- </td>
-
- </tr>
- <tr bgcolor="#ECECEC"><td><hr /></td></tr>
- <tr bgcolor="#ECECEC">
+ <!-- IMPORT LEADS STARTS HERE -->
+ <br />
+ <table align="center" cellpadding="5" cellspacing="0" width="95%" class="leadTable small">
+ <tr>
+ <td bgcolor="#FFFFFF" height="50" valign="middle" align="left" class="genHeaderSmall">{$MOD.LBL_MODULE_NAME} {$MODULE}</td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td> </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td align="left" style="padding-left:40px;">
+ <span class="genHeaderGray">Step 2 of 3 : </span>
+ <span class="genHeaderSmall">{$MODULE} List & Mapping </span>
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td align="left" style="padding-left:40px;">
+ The following tables shows the imported {$MODULE} and other details.
+ To map the fields, Select the corresponding in combo boxes for each {$MODULE}.
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td> </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td align="left" style="padding-left:40px;" >
+ <input type="checkbox" name="use_saved_mapping" id="saved_map_checkbox" onclick="ActivateCheckBox()" />
+ Use Saved Mapping : {$SAVED_MAP_LISTS}
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td align="left"style="padding-left:40px;padding-right:40px;">
+ <table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%" >
+ <tr bgcolor="white">
+ <td width="25%" class="lvtCol" align="center"><b>Mapping</b></td>
+ {if $HASHEADER eq 1}
+ <td width="25%" bgcolor="#E1E1E1" ><b>Headers :</b></td>
+ <td width="25%" ><b>{$MOD.LBL_ROW} 1</b></td>
+ <td width="25%" ><b>{$MOD.LBL_ROW} 2</b></td>
+ {else}
+ <td width="25%" ><b>{$MOD.LBL_ROW} 1</b></td>
+ <td width="25%" ><b>{$MOD.LBL_ROW} 2</b></td>
+ <td width="25%" ><b>{$MOD.LBL_ROW} 3</b></td>
+ {/if}
+ </tr>
+ </table>
+ {assign var="Firstrow" value=$FIRSTROW}
+ {assign var="Secondrow" value=$SECONDROW}
+ {assign var="Thirdrow" value=$THIRDROW}
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td width="25%" valign="top">
+ <div id="importmapform">
+ {include file="ImportMap.tpl"}
+ </div>
+ </td>
+ <td valign="top">
+ <table border="0" cellpadding="0" cellspacing="1" width="100%" valign="top" class="small">
+ {foreach name=iter item=row1 from=$Firstrow}
+ {assign var="counter" value=$smarty.foreach.iter.iteration}
+ {math assign="num" equation="x - y" x=$counter y=1}
+ <tr bgcolor="white" >
+ {if $HASHEADER eq 1}
+ <td bgcolor="#E1E1E1" width="33%" height="30">{$row1}</td>
+ <td width="34%">{$Secondrow[$num]}</td>
+ <td >{$Thirdrow[$num]}</td>
+ {else}
+ <td width="31%" height="30" >{$row1}</td>
+ <td width="30%" >{$Secondrow[$num]}</td>
+ <td >{$Thirdrow[$num]}</td>
+ {/if}
+ </tr>
+ {/foreach}
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
+ <td align="left" style="padding-left:40px;" >
+ <input type="checkbox" name="save_map" onclick="set_readonly(this.form)" />
+ Save above Mapping as :
+ <input type="text" readonly name="save_map_as" value="" class="importBox" >
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC"><td><hr /></td></tr>
+ <tr bgcolor="#ECECEC">
<td align="right" style="padding-right:40px;" >
<input type="submit" name="button" value=" ‹ Back " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='2'; return true;" />
-
-
+
<input type="submit" name="button" value=" Import Now › " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='4'; return verify_data(Import)" />
</td>
- </tr>
- <tr bgcolor="#ECECEC"><td align="right" > </td></tr>
+ </tr>
+ <tr bgcolor="#ECECEC"><td align="right" > </td></tr>
+ </table>
+ </form>
+ <!-- IMPORT LEADS ENDS HERE -->
+ </td>
+ </tr>
</table>
- </table>
- </td>
- </tr>
- <br />
-<!-- IMPORT LEADS ENDS HERE -->
-</form>
-</td>
-</tr>
+ </td>
+ </tr>
</table>
-
Modified: vtigercrm/trunk/modules/Import/ImportSteplast.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSteplast.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSteplast.php Thu May 4 16:08:45 2006
@@ -64,70 +64,64 @@
?>
<br>
- <table width="100%" border=1>
-
- <table align="center" cellpadding="5" cellspacing="0" width="95%" class="leadTable">
- <tr><br><br><br>
- <td bgcolor="#FFFFFF" height="50" valign="middle" align="left" class="genHeaderSmall"> Import <?php echo $_REQUEST['modulename']; ?> </td>
- </tr>
- <tr bgcolor="#ECECEC"><td colspan="2"> </td></tr>
- <tr bgcolor="#ECECEC">
- <td align="left" style="padding-left:40px;" colspan="2">
- <span class="genHeaderGray">Step 3 of 3 : </span>
- <span class="genHeaderSmall">Mapping Results </span>
- </td>
- </tr>
- <tr bgcolor="#ECECEC">
+ <table align="center" cellpadding="5" cellspacing="0" width="95%" class="leadTable small">
+ <tr>
+ <td bgcolor="#FFFFFF" height="50" valign="middle" align="left" class="genHeaderSmall" colspan="2">
+ Import <?php echo $_REQUEST['modulename']; ?>
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC"><td colspan="2"> </td></tr>
+ <tr bgcolor="#ECECEC">
+ <td align="left" style="padding-left:40px;width:75%;" >
+ <span class="genHeaderGray">Step 3 of 3 : </span>
+ <span class="genHeaderSmall">Mapping Results </span>
+ </td>
+ <td rowspan="2" width="25%" valign="top">
+ <table width="100%" border="0" cellpadding="5" cellspacing="0" >
+ <tr>
+ <td align="center" valign="top">
+ <form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
+ <input type="hidden" name="module" value="<?php echo $_REQUEST['modulename']; ?>">
+ <input type="hidden" name="action" value="Import">
+ <input type="hidden" name="step" value="2">
+ <input type="hidden" name="return_id" value="<?php echo $_REQUEST['return_id']; ?>">
+ <input type="hidden" name="return_module" value="<?php echo $_REQUEST['return_module']; ?>">
+ <input type="hidden" name="return_action" value="<?php echo (($_REQUEST['return_action'] != '')?$_REQUEST['return_action']:'index'); ?>">
+ <input title="<?php echo $mod_strings['LBL_FINISHED'] ?>" accessKey="" class="classBtn" type="submit" name="button" value=" <?php echo $mod_strings['LBL_FINISHED'] ?> " onclick="this.form.action.value=this.form.return_action.value;this.form.return_module.value=this.form.return_module.value;return true;">
+ <br><br>
+ <input title="<?php echo $mod_strings['LBL_IMPORT_MORE'] ?>" accessKey="" class="classBtn" type="submit" name="button" value=" <?php echo $mod_strings['LBL_IMPORT_MORE'] ?> " onclick="return true;">
+ </form>
+ </td>
+ </tr>
+ <tr>
+ <td align="center" valign="top">
+ <form name="Import" method="POST" action="index.php">
+ <input type="hidden" name="module" value="<?php echo $_REQUEST['modulename']; ?>">
+ <input type="hidden" name="action" value="Import">
+ <input type="hidden" name="step" value="undo">
+ <input type="hidden" name="return_module" value="<?php echo $_REQUEST['return_module']; ?>">
+ <input type="hidden" name="return_id" value="<?php echo $_REQUEST['return_id']; ?>">
+ <input type="hidden" name="return_action" value="<?php echo $_REQUEST['return_action']; ?>">
+ <input title="<?php echo $mod_strings['LBL_UNDO_LAST_IMPORT']; ?>" accessKey="" class="classBtn" type="submit" name="button" value=" <?php echo $mod_strings['LBL_UNDO_LAST_IMPORT'] ?> ">
+ </form>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr bgcolor="#ECECEC">
<td style="padding-left:140px;">
- <?php
- echo $_REQUEST['message'];
- ?>
-
- <br><br><br>
+ <?php
+ echo $_REQUEST['message'];
+ ?>
+ <br><br><br>
</td>
</tr>
-
+ </table>
<?php
}
-?>
-<br>
-<form name="Import" method="POST" action="index.php">
-<input type="hidden" name="module" value="<?php echo $_REQUEST['modulename']; ?>">
-<input type="hidden" name="action" value="Import">
-<input type="hidden" name="step" value="undo">
-<input type="hidden" name="return_module" value="<?php echo $_REQUEST['return_module']; ?>">
-<input type="hidden" name="return_id" value="<?php echo $_REQUEST['return_id']; ?>">
-<input type="hidden" name="return_action" value="<?php echo $_REQUEST['return_action']; ?>">
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
- <tr>
-<br> <td align="right"><input title="<?php echo $mod_strings['LBL_UNDO_LAST_IMPORT']; ?>" accessKey="" class="classBtn" type="submit" name="button" value=" <?php echo $mod_strings['LBL_UNDO_LAST_IMPORT'] ?> "></td>
- <td></td>
- </tr>
-</table>
-</form>
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
- <form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
- <input type="hidden" name="module" value="<?php echo $_REQUEST['modulename']; ?>">
- <input type="hidden" name="action" value="Import">
- <input type="hidden" name="step" value="2">
- <input type="hidden" name="return_id" value="<?php echo $_REQUEST['return_id']; ?>">
- <input type="hidden" name="return_module" value="<?php echo $_REQUEST['return_module']; ?>">
- <input type="hidden" name="return_action" value="<?php echo (($_REQUEST['return_action'] != '')?$_REQUEST['return_action']:'index'); ?>">
- <tr>
- <td align="right">
- <input title="<?php echo $mod_strings['LBL_IMPORT_MORE'] ?>" accessKey="" class="classBtn" type="submit" name="button" value=" <?php echo $mod_strings['LBL_IMPORT_MORE'] ?> " onclick="return true;">
- <input title="<?php echo $mod_strings['LBL_FINISHED'] ?>" accessKey="" class="classBtn" type="submit" name="button" value=" <?php echo $mod_strings['LBL_FINISHED'] ?> " onclick="this.form.action.value=this.form.return_action.value;this.form.return_module.value=this.form.return_module.value;return true;">
- </td>
- <td></td>
- </tr>
-</table>
-</form>
-
- </table>
- </table>
-<?php
+
+echo "<br><br>";
$currentModule = "Import";
@@ -167,9 +161,20 @@
}
if($module_name == 'Accounts' && $implict_account==true)
- echo get_form_header('','<b>Newly created Accounts</b>', false);
+ $display_header_msg = "Newly created Accounts";
else
- echo get_form_header('','<b>Last Imported '.$module_name.'</b>', false);
+ $display_header_msg = "Last Imported $module_name";
+
+ //Display the Header Message
+ echo "
+ <table width='100%' border='0' cellpadding='5' cellspacing='0'>
+ <tr>
+ <td class='dvtCellLabel' align='left'>
+ <b>Last Imported $module_name </b>
+ </td>
+ </tr>
+ </table>
+ ";
$smarty = new vtigerCRM_Smarty;
More information about the vtigercrm-commits
mailing list