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

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

Browse Source
This commit is contained in:
wangyidong
2016-03-11 14:51:54 +08:00
parent ba4efcfa7f a4ca492969
commit 2a8d4e92eb
16 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/bug/control.php
View File

@@ -942,8 +942,7 @@ class bug extends control
$bugs = $this->bug->getLinkedBugs($linkedBugs);
/* Build linkBug list.*/
$output = "<ul class='list-unstyled'>";
$output .= html::a(inlink('linkBugs', "bugID=$bugID&bugs=$bug->linkBug", '', true), $this->lang->bug->linkBugs, '', "class='iframe' data-width='85%'");
$output = '';
foreach($bugs as $bugId => $title)
{
$output .= '<li>';
@@ -951,7 +950,6 @@ class bug extends control
$output .= html::a("javascript:deleteLinkedBug($bugID, $bugId)", '<i class="icon-remove"></i>', '', "title='{$this->lang->unlink}' style='float:right'");
$output .= '</li>';
}
$output .= '</ul>';
die($output);
}
@@ -971,13 +969,11 @@ class bug extends control
$bugs = $this->bug->deleteLinkedBug($bugID, $deleteBug);
/* Build linkBug list. */
$output = "<ul class='list-unstyled'>";
$output .= html::a(inlink('linkBugs', "bugID=$bugID&bugs=$bug->linkBug", '', true), $this->lang->bug->linkBugs, '', "class='iframe' data-width='85%'");
$output = '';
foreach($bugs as $bugId => $title)
{
$output .= '<li>' . html::a(inlink('view', "bugID=$bugId"), "#$bugId " . $title) . html::a("javascript:deleteLinkedBug($bugID, $bugId)", '<i class="icon-remove"></i>', '', "style='float:right'");
}
$output .= '</ul>';
die($output);
}

2
module/bug/css/edit.css
View File

@@ -2,4 +2,4 @@
.col-side .chosen-container {width: 218px!important}
.col-side .chosen-container[id^="openedBuild"] {width: 172px!important}
.col-side .chosen-container[id^="resolvedBuild"] {width: 172px!important}
#linkBugBox > .list-unstyled > li {margin-left:-56px}
#linkBugBox > li {margin-left:-56px}

1
module/bug/css/linkbugs.css Normal file
View File

@@ -0,0 +1 @@
#linkBugsForm {min-height: 200px}

6
module/bug/view/edit.html.php
View File

@@ -232,9 +232,9 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tr class='text-top'>
<th class='w-80px'><?php echo $lang->bug->linkBug;?></th>
<td id='linkBugBox'>
<ul class='list-unstyled'>
<?php echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id&bugs=$bug->linkBug", '', true), $lang->bug->linkBugs, '', "class='iframe' data-width='85%'");?>
<td>
<?php echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id&bugs=$bug->linkBug", '', true), $lang->bug->linkBugs, '', "data-toggle='modal' data-type='iframe' data-width='85%'");?>
<ul class='list-unstyled' id='linkBugBox'>
<?php
if(isset($bug->linkBugTitles))
{

4
module/search/model.php
View File

@@ -30,10 +30,6 @@ class searchModel extends model
$searchParams['style'] = zget($searchConfig, 'style', 'full');
$searchParams['queryID'] = isset($searchConfig['queryID']) ? $searchConfig['queryID'] : 0;
/* remove onlybody for url*/
$onlybodyParam = $this->config->requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes';
$searchParams['actionURL'] = str_replace($onlybodyParam, '', $searchParams['actionURL']);
$this->session->set('searchParams', $searchParams);
}

9
module/story/control.php
View File

