diff --git a/module/mr/ui/commitlogs.html.php b/module/mr/ui/commitlogs.html.php index b588335f35..9a5b4902c8 100644 --- a/module/mr/ui/commitlogs.html.php +++ b/module/mr/ui/commitlogs.html.php @@ -19,6 +19,7 @@ dropmenu set::url(createLink($module, 'ajaxGetDropMenu', "objectID=$objectID&module={$app->rawModule}&method={$app->rawMethod}")) ); +include 'header.html.php'; detailHeader ( to::title @@ -47,72 +48,7 @@ panel div ( set::id('mrMenu'), - nav - ( - li - ( - setClass('nav-item'), - a - ( - $lang->mr->view, - set::href(inlink('view', "MRID={$MR->id}")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item'), - a - ( - $lang->mr->commitLogs, - setClass('active'), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item'), - a - ( - $lang->mr->viewDiff, - set::href(inlink('diff', "MRID={$MR->id}")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item story'), - a - ( - icon($lang->icons['story']), - $lang->productplan->linkedStories, - set::href(inlink('link', "MRID={$MR->id}&type=story")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item bug'), - a - ( - icon($lang->icons['bug']), - $lang->productplan->linkedBugs, - set::href(inlink('link', "MRID={$MR->id}&type=bug")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item task'), - a - ( - icon('todo'), - $lang->mr->linkedTasks, - set::href(inlink('link', "MRID={$MR->id}&type=task")), - set('data-app', $app->tab) - ) - ) - ) + $headers ), empty($commitLogs) ? p(setClass('detail-content'), in_array(strtolower($repo->SCM), array('gogs')) ? $lang->mr->unsupportedFeature : $lang->mr->noChanges) : div( setClass('pt-3'), diff --git a/module/mr/ui/diff.html.php b/module/mr/ui/diff.html.php index 7bf77959b5..d786046110 100644 --- a/module/mr/ui/diff.html.php +++ b/module/mr/ui/diff.html.php @@ -37,6 +37,7 @@ detailHeader ) ); +include 'header.html.php'; $entry = count($diffs) ? $diffs[0]->fileName : ''; $currentEntry = $this->repo->encodePath($entry); $fileInfo = $entry ? pathinfo($entry) : array(); @@ -64,72 +65,7 @@ panel div ( set::id('mrMenu'), - nav - ( - li - ( - setClass('nav-item'), - a - ( - $lang->mr->view, - set::href(inlink('view', "MRID={$MR->id}")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item'), - a - ( - $lang->mr->commitLogs, - set::href(inlink('commitlogs', "MRID={$MR->id}")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item'), - a - ( - $lang->mr->viewDiff, - setClass('active'), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item story'), - a - ( - icon($lang->icons['story']), - $lang->productplan->linkedStories, - set::href(inlink('link', "MRID={$MR->id}&type=story")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item bug'), - a - ( - icon($lang->icons['bug']), - $lang->productplan->linkedBugs, - set::href(inlink('link', "MRID={$MR->id}&type=bug")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item task'), - a - ( - icon('todo'), - $lang->mr->linkedTasks, - set::href(inlink('link', "MRID={$MR->id}&type=task")), - set('data-app', $app->tab) - ) - ) - ) + $headers ), empty($diffs) ? p(setClass('detail-content'), $lang->mr->noChanges) : div( setID('diff-sidebar-left'), diff --git a/module/mr/ui/header.html.php b/module/mr/ui/header.html.php new file mode 100644 index 0000000000..42bf282692 --- /dev/null +++ b/module/mr/ui/header.html.php @@ -0,0 +1,81 @@ +rawModule; +$methodName = $app->rawMethod; +if(empty($type)) $type = ''; +$headers = nav +( + li + ( + setClass('nav-item'), + a + ( + $lang->mr->view, + set::href(createLink($moduleName, 'view', "MRID={$MR->id}")), + $methodName == 'view' ? setClass('active') : null + ) + ), + li + ( + setClass('nav-item'), + a + ( + $lang->mr->commitLogs, + set::href(createLink($moduleName, 'commitlogs', "MRID={$MR->id}")), + set('data-app', $app->tab), + $methodName == 'commitlogs' ? setClass('active') : null + ) + ), + li + ( + setClass('nav-item'), + a + ( + $lang->mr->viewDiff, + set::href(createLink($moduleName, 'diff', "MRID={$MR->id}")), + set('data-app', $app->tab), + $methodName == 'diff' ? setClass('active') : null + ) + ), + li + ( + setClass('nav-item story'), + a + ( + icon($lang->icons['story']), + $lang->productplan->linkedStories, + set('data-app', $app->tab), + set::href($methodName == 'link' ? '#mr-story' : createLink($moduleName, 'link', "MRID={$MR->id}&type=story")), + $methodName == 'link' ? set('data-toggle', 'tab') : null, + $methodName == 'link' && $type == 'story' ? setClass('active') : null + ) + ), + li + ( + setClass('nav-item bug'), + a + ( + icon($lang->icons['bug']), + $lang->productplan->linkedBugs, + set('data-app', $app->tab), + set::href($methodName == 'link' ? '#mr-bug' : createLink($moduleName, 'link', "MRID={$MR->id}&type=bug")), + $methodName == 'link' ? set('data-toggle', 'tab') : null, + $methodName == 'link' && $type == 'bug' ? setClass('active') : null + ) + ), + li + ( + setClass('nav-item task'), + a + ( + icon('todo'), + $lang->mr->linkedTasks, + set('data-app', $app->tab), + set::href($methodName == 'link' ? '#mr-task' : createLink($moduleName, 'link', "MRID={$MR->id}&type=task")), + $methodName == 'link' ? set('data-toggle', 'tab') : null, + $methodName == 'link' && $type == 'task' ? setClass('active') : null + ) + ) +); diff --git a/module/mr/ui/link.html.php b/module/mr/ui/link.html.php index 85586f5971..0b9ca86893 100644 --- a/module/mr/ui/link.html.php +++ b/module/mr/ui/link.html.php @@ -124,81 +124,14 @@ detailHeader ) ); +include 'header.html.php'; panel ( setClass('relative'), div ( set::id('mrMenu'), - nav - ( - li - ( - setClass('nav-item' . ($type == 'view' ? ' active' : '')), - a - ( - $lang->mr->view, - set::href(inlink('view', "MRID={$MR->id}")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item'), - a - ( - $lang->mr->commitLogs, - set::href(inlink('commitlogs', "MRID={$MR->id}")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item' . ($type == 'diff' ? ' active' : '')), - a - ( - $lang->mr->viewDiff, - set::href(inlink('diff', "MRID={$MR->id}")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item story' . ($type == 'story' ? ' active' : '')), - a - ( - icon($lang->icons['story']), - $lang->productplan->linkedStories, - set::href('#mr-story'), - set('data-toggle', 'tab'), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item bug' . ($type == 'bug' ? ' active' : '')), - a - ( - icon($lang->icons['bug']), - $lang->productplan->linkedBugs, - set::href('#mr-bug'), - set('data-toggle', 'tab'), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item task' . ($type == 'task' ? ' active' : '')), - a - ( - icon('todo'), - $lang->mr->linkedTasks, - set::href('#mr-task'), - set('data-toggle', 'tab'), - set('data-app', $app->tab) - ) - ) - ) + $headers ), tabs ( diff --git a/module/mr/ui/view.html.php b/module/mr/ui/view.html.php index e821201c3f..c4ab32c2eb 100644 --- a/module/mr/ui/view.html.php +++ b/module/mr/ui/view.html.php @@ -19,6 +19,7 @@ dropmenu set::url(createLink($module, 'ajaxGetDropMenu', "objectID=$objectID&module={$app->rawModule}&method={$app->rawMethod}")) ); +include 'header.html.php'; $hasNoChange = $MR->synced && empty($rawMR->changes_count) ? true : false; $hasConflict = $MR->synced === '1' ? $rawMR->has_conflicts : !$MR->hasNoConflict; $sourceDisabled = ($MR->status == 'merged' && $MR->removeSourceBranch == '1') ? 'disabled' : ''; @@ -113,67 +114,7 @@ panel div ( set::id('mrMenu'), - nav - ( - li - ( - setClass('nav-item'), - a($lang->mr->view, setClass('active')) - ), - li - ( - setClass('nav-item'), - a - ( - $lang->mr->commitLogs, - set::href(inlink('commitlogs', "MRID={$MR->id}")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item'), - a - ( - $lang->mr->viewDiff, - set::href(inlink('diff', "MRID={$MR->id}")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item'), - a - ( - icon($lang->icons['story']), - $lang->productplan->linkedStories, - set::href(inlink('link', "MRID={$MR->id}&type=story")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item'), - a - ( - icon($lang->icons['bug']), - $lang->productplan->linkedBugs, - set::href(inlink('link', "MRID={$MR->id}&type=bug")), - set('data-app', $app->tab) - ) - ), - li - ( - setClass('nav-item'), - a - ( - icon('todo'), - $lang->mr->linkedTasks, - set::href(inlink('link', "MRID={$MR->id}&type=task")), - set('data-app', $app->tab) - ) - ) - ) + $headers ), div (