From 17803c5a14e0853085efdc9289ad9cab8da35c68 Mon Sep 17 00:00:00 2001 From: flyskyko Date: Tue, 27 Sep 2011 07:59:17 +0000 Subject: [PATCH] issue 160, fixed a bug related multiple toggle contents of multi language git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9359 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/tpl/css/admin.css | 8 ++++---- modules/admin/tpl/js/admin.js | 18 +++++++++++------- modules/member/tpl/group_list.html | 2 +- modules/menu/tpl/sitemap.html | 2 +- .../tpl/widget_generate_code.multilang.html | 4 ++-- ...idget_generate_code.multilang.textarea.html | 4 ++-- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index 95ea9332f..a7c6a567d 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -378,10 +378,10 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */ .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-size:12px;font-weight:normal;color:#666;border:1px solid #eee;border-top-color:#ccc} -.x .langEdit #langInput h2 strong{color:#000;font-size:14px} -.x .langEdit.showChild #langInput{position:absolute;left:285px;top:0} +.x .langEdit .langInput{background:#fff} +.x .langEdit .langInput h2{padding:5px 10px;margin:0 0 -1px 0;font-size:12px;font-weight:normal;color:#666;border:1px solid #eee;border-top-color:#ccc} +.x .langEdit .langInput h2 strong{color:#000;font-size:14px} +.x .langEdit.showChild .langInput{position:absolute;left:285px;top:0} .x .langEdit li.en input, .x .langEdit li.en textarea, .x .mLangEdit li.en textarea{background:url(../img/flag.us.gif) no-repeat 99% 5px} diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 96dda7c48..19268d08f 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -835,7 +835,7 @@ $('.multiLangEdit') // reset $layer.trigger('multilang-reset').removeClass('showChild').find('.langList').empty().end(); - $('#langInput li.'+xe.current_lang).find('>input:text,>textarea').val(text).prev('label').css('visibility','hidden'); + $layer.find('.langInput li.'+xe.current_lang).find('>input:text,>textarea').val(text).prev('label').css('visibility','hidden'); // hide suggestion layer $suggest.trigger('hide'); @@ -863,7 +863,8 @@ $('.multiLangEdit') $.each(list, function(key){ var $li = $('
  • ').appendTo($langlist); - $('') + var anchor_id = $layer.data('layer_index'); + $('') .text(this[xe.current_lang]) .data('multilang-name', key) .appendTo($li); @@ -912,6 +913,7 @@ $suggest = $('
      ') $(this).hide(); }); +var layer_index = 0; function initLayer($layer) { var $submit, $input, value='', current_status = 0, mode, cmd_add, cmd_edit, status_texts=[]; var USE = 0, UPDATE_AND_USE = 1, MODE_SAVE = 0, MODE_UPDATE = 1; @@ -923,7 +925,7 @@ function initLayer($layer) { .bind('multilang-reset', function(){ $layer .data('multilang-current-name', '') - .find('#langInput li').find('>input:text,>textarea').val(' ').prev('label').css('visibility','visible'); + .find('.langInput li').find('>input:text,>textarea').val(' ').prev('label').css('visibility','visible'); mode = MODE_SAVE; setTitleText(); @@ -945,7 +947,7 @@ function initLayer($layer) { if(!list || !list[name]) return; list = list[name]; - $controls = $('#langInput'); + $controls = $layer.find('.langInput'); $layer .trigger('multilang-reset') // reset @@ -968,7 +970,9 @@ function initLayer($layer) { setTitleText(); return false; - }); + }) + .data('layer_index', layer_index) + .find('.langInput').attr('id', 'langInput_' + layer_index++); cmd_edit = $layer.find('h2 strong').text(); cmd_add = $layer.find('h2 a').text(); @@ -1006,7 +1010,7 @@ function initLayer($layer) { function use_lang() { $layer.hide().closest('.multiLangEdit').find('.vLang') .eq(0).val('$user_lang->'+name).end() - .eq(1).val($('#langInput li.'+xe.current_lang).find('>input:text,>textarea').val()).end(); + .eq(1).val($layer.find('.langInput li.'+xe.current_lang).find('>input:text,>textarea').val()).end(); }; function save_lang() { @@ -1156,4 +1160,4 @@ jQuery(function($){ if($('.x>.body>.lnb').length == 0){ // When it have no lnb $('.x>.body>.content').addClass('single'); // Add class single } -}); \ No newline at end of file +}); diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html index a754b7f47..b4aec6f10 100644 --- a/modules/member/tpl/group_list.html +++ b/modules/member/tpl/group_list.html @@ -89,7 +89,7 @@
        -
        +

        다국어 수정 | 추가

          {@ diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html index cb82fbd1f..a3e73f0ba 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -62,7 +62,7 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
            -
            +

            {$lang->multilingual} {$lang->cmd_modify} | {$lang->cmd_insert}

              {@ diff --git a/modules/widget/tpl/widget_generate_code.multilang.html b/modules/widget/tpl/widget_generate_code.multilang.html index 375d76aa9..8a45e064d 100644 --- a/modules/widget/tpl/widget_generate_code.multilang.html +++ b/modules/widget/tpl/widget_generate_code.multilang.html @@ -1,7 +1,7 @@
                -
                +

                {$lang->multilingual} {$lang->cmd_modify} | {$lang->cmd_insert}

                  {@ @@ -20,4 +20,4 @@
                -                 \ No newline at end of file + diff --git a/modules/widget/tpl/widget_generate_code.multilang.textarea.html b/modules/widget/tpl/widget_generate_code.multilang.textarea.html index ea61170ac..5b05c0b24 100644 --- a/modules/widget/tpl/widget_generate_code.multilang.textarea.html +++ b/modules/widget/tpl/widget_generate_code.multilang.textarea.html @@ -5,7 +5,7 @@
                  -
                  +

                  {$lang->multilingual} {$lang->cmd_modify} | {$lang->cmd_insert}

                    {@ @@ -24,4 +24,4 @@
                  - \ No newline at end of file +