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

fixed an error in site design saving function on IE

Browse source 
alert pop-up design change



git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12606 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
nagoon97 2013-01-29 08:24:39 +00:00
parent d50fa66b7f
commit eafb2a9a8f
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/admin/tpl/css/admin.css
View file

@ -191,7 +191,9 @@ body>.x,
.x_modal._common {width:600px;margin-left:-300px} .x_modal._common {width:600px;margin-left:-300px}
.x_modal._common._small{width:400px;margin-left:-200px} .x_modal._common._small{width:400px;margin-left:-200px}
.x_modal._common._nobody .x_modal-body, .x_modal._common._nobody .x_modal-body,
.x_modal._common._type_alert .x_modal-header,
.x_modal._common._type_alert ._cancel{display:none} .x_modal._common._type_alert ._cancel{display:none}
.x_modal._common._type_alert .x_modal-body{border-radius:6px 6px 0 0;}
.x_modal._common._nobody .x_modal-footer{border-top:0} .x_modal._common._nobody .x_modal-footer{border-top:0}
.x_modal-body.showTree .moveList{float:left;width:60%} .x_modal-body.showTree .moveList{float:left;width:60%}
.x_modal-body.showTree .moveTree{display:block !important;float:right;width:38%} .x_modal-body.showTree .moveTree{display:block !important;float:right;width:38%}

4
modules/admin/tpl/js/admin.js
View file

@ -1106,12 +1106,12 @@ jQuery(function($){
this.showMsgBox(htOptions); this.showMsgBox(htOptions);
} }
$.xeMsgBox.alert = function(sTitle){ $.xeMsgBox.alert = function(sText){
htOptions = { htOptions = {
bAlert : true, bAlert : true,
bNobody : true, bNobody : true,
bSmall: true, bSmall: true,
sTitle : sTitle sText : sText
}; };
this.showMsgBox(htOptions); this.showMsgBox(htOptions);

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

@ -1141,7 +1141,7 @@ function clearInputs($elm){
function setItemTypes(htTypes){ function setItemTypes(htTypes){
var $ = jQuery; var $ = jQuery;
$.test=htTypes;
$._xeAdminVar.htItemTypes = htTypes || {}; $._xeAdminVar.htItemTypes = htTypes || {};
$._xeAdminVar.htItemTypes._SHORTCUT = { $._xeAdminVar.htItemTypes._SHORTCUT = {
@ -2749,19 +2749,18 @@ jQuery(function($){
$._xeAdminVar.sOpenDeisgnWith = "P"; $._xeAdminVar.sOpenDeisgnWith = "P";
//}); //});
}); });
$('#design ._btn_save').click(function(ev){ $('#design ._btn_save').click(function(ev){
ev.preventDefault(); ev.preventDefault();
var sMode = $._xeAdminVar.htPrevSetting.bMobilePreviewTabOpen?"M":"P"; var sMode = $._xeAdminVar.htPrevSetting.bMobilePreviewTabOpen?"M":"P";
//var sLayoutSrl = $._xeAdminVar.htSelectedMenuDesign.htLayoutSrl[sMode]; //var sLayoutSrl = $._xeAdminVar.htSelectedMenuDesign.htLayoutSrl[sMode];
var htDesign = $._xeAdminVar.htSelectedMenuDesign; var htDesign = $._xeAdminVar.htSelectedMenuDesign;
var htSkins = {}; var htSkins = {};
var item;
for(var sModuleName in $._xeAdminVar.htItemTypes){ for(var sModuleName in $._xeAdminVar.htItemTypes){
if(! $._xeAdminVar.htItemTypes.hasOwnProperty(sModuleName)) continue; if(! $._xeAdminVar.htItemTypes.hasOwnProperty(sModuleName)) continue;
if(sModuleName === "_SHORTCUT") continue; if(sModuleName === "_SHORTCUT") continue;
item = $._xeAdminVar.htItemTypes[sModuleName]; item = $._xeAdminVar.htItemTypes[sModuleName];
sModuleTitle = item.title; sModuleTitle = item.title;
@ -2774,7 +2773,7 @@ jQuery(function($){
target_type : sMode, target_type : sMode,
module_skin : $.stringify(htSkins) module_skin : $.stringify(htSkins)
}; };
//console.log(htParam); //console.log(htParam);
jQuery.exec_json("admin.procAdminInsertDefaultDesignInfo", htParam, function(htData){ jQuery.exec_json("admin.procAdminInsertDefaultDesignInfo", htParam, function(htData){
@ -3508,7 +3507,6 @@ jQuery(function($){
$._xeAdminVar.htItemTypes[$._htMarkupActionParam.moduleType].defaultMobileSkin.skin = sSkinName; $._xeAdminVar.htItemTypes[$._htMarkupActionParam.moduleType].defaultMobileSkin.skin = sSkinName;
$._xeAdminVar.htItemTypes[$._htMarkupActionParam.moduleType].defaultMobileSkin.title = sSkinTitle; $._xeAdminVar.htItemTypes[$._htMarkupActionParam.moduleType].defaultMobileSkin.title = sSkinTitle;
} }
<!--@end--> <!--@end-->
htDesign.sSkinName = sSkinName; htDesign.sSkinName = sSkinName;