From cf6c4f9359730a1084a033c81cfd49e5debcc4e7 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 31 May 2019 10:14:18 +0800 Subject: [PATCH] * Fix story and doc span style. --- module/doc/css/create.css | 1 - module/doc/css/createlib.css | 1 - module/doc/css/edit.css | 1 - module/doc/css/editlib.css | 1 - module/doc/view/create.html.php | 3 +++ module/doc/view/createlib.html.php | 3 +++ module/doc/view/edit.html.php | 3 +++ module/doc/view/editlib.html.php | 3 +++ module/doc/view/side.html.php | 2 +- module/project/lang/en.php | 2 +- module/story/css/create.css | 2 -- module/story/view/create.html.php | 3 +++ 12 files changed, 17 insertions(+), 8 deletions(-) diff --git a/module/doc/css/create.css b/module/doc/css/create.css index a7265b26a7..f31a665884 100644 --- a/module/doc/css/create.css +++ b/module/doc/css/create.css @@ -1,2 +1 @@ #whiteListBox .input-group:last-child{margin-top:10px} -#whiteListBox .input-group:last-child .input-group-addon{padding:5px 16px} diff --git a/module/doc/css/createlib.css b/module/doc/css/createlib.css index 0aad5d4557..5a9d9fbf82 100644 --- a/module/doc/css/createlib.css +++ b/module/doc/css/createlib.css @@ -8,4 +8,3 @@ table{width:90% !important} #project_chosen{width: 50%!important} #whiteListBox .input-group:last-child{margin-top:10px} -#whiteListBox .input-group:last-child .input-group-addon{padding:5px 16px} diff --git a/module/doc/css/edit.css b/module/doc/css/edit.css index a7265b26a7..f31a665884 100644 --- a/module/doc/css/edit.css +++ b/module/doc/css/edit.css @@ -1,2 +1 @@ #whiteListBox .input-group:last-child{margin-top:10px} -#whiteListBox .input-group:last-child .input-group-addon{padding:5px 16px} diff --git a/module/doc/css/editlib.css b/module/doc/css/editlib.css index 09b6eb891e..ecba31aba9 100644 --- a/module/doc/css/editlib.css +++ b/module/doc/css/editlib.css @@ -4,4 +4,3 @@ form {margin-right: 30px;} #whiteListBox div.input-group {margin-bottom: 2px;} #whiteListBox .input-group:last-child{margin-top:10px} -#whiteListBox .input-group:last-child .input-group-addon{padding:5px 16px} diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index 2a50a45c17..4f77dd60d1 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -10,6 +10,9 @@ * @link http://www.zentao.net */ ?> +app->getClientLang() == 'en'):?> + + doc->officeTypes, $docType) !== false):?>
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php index e53b15beec..1613c5117d 100644 --- a/module/doc/view/createlib.html.php +++ b/module/doc/view/createlib.html.php @@ -12,6 +12,9 @@ ?> +app->getClientLang() == 'en'):?> + +
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php index bdb1d248ad..20b7be0a0b 100644 --- a/module/doc/view/edit.html.php +++ b/module/doc/view/edit.html.php @@ -13,6 +13,9 @@ contentType == 'html') include '../../common/view/ueditor.html.php';?> contentType == 'markdown') include '../../common/view/markdown.html.php';?> +app->getClientLang() == 'en'):?> + +
diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php index 5ddcf493cc..50de980c50 100644 --- a/module/doc/view/editlib.html.php +++ b/module/doc/view/editlib.html.php @@ -12,6 +12,9 @@ ?> +app->getClientLang() == 'en'):?> + +
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php index 7baf667903..1ad1b1b4a3 100644 --- a/module/doc/view/side.html.php +++ b/module/doc/view/side.html.php @@ -13,7 +13,7 @@ if($this->methodName != 'browse') } if(empty($type)) $type = 'product'; ?> -
+
    diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 0ba8fe4239..7300894b09 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -83,7 +83,7 @@ $lang->team = new stdclass(); $lang->team->account = 'Username'; $lang->team->role = 'Role'; $lang->team->join = 'Joined'; -$lang->team->hours = 'hours/day'; +$lang->team->hours = 'Hours/day'; $lang->team->days = 'day'; $lang->team->totalHours = 'Total Hours'; diff --git a/module/story/css/create.css b/module/story/css/create.css index b4068ab3dd..d6efe12fb0 100644 --- a/module/story/css/create.css +++ b/module/story/css/create.css @@ -3,5 +3,3 @@ .pri-selector > .btn {padding: 5px 8px!important; width: 100%;} .pri-selector > .dropdown-menu {padding: 10px;} - -.sourceTd > .input-group > .input-group > .input-group-addon:first-child{padding: 5px 18px} diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 9e5d463ea0..a558ab1d88 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -12,6 +12,9 @@ ?> story->placeholder); ?> +app->getClientLang() == 'en'):?> + +