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

@ -104,7 +104,6 @@
</block>
</block>
<block cond="$var->type == 'module_srl_list'">
<p class="desc">{$var->description}</p>
<input type="hidden" name="{$id}" value="" />
<select class="modulelist_selected" size="8" multiple="multiple" style="width:290px;"></select>
<br/>
@ -232,6 +231,7 @@
<option loop="$menu_list => $key, $val" value="{$val->menu_srl}">{$val->title}</option>
</select>
</div>
<p class="desc">{$var->description}</p>
</li>
</block>
</ul>