From 8b78775556b4843be3dd732b125bfc0384a4c857 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 17 May 2018 16:37:40 +0800
Subject: [PATCH]  * adjust for report page.

---
 module/file/view/download.html.php    |  2 +-
 module/report/js/bugcreate.js         |  8 ++++----
 module/report/js/workload.js          | 14 +++++++-------
 module/report/view/bugcreate.html.php |  2 +-
 module/report/view/workload.html.php  | 16 +++++++---------
 module/testcase/view/create.html.php  |  7 +++++--
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/module/file/view/download.html.php b/module/file/view/download.html.php
index ee649ef236..5605469343 100644
--- a/module/file/view/download.html.php
+++ b/module/file/view/download.html.php
@@ -12,7 +12,7 @@
   <div class='main-header clearfix'>
     <h2 class='pull-left'><?php echo $lang->file->preview;?></h2>
     <?php if($fileType == 'txt'):?>
-    <div class='btn-toolbar pull-left w-120px'><?php echo html::select('charset', $config->file->charset, $charset, "onchange='setCharset(this.value)' class='chosen'");?></div>
+    <div class='btn-toolbar pull-left w-120px'><?php echo html::select('charset', $config->file->charset, $charset, "onchange='setCharset(this.value)' class='form-control'");?></div>
     <?php endif;?>
   </div>
   <?php if($fileType == 'image'):?>
diff --git a/module/report/js/bugcreate.js b/module/report/js/bugcreate.js
index fccbc767b8..e4a2cb584e 100644
--- a/module/report/js/bugcreate.js
+++ b/module/report/js/bugcreate.js
@@ -1,9 +1,9 @@
 function changeParams(obj)
 {
-    var begin = $('.main .row').find('#begin').val();
-    var end = $('.main .row').find('#end').val();
-    var product = $('.main .row').find('#product').val();
-    var project = $('.main .row').find('#project').val();
+    var begin   = $('#conditions').find('#begin').val();
+    var end     = $('#conditions').find('#end').val();
+    var product = $('#conditions').find('#product').val();
+    var project = $('#conditions').find('#project').val();
     if(begin.indexOf('-') != -1)
     {
         var beginarray = begin.split("-");
diff --git a/module/report/js/workload.js b/module/report/js/workload.js
index 371ea909b8..95e0528791 100644
--- a/module/report/js/workload.js
+++ b/module/report/js/workload.js
@@ -1,11 +1,11 @@
 function changeParams(obj)
 {
-    var begin = $('.main .row').find('#begin').val();
-    var end = $('.main .row').find('#end').val();
-    var workday = $('.main .row').find('#workday').val();
-    var dept = $('.main .row').find('#dept').val();
-    var assign = $('.main .row').find('#assign').val();
-    var days = diffDate(begin, end);
+    var begin   = $('#conditions').find('#begin').val();
+    var end     = $('#conditions').find('#end').val();
+    var workday = $('#conditions').find('#workday').val();
+    var dept    = $('#conditions').find('#dept').val();
+    var assign  = $('#conditions').find('#assign').val();
+    var days    = diffDate(begin, end);
 
     $('#days').val(days);
 
@@ -19,7 +19,7 @@ function changeParams(obj)
     {
         var endarray = end.split("-");
         var end = '';
-        for(i=0 ; i < endarray.length ; i++) end = end + endarray[i];
+        for(i = 0 ; i < endarray.length ; i++) end = end + endarray[i];
     }
 
     var link = createLink('report', 'workload', 'begin=' + begin + '&end=' + end + '&days=' + days + '&workday=' + workday + '&dept=' + dept + '&assign=' + assign);
diff --git a/module/report/view/bugcreate.html.php b/module/report/view/bugcreate.html.php
index acfb0367cf..68f78139d1 100644
--- a/module/report/view/bugcreate.html.php
+++ b/module/report/view/bugcreate.html.php
@@ -16,7 +16,7 @@
           <div class='col-sm-5'>
             <div class='input-group input-group-sm'>
               <span class='input-group-addon'><?php echo $lang->report->bugOpenedDate;?></span>
-              <div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='w-100px form-control form-date' onchange='changeParams(this)'");?></div>
+              <div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='form-control form-date' onchange='changeParams(this)'");?></div>
               <span class='input-group-addon fix-border'><?php echo $lang->report->to;?></span>
               <div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control form-date' onchange='changeParams(this)'");?></div>
             </div>
diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php
index 648cbbf0f3..130c10092d 100644
--- a/module/report/view/workload.html.php
+++ b/module/report/view/workload.html.php
@@ -14,38 +14,36 @@
       <div class='with-padding'>
         <form method='post'>
           <div class="table-row" id='conditions'>
-            <div class='col-sm-2'>
+            <div class='col-2'>
               <div class='input-group'>
                 <span class='input-group-addon'><?php echo $lang->report->dept;?></span>
                 <?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='changeParams(this)'");?>
               </div>
             </div>
-            <div class='col-sm-4'>
+            <div class='col-4'>
               <div class='input-group input-group-sm'>
                 <span class='input-group-addon'><?php echo $lang->report->taskAssignedDate;?></span>
-                <div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='w-80px form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
+                <div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
                 <span class='input-group-addon fix-border'><?php echo $lang->report->to;?></span>
                 <div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
               </div>
             </div>
-            <div class='col-sm-2'>
+            <div class='col-2'>
               <div class='input-group'>
                 <span class='input-group-addon'><?php echo $lang->report->diffDays;?></span>
                 <?php echo html::input('days', $days, "class='form-control' autocomplete='off' style='text-align:center'");?>
               </div>
             </div>
-            <div class='col-sm-2'>
+            <div class='col-2'>
               <div class='input-group'>
                 <span class='input-group-addon'><?php echo $lang->report->workday;?></span>
                 <?php echo html::input('workday', $workday, "class='form-control' autocomplete='off' style='width:50px'");?>
               </div>
             </div>
-            <div class='col-sm-1'>
+            <div class='col-1'>
               <?php echo html::select('assign', $lang->report->assign, $assign, "class='form-control' onchange='changeParams(this)' style='width:90px'");?>
             </div>
-            <div class='col-sm-1'>
-              <div class='input-group'><?php echo html::submitButton($lang->report->query);?></div>
-            </div>
+            <div class='col-1 text-right'><?php echo html::submitButton($lang->report->query);?></div>
           </div>
         </form>
       </div>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 7ebc03510a..fd79320f00 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -104,7 +104,7 @@
         <?php if(strpos(",$showFields,", ',pri,') !== false):?>
         <tr>
           <th><?php echo $lang->testcase->pri;?></th>
-          <td colspan="2">
+          <td>
             <?php
             $hasCustomPri = false;
             foreach($lang->testcase->priList as $priKey => $priValue)
@@ -155,7 +155,10 @@
                       <textarea rows='1' class='form-control autosize step-steps' name='steps[]'></textarea>
                       <span class="input-group-addon step-type-toggle">
                         <input type='hidden' name='stepType[]' value='item' class='step-type'>
-                        <label class="checkbox-inline"><input tabindex='-1' type="checkbox" class='step-group-toggle'> <?php echo $lang->testcase->group ?></label>
+                        <div class='checkbox-primary'>
+                          <input tabindex='-1' type="checkbox" class='step-group-toggle'>
+                          <label class="checkbox-inline"><?php echo $lang->testcase->group ?></label>
+                        </div>
                       </span>
                     </div>
                   </td>