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,25 +1,46 @@
<!--%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">
<form action="./" method="post" onsubmit="return doInstallFTPInfo(this);" id="ftp_form">
<ul class="form formFtp">
<li><label for="ftphost">{$lang->ftp_host}</label><input name="ftp_host" value="10.25.80.77" type="text" id="ftphost" class="iText" /></li>
<li><label for="ftpid">{$lang->user_id}</label><input name="ftp_user" type="text" id="ftpid" class="iText" /></li>
<li><label for="ftppw">{$lang->password}</label><input name="ftp_password" type="password" id="ftppw" class="iText" /></li>
<li><label for="ftpport">{$lang->ftp_port}</label><input name="ftp_port" type="text" id="ftpport" class="iText" /></li>
<li><label for="ftppath">{$lang->msg_ftp_installed_ftp_realpath}</label><input name="ftp_root_path" value="{$ftp_info->ftp_root_path}" type="text" id="ftppath" class="iText" />
<div class="desc" style="margin:1em 0; position:relative;"><p style="margin:1em 0;">{$lang->msg_ftp_installed_realpath}:<br/> {_XE_PATH_}</p>
<span class="ibtn" style="position:absolute; top:1em; right:1em;"><button type="button" onclick="getFTPList(); return false;">{$lang->ftp_get_list}</button></span>
<ul id="ftplist">
</ul>
</div></li>
</ul>
<form action="./" method="post" onsubmit="return doInstallFTPInfo(this);" id="ftp_form" class="x_form-horizontal">
<div class="x_control-group">
<label for="ftphost" class="x_control-label">{$lang->ftp_host}</label>
<div class="x_controls">
<input name="ftp_host" value="10.25.80.77" type="text" id="ftphost" />
</div>
</div>
<div class="x_control-group">
<label for="ftpid" class="x_control-label">{$lang->user_id}</label>
<div class="x_controls">
<input name="ftp_user" type="text" id="ftpid" />
</div>
</div>
<div class="x_control-group">
<label for="ftppw" class="x_control-label">{$lang->password}</label>
<div class="x_controls">
<input name="ftp_password" type="password" id="ftppw" />
</div>
</div>
<div class="x_control-group">
<label for="ftpport" class="x_control-label">{$lang->ftp_port}</label>
<div class="x_controls">
<input name="ftp_port" type="text" id="ftpport" />
</div>
</div>
<div class="x_control-group">
<label for="ftppath" class="x_control-label">{$lang->msg_ftp_installed_ftp_realpath}</label>
<div class="x_controls">
<input name="ftp_root_path" value="{$ftp_info->ftp_root_path}" type="text" id="ftppath" />
<p>{$lang->msg_ftp_installed_realpath}:<br/> {_XE_PATH_}</p>
<button type="button" class="x_btn x_btn-small" id="task-ftp-list" onclick="getFTPList();return false;"><i class="x_icon-list"></i> {$lang->ftp_get_list}</button>
<ul id="ftplist">
</ul>
<button type="button" class="x_btn x_btn-small x_btn-inverse" id="task-ftp-check" onclick="doCheckFTPInfo();return false"><i class="x_icon-resize-vertical x_icon-white"></i> {$lang->cmd_check_ftp_connect}</button>
</div>
</div>
<div class="desc">
<p>FTP 정보를 등록하는 이유.</p>
<p>{$lang->install_ftp_reason}</p>
<ul>
<li>{$lang->msg_safe_mode_ftp_needed}</li>
<li>{$lang->msg_safe_mode_ftp_needed2}</li>
@ -27,16 +48,15 @@
<p>{$lang->msg_safe_mode_ftp_config}</p>
</div>
<div class="ibtnArea">
<div class="fLeft">
<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallCheckEnv')}">{$lang->cmd_back}</a></span>
</div>
<div class="fRight">
<span class="ibtn"><input name="" type="submit" value="{$lang->cmd_pass_step}" /></span>
<span class="ibtn icon"><span class="monitor"></span> <button type="button" onclick="doCheckFTPInfo(); return false;">{$lang->cmd_check_ftp_connect}</button></span>
<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
</div>
<span class="x_pull-left">
<a href="{getUrl('', 'act', 'dispInstallCheckEnv')}" 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" id="task-ftp-skip">{$lang->cmd_pass_step} <i class="x_icon-chevron-right x_icon-white"></i></button>
<button type="submit" class="x_btn x_btn-small x_btn-inverse" id="task-ftp-confirm">{$lang->cmd_next} <i class="x_icon-chevron-right x_icon-white"></i></button>
</span>
</div>
</form>
</div>
</div>
<!--#include("footer.html")-->
<include target="footer.html" />