* Replace the subNavbar of pivot with mainMenu.
This commit is contained in:
liugang
@@ -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,');
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#subNavbar {text-align: left;}
|
||||
.main-position {position: relative;}
|
||||
.toolbar-padding {padding-right: 100px;}
|
||||
.child-position {position: absolute; right: 0;}
|
||||
|
||||
@@ -105,3 +105,9 @@ $lang->pivot->proVersion = '<a href="https://www.zentao.net/page/enterprise.h
|
||||
$lang->pivot->proVersionEn = '<a href="https://www.zentao.pm/" etarget="_blank">Testen Sie ZenTao Pro für mehr Informationen!</a>';
|
||||
$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;
|
||||
|
||||
@@ -105,3 +105,9 @@ $lang->pivot->proVersion = '<a href="https://www.zentao.net/page/enterprise.h
|
||||
$lang->pivot->proVersionEn = '<a href="https://www.zentao.pm/" target="_blank">Try ZenTao Biz for more!</a>';
|
||||
$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;
|
||||
|
||||
@@ -105,3 +105,9 @@ $lang->pivot->proVersion = '<a href="https://www.zentao.pm/page/vs.html" targ
|
||||
$lang->pivot->proVersionEn = '<a href="https://www.zentao.pm/page/vs.html" target="_blank">Try ZenTao Pro for more!</a>';
|
||||
$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;
|
||||
|
||||
@@ -106,3 +106,9 @@ $lang->pivot->proVersion = '<a href="https://api.zentao.net/goto.php?item=pro
|
||||
$lang->pivot->proVersionEn = '<a href="http://api.zentao.pm/goto.php?item=proversion&from=pivotpage" target="_blank">Hãy thử ZenTao Pro để biết thêm!</a>';
|
||||
$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;
|
||||
|
||||
@@ -104,3 +104,9 @@ $lang->pivot->deviationDesc = '按照已关闭执行统计偏差率（偏差率
|
||||
$lang->pivot->proVersion = '<a href="https://www.zentao.net/page/enterprise.html" target="_blank">更多精彩，尽在企业版！</a>';
|
||||
$lang->pivot->proVersionEn = '<a href="https://www.zentao.pm/" target="_blank">Try ZenTao Biz for more!</a>';
|
||||
$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;
|
||||
|
||||
@@ -104,3 +104,9 @@ $lang->pivot->deviationDesc = '按照已關閉執行統計偏差率（偏差率
|
||||
$lang->pivot->proVersion = '<a href="https://api.zentao.net/goto.php?item=proversion&from=pivotpage" target="_blank">更多精彩，盡在專業版！</a>';
|
||||
$lang->pivot->proVersionEn = '<a href="http://api.zentao.pm/goto.php?item=proversion&from=pivotpage" target="_blank">Try ZenTao Pro for more!</a>';
|
||||
$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;
|
||||
|
||||
@@ -8,6 +8,14 @@ $('#subNavbar li').not('[data-id=<?php echo $group;?>]').removeClass('active');
|
||||
<?php endif;?>
|
||||
<?php js::set('dimension', $dimension);?>
|
||||
<?php js::set('group', $group);?>
|
||||
<div id="mainMenu" class='clearfix'>
|
||||
<div class="btn-toolbar pull-left">
|
||||
<?php foreach($lang->pivot->featureBar['preview'] as $key => $label):?>
|
||||
<?php $active = ($key == $group) ? ' btn-active-text' : '';?>
|
||||
<?php echo html::a(inlink('preview', "dimension=$dimension&group=$key"), "<span class='text'>$label</span>", '', "class='btn btn-link {$active}'");?>
|
||||
<?php endforeach;?>
|
||||
</div>
|
||||
</div>
|
||||
<div id='mainContent' class='main-row'>
|
||||
<div class='side-col col-lg' id='sidebar'>
|
||||
<div class="sidebar-toggle">
|
||||
|
||||
Reference in New Issue
Block a user