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

This commit is contained in:
wangyidong
2016-02-16 14:56:57 +08:00
3 changed files with 38 additions and 3 deletions
+3
View File
@@ -3,6 +3,9 @@
.tabs .tab-content .tab-pane #querybox{margin:0px}
.tabs .tab-content .tab-pane #querybox form{padding-left:0px;}
.hide-side .col-main {width: 100%;}
.hide-side .col-side .main-side {width: 0; display: none;}
#unlinkBugList, #unlinkStoryList{margin-bottom:5px;}
input[type=checkbox].ml-10px{margin-left:10px;}
+20
View File
@@ -41,3 +41,23 @@ $(function()
});
});
})
$(document).ready(function()
{
$('.side-handle-btn').click(function()
{
if($(this).parents('.row-table').hasClass('hide-side'))
{
$('.row-table').removeClass('hide-side');
$('.side-handle-btn i').removeClass('icon-collapse-full');
$('.side-handle-btn i').addClass('icon-expand-full');
$.cookie('productPlanSide', 'show', {path: config.webRoot});
}
else
{
$('.side-handle-btn i').removeClass('icon-expand-full');
$('.side-handle-btn i').addClass('icon-collapse-full');
$('.row-table').addClass('hide-side');
$.cookie('productPlanSide', 'hide', {path: config.webRoot});
}
});
});
+15 -3
View File
@@ -44,7 +44,7 @@
?>
</div>
</div>
<div class='row-table'>
<div class='row-table <?php echo $this->cookie->productPlanSide == 'hide' ? 'hide-side' : ''?>'>
<div class='col-main'>
<div class='main'>
<div class='tabs'>
@@ -55,7 +55,13 @@
<div class='tab-content'>
<div id='stories' class='tab-pane <?php if($type == 'story') echo 'active'?>'>
<?php if(common::hasPriv('productplan', 'linkStory')):?>
<div class='action'><?php echo html::a("javascript:showLink($plan->id, \"story\")", '<i class="icon-link"></i> ' . $lang->productplan->linkStory, '', "class='btn btn-sm btn-primary'");?></div>
<div class='action'>
<?php echo html::a("javascript:showLink($plan->id, \"story\")", '<i class="icon-link"></i> ' . $lang->productplan->linkStory, '', "class='btn btn-sm btn-primary'");?>
<span class='side-handle-btn'>
<?php $class = $this->cookie->productPlanSide == 'hide' ? 'icon-collapse-full' : 'icon-expand-full'?>
<?php echo html::a('###', "<i class='$class'></i>", '', "class='btn btn-sm'")?>
</span>
</div>
<div class='linkBox'></div>
<?php endif;?>
<form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkStory', "planID=$plan->id&orderBy=$orderBy");?>">
@@ -154,7 +160,13 @@
</div>
<div id='bugs' class='tab-pane <?php if($type == 'bug') echo 'active';?>'>
<?php if(common::hasPriv('productplan', 'linkBug')):?>
<div class='action'><?php echo html::a("javascript:showLink($plan->id, \"bug\")", '<i class="icon-bug"></i> ' . $lang->productplan->linkBug, '', "class='btn btn-sm btn-primary'");?></div>
<div class='action'>
<?php echo html::a("javascript:showLink($plan->id, \"bug\")", '<i class="icon-bug"></i> ' . $lang->productplan->linkBug, '', "class='btn btn-sm btn-primary'");?>
<span class='side-handle-btn'>
<?php $class = $this->cookie->productPlanSide == 'hide' ? 'icon-collapse-full' : 'icon-expand-full'?>
<?php echo html::a('###', "<i class='$class'></i>", '', "class='btn btn-sm'")?>
</span>
</div>
<div class='linkBox'></div>
<?php endif;?>
<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "planID=$plan->id&orderBy=$orderBy");?>">