merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,33 +1,55 @@
<!--%import("js/install_admin.js")-->
<!--#include("header.html")-->
<load target="js/install_admin.js" />
<include target="header.html" />
<div id="body">
<!--#include("progress_menu.html")-->
<span class="dummy"></span>
<include target="progress_menu.html" />
<div id="content">
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form rule="install" action="./" method="post">
<input type="hidden" name="act" value="procInstall" />
<ul class="form formAdmin">
<li><label for="aMail">{$lang->email_address}</label><input name="email_address" type="text" class="iText" id="aMail" /></li>
<li><label for="aPw1">{$lang->password1}</label><input name="password" type="password" class="iText" id="aPw1" /></li>
<li><label for="aPw2">{$lang->password2}</label><input name="password2" type="password" class="iText" id="aPw2" /></li>
<li><label for="aId">{$lang->user_id}</label><input name="user_id" type="text" value="admin" class="iText" id="aId" /></li>
<li><label for="aNick">{$lang->nick_name}</label><input name="nick_name" type="text" class="iText" id="aNick" /></li>
</ul>
<form rule="install" action="./" method="post" class="x_form-horizontal">
<input type="hidden" name="act" value="procInstall" />
<div class="x_control-group">
<label for="aMail" class="x_control-label"><strong>*</strong> {$lang->email_address}</label>
<div class="x_controls">
<input name="email_address" type="email" id="aMail" required />
</div>
</div>
<div class="x_control-group">
<label for="aPw1" class="x_control-label"><strong>*</strong> {$lang->password1}</label>
<div class="x_controls">
<input name="password" type="password" id="aPw1" required />
</div>
</div>
<div class="x_control-group">
<label for="aPw2" class="x_control-label"><strong>*</strong> {$lang->password2}</label>
<div class="x_controls">
<input name="password2" type="password" id="aPw2" required />
</div>
</div>
<div class="x_control-group">
<label for="aNick" class="x_control-label"><strong>*</strong> {$lang->nick_name}</label>
<div class="x_controls">
<input name="nick_name" type="text" id="aNick" required />
</div>
</div>
<div class="x_control-group">
<label for="aId" class="x_control-label"><strong>*</strong> {$lang->user_id}</label>
<div class="x_controls">
<input name="user_id" type="text" id="aId" required />
</div>
</div>
<div class="desc">
<p>{$lang->install_notandum}</p>
</div>
<div class="ibtnArea">
<div class="fLeft">
<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallConfigForm')}">{$lang->cmd_back}</a></span>
</div>
<div class="fRight">
<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_complete}" /></span>
</div>
<span class="x_pull-left">
<a href="{getUrl('', 'act', 'dispInstallConfigForm')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
</span>
<span class="x_pull-right">
<button type="submit" class="x_btn x_btn-small x_btn-inverse x_disabled" id="task-done"><i class="x_icon-ok x_icon-white"></i> {$lang->cmd_complete}</button>
</span>
</div>
</form>
</div>
</div>
<!--#include("footer.html")-->
<include target="footer.html" />