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

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

Browse Source
This commit is contained in:
Catouse
2018-05-18 11:33:08 +08:00
parent 69ebbbc0f6 7ede06b0dd
commit 5295dbef07
7 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+7 -7
View File
@@ -256,13 +256,13 @@ class commonModel extends model
echo "<li class='divider'></li>";
}
echo "<li class='dropdown-submenu'>";
echo "<a href='javascript:;'>" . $lang->theme . "</a><ul class='dropdown-menu pull-left'>";
foreach($app->lang->themes as $key => $value)
{
echo "<li " . ($app->cookie->theme == $key ? "class='selected'" : '') . "><a href='javascript:selectTheme(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
}
echo '</ul></li>';
//echo "<li class='dropdown-submenu'>";
//echo "<a href='javascript:;'>" . $lang->theme . "</a><ul class='dropdown-menu pull-left'>";
//foreach($app->lang->themes as $key => $value)
//{
// echo "<li " . ($app->cookie->theme == $key ? "class='selected'" : '') . "><a href='javascript:selectTheme(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
//}
//echo '</ul></li>';
echo "<li class='dropdown-submenu'>";
echo "<a href='javascript:;'>" . $lang->lang . "</a><ul class='dropdown-menu pull-left'>";
module/doc/view/browse.html.php
+1 -1
View File
@@ -54,7 +54,7 @@ var browseType = '<?php echo $browseType;?>';
<th class="c-user"><?php echo $lang->doc->addedBy;?></th>
<th class="c-datetime"><?php echo $lang->doc->addedDate;?></th>
<th class="c-datetime"><?php echo $lang->doc->editedDate;?></th>
<th class="c-actions"></th>
<th class="c-actions"><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
module/story/css/edit.css
-1
View File
@@ -1,4 +1,3 @@
.col-side .chosen-container .chosen-drop {width: 216px!important}
.col-side .chosen-container {width: 218px!important}
#linkStoriesBox > li ,#childStoriesBox > li {margin-left:-56px}
.table-form>tbody>tr>th{padding-top:7px;}
module/story/view/activate.html.php
+3 -4
View File
@@ -43,11 +43,10 @@
<td colspan='2'><?php echo html::textarea('comment', '', 'rows=5 class="area-1"');?></td>
</tr>
<tr>
<td></td>
<td colspan='2'>
<td colspan='3' class='text-center'>
<?php
echo html::submitButton(html::icon($lang->icons['activate']) . ' ' . $lang->story->activate, '', 'btn btn-success');
echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));
echo html::submitButton($lang->story->activate, '', 'btn btn-wide btn-success');
echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), '', '', 'btn btn-wide');
?>
</td>
</tr>
module/story/view/linkstory.html.php
+1 -1
View File
@@ -67,7 +67,7 @@
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php if($storyCount) echo html::submitButton();?>
<?php if($storyCount) echo html::submitButton('', '', 'btn btn-default');?>
</div>
<?php echo html::hidden('story', $story->id);?>
</div>
module/testsuite/view/library.html.php
+8 -10
View File
@@ -22,7 +22,6 @@ js::set('flow', $this->config->global->flow);
<?php if($this->config->global->flow == 'onlyTest'):?>
<style>
.nav > li > .btn-group > a, .nav > li > .btn-group > a:hover, .nav > li > .btn-group > a:focus{background: #1a4f85; border-color: #164270;}
.outer.with-side #featurebar {background: none; border: none; line-height: 0; margin: 0; min-height: 0; padding: 0; }
#querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;}
</style>
<div id='mainMenu' class='clearfix'>
@@ -91,8 +90,8 @@ js::set('flow', $this->config->global->flow);
<?php
if(common::hasPriv('testsuite', 'library'))
{
echo html::a($this->inlink('library', "libID=$libID&browseType=all"), "<span class='text'>{$lang->testcase->allCases}</span><span class='label label-light label-badge'>{$pager->recTotal}</span>", '', "id='allTab' class='btn btn-link'");
if($config->testcase->needReview or !empty($config->testcase->forceReview)) echo html::a($this->inlink('library', "libID=$libID&browseType=wait"), "<span class='text'>" . $lang->testcase->statusList['wait'] . "</span><span class='label label-light label-badge'>{$pager->recTotal}</span>", '', "id='waitTab' class='btn btn-link'");
echo html::a($this->inlink('library', "libID=$libID&browseType=all"), "<span class='text'>{$lang->testcase->allCases}</span>", '', "id='allTab' class='btn btn-link'");
if($config->testcase->needReview or !empty($config->testcase->forceReview)) echo html::a($this->inlink('library', "libID=$libID&browseType=wait"), "<span class='text'>" . $lang->testcase->statusList['wait'] . "</span>", '', "id='waitTab' class='btn btn-link'");
}
?>
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->testcase->bySearch;?></a>
@@ -151,14 +150,14 @@ js::set('flow', $this->config->global->flow);
<th class='c-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-actions-2 text-center'><?php echo $lang->actions;?></th>
<th class='w-130px text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php if($cases):?>
<?php foreach($cases as $case):?>
<tr>
<td class='cell-id'>
<td class='c-id'>
<?php if($canBatchAction):?>
<?php echo html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id)));?>
<?php else:?>
@@ -176,7 +175,7 @@ js::set('flow', $this->config->global->flow);
<td class='<?php if(isset($run)) echo $run->status;?> testcase-<?php echo $case->status?>'> <?php echo $lang->testcase->statusList[$case->status];?></td>
<td class='c-actions'>
<?php
if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'review', '', 'iframe');
if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'glasses', '', 'iframe');
common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list');
if(common::hasPriv('testcase', 'delete'))
{
@@ -252,14 +251,13 @@ js::set('flow', $this->config->global->flow);
</div>
<script>
$('#module' + moduleID).addClass('active');
$('#<?php echo $this->session->libBrowseType?>Tab').addClass('btn-active-text');
$('#<?php echo $this->session->libBrowseType?>Tab').addClass('btn-active-text').append("<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
if(flow == 'onlyTest')
{
$('#modulemenu > .nav > li.right').before($('#featurebar .submenu').html());
toggleSearch();
$('#modulemenu > .nav > li').removeClass('active');
$('#modulemenu > .nav > li[data-id=' + browseType + ']').addClass('active');
$('#subNavbar > .nav > li').removeClass('active');
$('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
}
</script>
<?php include '../../common/view/footer.html.php';?>
module/todo/view/edit.html.php
+17 -17
View File
@@ -19,8 +19,8 @@
</div>
<form class='modal-body form-horizontal' method='post' target='hiddenwin' id='dataform'>
<div class="row form-group">
<label class="col-sm-2"><?php echo $lang->todo->date;?></label>
<div class="col-sm-9">
<label class="col-sm-1"><?php echo $lang->todo->date;?></label>
<div class="col-sm-10">
<div class='input-group has-icon-right'>
<?php echo html::input('date', $todo->date, "class='form-control form-date'");?>
<label for="date" class="input-control-icon-right"><i class="icon icon-delay"></i></label>
@@ -30,8 +30,8 @@
<?php if($todo->cycle):?>
<?php $todo->config = json_decode($todo->config);?>
<div class="row form-group cycleConfig">
<label class="col-sm-2"><?php echo $lang->todo->cycleConfig;?></label>
<div class="col-sm-9">
<label class="col-sm-1"><?php echo $lang->todo->cycleConfig;?></label>
<div class="col-sm-10">
<ul class="nav nav-tabs">
<li <?php if($todo->config->type == 'day') echo "class='active'"?>><a data-tab data-type='day' href="#day"><?php echo $lang->todo->cycleDay;?></a></li>
<li <?php if($todo->config->type == 'week') echo "class='active'"?>><a data-tab data-type='week' href="#week"><?php echo $lang->todo->cycleWeek;?></a></li>
@@ -69,28 +69,28 @@
</div>
</div>
<div class="row form-group cycleConfig">
<label class="col-sm-2"><?php echo $lang->todo->deadline;?></label>
<div class="col-sm-9">
<label class="col-sm-1"><?php echo $lang->todo->deadline;?></label>
<div class="col-sm-10">
<?php echo html::input("config[end]", $todo->config->end, "class='form-control form-date'");?>
</div>
</div>
<?php endif;?>
<div class="row form-group">
<label class="col-sm-2"><?php echo $lang->todo->type;?></label>
<div class="col-sm-9 todoType">
<label class="col-sm-1"><?php echo $lang->todo->type;?></label>
<div class="col-sm-10 todoType">
<input type='hidden' name='type' value='<?php echo $todo->type;?>' />
<?php echo $lang->todo->typeList[$todo->type];?>
</div>
</div>
<div class="row form-group">
<label class="col-sm-2"><?php echo $lang->todo->pri;?></label>
<label class="col-sm-1"><?php echo $lang->todo->pri;?></label>
<div class="col-sm-2">
<?php echo html::select('pri', $lang->todo->priList, $todo->pri, "class='form-control chosen'");?>
</div>
</div>
<div class="row form-group">
<label class="col-sm-2"><?php echo $lang->todo->name;?></label>
<div class="col-sm-9">
<label class="col-sm-1"><?php echo $lang->todo->name;?></label>
<div class="col-sm-10">
<div id='nameBox'>
<?php
$readType = ($todo->type == 'bug' or $todo->type == 'task') ? 'readonly' : '';
@@ -100,19 +100,19 @@
</div>
</div>
<div class="row form-group">
<label class="col-sm-2"><?php echo $lang->todo->desc;?></label>
<div class="col-sm-9">
<label class="col-sm-1"><?php echo $lang->todo->desc;?></label>
<div class="col-sm-10">
<?php echo html::textarea('desc', htmlspecialchars($todo->desc), "rows='8' class='form-control'");?>
</div>
</div>
<div class="row form-group">
<label class="col-sm-2"><?php echo $lang->todo->status;?></label>
<label class="col-sm-1"><?php echo $lang->todo->status;?></label>
<div class="col-sm-2">
<?php echo html::select('status', $lang->todo->statusList, $todo->status, "class='form-control chosen-simple'");?>
</div>
</div>
<div class="row form-group">
<label class="col-sm-2"><?php echo $lang->todo->beginAndEnd;?></label>
<label class="col-sm-1"><?php echo $lang->todo->beginAndEnd;?></label>
<div class="col-sm-2" style='padding-right:0px'>
<?php echo html::select('begin', $times, $todo->begin, 'onchange=selectNext(); class="form-control chosen" data-drop_direction="up"')?>
</div>
@@ -127,8 +127,8 @@
</div>
</div>
<div class="row form-group">
<label class="col-sm-2"></label>
<div class="col-sm-9">
<label class="col-sm-1"></label>
<div class="col-sm-10">
<div class='checkbox-primary'>
<input type='checkbox' name='private' id='private' value='1' <?php if($todo->private) echo 'checked';?> />
<label for='private'><?php echo $lang->todo->private;?></label>