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

* remove default text from chosen.

Browse Source 
* fixed css class of some tables.
 * ajusted style of form.
 * ajusted ui of searchbox.
This commit is contained in:
Catouse
2014-04-25 16:20:36 +08:00
parent 770825e370
commit fde4ff5610
30 changed files with 111 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/browse.custom.html.php
+1 -1
View File
@@ -14,7 +14,7 @@
</div>
<div class='main'>
<form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='bugList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='bugList'>
<?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<thead>
<tr>
module/bug/view/browse.html.php
+1 -1
View File
@@ -88,7 +88,7 @@ if($customed)
</div>
<div class='main'>
<form method='post'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='bugList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='bugList'>
<?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<thead>
<tr>
module/bug/view/edit.html.php
+1 -1
View File
@@ -36,7 +36,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<small><?php echo html::icon($lang->icons['edit']) . ' ' . $lang->bug->edit;?></small>
</div>
<div class='actions'>
<?php echo html::submitButton(html::icon('save') . ' ' . $lang->save)?>
<?php echo html::submitButton($lang->save)?>
</div>
</div>
<div class='row'>
module/common/lang/zh-cn.php
+1 -1
View File
@@ -365,7 +365,7 @@ $lang->zentaoSite = "官方网站";
$lang->chinaScrum = "<a href='http://api.zentao.net/goto.php?item=chinascrum' target='_blank'>Scrum社区</a>&nbsp; ";
$lang->agileTraining = "<a href='http://api.zentao.net/goto.php?item=agiletrain' target='_blank'>培训</a> ";
$lang->donate = "<a href='http://api.zentao.net/goto.php?item=donate' target='_blank'>捐赠 </a>";
$lang->proVersion = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' class='text-danger'>升至专业版!</a>&nbsp; ";
$lang->proVersion = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'><strong class='small text-danger'>PRO</strong> 升至专业版!</a> &nbsp; ";
$lang->downNotify = "下载桌面提醒";
$lang->suhosinInfo = "警告：数据太多，请在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>（设置更大的数）。 保存并重新启动apache，否则会造成部分数据无法保存。";
module/common/model.php
+10 -1
View File
@@ -412,9 +412,18 @@ class commonModel extends model
{
$searchObject = $methodName;
}
if(empty($lang->searchObjects[$searchObject])) $searchObject = 'bug';
echo "<div class='input-group input-group-sm' id='searchbox'>";
echo html::select('searchType', $lang->searchObjects, $searchObject, "class='form-control'");
echo "<div class='input-group-btn' id='typeSelector'>";
echo "<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span id='searchTypeName'>" . $lang->searchObjects[$searchObject] . "</span> <span class='caret'></span></button>";
echo html::hidden('searchType', $searchObject);
echo "<ul class='dropdown-menu'>";
foreach ($lang->searchObjects as $key => $value)
{
echo "<li><a href='javascript:;' data-value='{$key}'>{$value}</a></li>";
}
echo '</ul></div>';
echo html::input('searchQuery', '', "onclick='this.value=\"\"' onkeydown='if(event.keyCode==13) shortcut()' class='form-control' placeholder='" . $lang->searchTips . "'");
echo "<div id='objectSwitcher' class='input-group-btn'><a href='javascript:shortcut();' class='btn'>GO! </a></div>";
echo "</div>\n";
module/common/view/chosen.html.php
+1 -3
View File
@@ -9,9 +9,7 @@ if($config->debug)
<script>
noResultsMatch = '<?php echo $lang->noResultsMatch;?>';
chooseUsersToMail = '<?php echo $lang->chooseUsersToMail;?>';
selectAnOption = '<?php echo $lang->selectAnOption;?>';
selectSomeOptions = '<?php echo $lang->selectSomeOptions;?>';
defaultChosenOptions = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 10, width: '100%', placeholder_text_single: selectAnOption, placeholder_text_multiple: selectSomeOptions, search_contains: true};
defaultChosenOptions = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 10, width: '100%', placeholder_text_single: ' ', placeholder_text_multiple: ' ', search_contains: true};
$(document).ready(function()
{
$("#mailto").attr('data-placeholder', chooseUsersToMail);
module/company/view/browse.html.php
+1 -1
View File
@@ -34,7 +34,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 table-borderless tablesorter table-fixed' id='userList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='userList'>
<thead>
<tr class='colhead'>
<?php $vars = "param=$param&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
module/company/view/dynamic.html.php
+1 -1
View File
@@ -35,7 +35,7 @@ var browseType = '<?php echo $browseType;?>';
<div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
</div>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<thead>
<tr class='colhead'>
<th class='w-150px'><?php echo $lang->action->date;?></th>
module/doc/view/browse.html.php
+1 -1
View File
@@ -43,7 +43,7 @@ var browseType = '<?php echo $browseType;?>';
</div>
</div>
<div class='main'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='docList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='docList'>
<thead>
<tr>
<?php $vars = "libID=$libID&module=$moduleID&productID=$productID&projectID=$projectID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
module/group/view/browse.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
<?php endif;?>
</div>
</div>
<table align='center' class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='groupList'>
<table align='center' class='table table-condensed table-hover table-striped tablesorter table-fixed' id='groupList'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->group->id;?></th>
module/product/view/browse.html.php
+1 -1
View File
@@ -69,7 +69,7 @@
</div>
<div class='main'>
<form method='post' id='productStoryForm'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='storyList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='storyList'>
<thead>
<tr>
<?php $vars = "productID=$productID&browseType=$browseType&param=$moduleID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
module/productplan/view/linkbug.html.php
+2 -2
View File
@@ -25,7 +25,7 @@
<div id='querybox'></div>
<div id='bugList'>
<form method='post' id='unlinkedBugsForm'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong></caption>
<thead>
<tr class='colhead'>
@@ -69,7 +69,7 @@
</form>
<hr class='mg-0'>
<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug');?>" id='linkedBugsForm'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<caption class='text-left text-important'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->linkedBugs;?></strong> (<?php echo count($planBugs);?>)</caption>
<thead>
<tr class='colhead'>
module/productplan/view/linkstory.html.php
+2 -2
View File
@@ -23,7 +23,7 @@
</div>
<div id='storyList'>
<form method='post' id='unlinkedStoriesForm'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong></caption>
<thead>
<tr>
@@ -71,7 +71,7 @@
</form>
<hr class='mg-0'>
<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkStory');?>" id='linkedStoriesForm'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<caption class='text-left text-important'><?php echo html::icon('link');?> &nbsp;<strong><?php echo $lang->productplan->linkedStories;?></strong> (<?php echo count($planStories);?>)</caption>
<thead>
<tr class='colhead'>
module/project/view/bug.html.php
+1 -1
View File
@@ -20,7 +20,7 @@
<?php common::printIcon('bug', 'create', "productID=$productID&extra=projectID=$project->id");?>
</div>
</div>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='bugList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='bugList'>
<thead>
<tr>
<?php $vars = "projectID={$project->id}&orderBy=%s&build=$buildID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
module/project/view/task.html.php
+1 -1
View File
@@ -41,7 +41,7 @@ var browseType = '<?php echo $browseType;?>';
</div>
<div class='main'>
<form method='post' id='projectTaskForm'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='taskList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='taskList'>
<?php $vars = "projectID=$project->id&status=$status&parma=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
<thead>
<tr>
module/story/view/edit.html.php
+2 -2
View File
@@ -19,7 +19,7 @@
<small><?php echo html::icon($lang->icons['edit']) . ' ' . $lang->story->edit;?></small>
</div>
<div class='actions'>
<?php echo html::submitButton(html::icon('save') . ' ' . $lang->save)?>
<?php echo html::submitButton($lang->save)?>
</div>
</div>
<div class='row'>
@@ -41,7 +41,7 @@
</fieldset>
<div class='actions'>
<?php
echo html::submitButton(html::icon('save') . ' ' . $lang->save);
echo html::submitButton($lang->save);
echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));
?>
</div>
module/story/view/view.html.php
+14 -32
View File
@@ -101,6 +101,7 @@
<ul class='nav nav-tabs'>
<li class='active'><a href='#legendBasicInfo' data-toggle='tab'><?php echo $lang->story->legendBasicInfo;?></a></li>
<li><a href='#legendProjectAndTask' data-toggle='tab'><?php echo $lang->story->legendProjectAndTask;?></a></li>
<li><a href='#legendLifeTime' data-toggle='tab'><?php echo $lang->story->legendLifeTime;?></a></li>
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendBasicInfo'>
@@ -156,6 +157,10 @@
<th><?php echo $lang->story->keywords;?></th>
<td><?php echo $story->keywords;?></td>
</tr>
<tr>
<th><?php echo $lang->story->legendMailto;?></th>
<td><?php $mailto = explode(',', $story->mailto); foreach($mailto as $account) {if(empty($account)) continue; echo "<span>" . $users[trim($account)] . '</span> &nbsp;'; }?></td>
</tr>
</table>
</div>
<div class='tab-pane' id='legendProjectAndTask'>
@@ -174,16 +179,7 @@
?>
</ul>
</div>
</div>
</div>
<div class='tabs'>
<ul class='nav nav-tabs'>
<li class='active'><a href='#legendLifeTime' data-toggle='tab'><?php echo $lang->story->legendLifeTime;?></a></li>
<li><a href='#legendFromBug' data-toggle='tab'><?php echo $lang->story->legendFromBug;?></a></li>
<li><a href='#legendMailto' data-toggle='tab'><?php echo $lang->story->legendMailto;?></a></li>
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendLifeTime'>
<div class='tab-pane' id='legendLifeTime'>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th class='w-70px'><?php echo $lang->story->openedBy;?></th>
@@ -223,16 +219,6 @@
</tr>
</table>
</div>
<div class='tab-pane' id='legendFromBug'>
<ul class='list-unstyled'>
<?php
if(!empty($fromBug)) echo "<li title='#$fromBug->id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id"), "#$fromBug->id $fromBug->title") . '</li>';
?>
</ul>
</div>
<div class='tab-pane' id='legendMailto'>
<ul class='list-inline'><?php $mailto = explode(',', $story->mailto); foreach($mailto as $account) {if(empty($account)) continue; echo "<li><i class='icon-user'></i> " . $users[trim($account)] . '</li>'; }?></ul>
</div>
</div>
</div>
<div class='tabs'>
@@ -240,20 +226,22 @@
<li class='active'><a href='#legendBugs' data-toggle='tab'><?php echo $lang->story->legendBugs;?></a></li>
<li><a href='#legendCases' data-toggle='tab'><?php echo $lang->story->legendCases;?></a></li>
<li><a href='#legendLinkStories' data-toggle='tab'><?php echo $lang->story->legendLinkStories;?></a></li>
<li><a href='#legendChildStories' data-toggle='tab'><?php echo $lang->story->legendChildStories;?></a></li>
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendBugs'>
<ul class='list-unstyled'>
<ul class='list-unstyled'>
<?php
foreach($bugs as $bug)
if(!empty($fromBug)) echo "<li title='#$fromBug->id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id"), "#$fromBug->id $fromBug->title") . " <span class='label label-warning'>{$lang->story->legendFromBug}</span></li>";
?>
<?php
foreach($cases as $case)
{
echo "<li title='#$bug->id $bug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$bug->id"), "#$bug->id $bug->title") . '</li>';
echo "<li title='#$case->id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id"), "#$case->id $case->title") . '</li>';
}
?>
</ul>
</div>
<div class='tab-pane' id='legendBugs'>
<div class='tab-pane' id='legendCases'>
<ul class='list-unstyled'>
<?php
foreach($cases as $case)
@@ -271,16 +259,10 @@
{
if(isset($story->extraStories[$linkStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '</li>';
}
?>
</ul>
</div>
<div class='tab-pane' id='legendChildStories'>
<ul class='list-unstyled'>
<?php
$childStories = explode(',', $story->childStories) ;
foreach($childStories as $childStoryID)
{
if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . '</li>';
if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . " <span class='label label-info'>{$lang->story->legendChildStories}</span></li>";
}
?>
</ul>
module/task/css/recordestimate.css
+1 -1
View File
@@ -1 +1 @@
body {padding-bottom: 200px !important;}
body {padding-bottom: 140px !important;}
module/task/view/edit.html.php
+6 -6
View File
@@ -25,7 +25,7 @@
<small><?php echo html::icon($lang->icons['edit']) . ' ' . $lang->task->edit;?></small>
</div>
<div class='actions'>
<?php echo html::submitButton(html::icon('save') . ' ' . $lang->save)?>
<?php echo html::submitButton($lang->save)?>
</div>
</div>
<div class='row'>
@@ -34,22 +34,22 @@
<div class='form-group'>
<?php echo html::input('name', $task->name, 'class="form-control" placeholder="' . $lang->task->name . '"');?>
</div>
<fieldset>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->task->desc;?></legend>
<div class='form-group'>
<?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows='8' class='form-control'");?>
</div>
</fieldset>
<fieldset>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->comment;?></legend>
<div class='form-group'><?php echo html::textarea('comment', '', "rows='5' class='form-control'");?></div>
</fieldset>
<fieldset>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->files;?></legend>
<div class='form-group'><?php echo $this->fetch('file', 'buildform');?></div>
</fieldset>
<div class='actions'>
<?php echo html::submitButton(html::icon('save') . ' ' . $lang->save) . html::linkButton($lang->goback, $this->inlink('view', "taskID=$task->id")) .html::hidden('consumed', $task->consumed);?>
<div class='actions actions-form'>
<?php echo html::submitButton($lang->save) . html::linkButton($lang->goback, $this->inlink('view', "taskID=$task->id")) .html::hidden('consumed', $task->consumed);?>
</div>
<?php include '../../common/view/action.html.php';?>
</div>
module/task/view/finish.html.php
+1 -1
View File
@@ -32,7 +32,7 @@
</tr>
<tr>
<th><?php echo $lang->task->finishedDate;?></th>
<td><div class='datepicker-wrapper'><?php echo html::input('finishedDate', helper::today(), "class='form-control form-datetime'");?></div></td><td></td>
<td><div class='datepicker-wrapper'><?php echo html::input('finishedDate', helper::today(), "class='form-control form-date'");?></div></td><td></td>
</tr>
<tr>
module/task/view/recordestimate.html.php
+1 -1
View File
@@ -65,7 +65,7 @@
<?php for($i = 1; $i <= 5; $i++):?>
<tr class="text-center">
<td><?php echo $i . html::hidden("id[$i]", $i);?></td>
<td><?php echo html::input("dates[$i]", '', "class='form-control text-center form-datetime'");?></td>
<td><?php echo html::input("dates[$i]", '', "class='form-control text-center form-date'");?></td>
<td><?php echo html::input("consumed[$i]", '', "class='form-control text-center'");?></td>
<td><?php echo html::input("left[$i]", '', "class='form-control text-center left'");?></td>
<td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' rows='1'");?></td>
module/task/view/start.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->task->realStarted;?></th>
<td class='w-p25-f'><div class='datepicker-wrapper'><?php echo html::input('realStarted', helper::today(), "class='form-control form-datetime'");?></div></td><td></td>
<td class='w-p25-f'><div class='datepicker-wrapper'><?php echo html::input('realStarted', helper::today(), "class='form-control form-date'");?></div></td><td></td>
</tr>
<tr>
<th><?php echo $lang->task->consumed;?></th>
module/testcase/view/batchcreate.html.php
+3 -1
View File
@@ -48,7 +48,9 @@
<td><?php echo html::input("title[$i]", '', "class='form-control'");?></td>
</tr>
<?php endfor;?>
<tr><td colspan='<?php $story ? print '4' : print '5'?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
<tfoot>
<tr><td colspan='<?php $story ? print '4' : print '5'?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</tfoot>
</table>
</form>
<?php include '../../common/view/footer.html.php';?>
module/testcase/view/batchedit.html.php
+3 -1
View File
@@ -46,7 +46,9 @@
<?php if(isset($suhosinInfo)):?>
<tr><td colspan='<?php echo $this->config->testcase->batchEdit->columns;?>'><div class='alert alert-info'><?php echo $suhosinInfo;?></div></td></tr>
<?php endif;?>
<tr><td colspan='<?php echo $this->config->testcase->batchEdit->columns;?>' class='text-center'><?php echo html::submitButton();?></td></tr>
<tfoot>
<tr><td colspan='<?php echo $this->config->testcase->batchEdit->columns;?>' class='text-center'><?php echo html::submitButton();?></td></tr>
</tfoot>
</table>
</form>
<?php include '../../common/view/footer.html.php';?>
module/testcase/view/browse.html.php
+1 -1
View File
@@ -71,7 +71,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
</div>
<div class='main'>
<form id='batchForm' method='post'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='caseList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='caseList'>
<?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<thead>
<tr>
module/testcase/view/edit.html.php
+8 -8
View File
@@ -21,10 +21,10 @@
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testcase']);?> <strong><?php echo $case->id;?></strong></span>
<strong><?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id"), $case->title);?></strong>
<small><?php echo html::icon($lang->icons['edit']) . ' ' . $lang->case->edit;?></small>
<small><?php echo $lang->case->edit;?></small>
</div>
<div class='actions'>
<?php echo html::submitButton(html::icon('save') . ' ' . $lang->save)?>
<?php echo html::submitButton($lang->save)?>
</div>
</div>
<div class='row'>
@@ -33,11 +33,11 @@
<div class='form-group'>
<?php echo html::input('title', $case->title, 'class="form-control" placeholder="' . $lang->case->title . '"');?>
</div>
<fieldset>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->testcase->precondition;?></legend>
<div class='form-group'><?php echo html::textarea('precondition', $case->precondition, "rows='4' class='form-control'");?></div>
</fieldset>
<fieldset>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->testcase->steps;?></legend>
<div class='form-group'>
<table class='table table-form'>
@@ -68,17 +68,17 @@
</table>
</div>
</fieldset>
<fieldset>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->testcase->legendComment;?></legend>
<div class='form-group'><?php echo html::textarea('comment', '', "rows='5' class='form-control'");?></div>
</fieldset>
<fieldset>
<fieldset class='fieldset-pure'>
<legend><?php echo $lang->testcase->legendAttatch;?></legend>
<div class='form-group'><?php echo $this->fetch('file', 'buildform', 'filecount=2');?></div>
</fieldset>
<div class='actions'>
<div class='text-center mgb-20'>
<?php echo html::submitButton();?>
<input type='button' value='<?php echo $lang->testcase->buttonToList;?>' class='button-s' onclick='location.href="<?php echo $this->createLink('testcase', 'browse', "productID=$productID");?>"' />
<input type='button' value='<?php echo $lang->testcase->buttonToList;?>' class='btn' onclick='location.href="<?php echo $this->createLink('testcase', 'browse', "productID=$productID");?>"' />
</div>
<?php include '../../common/view/action.html.php';?>
</div>
module/testtask/view/cases.html.php
+1 -1
View File
@@ -55,7 +55,7 @@ var moduleID = '<?php echo $moduleID;?>';
<div class='main'>
<form method='post' name='casesform'>
<?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 table-borderless tablesorter table-fixed' id='caseList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='caseList'>
<thead>
<tr class='colhead'>
<th class='w-id'><nobr><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></nobr></th>
module/testtask/view/linkcase.html.php
+1 -1
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 table-borderless tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<caption class='text-left text-special'>
<?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->testtask->unlinkedCases;?></strong> (<?php echo count($cases);?>)
</caption>
www/js/my.full.js
+18 -18
View File
@@ -48,6 +48,22 @@ function createLink(moduleName, methodName, vars, viewType, isOnlyBody)
return link;
}
/**
* Bind Event for searchbox
*
*/
function setSearchBox()
{
$('#typeSelector a').click(function()
{
$('#typeSelector li.active').removeClass('active');
var $this = $(this);
$this.closest('li').addClass('active');
$("#searchType").val($this.data('value'));
$("#searchTypeName").text($this.text());
});
}
/**
* Go to the view page of one object.
*
@@ -397,22 +413,6 @@ function setOuterBox()
resetOuterHeight();
}
/**
* Set the css of the iframe.
*
* @param string $color
* @access public
* @return void
*/
function setDebugWin(color)
{
if($.browser.msie && $('.debugwin').size() == 1)
{
var debugWin = $(".debugwin")[0].contentWindow.document;
$("body", debugWin).append("<style>body{background:" + color + "}</style>");
}
}
/**
* Disable the submit button when submit form.
*
@@ -1039,7 +1039,7 @@ function setModal4List(colorboxClass, replaceID, callback, width, height)
function setTableBehavior()
{
$('#wrap .table:not(.table-data, .table-form, .active-disabled) tbody tr:not(.active-disabled) td').click(function(){$(this).closest('tr').toggleClass('active');});
$('#wrap .outer > .table, #wrap .outer > form > .table, #wrap .outer > .mian > .table, #wrap .outer > .mian > form > .table, #wrap .outer > .container > .table').not('.table-data, .table-form').addClass('table table-condensed table-hover table-striped table-borderless tablesorter');
$('#wrap .outer > .table, #wrap .outer > form > .table, #wrap .outer > .mian > .table, #wrap .outer > .mian > form > .table, #wrap .outer > .container > .table').not('.table-data, .table-form').addClass('table table-condensed table-hover table-striped tablesorter');
}
/**
@@ -1086,7 +1086,7 @@ $(document).ready(function()
setTableBehavior();
setForm();
saveWindowSize();
setDebugWin('white');
setSearchBox();
setOuterBox();
setRequiredFields();
www/theme/default/style.css
+24 -34
View File
@@ -164,6 +164,14 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
.nav-tabs > li > a {padding: 5px 10px; color: #333}
.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {color: #333; font-weight: bold; line-height: 20px}
.tab-content {border: 1px solid #ddd; border-top: 0; padding: 10px 10px}
.tab-pane > h6 {margin-top: 0; margin-bottom: 3px;}
/* fieldset */
fieldset {margin-bottom: 15px; border: 1px solid #e5e5e5; padding: 10px 15px 15px;}
fieldset.fieldset-pure {background: none; padding: 0; border: none; padding-top: 5px;}
fieldset.collapsed {border: none}
fieldset > legend {width: auto; margin: 0 0 0 -5px; font-size: 13px; font-weight: bold; border-bottom: none; padding: 0 5px}
fieldset > .form-group {margin-bottom: 0;}
/* === Views === */
/* Table form */
@@ -201,15 +209,6 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
.form-condensed .table-form > tfoot td {padding-bottom: 10px!important; border-top: none!important}
.form-condensed .table-form > tfoot td[colspan] {text-align: center;}
.form-condensed .table-form > tfoot td > .btn {margin-right: 10px;}
.form-condensed fieldset {padding: 2px 15px 2px 5px; margin-bottom: 10px; margin-top: 35px; border-radius: 2px; position: relative;}
.form-condensed fieldset.fieldset-primary {background-color: transparent; padding: 0; margin-top: 0;}
.form-condensed fieldset .table-form {margin-bottom: 0;}
.form-condensed fieldset.collapsed, .form-condensed fieldset.fieldset-pure.collapsed {padding: 1px!important; background: #eee!important}
.form-condensed fieldset.collapsed .table-form, .form-condensed fieldset.collapsed .article-content, .form-condensed fieldset.collapsed .form-group, .form-condensed fieldset.collapsed #historyItem {display: none}
.form-condensed legend {font-size: 12px; font-weight: bold; padding: 5px; position: absolute; top: -25px; left: 0; cursor: pointer; line-height: 14px; vertical-align: top; color: #666; background: #f1f1f1;}
.form-condensed .fieldset-pure legend{top: -20px}
.form-condensed legend:hover {color: #333;}
.form-condensed .chosen-container-single .chosen-single {padding: 4px 10px; height: 30px}
.form-condensed .chosen-container-single .chosen-single div {padding: 4px 10px}
.form-condensed .chosen-container-multi .chosen-choices {min-height: 30px}
@@ -221,7 +220,6 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
.form-condensed .chosen-container-single .chosen-single {padding: 5px 10px}
.form-condensed .chosen-container-single .chosen-single abbr {top: 5px; right: 18px}
.form-condensed .chosen-container-single .chosen-search:before {top: 10px}
.form-condensed fieldset > .form-group {margin-bottom: 0;}
/* help in form */
.help-block {margin-bottom: 5px;}
@@ -268,7 +266,6 @@ div.form-control[contenteditable='true'] {height: auto; text-align: left; outlin
.list-group-item.active,.list-group-item.active:hover {background: #fff; border-color: #ddd; background: #f1f1f1; color: #333; font-weight: bold;}
.list-group-item.active > a {color: #333}
/* File form */
.fileBox {margin-bottom: 10px; width: 100%}
#fileform > .fileBox:last-child {margin-bottom: 0;}
@@ -300,19 +297,17 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#companyname a {display: inline-block; margin-left: 4px; font-size: 12px}
#mainmenu {margin-top: 12px; width: 100%; position: relative;}
#mainmenu li {float: left;}
#mainmenu li > a {display: block; margin-right: 3px; white-space:nowrap; padding:7px 15px; color:#E5E5E5; font-size: 14px; background:#114f8e;-webkit-box-shadow: 0 -3px 3px rgba(0, 0, 0, 0.10);box-shadow: 0 -3px 3px rgba(0, 0, 0, 0.10);}
#mainmenu li > a:hover{background-color: #2e6dad;color: #fff;-webkit-box-shadow: 0 -3px 5px rgba(0, 0, 0, 0.2);box-shadow: 0 -3px 5px rgba(0, 0, 0, 0.2);}
#mainmenu li.active > a { background-color:#e5e5e5;color:#21841d; font-weight:bold;}
#searchbox {position: absolute; right: 0; top: 1px; width: 220px; border-radius: 12px; overflow: hidden;}
#searchbox.input-group .form-control, #searchbox.input-group .btn {width: 50%; padding: 2px 5px; line-height: 20px; height: 24px;border-top: 0; border-bottom: 0; float: left; display: block;}
#searchbox.input-group .btn {height: 24px; width: 40px; color: #666}
#searchbox .form-control {color: #666; border-left: 0}
#searchbox input.form-control {border-right: 0;}
#searchbox .btn, #searchbox .form-control {border-radius: 0}
#searchbox .btn {margin-left: -1px\0;}
#mainmenu .nav > li {float: left;}
#mainmenu .nav > li > a {display: block; margin-right: 3px; white-space:nowrap; padding:7px 15px; color:#E5E5E5; font-size: 14px; background:#114f8e;-webkit-box-shadow: 0 -3px 3px rgba(0, 0, 0, 0.10);box-shadow: 0 -3px 3px rgba(0, 0, 0, 0.10);}
#mainmenu .nav > li > a:hover{background-color: #2e6dad;color: #fff;-webkit-box-shadow: 0 -3px 5px rgba(0, 0, 0, 0.2);box-shadow: 0 -3px 5px rgba(0, 0, 0, 0.2);}
#mainmenu .nav > li.active > a { background-color:#e5e5e5;color:#21841d; font-weight:bold;}
#searchbox {position: absolute; right: 0; top: 1px; width: 200px; border-radius: 12px;}
#searchbox .form-control, #searchbox .btn {padding: 2px 5px; line-height: 20px; height: 24px;border-top: 0; border-bottom: 0; float: left; display: block;}
#typeSelector .btn{padding-left: 10px; border-radius: 12px 0 0 12px}
#objectSwitcher .btn{padding-right: 10px; border-radius: 0 12px 12px 0; margin-left: -1px\0;}
#searchbox .dropdown-menu {margin-top: -1px; width: 212px; padding: 0;}
#searchbox .dropdown-menu > li {float: left; width: 105px; border-bottom: 1px dotted #ddd; border-right: 1px dotted #ddd}
/* Module menu. */
#modulemenu {background-color: #e5e5e5; margin: 0 -20px; padding: 0 20px; font-size: 14px; position: relative; height: 40px;}
#modulemenu .nav > li {line-height: 30px; padding:5px 0px 1px;display: block; float: left; color: #808080}
@@ -406,15 +401,15 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#titlebar > .heading > .prefix > i {font-size: 14px; color: #808080; display: none}
#titlebar > .heading > strong {display: inline-block; margin-right: 5px;}
#titlebar > .heading > strong > i, #titlebar > .heading > strong > small > i {display: none}
#titlebar > .heading > small > i {position: relative; top: 1px;}
#titlebar > .heading > small > i {position: relative; top: 1px; display: none}
#titlebar .actions {position: absolute; right: 20px; top: 8px;}
#titlebar .actions > .btn, #titlebar .actions > .btn-group {margin-left: 8px;}
#titlebar .actions > .text {display: inline-block; margin-left: 8px; line-height: 30px}
/* Button in titlebar and featurebar */
#titlebar > .actions .btn {padding-top: 4px; padding-bottom: 4px;}
#featurebar > .actions .btn:not(.btn-primary), #titlebar > .actions .btn:not(.btn-primary), .main > .actions .btn:not(.btn-primary) {border-color: transparent; background: none; box-shadow: none; padding: 4px 7px; border-radius: 2px; text-shadow: none; color: #036}
#featurebar > .actions .btn:not(.btn-primary):hover, #titlebar > .actions .btn:not(.btn-primary):hover, .main > .actions .btn:not(.btn-primary):hover {background: #ddd; border-color: #ddd; color: #333}
#featurebar > .actions .btn:not(.btn-primary), #titlebar > .actions .btn:not(.btn-primary), .main > .actions:not(.actions-form) .btn:not(.btn-primary) {border-color: transparent; background: none; box-shadow: none; padding: 4px 7px; border-radius: 2px; text-shadow: none; color: #036}
#featurebar > .actions .btn:not(.btn-primary):hover, #titlebar > .actions .btn:not(.btn-primary):hover, .main > .actions:not(.actions-form) .btn:not(.btn-primary):hover {background: #ddd; border-color: #ddd; color: #333}
/* Following style to fixed ie8 */
#featurebar > .actions .btn, #titlebar > .actions .btn {border-color: transparent\0; background: none\0; box-shadow: none\0; padding: 4px 8px\0;}
@@ -466,22 +461,17 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
.outer > .container > .table-data {margin: 10px 0}
/* Main content in outer */
.outer .row {padding: 15px 20px;}
.outer .container > .main {padding: 10px 20px}
.outer .main fieldset {margin-bottom: 15px; border: 1px solid #e5e5e5; padding: 10px 15px 15px;}
.outer .main fieldset.fieldset-pure {background: none; padding: 0; border: none}
.outer .main fieldset.collapsed {border: none}
.outer .main fieldset > legend {width: auto; margin: 0 0 0 -5px; font-size: 13px; font-weight: bold; border-bottom: none; padding: 0 5px}
.outer .main .article-content {font-size: 14px; padding: 0}
.outer .main .actions {text-align: center;}
.outer .main .actions + .tabs {margin-top: 20px;}
.outer .main .actions {text-align: center; margin-bottom: 20px;}
.outer .main .actions > .btn, .outer .main .actions > .btn-group {margin: 0 4px}
.outer .main ul.list-unstyled:last-child {margin-bottom: 0;}
.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 15px 10px;}
.outer .main-side > fieldset {padding: 5px 20px 10px 10px;}
.outer .main-side > fieldset > .table {border: none}
.outer .main .tabs {margin-bottom: 15px;}