diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 9dd372963b..404e6f20cc 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -53,14 +53,14 @@ function browseBySearch(active)
" . $lang->bug->moduleBugs . " "; + echo "" . $lang->bug->moduleBugs . " "; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToMe¶m=0"), $lang->bug->assignToMe) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=openedByMe¶m=0"), $lang->bug->openedByMe) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=resolvedByMe¶m=0"), $lang->bug->resolvedByMe) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToNull¶m=0"), $lang->bug->assignToNull) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs¶m=0"), $lang->bug->longLifeBugs) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs¶m=0"), $lang->bug->postponedBugs) . ""; - echo "{$lang->bug->byQuery} "; + echo "{$lang->bug->byQuery} "; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->bug->needConfirm) . ""; ?> diff --git a/module/common/control.php b/module/common/control.php index d6f326ce39..fc2145acb9 100644 --- a/module/common/control.php +++ b/module/common/control.php @@ -129,8 +129,9 @@ EOT; public static function printMainmenu($moduleName) { global $app, $lang; + $logo = $app->getWebRoot() . 'theme/default/images/main/logo.png'; echo "\n"; diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index e78938c67a..a86f30eac8 100644 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -1,32 +1,4 @@ -app->getClientTheme(); -$webRoot = $this->app->getWebRoot(); -$jsRoot = $webRoot . "js/"; -$themeRoot = $webRoot . "theme/"; -?> - - - - - title)) $header->title = $lang->zentaoMS; - if(!isset($header->keywords)) $header->keywords = $lang->zentaoKeywords; - if(!isset($header->desc)) $header->desc = $lang->zentaoDESC; - echo "$header->title - $lang->zentaoMS\n"; - echo "\n"; - echo "\n"; - ?> - - - -' type='text/css' media='screen' /> -' type='text/css' media='screen' /> - - - - - +
diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php index 02e0ea0ced..2e3a77b753 100644 --- a/module/common/view/header.lite.html.php +++ b/module/common/view/header.lite.html.php @@ -1,25 +1,31 @@ app->getClientTheme(); -$webRoot = $this->app->getWebRoot(); -$jsRoot = $webRoot . "js/"; -$themeRoot = $webRoot . "theme/"; +$webRoot = $this->app->getWebRoot(); +$jsRoot = $webRoot . "js/"; +$themeRoot = $webRoot . "theme/"; +$defaultTheme = $webRoot . 'theme/default/'; +$clientTheme = $this->app->getClientTheme(); ?> title)) echo "$header->title - $lang->zentaoMS\n"; - if(isset($header->keyword)) echo "\n"; - if(isset($header->desc)) echo "\n"; + $header = isset($header) ? (object)$header : new stdclass(); + if(!isset($header->title)) $header->title = $lang->zentaoMS; + if(!isset($header->keywords)) $header->keywords = $lang->zentaoKeywords; + if(!isset($header->desc)) $header->desc = $lang->zentaoDESC; + echo "$header->title - $lang->zentaoMS\n"; + echo "\n"; + echo "\n"; ?> -' type='text/css' media='screen' /> -' type='text/css' media='screen' /> +' type='text/css' media='screen' /> +' type='text/css' media='screen' /> + +' type='text/css' media='screen' /> + diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index af2ae98952..af217b3e60 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -52,8 +52,8 @@ function search(active)
- product->moduleStory;?> - product->searchStory;?> + product->moduleStory;?> + product->searchStory;?> createLink('product', 'browse', "productID=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->product->allStory);?>
diff --git a/module/story/control.php b/module/story/control.php index f2f2af0f60..72abdcad39 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -320,6 +320,7 @@ class story extends control $tasks = $this->task->getStoryTaskPairs($storyID, $projectID); $this->assign('tasks', $tasks); $this->display(); + exit; } /* Ajax: 鑾峰彇鏌愪竴涓」鐩殑闇姹傚垪琛ㄣ*/ diff --git a/module/story/view/tasks.html.php b/module/story/view/tasks.html.php index 9e7540ed56..669bb7c824 100644 --- a/module/story/view/tasks.html.php +++ b/module/story/view/tasks.html.php @@ -1,17 +1,5 @@ -app->getClientTheme(); -$webRoot = $this->app->getWebRoot(); -$jsRoot = $webRoot . "js/"; -$themeRoot = $webRoot . "theme/"; -?> - - - - -' type='text/css' media='screen' /> -' type='text/css' media='screen' /> - - + +
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 48ed562539..6ddd96f3ac 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -52,8 +52,8 @@ function browseBySearch(active)
" . $lang->testcase->moduleCases . " "; - echo "{$lang->testcase->bySearch} "; + echo "" . $lang->testcase->moduleCases . " "; + echo "{$lang->testcase->bySearch} "; echo "" . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->testcase->allCases) . ""; echo "" . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->testcase->needConfirm) . ""; ?> diff --git a/module/user/control.php b/module/user/control.php index b0367dd268..b20eafc1cd 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -349,6 +349,7 @@ class user extends control $this->app->loadLang($module); $this->app->loadLang('index'); $this->display(); + exit; } /** diff --git a/module/user/view/deny.html.php b/module/user/view/deny.html.php index 6baede1871..2176590aab 100644 --- a/module/user/view/deny.html.php +++ b/module/user/view/deny.html.php @@ -20,39 +20,27 @@ * @package ZenTaoMS * @version $Id$ */ +include '../../common/view/header.lite.html.php'; ?> - - - - title)) echo "$header->title - $lang->zentaoMS\n"; - if(isset($header->keyword)) echo "\n"; - if(isset($header->desc)) echo "\n"; - ?> - ' type='text/css' media='screen' /> - ' type='text/css' media='screen' /> - - +
-
story->tasks;?>
- - - + +
user->account, ' ', $lang->user->deny;?>
- $module->common) ? $lang->$module->common: $module; - $methodName = isset($lang->$module->$method) ? $lang->$module->$method: $method; + + + + - -
user->account, ' ', $lang->user->deny;?>
+ $module->common) ? $lang->$module->common: $module; + $methodName = isset($lang->$module->$method) ? $lang->$module->$method: $method; - printf($lang->user->errorDeny, $moduleName, $methodName); - echo "
"; - echo html::a($this->createLink($config->default->module), $lang->index->common); - if($refererBeforeDeny) echo html::a(helper::safe64Decode($refererBeforeDeny), $lang->user->goback); - echo html::a($this->createLink('user', 'logout', "referer=" . helper::safe64Encode($denyPage)), $lang->user->relogin); - ?> -
- + printf($lang->user->errorDeny, $moduleName, $methodName); + echo "
"; + echo html::a($this->createLink($config->default->module), $lang->index->common); + if($refererBeforeDeny) echo html::a(helper::safe64Decode($refererBeforeDeny), $lang->user->goback); + echo html::a($this->createLink('user', 'logout', "referer=" . helper::safe64Encode($denyPage)), $lang->user->relogin); + ?> +
diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index a89f1e919e..4b43ceb82b 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -20,29 +20,8 @@ * @package ZenTaoMS * @version $Id$ */ -$clientTheme = $this->app->getClientTheme(); -$webRoot = $this->app->getWebRoot(); -$jsRoot = $webRoot . "js/"; -$themeRoot = $webRoot . "theme/"; +include '../../common/view/header.lite.html.php'; ?> - - - - title)) echo "$header->title - $lang->zentaoMS\n"; - if(isset($header->keyword)) echo "\n"; - if(isset($header->desc)) echo "\n"; - ?> - - - - -' type='text/css' media='screen' /> -' type='text/css' media='screen' /> - - - - +