diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 434ca1fe26..c39e43e02e 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -35,7 +35,6 @@ $lang->link = 'Link'; $lang->unlink = 'Unlink'; $lang->import = 'Import'; $lang->export = 'Export'; -$lang->exportType = 'Exprot Type'; $lang->setFileName = 'Filename:'; $lang->activate = 'Activate'; $lang->submitting = 'Saving...'; @@ -115,8 +114,8 @@ $lang->exportFileTypeList['csv'] = 'csv'; $lang->exportFileTypeList['xml'] = 'xml'; $lang->exportFileTypeList['html'] = 'html'; -$lang->exportTypeList['all'] = 'Export ALL'; -$lang->exportTypeList['selected'] = 'Export Checked'; +$lang->exportTypeList['all'] = 'All records'; +$lang->exportTypeList['selected'] = 'Only checked'; /* Support charset. */ $lang->exportEncodeList['gbk'] = 'GBK'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 30c0420121..021260511d 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -35,7 +35,6 @@ $lang->link = '关联'; $lang->unlink = '移除'; $lang->import = '导入'; $lang->export = '导出'; -$lang->exportType = '导出类型'; $lang->setFileName = '文件名:'; $lang->activate = '激活'; $lang->submitting = '稍候...'; @@ -115,8 +114,8 @@ $lang->exportFileTypeList['csv'] = 'csv'; $lang->exportFileTypeList['xml'] = 'xml'; $lang->exportFileTypeList['html'] = 'html'; -$lang->exportTypeList['all'] = '导出全部'; -$lang->exportTypeList['selected'] = '导出选中'; +$lang->exportTypeList['all'] = '全部记录'; +$lang->exportTypeList['selected'] = '选中记录'; /* 支持的编码格式。*/ $lang->exportEncodeList['gbk'] = 'GBK'; diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index d09d2063cd..377d98c401 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -43,18 +43,19 @@ function switchEncode(fileType) } } -

-
+ -
export;?>
- ' . $lang->exportType . ':' . html::radio('exportType', $lang->exportTypeList, ($this->cookie->checkedItem) ? 'selected' : 'all') . '

'?> - setFileName;?> - - exportFileTypeList, '', 'onchange=switchEncode(this.value)');?> - exportEncodeList, 'gbk', key($lang->exportFileTypeList) == 'csv' ? "" : "class='hidden'");?> - +
+ setFileName . ' '; + echo html::input('fileName', '', 'class=text-2'); + echo html::select('fileType', $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value)'); + echo html::select('encode', $lang->exportEncodeList, 'gbk', key($lang->exportFileTypeList) == 'csv' ? "" : "class='hidden'"); + echo html::select('exportType', $lang->exportTypeList, ($this->cookie->checkedItem) ? 'selected' : 'all'); + echo html::submitButton(); + ?>
diff --git a/www/js/my.full.js b/www/js/my.full.js index 4bc7092556..6f39b35f9b 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -526,7 +526,7 @@ function setSubversionLink() /* Set the colorbox of export. */ function setExport() { - if($('.export').size()) $(".export").colorbox({width:500, height:220, iframe:true, transition:'none', scrolling:true}); + if($('.export').size()) $(".export").colorbox({width:600, height:200, iframe:true, transition:'none', scrolling:true}); } /** diff --git a/www/theme/default/style.css b/www/theme/default/style.css index a5579a66a3..65e5be5b7a 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -380,7 +380,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table #poweredby {padding-right:10px} /* Debug. */ -.debugwin {display:block; width:200px; height:20px; bottom:50px; border-left:10px solid red; position:fixed;} +.debugwin {display:block; width:50px; height:20px; bottom:50px; border-left:10px solid red; position:fixed;} /* Pager. */ .pager {margin-bottom:0}