Changed Dashboard page to latest bootstrap and fixed Awards page
这个提交包含在：
Peter Goodhall
父节点
c00430d2a5
当前提交
b3ce2c9a27
共有 12 个文件被更改，包括 96 次插入 和 107 次删除
|
|
@ -62,9 +62,9 @@ class Dashboard extends CI_Controller {
|
||||||
|
|
||||||
$data['page_title'] = "Dashboard";
|
$data['page_title'] = "Dashboard";
|
||||||
|
|
||||||
$this->load->view('layout/header', $data);
|
$this->load->view('interface_assets/header', $data);
|
||||||
$this->load->view('dashboard/index');
|
$this->load->view('dashboard/index');
|
||||||
$this->load->view('layout/footer');
|
$this->load->view('interface_assets/footer');
|
||||||
}
|
}
|
||||||
|
|
||||||
function map() {
|
function map() {
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,8 @@ class DXCC extends CI_Model {
|
||||||
"6m" =>0,
|
"6m" =>0,
|
||||||
"4m" =>0,
|
"4m" =>0,
|
||||||
"2m" =>0,
|
"2m" =>0,
|
||||||
"70cm"=>0);
|
"70cm"=>0,
|
||||||
|
"23cm"=>0);
|
||||||
$last_country = $row->COL_COUNTRY;
|
$last_country = $row->COL_COUNTRY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
<div id="container">
|
<div class="container">
|
||||||
|
<br><br><br>
|
||||||
<h1><?php echo $page_title?></h1>
|
<h1><?php echo $page_title?></h1>
|
||||||
|
|
||||||
<?php $this->load->view("awards/nav_bar")?>
|
<?php $this->load->view("awards/nav_bar")?>
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
<div id="container">
|
<div class="container">
|
||||||
|
<br><br><br>
|
||||||
<h2>Logbook</h2>
|
<h2>Logbook</h2>
|
||||||
|
|
||||||
<h3>Filtering on <?php echo $filter ?></h3>
|
<h3>Filtering on <?php echo $filter ?></h3>
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
|
|
||||||
<div id="container">
|
<div class="container">
|
||||||
|
<br><br><br>
|
||||||
<h1><?php echo $page_title; ?></h1>
|
<h1><?php echo $page_title; ?></h1>
|
||||||
|
|
||||||
<!-- Sub Nav for Awards -->
|
<!-- Sub Nav for Awards -->
|
||||||
|
|
||||||
<?php $this->load->view("awards/nav_bar")?>
|
<?php $this->load->view("awards/nav_bar")?>
|
||||||
|
|
||||||
<table id="table-fixed"></table>
|
|
||||||
|
|
||||||
<table width="100%" class="zebra-striped">
|
<table class="table table-striped table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="width:225px">Country (<?php echo count($dxcc)?>)</td>
|
<td style="width:225px">Country (<?php echo count($dxcc)?>)</td>
|
||||||
|
|
@ -25,6 +25,7 @@
|
||||||
<td>4m</td>
|
<td>4m</td>
|
||||||
<td>2m</td>
|
<td>2m</td>
|
||||||
<td>70cm</td>
|
<td>70cm</td>
|
||||||
|
<td>23cm</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,14 @@
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<h2><?php echo $page_title; ?></h2>
|
|
||||||
|
|
||||||
<ul class="tabs">
|
<br><br><br>
|
||||||
<li class="active"><a href="<?php echo site_url('awards'); ?>">Home</a></li>
|
<h2><?php echo $page_title; ?></h2>
|
||||||
<li><a href="<?php echo site_url('awards/dxcc'); ?>">DXCC</a></li>
|
|
||||||
<li><a href="<?php echo site_url('awards/wab'); ?>">WAB</a></li>
|
|
||||||
<li><a href="<?php echo site_url('awards/sota'); ?>">SOTA</a></li>
|
<nav class="nav">
|
||||||
<li><a href="<?php echo site_url('awards/wacral'); ?>">WACRAL</a></li>
|
<a class="nav-link" href="<?php echo site_url('awards/dxcc'); ?>">DXCC</a>
|
||||||
<li><a href="<?php echo site_url('awards/cq'); ?>">CQ</a></li>
|
<a class="nav-link" href="<?php echo site_url('awards/wab'); ?>">WAB</a>
|
||||||
</ul>
|
<a class="nav-link" href="<?php echo site_url('awards/sota'); ?>">SOTA</a>
|
||||||
|
<a class="nav-link" href="<?php echo site_url('awards/cq'); ?>">CQ</a>
|
||||||
|
</nav>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,7 @@
|
||||||
|
|
||||||
<ul class="tabs">
|
<nav class="nav">
|
||||||
<li id="tab_dxcc">
|
<a class="nav-link" href="<?php echo site_url('awards/dxcc'); ?>">DXCC</a>
|
||||||
<a href="<?php echo site_url('awards/dxcc'); ?>">DXCC</a>
|
<a class="nav-link" href="<?php echo site_url('awards/wab'); ?>">WAB</a>
|
||||||
</li>
|
<a class="nav-link" href="<?php echo site_url('awards/sota'); ?>">SOTA</a>
|
||||||
<li id="tab_wab">
|
<a class="nav-link" href="<?php echo site_url('awards/cq'); ?>">CQ</a>
|
||||||
<a href="<?php echo site_url('awards/wab'); ?>">WAB</a>
|
</nav>
|
||||||
</li>
|
|
||||||
<li id="tab_sota">
|
|
||||||
<a href="<?php echo site_url('awards/sota'); ?>">SOTA</a>
|
|
||||||
</li>
|
|
||||||
<li id="tab_wacral">
|
|
||||||
<a href="<?php echo site_url('awards/wacral'); ?>">WACRAL</a>
|
|
||||||
</li>
|
|
||||||
<li id="tab_cq">
|
|
||||||
<a href="<?php echo site_url('awards/cq'); ?>">CQ</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
var tab = "<?php echo $this->router->fetch_method(); ?>";
|
|
||||||
$('#tab_'+tab).addClass('active');
|
|
||||||
</script>
|
|
||||||
|
|
@ -1,11 +1,13 @@
|
||||||
<div id="container">
|
<div class="container">
|
||||||
|
|
||||||
|
<br><br><br>
|
||||||
<h1><?php echo $page_title; ?></h1>
|
<h1><?php echo $page_title; ?></h1>
|
||||||
|
|
||||||
<!-- Sub Nav for Awards -->
|
<!-- Sub Nav for Awards -->
|
||||||
|
|
||||||
<?php $this->load->view("awards/nav_bar")?>
|
<?php $this->load->view("awards/nav_bar")?>
|
||||||
|
|
||||||
<table width="100%" class="zebra-striped">
|
<table class="table table-striped table-hover">
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>Reference</td>
|
<td>Reference</td>
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,14 @@
|
||||||
<div id="container">
|
<div class="container">
|
||||||
|
|
||||||
|
<br><br><br>
|
||||||
|
|
||||||
<h1><?php echo $page_title; ?></h1>
|
<h1><?php echo $page_title; ?></h1>
|
||||||
|
|
||||||
<!-- Sub Nav for Awards -->
|
<!-- Sub Nav for Awards -->
|
||||||
|
|
||||||
<?php $this->load->view("awards/nav_bar")?>
|
<?php $this->load->view("awards/nav_bar")?>
|
||||||
|
|
||||||
<table width="100%" class="zebra-striped">
|
<table class="table table-striped table-hover">
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>Square</td>
|
<td>Square</td>
|
||||||
|
|
|
||||||
|
|
@ -1,67 +1,37 @@
|
||||||
<script type="text/javascript" src="<?php echo base_url() ;?>fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
|
<div class="container">
|
||||||
|
<br><br><br>
|
||||||
<script type="text/javascript" src="<?php echo base_url() ;?>fancybox/jquery.fancybox-1.3.4.pack.js"></script>
|
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="<?php echo base_url() ;?>fancybox/jquery.fancybox-1.3.4.css" media="screen" />
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
|
|
||||||
$(document).ready(function() {
|
|
||||||
$(".qsobox").fancybox({
|
|
||||||
'autoDimensions' : false,
|
|
||||||
'width' : 700,
|
|
||||||
'height' : 300,
|
|
||||||
'transitionIn' : 'fade',
|
|
||||||
'transitionOut' : 'fade',
|
|
||||||
'type' : 'iframe'
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<script type="text/javascript" src="<?php echo base_url();?>js/leaflet/leafembed.js"></script>
|
|
||||||
<script type="text/javascript">
|
|
||||||
|
|
||||||
<?php if($qra == "set") { ?>
|
|
||||||
var q_lat = <?php echo $qra_lat; ?>;
|
|
||||||
var q_lng = <?php echo $qra_lng; ?>;
|
|
||||||
<?php } else { ?>
|
|
||||||
var q_lat = 40.313043;
|
|
||||||
var q_lng = -32.695312;
|
|
||||||
<?php } ?>
|
|
||||||
|
|
||||||
var qso_loc = '<?php echo site_url('dashboard/map');?>';
|
|
||||||
var q_zoom = 2;
|
|
||||||
|
|
||||||
$(document).ready(function(){
|
|
||||||
initmap();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div id="container">
|
|
||||||
|
|
||||||
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
|
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
|
||||||
<div class="alert-message success">
|
|
||||||
<p>You have had <strong><?php echo $todays_qsos; ?></strong> QSOs Today!</p>
|
<?php if($todays_qsos >= 1) { ?>
|
||||||
</div>
|
<div class="alert alert-success" role="alert">
|
||||||
|
You have had <strong><?php echo $todays_qsos; ?></strong> QSOs Today!
|
||||||
|
</div>
|
||||||
|
<?php } else { ?>
|
||||||
|
<div class="alert alert-danger" role="alert">
|
||||||
|
You have made no QSOs today, time to turn on the radio!
|
||||||
|
</div>
|
||||||
|
<?php } ?>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
<!-- Map -->
|
<!-- Map -->
|
||||||
<div id="map" style="width: 100%; height: 300px"></div>
|
<div id="map" style="width: 100%; height: 300px"></div>
|
||||||
|
|
||||||
<!-- Log Data -->
|
<!-- Log Data -->
|
||||||
<div class="row" style="margin-top: 10px;">
|
<div class="row">
|
||||||
<div class="span10" style="padding-left: 15px; padding-right: 25px; border-right: 1px solid #dfdfdf;">
|
<div class="col-8" style="padding-left: 15px; padding-right: 25px; border-right: 1px solid #dfdfdf;">
|
||||||
<table width="100%" class="zebra-striped">
|
<table class="table table-striped table-hover">
|
||||||
<tr class="titles">
|
|
||||||
<td>Date</td>
|
<thead>
|
||||||
<td>Time</td>
|
<tr class="titles">
|
||||||
<td>Call</td>
|
<th>Date</th>
|
||||||
<td>Mode</td>
|
<th>Time</th>
|
||||||
<td>Sent</td>
|
<th>Call</th>
|
||||||
<td>Recv</td>
|
<th>Mode</th>
|
||||||
<td>Band</td>
|
<th>Sent</th>
|
||||||
</tr>
|
<th>Recv</th>
|
||||||
|
<th>Band</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
|
||||||
<?php $i = 0;
|
<?php $i = 0;
|
||||||
foreach ($last_five_qsos->result() as $row) { ?>
|
foreach ($last_five_qsos->result() as $row) { ?>
|
||||||
|
|
@ -82,10 +52,10 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="span5">
|
<div class="col-4">
|
||||||
<table width="100%" class="zebra-striped">
|
<table class="table table-striped table-hover">
|
||||||
<tr class="titles">
|
<tr class="titles">
|
||||||
<td colspan="2"><span class="icon_stats">QSOs</span></td>
|
<td colspan="2"><i class="fas fa-chart-bar"></i> QSOs</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -109,7 +79,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr class="titles">
|
<tr class="titles">
|
||||||
<td colspan="2"><span class="icon_world">Countries</span></td>
|
<td colspan="2"><i class="fas fa-globe-europe"></i> Countries</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -128,7 +98,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr class="titles">
|
<tr class="titles">
|
||||||
<td colspan="2"><span class="icon_qsl">QSL Cards</span></td>
|
<td colspan="2"><i class="fas fa-envelope"></i>QSL Cards</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
|
||||||
<script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
|
<script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
|
||||||
|
|
||||||
|
<script type="text/javascript" src="<?php echo base_url(); ?>js/leaflet/leaflet.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$('#create_station_profile #country').val($("#dxcc_select option:selected").text());
|
$('#create_station_profile #country').val($("#dxcc_select option:selected").text());
|
||||||
|
|
@ -13,6 +15,27 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
<script type="text/javascript" src="<?php echo base_url();?>js/leaflet/leafembed.js"></script>
|
||||||
|
<script type="text/javascript">
|
||||||
|
|
||||||
|
<?php if($qra == "set") { ?>
|
||||||
|
var q_lat = <?php echo $qra_lat; ?>;
|
||||||
|
var q_lng = <?php echo $qra_lng; ?>;
|
||||||
|
<?php } else { ?>
|
||||||
|
var q_lat = 40.313043;
|
||||||
|
var q_lng = -32.695312;
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
var qso_loc = '<?php echo site_url('dashboard/map');?>';
|
||||||
|
var q_zoom = 2;
|
||||||
|
|
||||||
|
$(document).ready(function(){
|
||||||
|
initmap();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<?php if ($this->uri->segment(1) == "radio") { ?>
|
<?php if ($this->uri->segment(1) == "radio") { ?>
|
||||||
<!-- If this is the admin/radio page run the JS -->
|
<!-- If this is the admin/radio page run the JS -->
|
||||||
|
|
|
||||||
|
|
@ -9,11 +9,14 @@
|
||||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/bootstrap.min.css">
|
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/bootstrap.min.css">
|
||||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.css">
|
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.css">
|
||||||
|
|
||||||
|
<!-- Maps -->
|
||||||
|
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>js/leaflet/leaflet.css" />
|
||||||
|
|
||||||
<title><?php if(isset($page_title)) { echo $page_title; } ?> - Cloudlog</title>
|
<title><?php if(isset($page_title)) { echo $page_title; } ?> - Cloudlog</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<nav class="navbar navbar-expand-lg navbar-light bg-light">
|
<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
|
||||||
<a class="navbar-brand" href="<?php echo site_url(); ?>">Cloudlog</a>
|
<a class="navbar-brand" href="<?php echo site_url(); ?>">Cloudlog</a>
|
||||||
|
|
||||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用