@@ -946,6 +946,7 @@ class story extends control
$this->view->type = $type;
$this->view->allStories = $allStories;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->actionURL = $this->config->product->search;
$this->display();
}
@@ -964,8 +965,7 @@ class story extends control
$stories = $this->story->getLinkedStories($linkedStories);
$story = $this->story->getById($storyID);
$output = "<ul class='list-unstyled'>";
$output .= html::a($this->createLink('story', 'linkStory', "storyID=$storyID&type=$type&stories={$story->$type}", '', true), $this->lang->story->linkStory, '', "class='iframe' data-width='85%'");
$output = '';
foreach($stories as $storyId => $storyTitle)
{
$output .= '<li>';
@@ -973,7 +973,6 @@ class story extends control
$output .= html::a("javascript:deleteLinkedStory($storyID, \"$type\", $storyId)", '<i class="icon-remove"></i>', '', "title='{$this->lang->unlink}' style='float:right'");
$output .= '</li>';
}
$output .= '</ul>';
die($output);
}
@@ -992,8 +991,7 @@ class story extends control
$stories = $this->story->deleteLinkedStory($storyID, $type, $deleteStory);
$story = $this->story->getById($storyID);
$output = "<ul class='list-unstyled'>";
$output .= html::a($this->createLink('story', 'linkStory', "storyID=$storyID&type=$type&stories={$story->$type}", '', true), $this->lang->story->linkStory, '', "class='iframe' data-width='85%'");
$output = "";
foreach($stories as $storyId => $storyTitle)
{
$output .= '<li>';
@@ -1001,7 +999,6 @@ class story extends control
$output .= html::a("javascript:deleteLinkedStory($storyID, \"$type\", $storyId)", '<i class="icon-remove"></i>', '', "title='{$this->lang->unlink}' style='float:right'");
$output .= '</li>';
}
$output .= '</ul>';
die($output);
}

2
module/story/css/edit.css
View File

@@ -1,3 +1,3 @@
.col-side .chosen-container .chosen-drop {width: 216px!important}
.col-side .chosen-container {width: 218px!important}
#linkStoriesBox > .list-unstyled > li ,#childStoriesBox > .list-unstyled > li {margin-left:-56px}
#linkStoriesBox > li ,#childStoriesBox > li {margin-left:-56px}

1
module/story/css/linkstory.css Normal file
View File

@@ -0,0 +1 @@
#linkStoryForm {min-height: 200px}

12
module/story/view/edit.html.php
View File

@@ -171,9 +171,9 @@
</tr>
<tr class='text-top'>
<th><?php echo $lang->story->linkStories;?></th>
<td id='linkStoriesBox'>
<ul class='list-unstyled'>
<?php echo html::a($this->createLink('story', 'linkStory', "storyID=$story->id&type=linkStories&stories=$story->linkStories", '', true), $lang->story->linkStory, '', "class='iframe' data-width='85%'");?>
<td>
<?php echo html::a($this->createLink('story', 'linkStory', "storyID=$story->id&type=linkStories&stories=$story->linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='85%'");?>
<ul class='list-unstyled' id='linkStoriesBox'>
<?php
$linkStories = explode(',', $story->linkStories);
foreach($linkStories as $linkStoryID)
@@ -192,9 +192,9 @@
</tr>
<tr class='text-top'>
<th><?php echo $lang->story->childStories;?></th>
<td id='childStoriesBox'>
<ul class='list-unstyled'>
<?php echo html::a($this->createLink('story', 'linkStory', "storyID=$story->id&type=childStories&stories=$story->childStories", '', true), $lang->story->linkStory, '', "class='iframe' data-width='85%'");?>
<td>
<?php echo html::a($this->createLink('story', 'linkStory', "storyID=$story->id&type=childStories&stories=$story->childStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='85%'");?>
<ul class='list-unstyled' id='childStoriesBox'>
<?php
$childStories = explode(',', $story->childStories);
foreach($childStories as $childStoryID)

8
module/testcase/control.php
View File

@@ -683,8 +683,7 @@ class testcase extends control
$cases = $this->testcase->getLinkedCases($linkedCases);
/* Build linkCase list. */
$output = "<ul class='list-unstyled'>";
$output .= html::a($this->createLink('testcase', 'linkCases', "caseID=$caseID&cases=$case->linkCase", '', true), $this->lang->testcase->linkCases, '', "class='iframe' data-width='85%'");
$output = '';
foreach($cases as $caseId => $caseTitle)
{
$output .= '<li>';
@@ -692,7 +691,6 @@ class testcase extends control
$output .= html::a("javascript:deleteLinkedCase($caseID, $caseId)", '<i class="icon-remove"></i>', '', "title='{$this->lang->unlink}' style='float:right'");
$output .= '</li>';
}
$output .= '</ul>';
die($output);
}
@@ -712,8 +710,7 @@ class testcase extends control
$cases = $this->testcase->deleteLinkedCase($caseID, $deleteCase);
/* Build linkCase list. */
$output = "<ul class='list-unstyled'>";
$output .= html::a($this->createLink('testcase', 'linkCases', "caseID=$caseID&cases=$cases", '', true), $this->lang->testcase->linkCases, '', "class='iframe' data-width='85%'");
$output = '';
foreach($cases as $caseId => $caseTitle)
{
$output .= '<li>';
@@ -721,7 +718,6 @@ class testcase extends control
$output .= html::a("javascript:deleteLinkedCase($caseID, $caseId)", '<i class="icon-remove"></i>', '', "title='{$this->lang->unlink}' style='float:right'");
$output .= '</li>';
}
$output .= '</ul>';
die($output);
}

