diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index 110dd250f..27a66e523 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -21,7 +21,6 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x h4{font-size:14px} .x h5{font-size:12px} .x h6{font-size:12px} -.x section>h1{border-bottom:1px solid #ddd} .x [class^="x_icon-"], .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} @@ -73,9 +72,6 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x .x_control-group:before{content:"";display:block;clear:both} .x .x_control-group:first-child, .x .x_control-group:first-of-type{border-top:0;padding-top:0} -.x .x_control-group input, -.x .x_control-group select, -.x .x_control-group textarea{margin-bottom:0} .x input[type="text"], .x input[type="password"], .x input[type="datetime"], @@ -99,7 +95,7 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x .x_tab-content{overflow-x:hidden} /* Custom Styles */ .x .section{margin:20px 0 40px 0} -.x .section>h1{position:relative} +.x .section>h1{position:relative;border-bottom:1px solid #ddd} .x .section>h1>.snToggle{position:absolute;bottom:0;right:0;width:32px;height:32px;opacity:.5;filter:alpha(opacity=50)} .x .section>h1>.snToggle.x_icon-chevron-up{background-position:-279px -112px} .x .section>h1>.snToggle.x_icon-chevron-down{background-position:-303px -111px} diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css index 226460297..ac946acea 100644 --- a/modules/admin/tpl/css/admin.min.css +++ b/modules/admin/tpl/css/admin.min.css @@ -21,7 +21,6 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x h4{font-size:14px} .x h5{font-size:12px} .x h6{font-size:12px} -.x section>h1{border-bottom:1px solid #ddd} .x [class^="x_icon-"], .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} @@ -73,9 +72,6 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x .x_control-group:before{content:"";display:block;clear:both} .x .x_control-group:first-child, .x .x_control-group:first-of-type{border-top:0;padding-top:0} -.x .x_control-group input, -.x .x_control-group select, -.x .x_control-group textarea{margin-bottom:0} .x input[type="text"], .x input[type="password"], .x input[type="datetime"], @@ -99,7 +95,7 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x .x_tab-content{overflow-x:hidden} /* Custom Styles */ .x .section{margin:20px 0 40px 0} -.x .section>h1{position:relative} +.x .section>h1{position:relative;border-bottom:1px solid #ddd} .x .section>h1>.snToggle{position:absolute;bottom:0;right:0;width:32px;height:32px;opacity:.5;filter:alpha(opacity=50)} .x .section>h1>.snToggle.x_icon-chevron-up{background-position:-279px -112px} .x .section>h1>.snToggle.x_icon-chevron-down{background-position:-303px -111px} diff --git a/modules/importer/lang/lang.xml b/modules/importer/lang/lang.xml index 96509cedd..c4bcaf9e0 100644 --- a/modules/importer/lang/lang.xml +++ b/modules/importer/lang/lang.xml @@ -317,11 +317,6 @@ Hãy nhập đường dẫn cho File chứa Data trên Host dưới dạng http: - - - - - @@ -337,11 +332,6 @@ Hãy nhập đường dẫn cho File chứa Data trên Host dưới dạng http: - - 사이트 찾기를 클릭하면 됩니다. 도메인을 빈 칸으로 남겨두면 모든 사이트의 목록을 보여줍니다.]]> - Find Site. If you leave the domain field empty, list of all the sites is displayed.]]> - 　　サイト検索をクリックします。ドメインを空欄にしておくと、すべてのサイトのリストを表示します。]]> - @@ -513,25 +503,25 @@ Hãy nhập đường dẫn cho File chứa Data trên Host dưới dạng http: - XML Exporter를 이용해서 원하는 데이터를 XML파일로 생성 후 업로드해주셔야 합니다.]]> + XML Exporter를 이용해서 원하는 데이터를 XML파일로 생성 후 업로드해주셔야 합니다.]]> XML Exporter to convert the data you want into XML File.]]> +In order to import, you first have to use XML Exporter to convert the data you want into XML File.]]> XML Exporterを利用して変換したい書き込みデータをXMLファイルで作成してアップロードしてください。]]> +変換するためには、XML Exporterを利用して変換したい書き込みデータをXMLファイルで作成してアップロードしてください。]]> XML Exporter生成XML文件后再上传。]]> +导入数据时请利用 XML Exporter生成XML文件后再上传。]]> XML Exporter 建立 XML 檔案後再上傳。]]> +匯入資料時，請利用 XML Exporter 建立 XML 檔案後再上傳。]]> Exporteur de XML pour convertir les données en fichier de XML, et puis téléchargez-le.]]> +Pour transférer, vous devez utiliser Exporteur de XML pour convertir les données en fichier de XML, et puis téléchargez-le.]]> XML Экспортер (XML Exporter), чтобы конвертировать нужные данные в XML Файл и затем загрузить его.]]> +Чтобы импортировать, Вам следует использовать XML Экспортер (XML Exporter), чтобы конвертировать нужные данные в XML Файл и затем загрузить его.]]> XML Exporter para transformar los datos en archivo XML, y luego subir ese archivo.]]> +Para la transferencia debe utilizar XML Exporter para transformar los datos en archivo XML, y luego subir ese archivo.]]> XML DışAktarımcı'yı kullanıp istediğiniz veriyi XML türüne çevirmelisiniz.]]> +İçe aktarımı gerçekleştirebilmek için öncelikle XML DışAktarımcı'yı kullanıp istediğiniz veriyi XML türüne çevirmelisiniz.]]> XML Exporter.]]> +Để hiểu rõ hơn công việc này, bạn có thể tham khảo cách chuyển đổi Data của bạn vào XE khi bạn đã Upload chúng tại XML Exporter.]]> - - - - + + {@ $type_list = array('module'=>$lang->type_module, 'ttxml'=>$lang->type_ttxml, 'member'=>$lang->type_member, 'sync'=>$lang->type_syncmember, 'message'=>$lang->type_message) }
-

{$lang->importer}

+

{$lang->importer}

{nl2br($lang->about_importer)}

diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html index db80c3802..7239c7720 100644 --- a/modules/importer/tpl/index.html +++ b/modules/importer/tpl/index.html @@ -5,108 +5,67 @@

{$XE_VALIDATOR_MESSAGE}

-
-

{$lang->type_module}

-
+ -
-

{$lang->xml_path} {$lang->path_info}

-

- - - -

+

{$lang->type_module}

+
+ + + +
-
-

{$lang->data_destination}
{$lang->import_desc}

-

- {$lang->find_site} -

-
    -
    -

    -

    - -

    -

    - -

    +
    + +
    -
    -

    {$lang->guestbook_destination}

    -
    - {$lang->find_site} -
    -
      -
      -
      -

      - -

      -

      - -

      +
      + +
      -

      {$lang->about_ttxml_user_id}

      -

      + +
      -

      {$lang->import_step_desc[3]}

      -

      {$lang->type_syncmember}

      + +

      {$lang->import_step_desc[3]}

      -
      - -
      - -
      - -
      - - -

      {$lang->type_member}

      -
        -
      • -

        {$lang->xml_path} {$lang->path_info}

        -

        - - - {$lang->msg_no_xml_file} -

        -
        • -
      • -

        {$lang->import_step_desc[3]}

        -

        {$lang->type_syncmember}

        -
        • -
      -
      + + + + +

      {$lang->type_member}

      +
      + + + + {$lang->msg_no_xml_file} +
      +
      + +

      {$lang->import_step_desc[3]}

      +
      +
      + +
      +
      + +
      -

      {$lang->type_message}

      -
        -
      • -

        {$lang->xml_path} {$lang->path_info}

        -

        - - - -

        -
        • -
      +

      {$lang->type_message}

      +
      + + + + +
      @@ -141,7 +100,7 @@ diff --git a/modules/importer/tpl/js/importer_admin.js b/modules/importer/tpl/js/importer_admin.js index b8891ae7e..4383e9dd2 100644 --- a/modules/importer/tpl/js/importer_admin.js +++ b/modules/importer/tpl/js/importer_admin.js @@ -11,7 +11,7 @@ jQuery(function($){ $('.checkxml') .find('input:text') .change(function(){ - $(this).closest('.checkxml').find('.desr').hide(); + $(this).closest('.checkxml').find('.x_help-inline').hide(); }) .end() .find('button') @@ -22,7 +22,7 @@ $('.checkxml') $form = $this.closest('form'); $container = $this.closest('.checkxml'); $input = $container.find('input').prop('disabled', true).addClass('loading'); - $message = $container.find('.desc').hide(); + $message = $container.find('.x_help-inline').hide(); function on_complete(data) { var $ul, $ttxml, $xml; @@ -35,7 +35,7 @@ $('.checkxml') // when the file doesn't exists or any other error occurs if(data.error || data.exists != 'true') { - $message.attr('class', 'desc error').fadeIn(300); + $message.attr('class', 'x_help-inline').fadeIn(300); $ttxml = $ttxml.filter(':visible'); $ttxml.eq(-1).slideUp(100, function(){ $ttxml = $ttxml.slice(0,-1).eq(-1).slideUp(100,arguments.callee); @@ -44,7 +44,7 @@ $('.checkxml') return restore(); } - $message.attr('class', 'desc success').fadeIn(300); + $message.attr('class', 'x_help-inline').fadeIn(300); $form.find(':submit').removeAttr('disabled'); $syncmember = $form.find('.syncmember:hidden'); @@ -71,7 +71,7 @@ $('.checkxml') $.exec_json('importer.procImporterAdminCheckXmlFile', {filename:$.trim($input.val())}, on_complete); }) .end() - .find('.desc').hide().end() + .find('.x_help-inline').hide().end() .closest('form').find('>.ttxml').hide().end().end() .closest('form').find(':submit').attr('disabled','disabled');