diff --git a/extension/lite/user/ext/view/dynamic.lite.html.hook.php b/extension/lite/user/ext/view/dynamic.lite.html.hook.php deleted file mode 100644 index b8993f230c..0000000000 --- a/extension/lite/user/ext/view/dynamic.lite.html.hook.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extension/lite/user/ext/view/execution.lite.html.hook.php b/extension/lite/user/ext/view/execution.lite.html.hook.php deleted file mode 100644 index b8993f230c..0000000000 --- a/extension/lite/user/ext/view/execution.lite.html.hook.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extension/lite/user/ext/view/featurebar.html.php b/extension/lite/user/ext/view/featurebar.html.php new file mode 100644 index 0000000000..a73135924e --- /dev/null +++ b/extension/lite/user/ext/view/featurebar.html.php @@ -0,0 +1,66 @@ + +
+ + diff --git a/extension/lite/user/ext/view/featurebar.lite.html.hook.php b/extension/lite/user/ext/view/featurebar.lite.html.hook.php deleted file mode 100644 index 43d0e35d07..0000000000 --- a/extension/lite/user/ext/view/featurebar.lite.html.hook.php +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/extension/lite/user/ext/view/profile.lite.html.hook.php b/extension/lite/user/ext/view/profile.lite.html.hook.php deleted file mode 100644 index b8993f230c..0000000000 --- a/extension/lite/user/ext/view/profile.lite.html.hook.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extension/lite/user/ext/view/story.lite.html.hook.php b/extension/lite/user/ext/view/story.lite.html.hook.php deleted file mode 100644 index b8993f230c..0000000000 --- a/extension/lite/user/ext/view/story.lite.html.hook.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extension/lite/user/ext/view/task.lite.html.hook.php b/extension/lite/user/ext/view/task.lite.html.hook.php deleted file mode 100644 index b8993f230c..0000000000 --- a/extension/lite/user/ext/view/task.lite.html.hook.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extension/lite/user/ext/view/todo.lite.html.hook.php b/extension/lite/user/ext/view/todo.lite.html.hook.php deleted file mode 100644 index b8993f230c..0000000000 --- a/extension/lite/user/ext/view/todo.lite.html.hook.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extension/lite/user/ext/view/todocalendar.lite.html.hook.php b/extension/lite/user/ext/view/todocalendar.lite.html.hook.php deleted file mode 100644 index b8993f230c..0000000000 --- a/extension/lite/user/ext/view/todocalendar.lite.html.hook.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/framework/base/control.class.php b/framework/base/control.class.php index 01212eb037..cd96ce19ec 100644 --- a/framework/base/control.class.php +++ b/framework/base/control.class.php @@ -416,12 +416,13 @@ class baseControl $moduleName = basename(dirname(dirname(realpath($viewFile)))); $extPath = $this->app->getModuleExtPath('', $moduleName, 'view'); - $checkedOrder = array('site', 'common', 'xuan', 'vision', 'custom'); + $checkedOrder = array('site', 'custom', 'vision', 'xuan', 'common'); + $fileName = basename($viewFile); foreach($checkedOrder as $checkedType) { if(!empty($extPath[$checkedType])) { - $extViewFile = $extPath[$checkedType] . basename($viewFile); + $extViewFile = $extPath[$checkedType] . $fileName; if(file_exists($extViewFile)) { helper::cd($extPath[$checkedType]); diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php index 6af3ff7ca7..816199e89d 100755 --- a/module/user/view/featurebar.html.php +++ b/module/user/view/featurebar.html.php @@ -10,60 +10,60 @@ $label = "{$lang->user->schedule}"; $active = $methodName == 'todo' ? ' btn-active-text' : ''; - common::printLink('user', 'todo', "userID={$user->id}&type=all", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'todo', "userID={$user->id}&type=all", $label, '', "class='btn btn-link $active todoTab'"); $label = "{$lang->user->task}"; $active = $methodName == 'task' ? ' btn-active-text' : ''; - common::printLink('user', 'task', "userID={$user->id}", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'task', "userID={$user->id}", $label, '', "class='btn btn-link $active taskTab'"); if($config->URAndSR) { $label = "{$lang->URCommon}"; $active = ($methodName == 'story' and $storyType == 'requirement') ? ' btn-active-text' : ''; - common::printLink('user', 'story', "userID={$user->id}&storyType=requirement", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'story', "userID={$user->id}&storyType=requirement", $label, '', "class='btn btn-link $active URTab'"); } $label = "{$lang->SRCommon}"; $active = ($methodName == 'story' and $storyType == 'story') ? ' btn-active-text' : ''; - common::printLink('user', 'story', "userID={$user->id}&storyType=story", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'story', "userID={$user->id}&storyType=story", $label, '', "class='btn btn-link $active SRTab'"); $label = "{$lang->user->bug}"; $active = $methodName == 'bug' ? ' btn-active-text' : ''; - common::printLink('user', 'bug', "userID={$user->id}", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'bug', "userID={$user->id}", $label, '', "class='btn btn-link $active bugTab'"); $label = "{$lang->user->testTask}"; $active = $methodName == 'testtask' ? ' btn-active-text' : ''; - common::printLink('user', 'testtask', "userID={$user->id}", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'testtask', "userID={$user->id}", $label, '', "class='btn btn-link $active testtaskTab'"); $label = "{$lang->user->testCase}"; $active = $methodName == 'testcase' ? ' btn-active-text' : ''; - common::printLink('user', 'testcase', "userID={$user->id}", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'testcase', "userID={$user->id}", $label, '', "class='btn btn-link $active testcaseTab'"); if($this->config->systemMode == 'new') { $label = "{$lang->user->execution}"; $active = $methodName == 'execution' ? ' btn-active-text' : ''; - common::printLink('user', 'execution', "userID={$user->id}", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'execution', "userID={$user->id}", $label, '', "class='btn btn-link $active executionTab'"); } if($this->config->edition == 'max') { $label = "{$lang->user->issue}"; $active = $methodName == 'issue' ? ' btn-active-text' : ''; - common::printLink('user', 'issue', "userID={$user->id}", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'issue', "userID={$user->id}", $label, '', "class='btn btn-link $active issueTab'"); $label = "{$lang->user->risk}"; $active = $methodName == 'risk' ? ' btn-active-text' : ''; - common::printLink('user', 'risk', "userID={$user->id}", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'risk', "userID={$user->id}", $label, '', "class='btn btn-link $active riskTab'"); } $label = "{$lang->user->dynamic}"; $active = $methodName == 'dynamic' ? ' btn-active-text' : ''; - common::printLink('user', 'dynamic', "userID={$user->id}&type=today", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'dynamic', "userID={$user->id}&type=today", $label, '', "class='btn btn-link $active dynamicTab'"); $label = "{$lang->user->profile}"; $active = $methodName == 'profile' ? ' btn-active-text' : ''; - common::printLink('user', 'profile', "userID={$user->id}", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'profile', "userID={$user->id}", $label, '', "class='btn btn-link $active profileTab'"); ?>