Reformat result table and also handle empty results
这个提交包含在:
父节点
a7c0435740
当前提交
98e83ee511
共有 4 个文件被更改,包括 17 次插入 和 5 次删除
|
|
@ -471,16 +471,16 @@ class Visitor extends CI_Controller {
|
|||
$callsign = $this->security->xss_clean($this->uri->segment(4));
|
||||
$this->load->model('publicsearch');
|
||||
$result = $this->publicsearch->search($slug, $callsign);
|
||||
$this->search_result($result);
|
||||
$this->search_result($result, $callsign);
|
||||
}
|
||||
|
||||
private function search_result($search_results) {
|
||||
private function search_result($search_results, $callsign) {
|
||||
$data['callsign'] = $callsign;
|
||||
if ($search_results->num_rows() > 0) {
|
||||
echo "Result found";
|
||||
$data['results'] = $search_results;
|
||||
$this->load->view('public_search/result.php', $data);
|
||||
} else {
|
||||
echo "No results found";
|
||||
$this->load->view('public_search/empty.php', $data);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
<div class="container publicsearch">
|
||||
<h1>Results <small class="text-muted">Searching for <?php echo str_replace("0","Ø",strtoupper($callsign)); ?></small></h1>
|
||||
<div class="card text-center">
|
||||
<div class="card-body">
|
||||
<?php
|
||||
|
||||
if ($results) { ?>
|
||||
|
|
@ -67,3 +71,6 @@ if ($results) { ?>
|
|||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
<?php $this->CI =& get_instance();
|
||||
if ($this->CI->public_search_enabled($slug) || $this->session->userdata('user_type') >= 2) { ?>
|
||||
<form method="post" action="" class="form-inline">
|
||||
<input class="form-control mr-sm-2" id="callsign" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" aria-label="Search">
|
||||
<input class="form-control mr-sm-2" id="callsign" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" style="text-transform: uppercase;" aria-label="Search">
|
||||
|
||||
<button onclick="publicSearchButtonPress()" class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> <?php echo lang('menu_search_button'); ?></button>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -42,6 +42,11 @@ thead > tr > td {
|
|||
padding-top: 15px;
|
||||
}
|
||||
|
||||
.publicsearch {
|
||||
padding-top: 15px;
|
||||
max-width: 540px;
|
||||
}
|
||||
|
||||
.search {
|
||||
padding-top: 15px;
|
||||
}
|
||||
|
|
|
|||
正在加载…
在新工单中引用