+ pivot->featureBar['preview'] as $key => $label):?>
+
+ $label", '', "class='btn btn-link {$active}'");?>
+
+
+diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index ad446e55cd..a5a63465ec 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -547,17 +547,6 @@ $lang->report->menu->pivot = array('link' => "{$lang->pivot->common}|pivot|prev $lang->report->menuOrder[5] = 'screen'; $lang->report->menuOrder[10] = 'pivot'; -$lang->report->menu->pivot['subMenu'] = new stdclass(); -$lang->report->menu->pivot['subMenu']->product = array('link' => "{$lang->product->common}|pivot|preview|diemsnion=&group=product"); -$lang->report->menu->pivot['subMenu']->project = array('link' => "{$lang->project->common}|pivot|preview|dimension=&group=project"); -$lang->report->menu->pivot['subMenu']->test = array('link' => "{$lang->qa->common}|pivot|preview|dimension=&group=test"); -$lang->report->menu->pivot['subMenu']->staff = array('link' => "{$lang->system->common}|pivot|preview|dimension=&group=staff"); - -$lang->report->menu->pivot['menuOrder'][5] = 'product'; -$lang->report->menu->pivot['menuOrder'][10] = 'project'; -$lang->report->menu->pivot['menuOrder'][15] = 'test'; -$lang->report->menu->pivot['menuOrder'][20] = 'staff'; - /* Company menu.*/ $lang->company->menu = new stdclass(); $lang->company->menu->browseUser = array('link' => "{$lang->user->common}|company|browse", 'subModule' => ',user,'); diff --git a/module/pivot/css/preview.css b/module/pivot/css/preview.css index c5d7aefa4f..f7a384c8e2 100644 --- a/module/pivot/css/preview.css +++ b/module/pivot/css/preview.css @@ -1,4 +1,3 @@ -#subNavbar {text-align: left;} .main-position {position: relative;} .toolbar-padding {padding-right: 100px;} .child-position {position: absolute; right: 0;} diff --git a/module/pivot/lang/de.php b/module/pivot/lang/de.php index abab8c3a56..b0dff9f2c1 100644 --- a/module/pivot/lang/de.php +++ b/module/pivot/lang/de.php @@ -105,3 +105,9 @@ $lang->pivot->proVersion = 'Testen Sie ZenTao Pro für mehr Informationen!'; $lang->pivot->workloadDesc = 'Workload = the total left hours of all tasks of the user / selected days * hours per day. For example: the begin and end date is January 1st to January 7th, and the total work days is 5 days, 8 hours per day. The Work load is all unfinished tasks assigned to this user to be finished in 5 days, 8 hours per day.'; + +$lang->pivot->featureBar = array(); +$lang->pivot->featureBar['preview']['product'] = $lang->product->common; +$lang->pivot->featureBar['preview']['project'] = $lang->project->common; +$lang->pivot->featureBar['preview']['test'] = $lang->qa->common; +$lang->pivot->featureBar['preview']['staff'] = $lang->system->common; diff --git a/module/pivot/lang/en.php b/module/pivot/lang/en.php index 93684b3862..81dc50e804 100644 --- a/module/pivot/lang/en.php +++ b/module/pivot/lang/en.php @@ -105,3 +105,9 @@ $lang->pivot->proVersion = 'Try ZenTao Biz for more!'; $lang->pivot->workloadDesc = 'Workload = the total left hours of all tasks of the user / selected days * hours per day. For example: the begin and end date is January 1st to January 7th, and the total work days is 5 days, 8 hours per day. The Work load is all unfinished tasks assigned to this user to be finished in 5 days, 8 hours per day.'; + +$lang->pivot->featureBar = array(); +$lang->pivot->featureBar['preview']['product'] = $lang->product->common; +$lang->pivot->featureBar['preview']['project'] = $lang->project->common; +$lang->pivot->featureBar['preview']['test'] = $lang->qa->common; +$lang->pivot->featureBar['preview']['staff'] = $lang->system->common; diff --git a/module/pivot/lang/fr.php b/module/pivot/lang/fr.php index e771c3d098..68b4333c24 100644 --- a/module/pivot/lang/fr.php +++ b/module/pivot/lang/fr.php @@ -105,3 +105,9 @@ $lang->pivot->proVersion = 'pivot->proVersionEn = 'Try ZenTao Pro for more!'; $lang->pivot->workloadDesc = 'Workload = the total left hours of all tasks of the user / selected days * hours per day. For example: the begin and end date is January 1st to January 7th, and the total work days is 5 days, 8 hours per day. The Work load is all unfinished tasks assigned to this user to be finished in 5 days, 8 hours per day.'; + +$lang->pivot->featureBar = array(); +$lang->pivot->featureBar['preview']['product'] = $lang->product->common; +$lang->pivot->featureBar['preview']['project'] = $lang->project->common; +$lang->pivot->featureBar['preview']['test'] = $lang->qa->common; +$lang->pivot->featureBar['preview']['staff'] = $lang->system->common; diff --git a/module/pivot/lang/vi.php b/module/pivot/lang/vi.php index b4bb92a201..20259b3dd1 100644 --- a/module/pivot/lang/vi.php +++ b/module/pivot/lang/vi.php @@ -106,3 +106,9 @@ $lang->pivot->proVersion = 'Hãy thử ZenTao Pro để biết thêm!'; $lang->pivot->workloadDesc = 'Workload = the total left hours of all tasks of the user / selected days * hours per day. For example: the begin and end date is January 1st to January 7th, and the total work days is 5 days, 8 hours per day. The Work load is all unfinished tasks assigned to this user to be finished in 5 days, 8 hours per day.'; + +$lang->pivot->featureBar = array(); +$lang->pivot->featureBar['preview']['product'] = $lang->product->common; +$lang->pivot->featureBar['preview']['project'] = $lang->project->common; +$lang->pivot->featureBar['preview']['test'] = $lang->qa->common; +$lang->pivot->featureBar['preview']['staff'] = $lang->system->common; diff --git a/module/pivot/lang/zh-cn.php b/module/pivot/lang/zh-cn.php index a391761bfa..68bafdc917 100644 --- a/module/pivot/lang/zh-cn.php +++ b/module/pivot/lang/zh-cn.php @@ -104,3 +104,9 @@ $lang->pivot->deviationDesc = '按照已关闭执行统计偏差率(偏差率 $lang->pivot->proVersion = '更多精彩,尽在企业版!'; $lang->pivot->proVersionEn = 'Try ZenTao Biz for more!'; $lang->pivot->workloadDesc = '工作负载=用户所有任务剩余工时之和/选择的时间天数*每天的工时。例如:起止时间设为1月1日~1月7日、工作日天数5天、每天工时8h,统计的是所有指派给该人员的未完成的任务,在5天内,每天8h的情况下的工作负载。'; + +$lang->pivot->featureBar = array(); +$lang->pivot->featureBar['preview']['product'] = $lang->product->common; +$lang->pivot->featureBar['preview']['project'] = $lang->project->common; +$lang->pivot->featureBar['preview']['test'] = $lang->qa->common; +$lang->pivot->featureBar['preview']['staff'] = $lang->system->common; diff --git a/module/pivot/lang/zh-tw.php b/module/pivot/lang/zh-tw.php index cb09354bf9..72196c2ae1 100644 --- a/module/pivot/lang/zh-tw.php +++ b/module/pivot/lang/zh-tw.php @@ -104,3 +104,9 @@ $lang->pivot->deviationDesc = '按照已關閉執行統計偏差率(偏差率 $lang->pivot->proVersion = '更多精彩,盡在專業版!'; $lang->pivot->proVersionEn = 'Try ZenTao Pro for more!'; $lang->pivot->workloadDesc = '工作負載=用戶所有任務剩餘工時之和/選擇的時間天數*每天的工時。例如:起止時間設為1月1日~1月7日、工作日天數5天、每天工時8h,統計的是所有指派給該人員的未完成的任務,在5天內,每天8h的情況下的工作負載。'; + +$lang->pivot->featureBar = array(); +$lang->pivot->featureBar['preview']['product'] = $lang->product->common; +$lang->pivot->featureBar['preview']['project'] = $lang->project->common; +$lang->pivot->featureBar['preview']['test'] = $lang->qa->common; +$lang->pivot->featureBar['preview']['staff'] = $lang->system->common; diff --git a/module/pivot/view/preview.html.php b/module/pivot/view/preview.html.php index 708520f5ab..e3dbe41e64 100644 --- a/module/pivot/view/preview.html.php +++ b/module/pivot/view/preview.html.php @@ -8,6 +8,14 @@ $('#subNavbar li').not('[data-id=]').removeClass('active'); +