Merge branch 'fixbug' into 'master'

* Fix bug.

See merge request easycorp/zentaopms!3202

module/holiday/view/browse.html.php

@@ -14,7 +14,7 @@
 <div id='mainMenu' class='clearfix'>
   <div class='pull-left btn-toolbar'>
     <?php
-    echo html::a($this->createLink('holiday', 'browse'), '<span class="text">' . $lang->holiday->all . '</span>', '', "class='btn btn-link btn-active-text'");
+    echo html::a($this->createLink('holiday', 'browse'), '<span class="text">' . $lang->holiday->all . '</span>', '', "class='btn btn-link btn-active-text' data-app='oa'");
     ?>
   </div>
   <div class='pull-right'>

module/programplan/view/gantt.html.php

@@ -14,6 +14,7 @@
 <?php include '../../common/view/gantt.html.php';?>
 <style>
 #ganttView {height: 600px;}
+#ganttView .gantt_layout_cell {min-width: 560px!important;}
 #mainContent:before {background: #fff;}
 .gantt-fullscreen #header,
 .gantt-fullscreen #mainMenu,