From 304653cd655adfb3a1a00fc7643367a4a9f3f919 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 17 May 2018 09:04:44 +0800
Subject: [PATCH]  * fix bug.

---
 module/bug/js/common.js             |  2 +-
 module/bug/view/edit.html.php       |  8 ++++----
 module/file/view/export.html.php    |  8 ++++----
 module/project/view/kanban.html.php | 19 +++++--------------
 4 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index b730eda26d..6ee65a4f8d 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -101,7 +101,7 @@ function loadAllBuilds(that)
     {
         productID = $('#product').val();
         projectID = $('#project').val();
-        if(page == 'edit') buildBox = $(that).parent().prev().filter('span').attr('id');
+        if(page == 'edit') buildBox = $(that).closest('.input-group').attr('id');
 
         if(projectID)
         {
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 43086c9240..d5d53b0a5a 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -216,8 +216,8 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                 <tr>
                   <th><?php echo $lang->bug->openedBuild;?></th>
                   <td>
-                    <div class='input-group'>
-                      <span id='openedBuildBox'><?php echo html::select('openedBuild[]', $openedBuilds, $bug->openedBuild, 'size=4 multiple=multiple class="chosen form-control"');?></span>
+                    <div id='openedBuildBox' class='input-group'>
+                      <?php echo html::select('openedBuild[]', $openedBuilds, $bug->openedBuild, 'size=4 multiple=multiple class="chosen form-control"');?>
                       <span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn btn-default' onclick='loadAllBuilds(this)'")?></span>
                     </div>
                   </td>
@@ -233,8 +233,8 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                 <tr>
                   <th><?php echo $lang->bug->resolvedBuild;?></th>
                   <td>
-                    <div class='input-group'>
-                      <span id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, "class='form-control chosen'");?></span>
+                    <div id='resolvedBuildBox' class='input-group'>
+                      <?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, "class='form-control chosen'");?>
                       <span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn btn-default' onclick='loadAllBuilds(this)'")?></span>
                     </div>
                   </td>
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index a82b8c2f7a..0a4df725aa 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -121,7 +121,7 @@ $(document).ready(function()
     <h2><?php echo $lang->export;?></h2>
   </div>
   <?php $isCustomExport = (!empty($customExport) and !empty($allExportFields));?>
-  <form class='main-form' method='post' target='hiddenwin' style='padding: 50px 1% 50px'>
+  <form class='main-form' method='post' target='hiddenwin' style='padding: 50px 0 50px'>
     <table class='w-p100 table-fixed'>
       <tr>
         <td>
@@ -133,10 +133,10 @@ $(document).ready(function()
         <td class='w-80px'>
           <?php echo html::select('fileType',   $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control"');?>
         </td>
-        <td class='w-90px'>
+        <td class='w-80px'>
           <?php echo html::select('encode',     $config->charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='form-control'");?>
         </td>
-        <td class='w-110px'>
+        <td class='w-100px'>
           <?php echo html::select('exportType', $lang->exportTypeList, 'all', "class='form-control'");?>
         </td>
         <?php if($isCustomExport):?>
@@ -144,7 +144,7 @@ $(document).ready(function()
           <span id='tplBox'><?php echo $this->fetch('file', 'buildExportTPL', 'module=' . $this->moduleName);?></span>
         </td>
         <?php endif?>
-        <td style='width:<?php echo $isCustomExport ? '130px' : '70px'?>'>
+        <td style='width:<?php echo $isCustomExport ? '110px' : '60px'?>'>
           <div class='input-group'>
             <?php echo html::submitButton($lang->export, "onclick='setDownloading();' ");?>
             <?php if($isCustomExport):?>
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 6dedb79aaa..23b42db1f7 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -12,20 +12,11 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-right'>
     <?php echo html::a($this->createLink('project', 'ajaxKanbanSetting', "projectID=$projectID"), "<i class='icon-cog muted'></i> " . $lang->project->kanbanSetting, '', "class='iframe btn btn-link'");?>
-    <?php if(common::hasPriv('project', 'printKanban')) echo html::a('###', "<i class='icon-printer muted'></i> " . $lang->project->printKanban, '', "class='btn btn-link' id='printKanban' title='{$lang->project->printKanban}'");?>
-    <div class='btn-group'>
-      <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='exportAction'>
-        <i class='icon-import muted'></i> <?php echo $lang->export ?>
-        <span class='caret'></span>
-      </button>
-      <ul class='dropdown-menu' id='exportActionMenu'>
-        <?php 
-        $misc = common::hasPriv('task', 'export') ? "class='export iframe' data-width='700'" : "class=disabled";
-        $link = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType") : '#';
-        echo "<li>" . html::a($link, $lang->task->export, '', $misc) . "</li>";
-        ?>
-      </ul>
-    </div>
+    <?php if(common::hasPriv('project', 'printKanban')) echo html::a($this->createLink('project', 'printKanban', "projectID=$projectID"), "<i class='icon-printer muted'></i> " . $lang->project->printKanban, '', "class='iframe btn btn-link' id='printKanban' title='{$lang->project->printKanban}'");?>
+    <?php 
+    $link = $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType");
+    if(common::hasPriv('task', 'export')) echo html::a($link, "<i class='icon-import muted'></i> " . $lang->task->export, '', "class='btn btn-link iframe' data-width='700'");
+    ?>
     <div class='btn-group'>
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'>
         <i class='icon-export muted'></i> <?php echo $lang->import ?>