diff --git a/html/exhi/application/views/general/v_general_home.php b/html/exhi/application/views/general/v_general_home.php index a1171553b6ce2a54287d92ee9032ac4df1eb4404..4cd95a17eef6a159f9597ac3f7a6a80ed41f7e1f 100644 --- a/html/exhi/application/views/general/v_general_home.php +++ b/html/exhi/application/views/general/v_general_home.php @@ -215,6 +215,9 @@ .grow:hover { transform: scale(1.2); } + .select2-container--default .select2-selection--multiple .select2-selection__choice{ + color: black !important; + } </style> <div class="wrapper"> <div class="container-fluid"> @@ -222,26 +225,25 @@ <div class="content" style="padding: 20px"> <div class="container-fluid"> <div class="row"> - <div class="container-fluid g-3"> - <button class="button button-mid" data-toggle="modal" data-target="#advanceSearcheModal">ค้นหาขั้นสูง</button><br><br><br><br> - </div> - <div class="col-md-2 position-relative"> - <div class="form-group"> - <label for="year" class="form-label">ปี</label> - <select name="year" class="form-control form-sm" id="year" onchange="get_num_project()"> + <div class="col-2"> + <div class="form-group"> + <select name="year" class="form-control form-control" id="year" onchange="get_num_project()"> </select> </div> - </div> - <div class="col-md-2 position-relative"> + </div> + <div class="col-2"> <div class="input-group"> - <input type="search" class="form-control form-control-lg" placeholder="ชื่อโปรเจกต์.."> + <input type="search" class="form-control form-control" placeholder="ชื่อโปรเจกต์.."> <div class="input-group-append"> - <button type="submit" class="btn btn-lg btn-default"> + <button type="submit" class="btn btn btn-default"> <i class="fa fa-search"></i> </button> </div> </div> </div> + <div class="col-2"> + <button style="background-color:white;border-color:#A79E9E" class="btn" data-toggle="modal" data-target="#advanceSearcheModal">ค้นหาขั้นสูง</button><br><br><br><br> + </div> </div> <div> <h5><b>ผลงานที่เพิ่มล่าสุด</b></h5> @@ -391,27 +393,39 @@ </div> </div> </div> - <div class="form-group has-success"> - <label class="form-label">บริษัท: </label> - <select class="form-control" id="company" name="company"> - <option value="">ทั้งหมด</option> - <?php foreach ($companies as $company) { ?> - <option value="<?php echo $company->company_id ?>"><?php echo $company->name ?></option> - <?php } ?> - </select> - </div> - <div class="form-group has-success"> - <label class="form-label">ชื่อโปรเจกต์: </label> - <input name="pname" type="text" class="form-control"> - </div> - <div class="form-group has-success"> - <label class="form-label">หมวดหมู่: </label> - <select class="js-example-basic-multiple form-control" name="tag[]" multiple="multiple" id="muti"> - <?php foreach ($tags as $tag) { ?> - <option value="<?php echo $tag->tag_id ?>"><?php echo $tag->name ?></option> - <?php } ?> - </select> - </div> + <div class="row"> + <div class="col-12"> + <div class="form-group has-success"> + <label class="form-label">บริษัท: </label> + <select class="form-control" id="company" name="company"> + <option value="">ทั้งหมด</option> + <?php foreach ($companies as $company) { ?> + <option value="<?php echo $company->company_id ?>"><?php echo $company->name ?></option> + <?php } ?> + </select> + </div> + </div> + </div> + <div class="row"> + <div class="col-12"> + <div class="form-group has-success"> + <label class="form-label">ชื่อโปรเจกต์: </label> + <input name="pname" type="text" class="form-control"> + </div> + </div> + </div> + <div class="row"> + <div class="col-md-12"> + <div class="form-group has-success"> + <label class="form-label">หมวดหมู่: </label><br> + <select class="js-example-basic-multiple form-control" name="tag[]" multiple="multiple" id="muti"> + <?php foreach ($tags as $tag) { ?> + <option value="<?php echo $tag->tag_id ?>"><?php echo $tag->name ?></option> + <?php } ?> + </select> + </div> + </div> + </div> <hr> <div class="row justify-content-between"> <a type="hidden"></a> @@ -451,7 +465,7 @@ $(document).ready(function() { get_project_year(); get_trend(); - $("#muti").select2().select2(); + $("#muti").select2(); let year = document.getElementById("year").value; $('#project_2').attr('href', '<?php echo site_url() . "/General/show_project_2" ?>?y=' + year); $('#project_3').attr('href', '<?php echo site_url() . "/General/show_project_3" ?>?y=' + year); @@ -590,4 +604,4 @@ selectDiv_3.innerHTML = 'จำนวนผลงาน : ' + data.team + ' ผลงาน'; selectDiv_4.innerHTML = 'จำนวนผลงาน : ' + data.project + ' ผลงาน'; } -</script> \ No newline at end of file +</script>