-
-

- icons['user']);?> - realname;?> (account;?>) - user->profile;?> -

-
- createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?> +
+
+
+
+

user->legendBasic;?>

+
+ createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?> +
+
+
+
+
+
user->account;?>
+
account;?>
+
user->realname;?>
+
realname;?>
+
user->dept;?>
+
+ $dept) + { + if($dept->name) echo $dept->name; + if(isset($deptPath[$key + 1])) echo $lang->arrow; + } + } + ?> +
+
user->role;?>
+
user->roleList[$user->role];?>
+
group->priv;?>
+
name . ' '; ?>
+
user->join;?>
+
join);?>
+
user->visits;?>
+
visits;?>
+
user->ip;?>
+
ip;?>
+
user->last;?>
+
last;?>
+ ranzhi):?> +
user->ranzhi;?>
+
+ ranzhi . ' ';?> + createLink('my', 'unbind'), "", 'hiddenwin', "class='bin-icon' title='{$lang->user->unbind}'");?> +
+ +
+
+
+
+
user->commiter;?>
+
commiter;?>
+
user->email;?>
+
email;?>
+ user->contactField) as $field):?> +
user->$field;?>
+
+ $field) + { + echo html::a("callto://$user->skype", $user->skype); + } + elseif($field == 'qq' and $user->$field) + { + echo html::a("tencent://message/?uin=$user->qq", $user->qq); + } + else + { + echo $user->$field; + } + ?> +
+ +
user->address;?>
+
address;?>
+
user->zipcode;?>
+
zipcode;?>
+
+
+
+
+
+
+
+
+

user->legendContribution;?>

