merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -10,6 +10,7 @@
<p class="q"><label for="module_category_srl">{$lang->module_category}</label></p>
<p class="a">
<select name="module_category_srl" id="module_category_srl">
<option value="" selected="selected">{$lang->keep_existing_value}</option>
<option value="0">{$lang->notuse}</option>
<!--@foreach($module_category as $key => $val)-->
<option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
@ -22,6 +23,7 @@
<p class="q"><label for="layout_srl">{$lang->layout}</label></p>
<p class="a">
<select name="layout_srl" id="layout_srl">
<option value="" selected="selected">{$lang->keep_existing_value}</option>
<option value="0">{$lang->notuse}</option>
<!--@foreach($layout_list as $key => $val)-->
<option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
@ -34,13 +36,41 @@
<p class="q"><label for="skin">{$lang->skin}</label></p>
<p class="a">
<select name="skin" id="skin">
<option value="" selected="selected">{$lang->keep_existing_value}</option>
<!--@foreach($skin_list as $key=>$val)-->
<option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='xe_board'))-->selected="selected"<!--@end-->>{$val->title}</option>
<option value="{$key}" <!--@if($module_info->skin==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
<!--@end-->
</select>
</p>
<p class="desc">{$lang->about_skin}</p>
</li>
<!--li>
<p class="q"><label for="layout_srl">{$lang->mobile_view}</label></p>
<p class="a">
<input type="checkbox" name="use_mobile" id="use_mobile" value="Y" checked="checked"|cond="$module_info->use_mobile == 'Y'" /> <label for="use_mobile">{$lang->mobile_view}</label>
<input type="checkbox" name="keep_mobile_value" id="keep_mobile_value" value="Y" checked="checked"|cond="$module_info->use_mobile == 'Y'" /> <label for="use_mobile">{$lang->mobile_view}</label>
</p>
</li-->
<li>
<p class="q"><label for="mlayout_srl">{$lang->mobile_layout}</label></p>
<p class="a">
<select name="mlayout_srl" id="layout_srl">
<option value="" selected="selected">{$lang->keep_existing_value}</option>
<option value="0">{$lang->notuse}</option>
<option loop="$mlayout_list => $key, $val" value="{$val->layout_srl}" selected="selected"|cond="$module_info->mlayout_srl== $val->layout_srl">{$val->title} ({$val->layout})</option>
</select>
</p>
</li>
<li>
<p class="q"><label for="mskin">{$lang->mobile_skin}</label></p>
<p class="a">
<select name="mskin" id="mskin">
<option value="" selected="selected">{$lang->keep_existing_value}</option>
<option loop="$mskin_list=> $key, $val" value="{$key}" selected="selected"|cond="$module_info->mskin== $key">{$val->title}</option>
</select>
</p>
</li>
<li>
<p class="q"><label for="description">{$lang->description}</label></p>
<p class="a">
@ -73,4 +103,4 @@
</div>
</form>
</div>
</div>