Issue 2564 fixed.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11635 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-10-08 10:29:27 +00:00
parent 14fb2dc934
commit 683b48658e
4 changed files with 56 additions and 30 deletions

View file

@ -65,6 +65,10 @@
<value xml:lang="ko"><![CDATA[자세히]]></value>
<value xml:lang="en"><![CDATA[Details]]></value>
</item>
<item name="install_ftp_reason">
<value xml:lang="ko"><![CDATA[FTP 정보를 등록하는 이유.]]></value>
<value xml:lang="en"><![CDATA[Reason of FTP info is needed.]]></value>
</item>
<item name="install_checklist_title" type="array">
<item name="php_version">
<value xml:lang="ko"><![CDATA[PHP Version]]></value>

View file

@ -10,10 +10,11 @@ em, address {font-style:normal}
button{margin:0;padding:0;overflow:visible;cursor:pointer}
a {text-decoration:none}
a:hover, a:active, a:focus {text-decoration:underline}
/* Common Class */
.iText{border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent}
.iCheck, .iRadio{width:13px;height:13px;margin:0;padding:0;vertical-align:middle}
.hide{position:absolute;left:0;top:0;width:1px;height:1px;font-size:0;line-height:0;visibility:hidden}
/* Bootstrap Override */
.x label[for],
.x .x_form-horizontal .x_control-label{font-weight: bold}
.x ol,
.x ul{margin-top:15px;margin-bottom:15px}
/* Layout */
#xei{width:800px;margin:0 auto;padding:120px 0 0 0}
#xei #header{position:relative;background:#444;margin:0 0 1px 0;padding:10px 20px;color:#fff;border-radius:5px 5px 0 0}
@ -104,8 +105,7 @@ a:hover, a:active, a:focus {text-decoration:underline}
.form strong{color:#f60}
.form em{font-style:normal;color:#ffc}
.form a{color:#fff;text-decoration:underline}
.desc{padding:10px 20px;margin:0 20px 20px 20px;background:#555;color:#eee;line-height:1.5}
.desc ul{margin:0 0 0 20px;padding:0}
.desc{padding:10px 20px;margin:15px 0;background:#555;color:#fff;line-height:1.5;border-radius:5px}
.desc strong{color:#F60}
.language{list-style:none;margin:0;padding:0 0 0 20px}
.language li{position:relative;margin:0 0 7px 0}

View file

@ -3,21 +3,44 @@
<div id="body">
<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>
@ -25,14 +48,13 @@
<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>

View file

@ -120,7 +120,7 @@ function completeGetFtpInfo(ret_obj)
arr.pop();
arr.push("");
target = arr.join("/");
list = list + "<li><a href='#ftpSetup' style='color:#fff; text-decoration:underline;' onclick=\"getFTPList('"+target+"')\">../</a></li>";
list = list + "<li><a href='#ftpSetup' onclick=\"getFTPList('"+target+"')\">../</a></li>";
}
for(var i=0;i<ret_obj['list']['item'].length;i++)
@ -136,7 +136,7 @@ function completeGetFtpInfo(ret_obj)
}
else
{
list = list + "<li><a href='#ftpSetup' style='color:#fff; text-decoration:underline;' onclick=\"getFTPList('"+pwd+v+"')\">"+v+"</a></li>";
list = list + "<li><a href='#ftpSetup' onclick=\"getFTPList('"+pwd+v+"')\">"+v+"</a></li>";
}
}