fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-26 14:49:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.3 (~r10943)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -105,7 +105,7 @@ html{height:100%;background:url(../img/bgHtml.gif) repeat-x 0 0}
.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}
.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 strong{color:#F60}
.agreement{color:#eee}

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

@ -17,7 +17,7 @@
<li><label for="dbPort">{$lang->db_port}</label><input name="db_port" value="33000" 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_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></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>
<div class="desc">{$lang->db_info_desc}</div>

2
modules/install/tpl/form.firebird.html
View file

@ -17,7 +17,7 @@
<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_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></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>
<div class="desc">{$lang->db_info_desc}</div>

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

@ -17,7 +17,7 @@
<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_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></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>
<div class="desc">{$lang->db_info_desc}</div>

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

@ -17,7 +17,7 @@
<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_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></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>
<div class="desc">{$lang->db_info_desc}</div>

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

@ -17,7 +17,7 @@
<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_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></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>
<div class="desc">{$lang->db_info_desc}</div>

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

@ -17,7 +17,7 @@
<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_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></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>
<div class="desc">{$lang->db_info_desc}</div>

2
modules/install/tpl/form.postgresql.html
View file

@ -17,7 +17,7 @@
<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_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></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>
<div class="desc">{$lang->db_info_desc}</div>

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

@ -1,4 +1,4 @@
<!--%import("./css/install.css")-->
<load target="./css/install.css" />
<div id="xei">
<div id="header">
<h1><img src="img/xe.gif" width="163" height="26" alt="Xpress Engine" /></h1>

42
modules/install/tpl/introduce.html
View file

@ -1,39 +1,29 @@
<!--%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")-->
<include target="progress_menu.html" />
<span class="dummy"></span>
<div id="content">
<form action="./" class="agreement" method="post">
<input type="hidden" name="module" value="install" />
<input type="hidden" name="act" value="procInstallAgreement" />
<input type="hidden" id="agree_license_text" value="{$lang->install_license_desc['lgpl']}" />
<input type="hidden" name="module" value="install" />
<input type="hidden" name="act" value="procInstallAgreement" /> <!-- UX/Remove -->
<input type="hidden" name="lgpl_agree" value="Y" /> <!-- UX/Remove -->
<input type="hidden" name="enviroment_gather" value="N" /> <!-- UX/Remove -->
<div class="desc">
<p><input type="checkbox" name="lgpl_agree" value="Y" class="iCheck" id="lgpl" /> <label for="lgpl">{$lang->lgpl_agree}</label> - <a href="{$lang->lgpl_license_url}" target="_blank">{$lang->read_all}</a></p>
<p>{$lang->license_agreement_desc}</p>
</div>
<div class="desc">
<p><input type="checkbox" name="enviroment_gather" value="Y" class="iCheck" id="env" /> <label for="env">{$lang->install_env_agreement}</label></p>
<p>{$lang->install_env_agreement_desc}</p>
<ul style="list-style:none">
<li loop="$lang_supported=>$key,$val" style="position:relative; margin:0 0 4px 0">
<i cond="$l==$key" style="position:absolute;top:0;left:-16px;font-style:normal;font-weight:bold;color:red" title="Selected Language">&#10004;</i>
<a href="{getUrl('l', $key)}" cond="$l!=$key">{$val}</a>
<strong cond="$l==$key">{$val}</strong>
</li>
</ul>
</div>
<div class="ibtnArea">
<div class="fLeft">
<div class="select open" style="width:160px;">
<span class="ctrl"><span class="arrow"></span></span>
<button type="button" class="myValue selected">{$lang_supported[Context::getLangType()]}</button>
<div class="aList" style="bottom:20px;top:auto">
<ul>
<li loop="$lang_supported=>$key,$val"><a href="{getUrl('l', $key)}">{$val}</a></li>
</ul>
</div>
</div>
</div>
<div class="fRight">
<span class="ibtn icon"><span class="check"></span> <input type="submit" value="{$lang->cmd_agree_license}" /></span>
<span class="ibtn icon"><span class="check"></span> <input type="submit" value="{$lang->cmd_next}" /></span>
</div>
</div>
</form>
</div>
</div>
<!--#include("footer.html")-->
<include target="footer.html" />

10
modules/install/tpl/js/install.js
View file

@ -1,14 +1,4 @@
jQuery(function($){
// Agreement
var agree = $('.agreement');
agree.submit(function(){
if($('#lgpl:checked').length==0){
alert($('#agree_license_text').val());
$('#lgpl').focus();
return false;
}
});
// Input Clear
var iText = $('.item>.iLabel').next('.iText');
$('.item>.iLabel').css('position','absolute');

22
modules/install/tpl/progress_menu.html
View file

@ -1,11 +1,11 @@
<div id="progress">
<ul>
<li <!--@if($act=='')-->class="active"<!--@end-->>{$lang->install_progress_menu['agree']}</li>
<li <!--@if($act=='dispInstallCheckEnv')-->class="active"<!--@end-->>{$lang->install_progress_menu['condition']}</li>
<li <!--@if($act=='dispInstallSelectDB' && $progressMenu == '3')-->class="active"<!--@end-->>{$lang->install_progress_menu['ftp']}</li>
<li <!--@if($act=='dispInstallSelectDB' && $progressMenu == '4')-->class="active"<!--@end-->>{$lang->install_progress_menu['dbSelect']}</li>
<li <!--@if($act=='dispInstallDBForm')-->class="active"<!--@end-->>{$lang->install_progress_menu['dbInfo']}</li>
<li <!--@if($act=='dispInstallConfigForm')-->class="active"<!--@end-->>{$lang->install_progress_menu['configInfo']}</li>
<li <!--@if($act=='dispInstallManagerForm')-->class="active"<!--@end-->>{$lang->install_progress_menu['adminInfo']}</li>
</ul>
</div>
<div id="progress">
<ul>
<li class="active"|cond="$act==''">{$lang->install_progress_menu['language']}</li>
<li class="active"|cond="$act=='dispInstallCheckEnv'">{$lang->install_progress_menu['condition']}</li>
<li class="active"|cond="$act=='dispInstallSelectDB' && $progressMenu == '3'">{$lang->install_progress_menu['ftp']}</li>
<li class="active"|cond="$act=='dispInstallSelectDB' && $progressMenu == '4'">{$lang->install_progress_menu['dbSelect']}</li>
<li class="active"|cond="$act=='dispInstallDBForm'">{$lang->install_progress_menu['dbInfo']}</li>
<li class="active"|cond="$act=='dispInstallConfigForm'">{$lang->install_progress_menu['configInfo']}</li>
<li class="active"|cond="$act=='dispInstallManagerForm'">{$lang->install_progress_menu['adminInfo']}</li>
</ul>
</div>