merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -98,7 +98,6 @@ jQuery(function($){
});
$(window).resize();
// Popup list : 'Move to site' and 'Site map'
$('.header>.siteTool>a.i')
.bind('before-open.tc', function(){
@ -1167,7 +1166,7 @@ $('.filebox')
});
/* insert fog layer */
// insert fog layer
function showWaitingFogLayer() {
var $bg = jQuery('<span class="bg"></span>');
$bg.height(jQuery(window).height());
@ -1181,7 +1180,8 @@ function hideWaitingFogLayer() {
jQuery('.wfsr').unwrap();
}
/* install module */
// install module
function doInstallModule(module) {
var params = new Array();
params['module_name'] = module;
@ -1189,7 +1189,7 @@ function doInstallModule(module) {
showWaitingFogLayer();
}
/* upgrade module */
// upgrade module
function doUpdateModule(module) {
var params = new Array();
params['module_name'] = module;
@ -1202,17 +1202,18 @@ function completeInstallModule(ret_obj) {
location.reload();
}
jQuery(document).ready(function($){
jQuery(function($){
$('body').ajaxComplete(function(){ hideWaitingFogLayer() });
});
/* admin single column layout */
// admin single column layout
jQuery(function($){
if($('.x>.body>.lnb').length == 0){ // When it have no lnb
$('.x>.body>.content').addClass('single'); // Add class single
}
});
/* Details toggle in admin table */
// Details toggle in admin table
jQuery(function($){
var viewBtn = $('.x .dsTg span.side>button.text');
var tdTitle = $('.x .dsTg td.title');
@ -1230,3 +1231,23 @@ jQuery(function($){
details.slideToggle(200);
});
});
// Toggle Content
jQuery(function($){
var $h2h3 = $('.x .content .h2, .x .content .h3').not('.portlet .h2, .modal .h2');
$h2h3.each(function(){
var $sTog = $('<button type="button" class="sTog" title="Open/Close"><i class="icon-chevron-up"></i></button>');
$(this).append($sTog);
$sTog.click(function(){
var $t = $(this);
var $sTogObj = $t.parent().nextUntil('.h2, .h3').not('.langEdit, .tgContent, .modal');
if($t.parent().next().is(':hidden')){
$t.find('i').attr('class','icon-chevron-up');
$sTogObj.slideDown(200);
} else {
$t.find('i').attr('class','icon-chevron-down');
$sTogObj.slideUp(200);
}
});
});
});

File diff suppressed because one or more lines are too long