[pLog-svn] r3124 - in plog/trunk: . templates/wizard
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sat Mar 25 16:09:38 GMT 2006
Author: oscar
Date: 2006-03-25 16:09:37 +0000 (Sat, 25 Mar 2006)
New Revision: 3124
Modified:
plog/trunk/templates/wizard/checks.template
plog/trunk/templates/wizard/header.template
plog/trunk/templates/wizard/intro.template
plog/trunk/templates/wizard/step1.template
plog/trunk/templates/wizard/step2.template
plog/trunk/templates/wizard/step3.template
plog/trunk/templates/wizard/step4.template
plog/trunk/templates/wizard/step5.template
plog/trunk/templates/wizard/update1.template
plog/trunk/templates/wizard/update2.template
plog/trunk/templates/wizard/update3.template
plog/trunk/templates/wizard/update4.template
plog/trunk/wizard.php
Log:
some cosmetic fixes
Modified: plog/trunk/templates/wizard/checks.template
===================================================================
--- plog/trunk/templates/wizard/checks.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/checks.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="1 Preinstallation Checks" step=1 mode=install}
+{include file="wizard/header.template" title="1 Preinstallation Checks" step=1 mode=$mode}
<form name="databaseInfo" action="wizard.php" method="post">
<fieldset class="inputField">
<legend>Output</legend>
Modified: plog/trunk/templates/wizard/header.template
===================================================================
--- plog/trunk/templates/wizard/header.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/header.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -28,19 +28,21 @@
<div id="menu">
{if $mode=="install"}
<ul>
- <li {if $step==1}class="currentStep"{/if}>1 Welcome</li>
- <li {if $step==2}class="currentStep"{/if}>» 2 Confirm</li>
- <li {if $step==3}class="currentStep"{/if}>» 3 Database</li>
- <li {if $step==4}class="currentStep"{/if}>» 4 User Creation</li>
- <li {if $step==5}class="currentStep"{/if}>» 5 Blog Configuration</li>
- <li {if $step==6}class="currentStep"{/if}>» 6 Done!</li>
+ <li {if $step==1}class="currentStep"{/if}>1 Checks</li>
+ <li {if $step==2}class="currentStep"{/if}>» 2 Welcome</li>
+ <li {if $step==3}class="currentStep"{/if}>» 3 Confirm</li>
+ <li {if $step==4}class="currentStep"{/if}>» 4 Database</li>
+ <li {if $step==5}class="currentStep"{/if}>» 5 First User</li>
+ <li {if $step==6}class="currentStep"{/if}>» 6 First Blog</li>
+ <li {if $step==7}class="currentStep"{/if}>» 7 Done!</li>
</ul>
{else}
<ul>
- <li {if $step==1}class="currentStep"{/if}>1 Update</li>
- <li {if $step==2}class="currentStep"{/if}>» 2 Database Changes</li>
- <li {if $step==3}class="currentStep"{/if}>» 3 Data changes</li>
- <li {if $step==4}class="currentStep"{/if}>» 4 Done!</li>
+ <li {if $step==1}class="currentStep"{/if}>1 Checks</li>
+ <li {if $step==2}class="currentStep"{/if}>» 2 Update</li>
+ <li {if $step==3}class="currentStep"{/if}>» 3 Database Changes</li>
+ <li {if $step==4}class="currentStep"{/if}>» 4 Data changes</li>
+ <li {if $step==5}class="currentStep"{/if}>» 5 Done!</li>
</ul>
{/if}
<br style="clear:both;"/>
Modified: plog/trunk/templates/wizard/intro.template
===================================================================
--- plog/trunk/templates/wizard/intro.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/intro.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="1 Welcome!" step=1 mode=install}
+{include file="wizard/header.template" title="Welcome!" step=2 mode=install}
<form name="databaseInfo" action="wizard.php" method="post">
<fieldset class="inputField">
<legend>Database settings</legend>
Modified: plog/trunk/templates/wizard/step1.template
===================================================================
--- plog/trunk/templates/wizard/step1.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/step1.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="2 Confirm Information" mode=install step=2}
+{include file="wizard/header.template" title="Confirm Information" mode=install step=3}
<form name="formStep1" method="post">
<fieldset class="inputField">
<legend>Database Initialization</legend>
Modified: plog/trunk/templates/wizard/step2.template
===================================================================
--- plog/trunk/templates/wizard/step2.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/step2.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="3 Database Initialized" step=3 mode="install"}
+{include file="wizard/header.template" title="Database Initialized" step=4 mode="install"}
<form name="formStep2" action="wizard.php" method="post">
<fieldset class="inputField">
<legend>Database Initialization</legend>
Modified: plog/trunk/templates/wizard/step3.template
===================================================================
--- plog/trunk/templates/wizard/step3.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/step3.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="4 User Creation" step=4 mode=install}
+{include file="wizard/header.template" title="User Creation" step=5 mode=install}
<form name="newUser" action="wizard.php" method="post">
<fieldset class="inputField">
<legend>User Creation</legend>
Modified: plog/trunk/templates/wizard/step4.template
===================================================================
--- plog/trunk/templates/wizard/step4.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/step4.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="5 Blog Configuration" step=5 mode=install}
+{include file="wizard/header.template" title="Blog Configuration" step=6 mode=install}
<form name="newBlog" method="post">
<fieldset class="inputField">
<legend>Blog Creation</legend>
Modified: plog/trunk/templates/wizard/step5.template
===================================================================
--- plog/trunk/templates/wizard/step5.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/step5.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="6 Done!" mode=install step=6}
+{include file="wizard/header.template" title="Done!" mode=install step=7}
<form method="post">
<fieldset class="inputField">
<div class="wizardInfo">
Modified: plog/trunk/templates/wizard/update1.template
===================================================================
--- plog/trunk/templates/wizard/update1.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/update1.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="1 Update" step=1 mode=update}
+{include file="wizard/header.template" title="Update" step=2 mode=update}
<form name="databaseInfo" method="post">
<fieldset class="inputField">
<legend>Database Info</legend>
Modified: plog/trunk/templates/wizard/update2.template
===================================================================
--- plog/trunk/templates/wizard/update2.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/update2.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" step=2 title="2 Database Changes"}
+{include file="wizard/header.template" step=3 title="Database Changes"}
<form name="update2" id="update2" method="post">
<fieldset class="inputField">
<legend>Database Changes</legend>
Modified: plog/trunk/templates/wizard/update3.template
===================================================================
--- plog/trunk/templates/wizard/update3.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/update3.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" step=3 mode=update title="3 Data Changes"}
+{include file="wizard/header.template" step=4 mode=update title="Data Changes"}
<form name="update2" method="post">
<fieldset class="inputField">
<legend>Data Changes</legend>
Modified: plog/trunk/templates/wizard/update4.template
===================================================================
--- plog/trunk/templates/wizard/update4.template 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/templates/wizard/update4.template 2006-03-25 16:09:37 UTC (rev 3124)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" step=4 mode=upgrade title="4 Done!"}
+{include file="wizard/header.template" step=5 mode=upgrade title="Done!"}
<form method="post">
<fieldset class="inputField">
<legend>Upgrade Complete</legend>
Modified: plog/trunk/wizard.php
===================================================================
--- plog/trunk/wizard.php 2006-03-25 15:57:23 UTC (rev 3123)
+++ plog/trunk/wizard.php 2006-03-25 16:09:37 UTC (rev 3124)
@@ -366,6 +366,13 @@
$this->_view = new WizardView( "checks" );
$this->_view->setValue( "ok", $ok );
$this->_view->setValue( "checks", $checks );
+
+ if( WizardTools::isNewInstallation())
+ $this->_view->setValue( "mode", "install" );
+ else
+ $this->_view->setValue( "mode", "update" );
+
+ return true;
}
}
@@ -447,7 +454,7 @@
if( !File::exists( $configFileName )) {
if (! File::touch( $configFileName ) ) {
$this->_view = new WizardView( "intro" );
- $message = "Could not create the pLog configuration file $configFileName. Please make sure
+ $message = "Could not create the LifeType configuration file $configFileName. Please make sure
that the file can be created by the user running the webserver. It is needed to
store the database configuration settings.";
$this->_view->setErrorMessage( $message );
More information about the pLog-svn
mailing list