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

oscar at devel.plogworld.net oscar at devel.plogworld.net
Mon Dec 27 23:21:25 GMT 2004


Author: oscar
Date: 2004-12-27 23:21:25 +0000 (Mon, 27 Dec 2004)
New Revision: 586

Modified:
   plog/trunk/templates/wizard/footer.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
Log:
updated the wizard


Modified: plog/trunk/templates/wizard/footer.template
===================================================================
--- plog/trunk/templates/wizard/footer.template	2004-12-27 23:21:02 UTC (rev 585)
+++ plog/trunk/templates/wizard/footer.template	2004-12-27 23:21:25 UTC (rev 586)
@@ -1,12 +1,3 @@
- </div>
- </div>
- <div id="Bottommenu">
-  Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.
- </div>
-<!-- Please leave the credit intact. Thank you. -->
-<div id="Bottom">
-Copyright &copy; the <a href="{$version->getProjectPage()}">pLog team</a><br/>
-Design by <a href="http://www.bookofstyles.org/">Book of Styles</a><br/>
-</div>
-</body>
-</html>
+</div>
+</body>
+</html>
\ No newline at end of file

Modified: plog/trunk/templates/wizard/header.template
===================================================================
--- plog/trunk/templates/wizard/header.template	2004-12-27 23:21:02 UTC (rev 585)
+++ plog/trunk/templates/wizard/header.template	2004-12-27 23:21:25 UTC (rev 586)
@@ -1,19 +1,50 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-  <title>Wizard</title>
-  <style type="text/css" media="screen">@import "styles/wizard.css";</style>
- </head>
- <body>
-  <p class="Upgrade">This page looks plain and unstyled because you're using a non-standard compliant browser. To see it in its best form, please <a href="http://www.webstandards.org/upgrade/" title="The Web Standards Project's Browser Upgrade initiative">upgrade</a> to a browser that supports web standards. It's free and painless.</p>
-  <div id="Container">
-  <img src="imgs/plog_top.gif" alt="logo"/>
-  <div id="Topmenu">
-   Step {$step} of {$steps}
-  </div>
-  <div id="Main">
-  <div id="Content">
-  
-  
-  
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" >
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" >
+<head>
+<title>pLog Admin</title>
+<meta http-equiv="content-type" content="text/html;charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<link rel="stylesheet" href="styles/admin.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="styles/wizard.css" type="text/css" media="screen" />
+</head>
+<body>
+
+<div id="container" >
+
+    <div id="header" >
+        <h1><span>Wizard</span></h1>
+    </div>
+
+    <hr class="hide" />
+    <div id="skipNav">
+    <ul title="Accessibility options">
+    <li><a href="#menubar">Skip to Menu Bar</a></li>
+    <li><a href="#navigation">Skip to Navigation Bar</a></li>
+    </ul>
+    </div>
+    <hr class="hide" />
+
+    <div id="menubar">
+        <div id="menu">
+         {if $mode=="install"}
+          <ul>
+			<li {if $step==1}class="currentStep"{/if}>1 Welcome</li>
+			<li {if $step==2}class="currentStep"{/if}>&raquo; 2 Confirm</li>
+			<li {if $step==3}class="currentStep"{/if}>&raquo; 3 Database</li>
+			<li {if $step==4}class="currentStep"{/if}>&raquo; 4 User Creation</li>
+			<li {if $step==5}class="currentStep"{/if}>&raquo; 5 Blog Configuration</li>
+			<li {if $step==6}class="currentStep"{/if}>&raquo; 6 Done!</li>
+		  </ul>	
+		  {/if}
+          <br style="clear:both;"/>
+        </div>
+
+    </div>
+    <div id="content" >
+        <div id="nav_bar">
+            <div id="section_title">
+                <h2>{$title}</h2>
+            </div>
+            <br style="clear:both;" />
+        </div>				
+    
\ No newline at end of file

