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

* Adjust the icons.

Browse Source
This commit is contained in:
chencongzhi520@gmail.com
2012-07-14 07:26:53 +00:00
parent e804d246ac
commit 031b8fc9f0
34 changed files with 365 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/view.css
-3
View File
@@ -1,4 +1 @@
.content .stepTitle{margin:7px 0 7px -15px; display:block; color: green}
#titlebar #main {float:left; width:55%; clear:none; text-align:left}
#titlebar div {float:right; width:45%; clear:none; text-align:right}
module/bug/js/browse.js
+1 -1
View File
@@ -10,7 +10,7 @@ function browseByModule(active)
$(document).ready(function()
{
$("a.icon-green-big-bug-customFields").colorbox({width:600, height:340, iframe:true, transition:'none'});
$("a.customFields").colorbox({width:600, height:340, iframe:true, transition:'none'});
$('#' + browseType + 'Tab').addClass('active');
$('#module' + moduleID).addClass('active');
module/bug/lang/zh-cn.php
+5 -5
View File
@@ -66,17 +66,17 @@ $lang->bug->lastEditedDateAB = '修改日期';
/* 方法列表。*/
$lang->bug->index = '首页';
$lang->bug->create = '创建Bug';
$lang->bug->create = '创建';
$lang->bug->confirmBug = '确认';
$lang->bug->edit = '编辑Bug';
$lang->bug->assignTo = '指派';
$lang->bug->browse = 'Bug列表';
$lang->bug->view = 'Bug详情';
$lang->bug->resolve = '解决Bug';
$lang->bug->close = '关闭Bug';
$lang->bug->resolve = '解决';
$lang->bug->close = '关闭';
$lang->bug->activate = '激活Bug';
$lang->bug->reportChart = '报表统计';
$lang->bug->export = '导出数据';
$lang->bug->export = '导出';
$lang->bug->delete = '删除Bug';
$lang->bug->saveTemplate = '保存模板';
$lang->bug->deleteTemplate = '删除模板';
@@ -241,7 +241,7 @@ $lang->bug->resolutionList['willnotfix'] = "不予解决";
$lang->bug->resolutionList['tostory'] = '转为需求';
/* 统计报表。*/
$lang->bug->report->common = '统计报表';
$lang->bug->report->common = '报表';
$lang->bug->report->select = '请选择报表类型';
$lang->bug->report->create = '生成报表';
module/bug/view/browse.html.php
+8 -8
View File
@@ -37,10 +37,10 @@ var customed = <?php echo (int)$customed;?>;
?>
</div>
<div class='f-right'>
<?php if($browseType != 'needconfirm') common::printIcon('bug', 'export', "productID=$productID&orderBy=$orderBy", '', 'big');?>
<?php common::printIcon('bug', 'customFields', '', '', 'big'); ?>
<?php common::printIcon('bug', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", '', 'big');?>
<?php common::printIcon('bug', 'create', "productID=$productID&extra=moduleID=$moduleID", '', 'big'); ?>
<?php if($browseType != 'needconfirm') common::printIcon('bug', 'export', "productID=$productID&orderBy=$orderBy");?>
<?php common::printIcon('bug', 'customFields'); ?>
<?php common::printIcon('bug', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID");?>
<?php common::printIcon('bug', 'create', "productID=$productID&extra=moduleID=$moduleID"); ?>
</div>
</div>
<div id='querybox' class='<?php if($browseType !='bysearch') echo 'hidden';?>'><?php echo $searchForm;?></div>
@@ -133,10 +133,10 @@ var customed = <?php echo (int)$customed;?>;
<td class='a-right'>
<?php
$params = "bugID=$bug->id";
common::printIcon('bug', 'resolve', $params, $bug);
common::printIcon('bug', 'close', $params, $bug);
common::printIcon('bug', 'edit', $params, $bug);
common::printIcon('bug', 'create', "product=$bug->product&extra=bugID=$bug->id", $bug, 'small', 'copy');
common::printIcon('bug', 'resolve', $params, $bug, 'list');
common::printIcon('bug', 'close', $params, $bug, 'list');
common::printIcon('bug', 'edit', $params, $bug, 'list');
common::printIcon('bug', 'create', "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy');
?>
</td>
<?php endif;?>
module/bug/view/view.html.php
+12 -16
View File
@@ -22,26 +22,22 @@
if(!$bug->deleted)
{
ob_start();
if($this->bug->isClickable($bug, 'confirmBug')) common::printLink('bug', 'confirmBug', $params, $lang->bug->buttonConfirm);
common::printLink('bug', 'assignTo', $params, $lang->bug->buttonAssign);
if($this->bug->isClickable($bug, 'resolve')) common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve);
if($this->bug->isClickable($bug, 'close')) common::printLink('bug', 'close', $params, $lang->bug->buttonClose);
if($this->bug->isClickable($bug, 'activate')) common::printLink('bug', 'activate', $params, $lang->bug->buttonActivate);
if($this->bug->isClickable($bug, 'confirmBug')) common::printIcon('bug', 'confirmBug', $params);
common::printIcon('bug', 'assignTo', $params);
if($this->bug->isClickable($bug, 'resolve')) common::printIcon('bug', 'resolve', $params);
if($this->bug->isClickable($bug, 'close')) common::printIcon('bug', 'close', $params);
if($this->bug->isClickable($bug, 'activate')) common::printIcon('bug', 'activate', $params);
if($this->bug->isClickable($bug, 'toStory'))
{
common::printSplitIcon();
common::printLink('story', 'create', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $lang->bug->toStory);
}
common::printLink('testcase', 'create', $convertParams, $lang->bug->buttonCreateTestcase);
if($this->bug->isClickable($bug, 'toStory')) common::printIcon('bug', 'toStory', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", '', 'button', 'toStory');
common::printIcon('bug', 'createCase', $convertParams, '', 'button', 'createCase');
if($this->bug->isClickable($bug, 'edit')) common::printSplitIcon();
common::printIcon('bug', 'edit', $params, '', 'big');
common::printDivider();
common::printIcon('bug', 'edit', $params);
common::printCommentIcon('bug');
common::printIcon('bug', 'create', $copyParams, '', 'big', 'copy');
common::printIcon('bug', 'delete', $params, '', 'big', '', 'hiddenwin');
common::printIcon('bug', 'create', $copyParams, '', 'button', 'copy');
common::printIcon('bug', 'delete', $params, '', 'button', '', 'hiddenwin');
if($this->bug->isClickable($bug, 'goback')) common::printSplitIcon();
common::printDivider();
common::printRPN($browseLink, $preAndNext);
$actionLinks = ob_get_contents();
module/common/control.php
+45 -13
View File
@@ -214,9 +214,9 @@ class common extends control
* @access public
* @return void
*/
public static function printSplitIcon()
public static function printDivider()
{
echo "<span class='icon-green-big-common-splitLine'></span>";
echo "&nbsp;&nbsp;&nbsp;&nbsp;";
}
/**
@@ -232,7 +232,9 @@ class common extends control
global $lang;
if(!common::hasPriv($module, 'edit')) return false;
echo html::a('#comment', '&nbsp;', '', "class='icon-green-big-common-comment' title={$lang->comment} onclick='setComment()'");
echo "<span class='link-button'>";
echo html::a('#comment', '&nbsp;', '', "class='icon-black-common-comment' title='$lang->comment' onclick='setComment()'");
echo "</span>";
}
/**
@@ -242,14 +244,14 @@ class common extends control
* @param string $method
* @param string $vars
* @param object $object
* @param string $size
* @param string $type button|list
* @param string $icon
* @param string $target
* @static
* @access public
* @return void
*/
public static function printIcon($module, $method, $vars = '', $object = '', $size = 'small', $icon = '', $target = '')
public static function printIcon($module, $method, $vars = '', $object = '', $type = 'button', $icon = '', $target = '')
{
global $app, $lang;
@@ -266,8 +268,10 @@ class common extends control
}
/* Set module and method, then create link to it. */
if(strtolower($module) == 'testcase' and strtolower($method) == 'tobug') ($module = 'bug') and ($method = 'create');
if(strtolower($module) == 'testcase' and strtolower($method) == 'createbug') ($module = 'bug') and ($method = 'create');
if(strtolower($module) == 'story' and strtolower($method) == 'createcase') ($module = 'testcase') and ($method = 'create');
if(strtolower($module) == 'bug' and strtolower($method) == 'tostory') ($module = 'story') and ($method = 'create');
if(strtolower($module) == 'bug' and strtolower($method) == 'createcase') ($module = 'testcase') and ($method = 'create');
if(!common::hasPriv($module, $method)) return false;
$link = helper::createLink($module, $method, $vars);
@@ -279,21 +283,40 @@ class common extends control
{
$title = $method == 'report' ? $lang->$module->$method->common : $lang->$module->$method;
}
if($icon == 'toStory') $title = $lang->bug->toStory;
if($icon == 'createBug') $title = $lang->testtask->createBug;
/* Get the icon name. */
/* set the class. */
if(!$icon) $icon = $method;
if(strpos(',edit,copy,report,export,delete,', ",$icon,") !== false) $module = 'common';
$iconClass = $clickable ? "icon-green-$size-$module-$icon" : "icon-gray-$size-$module-$icon";
$color = $type == 'button' ? 'black' : ($clickable ? 'green' : 'gray');
$extraClass = strpos(',export,customFields,runCase,results,', ",$method,") !== false ? $method : '';
$class = $extraClass ? "icon-$color-$module-$icon $extraClass" : "icon-$color-$module-$icon";
/* Create the icon link. */
if($clickable)
{
$newline = $size == 'small' ? false : true;
echo html::a($link, '&nbsp;', $target, "class='$iconClass' title='$title'", $newline);
if($type == 'button')
{
echo "<span class='link-button'>";
echo html::a($link, '&nbsp;', $target, "class='$class' title='$title'", true);
if($method != 'edit' and $method != 'delete' and $method != 'copy')
{
echo html::a($link, $title . '&nbsp;&nbsp;&nbsp;', $target, "class='$extraClass'", true);
}
echo "</span>";
}
else
{
echo html::a($link, '&nbsp;', $target, "class='$class' title='$title'", false);
}
}
else
{
echo "<span class='$iconClass' title='$title'>&nbsp;</span>";
if($type == 'list')
{
echo "<span class='$class' title='$title'>&nbsp;</span>";
}
}
}
@@ -309,16 +332,25 @@ class common extends control
{
global $lang;
echo "<span class='link-button'>";
echo html::a($backLink, '&nbsp;', '', "class='icon-goback' title={$lang->goback}");
echo "</span>";
if(isset($preAndNext->pre) and $preAndNext->pre)
{
$title = isset($preAndNext->pre->title) ? $preAndNext->pre->title : $preAndNext->pre->name;
echo html::a($this->inLink('view', "ID={$preAndNext->pre->id}"), '&nbsp', '', "id='pre' class='icon-pre' title='{$preAndNext->pre->id}{$lang->colon}{$title}'");
$title = '#' . $preAndNext->pre->id . ' ' . $title;
echo "<span class='link-button'>";
echo html::a($this->inLink('view', "ID={$preAndNext->pre->id}"), '&nbsp', '', "id='pre' class='icon-pre' title='{$title}'");
echo "</span>";
}
if(isset($preAndNext->next) and $preAndNext->next)
{
$title = isset($preAndNext->next->title) ? $preAndNext->next->title : $preAndNext->next->name;
echo html::a($this->inLink('view', "ID={$preAndNext->next->id}"), '&nbsp;', '', "id='next' class='icon-next' title='{$preAndNext->next->id}{$lang->colon}{$title}'");
$title = '#' . $preAndNext->next->id . ' ' . $title;
echo "<span class='link-button'>";
echo html::a($this->inLink('view', "ID={$preAndNext->next->id}"), '&nbsp;', '', "id='next' class='icon-next' title='$title'");
echo "</span>";
}
}
module/my/view/bug.html.php
+5 -5
View File
@@ -34,7 +34,7 @@
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='w-user'><?php echo $lang->bug->resolvedByAB;?></th>
<th class='w-resolution'><?php echo $lang->bug->resolutionAB;?></th>
<th class='w-130px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-80px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -48,12 +48,12 @@
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
<td>
<td class='a-right'>
<?php
$params = "bugID=$bug->id";
if(!($bug->status == 'active' and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' ';
if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose))) echo $lang->bug->buttonClose . ' ';
common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
common::printIcon('bug', 'resolve', $params, $bug, 'list');
common::printIcon('bug', 'close', $params, $bug, 'list');
common::printIcon('bug', 'edit', $params, '', 'list');
?>
</td>
</tr>
module/my/view/story.html.php
+9 -9
View File
@@ -22,19 +22,19 @@
?>
</div>
</div>
<table class='table-1 tablesorter'>
<table class='table-1 tablesorter fixed'>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->story->product;?></th>
<th class='w-200px'><?php echo $lang->story->product;?></th>
<th><?php echo $lang->story->title;?></th>
<th><?php echo $lang->story->plan;?></th>
<th class='w-150px'><?php echo $lang->story->plan;?></th>
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='w-hour'><?php echo $lang->story->estimateAB;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
<th class='w-stage'><?php echo $lang->story->stageAB;?></th>
<th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-100px'><?php echo $lang->story->stageAB;?></th>
<th class='w-80px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -50,11 +50,11 @@
<td><?php echo $story->estimate;?></td>
<td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
<td>
<td class='a-right'>
<?php
if(!($story->status != 'closed' and common::printLink('story', 'change', "storyID=$story->id", $lang->story->change))) echo $lang->story->change . ' ';
if(!(($story->status == 'draft' or $story->status == 'changed') and common::printLink('story', 'review', "storyID=$story->id", $lang->story->review))) echo $lang->story->review . ' ';
if(!($story->status != 'closed' and common::printLink('story', 'close', "storyID=$story->id", $lang->story->close))) echo $lang->story->close . ' ';
common::printIcon('story', 'change', "storyID=$story->id", $story, 'list');
common::printIcon('story', 'review', "storyID=$story->id", $story, 'list');
common::printIcon('story', 'close', "storyID=$story->id", $story, 'list');
?>
</td>
</tr>
module/my/view/task.html.php
+6 -6
View File
@@ -42,7 +42,7 @@
<th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='w-120px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -61,12 +61,12 @@
<td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
<td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
<td><?php echo $users[$task->openedBy];?></td>
<td>
<td class='a-right'>
<?php
if(!(($task->status == 'wait') and common::printLink('task', 'start', "taskID=$task->id", $lang->task->buttonStart))) echo $lang->task->buttonStart . ' ';
if(!(($task->status == 'wait' or $task->status == 'doing') and common::printLink('task', 'finish', "taskID=$task->id", $lang->task->buttonDone))) echo $lang->task->buttonDone . ' ';
if(!(($task->status == 'done' or $task->status == 'cancel') and common::printLink('task', 'close', "taskID=$task->id", $lang->task->buttonClose))) echo $lang->task->buttonClose . ' ';
if(!(($task->status == 'closed' or $task->status == 'done' or $task->status == 'cancel') and common::printLink('task', 'activate', "taskID=$task->id", $lang->task->buttonActivate))) echo $lang->task->buttonActivate . ' ';
common::printIcon('task', 'start', "taskID=$task->id", $task, 'list');
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list');
common::printIcon('task', 'close', "taskID=$task->id", $task, 'list');
common::printIcon('task', 'activate', "taskID=$task->id", $task, 'list');
?>
</td>
</tr>
module/my/view/testcase.html.php
+2 -6
View File
@@ -33,7 +33,7 @@
<th class='w-type'> <?php echo $lang->typeAB;?></th>
<th class='w-user'> <?php echo $lang->openedByAB;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
<th class='w-80px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-40px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -45,11 +45,7 @@
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
<td><?php echo $users[$case->openedBy];?></td>
<td><?php echo $lang->testcase->statusList[$case->status];?></td>
<td>
<?php
common::printLink('testcase', 'edit', "caseID=$case->id", $lang->testcase->buttonEdit);
?>
</td>
<td><?php common::printIcon('testcase', 'edit', "caseID=$case->id", '', 'list');?></td>
</tr>
<?php endforeach;?>
</tbody>
module/my/view/testtask.html.php
+4 -4
View File
@@ -32,7 +32,7 @@
<th class='w-80px'><?php echo $lang->testtask->begin;?></th>
<th class='w-80px'><?php echo $lang->testtask->end;?></th>
<th class='w-50px'><?php echo $lang->statusAB;?></th>
<th class='w-130px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-80px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -45,11 +45,11 @@
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td><?php echo $lang->testtask->statusList[$task->status];?></td>
<td>
<td class='a-right'>
<?php
common::printLink('testtask', 'cases', "taskID=$task->id", $lang->testtask->cases);
common::printLink('testtask', 'edit', "taskID=$task->id", $lang->edit);
common::printLink('testtask', 'delete', "taskID=$task->id", $lang->delete, 'hiddenwin');
common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list');
common::printIcon('testtask', 'delete', "taskID=$task->id", '', 'list', '', 'hiddenwin');
?>
</td>
</tr>
module/my/view/todo.html.php
+7 -8
View File
@@ -34,9 +34,9 @@
</div>
<div class='f-right'>
<?php
common::printLink('todo', 'export', "account=$account&orderBy=id_desc", $lang->export, '', 'class="export w-date"');
common::printLink('todo', 'batchCreate', "", $lang->todo->batchCreate);
echo html::a($this->createLink('todo', 'create', "date=" . str_replace('-', '', $date)), $lang->todo->create);
common::printIcon('todo', 'export', "account=$account&orderBy=id_desc");
common::printIcon('todo', 'batchCreate');
common::printIcon('todo', 'create', "date=" . str_replace('-', '', $date));
?>
</div>
</div>
@@ -51,7 +51,7 @@
<th class='w-hour'><?php echo $lang->todo->beginAB;?></th>
<th class='w-hour'><?php echo $lang->todo->endAB;?></th>
<th class='w-status'><?php echo $lang->todo->status;?></th>
<th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -70,12 +70,11 @@
<td><?php echo $todo->begin;?></td>
<td><?php echo $todo->end;?></td>
<td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
<td>
<td class='f-right'>
<?php
echo html::a($this->createLink('todo', 'mark', "id=$todo->id&status=$todo->status"), $lang->todo->{'mark'.ucfirst($todo->status)}, 'hiddenwin');
echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my"), $lang->todo->viewAB);
echo html::a($this->createLink('todo', 'edit', "id=$todo->id"), $lang->edit);
echo html::a($this->createLink('todo', 'delete', "id=$todo->id"), $lang->delete, 'hiddenwin');
common::printIcon('todo', 'edit', "id=$todo->id", '', 'list');
common::printIcon('todo', 'delete', "id=$todo->id", '', 'list', '', 'hiddenwin');
?>
</td>
</tr>
module/product/view/browse.html.php
+8 -8
View File
@@ -31,10 +31,10 @@ var browseType = '<?php echo $browseType;?>';
<span id='bysearchTab' ><a href='#'><span class='icon-search'></span><?php echo $lang->product->searchStory;?></a></span>
</div>
<div class='f-right'>
<?php common::printIcon('story', 'export', "productID=$productID&orderBy=$orderBy", '', 'big');?>
<?php common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", '', 'big');?>
<?php common::printIcon('story', 'batchCreate', "productID=$productID&moduleID=$moduleID", '', 'big');?>
<?php common::printIcon('story', 'create', "productID=$productID&moduleID=$moduleID", '', 'big'); ?>
<?php common::printIcon('story', 'export', "productID=$productID&orderBy=$orderBy");?>
<?php common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID");?>
<?php common::printIcon('story', 'batchCreate', "productID=$productID&moduleID=$moduleID");?>
<?php common::printIcon('story', 'create', "productID=$productID&moduleID=$moduleID"); ?>
</div>
</div>
<div id='querybox' class='<?php if($browseType !='bysearch') echo 'hidden';?>'><?php echo $searchForm;?></div>
@@ -95,10 +95,10 @@ var browseType = '<?php echo $browseType;?>';
<td class='a-right'>
<?php
$vars = "story={$story->id}";
common::printIcon('story', 'change', $vars, $story);
common::printIcon('story', 'review', $vars, $story);
common::printIcon('story', 'edit', "storyID=$story->id", $story);
common::printIcon('story', 'createCase', "productID=$story->product&module=0&from=&param=0&$vars", $story, 'small', 'createCase');
common::printIcon('story', 'change', $vars, $story, 'list');
common::printIcon('story', 'review', $vars, $story, 'list');
common::printIcon('story', 'edit', "storyID=$story->id", $story, 'list');
common::printIcon('story', 'createCase', "productID=$story->product&module=0&from=&param=0&$vars", $story, 'list', 'createCase');
?>
</td>
</tr>
module/productplan/view/view.html.php
+76 -76
View File
@@ -14,83 +14,83 @@
<?php include '../../common/view/tablesorter.html.php';?>
<table class='cont-rt5'>
<caption><?php echo $plan->title . $lang->colon . $lang->productplan->view;?></caption>
<tr valign='top'>
<td>
<fieldset>
<legend><?php echo $lang->productplan->desc;?></legend>
<div class='content'><?php echo $product->desc;?></div>
</fieldset>
<?php include '../../common/view/action.html.php';?>
<div class='a-center f-16px strong'>
<?php
$browseLink = $this->session->productPlanList ? $this->session->productPlanList : inlink('browse', "planID=$plan->id");
if(!$plan->deleted)
{
common::printLink('productplan', 'edit', "planID=$plan->id", $lang->edit);
common::printLink('productplan', 'linkstory',"planID=$plan->id", $lang->productplan->linkStory);
common::printLink('productplan', 'delete', "planID=$plan->id", $lang->delete, 'hiddenwin');
}
<tr valign='top'>
<td>
<fieldset>
<legend><?php echo $lang->productplan->desc;?></legend>
<div class='content'><?php echo $product->desc;?></div>
</fieldset>
<?php include '../../common/view/action.html.php';?>
<div class='a-center f-16px strong'>
<?php
$browseLink = $this->session->productPlanList ? $this->session->productPlanList : inlink('browse', "planID=$plan->id");
if(!$plan->deleted)
{
common::printLink('productplan', 'edit', "planID=$plan->id", $lang->edit);
common::printLink('productplan', 'linkstory',"planID=$plan->id", $lang->productplan->linkStory);
common::printLink('productplan', 'delete', "planID=$plan->id", $lang->delete, 'hiddenwin');
}
echo html::a($browseLink, $lang->goback);
?>
</div>
<table class='table-1 tablesorter a-center'>
<caption class='caption-tl'><?php echo $plan->title .$lang->colon . $lang->productplan->linkedStories;?></caption>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->story->title;?></th>
<th><?php echo $lang->openedByAB;?></th>
<th><?php echo $lang->assignedToAB;?></th>
<th><?php echo $lang->story->estimateAB;?></th>
<th><?php echo $lang->statusAB;?></th>
<th><?php echo $lang->story->stageAB;?></th>
<th class='w-p10 {sorter:false}'><?php echo $lang->actions?></th>
?>
</div>
<table class='table-1 tablesorter a-center'>
<caption class='caption-tl'><?php echo $plan->title .$lang->colon . $lang->productplan->linkedStories;?></caption>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->story->title;?></th>
<th><?php echo $lang->openedByAB;?></th>
<th><?php echo $lang->assignedToAB;?></th>
<th><?php echo $lang->story->estimateAB;?></th>
<th><?php echo $lang->statusAB;?></th>
<th><?php echo $lang->story->stageAB;?></th>
<th class='w-p10 {sorter:false}'><?php echo $lang->actions?></th>
</tr>
</thead>
<tbody>
<?php $totalEstimate = 0.0;?>
<?php foreach($planStories as $story):?>
<?php
$viewLink = $this->createLink('story', 'view', "storyID=$story->id");
$totalEstimate += $story->estimate;
?>
<tr>
<td><?php echo html::a($viewLink, $story->id);?></td>
<td><?php echo $story->pri;?></td>
<td class='a-left nobr'><?php echo html::a($viewLink , $story->title);?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $users[$story->assignedTo];?></td>
<td><?php echo $story->estimate;?></td>
<td><?php echo $lang->story->statusList[$story->status];?></td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
<td><?php common::printLink('productplan', 'unlinkStory', "story=$story->id", $lang->productplan->unlinkStory, 'hiddenwin');?></td>
</tr>
<?php endforeach;?>
</tbody>
<tfoot><tr><td colspan='9' class='a-right'><?php printf($lang->product->storySummary, count($planStories), $totalEstimate);?> </td></tr></tfoot>
</table>
</td>
<td class="divider"></td>
<td class="side">
<fieldset>
<legend><?php echo $lang->productplan->basicInfo?></legend>
<table class='table-1 a-left'>
<tr>
<th width='25%' class='a-right'><?php echo $lang->productplan->title;?></th>
<td <?php if($plan->deleted) echo "class='deleted'";?>><?php echo $plan->title;?></th>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->begin;?></th>
<td><?php echo $plan->begin;?></th>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->end;?></th>
<td><?php echo $plan->end;?></th>
</tr>
</table>
</fieldset>
</td>
</tr>
</thead>
<tbody>
<?php $totalEstimate = 0.0;?>
<?php foreach($planStories as $story):?>
<?php
$viewLink = $this->createLink('story', 'view', "storyID=$story->id");
$totalEstimate += $story->estimate;
?>
<tr>
<td><?php echo html::a($viewLink, $story->id);?></td>
<td><?php echo $story->pri;?></td>
<td class='a-left nobr'><?php echo html::a($viewLink , $story->title);?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $users[$story->assignedTo];?></td>
<td><?php echo $story->estimate;?></td>
<td><?php echo $lang->story->statusList[$story->status];?></td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
<td><?php common::printLink('productplan', 'unlinkStory', "story=$story->id", $lang->productplan->unlinkStory, 'hiddenwin');?></td>
</tr>
<?php endforeach;?>
</tbody>
<tfoot><tr><td colspan='9' class='a-right'><?php printf($lang->product->storySummary, count($planStories), $totalEstimate);?> </td></tr></tfoot>
</table>
</td>
<td class="divider"></td>
<td class="side">
<fieldset>
<legend><?php echo $lang->productplan->basicInfo?></legend>
<table class='table-1 a-left'>
<tr>
<th width='25%' class='a-right'><?php echo $lang->productplan->title;?></th>
<td <?php if($plan->deleted) echo "class='deleted'";?>><?php echo $plan->title;?></th>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->begin;?></th>
<td><?php echo $plan->begin;?></th>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->end;?></th>
<td><?php echo $plan->end;?></th>
</tr>
</table>
</fieldset>
</td>
</tr>
</table>
<?php include '../../common/view/footer.html.php';?>
module/project/view/bug.html.php
+4 -25
View File
@@ -33,7 +33,7 @@
<th class='w-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-80px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -50,30 +50,9 @@
<td class='a-right'>
<?php
$params = "bugID=$bug->id";
if(common::hasPriv('bug', 'resolve'))
{
if($bug->status == 'active')
{
echo html::a($this->createLink('bug', 'resolve', $params), '&nbsp;', '', "class='icon-green-small-bug-resolve' title='{$lang->bug->buttonResolve}'", false);
}
else
{
echo "<span class='icon-gray-small-bug-resolve'>&nbsp;</span>";
}
}
if(common::hasPriv('bug', 'close'))
{
if($bug->status == 'resolved')
{
echo html::a($this->createLink('bug', 'close', $params), '&nbsp;', '', "class='icon-green-small-bug-close' title='{$lang->bug->buttonClose}'", false);
}
else
{
echo "<span class='icon-gray-small-bug-close'>&nbsp;</span>";
}
}
common::printLink('bug', 'edit', $params, '&nbsp;', '', "class='icon-green-small-edit' title='{$lang->bug->buttonEdit}'", false);
common::printIcon('bug', 'resolve', $params, $bug, 'list');
common::printIcon('bug', 'close', $params, $bug, 'list');
common::printIcon('bug', 'edit', $params, $bug, 'list');
?>
</td>
</tr>
module/project/view/task.html.php
+4 -4
View File
@@ -132,10 +132,10 @@ var browseType = '<?php echo $browseType;?>';
<td class='a-right'>
<?php
if($browseType == 'needconfirm') common::printLink('task', 'confirmStoryChange', "taskid=$task->id", $lang->confirm, 'hiddenwin');
common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task);
common::printIcon('task', 'finish', "taskID=$task->id", $task);
common::printIcon('task', 'close', "taskID=$task->id", $task);
if($this->task->isClickable($task, 'edit')) common::printIcon('task', 'edit', "taskID=$task->id");
common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list');
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list');
common::printIcon('task', 'close', "taskID=$task->id", $task, 'list');
if($this->task->isClickable($task, 'edit')) common::printIcon('task', 'edit',"taskID=$task->id", '', 'list');
?>
</td>
</tr>
module/project/view/taskheader.html.php
+4 -4
View File
@@ -21,10 +21,10 @@
</div>
<div class='f-right'>
<?php
if($browseType != 'needconfirm') common::printIcon('task', 'export', "projectID=$projectID&orderBy=$orderBy", '', 'big');
common::printIcon('task', 'report', "project=$project->id&browseType=$browseType", '', 'big');
common::printIcon('task', 'batchCreate', "projectID=$project->id", '', 'big');
common::printIcon('task', 'create', "project=$project->id", '', 'big');
if($browseType != 'needconfirm') common::printIcon('task', 'export', "projectID=$projectID&orderBy=$orderBy");
common::printIcon('task', 'report', "project=$project->id&browseType=$browseType");
common::printIcon('task', 'batchCreate', "projectID=$project->id");
common::printIcon('task', 'create', "project=$project->id");
?>
</div>
</div>
module/story/lang/zh-cn.php
+3 -3
View File
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
$lang->story->browse = "需求列表";
$lang->story->create = "新增需求";
$lang->story->create = "新增";
$lang->story->createCase = "建用例";
$lang->story->batchCreate = "批量添加";
$lang->story->change = "变更";
@@ -26,7 +26,7 @@ $lang->story->tasks = "相关任务";
$lang->story->taskCount = '任务数';
$lang->story->bugs = "Bug";
$lang->story->linkStory = '关联需求';
$lang->story->export = "导出数据";
$lang->story->export = "导出";
$lang->story->reportChart = "统计报表";
$lang->story->common = '需求';
@@ -189,7 +189,7 @@ $lang->story->action->linked2project = array('main' => '$date, 由 <strong>
$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 从项目 <strong>$extra</strong> 移除。');
/* 统计报表。*/
$lang->story->report->common = '统计报表';
$lang->story->report->common = '报表';
$lang->story->report->select = '请选择报表类型';
$lang->story->report->create = '生成报表';
module/story/view/view.html.php
+10 -12
View File
@@ -20,21 +20,19 @@
{
ob_start();
if($this->story->isClickable($story, 'change')) common::printLink('story', 'change', "storyID=$story->id", $lang->story->change);
if($this->story->isClickable($story, 'review')) common::printLink('story', 'review', "storyID=$story->id", $lang->story->review);
if($this->story->isClickable($story, 'close')) common::printLink('story', 'close', "storyID=$story->id", $lang->story->close);
if($this->story->isClickable($story, 'activate')) common::printLink('story', 'activate', "storyID=$story->id", $lang->story->activate);
if($this->story->isClickable($story, 'change')) common::printIcon('story', 'change', "storyID=$story->id");
if($this->story->isClickable($story, 'review')) common::printIcon('story', 'review', "storyID=$story->id");
if($this->story->isClickable($story, 'close')) common::printIcon('story', 'close', "storyID=$story->id");
if(!$this->story->isClickable($story, 'activate')) common::printIcon('story', 'activate', "storyID=$story->id");
common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=&param=0&storyID=$story->id", '', 'button', 'createCase');
if($this->story->isClickable($story, 'toCase')) common::printSplitIcon();
common::printLink('testcase', 'create', "productID=$story->product&moduleID=0&from=&param=0&storyID=$story->id", $lang->story->createCase);
if($this->story->isClickable($story, 'edit')) common::printSplitIcon();
common::printIcon('story', 'edit', "storyID=$story->id", '', 'big');
common::printDivider();
common::printIcon('story', 'edit', "storyID=$story->id");
common::printCommentIcon('story');
common::printIcon('story', 'create', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'big', 'copy');
common::printIcon('story', 'delete', "storyID=$story->id", '', 'big', '', 'hiddenwin');
common::printIcon('story', 'create', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'button', 'copy');
common::printIcon('story', 'delete', "storyID=$story->id", '', 'button', '', 'hiddenwin');
if($this->story->isClickable('story', 'goback')) common::printSplitIcon();
common::printDivider();
common::printRPN($browseLink, $preAndNext);
$actionLinks = ob_get_contents();
module/task/lang/zh-cn.php
+10 -10
View File
@@ -10,21 +10,21 @@
* @link http://www.zentao.net
*/
$lang->task->index = "任务一览";
$lang->task->create = "新增任务";
$lang->task->create = "新增";
$lang->task->batchCreate = "批量添加";
$lang->task->batchEdit = "批量编辑";
$lang->task->import = "导入之前未完任务";
$lang->task->edit = "编辑任务";
$lang->task->delete = "删除任务";
$lang->task->edit = "编辑";
$lang->task->delete = "删除";
$lang->task->view = "查看任务";
$lang->task->logEfforts = "记录工时";
$lang->task->start = "开始任务";
$lang->task->finish = "完成任务";
$lang->task->close = "关闭任务";
$lang->task->start = "开始";
$lang->task->finish = "完成";
$lang->task->close = "关闭";
$lang->task->batchClose = "批量关闭";
$lang->task->cancel = "取消任务";
$lang->task->activate = "激活任务";
$lang->task->export = "导出数据";
$lang->task->cancel = "取消";
$lang->task->activate = "激活";
$lang->task->export = "导出";
$lang->task->reportChart = "报表统计";
$lang->task->fromBug = '来源Bug';
$lang->task->confirmStoryChange = "确认需求变动";
@@ -135,7 +135,7 @@ $lang->task->delayWarning = " <strong class='delayed f-14px'> 延期%s天
$lang->task->remindBug = "该任务为Bug转化得到，是否更新Bug:%s ?";
/* 统计报表。*/
$lang->task->report->common = '统计报表';
$lang->task->report->common = '报表';
$lang->task->report->select = '请选择报表类型';
$lang->task->report->create = '生成报表';
module/task/view/view.html.php
+10 -10
View File
@@ -24,19 +24,19 @@
{
ob_start();
//if(!($task->status != 'closed' and $task->status != 'cancel' and common::printLink('task', 'logEfforts', "taskID=$task->id", $lang->task->buttonLogEfforts))) echo $lang->task->buttonLogEfforts . ' ';
common::printLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $lang->task->assign);
if($this->task->isClickable($task, 'start')) common::printLink('task', 'start', "taskID=$task->id", $lang->task->buttonStart);
if($this->task->isClickable($task, 'finish')) common::printLink('task', 'finish', "taskID=$task->id", $lang->task->buttonDone);
if($this->task->isClickable($task, 'close')) common::printLink('task', 'close', "taskID=$task->id", $lang->task->buttonClose);
if($this->task->isClickable($task, 'activate')) common::printLink('task', 'activate', "taskID=$task->id", $lang->task->buttonActivate);
if($this->task->isClickable($task, 'cancel')) common::printLink('task', 'cancel', "taskID=$task->id", $lang->task->buttonCancel);
common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id");
if($this->task->isClickable($task, 'start')) common::printIcon('task', 'start', "taskID=$task->id");
if($this->task->isClickable($task, 'finish')) common::printIcon('task', 'finish', "taskID=$task->id");
if($this->task->isClickable($task, 'close')) common::printIcon('task', 'close', "taskID=$task->id");
if($this->task->isClickable($task, 'activate')) common::printIcon('task', 'activate', "taskID=$task->id");
if($this->task->isClickable($task, 'cancel')) common::printIcon('task', 'cancel', "taskID=$task->id");
if($this->task->isClickable($task, 'edit')) common::printSplitIcon();
common::printIcon('task', 'edit', "taskID=$task->id", '', 'big');
common::printDivider();
common::printIcon('task', 'edit', "taskID=$task->id");
common::printCommentIcon('task');
common::printIcon('task', 'delete',"projectID=$task->project&taskID=$task->id", '', 'big', '', 'hiddenwin');
common::printIcon('task', 'delete',"projectID=$task->project&taskID=$task->id", '', 'button', '', 'hiddenwin');
if($this->task->isClickable($task, 'goback')) common::printSplitIcon();
common::printDivider();
common::printRPN($browseLink, $preAndNext);
$actionLinks = ob_get_contents();
module/testcase/js/view.js
+1 -1
View File
@@ -1,6 +1,6 @@
$(document).ready(function()
{
$(".runcase").colorbox({width:900, height:600, iframe:true, transition:'none'});
$(".runCase").colorbox({width:900, height:600, iframe:true, transition:'none'});
$(".results").colorbox({width:900, height:600, iframe:true, transition:'none'});
})
function setComment()
module/testcase/lang/zh-cn.php
+2 -2
View File
@@ -49,7 +49,7 @@ $lang->testcase->stepExpect = '预期';
$lang->testcase->common = '用例管理';
$lang->testcase->index = "用例管理首页";
$lang->testcase->create = "创建用例";
$lang->testcase->create = "建用例";
$lang->testcase->batchCreate = "批量添加";
$lang->testcase->delete = "删除用例";
$lang->testcase->view = "用例详情";
@@ -57,7 +57,7 @@ $lang->testcase->edit = "编辑用例";
$lang->testcase->delete = "删除用例";
$lang->testcase->browse = "用例列表";
$lang->testcase->import = "导入用例";
$lang->testcase->export = "导出数据";
$lang->testcase->export = "导出";
$lang->testcase->confirmStoryChange = '确认需求变动';
$lang->testcase->deleteStep = '删除';
module/testcase/view/browse.html.php
+7 -7
View File
@@ -30,9 +30,9 @@ var moduleID = '<?php echo $moduleID;?>';
</div>
<div class='f-right'>
<?php //common::printLink('testcase', 'import', "productID=$productID", '&nbsp;', '', "class='import icon-green-big-import' title='{$lang->testcase->import}'"); ?>
<?php if($browseType != 'needconfirm') common::printIcon('testcase', 'export', "productID=$productID&orderBy=$orderBy", '', 'big'); ?>
<?php common::printIcon('testcase', 'batchCreate', "productID=$productID&moduleID=$moduleID", '', 'big');?>
<?php common::printIcon('testcase', 'create', "productID=$productID&moduleID=$moduleID", '', 'big'); ?>
<?php if($browseType != 'needconfirm') common::printIcon('testcase', 'export', "productID=$productID&orderBy=$orderBy"); ?>
<?php common::printIcon('testcase', 'batchCreate', "productID=$productID&moduleID=$moduleID");?>
<?php common::printIcon('testcase', 'create', "productID=$productID&moduleID=$moduleID"); ?>
</div>
</div>
<div id='querybox' class='<?php if($browseType != 'bysearch') echo 'hidden';?>'><?php echo $searchForm;?></div>
@@ -91,10 +91,10 @@ var moduleID = '<?php echo $moduleID;?>';
<?php
common::printLink('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $this->app->loadLang('testtask')->testtask->runCase, '', 'class="runcase"');
common::printLink('testtask', 'results', "runID=0&caseID=$case->id", $lang->testtask->results, '', 'class="results"');
common::printIcon('testcase', 'edit', "caseID=$case->id", $case);
common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $case, 'small', 'copy');
common::printIcon('testcase', 'delete', "caseID=$case->id", '', 'small', '', 'hiddenwin');
common::printIcon('testcase', 'toBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'small', 'createBug');
common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list');
common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $case, 'list', 'copy');
common::printIcon('testcase', 'delete', "caseID=$case->id", '', 'list', '', 'hiddenwin');
common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug');
?>
</td>
<?php endif;?>
module/testcase/view/view.html.php
+9 -13
View File
@@ -21,22 +21,18 @@
{
ob_start();
common::printLink('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->currentVersion", $this->app->loadLang('testtask')->testtask->runCase, '', 'class="runcase"');
common::printLink('testtask', 'results', "runID=0&caseID=$case->id&version=$case->version", $lang->testtask->results, '', 'class="results"');
common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->currentVersion");
common::printIcon('testtask', 'results', "runID=0&caseID=$case->id&version=$case->version");
if($this->testcase->isClickable($case, 'toBug'))
{
common::printSplitIcon();
common::printLink('bug', 'create', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $lang->testtask->createBug);
}
if($this->testcase->isClickable($case, 'edit')) common::printSplitIcon();
common::printIcon('testcase', 'edit',"caseID=$case->id", '', 'big');
common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", '', 'button', 'createBug');
common::printDivider();
common::printIcon('testcase', 'edit',"caseID=$case->id");
common::printCommentIcon('testcase');
common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", '', 'big', 'copy');
common::printIcon('testcase', 'delete', "caseID=$case->id", '', 'big', '', 'hiddenwin');
common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", '', 'button', 'copy');
common::printIcon('testcase', 'delete', "caseID=$case->id", '', 'button', '', 'hiddenwin');
if($this->testcase->isClickable($case, 'goback')) common::printSplitIcon();
common::printDivider();
common::printRPN($browseLink, $preAndNext);
$actionLinks = ob_get_contents();
module/testtask/view/browse.html.php
+2 -2
View File
@@ -45,8 +45,8 @@
<?php
common::printLink('testtask', 'cases', "taskID=$task->id", $lang->testtask->cases);
common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCaseAB);
common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'small');
common::printIcon('testtask', 'delete', "taskID=$task->id", '', 'small', '', 'hiddenwin');
common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list');
common::printIcon('testtask', 'delete', "taskID=$task->id", '', 'list', '', 'hiddenwin');
?>
</td>
</tr>
module/testtask/view/view.html.php
+3 -3
View File
@@ -54,9 +54,9 @@
{
common::printLink('testtask', 'cases', "taskID=$task->id", $lang->testtask->cases);
common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCaseAB);
common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'big');
common::printIcon('testtask', 'delete', "taskID=$task->id", '', 'big', '', 'hiddenwin');
echo common::printRPN($browseLink);
common::printLink('testtask', 'edit', "taskID=$task->id",$lang->edit);
common::printLink('testtask', 'delete', "taskID=$task->id", $lang->delete, 'hiddenwin');
echo html::a($browseLink, $lang->goback);
}
?>
</div>
www/js/my.full.js
-1
View File
@@ -579,7 +579,6 @@ function setProjectListLink()
function setExport()
{
if($('.export').size()) $(".export").colorbox({width:500, height:200, iframe:true, transition:'elastic', speed:350, scrolling:true});
if($('.icon-green-big-common-export').size()) $(".icon-green-big-common-export").colorbox({width:500, height:200, iframe:true, transition:'elastic', speed:350, scrolling:true});
}
/**
www/theme/default/images/main/link-button.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 218 B

www/theme/default/images/main/zt-black.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 KiB

www/theme/default/images/main/zt-gray.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

www/theme/default/images/main/zt-green.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

www/theme/default/style.css
+106 -55
View File
@@ -312,10 +312,10 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
#projectID {background:#e5e5e5; border:1px solid #e5e5e5}
/* Feature bar. */
#featurebar {background-color:#EDF3FE; height:28px; line-height:28px; cursor:pointer; padding:6px 8px; margin: -15px -15px 10px -15px;}
#featurebar { height:28px; line-height:28px; cursor:pointer; padding:20px 8px 10px 8px; margin: -15px -15px 10px -15px;}
#featurebar a {text-decoration:none; border-right:1px solid #ddd; padding:4px 10px 4px 4px; color:#003366}
#featurebar a:hover {color:#ff3600;}
#featurebar .f-right a {color:red; font-weight:bold; border-right:none; padding:2px 10px;}
#featurebar .f-right a {border-right:none; padding:0px}
#featurebar #bysearchTab a {border:none;}
#featurebar select {font-size:12px; height:22px; margin-top:3px;}
@@ -330,9 +330,9 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
#tree a {color:#003366}
/* Title bar. */
#titlebar {font-size:14px; font-weight:bold; background-color:#EDF3FE; padding:5px; margin:5px 0; height:30px; line-height:30px;}
#titlebar #main {float:left; width:65%; clear:none; text-align:left}
#titlebar div {float:right; width:35%; clear:none; text-align:right}
#titlebar {font-size:14px; font-weight:bold; padding:5px; margin:0px 0px 8px 0px; height:30px; line-height:30px;}
#titlebar #main {float:left; width:45%; clear:none; text-align:left}
#titlebar div {float:right; width:55%; clear:none; text-align:right}
#titlebar #main input {font-size:14px; margin-top:5px}
#titlebar .text-1 {width:80%}
@@ -348,7 +348,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
#dataform .rowhead{font-size:11.5px; font-weight:1.2; border:none}
#dataform tr, #createform td, #createform th{border:none; background:#fcfcfc}
.actionlink{font-size:14px; font-weight:bold}
.actionlink{font-size:14px; font-weight:bold; padding-top:8px}
/* Product, project switcher. */
#switcher {color:white; font-style:bold; background:red; cursor:pointer;}
@@ -421,48 +421,81 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
.icon-arrow { padding-left:10px; background:url(images/main/ui-gray.png) -32px 0px;}
/* Common icons. */
.pri1 {padding:2px 8px; background:url(images/main/zt-green.png) 0px -141px;}
.pri2 {padding:2px 8px; background:url(images/main/zt-green.png) -20px -141px;}
.pri3 {padding:2px 8px; background:url(images/main/zt-green.png) -40px -141px;}
.pri4 {padding:2px 8px; background:url(images/main/zt-green.png) -60px -141px;}
.pri5 {padding:2px 8px; background:url(images/main/zt-green.png) -80px -141px;}
.pri6 {padding:2px 8px; background:url(images/main/zt-green.png) -100px -141px;}
.icon-goback {padding:2px 10px; background:url(images/main/zt-green.png) 2px -40px;}
.icon-pre {padding:2px 8px; background:url(images/main/zt-green.png) -22px -40px;}
.icon-next {padding:2px 8px; background:url(images/main/zt-green.png) -42px -40px;}
#searchicon {padding:2px 8px; background:url(images/main/zt-green.png) -102px -80px; margin-left:10px;}
#searchmore {padding:2px 8px; background:url(images/main/zt-green.png) -62px -100px no-repeat; margin-right:10px;}
#searchlite {padding:2px 8px; background:url(images/main/zt-green.png) -82px -100px no-repeat; margin-right:10px}
.icon-green-big-common-edit {padding:2px 8px; background:url(images/main/zt-green.png) -1px 0px;}
.icon-green-small-common-edit {padding:2px 8px; background:url(images/main/zt-green.png) 0px -21px;}
.icon-green-big-common-comment {padding:2px 8px; background:url(images/main/zt-green.png) -22px 0px;}
.icon-green-big-common-copy {padding:2px 8px; background:url(images/main/zt-green.png) -41px 0px;}
.icon-green-small-common-copy {padding:2px 8px; background:url(images/main/zt-green.png) -40px -21px;}
.icon-green-big-common-delete {padding:2px 8px; background:url(images/main/zt-green.png) -60px 0px;}
.icon-green-small-common-delete {padding:2px 8px; background:url(images/main/zt-green.png) -60px -22px;}
.icon-green-big-common-splitLine {padding:2px 10px; background:url(images/main/zt-green.png) -61px -40px;}
.icon-green-big-common-report {padding:2px 10px; background:url(images/main/zt-green.png) -40px -82px;}
#featurebar .f-right .icon-green-big-common-import {padding:2px 8px; background:url(images/main/zt-green.png) 0px -80px;}
#featurebar .f-right .icon-green-big-common-export {padding:2px 8px; background:url(images/main/zt-green.png) -21px -82px;}
.pri1 {padding:2px 8px; background:url(images/main/zt-green.png) 0px -141px;}
.pri2 {padding:2px 8px; background:url(images/main/zt-green.png) -20px -141px;}
.pri3 {padding:2px 8px; background:url(images/main/zt-green.png) -40px -141px;}
.pri4 {padding:2px 8px; background:url(images/main/zt-green.png) -60px -141px;}
.pri5 {padding:2px 8px; background:url(images/main/zt-green.png) -80px -141px;}
.pri6 {padding:2px 8px; background:url(images/main/zt-green.png) -100px -141px;}
.icon-goback {padding:2px 8px; background:url(images/main/zt-black.png) -4px -62px;}
.icon-pre {padding:2px 8px; background:url(images/main/zt-black.png) -24px -62px;}
.icon-next {padding:2px 8px; background:url(images/main/zt-black.png) -45px -62px;}
#searchicon {padding:2px 8px; background:url(images/main/zt-green.png) -102px -80px; margin-left:10px;}
#searchmore {padding:2px 8px; background:url(images/main/zt-green.png) -62px -100px no-repeat; margin-right:10px;}
#searchlite {padding:2px 8px; background:url(images/main/zt-green.png) -82px -100px no-repeat; margin-right:10px}
.icon-black-common-edit {padding:2px 8px; background:url(images/main/zt-black.png) -4px -22px no-repeat;}
.icon-green-common-edit {padding:2px 8px; background:url(images/main/zt-green.png) 0px -22px no-repeat;}
.icon-black-common-comment {padding:2px 8px; background:url(images/main/zt-black.png) -24px -22px no-repeat;}
.icon-black-common-copy {padding:2px 8px; background:url(images/main/zt-black.png) -40px -21px no-repeat;}
.icon-green-common-copy {padding:2px 8px; background:url(images/main/zt-green.png) -40px -21px no-repeat;}
.icon-black-common-delete {padding:2px 8px; background:url(images/main/zt-black.png) -65px -22px no-repeat;}
.icon-green-common-delete {padding:2px 8px; background:url(images/main/zt-green.png) -60px -22px no-repeat;}
.icon-gray-common-delete {padding:2px 8px; background:url(images/main/zt-gray.png) -60px -22px no-repeat;}
#featurebar .f-right .icon-black-common-report {padding:2px 10px; background:url(images/main/zt-black.png) -40px -102px no-repeat;}
#featurebar .f-right .icon-black-common-export {padding:2px 8px; background:url(images/main/zt-black.png) -21px -102px;}
/* Story icons. */
.icon-green-small-story-change {padding:2px 8px; background:url(images/main/zt-green.png) -40px -220px;}
.icon-gray-small-story-change {padding:2px 8px; background:url(images/main/zt-gray.png) -40px -220px;}
.icon-green-small-story-review {padding:2px 8px; background:url(images/main/zt-green.png) -60px -221px;}
.icon-gray-small-story-review {padding:2px 8px; background:url(images/main/zt-gray.png) -60px -221px;}
.icon-green-small-story-createCase {padding:2px 8px; background:url(images/main/zt-green.png) -120px -221px;}
#featurebar .f-right .icon-green-big-story-create {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) 0px -202px;}
#featurebar .f-right .icon-green-big-story-batchCreate {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) -20px -202px;}
.icon-black-story-toStory {padding:2px 8px; background:url(images/main/zt-black.png) 0px -222px;}
.icon-black-story-change {padding:2px 8px; background:url(images/main/zt-black.png) -40px -220px;}
.icon-green-story-change {padding:2px 8px; background:url(images/main/zt-green.png) -40px -220px;}
.icon-gray-story-change {padding:2px 8px; background:url(images/main/zt-gray.png) -40px -220px;}
.icon-black-story-review {padding:2px 8px; background:url(images/main/zt-black.png) -60px -221px;}
.icon-green-story-review {padding:2px 8px; background:url(images/main/zt-green.png) -60px -221px;}
.icon-gray-story-review {padding:2px 8px; background:url(images/main/zt-gray.png) -60px -221px;}
.icon-black-story-close {padding:2px 8px; background:url(images/main/zt-black.png) -80px -221px;}
.icon-green-story-close {padding:2px 8px; background:url(images/main/zt-green.png) -80px -221px;}
.icon-gray-story-close {padding:2px 8px; background:url(images/main/zt-gray.png) -80px -221px;}
.icon-black-story-activate {padding:2px 8px; background:url(images/main/zt-black.png) -100px -221px;}
.icon-black-story-createCase {padding:2px 8px; background:url(images/main/zt-green.png) -120px -221px;}
.icon-green-story-createCase {padding:2px 8px; background:url(images/main/zt-green.png) -120px -221px;}
#featurebar .f-right .icon-black-story-create {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) 0px -222px;}
#featurebar .f-right .icon-black-story-batchCreate {padding:2px 7px 2px 10px; background:url(images/main/zt-black.png) -20px -222px;}
/* Task icons. */
.icon-green-small-task-assignTo {padding:2px 8px; background:url(images/main/zt-green.png) -40px -262px;}
.icon-gray-small-task-assignTo {padding:2px 8px; background:url(images/main/zt-gray.png) -40px -262px;}
.icon-green-small-task-finish {padding:2px 8px; background:url(images/main/zt-green.png) -80px -262px;}
.icon-gray-small-task-finish {padding:2px 8px; background:url(images/main/zt-gray.png) -80px -262px;}
.icon-green-small-task-close {padding:2px 8px; background:url(images/main/zt-green.png) -100px -261px;}
.icon-gray-small-task-close {padding:2px 8px; background:url(images/main/zt-gray.png) -100px -261px;}
#featurebar .f-right .icon-green-big-task-create {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) 0px -242px;}
#featurebar .f-right .icon-green-big-task-batchCreate {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) -20px -242px;}
.icon-black-task-assignTo {padding:2px 8px; background:url(images/main/zt-black.png) -40px -262px;}
.icon-green-task-assignTo {padding:2px 8px; background:url(images/main/zt-green.png) -40px -262px;}
.icon-gray-task-assignTo {padding:2px 8px; background:url(images/main/zt-gray.png) -40px -262px;}
.icon-black-task-start {padding:2px 8px; background:url(images/main/zt-black.png) -61px -262px;}
.icon-green-task-start {padding:2px 8px; background:url(images/main/zt-green.png) -61px -262px;}
.icon-gray-task-start {padding:2px 8px; background:url(images/main/zt-gray.png) -61px -262px;}
.icon-black-task-finish {padding:2px 8px; background:url(images/main/zt-black.png) -80px -262px;}
.icon-green-task-finish {padding:2px 8px; background:url(images/main/zt-green.png) -80px -262px;}
.icon-gray-task-finish {padding:2px 8px; background:url(images/main/zt-gray.png) -80px -262px;}
.icon-black-task-activate {padding:2px 8px; background:url(images/main/zt-black.png) -120px -262px;}
.icon-green-task-activate {padding:2px 8px; background:url(images/main/zt-green.png) -120px -262px;}
.icon-gray-task-activate {padding:2px 8px; background:url(images/main/zt-gray.png) -120px -262px;}
.icon-black-task-cancel {padding:2px 8px; background:url(images/main/zt-black.png) -141px -262px;}
.icon-green-task-close {padding:2px 8px; background:url(images/main/zt-green.png) -100px -261px;}
.icon-gray-task-close {padding:2px 8px; background:url(images/main/zt-gray.png) -100px -261px;}
#featurebar .f-right .icon-black-task-create {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) 0px -262px;}
#featurebar .f-right .icon-black-task-batchCreate {padding:2px 7px 2px 10px; background:url(images/main/zt-black.png) -20px -262px;}
/* Bug icons. */
.severity1 {padding:2px 8px; background:url(images/main/zt-green.png) 0px -381px;}
@@ -471,16 +504,34 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
.severity4 {padding:2px 8px; background:url(images/main/zt-green.png) -60px -381px;}
.severity5 {padding:2px 8px; background:url(images/main/zt-green.png) -80px -381px;}
.severity6 {padding:2px 8px; background:url(images/main/zt-green.png) -100px -381px;}
.icon-green-small-bug-createBug {padding:2px 8px; background:url(images/main/zt-green.png) -40px -342px;}
.icon-gray-small-bug-createBug {padding:2px 8px; background:url(images/main/zt-gray.png) -40px -342px;}
.icon-green-small-bug-resolve {padding:2px 8px; background:url(images/main/zt-green.png) -60px -301px;}
.icon-gray-small-bug-resolve {padding:2px 8px; background:url(images/main/zt-gray.png) -60px -301px;}
.icon-green-small-bug-close {padding:2px 8px; background:url(images/main/zt-green.png) -80px -301px;}
.icon-gray-small-bug-close {padding:2px 8px; background:url(images/main/zt-gray.png) -80px -301px;}
#featurebar .f-right .icon-green-big-bug-create, caption .f-right .icon-green-big-bug-create {padding:2px 8px; background:url(images/main/zt-green.png) 0px -202px;}
#featurebar .f-right .icon-green-big-bug-customFields {padding:2px 8px; background:url(images/main/zt-green.png) -161px -282px;}
.icon-black-bug-confirmBug {padding:2px 8px; background:url(images/main/zt-black.png) -40px -302px;}
.icon-black-bug-assignTo {padding:2px 8px; background:url(images/main/zt-black.png) -40px -262px;}
.icon-black-bug-createBug {padding:2px 8px; background:url(images/main/zt-black.png) -40px -342px;}
.icon-green-bug-createBug {padding:2px 8px; background:url(images/main/zt-green.png) -40px -342px;}
.icon-gray-bug-createBug {padding:2px 8px; background:url(images/main/zt-gray.png) -40px -342px;}
.icon-black-bug-resolve {padding:2px 8px; background:url(images/main/zt-black.png) -60px -301px;}
.icon-green-bug-resolve {padding:2px 8px; background:url(images/main/zt-green.png) -60px -301px;}
.icon-gray-bug-resolve {padding:2px 8px; background:url(images/main/zt-gray.png) -60px -301px;}
.icon-green-bug-close {padding:2px 8px; background:url(images/main/zt-green.png) -80px -301px;}
.icon-gray-bug-close {padding:2px 8px; background:url(images/main/zt-gray.png) -80px -301px;}
#featurebar .f-right .icon-black-bug-create, caption .f-right .icon-black-bug-create {padding:2px 8px; background:url(images/main/zt-green.png) 0px -222px;}
#featurebar .f-right .icon-black-bug-customFields {padding:2px 8px; background:url(images/main/zt-black.png) -161px -302px;}
/* Case icons. */
.icon-green-small-testcase-createCase {padding:1px 7px 1px 10px; background:url(images/main/zt-green.png) -120px -222px;}
#featurebar .f-right .icon-green-big-testcase-create {padding:2px 8px; background:url(images/main/zt-green.png) 0px -320px;}
#featurebar .f-right .icon-green-big-testcase-batchCreate {padding:2px 8px; background:url(images/main/zt-green.png) -20px -320px;}
.icon-black-testcase-createCase {padding:1px 7px 1px 10px; background:url(images/main/zt-black.png) -120px -222px;}
.icon-green-testcase-createCase {padding:1px 7px 1px 10px; background:url(images/main/zt-green.png) -120px -222px;}
#featurebar .f-right .icon-black-testcase-create {padding:2px 8px; background:url(images/main/zt-green.png) 0px -340px;}
#featurebar .f-right .icon-black-testcase-batchCreate {padding:2px 8px; background:url(images/main/zt-black.png) -20px -340px;}
.link-button {padding:5px 0px 5px 12px; margin-left:-1px; background:url(images/main/link-button.png) 0px 0px repeat-x; border-right:1px solid RGB(234, 234, 234); border-left:1px solid RGB(234, 234, 234)}
.link-button:hover {background:RGB(200, 200, 200)}
.link-button a{color:black; font-weight:normal; font-size:12px;}
.link-button a:hover {color:RGB(234, 0, 0);}
www/theme/lang/en.css
+2 -2
View File
@@ -2,5 +2,5 @@
.w-hour {width:85px}
.w-resolution {width:85px}
.side .rowhead {width:100px}
#titlebar #main{width:60%}
#titlebar div{width:40%}
#titlebar #main{width:40%}
#titlebar div{width:60%}