fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge problem fixed

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12358 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
nagoon97 2012-12-10 01:20:15 +00:00
parent 7c8c1660e7
commit 495a1c4c3d
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/menu/tpl/sitemap.html
View file

@ -120,7 +120,7 @@
<li class="ex"><button type="button" class="_edit_copy">{$lang->copy}</button></li>
<li class="ex"><button type="button" class="_edit_paste" disabled>{$lang->paste}</button></li>
<li class="ex"><button type="button" class="_deleteMenu">{$lang->cmd_delete}</button></li>
<li class="homepage"><label style="padding:0 0 0 8px;margin:0"><input type="checkbox" class="_chkUseAsHome"> {$lang->use_site_default_module}</label></li>
<li class="homepage"><label style="padding:0 0 0 8px;margin:0"><input type="checkbox" class="_chkUseAsHome switch"><i></i> {$lang->use_site_default_module}</label></li>
<li><a href="#imgbtn" data-admin-show="#imgbtn">{$lang->menu_img_btn} <i class="x_icon-circle-arrow-right"></i></a></li>
<li><a href="#design" data-admin-show="#design">{$lang->design} <i class="x_icon-circle-arrow-right"></i></a></li>
<li><a href="#auth" data-admin-show="#auth">{$lang->grant} <i class="x_icon-circle-arrow-right"></i></a></li>
@ -402,8 +402,8 @@
<form action="">
<h1>{$lang->layout}</h1>
<div class="cnt">
<label>
<input type="checkbox" class="_chkUseDefaultLayout" title="{$lang->use_site_default_layout}"> {$lang->use_site_default_layout}
<label style="padding-right:40px;white-space:nowrap;cursor:pointer">
<input type="checkbox" class="_chkUseDefaultLayout switch" title="{$lang->use_site_default_layout}"><i></i> {$lang->use_site_default_layout}
<a href="?module=admin&act=dispMenuAdminSiteDesign" class="x_icon-cog _siteDesignSetupLink">{$lang->site_default_layout_settings}</a>
</label>
<div class="list">
@ -411,7 +411,7 @@
<script id="tmpl_layout_list_item_no_layout" type="text/x-jquery-tmpl">
<li class="${Selected} _layoutItem">
<label>
<input type="radio" name="layout_item" title="{$lang->no_use_layout}"> {$lang->no_use_layout}
<input type="radio" name="layout_item" title="{$lang->no_use_layout}" class="switch"><i></i> {$lang->no_use_layout}
</label>
</li>
</script>
@ -2550,7 +2550,6 @@ jQuery(function($){
$('#design').removeClass('_mobile_view_disabled').find('.mvOption>:checkbox').attr('checked','checked');
}
//console.log(htDesign);
updateSelectedDesign(htDesign);
});
<!--@end-->
@ -2844,14 +2843,12 @@ jQuery(function($){
default:
sLayoutTitle = htDesign.sLayoutTitle;
}
//console.log(htDesign);
var sSkinTitle = htDesign.sSkinTitle;
var sSkinName = htDesign.sSkinName;
if(sSkinName == ""){
var sModuleType = htDesign.sModuleName==="page"?"ARTICLE":htDesign.sModuleName;
if($._xeAdminVar.htItemTypes[sModuleType]){
//console.log($._xeAdminVar.htItemTypes[sModuleType]);
if(sMode === "P"){
sSkinTitle = $._xeAdminVar.htItemTypes[sModuleType].defaultSkin.title;
}else{
@ -2861,13 +2858,13 @@ jQuery(function($){
}
$('#design ._layoutName').html(sLayoutTitle);
<!--@if($act == 'dispMenuAdminSiteMap')-->
$('#design ._skinTitle').html(sSkinTitle);
<!--@end-->
<!--@if($act == 'dispMenuAdminSiteDesign')-->
$('#design .active ._skinTitle').html(sSkinTitle);
<!--@end-->
updatePreview(htDesign);
}
@ -2904,6 +2901,12 @@ jQuery(function($){
});
$('#layout ._chkUseDefaultLayout').click(function(){
var $this = $(this);
if($this.is(':checked')){
$this.attr('checked','checked').parent().css('fontWeight','bold');
} else {
$this.removeAttr('checked').parent().css('fontWeight','normal');
}
updateLayoutListDisplayStatus();
});
$("#tmpl_layout_list_item_no_layout").template( "layoutListItem_nolayout" );
@ -2919,9 +2922,9 @@ jQuery(function($){
var sMode = $._xeAdminVar.htPrevSetting.bMobilePreviewTabOpen?"M":"P";
if(htDesign.sLayoutSrl == -1){
$('._chkUseDefaultLayout').attr('checked', 'checked');
$('._chkUseDefaultLayout').attr('checked', 'checked').parent().css('fontWeight','bold');
}else{
$('._chkUseDefaultLayout').removeAttr('checked');
$('._chkUseDefaultLayout').removeAttr('checked').parent().css('fontWeight','normal');
}
//updateLayoutListDisplayStatus();
@ -3107,8 +3110,8 @@ jQuery(function($){
$('#layout').on('click', 'input[name=layout_item]', function(){
$('#layout').nextAll().hide();
$('#layout').find('li.selected').removeClass('selected');
$(this).closest('li').addClass('selected');
$('#layout').find('li.selected').removeClass('selected').find('input[name="layout_item"]').removeAttr('checked');
$(this).attr('checked','checked').closest('li').addClass('selected');
var sMode = $._xeAdminVar.htPrevSetting.bMobilePreviewTabOpen?"M":"P";
@ -3873,4 +3876,4 @@ jQuery.extend({
}
});
//]]>
</script>
</script>