goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Changed Statistics to Bootstrap 4 layout

浏览代码
这个提交包含在：
Peter Goodhall 2019-05-13 17:37:01 +01:00
父节点 a3f12f0510
当前提交 cca5b0ae3b
共有 5 个文件被更改，包括 75 次插入 和 35 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

19
application/controllers/Statistics.php
查看文件

@ -39,11 +39,15 @@ class Statistics extends CI_Controller {
$data['totals_year'] = $this->logbook_model->totals_year();
$data['page_title'] = "Statistics";
// Render User Interface
$this->load->view('layout/header', $data);
// Set Page Title
$data['page_title'] = "Statistics";
// Load Views
$this->load->view('interface_assets/header', $data);
$this->load->view('statistics/index');
$this->load->view('layout/footer');
$this->load->view('interface_assets/footer');
}
function custom() {
@ -72,9 +76,9 @@ class Statistics extends CI_Controller {
if ($this->form_validation->run() == FALSE)
{
$this->load->view('layout/header', $data);
$this->load->view('interface_assets/header', $data);
$this->load->view('statistics/custom', $data);
$this->load->view('layout/footer');
$this->load->view('interface_assets/footer');
}
else
{
@ -83,10 +87,9 @@ class Statistics extends CI_Controller {
$data['result'] = $this->stats->result();
$this->load->view('layout/header', $data);
$this->load->view('interface_assets/header', $data);
$this->load->view('statistics/custom_result');
$this->load->view('layout/footer');
$this->load->view('interface_assets/footer');
}
}

23
application/views/statistics/custom.php
查看文件

@ -5,15 +5,24 @@
});
</script>
<div id="container">
<div class="container statistics_custom">
<h2><?php echo $page_title; ?></h2>
<h2>
<?php echo $page_title; ?>
<small class="text-muted">Explore the logbook.</small>
</h2>
<ul class="tabs">
<li><a href="<?php echo site_url('statistics');?>#home">General</a></li>
<li><a href="<?php echo site_url('statistics');?>#space">Satellite Contacts</a></li>
<li class="active"><a href="<?php echo site_url('statistics');?>/custom">Custom</a></li>
</ul>
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">General</a>
</li>
<li class="nav-item">
<a class="nav-link" id="satellite-tab" data-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false">Satellites</a>
</li>
<li class="nav-item">
<a href="/index.php/statistics/custom" class="nav-link" role="tab">Custom</a>
</li>
</ul>
<p>This is a work in-progress</p>

12
application/views/statistics/custom_result.php
查看文件

@ -5,15 +5,13 @@
});
</script>
<div id="container">
<div class="container statistics_custom">
<h2><?php echo $page_title; ?></h2>
<h2>
<?php echo $page_title; ?>
<small class="text-muted">Explore the logbook.</small>
</h2>
<ul class="tabs">
<li><a href="<?php echo site_url('statistics');?>#home">General</a></li>
<li><a href="<?php echo site_url('statistics');?>#space">Satellite Contacts</a></li>
<li class="active"><a href="<?php echo site_url('statistics');?>/custom">Custom</a></li>
</ul>
<p>This is a work in-progress</p>

48
application/views/statistics/index.php
查看文件

@ -95,20 +95,42 @@
}
</script>
<div id="container">
<div class="container statistics">
<h2>
<?php echo $page_title; ?>
<small class="text-muted">Explore the logbook.</small>
</h2>
<br>
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">General</a>
</li>
<li class="nav-item">
<a class="nav-link" id="satellite-tab" data-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false">Satellites</a>
</li>
<li class="nav-item">
<a href="/index.php/statistics/custom" class="nav-link" role="tab">Custom</a>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
<div id="totals_year" style="width: 900px; height: 500px;"></div>
<div id="modechart_div"></div>
<div id="bandchart_div"></div>
</div>
<div class="tab-pane fade" id="satellite" role="tabpanel" aria-labelledby="satellite-tab">
<div id="satchart_div"></div>
</div>
</div>
<h2><?php echo $page_title; ?></h2>
<ul class="tabs">
<li class="active"><a href="#home">General</a></li>
<li><a href="#space">Satellite Contacts</a></li>
<li><a href="statistics/custom">Custom</a></li>
</ul>
<div class="pill-content">
<div class="active" id="home">
<div id="totals_year" style="width: 900px; height: 500px;"></div><div id="modechart_div"></div> <div id="bandchart_div"></div></div>
<div id="space"><div id="satchart_div"></div></div>
</div>
</div>

8
assets/css/general.css
查看文件

@ -12,4 +12,12 @@
}
.row.logdata {
padding-top: 15px;
}
.statistics {
padding-top: 15px;
}
.statistics_custom {
padding-top: 15px;
}