merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -1,10 +0,0 @@
<filter name="introduce" module="install" act="procInstallAgreement">
<form>
<node target="lgpl_agree" required="true" />
<node target="enviroment_gather" required="false" />
</form>
<response callback_func="completeAgreement">
<tag name="error" />
<tag name="message" />
</response>
</filter>

View file

@ -4,11 +4,7 @@
<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" /> <!-- UX/Remove -->
<input type="hidden" name="lgpl_agree" value="Y" /> <!-- UX/Remove -->
<input type="hidden" name="enviroment_gather" value="N" /> <!-- UX/Remove -->
<div class="agreement">
<div class="desc">
<ul style="list-style:none">
<li loop="$lang_supported=>$key,$val" style="position:relative; margin:0 0 4px 0">
@ -20,10 +16,10 @@
</div>
<div class="ibtnArea">
<div class="fRight">
<span class="ibtn icon"><span class="check"></span> <input type="submit" value="{$lang->cmd_next}" /></span>
<span class="ibtn icon"><span class="check"></span> <a href="{getUrl('', 'act', 'dispInstallCheckEnv')}" >{$lang->cmd_next}</a></span>
</div>
</div>
</form>
</div>
</div>
</div>
<include target="footer.html" />