[pLog-CVS] plog/templates/wizard intro.template,1.3,1.4 step3.template,1.2,1.3

[Oscar R. <phu...@us...>]

Update of /cvsroot/plog/plog/templates/wizard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20761/templates/wizard

Modified Files:
	intro.template step3.template 
Log Message:
merged the PLOG_1_0_DEVEL_TEST experimental branch that was created some time
ago to start working on the new version with HEAD.


Index: step3.template
===================================================================
RCS file: /cvsroot/plog/plog/templates/wizard/step3.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** step3.template	28 Jan 2004 21:00:43 -0000	1.2
--- step3.template	17 Apr 2004 21:33:57 -0000	1.3
***************
*** 25,28 ****
--- 25,32 ----
     </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>

Index: intro.template
===================================================================
RCS file: /cvsroot/plog/plog/templates/wizard/intro.template,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** intro.template	3 Apr 2004 18:24:43 -0000	1.3
--- intro.template	17 Apr 2004 21:33:57 -0000	1.4
***************
*** 2,6 ****
  {assign var="steps" value="6"}
  {include file="wizard/header.template"}
!  <h1>Welcome to pLog 0.3.1!</h1>
    {if $errors}
   <p>
--- 2,6 ----
  {assign var="steps" value="6"}
  {include file="wizard/header.template"}
!  <h1>Welcome to pLog CVS!</h1>
    {if $errors}
   <p>
***************
*** 17,20 ****
--- 17,21 ----
    <b>Please follow this link if you are updating from version 0.2.x:
    <a href="?nextStep=Update1">UPDATE</a>.
+   <b>NOTE: This wizard won't update from 0.3.x to CVS, sorry!!!</b>
    </b>
   </p>