diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 25db65f8c7..ef8dc10eb0 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -379,7 +379,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
-
+
show('right', 'pagerjs');?>
diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php
index 7d1dfae16d..0087447d23 100644
--- a/module/build/view/linkbug.html.php
+++ b/module/build/view/linkbug.html.php
@@ -66,7 +66,7 @@
id}&type=bug"), $lang->goback, '', "class='btn'");?>
-
+
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index 96e01d475d..f3029edfa7 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -70,7 +70,7 @@
id}&type=story"), $lang->goback, '', "class='btn'");?>
-
+
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index ea6bb0114e..c20dd56d00 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -158,7 +158,7 @@ tbody tr td:first-child input{display:none;}
build->batchUnlink, '', 'btn');?>
- build->finishStories, $countStories);?>
+ build->finishStories, $countStories);?>
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 66b8901e41..3d1c8ad341 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -512,6 +512,19 @@ $lang->pager->locate = "Go!";
$lang->pager->previousPage = "Prev";
$lang->pager->nextPage = "Next";
$lang->pager->summery = "%s-%s of %s.";
+$lang->pager->pageOfText = "Page {0}";
+$lang->pager->firstPage = "First";
+$lang->pager->lastPage = "Last";
+$lang->pager->goto = "Goto";
+$lang->pager->pageOf = "Page {page}";
+$lang->pager->totalPage = "{totalPage} pages";
+$lang->pager->totalCount = "Total: {recTotal} items";
+$lang->pager->pageSize = "{recPerPage} per page";
+$lang->pager->itemsRange = "From {start} to {end}";
+$lang->pager->pageOfTotal = "Page {page} of {totalPage}";
+
+$lang->colorPicker = new stdclass();
+$lang->colorPicker->errorTip = 'Not a valid color value';
$lang->proVersion = "ZenTao Pro ";
$lang->downNotify = "Download Desktop Notification";
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 61a3217136..c0c3b5bd42 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -512,6 +512,19 @@ $lang->pager->locate = "Go!";
$lang->pager->previousPage = "Prev";
$lang->pager->nextPage = "Next";
$lang->pager->summery = "%s-%s of %s.";
+$lang->pager->pageOfText = "Page {0}";
+$lang->pager->firstPage = "First";
+$lang->pager->lastPage = "Last";
+$lang->pager->goto = "Goto";
+$lang->pager->pageOf = "Page {page}";
+$lang->pager->totalPage = "{totalPage} pages";
+$lang->pager->totalCount = "Total: {recTotal} items";
+$lang->pager->pageSize = "{recPerPage} per page";
+$lang->pager->itemsRange = "From {start} to {end}";
+$lang->pager->pageOfTotal = "Page {page} of {totalPage}";
+
+$lang->colorPicker = new stdclass();
+$lang->colorPicker->errorTip = 'Not a valid color value';
$lang->proVersion = "ZenTao Pro ";
$lang->downNotify = "Download Desktop Notification";
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index d3c20a7a5c..014ee074de 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -512,6 +512,19 @@ $lang->pager->locate = "GO!";
$lang->pager->previousPage = "上一页";
$lang->pager->nextPage = "下一页";
$lang->pager->summery = "第 %s-%s 项,共 %s 项";
+$lang->pager->pageOfText = '第 {0} 页';
+$lang->pager->firstPage = '第一页';
+$lang->pager->lastPage = '最后一页';
+$lang->pager->goto = '跳转';
+$lang->pager->pageOf = '第 {page} 页';
+$lang->pager->totalPage = '共 {totalPage} 页';
+$lang->pager->totalCount = '共 {recTotal} 项';
+$lang->pager->pageSize = '每页 {recPerPage} 项';
+$lang->pager->itemsRange = '第 {start} ~ {end} 项';
+$lang->pager->pageOfTotal = '第 {page}/{totalPage} 页';
+
+$lang->colorPicker = new stdclass();
+$lang->colorPicker->errorTip = '不是有效的颜色值';
$lang->proVersion = "专业版 ";
$lang->downNotify = "下载桌面提醒";
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 9c21185fd8..fe1baa5534 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -2,6 +2,7 @@
if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}
include 'header.lite.html.php';
include 'chosen.html.php';
+include 'pager.html.php';
//include 'validation.html.php';
?>
+$.extend($.fn.pager.Constructor.LANG, {
+ 'getClientLang();?>': {
+ 'pageOfText': "pager->pageOfText;?>",
+ 'prev': "pager->previousPage;?>",
+ 'next': "pager->nextPage;?>",
+ 'first': "pager->firstPage;?>",
+ 'last': "pager->lastPage;?>",
+ 'goto': "pager->goto;?>",
+ 'pageOf': "pager->pageOf;?>",
+ 'totalPage': "pager->totalPage;?>",
+ 'totalCount': "pager->totalCount;?>",
+ 'pageSize': "pager->pageSize;?>",
+ 'itemsRange': "pager->itemsRange;?>",
+ 'pageOfTotal': "pager->pageOfTotal;?>"
+ }
+});
+$.extend($.fn.colorPicker.Constructor.LANG, {
+ 'getClientLang();?>': {
+ 'errorTip': "colorPicker->errorTip;?>"
+ }
+});
+
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 8a48f77bae..5abe4c585a 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -66,7 +66,7 @@
id&type=bug&orderBy=$orderBy"), $lang->goback, '', "class='btn'");?>
-
+
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index 3795ad1962..c41c51d528 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -74,7 +74,7 @@
id&type=story&orderBy=$orderBy"), $lang->goback, '', "class='btn'");?>
-
+
diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php
index 9140f62695..cf35639a9b 100644
--- a/module/release/view/linkbug.html.php
+++ b/module/release/view/linkbug.html.php
@@ -70,7 +70,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
id&type=$type"), $lang->goback, '', "class='btn'");?>
-
+
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index 09c9b1ec4e..d835a52a5d 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -71,7 +71,7 @@
id&type=story"), $lang->goback, '', "class='btn'");?>
-
+
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index f591324b31..8944b1959c 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -214,7 +214,7 @@ js::set('suiteID', $suiteID);
-
+
show('right', 'pagerjs');?>
diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index 1ea5d7d695..46c51275cf 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -34,7 +34,7 @@
idAB);?>
- testcase->branch ?> |
+ testcase->branch ?> |
priAB);?> |
testcase->title);?> |
@@ -80,7 +80,7 @@
goback, $this->session->caseList);?>
-
+
show('right', 'pagerjs');?>
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index 6d84102772..cdf1c7a5a8 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -78,7 +78,7 @@
-
+
show('right', 'pagerjs');?>
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index fbd6becd84..9714da2d8a 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -126,7 +126,7 @@