[Vtigercrm-commits] [vtiger-commits] r6852 - in /vtigercrm/trunk: Smarty/templates/MigrationStep1.tpl modules/Migration/ModifyDatabase/42P2_to_50Alpha.php modules/Migration/ModifyDatabase/MigrationInfo.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Wed May 31 07:09:04 2006
New Revision: 6852

Log:
* Modified to display the images in Migration and the popup message for currency configuration change 

Modified:
    vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
    vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php

Modified: vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl Wed May 31 07:09:04 2006
@@ -43,7 +43,7 @@
 			<td bgcolor="#ECECEC" style="padding-left:10px;padding-top:10px;vertical-align:top;">
 				<table width="100%"  border="0" cellpadding="5" cellspacing="0">
 				   <tr>
-					<td width="10%"><img src="{$IMAGE_PATH}MigrationIcon.jpg" width="66" height="61"  align="absmiddle"/></td>
+					<td width="10%"><img src="{$IMAGE_PATH}migrate.gif" align="absmiddle"/></td>
 					<td width="90%">
 						<span class="genHeaderBig">Migrate From Previous Version</span><br />
 						Update your new vtiger CRM 5 database with the data from previous installation<br />
@@ -71,6 +71,10 @@
 						This option requires you to have the dump file, in this local system.
 						You cannot specify a remote machine. Refer documentation for Help.
 					</td>
+				   </tr>
+				   <tr bgcolor="#FFFFFF">
+					<td align="right" valign="top"><b>Note: </b></td>
+					<td>{$MOD.LBL_NOTES_DUMP_PROCESS}</td>
 				   </tr>
 				   <tr><td colspan="2" height="10"></td></tr>
 				   <tr bgcolor="#FFFFFF">
@@ -130,7 +134,7 @@
 				   </tr>
 				   <tr>
 					<td colspan="2" style="padding:10px;" align="center">
-						<input type="submit" name="migrate" value=" Test &amp; Migrate "  class="classBtn" onclick="return validate_migration(Migration);"/>
+						<input type="submit" name="migrate" value="  Migrate  "  class="classBtn" onclick="return validate_migration(Migration);"/>
 						&nbsp;<input type="submit" name="cancel" value=" &nbsp;Cancel&nbsp; "  class="classBtn" onclick="this.form.module.value='Settings';this.form.action.value='index';"/>
  					</td>
 				   </tr>

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php Wed May 31 07:09:04 2006
@@ -2875,7 +2875,7 @@
 		alert("Currency Changes has been made Successfully");
 	}
 
-	if(!confirm("Are you using Dollar $ as Currency?"))
+	if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate."))
 	{
 		getConversionRate('');
 	}

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php Wed May 31 07:09:04 2006
@@ -44,7 +44,7 @@
 			<td bgcolor="#ECECEC" style="padding-left:10px;padding-top:10px;vertical-align:top;">
 				<table width="100%"  border="0" cellpadding="5" cellspacing="0">
 				   <tr>
-					   <td width="10%"><img src="<?php echo $image_path; ?>MigrationIcon.jpg" width="66" height="61"  align="absmiddle"/></td>
+					   <td width="10%"><img src="<?php echo $image_path; ?>migrate.gif" align="absmiddle"/></td>
 					<td width="90%">
 						<span class="genHeaderBig">Migrate From Previous Version</span><br />
 						Update your new vtiger CRM 5 database with the data from previous installation<br />
@@ -189,10 +189,19 @@
 						<br /><br />
 
 						<b style="color:#006600">Migration Queries Log</b>
-						<div id="successLog" style="border:1px solid #666666;width:90%;position:relative;height:100px;overflow:auto;left:5%;top:10px;">
+						<div id="successLog" style="border:1px solid #666666;width:90%;position:relative;height:250px;overflow:auto;left:5%;top:10px;">
 							<!-- we should place the All queries executed-->
 							<!-- This table is designed to display all the queries (before this table a div tag is opened. so all these following queries will be put inside the div tab as a table format) -->
-							<table border=1>
+							<style>
+								.MigInfo{
+									border-collapse:collapse;
+									border:0px solid red;
+								}
+								.MigInfo tr td{
+										border:1px solid #CCCCCC;
+									      }
+							</style>
+							<table width="98%" cellpadding="3" cellspacing="0" border="0" class="MigInfo">
 							   <tr>
 							   	<td colspan=3 width="100%">
 									<br>Note : Please note that for each query the "Object" string will be displayed at the	starting of the line if the query executed successfully. If the query fails then "Object" will not be displayed. we can find out the failed queries based on these Object display.
@@ -219,7 +228,7 @@
 						<br /><br />
 
 						<b style="color:#FF0000">Failed Queries Log</b>
-						<div id="failedLog" style="border:1px solid #666666;width:90%;position:relative;height:100px;overflow:auto;left:5%;top:10px;">
+						<div id="failedLog" style="border:1px solid #666666;width:90%;position:relative;height:200px;overflow:auto;left:5%;top:10px;">
 							<!-- we should place the failed queries here -->
 							<?php
 								foreach($failure_query_array as $failed_query)