diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index 8760ccee3..7a6a0b738 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -403,11 +403,12 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
.x .langEdit .btnArea{white-space:normal}
.x .langEdit .langList,
.x .langEdit .langEditControls{box-shadow:3px 3px 6px #999;-moz-box-shadow:3px 3px 6px #999;-webkit-box-shadow:3px 3px 6px #999;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}
-.x .langEdit .langList{margin:0 -1px 0 0}
+.x .langEdit .langList{margin:0 -1px 0 0;display:none}
.x .langEdit .langList li{white-space:nowrap;color:#ccc;width:270px}
.x .langEdit .langList li span{display:inline-block;width:80px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color:#767676}
.x .langEdit .langList li a{display:inline-block;width:80px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}
.x .langEdit .langList li.active{background:url(../img/iconArrow.gif) no-repeat right -188px}
+.x .langEdit.showChild .langList{display:block}
.x .langEdit #langInput{background:#fff}
.x .langEdit #langInput h2{padding:5px 10px;margin:0 0 -1px 0;font-weight:normal;color:#ccc;border:1px solid #eee;border-top-color:#ccc}
.x .langEdit #langInput h2 strong{color:#000}
@@ -469,7 +470,8 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
.x .suggestion li button{border:0;background:#fff;text-align:left;width:288px;padding:2px 4px;display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
.x .suggestion li button:hover,
.x .suggestion li button:active,
-.x .suggestion li button:focus{background:#eee}
+.x .suggestion li button:focus,
+.x .suggestion li button.active{background:#eee}
/* Image Mark */
.x #imageMark{right:0}
/* Easy Installer */
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index 8d6710b98..22833e24d 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -816,7 +816,7 @@ $('.multiLangEdit')
initLayer($layer);
// reset
- $layer.trigger('multilang-reset')
+ $layer.trigger('multilang-reset').removeClass('showChild').find('.langList').empty().end();
$('#langInput li.'+xe.current_lang+' > input').val(text).prev('label').css('visibility','hidden');
// hide suggestion layer
@@ -841,23 +841,19 @@ $('.multiLangEdit')
$layer.data('multilang-list', list);
// make language list
- $langlist = $layer.find('.langList').empty();
+ $langlist = $layer.find('.langList');
$.each(list, function(key){
var $li = $('').appendTo($langlist);
- $('')
+ $('')
.text(this[xe.current_lang])
.data('multilang-name', key)
.appendTo($li);
});
- if(count(list) > 1) {
- $langlist.show();
- } else {
- $langlist.hide();
- }
+ if(count(list) > 1) $layer.addClass('showChild');
- $layer.find('.langList>li>button').click();
+ $layer.find('.langList>li>a:first').click();
};
@@ -941,7 +937,7 @@ function initLayer($layer) {
$layer
.trigger('multilang-reset') // reset
- .find('a.langItem.active').removeClass('active')
+ .find('.langList li.active').removeClass('active').end()
.data('multilang-current-name', name);
$this.parent('li').addClass('active');
@@ -981,9 +977,13 @@ function initLayer($layer) {
};
function setTitleText() {
- $layer.find('h2')
- .find('strong').text(mode==MODE_SAVE?cmd_add:cmd_edit).end()
- .find('a').text(mode==MODE_SAVE?cmd_edit:cmd_add).end()
+ if(!$layer.data('multilang-current-name')) {
+ $layer.find('h2').find('strong').text(cmd_add).end().find('a').hide();
+ } else {
+ $layer.find('h2')
+ .find('strong').text(mode==MODE_SAVE?cmd_add:cmd_edit).end()
+ .find('a').text(mode==MODE_SAVE?cmd_edit:cmd_add).show().end();
+ }
};
// process the submit button
diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html
index 7849989f4..c941a70c3 100644
--- a/modules/member/tpl/group_list.html
+++ b/modules/member/tpl/group_list.html
@@ -56,7 +56,7 @@
- {$lang->cmd_set_multilingual}
+ {$lang->cmd_set_multilingual}
|
@@ -90,12 +90,8 @@
-