diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 33488b21a9..1c6fdecce8 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -53,6 +53,7 @@ $lang->preview = 'Ansehen'; $lang->goback = 'Zurück'; $lang->goPC = 'PC'; $lang->more = 'Mehr'; +$lang->moreLink = 'MORE'; $lang->day = 'Tag'; $lang->customConfig = 'Custom Config'; $lang->public = 'Öffentlich'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index e87e0ea2d2..52ca9a94ba 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -53,6 +53,7 @@ $lang->preview = 'View'; $lang->goback = 'Back'; $lang->goPC = 'PC'; $lang->more = 'More'; +$lang->moreLink = 'MORE'; $lang->day = ' Day'; $lang->customConfig = 'Custom Config'; $lang->public = 'Public'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 30d886c0c6..ccbabae896 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -53,6 +53,7 @@ $lang->preview = 'Consulter'; $lang->goback = 'Retour'; $lang->goPC = 'PC'; $lang->more = 'Plus'; +$lang->moreLink = 'MORE'; $lang->day = 'Jour'; $lang->customConfig = 'Personnalisation'; $lang->public = 'Public'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 9fc1cd17cb..66d830d45c 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -53,6 +53,7 @@ $lang->preview = 'Xem'; $lang->goback = 'Trở lại'; $lang->goPC = 'PC'; $lang->more = 'Thêm'; +$lang->moreLink = 'MORE'; $lang->day = ' Day'; $lang->customConfig = 'Tùy biến cấu hình'; $lang->public = 'Công khai'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 893c0f70c7..9d880d5f08 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -53,6 +53,7 @@ $lang->preview = '查看'; $lang->goback = '返回'; $lang->goPC = 'PC版'; $lang->more = '更多'; +$lang->moreLink = 'MORE'; $lang->day = '天'; $lang->customConfig = '自定义'; $lang->public = '公共'; diff --git a/module/product/control.php b/module/product/control.php index d6e97721f4..4cbaea377c 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -832,6 +832,8 @@ class product extends control */ public function all($browseType = 'noclosed', $orderBy = 'order_desc') { + $this->lang->product->mainMenuAction = html::a('javascript:history.go(-1);', ' ' . $this->lang->goback, '', "class='btn btn-link'"); + /* Load module and set session. */ $this->loadModel('program'); $this->session->set('productList', $this->app->getURI(true)); diff --git a/module/product/model.php b/module/product/model.php index 3d49cd4d29..3f118b81df 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -501,7 +501,7 @@ class productModel extends model */ public function getProductMainAction() { - return common::hasPriv('product', 'all') ? html::a(helper::createLink('product', 'all'), $this->lang->product->moreProduct, '', "class='btn btn-link'") : ''; + return common::hasPriv('product', 'all') ? html::a(helper::createLink('product', 'all'), $this->lang->moreLink, '', "class='btn btn-link'") : ''; } /** diff --git a/module/program/control.php b/module/program/control.php index 5a0453f7e8..eb7062b696 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -60,7 +60,8 @@ class program extends control */ public function PGMBrowse($status = 'all', $orderBy = 'order_asc') { - $this->lang->navGroup->program = 'program'; + $this->lang->navGroup->program = 'program'; + $this->lang->program->mainMenuAction = html::a('javascript:history.go(-1);', ' ' . $this->lang->goback, '', "class='btn btn-link'"); if(common::hasPriv('program', 'pgmcreate')) $this->lang->pageActions = html::a($this->createLink('program', 'pgmcreate'), " " . $this->lang->program->PGMCreate, '', "class='btn btn-secondary'"); @@ -760,6 +761,7 @@ class program extends control */ public function PRJBrowse($programID = 0, $browseType = 'doing', $param = 0, $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1) { + $this->lang->program->mainMenuAction = html::a('javascript:history.go(-1);', ' ' . $this->lang->goback, '', "class='btn btn-link'"); $this->app->session->set('PRJBrowse', $this->app->getURI(true)); $this->loadModel('datatable'); diff --git a/module/program/model.php b/module/program/model.php index 66873146e1..25de03559a 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -31,7 +31,7 @@ class programModel extends model */ public function getPGMMainAction() { - return common::hasPriv('program', 'pgmbrowse') ? html::a(helper::createLink('program', 'pgmbrowse'), $this->lang->program->morePGM, '', "class='btn btn-link'") : ''; + return common::hasPriv('program', 'pgmbrowse') ? html::a(helper::createLink('program', 'pgmbrowse'), $this->lang->moreLink, '', "class='btn btn-link'") : ''; } /** @@ -813,7 +813,7 @@ class programModel extends model public function getPRJMainAction($module, $method) { if($module == 'program' and $method != 'index') return ''; - return common::hasPriv('program', 'prjbrowse') ? html::a(helper::createLink('program', 'prjbrowse'), $this->lang->program->morePRJ, '', "class='btn btn-link'") : ''; + return common::hasPriv('program', 'prjbrowse') ? html::a(helper::createLink('program', 'prjbrowse'), $this->lang->moreLink, '', "class='btn btn-link'") : ''; } /** diff --git a/www/theme/default/style.css b/www/theme/default/style.css index fd89894e67..6edb02a78f 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -54,7 +54,7 @@ a.showMoreImage:hover {opacity: 1;} .table-actions .btn{border: 1px solid #1183fb; color: #1183fb} .table-actions .btn:hover{background: #b3d4fc} -#header #toolbar a{color: #fff; font-size: 14px; line-height: 15px;} +#header #toolbar a{color: #84a2e2; font-size: 14px; line-height: 15px; border: #84a2e2 1px solid} #navbar .nav>li.divider {margin: 15px 8px 15px 8px;} #navbar .nav>li>a { padding: 10px 10px;}