+
+
+ user->personalData as $key => $title):?> +
+
+
+
+ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - user->contactField) as $field):?> - - - - - - - - - - - - - - ranzhi):?> - - - - - -
user->dept;?> - $dept) - { - if($dept->name) echo $dept->name; - if(isset($deptPath[$key + 1])) echo $lang->arrow; - } - } - ?> -
user->account;?>account;?>
user->realname;?>realname;?>
group->priv;?>name . ' '; ?>
user->role;?>user->roleList[$user->role];?>
user->join;?>join);?>
user->commiter;?>commiter;?>
user->email;?>email;?>
user->visits;?>visits;?>
user->ip;?>ip;?>
user->last;?>last;?>
user->$field;?> - $field) - { - echo html::a("callto://$user->skype", $user->skype); - } - elseif($field == 'qq' and $user->$field) - { - echo html::a("tencent://message/?uin=$user->qq", $user->qq); - } - else - { - echo $user->$field; - } - ?> -
user->address;?>address;?>
user->zipcode;?>zipcode;?>
user->ranzhi;?>ranzhi;?>
From 4d4093e703724f48190b9e59aaa1764ee9f4cb6c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 28 May 2019 13:44:32 +0800 Subject: [PATCH 06/13] * finish task #5583. --- module/block/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 150463119f..77625497f9 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -55,7 +55,7 @@ $lang->block->editBlock = '编辑区块'; $lang->block->ordersSaved = '排序已保存'; $lang->block->confirmRemoveBlock = '确定移除区块吗？'; $lang->block->noticeNewBlock = '10.0版本以后各个视图主页提供了全新的视图，您要启用新的视图布局吗？'; -$lang->block->confirmReset = '是否恢复默认布局'; +$lang->block->confirmReset = '是否恢复默认布局？'; $lang->block->closeForever = '永久关闭'; $lang->block->confirmClose = '确定永久关闭该区块吗？关闭后所有人都将无法使用该区块，可以在后台自定义中打开。'; $lang->block->remove = '移除'; From 4ba742dd9517a442c5ecf6b2a523d3814abb04e7 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 28 May 2019 14:00:19 +0800 Subject: [PATCH 07/13] * finish task #5581. --- module/product/lang/en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 6a16287d1f..d8aa9b6519 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->product->common = $lang->productCommon; -$lang->product->index = $lang->productCommon . 'Home'; +$lang->product->index = $lang->productCommon . ' Home'; $lang->product->browse = 'Story'; $lang->product->dynamic = 'Dynamics'; $lang->product->view = 'Overview'; From 8f069e202aa65e909d02a7da3adf7116656c1249 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 28 May 2019 14:16:27 +0800 Subject: [PATCH 08/13] * finish task #5580. --- module/product/lang/en.php | 3 ++- module/product/lang/zh-cn.php | 1 + www/theme/lang/en.css | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/module/product/lang/en.php b/module/product/lang/en.php index d8aa9b6519..b8510a8f3b 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -128,7 +128,7 @@ $lang->product->featureBar['browse']['allstory'] = $lang->product->allStory; $lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed; $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe; $lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe; -$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe; + $lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory; $lang->product->featureBar['browse']['more'] = $lang->more; @@ -136,6 +136,7 @@ $lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed; $lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed']; $lang->product->featureBar['all']['all'] = $lang->product->allProduct; +$lang->product->moreSelects['reviewedbyme'] = $lang->product->reviewedByMe; $lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe; $lang->product->moreSelects['activestory'] = $lang->product->activeStory; $lang->product->moreSelects['changedstory'] = $lang->product->changedStory; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 544eb6ac8c..aba4550471 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -136,6 +136,7 @@ $lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed; $lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed']; $lang->product->featureBar['all']['all'] = $lang->product->allProduct; + $lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe; $lang->product->moreSelects['activestory'] = $lang->product->activeStory; $lang->product->moreSelects['changedstory'] = $lang->product->changedStory; diff --git a/www/theme/lang/en.css b/www/theme/lang/en.css index e69de29bb2..b1d07a2c71 100644 --- a/www/theme/lang/en.css +++ b/www/theme/lang/en.css @@ -0,0 +1 @@ +.btn-toolbar>.btn, .btn-toolbar>.btn-group, .btn-toolbar>.dropdown {margin-right: 5px !important;} From 1986ce272ece8c8ad5e35ce9d1992515d57766b0 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 28 May 2019 14:21:01 +0800 Subject: [PATCH 09/13] * finish task #5579. --- module/product/css/common.css | 1 + 1 file changed, 1 insertion(+) diff --git a/module/product/css/common.css b/module/product/css/common.css index c3e6c23e1c..77dc41ccce 100644 --- a/module/product/css/common.css +++ b/module/product/css/common.css @@ -1,2 +1,3 @@ #whitelistBox .checkbox-primary, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;} .c-pri {overflow:hidden;} +#mainMenu .btn-toolbar .dropdown-menu li a.btn{text-align:left;} From 289eae85210b8af14d20d0a27d44de90daa567af Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 28 May 2019 15:40:33 +0800 Subject: [PATCH 10/13] * Finish task #5460. --- module/doc/view/alllibs.html.php | 2 +- module/doc/view/alllibsbylist.html.php | 2 +- module/doc/view/browse.html.php | 2 +- module/doc/view/browsebygrid.html.php | 2 +- module/doc/view/objectlibs.html.php | 2 +- module/doc/view/objectlibsbylist.html.php | 2 +- module/doc/view/showfiles.html.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php index 501318986a..f8d3a82ba0 100644 --- a/module/doc/view/alllibs.html.php +++ b/module/doc/view/alllibs.html.php @@ -24,8 +24,8 @@ doclib->tabList, $type);?>
- ", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?> ", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?> + ", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
diff --git a/module/doc/view/alllibsbylist.html.php b/module/doc/view/alllibsbylist.html.php index 668d922d3c..c6091df598 100644 --- a/module/doc/view/alllibsbylist.html.php +++ b/module/doc/view/alllibsbylist.html.php @@ -5,8 +5,8 @@ doclib->tabList, $type);?>
- ", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?> ", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?> + ", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>