[pLog-svn] r4124 - in plog/branches/lifetype-1.1.1: . templates/wizard

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-10-12 08:09:39 +0000 (Thu, 12 Oct 2006)
New Revision: 4124

Added:
   plog/branches/lifetype-1.1.1/templates/wizard/update111.template
Modified:
   plog/branches/lifetype-1.1.1/wizard.php
Log:
the previous fix didn't quite work as expected...


Added: plog/branches/lifetype-1.1.1/templates/wizard/update111.template
===================================================================
--- plog/branches/lifetype-1.1.1/templates/wizard/update111.template	2006-10-12 08:03:33 UTC (rev 4123)
+++ plog/branches/lifetype-1.1.1/templates/wizard/update111.template	2006-10-12 08:09:39 UTC (rev 4124)
@@ -0,0 +1,45 @@
+{include file="wizard/header.template" step=4 mode=update title="Data Changes"}
+<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">
+    {$message}
+    </p>
+   </div> 
+{/if}
+</fieldset>
+<div class="buttons">
+   {if !$complete}
+   <input type="hidden" name="nextStep" value="Fix111"/>
+   {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;"/>   
+   {/if}
+   {/if}
+   {if $viewIsError}
+     <input type="hidden" name="nextStep" value="Fix111"/>   
+     <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/branches/lifetype-1.1.1/wizard.php
===================================================================
--- plog/branches/lifetype-1.1.1/wizard.php	2006-10-12 08:03:33 UTC (rev 4123)
+++ plog/branches/lifetype-1.1.1/wizard.php	2006-10-12 08:09:39 UTC (rev 4124)
@@ -2490,7 +2490,7 @@
             // to fail on error   
             if( !$result && $transformer->failOnError ) {
                 //print("Error in step = $step<br/>");
-                $this->_view = new WizardView( "update3" );
+                $this->_view = new WizardView( "update111" );
                 // current and next step
                 $this->_view->setValue( "currentStep", $step );
                 $this->_view->setValue( "nextStep", $step+1 );                
@@ -2508,7 +2508,7 @@
             else {
                 if( !$complete ) {
                     //print("it's not complete! step = $step<br/>");
-                    $this->_view = new WizardView( "update3" );
+                    $this->_view = new WizardView( "update111" );
                     // current and next step
                     $this->_view->setValue( "currentStep", $step );
                     $this->_view->setValue( "nextStep", $step+1 );                
@@ -2523,7 +2523,7 @@
                     $moreTransformers = ( $this->currentTransformerId+1 < count( $this->transformers ));
                     if( $moreTransformers ) {
                         //print("Starting new transformer!<br/>");
-                        $this->_view = new WizardView( "update3" );
+                        $this->_view = new WizardView( "update111" );
                         // current and next step
                         $this->_view->setValue( "currentStep", 0 );
                         $this->_view->setValue( "nextStep", 1 );