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,4 +1,4 @@
<script type="text/javascript">
<script>
var preProcessingMsg = "{$lang->preprocessing}";
</script>
<div id="process" style="display:none;">
@ -14,8 +14,8 @@
<h3 class="h3">{$lang->import_step_title[99]} - {$lang->import_step_desc[99]}</h3>
<div id="status"></div>
<div class="btnArea">
<span class="btn" id="btn_continue" style="display:none;"><input type="submit" value="{$lang->cmd_continue}" /></span>
<span class="btn" id="btn_reload" style="display:block;"><input type="button" value="{$lang->cmd_reload}" onclick="location.reload(); return false;"/></span>
<input class="btn" id="btn_continue" style="display:none;" type="submit" value="{$lang->cmd_continue}" />
<input class="btn" id="btn_reload" style="display:block;" type="button" value="{$lang->cmd_reload}" onclick="location.reload()"/>
</div>
</form>
</div>