Modified: plog/trunk/templates/wizard/intro.template
===================================================================
--- plog/trunk/templates/wizard/intro.template	2004-12-27 23:21:02 UTC (rev 585)
+++ plog/trunk/templates/wizard/intro.template	2004-12-27 23:21:25 UTC (rev 586)
@@ -1,50 +1,70 @@
-{assign var="step" value="1"}
-{assign var="steps" value="6"}
-{include file="wizard/header.template"}
- <h1>Welcome to pLog CVS!</h1>
-  {if $errors}
- <p>
-  The following errors were found: <br/>
- <span style="color:red">{$message}</font>
- </p>
- {/if}
- <p>
-  Welcome to the configuration wizard of pLog. This wizard will guide you through the simple
-  process of installing or updating an older release of pLog.
- </p>
- <h3>Update</h3>
- <p>
-  <b>Please proceed to the update section if you are updating from 0.3.x:
-  <a href="?nextStep=Update1">UPDATE</a>.
-  </b>
- </p>
- <h3>New Installation</h3>
- <p>
-  If you have already made the changes to the configuration file yourself, you can skip
-  this step and continue <a href="?nextStep=Step1">here</a>
- </p>
- <p>
-  The first thing that it is needed to know
-  is the information regarding your database configuration. The user that will be used
-  to connect to the database must have enough permissions to run queries, add, remove
-  and update records. If you also wish to let this wizard create the database and the tables,
-  it should also have enough permissions to create databases and tables.
- </p>
+{include file="wizard/header.template" title="1 Welcome!" step=1 mode=install}
  <form name="databaseInfo" action="wizard.php" method="post">
-   <table>
-   <tr><td>Database server:</td><td><input style="width:100%" type="text" name="dbServer" value=""/></td></tr>
-   <tr><td>Database user:</td><td><input style="width:100%" type="text" name="dbUser" value=""/></td></tr>
-   <tr><td>Database password:</td><td><input style="width:100%" type="password" name="dbPassword" value=""/></td></tr>
-   <tr><td>Name of the database:</td><td><input style="width:100%" type="text" name="dbName" value=""/></td></tr>
-   <tr><td>Database prefix:</td><td><input style="width:100%" type="text" name="dbPrefix" value="plog_"/></td></tr>
-   </table>
-   <input type="checkbox" name="skipDbInfo" value="yes"/>
-   &nbsp;Check this box if you have already done this manually and would like to skip this step.<br/><br/>
-   <input type="hidden" name="nextStep" value="Step1"/>
- <p>
-  This information will be saved to the configuration file used by pLog so you will not need
-  to make any other changes.
- </p>
-   <input type="submit" name="Next" value="Next &raquo;"/>
+  <fieldset class="inputField">
+   <legend>Database settings</legend>  
+   {if $viewIsError}
+    <div class="wizardError">
+     <img src="imgs/icon_error-16.png" alt="Error" class="wizardInfoIcon" />
+     <p style="color:red;margin-left:20px;">{$viewErrorMessage}</p>
+    </div> 
+   {else}
+     <div class="wizardInfo">
+      <img src="imgs/icon_info-16.png" alt="Info" class="wizardInfoIcon" />
+      <p class="wizardInfoText">Welcome to the configuration wizard of pLog. This wizard will guide you through the process of installing pLog 1.0.
+      <br/><br/>
+      The first thing that it is needed to know
+      is the information regarding your database configuration. The user that will be used
+      to connect to the database must have enough permissions to run queries, add, remove
+      and update records. If you also wish to let this wizard create the database and the tables,
+      it should also have enough permissions to create databases and tables.
+      <br/><br/>
+      This information will be saved to the configuration file used by pLog so you will not need
+      to make any other changes.</p>
+     </div>
+   {/if}
+   <div class="field">
+    <label for="dbServer">Database server</label>
+    <span class="required">*</span>
+    <div class="formHelp">This is the host where your database server is running.</div>
+    <input style="width:100%" type="text" name="dbServer" value="{$dbServer}"/>
+    {include file="wizard/validate.template" field=dbServer message="Database server is missing or incorrect"}
+   </div>
+   
+   <div class="field">
+    <label for="dbUser">Database user</label>
+    <span class="required">*</span>
+    <div class="formHelp">User that will be used to access the database.</div>
+    <input style="width:100%" type="text" name="dbUser" value="{$dbUser}"/>
+    {include file="wizard/validate.template" field=dbUser message="Database user is missing or incorrect"}    
+   </div>
+   
+   <div class="field">
+    <label for="dbPassword">Database password</label>
+    <span class="required">*</span>
+    <div class="formHelp">Password for the user given above.</div>
+    <input style="width:100%" type="password" name="dbPassword" value="{$dbPassword}"/>
+   </div>
+   
+   <div class="field">
+    <label for="dbName">Database name</label>
+    <span class="required">*</span> 
+    <input style="width:100%" type="text" name="dbName" value=""/>
+    <div class="formHelp">Name of the database where tables will be created</div>
+    {include file="wizard/validate.template" field=dbName message="Database name is missing or incorrect"}    
+   </div> 
+   
+   <div class="field">
+    <label for="dbPrefix">Database prefix</label>
+    <span class="required">*</span>
+    <div class="formHelp">If needed, multiple instances of plog can run in the same database with different passwords, but the default is usually fine.</div>
+    <input style="width:100%" type="text" name="dbPrefix" value="plog_"/>
+   </div>
+   
+   </fieldset>
+   <div class="buttons">
+    <input type="hidden" name="nextStep" value="Step1"/>
+    <input type="reset" name="reset" value="Reset" />
+    <input type="submit" name="Next" value="Next &raquo;"/>
+   </div> 
  </form>
