Merge branch 'sprint/174_sunhao/bug16878' into 'master'

* Bug 16878, fix layout when open execution/task in iframe modal.

See merge request easycorp/zentaopms!765

module/execution/view/task.html.php

@@ -103,6 +103,7 @@ body {margin-bottom: 25px;}
     ?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->product->searchStory;?></a>
   </div>
+  <?php if(!isonlybody()): ?>
   <div class="btn-toolbar pull-right">
     <?php
     if(!isset($browseType)) $browseType = '';
@@ -176,6 +177,7 @@ body {margin-bottom: 25px;}
     <?php echo "</div>";?>
     <?php endif;?>
   </div>
+  <?php endif; ?>
 </div>
 <div id="mainContent" class="main-row fade">
   <div class="side-col" id="sidebar">
@@ -364,6 +366,7 @@ body {margin-bottom: 25px;}
   </div>
 </div>
 <?php js::set('replaceID', 'taskList')?>
+<?php if(isonlybody()) js::set('modalWidthReset', 1200) ?>
 <script>
 $(function()
 {