diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 4220a92e0..e6b9be623 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -113,16 +113,21 @@ jQuery(function($){ multilingual(); $mlCheck.change(multilingual); // Check All - $('.x th>input[type="checkbox"]').change(function(){ - var $this =$(this); - var $target = $this.closest('table').find('th>input[type="checkbox"], td>input[type="checkbox"]'); - if($this.is(':checked')){ - $target.attr('checked','checked'); - } else { - $target.removeAttr('checked'); - } - - }); + $('.x th>input[type="checkbox"]') + .change(function() { + var $this = $(this), name = $this.data('name'); + + $this.closest('table') + .find('input:checkbox') + .filter(function(){ + var $this = $(this); + return !$this.prop('disabled') && (($this.attr('name') == name) || ($this.data('name') == name)); + }) + .prop('checked', $this.prop('checked')) + .end() + .end() + .trigger('update.checkbox', [name, this.checked]); + }); // Pagination $('.x .x_pagination .x_disabled, .x .x_pagination .x_active').click(function(){ return false; @@ -140,43 +145,112 @@ jQuery(function($){ $this.removeClass('x_icon-chevron-down').addClass('x_icon-chevron-up'); } }); -// Close Button - $('.x_close').click(function(){ - $(this).parent().hide(); - }); +}); + // Modal Window - var $modal = $('.x_modal'); - if($modal.length >= 1){ - $('body').append('
').append($modal); // append background - $modal.prepend(''); // prepend close button - } - // Set close button 'data-hide' attribute - $modal.children('.x_close').each(function(){ - var $this = $(this); - $this.attr('data-hide', '#' + $this.parent().attr('id')); - }); - // Modal Open - var $modalBack = $('.x_modal-backdrop'); - $('.x a').click(function(){ - var $target = $($(this).attr('href')); - if($target.hasClass('x_modal')){ - $modalBack.show(); - $target.show(); - } - }); - // Modal Close - function modalClose(){ - $modal.hide(); - $modalBack.hide(); - } - $modalBack.click(modalClose); // $modalBack click - $(document).keydown(function(event){ // ESC keydown - if(event.keyCode != 27) return true; - return modalClose(); - }); - $('[data-hide]').click(function(){ // [data-hide] click - if($($(this).attr('data-hide')).hasClass('x_modal')){ - modalClose(); - } - }); -}); \ No newline at end of file +jQuery(function($){ + +var ESC = 27; + +$.fn.xeModalWindow = function(){ + this + .not('.xe-modal-window') + .addClass('xe-modal-window') + .each(function(){ + $( $(this).attr('href') ).addClass('x').hide(); + }) + .click(function(){ + var $this = $(this), $modal, $btnClose, disabled; + + // get and initialize modal window + $modal = $( $this.attr('href') ); + if(!$modal.parent('body').length) { + $btnClose = $(''); + $btnClose.click(function(){ $modal.data('anchor').trigger('close.mw') }); + $modal.find('[data-hide]').click(function(){ $modal.data('anchor').trigger('close.mw') }); + $('body').append('
').append($modal); // append background + $modal.prepend($btnClose); // prepend close button + } + + // set the related anchor + $modal.data('anchor', $this); + + if($modal.data('state') == 'showing') { + $this.trigger('close.mw'); + } else { + $this.trigger('open.mw'); + } + + return false; + }) + .bind('open.mw', function(){ + var $this = $(this), before_event, $modal, duration; + + // before event trigger + before_event = $.Event('before-open.mw'); + $this.trigger(before_event); + + // is event canceled? + if(before_event.isDefaultPrevented()) return false; + + // get modal window + $modal = $( $this.attr('href') ); + + // get duration + duration = $this.data('duration') || 'fast'; + + // set state : showing + $modal.data('state', 'showing'); + + // workaroud for IE6 + $('html,body').addClass('modalContainer'); + + // after event trigger + function after(){ $this.trigger('after-open.mw') }; + + $(document).bind('keydown.mw', function(event){ + if(event.which == ESC) { + $this.trigger('close.mw'); + return false; + } + }); + + $modal + .fadeIn(duration, after) + .find('button.x_close:first').focus(); + $('.x_modal-backdrop').show(); + }) + .bind('close.mw', function(){ + var $this = $(this), before_event, $modal, duration; + + // before event trigger + before_event = $.Event('before-close.mw'); + $this.trigger(before_event); + + // is event canceled? + if(before_event.isDefaultPrevented()) return false; + + // get modal window + $modal = $( $this.attr('href') ); + + // get duration + duration = $this.data('duration') || 'fast'; + + // set state : hiding + $modal.data('state', 'hiding'); + + // workaroud for IE6 + $('html,body').removeClass('modalContainer'); + + // after event trigger + function after(){ $this.trigger('after-close.mw') }; + + $modal.fadeOut(duration, after); + $('.x_modal-backdrop').hide(); + $this.focus(); + }); +}; +$('a.modalAnchor').xeModalWindow(); +$('div.x_modal').addClass('x').hide(); + +}); diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js index 4220a92e0..acadd7d6a 100644 --- a/modules/admin/tpl/js/admin.min.js +++ b/modules/admin/tpl/js/admin.min.js @@ -1,182 +1,9 @@ -/* NHN (developers@xpressengine.com) */ -jQuery(function($){ -// iSO mobile device toolbar remove - window.top.scrollTo(0,0); -// Skip to content - $('.x .skipNav>a').click(function(){ - $($(this).attr('href')).attr('tabindex','0').css('outline','0').focus(); - }); - -// TARGET toggle - $('.x [data-toggle]').click(function(){ - $($(this).attr('data-toggle')).toggle(); - return false; - }); -// TARGET show - $('.x [data-show]').click(function(){ - $($(this).attr('data-show')).show(); - return false; - }); -// TARGET hide - $('.x [data-hide]').click(function(){ - $($(this).attr('data-hide')).hide(); - return false; - }); - -// Tab Navigation - $('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide(); - $('.x .x_nav-tabs').find('>li>a[href^="#"]').click(function(){ - var $this = $(this); - $this.parent('li').addClass('x_active').siblings().removeClass('x_active'); - $this.closest('.x_nav-tabs').next('.x_tab-content').find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide(); - return false; - }); -// GNB Height 100% - var $xBody = $('.x>.body'); - var $xContent = $xBody.find('>.content'); - var $xGnb = $xBody.find('>.gnb'); - var $xGnb_li = $xGnb.find('>ul>li'); - $(window).resize(function(){ - setTimeout(function(){ - if($(window).width() <= 980 || $(window).width() > 1240){ - $xBody.removeClass('wide'); - } else { - $xBody.addClass('wide'); - } - }, 100); - }).resize(); -// GNB Click toggle - $xGnb_li.find('ul').prev('a') - .bind('click focus', function(){ - var $this = $(this); - // Submenu toggle - $xGnb_li.not($this.parent('li')).removeClass('open'); - $(this).parent('li').toggleClass('open'); - $xGnb.trigger('mouseenter'); // GNB Hover - return false; - }); -// GNB Hover toggle - function contentBugFix(){ // Chrome browser rendering bug fix - $xContent.width('99.99%'); - setTimeout(function(){ - $xContent.removeAttr('style'); - }, 0); - } - $xGnb - .mouseenter(function(){ // Mouseenter - if($(window).width() >= 980){ - $xBody.removeClass('wide'); - contentBugFix(); - } - }) - .mouseleave(function(){ // Mouseleave - if($(window).width() >= 980 && $(window).width() < 1240){ - $xBody.addClass('wide'); - contentBugFix(); - } - }); -// GNB Mobile Toggle - $xGnb.find('>a[href="#gnbNav"]').click(function(){ - $(this).parent('.gnb').toggleClass('open'); - return false; - }); -// GNB Close - $xGnb - .prepend(''); - $('.x .section>h1>.snToggle').click(function(){ - var $this = $(this); - var $section = $this.closest('.section'); - if(!$section.hasClass('collapse')){ - $section.addClass('collapse').children('h1:first').siblings().hide(); - $this.removeClass('x_icon-chevron-up').addClass('x_icon-chevron-down'); - } else { - $section.removeClass('collapse').children('h1:first').siblings().show(); - $this.removeClass('x_icon-chevron-down').addClass('x_icon-chevron-up'); - } - }); -// Close Button - $('.x_close').click(function(){ - $(this).parent().hide(); - }); -// Modal Window - var $modal = $('.x_modal'); - if($modal.length >= 1){ - $('body').append('
').append($modal); // append background - $modal.prepend(''); // prepend close button - } - // Set close button 'data-hide' attribute - $modal.children('.x_close').each(function(){ - var $this = $(this); - $this.attr('data-hide', '#' + $this.parent().attr('id')); - }); - // Modal Open - var $modalBack = $('.x_modal-backdrop'); - $('.x a').click(function(){ - var $target = $($(this).attr('href')); - if($target.hasClass('x_modal')){ - $modalBack.show(); - $target.show(); - } - }); - // Modal Close - function modalClose(){ - $modal.hide(); - $modalBack.hide(); - } - $modalBack.click(modalClose); // $modalBack click - $(document).keydown(function(event){ // ESC keydown - if(event.keyCode != 27) return true; - return modalClose(); - }); - $('[data-hide]').click(function(){ // [data-hide] click - if($($(this).attr('data-hide')).hasClass('x_modal')){ - modalClose(); - } - }); -}); \ No newline at end of file +jQuery(function(a){function c(){f.width("99.99%");setTimeout(function(){f.removeAttr("style")},0)}function b(){g.each(function(){var b=a(this),c=b.parent("label"),d=c.siblings('input[type="text"]:first'),e=c.siblings("select:first"),f=b.closest(".multilingual").siblings(".multilingual_item:first");b.is(":checked")?(d.hide(),e.show(),c.addClass("checked"),f.show()):(d.show(),e.hide(),c.removeClass("checked"),f.hide())})}window.top.scrollTo(0,0);a(".x .skipNav>a").click(function(){a(a(this).attr("href")).attr("tabindex", +"0").css("outline","0").focus()});a(".x [data-toggle]").click(function(){a(a(this).attr("data-toggle")).toggle();return!1});a(".x [data-show]").click(function(){a(a(this).attr("data-show")).show();return!1});a(".x [data-hide]").click(function(){a(a(this).attr("data-hide")).hide();return!1});a('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide();a(".x .x_nav-tabs").find('>li>a[href^="#"]').click(function(){var b=a(this);b.parent("li").addClass("x_active").siblings().removeClass("x_active");b.closest(".x_nav-tabs").next(".x_tab-content").find(b.attr("href")).addClass("x_active").show().siblings().removeClass("x_active").hide(); +return!1});var d=a(".x>.body"),f=d.find(">.content"),e=d.find(">.gnb"),h=e.find(">ul>li");a(window).resize(function(){setTimeout(function(){980>=a(window).width()||1240a(window).width()&&(d.addClass("wide"),c())});e.find('>a[href="#gnbNav"]').click(function(){a(this).parent(".gnb").toggleClass("open");return!1});e.prepend('');a(".x .section>h1>.snToggle").click(function(){var b= +a(this),c=b.closest(".section");c.hasClass("collapse")?(c.removeClass("collapse").children("h1:first").siblings().show(),b.removeClass("x_icon-chevron-down").addClass("x_icon-chevron-up")):(c.addClass("collapse").children("h1:first").siblings().hide(),b.removeClass("x_icon-chevron-up").addClass("x_icon-chevron-down"))})}); +jQuery(function(a){a.fn.xeModalWindow=function(){this.not(".xe-modal-window").addClass("xe-modal-window").each(function(){a(a(this).attr("href")).addClass("x").hide()}).click(function(){var c=a(this),b,d;b=a(c.attr("href"));b.parent("body").length||(d=a(''),d.click(function(){b.data("anchor").trigger("close.mw")}),b.find("[data-hide]").click(function(){b.data("anchor").trigger("close.mw")}),a("body").append('
').append(b), +b.prepend(d));b.data("anchor",c);"showing"==b.data("state")?c.trigger("close.mw"):c.trigger("open.mw");return!1}).bind("open.mw",function(){var c=a(this),b,d;b=a.Event("before-open.mw");c.trigger(b);if(b.isDefaultPrevented())return!1;b=a(c.attr("href"));d=c.data("duration")||"fast";b.data("state","showing");a("html,body").addClass("modalContainer");a(document).bind("keydown.mw",function(a){if(27==a.which)return c.trigger("close.mw"),!1});b.fadeIn(d,function(){c.trigger("after-open.mw")}).find("button.x_close:first").focus(); +a(".x_modal-backdrop").show()}).bind("close.mw",function(){var c=a(this),b,d;b=a.Event("before-close.mw");c.trigger(b);if(b.isDefaultPrevented())return!1;b=a(c.attr("href"));d=c.data("duration")||"fast";b.data("state","hiding");a("html,body").removeClass("modalContainer");b.fadeOut(d,function(){c.trigger("after-close.mw")});a(".x_modal-backdrop").hide();c.focus()})};a("a.modalAnchor").xeModalWindow();a("div.x_modal").addClass("x").hide()}); diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html index 652a3c61d..152eafaab 100644 --- a/modules/member/tpl/member_list.html +++ b/modules/member/tpl/member_list.html @@ -7,8 +7,10 @@

{$XE_VALIDATOR_MESSAGE}

-

{$lang->user_list}

-
+
+

{$lang->user_list}

+
+
{$lang->cmd_show_all_member} | @@ -18,14 +20,14 @@ | {$lang->denied}
- - +
+
+ {$lang->cmd_make} + {$lang->cmd_selected_user_manage}... +
+
+
- {$filter_type_title}({$total_count}) - - {$lang->cmd_make} - {$lang->cmd_selected_user_manage}... - -
+ @@ -83,21 +85,23 @@
{$filter_type_title}({$total_count})
{$lang->email}
-
- - {$lang->cmd_make} - {$lang->cmd_selected_user_manage}... - +
+
+ {$lang->cmd_make} + {$lang->cmd_selected_user_manage}... +
-