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 @@
file->preview;?>
-
file->charset, $charset, "onchange='setCharset(this.value)' class='chosen'");?>
+
file->charset, $charset, "onchange='setCharset(this.value)' class='form-control'");?>
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 @@
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 @@