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

Merge remote-tracking branch 'upstream/master'

浏览代码
这个提交包含在：
Andy 2018-11-24 21:01:33 +00:00
当前提交 5959f8d6b8
共有 8 个文件被更改，包括 34 次插入 和 13 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

14
application/config/config.sample.php
查看文件

@ -33,6 +33,16 @@ $config['table_name'] = "TABLE_HRD_CONTACTS_V01";
$config['locator'] = ""; $config['locator'] = "";
$config['display_freq'] = true; $config['display_freq'] = true;
/*
|--------------------------------------------------------------------------
| Google Maps JavaScript API Key
|--------------------------------------------------------------------------
| visit https://developers.google.com/maps/documentation/javascript/get-api-key
|
| 'gmaps_api_key' API key from Google Cloud Plattform
*/
$config['gmaps_api_key'] = "";
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Authentication | Authentication
@ -566,8 +576,8 @@ $config['compress_output'] = FALSE;
| helper' page of the user guide for information regarding date handling. | helper' page of the user guide for information regarding date handling.
| |
*/ */
$config['time_reference'] = 'local'; $config['time_reference'] = 'UTC';
date_default_timezone_set($config['time_reference']);
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Rewrite PHP Short Tags | Rewrite PHP Short Tags

2
application/views/layout/header.php
查看文件

@ -10,7 +10,7 @@
<script type="text/javascript" src="<?php echo base_url(); ?>js/bootstrap-dropdown.js"></script> <script type="text/javascript" src="<?php echo base_url(); ?>js/bootstrap-dropdown.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>js/bootstrap-tabs.js"></script> <script type="text/javascript" src="<?php echo base_url(); ?>js/bootstrap-tabs.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>js/global.js"></script> <script type="text/javascript" src="<?php echo base_url(); ?>js/global.js"></script>
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js"></script> <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=<?php echo $this->config->item('gmaps_api_key');?>"></script>
<!-- CSS Files --> <!-- CSS Files -->
<link type="text/css" href="<?php echo base_url(); ?>css/flick/jquery-ui-1.8.12.custom.css" rel="stylesheet" /> <link type="text/css" href="<?php echo base_url(); ?>css/flick/jquery-ui-1.8.12.custom.css" rel="stylesheet" />

2
application/views/layout/mini_header.php
查看文件

@ -10,7 +10,7 @@
<script type="text/javascript" src="<?php echo base_url(); ?>js/jquery-1.5.1.min.js"></script> <script type="text/javascript" src="<?php echo base_url(); ?>js/jquery-1.5.1.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>js/jquery-ui-1.8.12.custom.min.js"></script> <script type="text/javascript" src="<?php echo base_url(); ?>js/jquery-ui-1.8.12.custom.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>js/global.js"></script> <script type="text/javascript" src="<?php echo base_url(); ?>js/global.js"></script>
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js"></script> <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=<?php echo $this->config->item('gmaps_api_key');?>"></script>
</head> </head>

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

@ -10,9 +10,9 @@
<h2><?php echo $page_title; ?></h2> <h2><?php echo $page_title; ?></h2>
<ul class="tabs"> <ul class="tabs">
<li><a href="statistics">General</a></li> <li><a href="<?php echo site_url('statistics');?>#home">General</a></li>
<li><a href="statistics">Satellite Contacts</a></li> <li><a href="<?php echo site_url('statistics');?>#space">Satellite Contacts</a></li>
<li class="active"><a href="statistics/custom">Custom</a></li> <li class="active"><a href="<?php echo site_url('statistics');?>/custom">Custom</a></li>
</ul> </ul>
<p>This is a work in-progress</p> <p>This is a work in-progress</p>

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

@ -10,9 +10,9 @@
<h2><?php echo $page_title; ?></h2> <h2><?php echo $page_title; ?></h2>
<ul class="tabs"> <ul class="tabs">
<li><a href="statistics">General</a></li> <li><a href="<?php echo site_url('statistics');?>#home">General</a></li>
<li><a href="statistics">Satellite Contacts</a></li> <li><a href="<?php echo site_url('statistics');?>#space">Satellite Contacts</a></li>
<li class="active"><a href="statistics/custom">Custom</a></li> <li class="active"><a href="<?php echo site_url('statistics');?>/custom">Custom</a></li>
</ul> </ul>
<p>This is a work in-progress</p> <p>This is a work in-progress</p>

2
application/views/view_log/qso.php
查看文件

@ -19,7 +19,7 @@ line-height: 1.7;
margin: 10px 0; margin: 10px 0;
} }
</style> </style>
<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script> <script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false&key=<?php echo $this->config->item('gmaps_api_key');?>"></script>
</head> </head>
<body onload="initialize()"> <body onload="initialize()">

13
install/config/config.php
查看文件

@ -32,6 +32,16 @@ $config['table_name'] = "TABLE_HRD_CONTACTS_V01";
$config['locator'] = "%baselocator%"; $config['locator'] = "%baselocator%";
$config['display_freq'] = false; $config['display_freq'] = false;
/*
|--------------------------------------------------------------------------
| Google Maps JavaScript API Key
|--------------------------------------------------------------------------
| visit https://developers.google.com/maps/documentation/javascript/get-api-key
|
| 'gmaps_api_key' API key from Google Cloud Plattform
*/
$config['gmaps_api_key'] = "";
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Authentication | Authentication
@ -541,7 +551,8 @@ $config['compress_output'] = FALSE;
| helper' page of the user guide for information regarding date handling. | helper' page of the user guide for information regarding date handling.
| |
*/ */
$config['time_reference'] = 'local'; $config['time_reference'] = 'UTC';
date_default_timezone_set ( $config['time_reference'] );
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

2
install/index.php
查看文件

@ -101,7 +101,7 @@ if($_POST) {
<fieldset> <fieldset>
<legend>Configuration Settings</legend> <legend>Configuration Settings</legend>
<label for="directory">Directory</label><input type="text" id="directory" value="<?php echo str_replace("/install/", "", $_SERVER['REQUEST_URI']); ?>" class="input_text" name="directory" /> <label for="directory">Directory</label><input type="text" id="directory" value="<?php echo str_replace("/install/", "", $_SERVER['REQUEST_URI']); ?>" class="input_text" name="directory" />
<label for="websiteurl">Website URL</label><input type="text" id="websiteurl" value="http://<?php echo $_SERVER['HTTP_HOST'].str_replace("/install/", "", $_SERVER['REQUEST_URI']); ?>" class="input_text" name="websiteurl" /> <label for="websiteurl">Website URL</label><input type="text" id="websiteurl" value="<?php echo $_SERVER['REQUEST_SCHEME']; ?>://<?php echo $_SERVER['HTTP_HOST'].str_replace("/install/", "", $_SERVER['REQUEST_URI']); ?>" class="input_text" name="websiteurl" />
<label for="locator">Default Gridsquare</label><input type="text" id="locator" value="IO91JS" class="input_text" name="locator" /> <label for="locator">Default Gridsquare</label><input type="text" id="locator" value="IO91JS" class="input_text" name="locator" />
</fieldset> </fieldset>