fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 04:24:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Editor's bug in auto expand fixed

Browse source 
Admin UI enhancement - full setup save



git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12390 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
nagoon97 2012-12-13 01:36:05 +00:00
parent bd01cd8e50
commit 06b41e6d10
3 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/editor/skins/xpresseditor/js/Xpress_Editor.js
View file

@ -5083,7 +5083,10 @@ xe.XE_Editorresize = $.Class({
} }
}, },
$ON_XE_EDITOR_RESIZE : function(){ $ON_XE_EDITOR_RESIZE : function(){
this.inputArea.style.height = this.oIframe.style.height = this.oIframeBody[0].scrollHeight + 'px'; var t = this;
setTimeout(function(){
t.inputArea.style.height = t.oIframe.style.height = t.oIframeBody[0].scrollHeight + 'px';
}, 0);
} }
}); });
//} //}

5
modules/menu/tpl/css/sitemap.css
View file

@ -209,6 +209,11 @@ body>.x{max-width:none !important}
#properties.prop-shortcut li.homepage, #properties.prop-shortcut li.homepage,
#properties.prop-shortcut li.design, #properties.prop-shortcut li.design,
#properties.prop-shortcut li.details{display:none} #properties.prop-shortcut li.details{display:none}
#properties ._hasFullSetupO{display:none}
#properties._hasFullSetup ._hasFullSetupO{display:block}
#properties._hasFullSetup ._hasFullSetupX{display:none}
/* Add */ /* Add */
#add>*>.x_btn-group{border:0;padding:0} #add>*>.x_btn-group{border:0;padding:0}
/* Add Menu */ /* Add Menu */

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

@ -124,7 +124,8 @@
<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="#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="#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> <li><a href="#auth" data-admin-show="#auth">{$lang->grant} <i class="x_icon-circle-arrow-right"></i></a></li>
<li><a class="_openFullSetup">{$lang->full_settings} <i class="x_icon-cog"></i></a></li> <li class="_hasFullSetupX"><a href="#" class="_openFullSetup">{$lang->full_settings} <i class="x_icon-cog"></i></a></li>
<li class="_hasFullSetupO"><a href="#fullSetup" data-admin-show="#fullSetup">{$lang->full_settings} <i class="x_icon-circle-arrow-right"></i></a></li>
</ul> </ul>
</div> </div>
</section> </section>
@ -1664,7 +1665,28 @@ jQuery(function($){
}else{ }else{
$(ev.target).find('._chkUseAsHome').removeAttr('disabled').removeAttr('checked'); $(ev.target).find('._chkUseAsHome').removeAttr('disabled').removeAttr('checked');
} }
$.exec_json("menu.getMenuAdminDetailSetup", {
menu_item_srl : htNodeInfo[$._xeAdminVar.sSelectedMenuSrl].sNodeSrl
}, function(htData){
if(htData.simpleSetupHtml){
$(ev.target).addClass('_hasFullSetup');
$('#fullSetup').find('._setupHTML').html(htData.simpleSetupHtml);
var $form = $('#fullSetup form');
$form.attr('target', 'submitTarget');
$form.append($("<INPUT>").attr("type", "hidden").attr("name", "xe_js_callback").attr("value", "top.fullSetupSaved"));
}else{
$(ev.target).removeClass('_hasFullSetup');
$._xeAdminVar.sFullSetupUrl = htData.setupUrl;
}
}); });
});
top.fullSetupSaved = function(htData){
console.log(htData);
alert('cool');
$('#fullSetup').hide();
};
$('#properties').bind("hide", function(ev, htOpt){ $('#properties').bind("hide", function(ev, htOpt){
if(htOpt && htOpt.bOpeningProp) return; if(htOpt && htOpt.bOpeningProp) return;
@ -3616,6 +3638,10 @@ jQuery(function($){
$(this).find('.lang_code').trigger('reload-multilingual'); $(this).find('.lang_code').trigger('reload-multilingual');
console.log($(this).find('.lang_code')); console.log($(this).find('.lang_code'));
}); });
//.//
$('#fullSetup ._save').click(function(ev){
$('#fullSetup form').submit();
});
var d365 = new Date(); var d365 = new Date();
d365.setTime(d365.getTime() + 60*60*24*356); d365.setTime(d365.getTime() + 60*60*24*356);
@ -3883,33 +3909,29 @@ jQuery(function($){
top.fullSetupDone = function(htData){ top.fullSetupDone = function(htData){
jQuery('#properties').show(); jQuery('#properties').show();
} }
$('a._openFullSetup').click(function(ev){ $('a._openFullSetup').click(function(ev){
if($._xeAdminVar.oSetupWin){ if($._xeAdminVar.oSetupWin){
$._xeAdminVar.oSetupWin.close(); $._xeAdminVar.oSetupWin.close();
} }
ev.preventDefault(); $._xeAdminVar.oSetupWin = window.open($._xeAdminVar.sFullSetupUrl, "xe_fullSetup");
$('#properties').nextAll().hide(); ev.preventDefault();
var t = this; var t = this;
setTimeout(function(){ setTimeout(function(){
$(t).blur(); $(t).blur();
}, 0); }, 0);
/*
$.exec_json("menu.getMenuAdminDetailSetup", { $.exec_json("menu.getMenuAdminDetailSetup", {
menu_item_srl : htNodeInfo[$._xeAdminVar.sSelectedMenuSrl].sNodeSrl menu_item_srl : htNodeInfo[$._xeAdminVar.sSelectedMenuSrl].sNodeSrl
}, function(htData){ }, function(htData){
console.log(htData.simpleSetupHtml)
if(htData.simpleSetupHtml){
$('#fullSetup').find('._setupHTML').html(htData.simpleSetupHtml);
$('#fullSetup').show();
}else{
//$._xeAdminVar.oSetupWin = window.open("about:blank", "xe_fullSetup");
$._xeAdminVar.oSetupWin = window.open(htData.setupUrl, "xe_fullSetup", "resizable=yes");
//window.open(htData.setupUrl, "xe_fullSetup", "resizable=yes"); //window.open(htData.setupUrl, "xe_fullSetup", "resizable=yes");
} $._xeAdminVar.oSetupWin = window.open(htData.setupUrl, "xe_fullSetup");
}); });
*/
}); });