merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -18,7 +18,7 @@
</form>
<h3 class="h3">{$lang->widget_code}</h3>
<p><textarea id="widget_code" style="width: 100%; height: 50px;" readonly="readonly"></textarea>
<p><textarea id="widget_code" rows="8" cols="42" style="width: 100%; height: 50px;" readonly="readonly"></textarea>
<include target="widget_generate_code.filebox.html" />
<include target="widget_generate_code.multilang.html" />