From 978a9e272f3e7bd7132e6c3e59820c8a1313cdbf Mon Sep 17 00:00:00 2001 From: ChanMyeong Date: Thu, 18 Oct 2012 08:30:42 +0000 Subject: [PATCH] /modules/member/ UI Cleaning. git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11777 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/css/xe.css | 4 +- common/css/xe.min.css | 2 +- common/lang/lang.xml | 62 +++++---- modules/admin/tpl/css/admin.css | 44 +++--- modules/admin/tpl/css/admin.min.css | 44 +++--- modules/admin/tpl/js/admin.js | 1 - modules/admin/tpl/js/admin.min.js | 4 +- modules/member/tpl/default_config.html | 8 +- modules/member/tpl/design_config.html | 2 +- modules/member/tpl/header.html | 3 - modules/member/tpl/insert_join_form.html | 90 +++++++------ modules/member/tpl/login_config.html | 14 +- modules/member/tpl/member_list.html | 163 +++++++++++------------ modules/member/tpl/signup_config.html | 48 +++---- 14 files changed, 243 insertions(+), 246 deletions(-) diff --git a/common/css/xe.css b/common/css/xe.css index a1dcf28b3..cd98f306a 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -28,9 +28,9 @@ input[type=button].text, button[type=submit].text, button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a !important;background:none;text-decoration:underline;cursor:pointer} /* Popup Menu Area */ -#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} +#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:3px;padding:10px;font-size:12px;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} #popup_menu_area ul{list-style:none;margin:0;padding:0} -#popup_menu_area li{margin:0;padding:0} +#popup_menu_area li{margin:0;padding:0;line-height:1.25} #popup_menu_area a{text-decoration:none;color:#333} #popup_menu_area a:hover, #popup_menu_area a:avtive, diff --git a/common/css/xe.min.css b/common/css/xe.min.css index b121b3142..739478205 100644 --- a/common/css/xe.min.css +++ b/common/css/xe.min.css @@ -1 +1 @@ -@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:13px}body{word-wrap:break-word}a img{border:0}.xe_content img{max-width:100%;height:auto}@media \0screen{.xe_content img{max-width:none}}.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}.btn{position:relative;display:inline-block;vertical-align:middle}.btn *{display:inline-block;padding:0 8px;height:24px;line-height:22px;margin:0;font-weight:bold!important;color:#fff;text-decoration:none!important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}.btn *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a,.btn *[type=button]{border-color:#ccc;color:#333!important;background:#eee -webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff,endColorStr=#dddddd)}.btn *[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000))!important;background:#333 -moz-linear-gradient(top,#777,#000)!important;background-color:#333!important;color:#ffc!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777,endColorStr=#333333)}.btn a{height:22px}.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}.btn.medium a{height:28px}.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}.btn.large a{height:34px}input[type=submit].text,input[type=button].text,button[type=submit].text,button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a!important;background:0;text-decoration:underline;cursor:pointer}#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135,strength=5)}#popup_menu_area ul{list-style:none;margin:0;padding:0}#popup_menu_area li{margin:0;padding:0}#popup_menu_area a{text-decoration:none;color:#333}#popup_menu_area a:hover,#popup_menu_area a:avtive,#popup_menu_area a:focus{text-decoration:underline}.message{position:relative;border:1px solid #ddd;background-color:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:4px;line-height:1.4;font-size:13px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}body>.message{margin:1em}.message p{margin:1em 0!important}.message.info{border-color:#bce8f1;background-color:#d9edf7;color:#3a87ad}.message.error{border-color:#eed3d7;background-color:#f2dede;color:#b94a48}.message.update{border-color:#d6e9c6;background-color:#dff0d8;color:#468847}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100;border:1px solid #eae9dc;background:#fffdef url(../../common/img/msg.loading.gif) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-weight:bold}.wfsr_fog{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:0;width:100%;height:100%;opacity:.5;z-index:2;filter:alpha(opacity=50);zoom:1}.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1} \ No newline at end of file +@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:13px}body{word-wrap:break-word}a img{border:0}.xe_content img{max-width:100%;height:auto}@media \0screen{.xe_content img{max-width:none}}.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}.btn{position:relative;display:inline-block;vertical-align:middle}.btn *{display:inline-block;padding:0 8px;height:24px;line-height:22px;margin:0;font-weight:bold!important;color:#fff;text-decoration:none!important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}.btn *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a,.btn *[type=button]{border-color:#ccc;color:#333!important;background:#eee -webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff,endColorStr=#dddddd)}.btn *[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000))!important;background:#333 -moz-linear-gradient(top,#777,#000)!important;background-color:#333!important;color:#ffc!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777,endColorStr=#333333)}.btn a{height:22px}.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}.btn.medium a{height:28px}.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}.btn.large a{height:34px}input[type=submit].text,input[type=button].text,button[type=submit].text,button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a!important;background:0;text-decoration:underline;cursor:pointer}#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:3px;padding:10px;font-size:12px;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135,strength=5)}#popup_menu_area ul{list-style:none;margin:0;padding:0}#popup_menu_area li{margin:0;padding:0;line-height:1.25}#popup_menu_area a{text-decoration:none;color:#333}#popup_menu_area a:hover,#popup_menu_area a:avtive,#popup_menu_area a:focus{text-decoration:underline}.message{position:relative;border:1px solid #ddd;background-color:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:4px;line-height:1.4;font-size:13px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}body>.message{margin:1em}.message p{margin:1em 0!important}.message.info{border-color:#bce8f1;background-color:#d9edf7;color:#3a87ad}.message.error{border-color:#eed3d7;background-color:#f2dede;color:#b94a48}.message.update{border-color:#d6e9c6;background-color:#dff0d8;color:#468847}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100;border:1px solid #eae9dc;background:#fffdef url(../../common/img/msg.loading.gif) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-weight:bold}.wfsr_fog{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:0;width:100%;height:100%;opacity:.5;z-index:2;filter:alpha(opacity=50);zoom:1}.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1} \ No newline at end of file diff --git a/common/lang/lang.xml b/common/lang/lang.xml index e0a8e89ec..dc335854e 100644 --- a/common/lang/lang.xml +++ b/common/lang/lang.xml @@ -3308,6 +3308,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3322,30 +3347,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index b481741bf..d0d7dd524 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -25,7 +25,8 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x [class*=" x_icon-"]{text-decoration:none;border:0;padding:0;background-color:transparent;overflow:hidden;font-size:0} .x .x_close{width:24px;height:24px} .x .x_alert{ position:relative} -.x .x_alert>.x_close{position:absolute;top:0;right:0} +.x .x_alert>.x_close, +.x.x_modal>.x_close{position:absolute;top:0;right:0} .x .x_pagination{height:32px} .x .x_pagination ul>li>a, .x .x_pagination ul>li>span, @@ -59,7 +60,9 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x .x_inline{display:inline-block;*display:inline;*zoom:1} .x label.checked, .x input:checked+label, -.x label:only-of-type{font-weight:bold} +.x label:only-of-type, +.x .x_form-horizontal .x_control-label{font-weight:bold} +.x .x_form-horizontal .x_controls>label{padding-top:5px} .x input[type="radio"]+label, .x input[type="checkbox"]+label{font-weight:normal} .x label.x_inline{margin-right:16px} @@ -92,6 +95,7 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x button{line-height:16px} .x select{width:auto;padding:0;height:26px;line-height:26px} .x select[multiple]{height:auto} +.x textarea{vertical-align:top} .x .x_tab-content{overflow-x:hidden} /* Custom Styles */ .x .section{margin:20px 0 40px 0} @@ -343,6 +347,20 @@ html[lang="mn"] .x .g11n.active>[disabled], .x .moduleWindow .siteList>ul>li{background:#fff} .x .moduleWindow .siteList>ul>li:first-child>a{border-top-left-radius:0;border-top-right-radius:0} .x .moduleWindow select{width:100%} +/* Text List */ +.x .textList{border:1px solid #ddd !important;line-height:1.5em;height:125px;overflow:auto} +.x .textList li{border:0;padding:0 10px;height:25px;line-height:25px;white-space:nowrap;overflow:hidden} +.x .textList li:nth-child(even){background:#eee} +.x .textList li a{float:right;height:25px} +/* Up-Down Dragable */ +.x .uDrag .wrap{position:relative;padding-left:20px} +.x .uDrag li>.wrap{margin:0 0 0 8px} +.x .uDrag .dragActive{background:#FFD} +.x .uDrag .dragActive th, +.x .uDrag .dragActive td{background:none !important} +.x .uDrag .dragBtn{position:absolute;width:8px;height:100%;padding:0;overflow:hidden;background:url(../img/bgDragable.gif);top:1px;left:0;text-indent:12px;border:0;cursor:n-resize;white-space:nowrap;font-size:0px} +/* Layer */ +.x .layer{position:absolute;display:none;font-weight:normal} /* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */ /* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */ @@ -352,13 +370,6 @@ html[lang="mn"] .x .g11n.active>[disabled], .x .fvOff, .x .fvOn{display:inline-block;width:16px;height:16px;overflow:hidden;text-indent:16px;background:transparent url(../img/iconFavorite.gif) no-repeat;border:0} .x .fvOn{background-position:0 -16px} -/* Up-Down Dragable */ -.x .uDrag .wrap{position:relative;padding-left:20px} -.x .uDrag li>.wrap{margin:0 0 0 8px} -.x .uDrag .dragActive{background:#FFD} -.x .uDrag .dragActive th, -.x .uDrag .dragActive td{background:none !important} -.x .uDrag .dragBtn{position:absolute;width:8px;height:100%;padding:0;overflow:hidden;background:url(../img/bgDragable.gif);top:1px;left:0;text-indent:12px;border:0;cursor:n-resize;white-space:nowrap;font-size:0px} /* Section & Heading */ .x .h2, .x .h3, @@ -496,21 +507,6 @@ html[lang="mn"] .x .g11n.active>[disabled], .modal .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1} .modalClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px} .modalBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden} -/* Layer */ -.x .layer, -.x.layer{position:absolute;background:#fff;padding:0 1em;*padding:1em;border:8px solid #ddd;z-index:2;zoom:1;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} -.x .layer h2{font-size:14px} -.x .layer ul, -.x .layer ol, -.x .layer .lined, -.x .layer .table{margin-bottom:1em} -.x .layerClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px} -.x .layerBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden} -/* Text List */ -.x .textList{border:1px solid #ddd !important;line-height:1.5em;height:18.5em;overflow:auto} -.x .textList li{border:0;padding:.25em 1em;height:1.5em;white-space:nowrap;overflow:hidden} -.x .textList li:nth-child(even){background:#eee} -.x .textList li a{float:right} /* Favicon Preview */ .x #faviconPreview{position:relative;padding:80px 0 0 200px;background:url(../img/bgFavicon.gif) no-repeat} .x #faviconPreview img{position:absolute} diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css index 7f07ccd2a..098eacb06 100644 --- a/modules/admin/tpl/css/admin.min.css +++ b/modules/admin/tpl/css/admin.min.css @@ -25,7 +25,8 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x [class*=" x_icon-"]{text-decoration:none;border:0;padding:0;background-color:transparent;overflow:hidden;font-size:0} .x .x_close{width:24px;height:24px} .x .x_alert{ position:relative} -.x .x_alert>.x_close{position:absolute;top:0;right:0} +.x .x_alert>.x_close, +.x.x_modal>.x_close{position:absolute;top:0;right:0} .x .x_pagination{height:32px} .x .x_pagination ul>li>a, .x .x_pagination ul>li>span, @@ -59,7 +60,9 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x .x_inline{display:inline-block;*display:inline;*zoom:1} .x label.checked, .x input:checked+label, -.x label:only-of-type{font-weight:bold} +.x label:only-of-type, +.x .x_form-horizontal .x_control-label{font-weight:bold} +.x .x_form-horizontal .x_controls>label{padding-top:5px} .x input[type="radio"]+label, .x input[type="checkbox"]+label{font-weight:normal} .x label.x_inline{margin-right:16px} @@ -92,6 +95,7 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x button{line-height:16px} .x select{width:auto;padding:0;height:26px;line-height:26px} .x select[multiple]{height:auto} +.x textarea{vertical-align:top} .x .x_tab-content{overflow-x:hidden} /* Custom Styles */ .x .section{margin:20px 0 40px 0} @@ -343,6 +347,20 @@ html[lang="mn"] .x .g11n.active>[disabled], .x .moduleWindow .siteList>ul>li{background:#fff} .x .moduleWindow .siteList>ul>li:first-child>a{border-top-left-radius:0;border-top-right-radius:0} .x .moduleWindow select{width:100%} +/* Text List */ +.x .textList{border:1px solid #ddd !important;line-height:1.5em;height:125px;overflow:auto} +.x .textList li{border:0;padding:0 10px;height:25px;line-height:25px;white-space:nowrap;overflow:hidden} +.x .textList li:nth-child(even){background:#eee} +.x .textList li a{float:right;height:25px} +/* Up-Down Dragable */ +.x .uDrag .wrap{position:relative;padding-left:20px} +.x .uDrag li>.wrap{margin:0 0 0 8px} +.x .uDrag .dragActive{background:#FFD} +.x .uDrag .dragActive th, +.x .uDrag .dragActive td{background:none !important} +.x .uDrag .dragBtn{position:absolute;width:8px;height:100%;padding:0;overflow:hidden;background:url(../img/bgDragable.gif);top:1px;left:0;text-indent:12px;border:0;cursor:n-resize;white-space:nowrap;font-size:0px} +/* Layer */ +.x .layer{position:absolute;display:none;font-weight:normal} /* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */ /* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */ @@ -352,13 +370,6 @@ html[lang="mn"] .x .g11n.active>[disabled], .x .fvOff, .x .fvOn{display:inline-block;width:16px;height:16px;overflow:hidden;text-indent:16px;background:transparent url(../img/iconFavorite.gif) no-repeat;border:0} .x .fvOn{background-position:0 -16px} -/* Up-Down Dragable */ -.x .uDrag .wrap{position:relative;padding-left:20px} -.x .uDrag li>.wrap{margin:0 0 0 8px} -.x .uDrag .dragActive{background:#FFD} -.x .uDrag .dragActive th, -.x .uDrag .dragActive td{background:none !important} -.x .uDrag .dragBtn{position:absolute;width:8px;height:100%;padding:0;overflow:hidden;background:url(../img/bgDragable.gif);top:1px;left:0;text-indent:12px;border:0;cursor:n-resize;white-space:nowrap;font-size:0px} /* Section & Heading */ .x .h2, .x .h3, @@ -496,21 +507,6 @@ html[lang="mn"] .x .g11n.active>[disabled], .modal .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1} .modalClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px} .modalBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden} -/* Layer */ -.x .layer, -.x.layer{position:absolute;background:#fff;padding:0 1em;*padding:1em;border:8px solid #ddd;z-index:2;zoom:1;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} -.x .layer h2{font-size:14px} -.x .layer ul, -.x .layer ol, -.x .layer .lined, -.x .layer .table{margin-bottom:1em} -.x .layerClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px} -.x .layerBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden} -/* Text List */ -.x .textList{border:1px solid #ddd !important;line-height:1.5em;height:18.5em;overflow:auto} -.x .textList li{border:0;padding:.25em 1em;height:1.5em;white-space:nowrap;overflow:hidden} -.x .textList li:nth-child(even){background:#eee} -.x .textList li a{float:right} /* Favicon Preview */ .x #faviconPreview{position:relative;padding:80px 0 0 200px;background:url(../img/bgFavicon.gif) no-repeat} .x #faviconPreview img{position:absolute} diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index f504f2324..8ffe03048 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -250,7 +250,6 @@ $.fn.xeModalWindow = function(){ } else { $this.trigger('open.mw'); } - return false; }) .bind('open.mw', function(){ diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js index 8536b70e1..8ffe03048 100644 --- a/modules/admin/tpl/js/admin.min.js +++ b/modules/admin/tpl/js/admin.min.js @@ -52,6 +52,9 @@ jQuery(function($){ var $this = $(this); $this.parent('li').addClass('x_active').siblings().removeClass('x_active'); $this.closest('.x_nav-tabs').next('.x_tab-content').find('>.x_tab-pane').eq($this.attr('data-index')-1).addClass('x_active').show().siblings().removeClass('x_active').hide(); + + $(this).parents('.x_tabbable').trigger('tab_change', [parseInt($(this).attr('data-index'))-1, $(this)]); + return false; }); // GNB @@ -247,7 +250,6 @@ $.fn.xeModalWindow = function(){ } else { $this.trigger('open.mw'); } - return false; }) .bind('open.mw', function(){ diff --git a/modules/member/tpl/default_config.html b/modules/member/tpl/default_config.html index 2b1e8244f..b0377bd4d 100644 --- a/modules/member/tpl/default_config.html +++ b/modules/member/tpl/default_config.html @@ -15,24 +15,24 @@
-

