merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -0,0 +1,16 @@
<!--@foreach($skin_info->colorset as $key => $val)-->
<!--@if($val->screenshot)-->
{@ $_img_info = getImageSize($val->screenshot); $_height =
$_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
<!--@else-->
{@ $_width = 200; $_height = 20; $_talign = "left"; }
<!--@end-->
<div style="display: inline-block; *display: inline; *zoom: 1; text-align: {$_talign}">
<label for="<!--@if($type == 'M')-->m<!--@end-->colorset_{$key}" class="x_inline">
<input type="radio" name="<!--@if($type == 'M')-->m<!--@end-->colorset" value="{$val->name}" id="<!--@if($type == 'M')-->m<!--@end-->colorset_{$key}" <!--@if(($type == 'M' && $config->mcolorset==$val->name) || ($type == 'P' && $config->colorset==$val->name))-->checked="checked"<!--@end-->/>{$val->title}
</label>
<!--@if($val->screenshot)-->
<br /> <img src="../../../{$val->screenshot}" alt="{$val->title}" style="border: 1px solid #888888; padding: 2px; margin: 2px;" />
<!--@end-->
</div>
<!--@end-->

View file

@ -1,35 +1,50 @@
<h1 class="h1">{$lang->message} {$lang->cmd_management}</h1>
<load target="js/config.js" />
<div class="x_page-header">
<h1>
{$lang->message}
<a href="#aboutSkin" class="x_icon-question-sign" data-toggle>{$lang->help}</a>
</h1>
</div>
<p class="x_alert x_alert-info" id="aboutSkin" hidden>{$lang->about_skin}</p>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/message/tpl/config/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="./" method="post" class="form">
<form action="./" method="post" class="x_form-horizontal">
<input type="hidden" name="module" value="message" />
<input type="hidden" name="act" value="procMessageAdminInsertConfig" />
<p>{$lang->about_skin}</p>
<ul>
<li>
<p class="q"><label for="skin">{$lang->skin}</label></p>
<p class="a">
<select name="skin" id="skin">
<!--@foreach($skin_list as $key => $val)-->
<option value="{$key}" <!--@if($key==$config->skin)-->selected="selected"<!--@end-->>{$val->title}</option>
<!--@end-->
</select>
</p>
</li>
<li>
<p class="q"><label for="mskin">{$lang->mobile_skin}</label></p>
<p class="a">
<select name="mskin" id="mskin">
<!--@foreach($mskin_list as $key => $val)-->
<option value="{$key}" <!--@if($key==$config->mskin)-->selected="selected"<!--@end-->>{$val->title}</option>
<!--@end-->
</select>
</p>
</li>
</ul>
<input type="hidden" name="xe_validator_id" value="modules/message/tpl/config/1" />
<div class="x_control-group">
<label for="skin" class="x_control-label">{$lang->skin}</label>
<div class="x_controls">
<select name="skin" id="skin" style="width:auto" onchange="doGetSkinColorset(this.options[this.selectedIndex].value)">
<option loop="$skin_list => $key, $val" value="{$key}" selected="selected"|cond="$key == $config->skin">{$val->title}</option>
</select>
</div>
</div>
<div id="colorset" class="x_control-group" style="display:none">
<label class="x_control-label" for="message_colorset">{$lang->colorset}</label>
<div class="x_controls">
<div id="message_colorset"></div>
</div>
</div>
<div class="x_control-group">
<label for="mskin" class="x_control-label">{$lang->mobile_skin}</label>
<div class="x_controls">
<select name="mskin" id="mskin" style="width:auto" onchange="doGetSkinColorset(this.options[this.selectedIndex].value, 'M')">
<option loop="$mskin_list => $key, $val" value="{$key}" selected="selected"|cond="$key == $config->mskin">{$val->title}</option>
</select>
</div>
</div>
<div id="mcolorset" class="x_control-group" style="display:none">
<label class="x_control-label" for="message_mcolorset">{$lang->colorset}</label>
<div class="x_controls">
<div id="message_mcolorset"></div>
</div>
</div>
<div class="btnArea">
<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
<button class="x_btn x_btn-primary" type="submit">{$lang->cmd_registration}</button>
</div>
</form>

View file

@ -0,0 +1,45 @@
function doGetSkinColorset(skin, type) {
type = type == 'M' ? 'M' : 'P';
var params = {
'skin' : skin,
'type': type,
};
var response_tags = [ 'error', 'message', 'tpl' ];
function on_complete(ret) {
var $container = jQuery('#colorset');
if(type == 'M'){
$container = jQuery('#mcolorset');
}
var old_h = $container.is(':visible') ? $container.outerHeight() : 0;
if(ret.tpl == ''){
$container.hide();
}else{
$container.show();
var $colorset = jQuery('#message_colorset');
if(type == 'M'){
$colorset = jQuery('#message_mcolorset');
}
$colorset.html(ret.tpl);
}
var new_h = $container.is(':visible') ? $container.outerHeight() : 0;
try {
fixAdminLayoutFooter(new_h - old_h)
} catch (e) {};
}
exec_xml('message', 'getMessageAdminColorset', params, on_complete, response_tags);
}
jQuery(function($){
doGetSkinColorset($('#skin').val());
doGetSkinColorset($('#mskin').val(), 'M');
});