fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-20 19:59:54 +09:00
Code Issues Projects Releases Packages Wiki Activity

Installation UI bug fix.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12591 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2013-01-28 02:51:08 +00:00
parent 08920ced60
commit d280100461
10 changed files with 67 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/admin/tpl/css/admin.bootstrap.css
View file

@ -24,7 +24,7 @@
.x canvas,
.x video{display:inline-block;*display:inline;*zoom:1}
.x audio:not([controls]){display:none}
.x {font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}
.x{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}
.x a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}
.x a:hover,
.x a:active{outline:0}

9
modules/install/lang/lang.xml
View file

@ -541,9 +541,14 @@
<value xml:lang="vi"><![CDATA[Tên Table]]></value>
</item>
<item name="db_info_desc">
<value xml:lang="ko"><![CDATA[<p><strong>DB 호스트 네임</strong>, <strong>DB Port</strong>, <strong>DB 아이디</strong>, <strong>DB 비밀번호</strong>, <strong>DB 이름</strong> 정보는 서버 호스팅 관리자로부터 정보를 확인 하세요.</p><p><strong>DB 테이블 머리말</strong> 정보는 사용자 정의 할 수 있습니다. 영문 소문자를 권장 합니다. 숫자를 포함할 수 있습니다. 특수 문자를 사용할 수 없습니다.</p>]]></value>
<value xml:lang="ko"><![CDATA[<p><strong>DB 아이디</strong>, <strong>DB 비밀번호</strong>, <strong>DB 이름</strong> 정보는 서버 호스팅 관리자로부터 정보를 확인 하세요.</p>]]></value>
<value xml:lang="en"><![CDATA[<p>Please check <strong>database information</strong> to server master.</p>]]></value>
　　<value xml:lang="jp"><![CDATA[<p><strong>DB ID</strong>, <strong>DB パスワード</strong>, <strong>DB 名稱</strong> 情報は、サーバーホスティング管理者に情報を確認してください。</p>]]></value>
</item>
<item name="db_prefix_desc">
<value xml:lang="ko"><![CDATA[<p><strong>DB 호스트 네임</strong>, <strong>DB Port</strong> 정보는 서버 호스팅 관리자로부터 정보를 확인 하세요.</p><p><strong>DB 테이블 머리말</strong> 정보는 사용자 정의 할 수 있습니다. 영문 소문자를 권장 합니다. 숫자를 포함할 수 있습니다. 특수 문자를 사용할 수 없습니다.</p>]]></value>
<value xml:lang="en"><![CDATA[<p>Please check <strong>database information</strong> to server master.</p><p>You can modify database <strong>table prefix</strong>, and can use small letters(small letter is recommended), and numbers, but you can not use special letters.</p>]]></value>
　　<value xml:lang="jp"><![CDATA[<p><strong>DBホスト名</strong>, <strong>DB Port</strong>, <strong>DB ID</strong>, <strong>DB パスワード</strong>, <strong>DB 名稱</strong> 情報は、サーバーホスティング管理者に情報を確認してください。</p><p><strong>DBテーブルプレフィックス</strong> 情報は、ユーザーが定義できます。英文小文字の使用を推奨します。数字を含めることができます。特殊文字は、使用できません。</p>]]></value>
　　<value xml:lang="jp"><![CDATA[<p><strong>DBホスト名</strong>, <strong>DB Port</strong> 情報は、サーバーホスティング管理者に情報を確認してください。</p><p><strong>DBテーブルプレフィックス</strong> 情報は、ユーザーが定義できます。英文小文字の使用を推奨します。数字を含めることができます。特殊文字は、使用できません。</p>]]></value>
</item>
<item name="admin_title">
<value xml:lang="ko"><![CDATA[관리자 정보]]></value>

8
modules/install/tpl/admin_form.html
View file

@ -9,25 +9,25 @@
<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">{$lang->email_address}</label>
<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">{$lang->password1}</label>
<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">{$lang->password2}</label>
<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">{$lang->nick_name}</label>
<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>

18
modules/install/tpl/css/install.css
View file

