From eafb2a9a8fd9d02f277edd4e94ef97317b4f81dc Mon Sep 17 00:00:00 2001 From: nagoon97 Date: Tue, 29 Jan 2013 08:24:39 +0000 Subject: [PATCH] fixed an error in site design saving function on IE alert pop-up design change git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12606 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/tpl/css/admin.css | 2 ++ modules/admin/tpl/js/admin.js | 4 ++-- modules/menu/tpl/sitemap.html | 12 +++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index fcd403ff1..c61c939c1 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -191,7 +191,9 @@ body>.x, .x_modal._common {width:600px;margin-left:-300px} .x_modal._common._small{width:400px;margin-left:-200px} .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 .x_modal-body{border-radius:6px 6px 0 0;} .x_modal._common._nobody .x_modal-footer{border-top:0} .x_modal-body.showTree .moveList{float:left;width:60%} .x_modal-body.showTree .moveTree{display:block !important;float:right;width:38%} diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index b79b34a7b..c1de69487 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -1106,12 +1106,12 @@ jQuery(function($){ this.showMsgBox(htOptions); } - $.xeMsgBox.alert = function(sTitle){ + $.xeMsgBox.alert = function(sText){ htOptions = { bAlert : true, bNobody : true, bSmall: true, - sTitle : sTitle + sText : sText }; this.showMsgBox(htOptions); diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html index fb856b774..6e6d203c4 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -1141,7 +1141,7 @@ function clearInputs($elm){ function setItemTypes(htTypes){ var $ = jQuery; - +$.test=htTypes; $._xeAdminVar.htItemTypes = htTypes || {}; $._xeAdminVar.htItemTypes._SHORTCUT = { @@ -2749,19 +2749,18 @@ jQuery(function($){ $._xeAdminVar.sOpenDeisgnWith = "P"; //}); }); - $('#design ._btn_save').click(function(ev){ ev.preventDefault(); - var sMode = $._xeAdminVar.htPrevSetting.bMobilePreviewTabOpen?"M":"P"; - + //var sLayoutSrl = $._xeAdminVar.htSelectedMenuDesign.htLayoutSrl[sMode]; var htDesign = $._xeAdminVar.htSelectedMenuDesign; var htSkins = {}; + var item; for(var sModuleName in $._xeAdminVar.htItemTypes){ if(! $._xeAdminVar.htItemTypes.hasOwnProperty(sModuleName)) continue; if(sModuleName === "_SHORTCUT") continue; - + item = $._xeAdminVar.htItemTypes[sModuleName]; sModuleTitle = item.title; @@ -2774,7 +2773,7 @@ jQuery(function($){ target_type : sMode, module_skin : $.stringify(htSkins) }; - + //console.log(htParam); 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.title = sSkinTitle; } - htDesign.sSkinName = sSkinName;