[pLog-svn] r5145 - in plog/branches/lifetype-1.2: styles templates/wizard
mark at devel.lifetype.net
mark at devel.lifetype.net
Wed Mar 21 12:41:49 EDT 2007
Author: mark
Date: 2007-03-21 12:41:49 -0400 (Wed, 21 Mar 2007)
New Revision: 5145
Modified:
plog/branches/lifetype-1.2/styles/wizard.css
plog/branches/lifetype-1.2/templates/wizard/checks.template
plog/branches/lifetype-1.2/templates/wizard/footer.template
plog/branches/lifetype-1.2/templates/wizard/step1.template
plog/branches/lifetype-1.2/templates/wizard/step3.template
plog/branches/lifetype-1.2/templates/wizard/step4.template
Log:
1. Some cosmetic fix.
2. Some HTML fix.
3. There is no DbError() in PDO mysql driver. Only ErrorMsg() available.
Modified: plog/branches/lifetype-1.2/styles/wizard.css
===================================================================
--- plog/branches/lifetype-1.2/styles/wizard.css 2007-03-21 08:17:56 UTC (rev 5144)
+++ plog/branches/lifetype-1.2/styles/wizard.css 2007-03-21 16:41:49 UTC (rev 5145)
@@ -26,6 +26,33 @@
margin-left: 20px;
}
+.checkCategory
+{
+ font-size: 12px;
+ font-weight: bold;
+ margin:5px 0px;
+ text-decoration: underline;
+}
+
+.checkItem
+{
+ padding-bottom: 5px;
+ margin-top: 10px;
+ border: 0px;
+}
+
+.checkError
+{
+ margin-left: 20px;
+ margin-top: 5px;
+}
+
+.checkImage
+{
+ float:left;
+ margin: 10px 5px 0px 0px;
+}
+
#menu li
{
position : relative;
Modified: plog/branches/lifetype-1.2/templates/wizard/checks.template
===================================================================
--- plog/branches/lifetype-1.2/templates/wizard/checks.template 2007-03-21 08:17:56 UTC (rev 5144)
+++ plog/branches/lifetype-1.2/templates/wizard/checks.template 2007-03-21 16:41:49 UTC (rev 5145)
@@ -17,26 +17,27 @@
<p class="wizardInfoText">Welcome to the configuration wizard of LifeType. These are some basic checks of your current
system in order to ensure that LifeType can run properly.
<br/><br/>
- </p>
+ </p>
+ </div>
{/if}
{foreach from=$checkGroups item=checks key=checkGroup}
- <div style="font-size: 12px; font-weight: bold; margin:5px 0px; text-decoration: underline">{$checkGroup}</div>
+ <div class="checkCategory">{$checkGroup}</div>
{foreach from=$checks item=check key=checkId}
{** loop through the checks and show an error message if not passed, unless not critical **}
{if $check->isValid()}
- <img src="imgs/summary/icon_accept-16.png" style="float:left; margin: 10px 5px 0px 0px;" alt="PASSED" />
+ <img src="imgs/summary/icon_accept-16.png" class="checkImage" alt="PASSED" />
{else}
{if $check->isCritical()}
- <img src="imgs/summary/icon_cancel-16.png" style="float:left; margin: 10px 5px 0px 0px;" alt="ERROR" />
+ <img src="imgs/summary/icon_cancel-16.png" class="checkImage" alt="ERROR" />
{else}
- <img src="imgs/summary/icon_warning-16.png" style="float:left; margin: 10px 5px 0px 0px;" alt="NOT CRITICAL" />
+ <img src="imgs/summary/icon_warning-16.png" class="checkImage" alt="NOT CRITICAL" />
{/if}
{/if}
- <div style="padding-bottom:5px; margin-top: 10px;">
+ <div class="checkItem">
{$check->getDesc()} {if !$check->isCritical()}(optional){/if}
{if !$check->isValid()}
- <div style="margin-left: 20px; margin-top: 5px;">
+ <div class="checkError">
{if $check->isCritical()}
<span style="color: red;">{$check->getSolution()}</span>
{else}
@@ -47,7 +48,7 @@
</div>
{/foreach}
{/foreach}
- </div>
+
</fieldset>
<div class="buttons">
{if $ok}
Modified: plog/branches/lifetype-1.2/templates/wizard/footer.template
===================================================================
--- plog/branches/lifetype-1.2/templates/wizard/footer.template 2007-03-21 08:17:56 UTC (rev 5144)
+++ plog/branches/lifetype-1.2/templates/wizard/footer.template 2007-03-21 16:41:49 UTC (rev 5145)
@@ -1,3 +1,4 @@
</div>
+</div>
</body>
</html>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/templates/wizard/step1.template
===================================================================
--- plog/branches/lifetype-1.2/templates/wizard/step1.template 2007-03-21 08:17:56 UTC (rev 5144)
+++ plog/branches/lifetype-1.2/templates/wizard/step1.template 2007-03-21 16:41:49 UTC (rev 5145)
@@ -1,5 +1,5 @@
{include file="wizard/header.template" title="Confirm Information" mode=install step=3}
- <form name="formStep1" method="post">
+ <form name="formStep1" action="wizard.php" method="post">
<fieldset class="inputField">
<legend>Database Initialization</legend>
{if $viewIsError}
@@ -32,7 +32,7 @@
<div class="field">
<label for="dbName">Database table</label>
<div class="formHelp"></div>
- <span idb="dbName">{$dbName}</span><br/>
+ <span id="dbName">{$dbName}</span><br/>
</div>
<div class="field">
<label for="dbPrefix">Database prefix</label>
@@ -43,7 +43,6 @@
{if !empty($availableCharacterSets)}
<div class="field">
<label for="dbCharacterSet">Database default character set</label>
- <span class="required"></span>
<div class="formHelp">If you plan to use UTF-8 as your default web encoding, please select <strong>utf8</strong> as your database default character set.</div>
<select name="dbCharacterSet" id="dbCharacterSet" size="1" style="width:20%">
<option value="default">default</option>
@@ -56,7 +55,6 @@
<div class="field">
<label for="createDatabase">Create database</label>
- <span class="required"></span>
<div class="formHelp"></div>
<div class="field"><input type="checkbox" name="createDatabase" id="createDatabase" class="checkbox" value="1" {if $createDatabase} checked="checked" {/if}/>Please check this if you want the installer to create the database.</div>
</div>
Modified: plog/branches/lifetype-1.2/templates/wizard/step3.template
===================================================================
--- plog/branches/lifetype-1.2/templates/wizard/step3.template 2007-03-21 08:17:56 UTC (rev 5144)
+++ plog/branches/lifetype-1.2/templates/wizard/step3.template 2007-03-21 16:41:49 UTC (rev 5145)
@@ -24,7 +24,6 @@
</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" id="userFullName" value="{$userFullName}"/>
</div>
@@ -51,7 +50,7 @@
<input type="button" value="« Previous" name="back" onClick="javascript:history.go(-1);" />
<input type="reset" value="Reset" name="Reset" />
<input type="submit" value="Next »" name="Next »"/>
- <input type="hidden" name="nextStep" value="Step4"/></p>
- </p>
-
+ <input type="hidden" name="nextStep" value="Step4"/>
+ </div>
+</form>
{include file="wizard/footer.template"}
Modified: plog/branches/lifetype-1.2/templates/wizard/step4.template
===================================================================
--- plog/branches/lifetype-1.2/templates/wizard/step4.template 2007-03-21 08:17:56 UTC (rev 5144)
+++ plog/branches/lifetype-1.2/templates/wizard/step4.template 2007-03-21 16:41:49 UTC (rev 5145)
@@ -1,5 +1,5 @@
{include file="wizard/header.template" title="Blog Configuration" step=6 mode=install}
-<form name="newBlog" method="post">
+<form name="newBlog" action="wizard.php" method="post">
<fieldset class="inputField">
<legend>Blog Creation</legend>
{if $viewIsError}
@@ -37,7 +37,7 @@
<span class="required">*</span>
<div class="fieldHelp">Default template that will be used throughout your site</div>
{foreach from=$siteTemplates item=template}
- <img height="300" width="300" src="{$template->getScreenshotUrl()}" alt="{$template->getName()}" /><br/>
+ <img height="210" width="280" src="{$template->getScreenshotUrl()}" alt="{$template->getName()}" /><br/>
<input type="radio" class="radio" id="blogTemplate" name="blogTemplate" value="{$template->getName()}" {if $blogTemplate==$template->getName()}checked="checked"{/if} /> {$template->getName()}<br/>
{/foreach}
{include file="wizard/validate.template" field=blogTemplate message="Please select a template for the blog"}
More information about the pLog-svn
mailing list