2
module/testcase/css/edit.css
View File

@@ -2,4 +2,4 @@
.col-side .chosen-container {width: 218px!important}
.table-form > tbody > tr > td .btn.addbutton {display:block; margin:1px 0px; width:40px; padding:1px 6px;}
.table-form > tbody > tr > td .btn.delbutton {display:block; margin:1px 0px; width:40px; padding:1px 6px;}
#linkCaseBox > .list-unstyled > li {margin-left:-56px}
#linkCaseBox li {margin-left:-56px}

1
module/testcase/css/linkcases.css Normal file
View File

@@ -0,0 +1 @@
#linkCasesForm {min-height: 200px}

6
module/testcase/view/edit.html.php
View File

@@ -142,9 +142,9 @@
</tr>
<tr class='text-top'>
<th><?php echo $lang->testcase->linkCase;?></th>
<td id='linkCaseBox'>
<ul class='list-unstyled'>
<?php echo html::a($this->createLink('testcase', 'linkCases', "caseID=$case->id&case=$case->linkCase", '', true), $lang->testcase->linkCases, '', "class='iframe' data-width='85%'");?>
<td>
<?php echo html::a($this->createLink('testcase', 'linkCases', "caseID=$case->id&case=$case->linkCase", '', true), $lang->testcase->linkCases, '', "data-type='iframe' data-toggle='modal' data-width='85%'");?>
<ul class='list-unstyled' id='linkCaseBox'>
<?php
if(isset($case->linkCaseTitles))
{

7
www/js/my.full.js
View File

@@ -727,12 +727,12 @@ function toggleSearch()
*/
function ajaxGetSearchForm(querybox)
{
querybox = typeof(querybox) == 'undefined' ? '#querybox' : querybox;
if($(querybox).html() == '')
var $querybox = $(querybox || '#querybox');
if($querybox.html() == '')
{
$.get(createLink('search', 'buildForm'), function(data)
{
$(querybox).html(data);
$querybox.html(data);
});
}
}
@@ -1000,6 +1000,7 @@ function setModal()
/* Save the href to rel attribute thus we can save it. */
$('#ajaxModal').attr('rel', url);
event.preventDefault();
return false;
});
});

4
www/js/zui/min.js
View File

File diff suppressed because one or more lines are too long

6
www/theme/default/style.css
View File

@@ -425,10 +425,10 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
/* Wrapper */
#wrap {padding:0 19px 20px 19px; background:#e5e5e5;}
#wrap .outer {position: relative; text-align:left; background:#fff;border:1px solid #cfcfcf; -webkit-box-shadow: 0 0px 6px rgba(0, 0, 0, 0.10);box-shadow: 0 0px 6px rgba(0, 0, 0, 0.10); padding: 20px}
#wrap .outer {position: relative; text-align:left; background:#fff;border:1px solid #cfcfcf; -webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.1);box-shadow: 0 1px 5px rgba(0, 0, 0, 0.1); padding: 20px}
/* Footer. */
#footer {position: relative; width:100%;position:fixed; bottom:0; left:0; margin:0; border-top: 1px solid #e1e1e1; background:#eef4fe;height:40px; line-height:40px;-webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1); z-index: 10}
#footer {position: relative; width:100%;position:fixed; bottom:0; left:0; margin:0; border-top: 1px solid #ddd; background:#eef4fe;height:40px; line-height:40px;-webkit-box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.05);box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.05); z-index: 10}
#crumbs a i.icon-home{display: none;}
#crumbs {float: left;margin-left: 20px;}
#crumbs .icon-angle-right{margin-right: 6px;}
@@ -694,7 +694,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#passwordStrength{display:none;}
.fixedTfootAction {position: fixed; bottom: 40px; box-shadow: 0 -3px 4px rgba(0,0,0,0.05)}
.table > .fixedTfootAction > tr > td {background: #F8FAFE; border-top-color: #bbb}
.table > .fixedTfootAction > tr > td {background: #F8FAFE; border-top-color: #bbb; border-bottom: none}
.fixedTheadOfList {position: fixed; top: 0px; z-index:10;}
.datatable.head-fixed > .datatable-head .table > thead > tr > th, .fixedTheadOfList > thead > tr > th {background-color: #114f8e; border-bottom-color: #bbb; color: #aaa}
.tablesorter.fixedTheadOfList thead tr .headerSortUp > a:after,