[pLog-svn] r3500 - plog/trunk/templates/wizard

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-05-31 21:52:14 +0000 (Wed, 31 May 2006)
New Revision: 3500

Modified:
   plog/trunk/templates/wizard/update2.template
   plog/trunk/templates/wizard/update3.template
   plog/trunk/templates/wizard/update4.template
Log:
changes needed for the new features in the wizard


Modified: plog/trunk/templates/wizard/update2.template
===================================================================
--- plog/trunk/templates/wizard/update2.template	2006-05-31 21:51:55 UTC (rev 3499)
+++ plog/trunk/templates/wizard/update2.template	2006-05-31 21:52:14 UTC (rev 3500)
@@ -11,36 +11,16 @@
    <div class="wizardInfo">
     <img src="imgs/admin/icon_info-16.png" alt="Info" class="wizardInfoIcon" />
     <p class="wizardInfoText">
-    {if $multipleSteps}
-       Processing {$numPosts} posts per step, out of {$totalPosts}.<br/>
-       Current step is <b>{$curStep}</b> out of <b>{$numSteps}</b>.<br/><br/>
-       Please wait... This process may take a while. <b>This page will reload itself until all the steps
-	   have been completed.</b>
-    {else}
        All the necessary changes have been made to the database:<br/><br/>
        {$message}
-    {/if}    
      </p> 
    </div>      
 {/if}
 </fieldset>
 <div class="buttons">
-   {if !$multipleSteps}	
 	<input type="button" name="Prev" value="&laquo; Previous" onClick="javascript:history.go(-1);" />
-   {/if}
    <input type="hidden" name="nextStep" value="Update3"/>
-   {if $multipleSteps}
-        <input type="hidden" name="curStep" value="{$curStep}" />
-        <input type="hidden" name="numPosts" value="{$numPosts}" />
-   {else}
        <input type="submit" name="Next" value="Next &raquo;"/>
-   {/if} 
 </div>
 </form>
-{if $multipleSteps}
- <!-- let's make the document submit itself -->
- <script type="javascript">
-  document.update2.submit();
- </script>
-{/if}
 {include file="wizard/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/wizard/update3.template
===================================================================
--- plog/trunk/templates/wizard/update3.template	2006-05-31 21:51:55 UTC (rev 3499)
+++ plog/trunk/templates/wizard/update3.template	2006-05-31 21:52:14 UTC (rev 3500)
@@ -1,27 +1,45 @@
 {include file="wizard/header.template" step=4 mode=update title="Data Changes"}
-<form name="update2" method="post">
+<form name="update3" method="post" id="update3">
 <fieldset class="inputField">
 <legend>Data Changes</legend>
 {if $viewIsError}
     <div class="wizardError">
      <img src="imgs/admin/icon_error-16.png" alt="Error" class="wizardInfoIcon" />
      <p style="color:red;margin-left:20px;">{$viewErrorMessage}</p>
+     <p>You may choose to ignore this error and continue with the data update process by
+     clicking the "Continue" button below.
     </div>
 {else}
    <div class="wizardInfo">
     <img src="imgs/admin/icon_info-16.png" alt="Info" class="wizardInfoIcon" />
     <p class="wizardInfoText">
-    The table holding the posts has been updated successfully. In total, {$totalPosts} posts have
-    been updated.<br/><br/>
-    The next step will repeat the same operation but for the rest of tables.
+    {$message}
     </p>
    </div> 
 {/if}
 </fieldset>
 <div class="buttons">
-   <input type="hidden" name="nextStep" value="Update4"/>
+   {if !$complete}
+   <input type="hidden" name="nextStep" value="Update3"/>
+   {else}
+   {if !$viewIsError}
+   <input type="hidden" name="nextStep" value="Update4"/>   
    <input type="submit" name="Prev" value="&laquo; Previous"/>   
-   <input type="submit" name="Next" value="Next &raquo;"/>
-</div>  
+   <input type="submit" name="Next" value="Next &raquo;"/>   
+   {/if}
+   {/if}
+   {if $viewIsError}
+     <input type="hidden" name="nextStep" value="Update3"/>   
+     <input type="submit" name="continue" value="Continue" />
+   {/if}   
+   <input type="hidden" name="page" value="{$nextStep}" />
+   <input type="hidden" name="transformerId" value="{$transformerId}" />
+</div>
 </form>
+{if !$complete  && !$viewIsError}
+ <!-- let's make the document submit itself -->
+ <script type="text/javascript">
+  document.update3.submit();
+ </script>
+{/if}
 {include file="wizard/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/wizard/update4.template
===================================================================
--- plog/trunk/templates/wizard/update4.template	2006-05-31 21:51:55 UTC (rev 3499)
+++ plog/trunk/templates/wizard/update4.template	2006-05-31 21:52:14 UTC (rev 3500)
@@ -11,8 +11,8 @@
    <div class="wizardInfo">
     <img src="imgs/admin/icon_info-16.png" alt="Info" class="wizardInfoIcon" />
     <p class="wizardInfoText">
-  Installation is complete. Congratulations, Your 1.0-based installation has been updated
-  to version 1.1.
+  Installation is complete. Congratulations, Your 1.0 installation has been successfully upgraded to 
+  version 1.1.
     </p> 
    </div>
 {/if}