{$lang->about_webmaster_name}

+

{$lang->about_webmaster_name}

-

{$lang->about_webmaster_email}

+

{$lang->about_webmaster_email}

-

{$lang->about_member_sync}

+

{$lang->about_member_sync}

-
+
diff --git a/modules/member/tpl/design_config.html b/modules/member/tpl/design_config.html index b87868434..353c4bc2f 100644 --- a/modules/member/tpl/design_config.html +++ b/modules/member/tpl/design_config.html @@ -42,7 +42,7 @@
-
+
diff --git a/modules/member/tpl/header.html b/modules/member/tpl/header.html index d56b6955d..033d77a19 100644 --- a/modules/member/tpl/header.html +++ b/modules/member/tpl/header.html @@ -2,18 +2,15 @@

{$lang->cmd_member_config}

-

{$XE_VALIDATOR_MESSAGE}

- - diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html index 1082110e5..ed471eed6 100644 --- a/modules/member/tpl/insert_join_form.html +++ b/modules/member/tpl/insert_join_form.html @@ -1,55 +1,57 @@ - -
-

{$lang->cmd_input_extend_form}

+ +
+

{$lang->cmd_input_extend_form}

-
- -
- -

{$lang->about_column_id}

+
+
+ +
+ +

{$lang->about_column_id}

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +

{$lang->about_multi_type}

+
+
+
+ +
+ +
+
+
+ +
+ + +
-
- -
- -
-
-
- -
- -
-
-
- -
- -

{$lang->about_multi_type}

-
-
-
- -
- -
-
-
- -
- - -
-
-
+