merge from branch 1.5.3.2 (~r11282)

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-19 07:56:40 +00:00
commit 9f5e25a15e
136 changed files with 414 additions and 317 deletions

View file

@ -20,7 +20,7 @@
</select>
<select name="editor_colorset" id="sel_editor_colorset" style="display:none">
</select>
<script>//<![CDATA[
<script type="text/javascript">//<![CDATA[
getEditorSkinColorList('{$communication_config->editor_skin}','{$communication_config->editor_colorset}');
//]]></script>
</td>
@ -53,6 +53,6 @@
<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
</div>
</form>
<script>
<script type="text/javascript">
jQuery(function() { doGetSkinColorset("{$communication_config->skin}"); });
</script>