Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust the UI.

Browse Source
This commit is contained in:
wangchunsheng
2010-04-22 09:33:18 +00:00
parent 0da8e8b638
commit 49cf300460
11 changed files with 55 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/browse.html.php
+2 -2
View File
@@ -53,14 +53,14 @@ function browseBySearch(active)
<div id='featurebar'>
<div class='f-left'>
<?php
echo "<span id='bymoduleTab' onclick=\"browseByModule('$browseType')\">" . $lang->bug->moduleBugs . "</span> ";
echo "<span id='bymoduleTab' onclick=\"browseByModule('$browseType')\"><a href='#'>" . $lang->bug->moduleBugs . "</a></span> ";
echo "<span id='assigntomeTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToMe&param=0"), $lang->bug->assignToMe) . "</span>";
echo "<span id='openedbymeTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=openedByMe&param=0"), $lang->bug->openedByMe) . "</span>";
echo "<span id='resolvedbymeTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=resolvedByMe&param=0"), $lang->bug->resolvedByMe) . "</span>";
echo "<span id='assigntonullTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToNull&param=0"), $lang->bug->assignToNull) . "</span>";
echo "<span id='longlifebugsTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs&param=0"), $lang->bug->longLifeBugs) . "</span>";
echo "<span id='postponedbugsTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs&param=0"), $lang->bug->postponedBugs) . "</span>";
echo "<span id='bysearchTab' onclick=\"browseBySearch('$browseType')\">{$lang->bug->byQuery}</span> ";
echo "<span id='bysearchTab' onclick=\"browseBySearch('$browseType')\"><a href='#'>{$lang->bug->byQuery}</a></span> ";
echo "<span id='allTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . "</span>";
echo "<span id='needconfirmTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm&param=0"), $lang->bug->needConfirm) . "</span>";
?>
module/common/control.php
+3 -2
View File
@@ -129,8 +129,9 @@ EOT;
public static function printMainmenu($moduleName)
{
global $app, $lang;
$logo = $app->getWebRoot() . 'theme/default/images/main/logo.png';
echo "<ul>\n";
echo "<li>$lang->zentaoMS</li>\n";
echo "<li style='padding:0; height:30px'><a href='http://www.zentao.cn' target='_blank'><img src='$logo' /></a></li>\n";
/* 设定当前的主菜单项。默认先取当前的模块名，如果有该模块所对应的菜单分组，则取分组名作为主菜单项。*/
$mainMenu = $moduleName;
@@ -168,7 +169,7 @@ EOT;
echo "<li id='searchbox'>";
echo html::select('searchType', $lang->searchObjects, $searchObject);
echo html::input('searchQuery', $lang->searchTips, "onclick=this.value='' onkeydown='if(event.keyCode==13) shortcut()' class='w-80px'");
echo html::input('searchQuery', $lang->searchTips, "onclick=this.value='' onkeydown='if(event.keyCode==13) shortcut()' class='w-60px'");
echo html::submitButton($lang->go, 'onclick="shortcut()"');
echo "</li>";
echo "</ul>\n";
module/common/view/header.html.php
+1 -29
View File
@@ -1,32 +1,4 @@
<?php
$clientTheme = $this->app->getClientTheme();
$webRoot = $this->app->getWebRoot();
$jsRoot = $webRoot . "js/";
$themeRoot = $webRoot . "theme/";
?>
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dli'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
<?php
$header = (object)$header;
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 "<title>$header->title - $lang->zentaoMS</title>\n";
echo "<meta name='keywords' content='$header->keywords'>\n";
echo "<meta name='description' content='$header->desc'>\n";
?>
<?php echo js::exportConfigVars();?>
<script src="<?php echo $jsRoot;?>jquery/lib.js" type="text/javascript"></script>
<script src="<?php echo $jsRoot;?>my.js" type="text/javascript"></script>
<link rel='stylesheet' href='<?php echo $clientTheme . 'yui.css';?>' type='text/css' media='screen' />
<link rel='stylesheet' href='<?php echo $clientTheme . 'style.css';?>' type='text/css' media='screen' />
<link rel='icon' href='<?php echo $webRoot;?>favicon.ico' type="image/x-icon" />
<link rel='shortcut icon' href='<?php echo $webRoot;?>favicon.ico' type='image/x-icon' />
<script type="text/javascript">loadFixedCSS();</script>
</head>
<body>
<?php include 'header.lite.html.php';?>
<div id='topbar' class='yui-d0 yui-t6'>
<div class='yui-main'>
<div class='yui-b'>
module/common/view/header.lite.html.php
+17 -11
View File
@@ -1,25 +1,31 @@
<?php
$clientTheme = $this->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();
?>
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dli'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
<?php
if(!isset($header)) $header = new stdClass();
$header = (object)$header;
if(isset($header->title)) echo "<title>$header->title - $lang->zentaoMS</title>\n";
if(isset($header->keyword)) echo "<meta name='keywords' content='$header->keyword'>\n";
if(isset($header->desc)) echo "<meta name='description' content='$header->desc'>\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 "<title>$header->title - $lang->zentaoMS</title>\n";
echo "<meta name='keywords' content='$header->keywords'>\n";
echo "<meta name='description' content='$header->desc'>\n";
?>
<?php echo js::exportConfigVars();?>
<script src="<?php echo $jsRoot;?>jquery/lib.js" type="text/javascript"></script>
<script src="<?php echo $jsRoot;?>my.js" type="text/javascript"></script>
<link rel='stylesheet' href='<?php echo $clientTheme . 'yui.css';?>' type='text/css' media='screen' />
<link rel='stylesheet' href='<?php echo $clientTheme . 'style.css';?>' type='text/css' media='screen' />
<link rel='stylesheet' href='<?php echo $defaultTheme . 'yui.css';?>' type='text/css' media='screen' />
<link rel='stylesheet' href='<?php echo $defaultTheme . 'style.css';?>' type='text/css' media='screen' />
<?php if(strpos($clientTheme, 'default') === false):?>
<link rel='stylesheet' href='<?php echo $clientTheme . 'style.css';?>' type='text/css' media='screen' />
<?php endif;?>
<link rel='icon' href='<?php echo $webRoot;?>favicon.ico' type="image/x-icon" />
<link rel='shortcut icon' href='<?php echo $webRoot;?>favicon.ico' type='image/x-icon' />
<script type="text/javascript">loadFixedCSS();</script>
module/product/view/browse.html.php
+2 -2
View File
@@ -52,8 +52,8 @@ function search(active)
<div class='yui-d0'>
<div id='featurebar'>
<div class='f-left'>
<span id='bymoduleTab' onclick='browseByModule()'><?php echo $lang->product->moduleStory;?></span>
<span id='bysearchTab' onclick='search("<?php echo $browseType;?>")'><?php echo $lang->product->searchStory;?></span>
<span id='bymoduleTab' onclick='browseByModule()'><a href='#'><?php echo $lang->product->moduleStory;?></a></span>
<span id='bysearchTab' onclick='search("<?php echo $browseType;?>")'><a href='#'><?php echo $lang->product->searchStory;?></a></span>
<span id='allTab'><?php echo html::a($this->createLink('product', 'browse', "productID=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->product->allStory);?></span>
</div>
<div class='f-right'>
module/story/control.php
+1
View File
@@ -320,6 +320,7 @@ class story extends control
$tasks = $this->task->getStoryTaskPairs($storyID, $projectID);
$this->assign('tasks', $tasks);
$this->display();
exit;
}
/* Ajax: 获取某一个项目的需求列表。*/
module/story/view/tasks.html.php
+2 -14
View File
@@ -1,17 +1,5 @@
<?php
$clientTheme = $this->app->getClientTheme();
$webRoot = $this->app->getWebRoot();
$jsRoot = $webRoot . "js/";
$themeRoot = $webRoot . "theme/";
?>
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dli'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
<link rel='stylesheet' href='<?php echo $clientTheme . 'yui.css';?>' type='text/css' media='screen' />
<link rel='stylesheet' href='<?php echo $clientTheme . 'style.css';?>' type='text/css' media='screen' />
</head>
<body>
<?php include '../../common/view/header.lite.html.php';?>
<style >body{background:white}</style>
<div class="yui-d0" style='margin-top:10px'>
<table class='table-1'>
<caption><?php echo $lang->story->tasks;?></caption>
module/testcase/view/browse.html.php
+2 -2
View File
@@ -52,8 +52,8 @@ function browseBySearch(active)
<div id='featurebar'>
<div class='f-left'>
<?php
echo "<span id='bymoduleTab' onclick=\"browseByModule('$browseType')\">" . $lang->testcase->moduleCases . "</span> ";
echo "<span id='bysearchTab' onclick=\"browseBySearch('$browseType')\">{$lang->testcase->bySearch}</span> ";
echo "<span id='bymoduleTab' onclick=\"browseByModule('$browseType')\"><a href='#'>" . $lang->testcase->moduleCases . "</a></span> ";
echo "<span id='bysearchTab' onclick=\"browseBySearch('$browseType')\"><a href='#'>{$lang->testcase->bySearch}</a></span> ";
echo "<span id='allTab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->testcase->allCases) . "</span>";
echo "<span id='needconfirmTab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=needconfirm&param=0"), $lang->testcase->needConfirm) . "</span>";
?>
module/user/control.php
+1
View File
@@ -349,6 +349,7 @@ class user extends control
$this->app->loadLang($module);
$this->app->loadLang('index');
$this->display();
exit;
}
/**
module/user/view/deny.html.php
+18 -30
View File
@@ -20,39 +20,27 @@
* @package ZenTaoMS
* @version $Id$
*/
include '../../common/view/header.lite.html.php';
?>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
<?php
$header = (object)$header;
if(isset($header->title)) echo "<title>$header->title - $lang->zentaoMS</title>\n";
if(isset($header->keyword)) echo "<meta name='keywords' content='$header->keyword'>\n";
if(isset($header->desc)) echo "<meta name='description' content='$header->desc'>\n";
?>
<link rel='stylesheet' href='<?php echo $app->getClientTheme() . 'yui.css';?>' type='text/css' media='screen' />
<link rel='stylesheet' href='<?php echo $app->getClientTheme() . 'style.css';?>' type='text/css' media='screen' />
</head>
<body>
<style >body{background:white}</style>
<div class='yui-d0' style='margin-top:100px'>
<table align='center' class='table-3'>
<caption><?php echo $app->user->account, ' ', $lang->user->deny;?></caption>
<tr>
<td>
<?php
$moduleName = isset($lang->$module->common) ? $lang->$module->common: $module;
$methodName = isset($lang->$module->$method) ? $lang->$module->$method: $method;
<table align='center' class='table-3'>
<caption><?php echo $app->user->account, ' ', $lang->user->deny;?></caption>
<tr>
<td>
<?php
$moduleName = isset($lang->$module->common) ? $lang->$module->common: $module;
$methodName = isset($lang->$module->$method) ? $lang->$module->$method: $method;
printf($lang->user->errorDeny, $moduleName, $methodName);
echo "<br />";
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);
?>
</td>
</tr>
</table>
</form>
printf($lang->user->errorDeny, $moduleName, $methodName);
echo "<br />";
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);
?>
</td>
</tr>
</table>
</div>
</body>
</html>
module/user/view/login.html.php
+6 -23
View File
@@ -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';
?>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
<?php
$header = (object)$header;
if(isset($header->title)) echo "<title>$header->title - $lang->zentaoMS</title>\n";
if(isset($header->keyword)) echo "<meta name='keywords' content='$header->keyword'>\n";
if(isset($header->desc)) echo "<meta name='description' content='$header->desc'>\n";
?>
<?php echo js::exportConfigVars();?>
<script language='Javascript'>var needPing=false</script>
<script src="<?php echo $jsRoot;?>jquery/lib.js" type="text/javascript"></script>
<script src="<?php echo $jsRoot;?>my.js" type="text/javascript"></script>
<link rel='stylesheet' href='<?php echo $clientTheme . 'yui.css';?>' type='text/css' media='screen' />
<link rel='stylesheet' href='<?php echo $clientTheme . 'style.css';?>' type='text/css' media='screen' />
<link rel='icon' href='<?php echo $webRoot;?>favicon.ico' type="image/x-icon" />
<link rel='shortcut icon' href='<?php echo $webRoot;?>favicon.ico' type='image/x-icon' />
<script language='Javascript'>loadFixedCSS();</script>
<style>
html{background-color:#06294e;}
body{background-image:url(theme/default/images/main/loginbg.png); background-position:center top; background-repeat:no-repeat;}
@@ -58,7 +37,11 @@ table, tr, td, th, input{ border:none;}
#poweredby a {color:#fff}
.button-s, .button-c {padding:3px 5px 3px 5px; width:80px; font-size:14px; font-weight:bold}
</style>
<body onLoad="document.getElementById('account').focus();">
<script language='Javascript'>
$(document).ready(function(){
$('#account').focus();
})
</script>
<div class='yui-d0 pt-200px'>
<form method='post' target='hiddenwin'>
<table align='center' class='table-4'>