git-svn-id: https://192.168.57.71/svn/jsgkj@1376 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/src/main/webapp/static/js/common/grid/GridManager.css

@@ -530,7 +530,7 @@ table.grid-manager-default tbody tr:hover td {
 
 .table-warp table[grid-manager] .drag-ongoing {
 	cursor: all-scroll;
-	background: #000 !important;
+	background: #96a6ca !important;
 	border-color: #ccc !important;
 	color: #fff !important;
 	opacity: .5
@@ -798,7 +798,8 @@ transform
 .table-warp .page-toolbar select[name=pSizeArea] {
 	height: 20px;
 	padding: 0px;
-	margin-left: 10px
+	margin-left: 3px;
+	margin-right: 3px;
 }
 
 .grid-menu[grid-master] {

gkaqv2/trunk/modules/web/src/main/webapp/static/js/common/grid/GridManager.js

@@ -317,7 +317,7 @@ function() {
             l = '<span class="adjust-action"></span>',
             g = '<div class="sorting-action"><i class="sa-icon sa-up iconfont icon-sanjiao2"></i><i class="sa-icon sa-down iconfont icon-sanjiao1"></i></div>',
             h = '<a href="" download="" id="gm-export-action"></a>';
-            if (t.supportAjaxPage) var p = '<div class="page-toolbar"><div class="dataTables_info"></div><div class="change-size"><select name="pSizeArea"></select></div><div class="goto-page">' + t.i18nText("goto-first-text") + '<input type="text" class="gp-input"/>' + t.i18nText("goto-last-text") + '</div><div class="refresh-action"><i class="iconfont icon-shuaxin"></i></div><div class="ajax-page"><ul class="pagination"></ul></div></div>';
+            if (t.supportAjaxPage) var p = '<div class="page-toolbar">每页<div class="change-size"><select name="pSizeArea"></select></div>行<div class="dataTables_info"></div><div class="goto-page">' + t.i18nText("goto-first-text") + '<input type="text" class="gp-input"/>' + t.i18nText("goto-last-text") + '</div><div class="refresh-action"><i class="iconfont icon-shuaxin"></i></div><div class="ajax-page"><ul class="pagination"></ul></div></div>';
             var u, f, m, v, b, x, w, y, T, C, k, D, M, S;
             t.checkTable(e),
             t.useDefaultStyle && e.addClass("grid-manager-default"),
@@ -1161,7 +1161,8 @@ function() {
             var s = 1 == t.cPage ? 1 : (t.cPage - 1) * t.pSize + 1,
             c = t.cPage * t.pSize,
             d = t.tSize,
-            l = a.i18nText("dataTablesInfo", [s, c, d]);
+            //l = a.i18nText("dataTablesInfo", [s, c, d]);
+            l = a.i18nText("dataTablesInfo2", [t.tPage]);
             r.val(t.pSize || 10),
             o.html(l),
             r.show()
@@ -1213,27 +1214,31 @@ function() {
                 "en-us": "order"
             },
             "first-page": {
-                "zh-cn": "首页",
+                "zh-cn": "<<",
                 "en-us": "first"
             },
             "previous-page": {
-                "zh-cn": "上一页",
+                "zh-cn": "<",
                 "en-us": "previous"
             },
             "next-page": {
-                "zh-cn": "下一页",
+                "zh-cn": ">",
                 "en-us": "next "
             },
             "last-page": {
-                "zh-cn": "尾页",
+                "zh-cn": ">>",
                 "en-us": "last "
             },
             dataTablesInfo: {
                 "zh-cn": "此页显示 {0}-{1} 共{2}条",
                 "en-us": "this page show {0}-{1} count {2}"
             },
+            dataTablesInfo2: {
+                "zh-cn": "共{0}页",
+                "en-us": "count {0} page"
+            },
             "goto-first-text": {
-                "zh-cn": "跳转至",
+                "zh-cn": "到第",
                 "en-us": "goto "
             },
             "goto-last-text": {