-{include file="wizard/footer.template"}
+{include file="wizard/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/wizard/step1.template
===================================================================
--- plog/trunk/templates/wizard/step1.template	2004-12-27 23:21:02 UTC (rev 585)
+++ plog/trunk/templates/wizard/step1.template	2004-12-27 23:21:25 UTC (rev 586)
@@ -1,35 +1,56 @@
-{assign var="step" value="2"}
-{assign var="steps" value="6"}
-{include file="wizard/header.template"}
- <h1>Confirm Information</h1>
- <p>
-  The following information has been saved to the configuration file. Please make sure
-  that it is correct and click "Next". If it is not correct, press "Back" and fill
-  the fields again with the correct information.
- </p>
- <p>
-  Database server: {$host}<br/>
-  Database username: {$username}<br/>
-  Database password: {$password}<br/>
-  Database: {$database}<br/>
-  Prefix: {$prefix}
- </p>
- <p>
-  Please click on the "Next" link if the above information is correct. Now the the tables for the
-  are going to be created. You can also skip this step if you have already
-  created the database and the tables and the only thing you'd like to do now is add a user
-  and a blog. If so, please <a href="?nextStep=Step3">proceed to Step Two</a>
- </p>
- <form name="formStep1" action="wizard.php" method="POST">
- <p>
-  <input type="checkbox" name="createDatabase"/>&nbsp;<b>Please check this if you want this wizard to
-  create the database for you as well, or leave it unchecked if you would only like to create
-  the tables.</b>
- </p>
- <p>
+{include file="wizard/header.template" title="2 Confirm Information" mode=install step=2}
+ <form name="formStep1" method="post">
+  <fieldset class="inputField">
+  <legend>Database Initialization</legend>   
+  {if $viewIsError}
+    <div class="wizardError">
+     <img src="imgs/icon_error-16.png" alt="Error" class="wizardInfoIcon" />
+     <p style="color:red;margin-left:20px;">{$viewErrorMessage}</p>
+    </div>
+  {else}
+   <div class="wizardInfo">
+     <img src="imgs/icon_info-16.png" alt="Info" class="wizardInfoIcon" />   
+     <p class="wizardInfoText">The following information has been saved to the configuration file. Now the the tables
+     are going to be created in the database.</p>
+   </div>  
+  {/if} 
+    <div class="field">
+     <label for="dbServer">Database server</label>
+     <div class="fieldHelp"></div>
+     {$dbServer}<br/>
+    </div>
+    <div class="field">
+     <label for="dbUser">Database User</label>
+     <div class="fieldHelp"></div>     
+     {$dbUser}<br/>
+    </div>
+    <div class="field"> 
+     <label for="dbPassword">Database password</label>
+     <div class="fieldHelp"></div>     
+     {$dbPassword}<br/>
+    </div>
+    <div class="field"> 
+     <label for="dbName">Database table</label>
+     <div class="fieldHelp"></div>     
+     {$dbName}<br/>
+    </div>
+    <div class="field">
+     <label for="dbPrefix">Database prefix</label>
+     <div class="fieldHelp"></div>     
+     {$dbPrefix}<br/>
+    </div>
+    <div class="field">
+     <label for="createDatabase">Create database</label>
+     <div class="fieldHelp"></div>     
+     <span class="required"></span>
+     <div class="fieldHelp"><input type="checkbox" name="createDatabase" class="checkbox" value="1" />Please check this if you want the installer to create the database.</div>
+    </div> 
+ </fieldset>
+ <div class="buttons"> 
+  <input type="button" name="Back" value="&laquo; Back" onclick="javascript:history.go(-1);" /> 
   <input type="hidden" name="nextStep" value="Step2"/>
-  <input type="button" name="Back" value="&laquo; Back" onclick="javascript:history.go(-1);"/>
+  <input type="reset"  name="reset" />
   <input type="submit" name="Next &raquo;" value="Next &raquo;"/>
- </p>
+ </div>
  </form>
 {include file="wizard/footer.template"}

Modified: plog/trunk/templates/wizard/step2.template
===================================================================
--- plog/trunk/templates/wizard/step2.template	2004-12-27 23:21:02 UTC (rev 585)
+++ plog/trunk/templates/wizard/step2.template	2004-12-27 23:21:25 UTC (rev 586)
@@ -1,18 +1,25 @@
-{assign var="step" value="3"}
-{assign var="steps" value="6"}
-{include file="wizard/header.template"}
- <h1>Database Initialized</h1>
- <p>
-  {$message}
- </p>
- <p>
-  The database and the tables needed have been successfuly created. We can now
-  proceed to the next step where we will create a user and a blog.
- </p>
- <form name="formStep2" action="wizard.php" method="post">
-  <p>
+{include file="wizard/header.template" title="3 Database Initialized" step=3 mode="install"}
+<form name="formStep2" action="wizard.php" method="post">
+ <fieldset class="inputField">
+  <legend>Database Initialization</legend>
+  <br/>   
+   {if $viewIsError}
+    <div class="wizardError">
+     <img src="imgs/icon_error-16.png" alt="Error" class="wizardInfoIcon" />
+     <p style="color:red;margin-left:20px;">{$viewErrorMessage}</p>
+    </div> 
+   {else}
+   <div class="wizardInfo">
+    <img src="imgs/icon_info-16.png" alt="Info" class="wizardInfoIcon" />   
+    <p class="wizardInfoText">The database and the tables needed have been successfuly created. We can now
+    proceed to the next step where we will create a user and a blog.</p>
+  </div>
+  {/if}
+  </fieldset>
+  <div class="buttons">
+   <input type="button" name="back" value=" &laquo; Previous" onClick="javascript:history.go(-1);" />
    <input type="hidden" name="nextStep" value="Step3"/>
    <input type="submit" name="Next &raquo;" value="Next &raquo;"/>
-  </p>
+  </div> 
  </form>
 {include file="wizard/footer.template"}

Modified: plog/trunk/templates/wizard/step3.template
===================================================================
--- plog/trunk/templates/wizard/step3.template	2004-12-27 23:21:02 UTC (rev 585)
+++ plog/trunk/templates/wizard/step3.template	2004-12-27 23:21:25 UTC (rev 586)
@@ -1,78 +1,55 @@
-{assign var="step" value="4"}
-{assign var="steps" value="6"}
-{include file="wizard/header.template"}
- <h1>User Registration</h1>
- {if $errors}
- <p>
-  The following errors were found: <br/>
-  <span style="color:red">{$message}</span>
- </p>
- {/if}
- <p>
-  At least one user is needed to run pLog. Since version 0.2, besides being a normal user
-  and having a normal blog, pLog offers basic user privileges
-  and this user will be given administrator privileges. The administrator
+{include file="wizard/header.template" title="4 User Creation" step=4 mode=install}
+<form name="newUser" action="wizard.php" method="post">
+ <fieldset class="inputField">
+  <legend>User Creation</legend>
+{if $viewIsError}
+    <div class="wizardError">
+     <img src="imgs/icon_error-16.png" alt="Error" class="wizardInfoIcon" />
+     <p style="color:red;margin-left:20px;">{$viewErrorMessage}</p>
+    </div> 
+{else}
+ <div class="wizardInfo">
+  <img src="imgs/icon_info-16.png" alt="Info" class="wizardInfoIcon" /> 
+  <p class="wizardInfoText">At least one user is needed to run pLog and this user will be given administrator privileges. The administrator
   user is allowed to configure pLog from within the administration interface, as well as
-  adding and removing users and blogs, etc.
- </p>
- <p>Please enter the following information for the user:</p>
-  <form name="newUser" action="wizard.php" method="post">
-  <p>
-  <table>
-   <tr>
-    <td>Username:</td>
-    <td><input type="text" name="userName" value="{$userName}"/></td>
-   </tr>
-   <tr>
-    <td>Full name (optional):</td>
-    <td><input type="text" name="userFullName" value="{$userFullName}"/></td>
-   </tr>   
-   <tr>
-    <td>Password:</td>
-    <td><input type="password" name="userPassword" value=""/></td>
-   </tr>
-   <tr>
-    <td>Confirm password:</td>
-    <td><input type="password" name="userPasswordCheck" value=""/></td>
-   <tr>
-    <td>Email address:</td>
-    <td><input type="text" name="userEmail" value="{$userEmail}"/></td>
-   </tr>
-   
-  {***
-   This is an example of custom user fields. The plog_users table has a special field
-   called 'properties' that will store a serialized PHP array with custom values that can be defined
-   here. Simply name your fields like 'properties[field_name]', so that the field can be handled
-   as an array in PHP. pLog will fetch this field and store it in the database for future use. 
-   
-   To fetch the value of these fields, use {$user->getValue("field_name")} from within a template, 
-   or simply $user->getValue("field_name") from within a php script 
-   
-   Please keep in mind that there is more than one place where pLog shows user-related forms, so please
-   have also a look at the following templates:
-   
-		admin/createuser.template
-		admin/userprofile.template
-		admin/usersettings.template
-		admin/createuser.template
-		register/step1.template
-		wizard/step3.template
-		
-	All the action classes that take care of these forms have been modified to use these custom fields
-   
-    The following lines are an example of how to add custom fields
-	
-	<tr>
-		<td class="alignright">Your MSN address: </td>
-		<td><input type="text" name="properties[msn_user]" value=""/></td>
-	</tr>  
-	<tr>
-		<td class="alignright">Your AIM address: </td>
-		<td><input type="text" name="properties[aim_user]" value=""/></td>
-	</tr>  
-  ***}   
-   
-  </table>
+  adding and removing users and blogs, etc.</p>
+ </div>
+{/if} 
+   <div class="field">
+    <label for="userName">User name</label>
+    <span class="required">*</span>
+    <div class="fieldHelp">Name of the first default user that will be created. This user will be given administrator privileges</div>
+    <input type="text" name="userName" value="{$userName}"/>
+    {include file="wizard/validate.template" field=userName message="User name is missing or incorrect"}
+   </div>
+   <div class="field"> 
+    <label for="userFullName">Full name</label>
+    <span class="required"></span>
+    <div class="fieldHelp">Full name of the user</div>
+    <input type="text" name="userFullName" value="{$userFullName}"/>
+   </div>
+   <div class="field">
+    <label for="userPassword">Password</label>
+    <span class="required">*</span>
+    <div class="fieldHelp">Password assigned to this user</div>
+    <input type="password" name="userPassword" value="{$userPassword}"/>
+    {include file="wizard/validate.template" field=userPassword message="Password is missing or too short"}    
+    <br/>
+    <div class="fieldHelp">Please confirm the password</div>
+    <input type="password" name="userPasswordCheck" value=""/>
+    {include file="wizard/validate.template" field=userPasswordCheck message="Passwords do not match"}
+   </div>
+   <div class="field">
+    <label for="userEmail">Email address</label>
+    <span class="required">*</span>
+    <div class="fieldHelp">Email address where notifications will be sent</div>
+    <input type="text" name="userEmail" value="{$userEmail}" />
+    {include file="wizard/validate.template" field=userEmail message="The email address is missing or incorrect"}    
+   </div>
+  </fieldset>
+  <div class="buttons">
+   <input type="button" value="&laquo; Previous" name="back" onClick="javascript:history.go(-1);" />
+   <input type="reset" value="Reset" name="Reset" />
    <input type="submit" value="Next &raquo;" name="Next &raquo;"/>
    <input type="hidden" name="nextStep" value="Step4"/></p>
   </p>

Modified: plog/trunk/templates/wizard/step4.template
===================================================================
--- plog/trunk/templates/wizard/step4.template	2004-12-27 23:21:02 UTC (rev 585)
+++ plog/trunk/templates/wizard/step4.template	2004-12-27 23:21:25 UTC (rev 586)
@@ -1,64 +1,54 @@
-{assign var="step" value="5"}
-{assign var="steps" value="6"}
-{include file="wizard/header.template"}
- <h1>Blog Registration</h1>
- {if $errors}
- <p>
-  The following errors were found: <br/>
-  <span style="color:red">{$message}</span>
- {/if}
- <p>
-  Your user has been successfully registered! Now we can continue and register a blog.
- </p>
- <p>
-  The only thing that we need to know to register a blog for you is the name you would
-  like to give to the blog. It can be as long or as short as you like, and it can of
-  course be changed any time in the future.
- </p>
-  <form name="newBlog" action="wizard.php" method="POST">
-  <p>
-   Enter a short but descriptive name for the new blog: <br/>
-   <input type="text" style="width:60%" name="blogName" value=""/><br/>
-   
- {***
-  The lines below are an example of how to add custom fields to a blog. The custom fields are stored in the
-  same field as the blog properties (the database field is 'settings') so you shoul be careful not to use the
-  same key twice.
-  
-  The core classes have been modified to take this feature into account so they will all look for an array 
-  of fields/values called "properties" (see below) You are responsible for validation!!!! pLog does not know
-  what to look for in these fields so we cannot apply automatica validation in this case. The recommended way
-  of doing this is by adding some javascript code. One thing pLog will take care of is to properly escape
-  the values received from these fields.
-  
-  Please keep in mind that there are several places throughout plog where blogs are created, edited, or
-  updated, so please take a look at the following template files:
-  
-  admin/createblog.template
-  admin/editblog.template
-  admin/blogsettings.template
-  wizard/step3.template
-  register/step2.template
-  
-  You can easily retrieve any of the values by using the $blog->getValue($key) method, or
-  {$blog->getValue($key)} from within a smarty template.
-	
-   
-  <!-- custom blog fields -->
-  <tr>
-   <td class="alignright" width="15%">Topic of this blog: </td>
-   <td><input type="text" style="width:95%" name="properties[topic]" value=""/></td>
-  </tr>  
-  <tr>
-   <td class="alignright" width="15%">Keyword of this blog: </td>
-   <td><input type="text" style="width:95%" name="properties[keyword]" value=""/></td>
-  </tr>
-  <!-- end of custom blog fields -->   
-  ***}
-   
+{include file="wizard/header.template" title="5 Blog Configuration" step=5 mode=install}
+<form name="newBlog" method="post">
+<fieldset class="inputField">
+<legend>Blog Creation</legend>
+{if $viewIsError}
+    <div class="wizardError">
+     <img src="imgs/icon_error-16.png" alt="Error" class="wizardInfoIcon" />
+     <p style="color:red;margin-left:20px;">{$viewErrorMessage}</p>
+    </div> 
+{else}
+ <div class="wizardInfo">
+  <img src="imgs/icon_info-16.png" alt="Info" class="wizardInfoIcon" /> 
+  <p class="wizardInfoText"> 
+   Your user has been successfully registered! Now a blog should be created.
+  </p>
+ </div>
+{/if}   
+  <div class="field">
+   <label for="blogName">Blog name</label>
+   <span class="required">*</span>
+   <div class="fieldHelp">Short but descriptive name for the new blog</div>
+   <input type="text" style="width:100%" name="blogName" value="{$blogName}"/>
+   {include file="summary/validate.template" field=blogName message="Blog name is missing or incorrect"}
+  </div>
+  <div class="field">
+   <label for="blogLocale">Language</label>
+   <span class="required">*</span>
+   <div class="fieldHelp">Select the default language that will be used throughout your site</div>
+   <select name="blogLocale">
+    {foreach from=$siteLocales item=locale}
+      <option value="{$locale->getLocaleCode()}" {if $blogLocale==$locale->getLocaleCode()}selected="selected"{/if}>{$locale->getDescription()}</option>
+    {/foreach}
+   </select>
+  </div>
+  <div class="field">
+   <label for="blogTemplate">Template</label>
+   <span class="required">*</span>
+   <div class="fieldHelp">Default template that will be used throughout your site</div>
+    {foreach from=$siteTemplates item=template}
+     <img height="150" width="150" src="{$template->getScreenshotUrl()}" alt="{$template->getName()}" /><br/>
+     <input type="radio" class="radio" name="blogTemplate" value="{$template->getName()}" {if $blogTemplate==$template->getName()}checked="checked"{/if} /> {$template->getName()}<br/>
+    {/foreach}
+    {include file="summary/validate.template" field=blogTemplate message="Please select a template for the blog"}
+  </div>
+ </fieldset>
+ <div class="buttons">  
+   <input type="button" value="&laquo; Previous" name="back" onClick="javascript:history.go(-1);" />
+   <input type="reset" value="Reset" name="Reset" /> 
    <input type="submit" value="Next &raquo;" name="Next &raquo;"/>
    <input type="hidden" name="nextStep" value="Step5"/>
-   <input type="hidden" name="ownerId" value="{$ownerid}"/>
-  </p>
-  </form>
-{include file="wizard/footer.template"}
+   <input type="hidden" name="ownerid" value="{$ownerid}"/>
+  </div>
+</form>
+{include file="wizard/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/wizard/step5.template
===================================================================
--- plog/trunk/templates/wizard/step5.template	2004-12-27 23:21:02 UTC (rev 585)
+++ plog/trunk/templates/wizard/step5.template	2004-12-27 23:21:25 UTC (rev 586)
@@ -1,20 +1,24 @@
-{assign var="step" value="6"}
-{assign var="steps" value="6"}
-{include file="wizard/header.template"}
- <h1>Wizard complete!</h1>
- <p>
-  Installation is complete. You can now proceed to the <a href="admin.php">Administration Interface</a> and start blogging!
- </p>
- <p>
+{include file="wizard/header.template" title="6 Done!" mode=install step=6}
+<form method="post">
+ <fieldset class="inputField">
+  <div class="wizardInfo">
+  <img src="imgs/icon_info-16.png" alt="Info" class="wizardInfoIcon" />   
+  <p class="wizardInfoText">Installation is complete!<br/>
+  <br/>
   {$message}
- </p>
- <p>
-  <span style="color:red">WARNING: </span>For security reasons, you must now remove this file, <b>wizard.php</b>. If you are
-  not planning to allow internet users to create new blogs in this server, then you should also
-  remove <b>register.php</b>.
- </p>
- <p>
-  Enjoy!<br/><b/>
+  </p>
+  </div>
+  <p>
+   <span style="color:red">WARNING: </span>For security reasons, you must now remove this file, <b>wizard.php</b>. If you are
+   not planning to allow internet users to create new blogs in this server, then you should also
+   remove <b>summary.php</b>.<br/><br/>
+   Enjoy,<br/>
   <a href="{$version->getProjectPage()}">The pLog team</a>.
- </p>
+  </p>
+ </fieldset>
+ <div class="buttons">
+  <input value="Go to blog" type="button" onClick="javascript:window.location='index.php'" /> 
+  <input value="Go to administration interface" type="button" onClick="javascript:window.location='admin.php'" />
+ </div> 
+</form> 
 {include file="wizard/footer.template"}

Modified: plog/trunk/templates/wizard/update1.template
===================================================================
--- plog/trunk/templates/wizard/update1.template	2004-12-27 23:21:02 UTC (rev 585)
+++ plog/trunk/templates/wizard/update1.template	2004-12-27 23:21:25 UTC (rev 586)
@@ -1,37 +1,47 @@
-{assign var="step" value="1"}
-{assign var="steps" value="4"}
-{include file="wizard/header.template"}
- <h1>Update to pLog 1.0</h1>
-  {if $errors}
- <p>
-  The following errors were found:
- <p>
- <p style="color:red">
-  {$message}
- </p>
- <p>
-  Correct the above errors and try again.
- </p>
- {/if}
- <p>
+{include file="wizard/header.template" title="1. Update"}
+<form name="databaseInfo" method="post">
+<fieldset class="inputField">
+ <legend>Database Info</legend>
+{if $viewIsError}
+  <span style="color:red">{$viewErrorMessage}</span>
+{else}
+  <div class="wizardInfo">
   The following database settings have been detected in the configuration file. Please make sure
   that they are correct and press "Next" to move to the next step. If they are not correct,
-  please make the necessary changes in your configuration file before continuing.
- </p>
- <form name="databaseInfo" action="wizard.php" method="post">
-   <table>
-   <tr><td>Database server: <b>{$dbServer}</b></td></tr>
-   <tr><td>Database user: <b>{$dbUser}</b></td></tr>
-   <tr><td>Database password: <b>{$dbPassword}</b></td></tr>
-   <tr><td>Name of the database: <b>{$dbName}</b></td></tr>
-   <tr><td>Database prefix: <b>{$dbPrefix}</b></td></tr>
-   </table>
-   <input type="hidden" name="nextStep" value="Update2"/>
-   <input type="button" name="Back" value="&laquo; Back" onclick="javascript:history.go(-1);"/>
-   <input type="submit" name="Next" value="Next &raquo;"/>
+  please make the necessary changes in your configuration file before continuing.<br/><br/>
+  The following step will consist of making the changes to the database structure, required by
+  some of the new features in 1.0.  
+  </div>
+{/if}
+    <div class="field">
+     <label for="dbServer">Database server</label>
+     <div class="fieldHelp"></div>
+     {$dbServer}<br/>
+    </div>
+    <div class="field">
+     <label for="dbUser">Database User</label>
+     <div class="fieldHelp"></div>     
+     {$dbUser}<br/>
+    </div>
+    <div class="field"> 
+     <label for="dbPassword">Database password</label>
+     <div class="fieldHelp"></div>     
+     {$dbPassword}<br/>
+    </div>
+    <div class="field"> 
+     <label for="dbName">Database table</label>
+     <div class="fieldHelp"></div>     
+     {$dbName}<br/>
+    </div>
+    <div class="field">
+     <label for="dbPrefix">Database prefix</label>
+     <div class="fieldHelp"></div>     
+     {$dbPrefix}<br/>
+    </div>
+   </fieldset>
+   <div class="buttons"> 
+    <input type="hidden" name="nextStep" value="Update2"/>
+    <input type="submit" name="Next" value="Next &raquo;"/>
+   </div>
  </form>
- <p>
-  The following step will consist of making the changes to the database structure, required by
-  some of the new features in 1.0.
- </p>
 {include file="wizard/footer.template"}
\ No newline at end of file




More information about the pLog-svn mailing list