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,28 +1,57 @@
<!--#include("header.html")-->
<div id="body">
<!--#include("progress_menu.html")-->
<span class="dummy"></span>
<include target="header.html" />
<div id="body">
<include target="progress_menu.html" />
<div id="content">
<div class="table">
<table border="1" cellspacing="0">
<tbody>
<!--@foreach($checklist as $key => $val)-->
<tr>
<th scope="row">{$lang->install_checklist_title[$key]}<!--@if($key == 'php_version')--> (Ver. {$phpversion})<!--@end--></th>
<td><!--@if($val)-->{$lang->enable}<!--@else--><strong>{$lang->disable}</strong><br />{$lang->install_checklist_desc[$key]}<!--@end--></td>
</tr>
<!--@end-->
</tbody>
</table>
<ul>
<li loop="$checklist => $key,$val" cond="!$val">
{@ $isDisable = TRUE}
<strong>{$lang->install_checklist_title[$key]}<block cond="$key == 'php_version'">(Ver. {$phpversion})</block></strong>
:
<em><i class="x_icon-ban-circle x_icon-white"></i> {$lang->disable}</em>
<p>{$lang->install_checklist_desc[$key]}</p>
</li>
</ul>
<div cond="!$isDisable">
<p>
<i class="x_icon-ok-sign x_icon-white"></i>
<strong>XE {__XE_VERSION__}</strong> {$lang->install_condition_enable}
&rsaquo;
<a href="#details" data-toggle style="text-decoration:underline">{$lang->install_details}</a>
</p>
<ul id="details" style="display:none;outline:none">
<li loop="$checklist => $key,$val">
<strong>{$lang->install_checklist_title[$key]}<block cond="$key == 'php_version'">(Ver. {$phpversion})</block></strong>
:
<em>{$lang->enable}</em>
</li>
</ul>
</div>
<div cond="$use_rewrite == 'N'">
<p>
<i class="x_icon-ok-sign x_icon-white"></i>
{$lang->disable_rewrite}
</p>
</div>
<div class="ibtnArea">
<div class="fLeft">
<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('')}">{$lang->cmd_back}</a></span>
</div>
<div class="fRight">
<span class="ibtn icon"><span class="check"></span><!--@if($install_enable)--><a href="{getUrl('','act','dispInstallSelectDB')}">{$lang->cmd_install_next}</a><!--@else--><a href="{getUrl('','act',$act)}">{$lang->cmd_install_fix_checklist}</a><!--@end--></span>
</div>
<span class="x_pull-left">
<a href="{getUrl('')}" 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">
<a cond="$install_enable" class="x_btn x_btn-small x_btn-inverse" id="task-checklist-confirm" href="{getUrl('','act','dispInstallSelectDB')}">{$lang->cmd_install_next} <i class="x_icon-chevron-right x_icon-white"></i></a>
<a cond="!$install_enable" class="x_btn x_btn-small x_btn-inverse" id="task-checklist-fix" href="{getUrl('','act',$act)}">{$lang->cmd_install_fix_checklist} <i class="x_icon-chevron-right x_icon-white"></i></a>
</span>
</div>
</div>
<!--#include("footer.html")-->
<include target="footer.html" />
<script>
jQuery(function($){
$('a[href="#details"]').click(function(){
var $this = $(this);
if($($this.attr('href')).is(':hidden')){
$this.text('{$lang->install_simply}');
}else{
$this.text('{$lang->install_details}');
}
});
});
</script>