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,35 +1,54 @@
<!--%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="mysql" action="./" method="post">
<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
<input type="hidden" name="act" value="procMysqlDBSetting" />
<input type="hidden" name="db_type" value="{$db_type}" />
<h2 class="h2">{$db_type}</h2>
<ul class="form formDbInfo">
<li><label for="dbHostName">{$lang->db_hostname}</label><input name="db_hostname" value="localhost" type="text" class="iText" id="dbHostName" /></li>
<li><label for="dbPort">{$lang->db_port}</label><input name="db_port" value="3306" type="text" class="iText" id="dbPort" /></li>
<li><label for="dbId">{$lang->db_userid}</label><input name="db_userid" type="text" class="iText" id="dbId" /></li>
<li><label for="dbPw">{$lang->db_password}</label><input name="db_password" type="password" class="iText" id="dbPw" /></li>
<li><label for="dbName">{$lang->db_name}</label><input name="db_database" type="text" class="iText" id="dbName" /></li>
<li><label for="dbPrefix">{$lang->db_table_prefix}</label><input name="db_table_prefix" type="text" class="iText" id="dbPrefix" value="xe" /></li>
</ul>
<form rule="mysql" action="./" method="post" class="x_form-horizontal">
<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
<input type="hidden" name="act" value="procMysqlDBSetting" />
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>
<div class="x_control-group">
<label for="dbId" class="x_control-label"><strong>*</strong> {$lang->db_userid}</label>
<div class="x_controls"><input name="db_userid" type="text" id="dbId" required /></div>
</div>
<div class="x_control-group">
<label for="dbPw" class="x_control-label"><strong>*</strong> {$lang->db_password}</label>
<div class="x_controls"><input name="db_password" type="password" id="dbPw" required /></div>
</div>
<div class="x_control-group">
<label for="dbName" class="x_control-label"><strong>*</strong> {$lang->db_name}</label>
<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
</div>
<div class="desc">{$lang->db_info_desc}</div>
<div class="ibtnArea">
<div class="fLeft">
<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallSelectDB')}">{$lang->cmd_back}</a></span>
<p style="text-align:right"><a href="#advanced" data-toggle style="text-decoration:underline">{$lang->advanced_setup}</a></p>
<div id="advanced" style="display:none">
<div class="x_control-group">
<label for="dbHostName" class="x_control-label"><strong>*</strong> {$lang->db_hostname}</label>
<div class="x_controls"><input name="db_hostname" value="localhost" type="text" id="dbHostName" required /></div>
</div>
<div class="fRight">
<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
<div class="x_control-group">
<label for="dbPort" class="x_control-label"><strong>*</strong> {$lang->db_port}</label>
<div class="x_controls"><input name="db_port" value="3306" type="text" id="dbPort" required /></div>
</div>
<div class="x_control-group">
<label for="dbPrefix" class="x_control-label"><strong>*</strong> {$lang->db_table_prefix}</label>
<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
</div>
<div class="desc">{$lang->db_prefix_desc}</div>
</div>
<div class="ibtnArea">
<span class="x_pull-left">
<a href="{getUrl('', 'act', 'dispInstallSelectDB')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
</span>
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-small x_btn-inverse x_disabled" id="task-db-info">{$lang->cmd_next} <i class="x_icon-chevron-right x_icon-white"></i></button>
</div>
</div>
</form>
</div>
</div>
<!--#include("footer.html")-->
<include target="footer.html" />