merge from branch luminous (version 1.5.4.2, ~r12561)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions

View file

@ -25,6 +25,15 @@
//]]></script>
</td>
</tr>
<tr>
<th scope="row">{$lang->layout}</th>
<td>
<select id="layout" name="layout_srl">
<option value="0">{$lang->notuse}</option>
<option loop="$layout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $communication_config->layout_srl">{$val->title} ({$val->layout})</option>
</select>
</td>
</tr>
<tr>
<th scope="row">{$lang->skin}</th>
<td>
@ -39,6 +48,15 @@
<th scope="row">{$lang->colorset}</th>
<td><div id="communication_colorset"></div></td>
</tr>
<tr>
<th>{$lang->mobile_layout}</th>
<td>
<select id="layout" name="mlayout_srl">
<option value="0">{$lang->notuse}</option>
<option loop="$mlayout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $communication_config->mlayout_srl">{$val->title} ({$val->layout})</option>
</select>
</td>
</tr>
<tr>
<th scope="row">{$lang->mobile_skin}</th>
<td>