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

* adjust task #2696.

Browse Source
This commit is contained in:
chenfeiCF
2016-12-01 11:23:04 +08:00
parent 901c40a6fb
commit 8720e886e8
8 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/browse.css
+2
View File
@@ -16,3 +16,5 @@
#treebox{position:fixed;margin-left:20px;}
.outer.hide-side #treebox{margin-left:0px;}
#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;}
module/bug/view/browse.html.php
+10 -9
View File
@@ -62,24 +62,25 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
</div>
</div>
<div class='btn-group'>
<div class='btn-group btn-bug-create'>
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
<i class='icon icon-plus'></i> <?php echo $lang->bug->common;?>
<span class='caret'></span>
</button>
<ul class='dropdown-menu' id='createBugActionMenu'>
<div class='btn-group' id='createActionMenu'>
<?php
if(commonModel::isTutorialMode())
{
$wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
echo '<li>' . html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams"), $lang->bug->create) . '</li>';
echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams"), "<i class='icon-plus'></i>" . $lang->bug->create, '', "class='btn btn-bug-create'");
}
else
{
$misc = common::hasPriv('bug', 'create') ? '' : "class=disabled";
$misc = common::hasPriv('bug', 'create') ? "class='btn'" : "class='btn disabled'";
$link = common::hasPriv('bug', 'create') ? $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID") : '#';
echo "<li>" . html::a($link, $lang->bug->create, '', $misc) . "</li>";
echo html::a($link, "<i class='icon icon-plus'></i>" . $lang->bug->create, '', $misc);
}
?>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'>
<span class='caret'></span>
</button>
<ul class='dropdown-menu'>
<?php
$misc = common::hasPriv('bug', 'batchCreate') ? '' : "class=disabled";
$link = common::hasPriv('bug', 'batchCreate') ? $this->createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID") : '#';
echo "<li>" . html::a($link, $lang->bug->batchCreate, '', $misc) . "</li>";
module/product/css/browse.css
+2
View File
@@ -13,4 +13,6 @@
a.removeModule{color:#ddd}
a.removeModule:hover{color:red}
#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;}
tbody > tr > td > .btn-icon {margin-right: 3px;}
module/product/view/browse.html.php
+24 -25
View File
@@ -55,31 +55,30 @@
</div>
<?php common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", '', 'button', 'bar-chart'); ?>
</div>
<div class='btn-group'>
<div class='btn-group create-story-btn'>
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
<i class='icon icon-plus'></i> <?php echo $lang->story->common;?>
<span class='caret'></span>
</button>
<ul class='dropdown-menu' id='createStoryActionMenu'>
<?php
if(commonModel::isTutorialMode())
{
$wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID");
echo "<li>" . html::a($this->createLink('tutorial', 'wizard', "module=story&method=create&params=$wizardParams"), $lang->story->create) . "</li>";
}
else
{
$misc = common::hasPriv('story', 'create') ? '' : "class=disabled";
$link = common::hasPriv('story', 'create') ? $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID") : '#';
echo "<li>" . html::a($link, $lang->story->create, '', $misc) . "</li>";
}
$misc = common::hasPriv('story', 'batchCreate') ? '' : "class=disabled";
$link = common::hasPriv('story', 'batchCreate') ? $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID") : '#';
echo "<li>" . html::a($link, $lang->story->batchCreate, '', $misc) . "</li>";
?>
</ul>
</div>
<div class="btn-group" id='createActionMenu'>
<?php
if(commonModel::isTutorialMode())
{
$wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID");
echo html::a($this->createLink('tutorial', 'wizard', "module=story&method=create&params=$wizardParams"), "<i class='con-plus'></i>" . $lang->story->create, '', 'create-story-btn');
}
else
{
$misc = common::hasPriv('story', 'create') ? "class='btn'" : "class='btn disabled'";
$link = common::hasPriv('story', 'create') ? $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID") : '#';
echo html::a($link, "<i class='icon icon-plus'></i>" . $lang->story->create, '', $misc);
}
?>
<button type="button" class="btn dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class='dropdown-menu'>
<?php
$misc = common::hasPriv('story', 'batchCreate') ? '' : "class=disabled";
$link = common::hasPriv('story', 'batchCreate') ? $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID") : '#';
echo "<li>" . html::a($link, $lang->story->batchCreate, '', $misc) . "</li>";
?>
</ul>
</div>
</div>
<div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
module/project/css/task.css
+2
View File
@@ -24,4 +24,6 @@
#taskTree{position:fixed;margin-left:20px;}
.outer.hide-side #taskTree{margin-left:0px;}
#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;}
tbody > tr > td > .btn-icon {margin-right: 2px}
module/project/view/taskheader.html.php
+9 -9
View File
@@ -121,17 +121,17 @@
</div>
</div>
<div class='btn-group'>
<div class='btn-group'>
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
<i class='icon icon-plus'></i> <?php echo $lang->task->common;?>
<span class='caret'></span>
</button>
<ul class='dropdown-menu' id='createTaskActionMenu'>
<div class='btn-group' id='createActionMenu'>
<?php
$misc = common::hasPriv('task', 'create') ? '' : "class=disabled";
$misc = common::hasPriv('task', 'create') ? "class='btn'" : "class='btn disabled'";
$link = common::hasPriv('task', 'create') ? $this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')) : '#';
echo "<li>" . html::a($link, $lang->task->create, '', $misc) . "</li>";
echo html::a($link, "<i class='icon icon-plus'></i>" . $lang->task->create, '', $misc);
?>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'>
<span class='caret'></span>
</button>
<ul class='dropdown-menu'>
<?php
$misc = common::hasPriv('task', 'batchCreate') ? '' : "class=disabled";
$link = common::hasPriv('task', 'batchCreate') ? $this->createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')) : '#';
echo "<li>" . html::a($link, $lang->task->batchCreate, '', $misc) . "</li>";
module/testcase/css/browse.css
+2
View File
@@ -12,3 +12,5 @@
.pl-5px{padding-left:5px;}
#treebox{position:fixed;margin-left:20px;}
.outer.hide-side #treebox{margin-left:0px;}
#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;}
module/testcase/view/caseheader.html.php
+9 -8
View File
@@ -79,17 +79,18 @@
<?php common::printIcon('testcase', 'import', "productID=$productID&branch=$branch", '', 'button', '', '', 'export cboxElement iframe');?>
</div>
<div class='btn-group'>
<div class='btn-group'>
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
<i class='icon icon-plus'></i> <?php echo $lang->testcase->common;?>
<div class='btn-group' id='createActionMenu'>
<?php
$initModule = isset($moduleID) ? (int)$moduleID : 0;
$misc = common::hasPriv('testcase', 'create') ? "class='btn'" : "class='btn disabled'";
$link = common::hasPriv('testcase', 'create') ? $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule") : '#';
echo html::a($link, "<i class='icon-plus'></i>" . $lang->testcase->create, '', $misc);
?>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'>
<span class='caret'></span>
</button>
<ul class='dropdown-menu' id='createCaseActionMenu'>
<ul class='dropdown-menu'>
<?php
$initModule = isset($moduleID) ? (int)$moduleID : 0;
$misc = common::hasPriv('testcase', 'create') ? '' : "class=disabled";
$link = common::hasPriv('testcase', 'create') ? $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule") : '#';
echo "<li>" . html::a($link, $lang->testcase->create, '', $misc) . "</li>";
$misc = common::hasPriv('testcase', 'batchCreate') ? '' : "class=disabled";
$link = common::hasPriv('testcase', 'batchCreate') ? $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule") : '#';
echo "<li>" . html::a($link, $lang->testcase->batchCreate, '', $misc) . "</li>";