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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
tengfei
2018-05-17 15:09:59 +08:00
parent 44d87c1368 dd94a715b8
commit ba2a44a659
73 changed files with 537 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/base/front/front.class.php
+5 -5
View File
@@ -392,7 +392,7 @@ class baseHTML
{
$html = "<div class='input-append date date-picker' {$options}>";
$html .= "<input type='text' name='{$name}' id='$name' value='$value' {$attrib} />\n";
$html .= "<span class='add-on'><button class='btn btn-default' type='button'><i class='icon-calendar'></i></button></span></div>";
$html .= "<span class='add-on'><button class='btn' type='button'><i class='icon-calendar'></i></button></span></div>";
return $html;
}
@@ -412,7 +412,7 @@ class baseHTML
{
$html = "<div class='input-append date time-picker' {$options}>";
$html .= "<input type='text' name='{$name}' id='$name' value='$value' {$attrib} />\n";
$html .= "<span class='add-on'><button class='btn btn-default' type='button'><i class='icon-calendar'></i></button></span></div>";
$html .= "<span class='add-on'><button class='btn' type='button'><i class='icon-calendar'></i></button></span></div>";
return $html;
}
@@ -507,7 +507,7 @@ class baseHTML
* @access public
* @return string the common button tag.
*/
public static function commonButton($label = '', $class = 'btn btn-default', $misc = '', $icon = '')
public static function commonButton($label = '', $class = 'btn', $misc = '', $icon = '')
{
if($icon) $label = "<i class='icon-" . $icon . "'></i> " . $label;
return " <button type='button' class='$class' $misc>$label</button>";
@@ -526,7 +526,7 @@ class baseHTML
* @access public
* @return string
*/
public static function linkButton($label = '', $link = '', $class='btn btn-default', $misc = '', $target = 'self')
public static function linkButton($label = '', $link = '', $class='btn', $misc = '', $target = 'self')
{
global $config, $lang;
@@ -650,7 +650,7 @@ function selectReverse(scope)
</script>
EOT;
global $lang;
$string .= "<input type='button' name='reversechecker' id='reversechecker' value='{$lang->selectReverse}' class='btn btn-default' onclick='selectReverse(\"$scope\")'/>";
$string .= "<input type='button' name='reversechecker' id='reversechecker' value='{$lang->selectReverse}' class='btn' onclick='selectReverse(\"$scope\")'/>";
return $string;
}
lib/front/front.class.php
+2 -2
View File
@@ -92,12 +92,12 @@ class html extends baseHTML
return parent::submitButton($label, $class, $misc);
}
public static function commonButton($label = '', $misc = '', $class = 'btn btn-default', $icon = '')
public static function commonButton($label = '', $misc = '', $class = 'btn', $icon = '')
{
return parent::commonButton($label, $class, $misc, $icon);
}
public static function linkButton($label = '', $link = '', $target = 'self', $misc = '', $class = 'btn btn-default')
public static function linkButton($label = '', $link = '', $target = 'self', $misc = '', $class = 'btn')
{
return parent::linkButton($label, $link, $class, $misc, $target);
}
module/block/css/dashboard.css
+3 -1
View File
@@ -1,2 +1,4 @@
.block-statistic .nav-stacked {overflow: auto; max-height: 220px;}
.nav > li > .btn {padding: 0 5px; line-height: 24px; margin: 3px; color: #3C4353;}
.nav > li > .btn {padding: 0 5px; line-height: 24px; margin: 3px; color: #3C4353;}
.dashboard .panel-body {max-height: 400px;overflow: auto;}
module/block/view/bugblock.html.php
+12 -2
View File
@@ -10,11 +10,21 @@
* @link http://www.ranzhi.org
*/
?>
<style>
.block-bugs .c-id {width: 55px;}
.block-bugs .c-level {width: 50px;text-align: center;}
.block-bugs .c-pri {width: 35px;text-align: center;}
.block-bugs .c-deadline {width: 95px;}
.block-bugs .c-status {width: 80px;}
.block-bugs.block-sm .c-pri,
.block-bugs.block-sm .c-status .label-dot {display: none;}
.block-bugs.block-sm .c-status {text-align: center;}
</style>
<div class='panel-body has-table'>
<table class='table table-borderless table-fixed-head table-hover block-bugs <?php if(!$longBlock) echo 'block-sm'?>'>
<thead>
<tr>
<th class='c-id'><?php echo $lang->idAB?></th>
<th class='c-id-xs'><?php echo $lang->idAB?></th>
<?php if($longBlock):?>
<th class='c-pri'><?php echo $lang->priAB?></th>
<?php endif;?>
@@ -30,7 +40,7 @@
$viewLink = $this->createLink('bug', 'view', "bugID={$bug->id}");
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td class='c-id'><?php echo $bug->id;?></td>
<td class='c-id-xs'><?php echo $bug->id;?></td>
<?php if($longBlock):?>
<td class='c-pri'><span class='label-pri label-pri-<?php echo $bug->pri?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
<?php endif;?>
module/block/view/caseblock.html.php
+2 -2
View File
@@ -25,7 +25,7 @@
<thead>
<tr class='text-center'>
<?php if($longBlock):?>
<th class='c-id'><?php echo $lang->idAB?></th>
<th class='c-id-xs'><?php echo $lang->idAB?></th>
<?php endif;?>
<th class='c-pri'><?php echo $lang->priAB?></th>
<th class='c-title text-left'><?php echo $lang->case->title;?></th>
@@ -44,7 +44,7 @@
?>
<tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<?php if($longBlock):?>
<td class='c-id'><?php echo $case->id;?></td>
<td class='c-id-xs'><?php echo $case->id;?></td>
<?php endif;?>
<td class='c-pri'><span class='label-pri label-pri-<?php echo $case->pri?>'><?php echo zget($lang->case->priList, $case->pri, $case->pri)?></span></td>
<td class='c-title text-left' style='color: <?php echo $case->color?>' title='<?php echo $case->title?>'><?php echo $case->title?></td>
module/block/view/dashboard.html.php
+1 -1
View File
@@ -105,7 +105,7 @@ config.confirmRemoveBlock = '<?php echo $lang->block->confirmRemoveBlock; ?>';
var module = '<?php echo $module?>';
var useGuest = <?php echo $useGuest ? 'true' : 'false';?>;
<?php if(!$useGuest):?>
$('#subHeader #pageActions .btn-toolbar:last').append(<?php echo json_encode(html::a($this->createLink("block", "admin", "id=0&module=$module"), "<i class='icon icon-plus text-muted'></i> {$lang->block->createBlock}", '', "class='btn btn-default' data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}'"))?>);
$('#subHeader #pageActions .btn-toolbar:last').append(<?php echo json_encode(html::a($this->createLink("block", "admin", "id=0&module=$module"), "<i class='icon icon-plus text-muted'></i> {$lang->block->createBlock}", '', "class='btn' data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}'"))?>);
<?php endif;?>
</script>
<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
module/block/view/dynamic.html.php
+1 -1
View File
@@ -1,5 +1,5 @@
<div class='panel-body'>
<ul class="timeline timeline-tag-left">
<ul class="timeline timeline-tag-left no-margin">
<?php
$i = 0;
foreach($actions as $action)
module/block/view/flowchart.html.php
+21
View File
@@ -1,3 +1,24 @@
<style>
.block-flowchart {padding: 10px;}
.block-flowchart .table {margin-bottom: 0;}
.block-flowchart .table > thead > tr > th,
.block-flowchart .table > tbody > tr > td,
.block-flowchart .table > tbody > tr > th {padding: 10px;font-weight: normal;text-align: center;}
.block-flowchart .table > thead > tr > th:first-child,
.block-flowchart .table > tbody > tr > td:first-child,
.block-flowchart .table > tbody > tr > th:first-child {text-align: left;}
.block-flowchart .table > thead > tr > th {width: 18%;vertical-align: top;}
.block-flowchart .table > thead > tr > th:first-child {width: auto;padding: 10px 10px 15px 10px;background: none;}
.block-flowchart .table > thead > tr > th:first-child + th > div {background: none;}
.block-flowchart .table > thead > tr > th,
.block-flowchart .table > thead > tr > th > div {padding: 0;background: url('data:image/gif;base64,R0lGODlhLQAPAJEAAAAAAP///+7u7v///yH5BAEAAAMALAAAAAAtAA8AAAJPlIY5psn92jrSUGVrRFlfvHHh9JGS6aVQ2K2l+LYOO6KuCpby/No8DjvtgrfiD+gj5ozLpvMIfSanu2FyiKX1qqOsrsaNdbXCcfm8Ok1OBQA7') no-repeat;background-position: right -22px top 15px;}
.block-flowchart .table > thead > tr > th > div {padding: 10px 10px 15px 10px;background-position: left -23px top 15px;}
.block-flowchart .table > thead > tr > th:last-child {background: none;}
.block-flowchart .table > tbody > tr > td {color: #3c4353;}
.block-flowchart .table > tbody > tr:nth-child(even) > td {background: #f7f8f9;}
.block-flowchart .flowchart-title {font-size: 14px;font-weight: bold;color: #3c4353;}
.block-flowchart .flowchart-step {display: inline-block;width: 24px;height: 24px;font-size: 14px;line-height: 24px;color: #fff;background-color: #00a9fc;border-radius: 50%;}
</style>
<table class="table table-borderless">
<thead>
<tr>
module/block/view/printassigntomeblock.html.php
+4
View File
@@ -17,3 +17,7 @@
</div>
<?php endforeach;?>
</div>
<style>
#assigntomeBlock #todo,
#assigntomeBlock #task {border-bottom: 1px solid #eee;}
</style>
module/block/view/productblock.html.php
+7
View File
@@ -10,6 +10,13 @@
* @link http://www.zentao.net
*/
?>
<style>
.block-products .c-plans {width: 70px;color: #8e939a;text-align: center;}
.block-products .c-publishs {width: 70px;color: #8e939a;text-align: center;}
.block-products .c-stories {width: 80px;color: #8e939a;text-align: center;}
.block-products .c-bugs {width: 90px;color: #8e939a;text-align: center;}
.block-products.block-sm .c-project {display: none;}
</style>
<div class="panel-body has-table block-products">
<table class='table table-borderless table-hover table-fixed-head table-fixed'>
<thead>
module/block/view/projectoverviewblock.html.php
+1 -2
View File
@@ -25,8 +25,7 @@
<ul class="status-bars">
<?php foreach($lang->project->statusList as $statusKey => $statusName):?>
<li>
<span class="value"><?php echo $overview[$statusKey];?></span>
<span class="bar" style="height: <?php echo $overviewPercent[$statusKey];?>"></span>
<span class="bar" style="height: <?php echo $overviewPercent[$statusKey];?>"><span class="value"><?php echo $overview[$statusKey];?></span></span>
<span class="title"><?php echo $statusName;?></span>
</li>
<?php endforeach;?>
module/block/view/releaseblock.html.php
+1 -1
View File
@@ -15,7 +15,7 @@
<thead>
<tr>
<?php if($longBlock):?>
<th class='c-id text-center'><?php echo $lang->idAB?></th>
<th class='c-id-xs text-center'><?php echo $lang->idAB?></th>
<th><?php echo $lang->release->product;?></th>
<?php endif;?>
<th><?php echo $lang->release->name;?></th>
module/block/view/storyblock.html.php
+13 -2
View File
@@ -10,12 +10,23 @@
* @link http://www.ranzhi.org
*/
?>
<style>
.block-stories .c-id {width: 55px;}
.block-stories .c-pri {width: 45px;text-align: center;}
.block-stories .c-estimate {width: 55px;}
.block-stories .c-status {width: 80px;}
.block-stories .c-stage {width: 80px;}
.block-stories.block-sm .estimate,
.block-stories.block-sm .c-stage,
.block-stories.block-sm .c-status .label-dot {display: none;}
.block-stories.block-sm .c-status {text-align: center;}
</style>
<div class='panel-body has-table'>
<table class='table table-borderless table-hover table-fixed-head block-stories <?php if(!$longBlock) echo 'block-sm'?>'>
<thead>
<tr>
<?php if($longBlock):?>
<th class="c-id"><?php echo $lang->idAB?></th>
<th class="c-id-xs"><?php echo $lang->idAB?></th>
<?php endif;?>
<th class="c-pri"><?php echo $lang->priAB?></th>
<th class="c-name"><?php echo $lang->story->title;?></th>
@@ -36,7 +47,7 @@
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<?php if($longBlock):?>
<td class="c-id"><?php echo $story->id;?></td>
<td class="c-id-xs"><?php echo $story->id;?></td>
<?php endif;?>
<td class="c-pri"><span class="label-pri label-pri-<?php echo $story->pri?>"><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td class="c-name" style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo $story->title?></td>
module/block/view/taskblock.html.php
+13 -2
View File
@@ -10,11 +10,22 @@
* @link http://www.ranzhi.org
*/
?>
<style>
.block-tasks .c-id {width: 55px;}
.block-tasks .c-pri {width: 45px;text-align: center;}
.block-tasks .c-estimate {width: 55px;}
.block-tasks .c-deadline {width: 95px;}
.block-tasks .c-status {width: 80px;}
.block-tasks.block-sm .estimate,
.block-tasks.block-sm .c-deadline,
.block-tasks.block-sm .c-status .label-dot {display: none;}
.block-tasks.block-sm .c-status {text-align: center;}
</style>
<div class='panel-body has-table'>
<table class='table table-borderless table-hover table-fixed-head block-tasks <?php if(!$longBlock) echo 'block-sm';?>'>
<thead>
<tr>
<th class='c-id'><?php echo $lang->idAB;?></th>
<th class='c-id-xs'><?php echo $lang->idAB;?></th>
<th class='c-pri'><?php echo $lang->priAB?></th>
<th class='c-name'> <?php echo $lang->task->name;?></th>
<?php if($longBlock):?>
@@ -31,7 +42,7 @@
$viewLink = $this->createLink('task', 'view', "taskID={$task->id}");
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td class='c-id'><?php echo $task->id;?></td>
<td class='c-id-xs'><?php echo $task->id;?></td>
<td class='c-pri'><span class='label-pri label-pri-<?php echo $task->pri;?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
<td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo $task->name?></td>
<?php if($longBlock):?>
module/block/view/todoblock.html.php
+25 -2
View File
@@ -10,6 +10,29 @@
* @link http://www.ranzhi.org
*/
?>
<style>
.block-todoes .panel-body {position: relative;padding-top: 42px;overflow: visible;}
.block-todoes .todoes-input {position: absolute;top: 0;right: 0;left: 0;padding: 0 20px 20px 20px;}
.block-todoes .todoes-input .form-control::-webkit-input-placeholder {font-size: 12px;line-height: 20px;color: #a4a8b6;}
.block-todoes .todoes-input .form-control::-moz-placeholder {font-size: 12px;line-height: 20px;color: #a4a8b6;}
.block-todoes .todoes-input .form-control:-ms-input-placeholder {font-size: 12px;line-height: 20px;color: #a4a8b6;}
.block-todoes .todoes-input .form-control::placeholder {font-size: 12px;line-height: 20px;color: #a4a8b6;}
.block-todoes .todoes {padding-left: 0;margin: 0 -10px;}
.block-todoes .todoes > li {position: relative;padding: 5px 10px 5px 35px;list-style: none;}
.block-todoes .todoes > li:hover {background-color: #e9f2fb;}
.block-todoes .todo-title {display: block;padding: 5px;}
.block-todoes .todo-pri {display: inline-block;padding: 0 5px;font-size: 12px;color: #3c4353;}
.block-todoes .todo-time {display: inline-block;padding: 0 5px;font-size: 12px;color: #8e939a;}
.block-todoes .todo-check {position: absolute;top: 10px;left: 10px;display: block;width: 20px;height: 20px;font-size: 20px;color: transparent;cursor: pointer;background: #fff;border: 2px solid #eee;border-radius: 50%;}
.block-todoes .todo-check:hover {border-color: #8e939a;}
.block-todoes .active > .todo-check {color: #00da88;background: transparent;border: none;}
.block-todoes .todoes-form {position: absolute;top: -45px;right: 0;left: 0;z-index: 15;max-width: 500px;padding: 12px 20px 20px;visibility: hidden;background: #fff;-webkit-box-shadow: 0 0 20px 0 #bdc9d8;box-shadow: 0 0 20px 0 #bdc9d8;opacity: 0;-webkit-transition: .4s cubic-bezier(.175, .885, .32, 1); -o-transition: .4s cubic-bezier(.175, .885, .32, 1);transition: .4s cubic-bezier(.175, .885, .32, 1);-webkit-transition-property: opacity, visibility; -o-transition-property: opacity, visibility;transition-property: opacity, visibility;}
.block-todoes .todoes-form .form-group > label {padding-left: 0;}
.block-todoes .todoes-form .form-group > label.text-center {text-align: center!important;}
.block-todoes .todoes-form > .form-group:last-child {margin-bottom: 0;}
.block-todoes .todoes-form > h3 {padding: 0 20px 15px;margin: 0 -20px 5px;font-size: 14px;line-height: 20px;}
.block-todoes.show-form .todoes-form {visibility: visible;opacity: 1;}
</style>
<div class='block-todoes' id="block <?php echo ($block->block)?>">
<div class='panel-body'>
<div class="todoes-input">
@@ -56,10 +79,10 @@
</div>
<div class="form-group">
<div class="col-sm-2"></div>
<div class="col-sm-10">
<div class="col-sm-10 form-actions no-margin">
<?php echo html::hidden('type', 'custom');?>
<?php echo html::commonButton($lang->save, "onclick='ajaxCreateTodo(this)'", "btn btn-primary btn-wide");?>
<button type="button" class="btn btn-default btn-wide todo-form-trigger" data-trigger="false"><?php echo $lang->goback;?></button>
<button type="button" class="btn btn-wide todo-form-trigger" data-trigger="false"><?php echo $lang->goback;?></button>
</div>
</div>
</form>
module/block/view/welcome.html.php
+13
View File
@@ -10,6 +10,19 @@
* @link http://www.zentao.net
*/
?>
<style>
.block-welcome .col-left {width: 25%;}
.block-welcome .col-left > h4 {margin: 5px 0;line-height: 30px;}
.block-welcome .col-left .timeline {margin: 10px 0 0;font-size: 12px;}
.block-welcome .col-right {width: 75%;}
.block-welcome .col-right > h4 {font-weight: normal;}
.block-welcome .col-right > h4 small {display: inline-block;margin-right: 8px;font-size: 14px;}
.block-welcome .col-right .tiles {padding: 10px 0 0 16px;border-left: 1px solid #e5e8ec;}
.block-welcome .col-right .tile {width: 20%;}
.block-welcome .panel-body {padding-top: 15px;}
.block-welcome .user-notification-icon {position: relative;display: inline-block;margin-left: 5px;}
.block-welcome .user-notification-icon .label-badge {position: absolute;top: 1px;right: -8px;min-width: 16px;padding: 2px;font-size: 12px;font-weight: normal;}
</style>
<div class="panel-body conatiner-fluid">
<div class="row">
<div class="col col-left">
module/bug/view/batchactivate.html.php
+8 -8
View File
@@ -15,22 +15,22 @@
<div class='main-header'>
<h2><?php echo $lang->bug->common . $lang->colon . $lang->bug->batchActivate;?></h2>
</div>
<form method='post' target='hiddenwin'>
<table class='table table-fixed with-border'>
<form class='main-form' method='post' target='hiddenwin'>
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-20px'><?php echo $lang->idAB;?></th>
<th class='w-50px'><?php echo $lang->bug->title;?></th>
<th class='w-70px'><?php echo $lang->bug->assignedTo;?></th>
<th class='w-70px'><?php echo $lang->bug->openedBuild;?></th>
<th class='w-150px'><?php echo $lang->bug->legendComment;?></th>
<th class='w-40px'><?php echo $lang->idAB;?></th>
<th class='w-160px'><?php echo $lang->bug->title;?></th>
<th class='w-120px'><?php echo $lang->bug->assignedTo;?></th>
<th class='w-200px'><?php echo $lang->bug->openedBuild;?></th>
<th><?php echo $lang->bug->legendComment;?></th>
</tr>
</thead>
<tbody class='text-left'>
<?php foreach($bugs as $bug):?>
<tr>
<td class='text-center'><?php echo $bug->id . html::hidden("bugIDList[$bug->id]", $bug->id);?></td>
<td><?php echo $bug->title . html::hidden("statusList[$bug->id]", $bug->status);?></td>
<td title='<?php echo $bug->title;?>'><?php echo $bug->title . html::hidden("statusList[$bug->id]", $bug->status);?></td>
<td style='overflow:visible'><?php echo html::select("assignedToList[$bug->id]", $users, $bug->resolvedBy, "class='form-control chosen'");?></td>
<td style='overflow:visible'><?php echo html::select("openedBuildList[$bug->id]", $builds, $bug->openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?></td>
<td><?php echo html::input("commentList[$bug->id]", '', "class='form-control'");?></td>
module/bug/view/create.html.php
+2 -2
View File
@@ -77,7 +77,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
<div class='input-group' id='buildBox'>
<?php echo html::select('openedBuild[]', $builds, $buildID, "size=4 multiple=multiple class='chosen form-control'");?>
<span class='input-group-addon fix-border' id='buildBoxActions'></span>
<div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn btn-default' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
<div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
</div>
</td>
</tr>
@@ -86,7 +86,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
<td>
<div class='input-group'>
<div class='input-group' id='assignedToBox'><?php echo html::select('assignedTo', $projectMembers, $assignedTo, "class='form-control chosen'");?></div>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?></span>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allUsers, "class='btn' onclick='loadAllUsers()' data-toggle='tooltip'");?></span>
</div>
</td>
</tr>
module/bug/view/edit.html.php
+2 -2
View File
@@ -218,7 +218,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<td>
<div id='openedBuildBox' class='input-group'>
<?php echo html::select('openedBuild[]', $openedBuilds, $bug->openedBuild, 'size=4 multiple=multiple class="chosen form-control"');?>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn btn-default' onclick='loadAllBuilds(this)'")?></span>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' onclick='loadAllBuilds(this)'")?></span>
</div>
</td>
</tr>
@@ -235,7 +235,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<td>
<div id='resolvedBuildBox' class='input-group'>
<?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, "class='form-control chosen'");?>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn btn-default' onclick='loadAllBuilds(this)'")?></span>
<span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' onclick='loadAllBuilds(this)'")?></span>
</div>
</td>
</tr>
module/build/view/linkbug.html.php
+2 -6
View File
@@ -58,19 +58,15 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($unlinkedCount):?>
<div class='table-footer'>
<?php if($unlinkedCount):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<<<<<<< HEAD
<?php echo html::submitButton($lang->build->linkBug, '', 'btn btn-default');?>
=======
<?php echo html::submitButton($lang->build->linkBug, '', 'btn');?>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
</div>
<?php endif;?>
<?php echo html::a(inlink('view', "buildID={$build->id}&type=bug"), $lang->goback, '', "class='btn'");?>
</div>
<?php endif;?>
</form>
</div>
<script>
module/build/view/linkstory.html.php
+2 -6
View File
@@ -62,19 +62,15 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($unlinkedCount):?>
<div class='table-footer'>
<?php if($unlinkedCount):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<<<<<<< HEAD
<?php echo html::submitButton($lang->build->linkStory, '', 'btn btn-default');?>
=======
<?php echo html::submitButton($lang->build->linkStory, '', 'btn');?>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
</div>
<?php endif;?>
<?php echo html::a(inlink('view', "buildID={$build->id}&type=story"), $lang->goback, '', "class='btn'");?>
</div>
<?php endif;?>
</form>
</div>
<script>
module/doc/js/view.js
-5
View File
@@ -1,5 +0,0 @@
$(function()
{
var outerH =$('.outer').css('min-height').replace('px', '');
$('#url-content').height(outerH - 180);
})
module/doc/model.php
+18 -3
View File
@@ -164,7 +164,7 @@ class docModel extends model
}
$actions .= html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary' data-toggle='modal'");
$actions .= html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'");
if($libID) $actions .= html::a(helper::createLink('doc', 'create', "libID=$libID"), "<i class='icon icon-plus'></i> " . $this->lang->doc->create, '', "class='btn btn-primary'");
$this->lang->modulePageActions = $actions;
@@ -286,6 +286,7 @@ class docModel extends model
*/
public function getDocsByBrowseType($libID, $browseType, $queryID, $moduleID, $sort, $pager)
{
$allLibs = array_keys($this->getLibs('all'));
if($browseType == "all")
{
$docs = $this->getDocs($libID, 0, $sort, $pager);
@@ -295,6 +296,7 @@ class docModel extends model
$docs = $this->dao->select('*')->from(TABLE_DOC)
->where('deleted')->eq(0)
->beginIF($libID)->andWhere('lib')->in($libID)->fi()
->andWhere('lib')->in($allLibs)
->andWhere('addedBy')->eq($this->app->user->account)
->orderBy($sort)
->page($pager)
@@ -311,6 +313,7 @@ class docModel extends model
$docs = $this->dao->select('*')->from(TABLE_DOC)
->where('deleted')->eq(0)
->andWhere('id')->in($docIdList)
->andWhere('lib')->in($allLibs)
->orderBy('editedDate_desc')
->page($pager)
->fetchAll('id');
@@ -348,6 +351,7 @@ class docModel extends model
$docs = $this->dao->select('*')->from(TABLE_DOC)
->where('deleted')->eq(0)
->beginIF($libID)->andWhere('lib')->in($libID)->fi()
->andWhere('lib')->in($allLibs)
->andWhere('collector')->like("%,{$this->app->user->account},%")
->orderBy($sort)
->page($pager)
@@ -398,13 +402,24 @@ class docModel extends model
{
if(!$this->checkPriv($doc)) unset($docs[$docID]);
}
$docs = $this->dao->select('*')->from(TABLE_DOC)->where('id')->in(array_keys($docs))->orderBy($sort)->page($pager)->fetchAll();
$docs = $this->dao->select('*')->from(TABLE_DOC)
->where('id')->in(array_keys($docs))
->andWhere('lib')->in($allLibs)
->orderBy($sort)
->page($pager)
->fetchAll();
}
elseif($browseType == 'fastsearch')
{
if(!$this->post->searchDoc) return array();
$docIdList = $this->getPrivDocs($libID, $moduleID);
$docs = $this->dao->select('*')->from(TABLE_DOC)->where('id')->in($docIdList)->andWhere('title')->like("%{$this->post->searchDoc}%")->orderBy($sort)->page($pager)->fetchAll();
$docs = $this->dao->select('*')->from(TABLE_DOC)
->where('id')->in($docIdList)
->andWhere('title')->like("%{$this->post->searchDoc}%")
->andWhere('lib')->in($allLibs)
->orderBy($sort)
->page($pager)
->fetchAll();
}
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'doc');
module/doc/view/createlib.html.php
+41 -45
View File
@@ -15,52 +15,48 @@
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
<h2>
<i class='icon icon-plus'></i>
<span class='prefix'><?php echo html::icon($lang->icons['doclib']);?></span>
<?php echo $lang->doc->createLib;?>
</h2>
<h2><?php echo $lang->doc->createLib;?></h2>
</div>
<form method='post' target='hiddenwin' >
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->doc->libType?></th>
<td><?php echo html::select('libType', $libTypeList, $type, "class='form-control'")?></td>
</tr>
<tr class='product'>
<th><?php echo $lang->doc->product?></th>
<td><?php echo html::select('product', $products, $type == 'product' ? $objectID : '', "class='form-control chosen'")?></td>
</tr>
<tr class='project hidden'>
<th><?php echo $lang->doc->project?></th>
<td><?php echo html::select('project', $projects, $type == 'project' ? $objectID : '', "class='form-control chosen'")?></td>
</tr>
<tr>
<th><?php echo $lang->doclib->name?></th>
<td><?php echo html::input('name', '', "class='form-control' autocomplete='off'")?></td>
</tr>
<tr>
<th><?php echo $lang->doclib->control;?></th>
<td><?php echo html::radio('acl', $lang->doc->aclList, 'open', "onchange='toggleAcl(this.value)'")?></td>
</tr>
<tr id='whiteListBox' class='hidden'>
<th><?php echo $lang->doc->whiteList;?></th>
<td>
<div class='input-group'>
<span class='input-group-addon groups-addon'><?php echo $lang->doclib->group?></span>
<?php echo html::select('groups[]', $groups, '', "class='form-control chosen' multiple")?>
</div>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->doclib->user?></span>
<?php echo html::select('users[]', $users, '', "class='form-control chosen' multiple")?>
</div>
</td>
</tr>
<tr>
<td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
</div>
<form method='post' target='hiddenwin' >
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->doc->libType?></th>
<td><?php echo html::select('libType', $libTypeList, $type, "class='form-control'")?></td>
</tr>
<tr class='product'>
<th><?php echo $lang->doc->product?></th>
<td><?php echo html::select('product', $products, $type == 'product' ? $objectID : '', "class='form-control chosen'")?></td>
</tr>
<tr class='project hidden'>
<th><?php echo $lang->doc->project?></th>
<td><?php echo html::select('project', $projects, $type == 'project' ? $objectID : '', "class='form-control chosen'")?></td>
</tr>
<tr>
<th><?php echo $lang->doclib->name?></th>
<td><?php echo html::input('name', '', "class='form-control' autocomplete='off'")?></td>
</tr>
<tr>
<th><?php echo $lang->doclib->control;?></th>
<td><?php echo html::radio('acl', $lang->doc->aclList, 'open', "onchange='toggleAcl(this.value)'")?></td>
</tr>
<tr id='whiteListBox' class='hidden'>
<th><?php echo $lang->doc->whiteList;?></th>
<td>
<div class='input-group'>
<span class='input-group-addon groups-addon'><?php echo $lang->doclib->group?></span>
<?php echo html::select('groups[]', $groups, '', "class='form-control chosen' multiple")?>
</div>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->doclib->user?></span>
<?php echo html::select('users[]', $users, '', "class='form-control chosen' multiple")?>
</div>
</td>
</tr>
<tr>
<td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
module/message/view/setting.html.php
+1 -1
View File
@@ -70,7 +70,7 @@
</tbody>
<tfoot>
<tr>
<td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide');?></td>
<td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-wide');?></td>
</tr>
</tfoot>
</table>
module/project/css/common.css
+2
View File
@@ -20,3 +20,5 @@
.table td.has-child > .task-toggle.collapsed > .icon {transform: rotate(-90deg);}
.chosen-container-single .chosen-single > span{max-width:200px;}
#whitelistBox .checkbox-inline, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}
module/project/css/create.css
-2
View File
@@ -15,5 +15,3 @@
.checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;}
.type-tips {display: none;}
#whitelistBox .checkbox-inline, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}
module/project/view/activate.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
<form class='load-indicator main-form' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->project->beginAndEnd;?></th>
<th class='w-70px'><?php echo $lang->project->beginAndEnd;?></th>
<td class='muted' colspan='2'>
<div id='sourceTimeBox'><?php echo $project->begin . ' ~ ' . $project->end;?></div>
<div id='readjustTimeBox' class='hide'>
module/project/view/all.html.php
+1 -1
View File
@@ -108,7 +108,7 @@
<div class='table-footer'>
<?php if($canBatchEdit):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->batchEdit, '', 'btn btn-default');?></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->batchEdit, '', 'btn');?></div>
<?php endif;?>
<?php if(!$canOrder and common::hasPriv('project', 'updateOrder')) echo html::a(inlink('all', "status=$status&projectID=$projectID&order=order_desc&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->project->updateOrder, '', "class='btn'");?>
<?php $pager->show('right', 'pagerjs');?>
module/project/view/batchedit.html.php
+9 -9
View File
@@ -43,17 +43,17 @@
<th class='w-50px'><?php echo $lang->idAB;?></th>
<th class='required <?php echo $minWidth?>'><?php echo $lang->project->name;?></th>
<th class='w-150px required'><?php echo $lang->project->code;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', ' required');?>'><?php echo $lang->project->PM;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'PO', ' hidden') . zget($requiredFields, 'PO', ' required');?>'><?php echo $lang->project->PO;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'QD', ' hidden') . zget($requiredFields, 'QD', ' required');?>'><?php echo $lang->project->QD;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'RD', ' hidden') . zget($requiredFields, 'RD', ' required');?>'><?php echo $lang->project->RD;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', ' required');?>'><?php echo $lang->project->type;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', ' required');?>'><?php echo $lang->project->status;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>'><?php echo $lang->project->PM;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'PO', ' hidden') . zget($requiredFields, 'PO', '', ' required');?>'><?php echo $lang->project->PO;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'QD', ' hidden') . zget($requiredFields, 'QD', '', ' required');?>'><?php echo $lang->project->QD;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'RD', ' hidden') . zget($requiredFields, 'RD', '', ' required');?>'><?php echo $lang->project->RD;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->project->type;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->project->status;?></th>
<th class='w-110px required'><?php echo $lang->project->begin;?></th>
<th class='w-110px required'><?php echo $lang->project->end;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', ' required');?>'> <?php echo $lang->project->desc;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'teamname', ' hidden') . zget($requiredFields, 'teamname', ' required');?>'><?php echo $lang->project->teamname;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'days', ' hidden') . zget($requiredFields, 'days', ' required');?>'><?php echo $lang->project->days;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'> <?php echo $lang->project->desc;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'teamname', ' hidden') . zget($requiredFields, 'teamname', '', ' required');?>'><?php echo $lang->project->teamname;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'days', ' hidden') . zget($requiredFields, 'days', '', ' required');?>'><?php echo $lang->project->days;?></th>
<th class='w-80px'><?php echo $lang->project->order;?></th>
</tr>
</thead>
module/project/view/edit.html.php
+1 -1
View File
@@ -143,7 +143,7 @@
</tr>
<tr id='whitelistBox' <?php if($project->acl != 'custom') echo "class='hidden'";?>>
<th><?php echo $lang->project->whitelist;?></th>
<td colspan='2' id='whitelistBox'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
<td colspan='2'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
</tr>
<tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?></td></tr>
</table>
module/project/view/grouptask.html.php
+3 -2
View File
@@ -38,7 +38,7 @@
<?php
if(!isset($browseType)) $browseType = '';
if(!isset($orderBy)) $orderBy = '';
common::printIcon('task', 'report', "project=$projectID&browseType=$browseType", '', 'button', 'bar-chart');
common::printIcon('task', 'report', "project=$projectID&browseType=$browseType", '', 'button', 'bar-chart muted');
?>
<div class="btn-group">
<button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export;?></span> <span class="caret"></span></button>
@@ -161,7 +161,8 @@
?>
</td>
<td class="c-status"><span class='status-<?php echo $task->status;?>'><span class="label label-dot"></span> <?php echo $lang->task->statusList[$task->status];?></span></td>
<td class="c-assign text-left has-btn"><?php echo html::a($this->createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", 'html', true), '<i class="icon icon-hand-right"></i> ' . $task->assignedToRealName, '', "class='iframe btn btn-icon-left' $assignedToClass");?></td>
<?php $assignedToRealName = $task->assignedToRealName ? $task->assignedToRealName : $lang->task->noAssigned;?>
<td class="c-assign text-left has-btn"><?php echo html::a($this->createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", 'html', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', "class='iframe btn btn-icon-left' $assignedToClass");?></td>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
<td class="c-hours em"><?php echo $task->estimate;?></td>
<td class="c-hours em"><?php echo $task->consumed;?></td>
module/project/view/importbug.html.php
+1 -1
View File
@@ -71,7 +71,7 @@ var browseType = '<?php echo $browseType;?>';
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->import, '', 'btn btn-default');?>
<?php echo html::submitButton($lang->import, '', 'btn');?>
</div>
<?php echo html::backButton();?>
<?php $pager->show('right', 'pagerjs');?>
module/project/view/importtask.html.php
+1 -1
View File
@@ -87,7 +87,7 @@
<?php if($tasks2Imported):?>
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->importTask, '', 'btn btn-default');?></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->importTask, '', 'btn');?></div>
</div>
<?php endif;?>
</form>
module/project/view/managemembers.html.php
+6 -4
View File
@@ -16,7 +16,9 @@
<?php js::set('roles', $roles);?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->project->manageMembers;?></div></span>
<span class='btn btn-link btn-active-text'>
<?php echo html::a($this->createLink('project', 'managemembers', "projectID={$project->id}"), "<span class='text'> {$lang->project->manageMembers}</span>");?>
</span>
<div class='input-group space w-200px'>
<span class='input-group-addon'><?php echo $lang->project->selectDept?></span>
<?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='setDeptUsers(this)' data-placeholder='{$lang->project->selectDeptTitle}'");?>
@@ -65,7 +67,7 @@
<?php foreach($members2Import as $member2Import):?>
<tr class='addedItem'>
<td><?php echo html::select("accounts[]", $users, $member2Import->account, "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></td>
<td><?php echo html::select("accounts[]", $users, $member2Import->account, "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
<td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='form-control' value='<?php echo $member2Import->role;?>' /></td>
<td><input type='text' name='days[]' id='days<?php echo $i;?>' class='form-control' value='<?php echo $project->days?>'/></td>
<td>
@@ -84,7 +86,7 @@
<?php foreach($deptUsers as $deptAccount => $userName):?>
<?php if(!isset($users[$deptAccount])) continue;?>
<tr class='addedItem'>
<td><?php echo html::select("accounts[]", $users, $deptAccount, "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></td>
<td><?php echo html::select("accounts[]", $users, $deptAccount, "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
<td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='form-control' value='<?php echo $roles[$deptAccount]?>'/></td>
<td><input type='text' name='days[]' id='days<?php echo $i;?>' class='form-control' value='<?php echo $project->days?>'/></td>
<td>
@@ -103,7 +105,7 @@
<?php for($j = 0; $j < 5; $j ++):?>
<tr class='addedItem'>
<td><?php echo html::select("accounts[]", $users, '', "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></td>
<td><?php echo html::select("accounts[]", $users, '', "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
<td><input type='text' name='roles[]' id='role<?php echo ($i);?>' class='form-control' /></td>
<td><input type='text' name='days[]' id='days<?php echo ($i);?>' class='form-control' value='<?php echo $project->days?>'/></td>
<td>
module/project/view/task.html.php
+1 -1
View File
@@ -90,7 +90,7 @@ js::set('browseType', $browseType);
<?php
if(!isset($browseType)) $browseType = '';
if(!isset($orderBy)) $orderBy = '';
common::printIcon('task', 'report', "project=$projectID&browseType=$browseType", '', 'button', 'bar-chart');
common::printIcon('task', 'report', "project=$projectID&browseType=$browseType", '', 'button', 'bar-chart muted');
?>
<div class="btn-group">
module/project/view/taskheader.html.php
+2 -2
View File
@@ -91,7 +91,7 @@
?>
<div class='btn-group'>
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown' id='exportAction'>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown' id='exportAction'>
<i class='icon-download-alt'></i> <?php echo $lang->export ?>
<span class='caret'></span>
</button>
@@ -105,7 +105,7 @@
</div>
<div class='btn-group'>
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown' id='importAction'>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown' id='importAction'>
<i class='icon-upload-alt'></i> <?php echo $lang->import ?>
<span class='caret'></span>
</button>
module/project/view/testtask.html.php
+1 -1
View File
@@ -75,7 +75,7 @@
</td>
<td class='text-left' title="<?php echo $task->name?>"><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
<td title="<?php echo $task->buildName?>"><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName);?></td>
<td><?php echo $users[$task->owner];?></td>
<td><?php echo zget($users, $task->owner);?></td>
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td title='<?php echo $lang->testtask->statusList[$task->status];?>'>
module/release/view/linkbug.html.php
-9
View File
@@ -43,11 +43,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<?php foreach($allBugs as $bug):?>
<?php if(strpos(",{$releaseBugs},", ",$bug->id,") !== false) continue;?>
<tr>
<<<<<<< HEAD
<td class='c-id'>
=======
<td class='c-id text-left'>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
<?php echo html::checkbox('bugs', array($bug->id => sprintf('%03d', $bug->id)), ($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') ? $bug->id : '');?>
</td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
@@ -68,13 +64,8 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<div class='table-footer'>
<?php if($unlinkedCount):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<<<<<<< HEAD
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->release->linkBug, '', 'btn btn-default');?>
=======
<div class="btn-toolbar">
<?php echo html::submitButton($lang->release->linkBug, '', 'btn');?>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
</div>
<?php endif;?>
<?php echo html::a(inlink('view', "releaseID=$release->id&type=$type"), $lang->goback, '', "class='btn'");?>
module/release/view/linkstory.html.php
-5
View File
@@ -64,13 +64,8 @@
<div class='table-footer'>
<?php if($unlinkedCount):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<<<<<<< HEAD
<div class='table-actions btn-toolbar'>
<?php echo html::submitButton($lang->release->linkStory, '', 'btn btn-default');?>
=======
<div class='btn-toolbar'>
<?php echo html::submitButton($lang->release->linkStory, '', 'btn');?>
>>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
</div>
<?php endif;?>
<?php echo html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'");?>
module/release/view/view.html.php
+3 -3
View File
@@ -125,7 +125,7 @@
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn btn-default');?>
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn');?>
</div>
<div class='text'><?php echo sprintf($lang->release->finishStories, $countStories);?></div>
</div>
@@ -196,7 +196,7 @@
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn btn-default');?>
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn');?>
</div>
<div class='text'><?php echo sprintf($lang->release->resolvedBugs, $countBugs);?></div>
</div>
@@ -267,7 +267,7 @@
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn btn-default');?>
<?php echo html::submitButton($lang->release->batchUnlink, '', 'btn');?>
</div>
<div class='text'><?php echo sprintf($lang->release->createdBugs, $countLeftBugs);?></div>
</div>
module/report/css/common.css
+1
View File
@@ -37,3 +37,4 @@ td .deviation{padding-left:20px; text-align:left;}
.checkboxes {margin-bottom: 10px;}
.checkboxes .checkbox-primary {margin-bottom: 5px;}
.fixed-header-copy thead tr th{color:#fff !important;}
module/report/js/bugassign.js
-4
View File
@@ -1,4 +0,0 @@
$(document).ready(function()
{
setTimeout(function(){fixedTheadOfList('#bugAssign')}, 100);
});
module/report/js/bugcreate.js
-5
View File
@@ -1,8 +1,3 @@
$(document).ready(function()
{
setTimeout(function(){fixedTheadOfList('#bug')}, 100);
});
function changeParams(obj)
{
var begin = $('.main .row').find('#begin').val();
module/report/js/productsummary.js
-5
View File
@@ -1,8 +1,3 @@
$(document).ready(function()
{
setTimeout(function(){fixedTheadOfList('#productList')}, 100);
});
$('#conditions input:checkbox').change(function()
{
var conditions = '';
module/report/js/projectdeviation.js
-1
View File
@@ -1,7 +1,6 @@
$(document).ready(function()
{
initChart();
setTimeout(function(){fixedTheadOfList('#projectList')}, 100);
});
function changeDate(begin, end)
module/report/js/workload.js
-5
View File
@@ -1,8 +1,3 @@
$(document).ready(function()
{
setTimeout(function(){fixedTheadOfList('#workload')}, 100);
});
function changeParams(obj)
{
var begin = $('.main .row').find('#begin').val();
module/report/view/bugassign.html.php
+31 -29
View File
@@ -15,36 +15,38 @@
<div class="panel-title"><?php echo $title;?></div>
<nav class="panel-actions btn-toolbar"></nav>
</div>
<table class='table table-condensed table-striped table-bordered table-fixed' id='bugAssign'>
<thead>
<tr class='colhead'>
<th><?php echo $lang->report->user;?></th>
<th><?php echo $lang->report->product;?></th>
<th><?php echo $lang->report->bugTotal;?></th>
<th><?php echo $lang->report->total;?></th>
</tr>
</thead>
<tbody>
<?php foreach($assigns as $account => $assign):?>
<?php if(!array_key_exists($account, $users)) continue;?>
<tr class="a-center">
<td rowspan="<?php echo count($assign['bug']);?>"><?php echo $users[$account];?></td>
<?php $id = 1;?>
<?php foreach($assign['bug'] as $product => $count):?>
<?php if($id != 1) echo '<tr class="a-center">';?>
<td><?php echo html::a($this->createLink('product', 'view', "product={$count['productID']}"), $product);?></td>
<td><?php echo $count['count'];?></td>
<?php if($id == 1):?>
<td rowspan="<?php echo count($assign['bug']);?>">
<?php echo $assign['total']['count'];?>
</td>
<?php endif;?>
<?php if($id != 1) echo '</tr>'; $id ++;?>
<div data-ride='table'>
<table class='table table-condensed table-striped table-bordered table-fixed' id='bugAssign'>
<thead>
<tr class='colhead'>
<th><?php echo $lang->report->user;?></th>
<th><?php echo $lang->report->product;?></th>
<th><?php echo $lang->report->bugTotal;?></th>
<th><?php echo $lang->report->total;?></th>
</tr>
</thead>
<tbody>
<?php foreach($assigns as $account => $assign):?>
<?php if(!array_key_exists($account, $users)) continue;?>
<tr class="a-center">
<td rowspan="<?php echo count($assign['bug']);?>"><?php echo $users[$account];?></td>
<?php $id = 1;?>
<?php foreach($assign['bug'] as $product => $count):?>
<?php if($id != 1) echo '<tr class="a-center">';?>
<td><?php echo html::a($this->createLink('product', 'view', "product={$count['productID']}"), $product);?></td>
<td><?php echo $count['count'];?></td>
<?php if($id == 1):?>
<td rowspan="<?php echo count($assign['bug']);?>">
<?php echo $assign['total']['count'];?>
</td>
<?php endif;?>
<?php if($id != 1) echo '</tr>'; $id ++;?>
<?php endforeach;?>
</tr>
<?php endforeach;?>
</tr>
<?php endforeach;?>
</tbody>
</table>
</tbody>
</table>
</div>
</div>
</div>
</div>
module/report/view/bugcreate.html.php
+31 -29
View File
@@ -38,35 +38,37 @@
<div class="panel-title"><?php echo $title;?></div>
<nav class="panel-actions btn-toolbar"></nav>
</div>
<table class='table table-condensed table-striped table-bordered table-fixed' id="bug">
<thead>
<tr class='colhead'>
<th><?php echo $lang->bug->openedBy;?></th>
<th><?php echo $lang->bug->unResolved;?></th>
<?php foreach($lang->bug->resolutionList as $resolutionType => $resolution):?>
<?php if(empty($resolutionType)) continue;?>
<th><?php echo $resolution;?></th>
<?php endforeach;?>
<th title='<?php echo $lang->report->validRateTips;?>'><?php echo $lang->report->validRate;?></th>
<th><?php echo $lang->report->total;?></th>
</tr>
</thead>
<tbody>
<?php foreach($bugs as $user => $bug):?>
<?php if(isset($users[$user])) continue;?>
<tr class="text-center">
<td><?php echo $users[$user];?></td>
<td><?php echo isset($bug['']) ? $bug[''] : 0;?></td>
<?php foreach($lang->bug->resolutionList as $resolutionType => $resolution):?>
<?php if(empty($resolutionType)) continue;?>
<td><?php echo isset($bug[$resolutionType]) ? $bug[$resolutionType] : 0;?></td>
<?php endforeach;?>
<td title='<?php echo $lang->report->validRateTips;?>'><?php echo round($bug['validRate'] * 100, 2) . '%';?></td>
<td><?php echo $bug['all'];?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<div data-ride='table'>
<table class='table table-condensed table-striped table-bordered table-fixed' id="bug">
<thead>
<tr class='colhead'>
<th><?php echo $lang->bug->openedBy;?></th>
<th><?php echo $lang->bug->unResolved;?></th>
<?php foreach($lang->bug->resolutionList as $resolutionType => $resolution):?>
<?php if(empty($resolutionType)) continue;?>
<th><?php echo $resolution;?></th>
<?php endforeach;?>
<th title='<?php echo $lang->report->validRateTips;?>'><?php echo $lang->report->validRate;?></th>
<th><?php echo $lang->report->total;?></th>
</tr>
</thead>
<tbody>
<?php foreach($bugs as $user => $bug):?>
<?php if(isset($users[$user])) continue;?>
<tr class="text-center">
<td><?php echo $users[$user];?></td>
<td><?php echo isset($bug['']) ? $bug[''] : 0;?></td>
<?php foreach($lang->bug->resolutionList as $resolutionType => $resolution):?>
<?php if(empty($resolutionType)) continue;?>
<td><?php echo isset($bug[$resolutionType]) ? $bug[$resolutionType] : 0;?></td>
<?php endforeach;?>
<td title='<?php echo $lang->report->validRateTips;?>'><?php echo round($bug['validRate'] * 100, 2) . '%';?></td>
<td><?php echo $bug['all'];?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</div>
</div>
</div>
</div>
module/report/view/productsummary.html.php
+62 -60
View File
@@ -32,67 +32,69 @@
<div class="panel-title"><?php echo $title;?></div>
<nav class="panel-actions btn-toolbar"></nav>
</div>
<table class='table table-condensed table-striped table-bordered table-fixed' id='productList'>
<thead>
<tr class='colhead'>
<th width='200'><?php echo $lang->product->name;?></th>
<th width='120'><?php echo $lang->product->PO;?></th>
<th><?php echo $lang->productplan->common;?></th>
<th width="100"><?php echo $lang->productplan->begin;?></th>
<th width="100"><?php echo $lang->productplan->end;?></th>
<th class="w-70px"><?php echo $lang->story->statusList['draft'];?></th>
<th class="w-70px"><?php echo $lang->story->statusList['active'];?></th>
<th class="w-70px"><?php echo $lang->story->statusList['changed'];?></th>
<th class="w-70px"><?php echo $lang->story->statusList['closed'];?></th>
<th class="w-70px"><?php echo $lang->report->total;?></th>
</tr>
</thead>
<tbody>
<?php $color = false;?>
<?php foreach($products as $product):?>
<tr class="text-center">
<?php $count = isset($product->plans) ? count($product->plans) : 1;?>
<td class='text-left' rowspan="<?php echo $count;?>"><?php echo "<p>" . html::a($this->createLink('product', 'view', "product=$product->id"), $product->name) . "</p>";?></td>
<td class='text-left' rowspan="<?php echo $count;?>"><?php echo "<p>" . zget($users, $product->PO) . '</p>';?></td>
<?php if(isset($product->plans)):?>
<?php $id = 1;?>
<?php foreach($product->plans as $plan):?>
<?php $class = $color ? 'rowcolor' : '';?>
<?php if($id != 1) echo "<tr class='text-center'>"?>
<td align='left' class="<?php echo $class;?>"><?php echo $plan->title;?></td>
<td class="<?php echo $class;?>"><?php echo $plan->begin == '2030-01-01' ? $lang->productplan->future : $plan->begin;?></td>
<td class="<?php echo $class;?>"><?php echo $plan->end == '2030-01-01' ? $lang->productplan->future : $plan->end;?></td>
<?php
$draftCount = isset($plan->status['draft']) ? $plan->status['draft'] : 0;
$activeCount = isset($plan->status['active']) ? $plan->status['active'] : 0;
$changedCount = isset($plan->status['changed']) ? $plan->status['changed'] : 0;
$closedCount = isset($plan->status['closed']) ? $plan->status['closed'] : 0;
?>
<td class="<?php echo $class;?>"><?php echo $draftCount;?></td>
<td class="<?php echo $class;?>"><?php echo $activeCount;?></td>
<td class="<?php echo $class;?>"><?php echo $changedCount;?></td>
<td class="<?php echo $class;?>"><?php echo $closedCount;?></td>
<td class="<?php echo $class;?>"><?php echo $draftCount + $activeCount + $changedCount + $closedCount;?></td>
<?php if($id != 1) echo "</tr>"?>
<?php $id ++;?>
<?php $color = !$color;?>
<div data-ride='table'>
<table class='table table-condensed table-striped table-bordered table-fixed' id='productList'>
<thead>
<tr>
<th class='w-200px'><?php echo $lang->product->name;?></th>
<th class='w-120px'><?php echo $lang->product->PO;?></th>
<th><?php echo $lang->productplan->common;?></th>
<th class="w-100px"><?php echo $lang->productplan->begin;?></th>
<th class="w-100px"><?php echo $lang->productplan->end;?></th>
<th class="w-70px"><?php echo $lang->story->statusList['draft'];?></th>
<th class="w-70px"><?php echo $lang->story->statusList['active'];?></th>
<th class="w-70px"><?php echo $lang->story->statusList['changed'];?></th>
<th class="w-70px"><?php echo $lang->story->statusList['closed'];?></th>
<th class="w-70px"><?php echo $lang->report->total;?></th>
</tr>
</thead>
<tbody>
<?php $color = false;?>
<?php foreach($products as $product):?>
<tr class="text-center">
<?php $count = isset($product->plans) ? count($product->plans) : 1;?>
<td class='text-left' rowspan="<?php echo $count;?>"><?php echo "<p>" . html::a($this->createLink('product', 'view', "product=$product->id"), $product->name) . "</p>";?></td>
<td class='text-left' rowspan="<?php echo $count;?>"><?php echo "<p>" . zget($users, $product->PO) . '</p>';?></td>
<?php if(isset($product->plans)):?>
<?php $id = 1;?>
<?php foreach($product->plans as $plan):?>
<?php $class = $color ? 'rowcolor' : '';?>
<?php if($id != 1) echo "<tr class='text-center'>"?>
<td align='left' class="<?php echo $class;?>"><?php echo $plan->title;?></td>
<td class="<?php echo $class;?>"><?php echo $plan->begin == '2030-01-01' ? $lang->productplan->future : $plan->begin;?></td>
<td class="<?php echo $class;?>"><?php echo $plan->end == '2030-01-01' ? $lang->productplan->future : $plan->end;?></td>
<?php
$draftCount = isset($plan->status['draft']) ? $plan->status['draft'] : 0;
$activeCount = isset($plan->status['active']) ? $plan->status['active'] : 0;
$changedCount = isset($plan->status['changed']) ? $plan->status['changed'] : 0;
$closedCount = isset($plan->status['closed']) ? $plan->status['closed'] : 0;
?>
<td class="<?php echo $class;?>"><?php echo $draftCount;?></td>
<td class="<?php echo $class;?>"><?php echo $activeCount;?></td>
<td class="<?php echo $class;?>"><?php echo $changedCount;?></td>
<td class="<?php echo $class;?>"><?php echo $closedCount;?></td>
<td class="<?php echo $class;?>"><?php echo $draftCount + $activeCount + $changedCount + $closedCount;?></td>
<?php if($id != 1) echo "</tr>"?>
<?php $id ++;?>
<?php $color = !$color;?>
<?php endforeach;?>
<?php else:?>
<?php $class = $color ? 'rowcolor' : '';?>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<?php $color = !$color;?>
<?php endif;?>
</tr>
<?php endforeach;?>
<?php else:?>
<?php $class = $color ? 'rowcolor' : '';?>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<td class="<?php echo $class;?>"></td>
<?php $color = !$color;?>
<?php endif;?>
</tr>
<?php endforeach;?>
</tbody>
</table>
</tbody>
</table>
</div>
</div>
</div>
</div>
module/report/view/projectdeviation.html.php
+74 -72
View File
@@ -29,86 +29,88 @@
<div class="panel-title"><?php echo $title;?></div>
<nav class="panel-actions btn-toolbar"></nav>
</div>
<table class='table table-condensed table-striped table-bordered table-fixed' id='projectList'>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->report->id;?></th>
<th><?php echo $lang->report->project;?></th>
<th class="w-100px"><?php echo $lang->report->estimate;?></th>
<th class="w-100px"><?php echo $lang->report->consumed;?></th>
<th class="w-100px"><?php echo $lang->report->deviation;?></th>
<th class="w-100px"><?php echo $lang->report->deviationRate;?></th>
</tr>
</thead>
<tbody>
<?php $chartData = array();?>
<?php foreach($projects as $id =>$project):?>
<tr class="text-center">
<td><?php echo $id;?></td>
<td class="text-left"><?php echo html::a($this->createLink('project', 'view', "projectID=$id"), $project->name);?></td>
<td><?php echo $project->estimate;?></td>
<td><?php echo $project->consumed;?></td>
<?php $deviation = $project->consumed - $project->estimate;?>
<td class="deviation">
<?php
if($deviation > 0)
<div data-ride='table'>
<table class='table table-condensed table-striped table-bordered table-fixed' id='projectList'>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->report->id;?></th>
<th><?php echo $lang->report->project;?></th>
<th class="w-100px"><?php echo $lang->report->estimate;?></th>
<th class="w-100px"><?php echo $lang->report->consumed;?></th>
<th class="w-100px"><?php echo $lang->report->deviation;?></th>
<th class="w-100px"><?php echo $lang->report->deviationRate;?></th>
</tr>
</thead>
<tbody>
<?php $chartData = array();?>
<?php foreach($projects as $id =>$project):?>
<tr class="text-center">
<td><?php echo $id;?></td>
<td class="text-left"><?php echo html::a($this->createLink('project', 'view', "projectID=$id"), $project->name);?></td>
<td><?php echo $project->estimate;?></td>
<td><?php echo $project->consumed;?></td>
<?php $deviation = $project->consumed - $project->estimate;?>
<td class="deviation">
<?php
if($deviation > 0)
{
echo '<span class="up">&uarr;</span>' . $deviation;
}
else if($deviation < 0)
{
echo '<span class="down">&darr;</span>' . abs($deviation);
}
else
{
echo '<span class="zero">0</span>';
}
?>
</td>
<td class="deviation">
<?php
$num = $project->estimate ? round($deviation / $project->estimate * 100, 2) : 'n/a';
if($num >= 50)
{
echo '<span class="up">&uarr;</span>' . $deviation;
echo '<span class="u50">' . $num . '%</span>';
}
else if($deviation < 0)
elseif($num >= 30)
{
echo '<span class="down">&darr;</span>' . abs($deviation);
echo '<span class="u30">' . $num . '%</span>';
}
elseif($num >= 10)
{
echo '<span class="u10">' . $num . '%</span>';
}
elseif($num > 0)
{
echo '<span class="u0">' . abs($num) . '%</span>';
}
elseif($num <= -20)
{
echo '<span class="d20">' . abs($num) . '%</span>';
}
elseif($num < 0)
{
echo '<span class="d0">' . abs($num) . '%</span>';
}
elseif($num == 'n/a')
{
echo '<span class="zero">' . $num . '</span>';
}
else
{
echo '<span class="zero">0</span>';
echo '<span class="zero">' . abs($num) . '%</span>';
}
?>
</td>
<td class="deviation">
<?php
$num = $project->estimate ? round($deviation / $project->estimate * 100, 2) : 'n/a';
if($num >= 50)
{
echo '<span class="u50">' . $num . '%</span>';
}
elseif($num >= 30)
{
echo '<span class="u30">' . $num . '%</span>';
}
elseif($num >= 10)
{
echo '<span class="u10">' . $num . '%</span>';
}
elseif($num > 0)
{
echo '<span class="u0">' . abs($num) . '%</span>';
}
elseif($num <= -20)
{
echo '<span class="d20">' . abs($num) . '%</span>';
}
elseif($num < 0)
{
echo '<span class="d0">' . abs($num) . '%</span>';
}
elseif($num == 'n/a')
{
echo '<span class="zero">' . $num . '</span>';
}
else
{
echo '<span class="zero">' . abs($num) . '%</span>';
}
$chartData['labels'][] = $project->name;
$chartData['data'][] = $deviation;
?>
</td>
</tr>
<?php endforeach;?>
</tbody>
</table>
$chartData['labels'][] = $project->name;
$chartData['data'][] = $deviation;
?>
</td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</div>
</div>
</div>
<?php if($chartData):?>
module/report/view/workload.html.php
+45 -43
View File
@@ -56,49 +56,51 @@
<div class="panel-title"><?php echo $title;?></div>
<nav class="panel-actions btn-toolbar"></nav>
</div>
<table class='table table-condensed table-striped table-bordered table-fixed' id="workload">
<thead>
<tr class='colhead'>
<th class="w-200px"><?php echo $lang->report->user;?></th>
<th><?php echo $lang->report->project;?></th>
<th class="w-100px"><?php echo $lang->report->task;?></th>
<th class="w-100px"><?php echo $lang->report->remain;?></th>
<th class="w-100px"><?php echo $lang->report->taskTotal;?></th>
<th class="w-100px"><?php echo $lang->report->manhourTotal;?></th>
<th class="w-100px"><?php echo $lang->report->workloadAB;?></th>
</tr>
</thead>
<tbody>
<?php $color = false;?>
<?php foreach($workload as $account => $load):?>
<?php if(!isset($users[$account])) continue;?>
<tr class="text-center">
<td rowspan="<?php echo count($load['task']);?>"><?php echo $users[$account];?></td>
<?php $id = 1;?>
<?php foreach($load['task'] as $project => $info):?>
<?php $class = $color ? 'rowcolor' : '';?>
<?php if($id != 1) echo '<tr class="text-center">';?>
<td class="<?php echo $class;?>"><?php echo html::a($this->createLink('project', 'view', "projectID={$info['projectID']}"), $project);?></td>
<td class="<?php echo $class;?> text-center"><?php echo $info['count'];?></td>
<td class="<?php echo $class;?> text-center"><?php echo $info['manhour'];?></td>
<?php if($id == 1):?>
<td rowspan="<?php echo count($load['task']);?>" class="text-center">
<?php echo $load['total']['count'];?>
</td>
<td rowspan="<?php echo count($load['task']);?>" class="text-center">
<?php echo $load['total']['manhour'];?>
</td>
<td rowspan="<?php echo count($load['task']);?>" class="text-center">
<?php echo round($load['total']['manhour'] / $allHour * 100, 2) . '%';?>
</td>
<?php endif;?>
<?php if($id != 1) echo '</tr>'; $id ++;?>
<?php $color = !$color;?>
<?php endforeach;?>
</tr>
<?php endforeach;?>
</tbody>
</table>
<div data-ride='table'>
<table class='table table-condensed table-striped table-bordered table-fixed' id="workload">
<thead>
<tr class='colhead'>
<th class="w-200px"><?php echo $lang->report->user;?></th>
<th><?php echo $lang->report->project;?></th>
<th class="w-100px"><?php echo $lang->report->task;?></th>
<th class="w-100px"><?php echo $lang->report->remain;?></th>
<th class="w-100px"><?php echo $lang->report->taskTotal;?></th>
<th class="w-100px"><?php echo $lang->report->manhourTotal;?></th>
<th class="w-100px"><?php echo $lang->report->workloadAB;?></th>
</tr>
</thead>
<tbody>
<?php $color = false;?>
<?php foreach($workload as $account => $load):?>
<?php if(!isset($users[$account])) continue;?>
<tr class="text-center">
<td rowspan="<?php echo count($load['task']);?>"><?php echo $users[$account];?></td>
<?php $id = 1;?>
<?php foreach($load['task'] as $project => $info):?>
<?php $class = $color ? 'rowcolor' : '';?>
<?php if($id != 1) echo '<tr class="text-center">';?>
<td class="<?php echo $class;?>"><?php echo html::a($this->createLink('project', 'view', "projectID={$info['projectID']}"), $project);?></td>
<td class="<?php echo $class;?> text-center"><?php echo $info['count'];?></td>
<td class="<?php echo $class;?> text-center"><?php echo $info['manhour'];?></td>
<?php if($id == 1):?>
<td rowspan="<?php echo count($load['task']);?>" class="text-center">
<?php echo $load['total']['count'];?>
</td>
<td rowspan="<?php echo count($load['task']);?>" class="text-center">
<?php echo $load['total']['manhour'];?>
</td>
<td rowspan="<?php echo count($load['task']);?>" class="text-center">
<?php echo round($load['total']['manhour'] / $allHour * 100, 2) . '%';?>
</td>
<?php endif;?>
<?php if($id != 1) echo '</tr>'; $id ++;?>
<?php $color = !$color;?>
<?php endforeach;?>
</tr>
<?php endforeach;?>
</tbody>
</table>
</div>
</div>
</div>
</div>
module/story/view/view.html.php
+2 -2
View File
@@ -165,7 +165,7 @@
<details class="detail" open>
<summary class="detail-title"><?php echo $lang->story->legendProjectAndTask;?></summary>
<div class="detail-content">
<ul class="list-unstyled">
<ul class="list-unstyled no-margin">
<?php
foreach($story->tasks as $projectTasks)
{
@@ -339,7 +339,7 @@
{
$this->app->loadLang('testcase');
echo "<div class='btn-group dropup'>";
echo "<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'><i class='icon icon-sitemap'></i> " . $lang->testcase->common . " <span class='caret'></span></button>";
echo "<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><i class='icon icon-sitemap'></i> " . $lang->testcase->common . " <span class='caret'></span></button>";
echo "<ul class='dropdown-menu' id='createCaseActionMenu'>";
$misc = "data-toggle='modal' data-type='iframe' data-width='95%'";
module/task/view/assignto.html.php
+1 -2
View File
@@ -46,8 +46,7 @@
<td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
</tr>
<tr>
<th></th>
<td colspan='2'>
<td colspan='3' class='text-center'>
<?php echo html::submitButton();?>
<?php echo html::linkButton($lang->goback, $this->session->taskList);?>
</td>
module/task/view/cancel.html.php
+2 -3
View File
@@ -27,12 +27,11 @@
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->comment;?></th>
<th class='w-50px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th></th>
<td>
<td colspan='2' class='text-center'>
<?php echo html::submitButton($lang->task->cancel);?>
<?php echo html::linkButton($lang->goback, $this->session->taskList);?>
</td>
module/task/view/close.html.php
+2 -3
View File
@@ -27,12 +27,11 @@
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->comment;?></th>
<th class='w-50px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th></th>
<td>
<td colspan='2' class='text-center'>
<?php echo html::submitButton($lang->task->close);?>
<?php echo html::linkButton($lang->goback, $this->session->taskList);?>
</td>
module/task/view/create.html.php
+19 -19
View File
@@ -85,26 +85,26 @@
<?php if(strpos(",$showFields,", ',pri,') !== false):?>
<tr>
<th><?php echo $lang->task->pri;?></th>
<td colspan='2'>
<?php
$hasCustomPri = false;
foreach($lang->task->priList as $priKey => $priValue)
{
if(!empty($priKey) and (string)$priKey != (string)$priValue)
{
$hasCustomPri = true;
break;
}
}
$priList = $lang->task->priList;
if(end($priList))
{
unset($priList[0]);
$priList[0] = '';
}
?>
<?php
$hasCustomPri = false;
foreach($lang->task->priList as $priKey => $priValue)
{
if(!empty($priKey) and (string)$priKey != (string)$priValue)
{
$hasCustomPri = true;
break;
}
}
$priList = $lang->task->priList;
if(end($priList))
{
unset($priList[0]);
$priList[0] = '';
}
?>
<td colspan='<?php echo $hasCustomPri ? 1 : 3 ?>'>
<?php if($hasCustomPri):?>
<?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control chosen'");?>
<?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control chosen chosen-simple'");?>
<?php else: ?>
<?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control' data-provide='labelSelector'");?>
<?php endif; ?>
module/task/view/edit.html.php
+7 -7
View File
@@ -36,10 +36,10 @@
<?php echo html::input('name', $task->name, 'class="form-control" autocomplete="off" placeholder="' . $lang->task->name . '"');?>
<?php if(empty($task->children) and empty($task->parent) and $task->type != 'affair'):?>
<span class='input-group-addon'>
<label class='checkbox-inline'>
<input type='checkBox' name='multiple' value='1' <?php echo empty($task->team) ? '' : 'checked';?> />
<?php echo $lang->task->multipleAB;?>
</label>
<div class='checkbox-primary'>
<input type='checkBox' name='multiple' id='multiple' value='1' <?php echo empty($task->team) ? '' : 'checked';?> />
<label for='multiple'><?php echo $lang->task->multipleAB;?></label>
</div>
</span>
<?php endif;?>
</div>
@@ -195,18 +195,18 @@
</div>
</div>
<div class="modal fade modal-team" id="modalTeam">
<div class="modal-dialog" style='width: 700px'>
<div class="modal-dialog">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">
<span aria-hidden="true">×</span><span class="sr-only"><?php echo $lang->task->close;?></span>
</button>
<h4 class="modal-title"><?php echo $lang->task->team?></h4>
</div>
<div class="modal-content">
<div class="modal-content with-padding">
<table class='table table-form'>
<?php foreach($task->team as $member):?>
<tr>
<td class='w-80px'><?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'")?></td>
<td class='w-250px'><?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'")?></td>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->task->estimate?></span>
module/task/view/pause.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<td colspan='2'>
<td colspan='2' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::linkButton($lang->goback, $this->session->taskList, '', '', 'btn btn-wide');?>
</td>
module/testcase/view/caseheader.html.php
+3 -3
View File
@@ -29,7 +29,7 @@
</ul>
</div>
<a href='###' class='dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon-import'></i> <?php echo $lang->import ?><span class='caret'></span></a>
<a href='###' class='dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon icon-import muted'></i> <?php echo $lang->import ?><span class='caret'></span></a>
<ul class='dropdown-menu' id='importActionMenu'>
<?php
$misc = common::hasPriv('testcase', 'import') ? "class='export'" : "class=disabled";
@@ -162,7 +162,7 @@
<div class='btn-toolbar pull-right'>
<div class='btn-group'>
<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>
<i class='icon-export'></i> <?php echo $lang->export ?>
<i class='icon icon-export muted'></i> <?php echo $lang->export ?>
<span class='caret'></span>
</button>
<ul class='dropdown-menu' id='exportActionMenu'>
@@ -178,7 +178,7 @@
</ul>
</div>
<div class='btn-group'>
<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon-import'></i> <?php echo $lang->import ?><span class='caret'></span></button>
<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon icon-import muted'></i> <?php echo $lang->import ?><span class='caret'></span></button>
<ul class='dropdown-menu' id='importActionMenu'>
<?php
$misc = common::hasPriv('testcase', 'import') ? "class='export'" : "class=disabled";
module/testcase/view/importfromlib.html.php
+1 -1
View File
@@ -70,7 +70,7 @@
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class='table-actions btn-toolbar'>
<?php echo html::submitButton($lang->testcase->import, '', 'btn btn-default');?>
<?php echo html::submitButton($lang->testcase->import, '', 'btn');?>
</div>
<?php echo html::linkButton($lang->goback, $this->session->caseList);?>
<?php $pager->show('right', 'pagerjs');?>
module/testsuite/view/batchcreatecase.html.php
+2 -2
View File
@@ -26,8 +26,8 @@
<tr class='text-center'>
<th class='w-50px'> <?php echo $lang->idAB;?></th>
<th class='w-180px'><?php echo $lang->testcase->module;?></th>
<th><?php echo $lang->testcase->title;?> <span class='required'></span></th>
<th class='w-100px'><?php echo $lang->testcase->type;?> <span class='required'></span></th>
<th class='required'><?php echo $lang->testcase->title;?></th>
<th class='w-100px required'><?php echo $lang->testcase->type;?></th>
<th class='w-80px'> <?php echo $lang->testcase->pri;?></th>
<th class='w-150px'><?php echo $lang->testcase->precondition;?></th>
<th class='w-100px'><?php echo $lang->testcase->keywords;?></th>
module/testsuite/view/library.html.php
+2 -2
View File
@@ -99,8 +99,8 @@ js::set('flow', $this->config->global->flow);
</div>
<div class='btn-toolbar pull-right'>
<div class='btn-group'>
<?php common::printLink('testsuite', 'exportTemplet', "libID=$libID", "<i class='icon-export'> </i>" . $lang->testsuite->exportTemplet, '', "class='btn btn-link export'");?>
<?php common::printLink('testsuite', 'import', "libID=$libID", "<i class='icon-import'> </i>" . $lang->testcase->importFile, '', "class='btn btn-link export'");?>
<?php common::printLink('testsuite', 'exportTemplet', "libID=$libID", "<i class='icon icon-export muted'> </i>" . $lang->testsuite->exportTemplet, '', "class='btn btn-link export'");?>
<?php common::printLink('testsuite', 'import', "libID=$libID", "<i class='icon muted icon-import'> </i>" . $lang->testcase->importFile, '', "class='btn btn-link export'");?>
</div>
<?php $params = "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0);?>
<?php common::printLink('testsuite', 'batchCreateCase', $params, "<i class='icon-plus'></i>" . $lang->testcase->batchCreate, '', "class='btn btn-secondary'");?>
module/testtask/view/runcase.html.php
+1 -1
View File
@@ -107,7 +107,7 @@
<td><?php echo $this->fetch('file', 'buildform', array('fileCount' => 1, 'percent' => 0.9, 'filesName' => "files{$step->id}", 'labelsName' => "labels{$step->id}"));?></td>
</tr>
<tr>
<td class='text-center'><button type="button" class="btn btn-default" onclick='loadFilesName()' data-dismiss="modal" aria-hidden="true"><?php echo $lang->save;?></button></td>
<td class='text-center'><button type="button" class="btn" onclick='loadFilesName()' data-dismiss="modal" aria-hidden="true"><?php echo $lang->save;?></button></td>
<tr>
</table>
</div>
module/todo/js/common.js
+2 -2
View File
@@ -44,12 +44,12 @@ function loadList(type, id)
{
if(data != ' ')
{
$(divClass).html(data);
$(divClass).html(data).find('select').chosen();
}
else
{
$("#type").val("custom");
$(divClass).html("<select id='bugs' class='form-control'></select>");
$(divClass).html("<select id='bugs' class='form-control'></select>").find('select').chosen();
}
});
}
module/todo/view/batchedit.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
<th class='w-100px'> <?php echo $lang->todo->date;?></th>
<th class='w-80px'> <?php echo $lang->todo->type;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->todo->pri;?></th>
<th class='red'><?php echo $lang->todo->name;?></th>
<th><?php echo $lang->todo->name;?></th>
<th <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo $lang->todo->desc;?></th>
<th class='w-180px<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'status', ' hidden')?>'> <?php echo $lang->todo->status;?></th>
module/todo/view/create.html.php
+2 -2
View File
@@ -86,11 +86,11 @@
</tr>
<tr>
<th><?php echo $lang->todo->type;?></th>
<td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange=loadList(this.value); class=form-control');?></td>
<td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange="loadList(this.value);" class="form-control chosen-simple"');?></td>
</tr>
<tr>
<th><?php echo $lang->todo->pri;?></th>
<td><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control chosen'");?></td>
<td><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control chosen-simple'");?></td>
</tr>
<tr>
<th><?php echo $lang->todo->name;?></th>
module/tree/view/browse.html.php
+1 -1
View File
@@ -124,7 +124,7 @@
<?php if($viewType != 'line'):?>
<td></td>
<?php endif;?>
<td colspan="2">
<td colspan="2" class="form-actions">
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?php echo $this->session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'btn btn-wide') : html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('parentModuleID', $currentModuleID);?>
module/tree/view/browsetask.html.php
+1 -1
View File
@@ -106,7 +106,7 @@
</tr>
<tr>
<td></td>
<td colspan='2'>
<td colspan='2' class="form-actions">
<?php
echo html::submitButton('', '', 'btn btn-primary btn-wide');
echo $this->session->taskList ? html::linkButton($this->lang->goback, $this->session->taskList) : html::backButton();
module/webhook/view/create.html.php
+4 -1
View File
@@ -65,7 +65,10 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide');?></td>
<td>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
</form>
module/webhook/view/edit.html.php
+4 -1
View File
@@ -68,7 +68,10 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide')?></td>
<td>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide')?>
</td>
</tr>
</table>
</form>
www/js/zui/min.js
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long