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

* improve UI of views with table, finish task #2687，task #2749 and task #2762.

Browse Source
This commit is contained in:
Catouse
2016-11-24 15:47:47 +08:00
parent bdac0837e5
commit 8951f8d0af
45 changed files with 193 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/browsedata.html.php
+2 -2
View File
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
?>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='bugList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='bugList'>
<thead>
<tr>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
@@ -46,7 +46,7 @@
<?php foreach($bugs as $bug):?>
<?php $bugLink = inlink('view', "bugID=$bug->id");?>
<tr class='text-center'>
<td class='bug-<?php echo $bug->status;?> strong text-left'>
<td class='cell-id bug-<?php echo $bug->status;?> strong text-left'>
<input type='checkbox' name='bugIDList[]' value='<?php echo $bug->id;?>'/>
<?php echo html::a($bugLink, sprintf('%03d', $bug->id));?>
</td>
module/bug/view/linkbugs.html.php
+2 -2
View File
@@ -21,7 +21,7 @@
<div id='querybox' class='show'></div>
</div>
<form method='post' class='form-condensed' target='hiddenwin' id='linkBugsForm'>
<table class='table table-condensed table-hover table-striped tablesorter' id='bugList'>
<table class='table table-condensed table-hover table-striped tablesorter table-selectable' id='bugList'>
<?php if($bugs2Link):?>
<thead>
<tr>
@@ -39,7 +39,7 @@
<?php foreach($bugs2Link as $bug2Link):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug2Link->id");?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<input type='checkbox' name='bugs[]' value='<?php echo $bug2Link->id;?>'/>
<?php echo html::a($bugLink, sprintf('%03d', $bug2Link->id));?>
</td>
module/build/css/view.css
+1 -1
View File
@@ -8,4 +8,4 @@
.tabs .tab-content .tab-pane #querybox{margin:0px; border-left:1px solid #ddd; border-right:1px solid #ddd;}
.tabs .tab-content .tab-pane #querybox form {padding-left:0px;}
.table-actions {padding-left: 8px;}
.table-actions {padding-left: 5px;}
module/build/view/linkbug.html.php
+3 -3
View File
@@ -13,7 +13,7 @@
<div id='querybox' class='show'></div>
<div id='unlinkBugList'>
<form method='post' id='unlinkedBugsForm' target='hiddenwin' action='<?php echo $this->createLink('build', 'linkBug', "buildID={$build->id}&browseType=$browseType&param=$param");?>'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable'>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong></caption>
<thead>
<tr class='colhead'>
@@ -29,8 +29,8 @@
<?php foreach($allBugs as $bug):?>
<?php if(strpos(",{$build->bugs},", ",$bug->id,") !== false) continue;?>
<tr>
<td class='text-left'>
<input class='ml-10px' type='checkbox' name='bugs[<?php echo $bug->id?>]' value='<?php echo $bug->id;?>' <?php if($bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?> />
<td class='cell-id'>
<input type='checkbox' name='bugs[<?php echo $bug->id?>]' value='<?php echo $bug->id;?>' <?php if($bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?> />
<?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?>
</td>
<td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
module/build/view/linkstory.html.php
+3 -3
View File
@@ -13,7 +13,7 @@
<div id='querybox' class='show'></div>
<div id='unlinkStoryList'>
<form method='post' id='unlinkedStoriesForm' target='hiddenwin' action='<?php echo $this->createLink('build', 'linkStory', "buildID={$build->id}&browseType=$browseType&param=$param");?>'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable'>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong></caption>
<thead>
<tr>
@@ -31,8 +31,8 @@
<?php foreach($allStories as $story):?>
<?php if(strpos(",{$build->stories},", ",{$story->id},") !== false) continue; ?>
<tr>
<td class='text-left'>
<input class='ml-10px' type='checkbox' name='stories[]' value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> />
<td class='cell-id'>
<input type='checkbox' name='stories[]' value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> />
<?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->id);?>
</td>
<td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
module/build/view/view.html.php
+6 -6
View File
@@ -56,7 +56,7 @@
<div class='linkBox'></div>
<?php endif;?>
<form method='post' target='hiddenwin' action='<?php echo inlink('batchUnlinkStory', "buildID={$build->id}")?>' id='linkedStoriesForm'>
<table class='table table-hover table-condensed table-striped tablesorter table-fixed' id='storyList'>
<table class='table table-hover table-condensed table-striped tablesorter table-fixed table-selectable' id='storyList'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
@@ -73,9 +73,9 @@
<?php foreach($stories as $storyID => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php if($canBatchUnlink):?>
<input class='ml-10px' type='checkbox' name='unlinkStories[]' value='<?php echo $story->id;?>'/>
<input type='checkbox' name='unlinkStories[]' value='<?php echo $story->id;?>'/>
<?php endif;?>
<?php echo sprintf('%03d', $story->id);?>
</td>
@@ -115,7 +115,7 @@
<div class='linkBox'></div>
<?php endif;?>
<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "build=$build->id");?>" id='linkedBugsForm'>
<table class='table table-hover table-condensed table-striped tablesorter table-fixed' id='bugList'>
<table class='table table-hover table-condensed table-striped tablesorter table-fixed table-selectable' id='bugList'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
@@ -132,9 +132,9 @@
<?php foreach($bugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php if($canBatchUnlink):?>
<input class='ml-10px' type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<?php endif;?>
<?php echo sprintf('%03d', $bug->id);?>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
module/common/view/datatable.html.php
+8 -1
View File
@@ -50,7 +50,14 @@ $(document).ready(function()
scrollPos : 'out',
tableClass : 'tablesorter',
storage : false,
selectable : {clickBehavior: 'multi'},
selectable :
{
clickBehavior: 'multi',
startDrag: function(e)
{
if(!this.multiKey && !$(e.target).closest('td[data-index="0"]').length) return false;
}
},
ready: function()
{
if(!this.$table) return;
module/company/view/browse.html.php
+2 -2
View File
@@ -33,7 +33,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
</div>
<div class='main'>
<form action='<?php echo $this->createLink('user', 'batchEdit', "deptID=$deptID")?>' method='post' id='userListForm'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='userList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='userList'>
<thead>
<tr class='colhead'>
<?php $vars = "param=$param&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
@@ -58,7 +58,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
?>
<?php foreach($users as $user):?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php
if($canBatchEdit) echo "<input type='checkbox' name='users[]' value='$user->account'> ";
printf('%03d', $user->id);
module/mail/view/browse.html.php
+2 -2
View File
@@ -16,7 +16,7 @@
</div>
<form method='post' action='<?php echo inlink('batchDelete')?>' target='hiddenwin' id='mailForm'>
<div class='panel'>
<table class='table table-condensed table-bordered active-disabled table-fixed tablesorter'>
<table class='table table-condensed table-bordered active-disabled table-fixed tablesorter table-selectable'>
<?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<thead>
<tr>
@@ -34,7 +34,7 @@
<tbody class='text-center'>
<?php foreach($queueList as $queue):?>
<tr>
<td>
<td class='cell-id'>
<input type='checkbox' name='mailIDList[]' value='<?php echo $queue->id;?>'/>
<?php echo $queue->id?>
</td>
module/mail/view/sendclouduser.html.php
+4 -4
View File
@@ -19,7 +19,7 @@
<form method='post' target='hiddenwin'>
<div class='panel'>
<div class='panel-heading'><strong><?php echo $lang->mail->unsyncUser?></strong></div>
<table class='table table-condensed table-bordered active-disabled table-fixed tablesorter'>
<table class='table table-condensed table-bordered active-disabled table-fixed tablesorter table-selectable'>
<thead>
<tr>
<th class='w-80px'> <?php echo $lang->user->account;?></th>
@@ -31,7 +31,7 @@
<?php foreach($users as $key => $user):?>
<?php if($user->email and isset($members[$user->email])) continue;?>
<tr>
<td>
<td class='cell-id'>
<input type='checkbox' name='unsyncList[]' value='<?php echo $user->account;?>'/>
<?php echo $user->account?>
</td>
@@ -62,7 +62,7 @@
<form method='post' target='hiddenwin'>
<div class='panel'>
<div class='panel-heading'><strong><?php echo $lang->mail->syncedUser?></strong></div>
<table class='table table-condensed table-bordered active-disabled table-fixed tablesorter'>
<table class='table table-condensed table-bordered active-disabled table-fixed tablesorter table-selectable'>
<thead>
<tr>
<th class='w-80px'> <?php echo $lang->user->account;?></th>
@@ -74,7 +74,7 @@
<?php foreach($users as $key => $user):?>
<?php if(empty($user->email) or !isset($members[$user->email])) continue;?>
<tr>
<td>
<td class='cell-id'>
<input type='checkbox' name='syncedList[]' value='<?php echo $user->account;?>'/>
<?php echo $user->account?>
</td>
module/my/view/bug.html.php
+2 -2
View File
@@ -22,7 +22,7 @@
</ul>
</div>
<form method='post' action='<?php echo $this->createLink('bug', 'batchEdit', "productID=0");?>'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='bugList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='bugList'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr class='text-center'>
@@ -42,7 +42,7 @@
<?php $canBatchEdit = common::hasPriv('bug', 'batchEdit');?>
<?php foreach($bugs as $bug):?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<?php if($canBatchEdit):?><input type='checkbox' name='bugIDList[]' value='<?php echo $bug->id;?>' /><?php endif;?>
<?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id), '_blank');?>
</td>
module/my/view/story.html.php
+2 -2
View File
@@ -22,7 +22,7 @@
</nav>
</div>
<form method='post' id='myStoryForm'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr class='text-center'>
@@ -46,7 +46,7 @@
<?php foreach($stories as $key => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "id=$story->id");?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php if($canBatchEdit or $canBatchClose):?>
<input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' />
<?php endif;?>
module/my/view/task.html.php
+2 -2
View File
@@ -24,7 +24,7 @@
</ul>
</div>
<form method='post' id='myTaskForm'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='tasktable'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='tasktable'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr class='text-center'>
@@ -48,7 +48,7 @@
<?php $canBatchClose = (common::hasPriv('task', 'batchClose') and $type != 'closedBy');?>
<?php foreach($tasks as $task):?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<?php if($canBatchEdit or $canBatchClose):?><input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>' /><?php endif;?>
<?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?>
</td>
module/my/view/testcase.html.php
+3 -3
View File
@@ -23,7 +23,7 @@
</nav>
</div>
<form method='post' id='myCaseForm'>
<table class='table table-condensed table-fixed table-hover table-striped tablesorter' id='caseList'>
<table class='table table-condensed table-fixed table-hover table-striped tablesorter table-selectable' id='caseList'>
<?php
$vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
$this->app->loadLang('testtask');
@@ -49,7 +49,7 @@
?>
<?php foreach($cases as $case):?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php if($canBatchEdit or $canBatchRun):?><input type='checkbox' name='caseIDList[]' value='<?php echo $case->id;?>'/><?php endif;?>
<?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?>
</td>
@@ -90,7 +90,7 @@
if($canBatchEdit)
{
$actionLink = $this->createLink('testcase', 'batchEdit');
echo html::submitButton("<i class='icon-edit'></i> " . $lang->edit, "onclick=setFormAction('$actionLink')");
echo html::submitButton("<i class='icon-pencil'></i> " . $lang->edit, "onclick=setFormAction('$actionLink')");
}
if($canBatchRun)
{
module/my/view/todo.html.php
+2 -2
View File
@@ -45,7 +45,7 @@
</div>
</div>
<form method='post' id='todoform'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='todoList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='todoList'>
<?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr class='text-center'>
@@ -63,7 +63,7 @@
<tbody>
<?php foreach($todos as $todo):?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<?php if(common::hasPriv('todo', 'batchEdit') or (common::hasPriv('todo', 'import2Today') and $importFuture)):?>
<input type='checkbox' name='todoIDList[<?php echo $todo->id;?>]' value='<?php echo $todo->id;?>' />
<?php endif;?>
module/product/view/all.html.php
+3 -3
View File
@@ -36,7 +36,7 @@
<?php else:?>
<?php $canOrder = (common::hasPriv('product', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
<form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>' id='productsForm'>
<table class='table table-condensed table-hover table-striped tablesorter table-datatable' id='productList'>
<table class='table table-condensed table-hover table-striped tablesorter table-datatable table-selectable' id='productList'>
<?php $vars = "productID=$productID&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
<thead>
<tr>
@@ -60,7 +60,7 @@
<tbody class='sortable' id='productTableList'>
<?php foreach($productStats as $product):?>
<tr class='text-center' data-id='<?php echo $product->id ?>' data-order='<?php echo $product->code ?>'>
<td>
<td class='cell-id'>
<?php if($canBatchEdit):?>
<input type='checkbox' name='productIDList[<?php echo $product->id;?>]' value='<?php echo $product->id;?>' />
<?php endif;?>
@@ -92,7 +92,7 @@
<?php endif;?>
<?php if(!$canOrder and common::hasPriv('product', 'updateOrder')) echo html::a(inlink('all', "productID=$productID&status=$status&order=order_desc&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->product->updateOrder, '' , "class='btn'");?>
</div>
<div class='text-right'><?php $pager->show();?></div>
<?php $pager->show();?>
</td>
</tr>
</tfoot>
module/product/view/browsedata.html.php
+2 -2
View File
@@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/tablesorter.html.php';?>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='storyList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='storyList'>
<thead>
<tr>
<th class='w-id {sorter:false}'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
@@ -38,7 +38,7 @@
$canView = common::hasPriv('story', 'view');
?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' />
<?php echo $canView ? html::a($viewLink, sprintf('%03d', $story->id)): sprintf('%03d', $story->id);?>
</td>
module/productplan/css/view.css
+2
View File
@@ -20,3 +20,5 @@ input[type=checkbox].ml-10px{margin-left:10px;}
.dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
.dropdown-list > li > a:hover,
.dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
.table-actions {padding-left: 5px;}
module/productplan/view/browse.html.php
+2 -2
View File
@@ -39,7 +39,7 @@
</div>
</div>
<form method='post' id='productplanForm' action='<?php echo inlink('batchEdit', "productID=$product->id&branch=$branch")?>'>
<table class='table' id="productplan">
<table class='table table-bordered table-selectable' id="productplan">
<thead>
<?php $vars = "productID=$productID&branch=$branch&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<tr class='colhead'>
@@ -57,7 +57,7 @@
<tbody>
<?php foreach($plans as $plan):?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<input type='checkbox' name='planIDList[<?php echo $plan->id;?>]' value='<?php echo $plan->id;?>' />
<?php echo $plan->id;?>
</td>
module/productplan/view/linkbug.html.php
+4 -4
View File
@@ -17,7 +17,7 @@ include '../../common/view/tablesorter.html.php';
<div id='querybox' class='show'></div>
<div id='unlinkBugList'>
<form method='post' id='unlinkedBugsForm' target='hiddenwin' action='<?php echo $this->createLink('productplan', 'linkBug', "planID=$plan->id&browseType=$browseType&param=$param&orderBy=$orderBy")?>'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable'>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong></caption>
<thead>
<tr class='colhead'>
@@ -36,8 +36,8 @@ include '../../common/view/tablesorter.html.php';
if($bug->plan and helper::diffDate($plans[$bug->plan], helper::today()) > 0) continue;
?>
<tr>
<td class='text-left'>
<input class='ml-10px' type='checkbox' name='bugs[]' value='<?php echo $bug->id;?>'/>
<td class='cell-id'>
<input type='checkbox' name='bugs[]' value='<?php echo $bug->id;?>'/>
<?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?>
</td>
<td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
@@ -53,7 +53,7 @@ include '../../common/view/tablesorter.html.php';
<td colspan='6' class='text-left'>
<?php if(count($allBugs))
{
echo "<div class='table-actions clearfix' style='padding-left:8px;'>";
echo "<div class='table-actions clearfix'>";
echo html::selectButton() . html::submitButton($lang->productplan->linkBug);
echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=$orderBy"), $lang->goback, '', "class='btn'");
echo '</div>';
module/productplan/view/linkstory.html.php
+4 -4
View File
@@ -17,7 +17,7 @@ include '../../common/view/tablesorter.html.php';
<div id='querybox' class='show'></div>
<div id='unlinkStoryList'>
<form method='post' id='unlinkedStoriesForm' target='hiddenwin' action='<?php echo $this->createLink('productplan', 'linkStory', "planID=$plan->id&browseType=$browseType&param=$param&orderBy=$orderBy")?>'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable'>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong></caption>
<thead>
<tr>
@@ -37,8 +37,8 @@ include '../../common/view/tablesorter.html.php';
<?php foreach($allStories as $story):?>
<?php if(isset($planStories[$story->id])) continue; ?>
<tr>
<td class='text-left'>
<input class='ml-10px' type='checkbox' name='stories[]' value='<?php echo $story->id;?>'/>
<td class='cell-id'>
<input type='checkbox' name='stories[]' value='<?php echo $story->id;?>'/>
<?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->id);?>
</td>
<td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
@@ -58,7 +58,7 @@ include '../../common/view/tablesorter.html.php';
<td colspan='9' class='text-left'>
<?php if(count($allStories))
{
echo "<div class='table-actions clearfix' style='padding-left:8px;'>";
echo "<div class='table-actions clearfix'>";
echo html::selectButton() . html::submitButton($lang->story->linkStory);
echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=$orderBy"), $lang->goback, '', "class='btn'");
echo '</div>';
module/productplan/view/view.html.php
+6 -6
View File
@@ -65,7 +65,7 @@
<div class='linkBox'></div>
<?php endif;?>
<form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkStory', "planID=$plan->id&orderBy=$orderBy");?>">
<table class='table tablesorter table-condensed table-hover table-striped table-fixed' id='storyList'>
<table class='table tablesorter table-condensed table-hover table-striped table-fixed table-selectable' id='storyList'>
<?php $vars = "planID={$plan->id}&type=story&orderBy=%s&link=$link&param=$param"; ?>
<thead>
<tr>
@@ -93,9 +93,9 @@
$totalEstimate += $story->estimate;
?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php if($canBatchUnlink or $canBatchChangePlan):?>
<input class='ml-10px' type='checkbox' name='storyIDList[]' value='<?php echo $story->id;?>'/>
<input type='checkbox' name='storyIDList[]' value='<?php echo $story->id;?>'/>
<?php endif;?>
<?php echo html::a($viewLink, sprintf("%03d", $story->id));?>
</td>
@@ -307,7 +307,7 @@
<div class='linkBox'></div>
<?php endif;?>
<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "planID=$plan->id&orderBy=$orderBy");?>">
<table class='table tablesorter table-condensed table-hover table-striped table-fixed' id='bugList'>
<table class='table tablesorter table-condensed table-hover table-striped table-fixed table-selectable' id='bugList'>
<?php $vars = "planID={$plan->id}&type=bug&orderBy=%s&link=$link&param=$param"; ?>
<thead>
<tr>
@@ -324,9 +324,9 @@
<?php $canBatchUnlink = common::hasPriv('productPlan', 'batchUnlinkBug');?>
<?php foreach($planBugs as $bug):?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php if($canBatchUnlink):?>
<input class='ml-10px' type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<?php endif;?>
<?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), sprintf("%03d", $bug->id));?>
</td>
module/project/css/bug.css
+8 -4
View File
@@ -1,4 +1,8 @@
.assign-menu {min-width: 150px; overflow: hidden; max-height: 305px}
.assign-menu.with-search {padding-bottom: 34px;}
.assign-menu > .assign-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0}
.assign-menu > .assign-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
.assign-menu.dropdown-menu.with-search {padding: 0; min-width: 150px; overflow: hidden; max-height: 302px;}
.assign-menu.dropdown-menu > .assign-search .input-group {width:100%;}
.assign-menu.dropdown-menu > .assign-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
.assign-menu.dropdown-menu > .assign-search .form-control {border: none!important; box-shadow: none!important; border-top: 1px solid #ddd!important;}
.dropdown-list {display: block; padding: 0; max-height: 270px; overflow-y: auto; margin: 0;}
.dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
.dropdown-list > li > a:hover,
.dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
module/project/view/all.html.php
+3 -3
View File
@@ -28,7 +28,7 @@
</div>
<?php $canOrder = (common::hasPriv('project', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
<form id='projectsForm' class='form-condensed' method='post' action='<?php echo inLink('batchEdit', "projectID=$projectID");?>'>
<table class='table table-fixed tablesorter table-datatable' id='projectList'>
<table class='table table-fixed tablesorter table-datatable table-selectable' id='projectList'>
<?php $vars = "status=$status&projectID=$projectID&orderBy=%s&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
<thead>
<tr>
@@ -52,7 +52,7 @@
<tbody class='sortable' id='projectTableList'>
<?php foreach($projectStats as $project):?>
<tr class='text-center' data-id='<?php echo $project->id ?>' data-order='<?php echo $project->order ?>'>
<td>
<td class='cell-id'>
<?php if($canBatchEdit):?>
<input type='checkbox' name='projectIDList[<?php echo $project->id;?>]' value='<?php echo $project->id;?>' />
<?php endif;?>
@@ -91,7 +91,7 @@
<?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'");?>
</div>
<div class='text-right'><?php $pager->show();?></div>
<?php $pager->show();?>
</td>
</tr>
</tfoot>
module/project/view/bug.html.php
+7 -6
View File
@@ -22,7 +22,7 @@
</div>
</div>
<form method='post' id='projectBugForm'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='bugList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='bugList'>
<thead>
<tr>
<?php $vars = "projectID={$project->id}&orderBy=%s&build=$buildID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
@@ -40,7 +40,7 @@
<tbody>
<?php foreach($bugs as $bug):?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<input type='checkbox' name='bugIDList[]' value='<?php echo $bug->id;?>'/>
<?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id), '_blank');?>
</td>
@@ -82,16 +82,17 @@
echo '<div class="dropup btn-group">';
echo '<button class="btn dropdown-toggle" type="button" data-toggle="dropdown">';
echo $lang->bug->assignedTo;
echo '<span class="caret"></span></button>';
echo '<ul class="dropdown-menu assign-menu' . ($withSearch ? ' with-search':'') . '" role="menu">';
echo ' <span class="caret"></span></button>';
echo '<div class="dropdown-menu assign-menu' . ($withSearch ? ' with-search':'') . '" role="menu">';
echo '<ul class="dropdown-list">';
foreach ($memberPairs as $key => $value)
{
if(empty($key)) continue;
echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
}
if($withSearch) echo "<li class='assign-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
echo '</ul>';
echo '</div>';
if($withSearch) echo "<div class='assign-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
echo '</div></div>';
}
}
?>
module/project/view/importbug.html.php
+7 -9
View File
@@ -12,10 +12,8 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<script language='Javascript'>
$(function(){
$(".preview").modalTrigger({width:1000, type:'iframe'});
})
<script>
$(function(){$(".preview").modalTrigger({width:1000, type:'iframe'});});
var browseType = '<?php echo $browseType;?>';
</script>
<div id='titlebar'>
@@ -26,7 +24,7 @@ var browseType = '<?php echo $browseType;?>';
<div id='querybox' class='show'></div>
</div>
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin' id='importBugForm'>
<table class='table tablesorter table-fixed'>
<table class='table tablesorter table-fixed table-selectable'>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php echo $lang->idAB;?></th>
@@ -42,7 +40,7 @@ var browseType = '<?php echo $browseType;?>';
<tbody>
<?php foreach($bugs as $bug):?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php echo html::checkbox("import[$bug->id]", '');?>
<?php echo sprintf('%03d', $bug->id) . html::hidden("id[$bug->id]", $bug->id);?>
</td>
@@ -50,9 +48,9 @@ var browseType = '<?php echo $browseType;?>';
<td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='text-left nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'", true, true);?></td>
<td class='bug-<?php echo $bug->status?>'><?php echo $lang->bug->statusList[$bug->status];?></td>
<td><?php echo html::select("pri[$bug->id]", $lang->task->priList, 3, "class='input-sm form-control'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("assignedTo[$bug->id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='input-sm form-control chosen'");?></td>
<td><?php echo html::input("estimate[$bug->id]", '', 'size=4 class="input-sm form-control"');?></td>
<td class='td-has-control'><?php echo html::select("pri[$bug->id]", $lang->task->priList, 3, "class='input-sm form-control'");?></td>
<td class='td-has-control' class='text-left' style='overflow:visible'><?php echo html::select("assignedTo[$bug->id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='input-sm form-control chosen'");?></td>
<td class='td-has-control'><?php echo html::input("estimate[$bug->id]", '', 'size=4 class="input-sm form-control"');?></td>
</tr>
<?php endforeach;?>
</tbody>
module/project/view/importtask.html.php
+6 -8
View File
@@ -23,16 +23,16 @@
<?php echo html::select('fromproject', $projects, $fromProject, "onchange='reload($projectID, this.value)' class='form-control chosen'");?>
<span class='input-group-btn'>
<?php
$toggleClass = $containDoing ? 'icon-toggle-on' : 'icon-toggle-off';
$toggleClass = $containDoing ? 'icon-checked' : 'icon-check-empty';
$params = $containDoing ? "toProject=$projectID&fromProject=$fromProject" : "toProject=$projectID&fromProject=$fromProject&containDoing=true";
echo html::a($this->createLink('project', 'importTask', $params), "<i class={$toggleClass}></i>" . $lang->project->containDoing, '', "class='btn'");
echo html::a($this->createLink('project', 'importTask', $params), "<i class={$toggleClass}></i> " . $lang->project->containDoing, '', "class='btn'");
?>
</span>
</div>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' id='importTaskForm'>
<table class='table tablesorter table-fixed'>
<table class='table tablesorter table-fixed table-selectable'>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->idAB;?></th>
@@ -50,12 +50,10 @@
<?php foreach($tasks2Imported as $task):?>
<?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
<tr class='text-center'>
<td>
<input type='checkbox' name='tasks[]' value='<?php echo $task->id;?>' />
<?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>
<td class='cell-id'>
<input type='checkbox' name='tasks[]' value='<?php echo $task->id;?>' />
<?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>
</td>
<td><?php echo substr($projects[$task->project], 2);?></td>
<td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
<td class='text-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
module/project/view/linkstory.html.php
+2 -3
View File
@@ -21,7 +21,7 @@
<div id='querybox' class='show'></div>
</div>
<form method='post' class='form-condensed' id='linkStoryForm'>
<table class='table tablesorter table-fixed' id='linkStoryList'>
<table class='table tablesorter table-fixed table-selectable' id='linkStoryList'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
@@ -43,7 +43,7 @@
<?php if(isset($prjStories[$story->id])) continue;?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id");?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<input type='checkbox' name='stories[]' value='<?php echo $story->id;?>'/>
<?php echo html::hidden("products[$story->id]", $story->product);?>
<?php echo html::a($storyLink, sprintf('%03d', $story->id));?>
@@ -66,7 +66,6 @@
<tr>
<td colspan='<?php echo $productType == 'normal' ? '7' :'8';?>' class='text-left'>
<div class='table-actions clearfix'>
<?php
if($storyCount) echo html::selectButton() . html::submitButton();
else echo "<div class='text'>" . $lang->project->whyNoStories . '</div>';
module/project/view/story.html.php
+2 -2
View File
@@ -51,7 +51,7 @@
</div>
<div class='main'>
<form method='post' id='projectStoryForm'>
<table class='table tablesorter table-condensed table-fixed' id='storyList'>
<table class='table tablesorter table-condensed table-fixed table-selectable' id='storyList'>
<thead>
<tr class='colhead'>
<?php $vars = "projectID={$project->id}&orderBy=%s&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
@@ -79,7 +79,7 @@
$totalEstimate += $story->estimate;
?>
<tr class='text-center' id="story<?php echo $story->id?>">
<td class='text-left'>
<td class='cell-id'>
<?php if($canBatchEdit or $canBatchClose):?>
<input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' />
<?php endif;?>
module/project/view/taskdata.html.php
+2 -2
View File
@@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/tablesorter.html.php';?>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='taskList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='taskList'>
<thead>
<tr>
<th class='w-id {sorter:false}'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
@@ -44,7 +44,7 @@
<?php foreach($tasks as $task):?>
<?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : ''; ?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>'/>
<?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>
</td>
module/release/css/view.css
+2
View File
@@ -4,3 +4,5 @@
.tabs .tab-content{padding:0px; border:0px;}
.tabs .tab-content .tab-pane #querybox{margin:0px; border-left:1px solid #ddd; border-right:1px solid #ddd;}
.tabs .tab-content .tab-pane #querybox form{padding-left:0px;}
.table-actions {padding-left: 5px;}
module/release/view/linkbug.html.php
+4 -4
View File
@@ -17,7 +17,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
?>
<div id='<?php echo $type == 'bug' ? 'unlinkBugList' : 'unlinkLeftBugList';?>'>
<form method='post' target='hiddenwin' id='<?php echo $formID?>' action='<?php echo $this->createLink('release', 'linkBug', "releaseID=$release->id&browseType=$browseType&param=$param&type=$type")?>'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable'>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong></caption>
<thead>
<tr class='colhead'>
@@ -33,8 +33,8 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<?php foreach($allBugs as $bug):?>
<?php if(strpos(",{$releaseBugs},", ",$bug->id,") !== false) continue;?>
<tr>
<td class='text-left'>
<input class='ml-10px' type='checkbox' name='bugs[<?php echo $bug->id?>]' value='<?php echo $bug->id;?>' <?php if($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?> />
<td class='cell-id'>
<input type='checkbox' name='bugs[<?php echo $bug->id?>]' value='<?php echo $bug->id;?>' <?php if($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?> />
<?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?>
</td>
<td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
@@ -50,7 +50,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<td colspan='6' class='text-left'>
<?php if(count($allBugs))
{
echo "<div class='table-actions clearfix pdl-8px'>";
echo "<div class='table-actions clearfix'>";
echo html::selectButton() . html::submitButton($lang->release->linkBug);
echo html::a(inlink('view', "releaseID=$release->id&type=$type"), $lang->goback, '', "class='btn'");
echo '</div>';
module/release/view/linkstory.html.php
+3 -3
View File
@@ -13,7 +13,7 @@
<div id='querybox' class='show'></div>
<div id='unlinkStoryList'>
<form method='post' target='hiddenwin' id='unlinkedStoriesForm' action='<?php echo $this->createLink('release', 'linkStory', "releaseID=$release->id&browseType=$browseType&param=$param")?>'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable'>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong></caption>
<thead>
<tr>
@@ -31,7 +31,7 @@
<?php foreach($allStories as $story):?>
<?php if(strpos(",{$release->stories},", ",{$story->id},") !== false) continue; ?>
<tr>
<td class='text-left'>
<td class='cell-id'>
<input class='ml-10px' type='checkbox' name='stories[]' value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> />
<?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->id);?>
</td>
@@ -50,7 +50,7 @@
<td colspan='8' class='text-left'>
<?php if(count($allStories))
{
echo "<div class='table-actions clearfix pdl-8px'>";
echo "<div class='table-actions clearfix'>";
echo html::selectButton() . html::submitButton($lang->story->linkStory);
echo html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'");
echo '</div>';
module/release/view/view.html.php
+12 -12
View File
@@ -78,7 +78,7 @@
<div class='linkBox'></div>
<?php endif;?>
<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkStory', "release=$release->id");?>" id='linkedStoriesForm'>
<table class='table table-hover table-condensed table-striped tablesorter table-fixed' id='storyList'>
<table class='table table-hover table-condensed table-striped tablesorter table-fixed table-selectable' id='storyList'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
@@ -95,9 +95,9 @@
<?php foreach($stories as $storyID => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php if($canBatchUnlink):?>
<input class='ml-10px' type='checkbox' name='unlinkStories[]' value='<?php echo $story->id;?>'/>
<input type='checkbox' name='unlinkStories[]' value='<?php echo $story->id;?>'/>
<?php endif;?>
<?php echo sprintf('%03d', $story->id);?>
</td>
@@ -121,7 +121,7 @@
<tfoot>
<tr>
<td colspan='8'>
<div class='table-actions clearfix pdl-8px'>
<div class='table-actions clearfix'>
<?php if($countStories and $canBatchUnlink) echo html::selectButton() . html::submitButton($lang->release->batchUnlink);?>
<div class='text'><?php echo sprintf($lang->release->finishStories, $countStories);?></div>
</div>
@@ -137,7 +137,7 @@
<div class='linkBox'></div>
<?php endif;?>
<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id");?>" id='linkedBugsForm'>
<table class='table table-hover table-condensed table-striped tablesorter table-fixed' id='bugList'>
<table class='table table-hover table-condensed table-striped tablesorter table-fixed table-selectable' id='bugList'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
@@ -154,9 +154,9 @@
<?php foreach($bugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php if($canBatchUnlink):?>
<input class='ml-10px' type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<?php endif;?>
<?php echo sprintf('%03d', $bug->id);?>
</td>
@@ -180,7 +180,7 @@
<tfoot>
<tr>
<td colspan='8'>
<div class='table-actions clearfix pdl-8px'>
<div class='table-actions clearfix'>
<?php if($countBugs and $canBatchUnlink) echo html::selectButton() . html::submitButton($lang->release->batchUnlink);?>
<div class='text'><?php echo sprintf($lang->release->resolvedBugs, $countBugs);?></div>
</div>
@@ -196,7 +196,7 @@
<div class='linkBox'></div>
<?php endif;?>
<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id&type=leftBug");?>" id='linkedBugsForm'>
<table class='table table-hover table-condensed table-striped tablesorter table-fixed' id='leftBugList'>
<table class='table table-hover table-condensed table-striped tablesorter table-fixed table-selectable' id='leftBugList'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
@@ -212,9 +212,9 @@
<?php foreach($leftBugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr class='text-center'>
<td>
<td class='cell-id'>
<?php if($canBatchUnlink):?>
<input class='ml-10px' type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<?php endif;?>
<?php echo sprintf('%03d', $bug->id);?>
</td>
@@ -237,7 +237,7 @@
<tfoot>
<tr>
<td colspan='7'>
<div class='table-actions clearfix pdl-8px'>
<div class='table-actions clearfix'>
<div class='text'>
<?php if($countLeftBugs and $canBatchUnlink) echo html::selectButton() . html::submitButton($lang->release->batchUnlink);?>
<?php echo sprintf($lang->release->createdBugs, $countLeftBugs);?>
module/story/view/linkstory.html.php
+2 -2
View File
@@ -21,7 +21,7 @@
<div id='querybox' class='show'></div>
</div>
<form method='post' class='form-condensed' target='hiddenwin' id='linkStoryForm'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='storyList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='storyList'>
<?php if($stories2Link):?>
<thead>
<tr>
@@ -39,7 +39,7 @@
<?php foreach($stories2Link as $story2Link):?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story2Link->id");?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<input type='checkbox' name='stories[]' value='<?php echo $story2Link->id;?>'/>
<?php echo html::a($storyLink, sprintf('%03d', $story2Link->id));?>
</td>
module/story/view/zerocase.html.php
+3 -3
View File
@@ -14,7 +14,7 @@
<?php include '../../testcase/view/caseheader.html.php';?>
<div class='main'>
<form method='post' id='productStoryForm'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='storyList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='storyList'>
<thead>
<tr>
<?php $vars = "productID=$productID&orderBy=%s";?>
@@ -38,7 +38,7 @@
$canView = common::hasPriv('story', 'view');
?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' />
<?php if($canView) echo html::a($viewLink, sprintf('%03d', $story->id)); else printf('%03d', $story->id);?>
</td>
@@ -67,7 +67,7 @@
<tfoot>
<tr>
<td colspan='11'>
<div class='table-actions clearfix'>
<div class='table-actions clearfix' style='padding-left: 5px'>
<?php if(count($stories)):?>
<?php echo html::selectButton();?>
<?php
module/testcase/css/createbug.css
+10
View File
@@ -0,0 +1,10 @@
body {padding: 15px;}
.table {margin-bottom: 5px;}
.table > thead > tr > th {border-top: 1px solid #ddd;}
.table > thead > tr > th:first-child,
.table > tbody > tr > td:first-child {border-left: 1px solid #ddd}
.table > thead > tr > th:last-child,
.table > tbody > tr > td:last-child {border-right: 1px solid #ddd}
.table tfoot td {border-bottom: none}
.table-actions {float: none; padding: 10px 0 0 0;}
.table-actions .checkbox.btn {padding: 6px 11px;}
module/testcase/css/linkcases.css
+1
View File
@@ -1 +1,2 @@
#linkCasesForm {min-height: 300px}
.table-actions {padding-left: 0}
module/testcase/view/browsedata.html.php
+2 -2
View File
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
?>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='caseList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='caseList'>
<thead>
<tr>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
@@ -35,7 +35,7 @@
<?php foreach($cases as $case):?>
<tr class='text-center'>
<?php $viewLink = inlink('view', "caseID=$case->id");?>
<td>
<td class='cell-id'>
<input type='checkbox' name='caseIDList[]' value='<?php echo $case->id;?>'/>
<?php echo html::a($viewLink, sprintf('%03d', $case->id));?>
</td>
module/testcase/view/createbug.html.php
+3 -5
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.lite.html.php';?>
<form action='<?php echo $this->createLink('bug', 'create', "product=$productID&branch=$branch&extras=$extras")?>' target='_parent' method='post'>
<table class='table table-condensed table-hover table-striped tablesorter' style='word-break:break-all'>
<table class='table table-condensed table-hover table-striped tablesorter table-selectable' style='word-break:break-all'>
<thead>
<tr>
<th class='w-60px'><?php echo $lang->testcase->stepID;?></th>
@@ -26,7 +26,7 @@
<?php $i = 1;?>
<?php foreach($result->stepResults as $stepID => $stepResult):?>
<tr>
<td>
<td class='cell-id'>
<input type='checkbox' name='stepIDList[]' value='<?php echo $stepID;?>'/>
<?php echo $i?>
</td>
@@ -40,9 +40,7 @@
</tbody>
<tfoot>
<tr>
<td colspan='5'>
<div class='table-actions clearfix'><?php echo html::selectButton() . html::submitButton();?></div>
</td>
<td colspan='5' class='pd-0'><div class='table-actions clearfix'><?php echo html::selectButton() . html::submitButton();?></div></td>
</tr>
</tfoot>
</table>
module/testcase/view/linkcases.html.php
+3 -3
View File
@@ -22,7 +22,7 @@
<div id='querybox' class='show'></div>
</div>
<form method='post' class='form-condensed' target='hiddenwin' id='linkCasesForm'>
<table class='table table-condensed table-hover table-striped tablesorter' id='caseList'>
<table class='table table-condensed table-hover table-striped tablesorter table-selectable' id='caseList'>
<?php if($cases2Link):?>
<thead>
<tr>
@@ -38,7 +38,7 @@
<?php $caseCount = 0;?>
<?php foreach($cases2Link as $case2Link):?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<input type='checkbox' name='cases[]' value='<?php echo $case2Link->id;?>' />
<?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case2Link->id"), sprintf('%03d', $case2Link->id));?>
</td>
@@ -53,7 +53,7 @@
</tbody>
<tfoot>
<tr>
<td colspan='7'>
<td colspan='6'>
<div class='table-actions clearfix'>
<?php if($caseCount) echo html::selectButton() . html::submitButton();?>
</div>
module/testtask/view/casesdata.html.php
+2 -2
View File
@@ -11,7 +11,7 @@
*/
?>
<?php $vars = "taskID=$task->id&browseType=$browseType&param=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='caseList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='caseList'>
<thead>
<tr class='colhead'>
<th class='w-id'><nobr><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></nobr></th>
@@ -35,7 +35,7 @@
<tbody>
<?php foreach($runs as $run):?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<?php if($canBatchEdit or $canBatchAssign or $canBatchRun):?>
<input type='checkbox' name='caseIDList[]' value='<?php echo $run->case;?>'/>
<?php endif;?>
module/testtask/view/linkcase.html.php
+3 -3
View File
@@ -34,7 +34,7 @@
<div id='querybox' class='show'></div>
</div>
<form method='post'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable'>
<caption class='text-left text-special'>
<?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->testtask->unlinkedCases;?></strong> (<?php echo $pager->recTotal;?>)
</caption>
@@ -52,7 +52,7 @@
<tbody>
<?php foreach($cases as $case):?>
<tr class='text-center'>
<td class='text-left'>
<td class='cell-id'>
<input type='checkbox' name='cases[]' value='<?php echo $case->id;?>' />
<?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?>
</td>
@@ -78,7 +78,7 @@
<tr>
<td colspan='7'>
<?php if($cases):?>
<div class='table-actions clearfix'><?php echo html::selectButton() . html::submitButton();?></div>
<div class='table-actions pd-0 clearfix'><?php echo html::selectButton() . html::submitButton();?></div>
<?php endif;?>
<div class='text-right'><?php $pager->show();?></div>
</td>
www/js/my.full.js
+26 -18
View File
@@ -655,7 +655,24 @@ function setComment()
*/
function checkTable($table)
{
$table = $table || $('.tablesorter:not(.table-datatable)');
$(document).off('change.checktable').on('change.checktable', '.rows-selector:checkbox', function()
{
var $checkbox = $(this);
var $datatable = $checkbox.closest('.datatable');
if($datatable.length) {
var $checkAll = $datatable.find('.check-all.check-btn:first').trigger('click');
$checkbox.prop('checked', $checkAll.hasClass('checked'))
return;
}
var scope = $checkbox.data('scope');
var $target = scope ? $('#' + scope) : $checkbox.closest('.table');
var isChecked = $checkbox.prop('checked');
$target.find('tbody > tr').toggleClass('active', isChecked).find('td :checkbox').prop('checked', isChecked);
});
$table = $table || $('.table-selectable');
if(!$table.length) return;
var checkRow = function(checked)
{
@@ -679,6 +696,8 @@ function checkTable($table)
}
};
var isSelectableTable = $table.hasClass('table-selectable');
$table.selectable(
{
selector: 'tbody > tr',
@@ -699,6 +718,10 @@ function checkTable($table)
});
},
clickBehavior: 'multi',
startDrag: function(e)
{
if(!this.multiKey && isSelectableTable && !$(e.target).closest('.cell-id').length) return false;
},
select: function(e)
{
checkRow.call(e.target, true);
@@ -708,21 +731,6 @@ function checkTable($table)
checkRow.call(e.target, false);
}
}).on('click', 'tbody > tr :checkbox', function(e){checkRow.call(this); e.stopPropagation();}).on('click mousedown mousemove mouseup', 'tbody a,tbody select,tbody input', function(e) {e.stopPropagation();});
$(document).off('change.checktable').on('change.checktable', '.rows-selector:checkbox', function()
{
var $checkbox = $(this);
var $datatable = $checkbox.closest('.datatable');
if($datatable.length) {
var $checkAll = $datatable.find('.check-all.check-btn:first').trigger('click');
$checkbox.prop('checked', $checkAll.hasClass('checked'))
return;
}
var scope = $checkbox.data('scope');
var $target = scope ? $('#' + scope) : $checkbox.closest('.table');
var isChecked = $checkbox.prop('checked');
$target.find('tbody > tr').toggleClass('active', isChecked).find('td :checkbox').prop('checked', isChecked);
});
}
/**
@@ -1300,7 +1308,7 @@ function setModal4List(triggerClass, replaceID, callback, width)
}
catch(err){}
if($list.is('.tablesorter:not(.table-datatable)')) checkTable($list);
if($list.is('.table-selectable:not(.table-datatable)')) checkTable($list);
else $list.find('tbody tr:not(.active-disabled) td').click(function(){$(this).closest('tr').toggleClass('active');});
if($.isFunction(callback)) callback();
@@ -1433,7 +1441,7 @@ function fixedTfootAction(formID)
if($(formID).find('table:last').find('tfoot').size() == 0) return false;
fixTfootInit();
$(window).scroll(fixTfoot);//Fix table foot when scrolling.
$(window).scroll(fixTfoot).resize(fixTfoot);//Fix table foot when scrolling.
$('.side-handle').click(function(){setTimeout(fixTfootInit, 300);});//Fix table foot if module tree is hidden or displayed.
var $table, $tfoot, $inputGroup, tableWidth, tableOffset, hasFixed;
www/theme/default/style.css
+13 -8
View File
@@ -117,6 +117,7 @@ hr.small {margin: 10px 0}
.table caption {padding: 8px 20px; border: 1px solid #DDD; border-bottom: 0; background: #fafafa;}
.table.table-condensed caption {padding: 6px 15px;}
.table td.td-has-control {padding: 2px 4px;}
/* Datepicker */
.datepicker-wrapper {position: relative; cursor: pointer;}
@@ -161,7 +162,9 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
/* priority icons. */
.pri1,.pri0,.pri2,.pri3,.pri4,.pri5,.pri6,.pri{display:inline-block;width: 18px;height: 18px;font-size: 12px;line-height: 14px;font-weight: bold; text-align: center; color: #ccc; -moz-border-radius:50%; -webkit-border-radius:50%; border-radius:50%;border: 2px solid #ccc; font-family: arial, helvetica, clean, sans-serif; background-color: #fff}
.pri:before, .pri0:before{content: '?'}
.pri0 {font-size: 0}
.pri0:before {font-size: 12px}
.pri:before, .pri0:before{content: '?';}
.pri1{border-color: #d71319;color: #d71319;}
.pri2{border-color: #EA644A;color: #EA644A;}
.pri3{border-color: #BD7B46;color: #BD7B46;}
@@ -546,8 +549,6 @@ body {color:#141414; padding-bottom: 40px;}
.outer .table thead tr th.text-left {text-align: left;}
.outer .table tbody td {vertical-align: middle;}
.outer .table th {vertical-align: middle;}
.outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 10px}
.outer .table tr > th:last-child, .outer .table tr > td:last-child {padding-right: 10px}
.outer .table.table-form tr > th:last-child, .outer .table.table-form tr > td:last-child {padding-right: 5px}
.outer .table.table-form.table-fixed tr > th:last-child, .outer .table.table-form.table-fixed tr > td:last-child {padding-right: 15px}
.outer .table tbody > tr:last-child td {border-bottom: 1px solid #e5e5e5;}
@@ -567,11 +568,14 @@ body {color:#141414; padding-bottom: 40px;}
.outer .table tfoot .chosen-container-single .chosen-single abbr {top: 4px;}
.table-actions {float: left;}
.table-actions > .checkbox {float: left; margin: 0}
.table-actions > .btn-group, .table-actions > .btn, .table-actions > .input-group, .table-actions > .text {float: left; margin-right: 6px;}
.table-actions > .btn-group, .table-actions > .btn, .table-actions > .input-group, .table-actions > .text {float: left; margin-right: 5px;}
.table-actions > .text {line-height: 24px; color: #808080}
.table-actions > .text strong {color: #333}
.outer .table tfoot .pager {margin: -3px 0;}
.table .cell-id {text-align: left; padding-left: 12px!important;}
.datatable .table > tbody > tr > td.check-btn, .datatable .table > thead > tr > th.check-btn {padding-left: 12px!important; padding-right: 0; text-align: left;}
/* color of a when visited */
.outer .table tbody td > a:visited, #crumbs > a:visited, .side > a:visited {color: #551A8B}
@@ -598,7 +602,7 @@ body {color:#141414; padding-bottom: 40px;}
.outer .main ul.list-unstyled li {padding: 2px 0}
.outer .main .table tr > th:first-child, .outer .main .table tr > td:first-child {padding-left: 0;}
.outer .main-side > fieldset {padding: 5px 20px 10px 10px;}
.outer .main-side > fieldset {padding: 5px 0px 10px 10px;}
.outer .main-side > fieldset > .table {border: none}
.outer .main .tabs {margin-bottom: 15px;}
@@ -612,8 +616,9 @@ body {color:#141414; padding-bottom: 40px;}
.outer.with-side #featurebar, .outer.with-side #titlebar {margin-bottom: 20px;}
.outer.with-side .main, .outer.with-side .side + form, .outer.with-side .main, .outer.with-side .side + table {margin-left: 212px; margin-right: 0;}
.outer.with-side.with-transition .main, .outer.with-side.with-transition .side + form, .outer.with-side.with-transition .main, .outer.with-side.with-transition .side + table {transition: all 0.3s;}
.outer.with-side .table tr > th:first-child, .outer.with-side .table tr > td:first-child {padding-left: 8px}
.outer.with-side .table tr > th:last-child, .outer.with-side .table tr > td:last-child {padding-right: 8px}
.outer.with-side .table tr > th:first-child, .outer.with-side .table tr > td:first-child {padding-left: 5px}
.outer.with-side .table tr > th:first-child, .outer.with-side .table tr > td:first-child .table-actions {padding-left: 0;}
.outer.with-side .table tr > th:last-child, .outer.with-side .table tr > td:last-child {padding-right: 5px}
.outer .side {width: 192px; position: absolute; left: 20px;}
.outer .side-body {overflow: hidden;}
.outer .side-body .panel {min-width: 180px;}
@@ -645,7 +650,7 @@ body {color:#141414; padding-bottom: 40px;}
.pager > .dropdown > a, .pager > i, .pager > a {display: inline-block; position: relative; padding: 5px; min-width: 25px; text-align: center; margin-left: -5px;}
.pager .dropdown > a:hover, .pager > a:hover {background: #e5e5e5;}
.pager .dropdown-menu {margin-top: 0; width: 212px; margin-left: -5px; padding: 0;}
.pager .dropdown-menu > li {display: block; float: left; width: 70px; border-right: 1px dotted #ddd; border-bottom: 1px dotted #ddd}
.pager .dropdown-menu > li {display: block; float: left; width: 70px; border-right: 1px dotted #ddd; border-bottom: 1px dotted #ddd;}
#_pageID, #goto {display: none}
/* modal */