Revision: 25171
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=25171&view=rev
Author: ricks99
Date: 2010-02-12 23:40:32 +0000 (Fri, 12 Feb 2010)
Log Message:
-----------
[FIX]Addressed multiple xhtml validation errors. All pages of the installer now validate properly.
Modified Paths:
--------------
trunk/templates/tiki-install.tpl
Modified: trunk/templates/tiki-install.tpl
===================================================================
--- trunk/templates/tiki-install.tpl 2010-02-12 23:04:11 UTC (rev 25170)
+++ trunk/templates/tiki-install.tpl 2010-02-12 23:40:32 UTC (rev 25171)
@@ -26,13 +26,13 @@
</ul>
<form action="tiki-install.php" method="post">
- {tr}Select your language:{/tr}
- <select name="lang" id="general-lang" onchange="javascript:submit()">
+ <label>{tr}Select your language:{/tr}
+ <select name="lang" id="general-lang" onchange="javascript:submit()" title="{tr}Select your language:{/tr}">
{section name=ix loop=$languages}
<option value="{$languages[ix].value|escape}"
{if $prefs.site_language eq $languages[ix].value}selected="selected"{/if}>{$languages[ix].name}</option>
{/section}
- </select>
+ </select></label>
<input type="hidden" name="install_step" value="0" />
{if $multi} <input type="hidden" name="multi" value="{$multi}" />{/if}
</form>
@@ -50,7 +50,7 @@
<h1>{tr}Read the License{/tr}</h1>
<p>{tr}Tiki is software distributed under the LGPL license.{/tr} {tr} <a href="http://creativecommons.org/licenses/LGPL/2.1/" target="_blank">Here is a human-readable summary of the license below, including many translations.</a>{/tr}</p>
<div align="center" style="margin-top:1em;">
-<iframe src="license.txt" width="700px" height="300px"> </iframe>
+<iframe src="license.txt" width="700" height="300" style="width:700px;height:300px"> </iframe>
<form action="tiki-install.php" method="post">
{if $multi} <input type="hidden" name="multi" value="{$multi}" />{/if}
{if $lang} <input type="hidden" name="lang" value="{$lang}" />{/if}
@@ -69,7 +69,7 @@
<h2>{tr}Memory{/tr}</h2>
{if $php_memory_limit <= 0}
<div style="border: solid 1px #000; padding: 5px; background: #a9ff9b;">
- <p align="center"><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle"/> {tr}Tiki has not detected your PHP memory_limit.{/tr} {tr}This probably means you have no set limit (all is well).{/tr} </p>
+ <p align="center"><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki has not detected your PHP memory_limit.{/tr} {tr}This probably means you have no set limit (all is well).{/tr} </p>
</div>
{elseif $php_memory_limit < 32 * 1024 * 1024}
<div style="border-style: solid; border-width: 1; padding: 5px; background: #FF0000">
@@ -82,14 +82,14 @@
<div style="border: solid 1px #000; padding: 4px; background-color: #a9ff9b;">
<p align="center">
<span style="font-size: large; padding: 4px;">
- <img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle"/> {tr}Tiki has detected your PHP memory_limit at:{/tr} {$php_memory_limit|kbsize:true:0}.
+ <img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> {tr}Tiki has detected your PHP memory_limit at:{/tr} {$php_memory_limit|kbsize:true:0}.
</span>
</p>
</div>
{/if}
<br />
- <h2>{tr}Mail{/tr}</h2><A NAME="mail"></A>
+ <h2>{tr}Mail{/tr}</h2><a name="mail"> </a>
<p>{tr}Tiki uses the PHP <strong>mail</strong> function to send email notifications and messages.{/tr}</p>
{if $perform_mail_test ne 'y'}
<p>{tr}To test your system configuration, Tiki will attempt to send a test message to you.{/tr}</p>
@@ -97,7 +97,7 @@
<form action="tiki-install.php#mail" method="post">
<div style="padding:1em 7em;">
<label for="admin_email_test">{tr}Test email:{/tr}</label>
- <input type="text" size="40" name="email_test_to" id="email_test_to" value="{if isset($email_test_to)}{$email_test_to}{/if}"/>
+ <input type="text" size="40" name="email_test_to" id="email_test_to" value="{if isset($email_test_to)}{$email_test_to}{/if}" />
{if isset($email_test_err)}<span class="attention"><em>{$email_test_err}</em></span>
{else}<em>{tr}Email address to send test to.{/tr}</em>{/if}
<br /><br />
@@ -185,7 +185,7 @@
<br />
{section name=n loop=$tikifeedback}
<div class="simplebox {if $tikifeedback[n].num > 0} highlight{/if}">
- <img src="pics/icons/{if $tikifeedback[n].num > 0}delete.png" alt="{tr}Error{/tr}"{else}accept.png" alt="{tr}Success{/tr}"{/if} style="vertical-align:middle"/> {$tikifeedback[n].mes}
+ <img src="pics/icons/{if $tikifeedback[n].num > 0}delete.png" alt="{tr}Error{/tr}"{else}accept.png" alt="{tr}Success{/tr}"{/if} style="vertical-align:middle" /> {$tikifeedback[n].mes}
</div>
{/section}
{/if}
@@ -258,7 +258,7 @@
<div class="clearfix">
<p>
{if $tikidb_created}
- {tr}This install will populate (or upgrade) the database.{/tr}<br/><br/>
+ {tr}This install will populate (or upgrade) the database.{/tr}<br /><br />
{tr}If you want to upgrade from a previous Tiki release, ensure that you have read and understood the <a href="http://doc.tikiwiki.org/Upgrade" target="_blank">Upgrade instructions</a>.{/tr}
{else}
{tr}A new install will populate the database.{/tr}
@@ -294,9 +294,9 @@
{else}
<div id="install-table">
{/if}
- {if $tikidb_created}<p style="text-align:center"><img src="pics/icons/sticky.png" alt="{tr}Warning{/tr}" style="vertical-align:middle"/> <strong>{tr}Warning:{/tr}</strong> {tr}This will destroy your current database.{/tr}</p>{/if}
+ {if $tikidb_created}<p style="text-align:center"><img src="pics/icons/sticky.png" alt="{tr}Warning{/tr}" style="vertical-align:middle" /> <strong>{tr}Warning:{/tr}</strong> {tr}This will destroy your current database.{/tr}</p>{/if}
<p align="center">
- <input type="submit" name="scratch" value=" {if $tikidb_created}{tr}Reinstall{/tr}{else}{tr}Install{/tr}{/if} " style="margin: 32px;"/>
+ <input type="submit" name="scratch" value=" {if $tikidb_created}{tr}Reinstall{/tr}{else}{tr}Install{/tr}{/if} " style="margin: 32px;" />
</p>
</div>
@@ -349,7 +349,7 @@
</p>
</div>
{if $installer->success|@count gt 0}
- <p><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle"/> <span style="font-weight:bold">
+ <p><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> <span style="font-weight:bold">
{if isset($smarty.post.update)}
{tr}Upgrade operations executed successfully:{/tr}
{else}
@@ -358,7 +358,7 @@
</span>
{$installer->success|@count} {tr}SQL queries.{/tr}</p>
{else}
- <p><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle"/> <span style="font-weight: bold">{tr}Database was left unchanged.{/tr}</span></p>
+ <p><img src="pics/icons/accept.png" alt="{tr}Success{/tr}" style="vertical-align:middle" /> <span style="font-weight: bold">{tr}Database was left unchanged.{/tr}</span></p>
{/if}
{if $installer->failures|@count > 0}
{jq}
@@ -369,7 +369,7 @@
{/literal}
{/jq}
-<p><img src="pics/icons/delete.png" alt="{tr}Failed{/tr}" style="vertical-align:middle"/> <strong>{tr}Operations failed:{/tr}</strong> {$installer->failures|@count} {tr}SQL queries.{/tr}
+<p><img src="pics/icons/delete.png" alt="{tr}Failed{/tr}" style="vertical-align:middle" /> <strong>{tr}Operations failed:{/tr}</strong> {$installer->failures|@count} {tr}SQL queries.{/tr}
<a href="javascript:sql_failed()">{tr}Display details.{/tr}</a>
<div id="sql_failed_log" style="display:none">
@@ -478,18 +478,18 @@
</p>
{if isset($smarty.post.scratch)}
- <h3><img src="pics/icons/information.png" alt="{tr}Note{/tr}" style="vertical-align:middle"/> {tr}Installation{/tr}</h3>
+ <h3><img src="pics/icons/information.png" alt="{tr}Note{/tr}" style="vertical-align:middle" /> {tr}Installation{/tr}</h3>
<p>{tr}If this is a first time installation, go to <strong>tiki-admin.php</strong> after login to start configuring your new Tiki installation.{/tr}</p>
{/if}
{if isset($smarty.post.update)}
- <h3><img src="pics/icons/information.png" alt="{tr}Note{/tr}" style="vertical-align:middle"/> {tr}Upgrade{/tr}</h3>
+ <h3><img src="pics/icons/information.png" alt="{tr}Note{/tr}" style="vertical-align:middle" /> {tr}Upgrade{/tr}</h3>
<p>{tr}If this is an upgrade, clean the Tiki caches manually (the <strong>templates_c</strong> directory) or by using the <strong>Admin > System</strong> option from the Admin menu.{/tr}</p>
{/if}
{if $tikidb_is20}
- <span class="button"><a href="tiki-install.php?lockenter&install_type={$install_type}">{tr}Enter Tiki and Lock Installer{/tr} ({tr}Recommended{/tr})</a></span>
- <span class="button"><a href="tiki-install.php?nolockenter&install_type={$install_type}">{tr}Enter Tiki Without Locking Installer{/tr}</a></span>
+ <span class="button"><a href="tiki-install.php?lockenter&install_type={$install_type}">{tr}Enter Tiki and Lock Installer{/tr} ({tr}Recommended{/tr})</a></span>
+ <span class="button"><a href="tiki-install.php?nolockenter&install_type={$install_type}">{tr}Enter Tiki Without Locking Installer{/tr}</a></span>
{/if}
</div>
@@ -537,7 +537,7 @@
{tr}Go directly to the <strong>Install/Upgrade</strong> step.{/tr}
{if $dbcon eq 'y' or isset($smarty.post.scratch) or isset($smarty.post.update)}
<a href="tiki-install.php?install_step=4{if $multi}&multi={$multi}{/if}{if $lang}&lang={$lang}{/if}" title="{tr}Install/Upgrade{/tr}">
- <img src="pics/icons/arrow_right.png" height=16 width=16/>
+ <img src="pics/icons/arrow_right.png" height="16" width="16" />
</a>
{/if}
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