@ -2,17 +2,17 @@
/* NHN (developers@xpressengine.com) */
/* Element Reset */
html, body{margin:0;min-height:100%}
body, input, textarea, select, table, button, label{font-family:Tahoma, Geneva, sans-serif;font-size:12px}
body, .x input, .x textarea, .x select, .x table, .x button, .x label{font-family:Tahoma, Geneva, sans-serif;font-size:12px}
body{background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(#ccc), to(#fff));background:-moz-linear-gradient(top, #ccc, #fff);background:-o-linear-gradient(top, #ccc, #fff)}
img, fieldset{border:0}
form, fieldset{margin:0;padding:0}
em{color:#ffc;font-weight:normal;font-style:normal}
strong{color:#f60}
button{margin:0;padding:0;overflow:visible;cursor:pointer}
a{text-decoration:none}
a:hover,
a:active,
a:focus{text-decoration:underline}
.x em{color:#ffc;font-weight:normal;font-style:normal}
.x strong{color:#f60}
.x button{margin:0;padding:0;overflow:visible;cursor:pointer}
.x a{text-decoration:none}
.x a:hover,
.x a:active,
.x a:focus{text-decoration:underline}
/* Bootstrap Override */
.x label[for],
.x .x_form-horizontal .x_control-label{font-weight:bold}
@ -26,7 +26,7 @@ a:focus{text-decoration:underline}
.x .x_control-group:first-child,
.x .x_control-group:first-of-type{border-top:0;padding-top:0}
/* Layout */
.x{width:800px;margin:0 auto;padding:120px 0 0 0}
.x{width:800px;margin:120px auto 0 auto;background-color:transparent}
.x #header{position:relative;background:#444;margin:0 0 1px 0;padding:10px 20px;color:#fff;border-radius:5px 5px 0 0}
.x #header h1{margin:0}
.x #header em{position:absolute;bottom:10px;right:20px;font-weight:bold;font-size:14px;color:#eee}

17
modules/install/tpl/form.cubrid.html
View file

@ -12,32 +12,33 @@
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>
<div class="x_control-group">
<label for="dbId" class="x_control-label">{$lang->db_userid}</label>
<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">{$lang->db_password}</label>
<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">{$lang->db_name}</label>
<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>
<p style="text-align:right"><a href="#advanced" data-toggle>{$lang->advanced_setup}</a></p>
<div class="desc">{$lang->db_info_desc}</div>
<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">{$lang->db_hostname}</label>
<label for="dbHostName" class="x_control-label"><strong>*</strong> {$lang->db_hostname}</label>
<div class="x_controls"><input name="db_hostname" value="127.0.0.1" type="text" id="dbHostName" required /></div>
</div>
<div class="x_control-group">
<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
<label for="dbPort" class="x_control-label"><strong>*</strong> {$lang->db_port}</label>
<div class="x_controls"><input name="db_port" value="33000" type="text" id="dbPort" required /></div>
</div>
<div class="x_control-group">
<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
<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_info_desc}</div>
<div class="desc">{$lang->db_prefix_desc}</div>
</div>
<div class="ibtnArea">
<span class="x_pull-left">

17
modules/install/tpl/form.mssql.html
View file

@ -12,32 +12,33 @@
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>
<div class="x_control-group">
<label for="dbId" class="x_control-label">{$lang->db_userid}</label>
<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">{$lang->db_password}</label>
<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">{$lang->db_name}</label>
<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>
<p style="text-align:right"><a href="#advanced" data-toggle>{$lang->advanced_setup}</a></p>
<div class="desc">{$lang->db_info_desc}</div>
<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">{$lang->db_hostname}</label>
<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="x_control-group">
<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
<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">{$lang->db_table_prefix}</label>
<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_info_desc}</div>
<div class="desc">{$lang->db_prefix_desc}</div>
</div>
<div class="ibtnArea">
<span class="x_pull-left">

17
modules/install/tpl/form.mysql.html
View file

@ -12,32 +12,33 @@
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>
<div class="x_control-group">
<label for="dbId" class="x_control-label">{$lang->db_userid}</label>
<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">{$lang->db_password}</label>
<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">{$lang->db_name}</label>
<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>
<p style="text-align:right"><a href="#advanced" data-toggle>{$lang->advanced_setup}</a></p>
<div class="desc">{$lang->db_info_desc}</div>
<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">{$lang->db_hostname}</label>
<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="x_control-group">
<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
<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">{$lang->db_table_prefix}</label>
<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_info_desc}</div>
<div class="desc">{$lang->db_prefix_desc}</div>
</div>
<div class="ibtnArea">
<span class="x_pull-left">

17
modules/install/tpl/form.mysql_innodb.html
View file

@ -12,32 +12,33 @@
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>
<div class="x_control-group">
<label for="dbId" class="x_control-label">{$lang->db_userid}</label>
<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">{$lang->db_password}</label>
<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">{$lang->db_name}</label>
<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>
<p style="text-align:right"><a href="#advanced" data-toggle>{$lang->advanced_setup}</a></p>
<div class="desc">{$lang->db_info_desc}</div>
<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">{$lang->db_hostname}</label>
<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="x_control-group">
<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
<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">{$lang->db_table_prefix}</label>
<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_info_desc}</div>
<div class="desc">{$lang->db_prefix_desc}</div>
</div>
<div class="ibtnArea">
<span class="x_pull-left">

17
modules/install/tpl/form.mysqli.html
View file

@ -12,32 +12,33 @@
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>
<div class="x_control-group">
<label for="dbId" class="x_control-label">{$lang->db_userid}</label>
<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">{$lang->db_password}</label>
<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">{$lang->db_name}</label>
<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>
<p style="text-align:right"><a href="#advanced" data-toggle>{$lang->advanced_setup}</a></p>
<div class="desc">{$lang->db_info_desc}</div>
<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">{$lang->db_hostname}</label>
<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="x_control-group">
<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
<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">{$lang->db_table_prefix}</label>
<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_info_desc}</div>
<div class="desc">{$lang->db_prefix_desc}</div>
</div>
<div class="ibtnArea">
<span class="x_pull-left">

2
modules/install/tpl/header.html
View file

@ -1,4 +1,4 @@
<load target="../../../common/css/bootstrap.min.css" />
<load target="../../../modules/admin/tpl/css/admin.bootstrap.min.css" />
<load target="./css/install.css" />
<div class="x">
<div id="header">