All sorts of updates

pull/106/merge
Peter Goodhall 2011-10-18 22:29:50 +01:00
rodzic 02117d6a59
commit 12706b313c
7 zmienionych plików z 95 dodań i 139 usunięć

Wyświetl plik

@ -1,33 +1,56 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/* Logbook options */
/*
|--------------------------------------------------------------------------
| Install Options
|--------------------------------------------------------------------------
|
| 'app_name' Name of the App 'Cloudlog'
| 'app_version' Set by the dev team.
| 'directory' directory where cloudlog is installed eg "logger"
*/
$config['app_name'] = "Cloudlog";
$config['app_version'] = "0.1";
$config['directory'] = "logbook";
/*
|--------------------------------------------------------------------------
| Logbook Options
|--------------------------------------------------------------------------
|
| 'table_name' SQL table where log can be found
| 'locator' Default locator used to calculate bearings/distance
| 'display_freq' Show or Hide frequnecy info
*/
$config['table_name'] = "table_hrd_contacts_v01";
$config['locator'] = "IO91JS";
$config['display_freq'] = false; // hide and display freq input on Add QSO
$config['display_freq'] = false;
/*
|--------------------------------------------------------------------------
| Authentication
|--------------------------------------------------------------------------
|
| 'use_auth' False turns all authentication off, best used when setting up
| 'auth_table' MySQL Database Table defaults "users"
| 'auth_mode' Minimum user level required 0 = anonymous, 1 = viewer,
| 2 = editor, 3 = api user, 99 = owner
| 'auth_level[]' Defines level titles
*/
/* User options */
// Use authentication?
$config['use_auth'] = true;
// User table
$config['auth_table'] = "users";
// Minimum user level required
// 0 = anonymous, 1 = viewer, 2 = editor, 3 = api user, 99 = owner
$config['auth_mode'] = "0";
// User levels
$config['auth_level'][0] = "Anonymous";
$config['auth_level'][1] = "Viewer";
$config['auth_level'][2] = "Editor";
$config['auth_level'][3] = "API User";
$config['auth_level'][99] = "Administrator";
/* Beta Features */
$config['beta'] = true;
$config['app_name'] = "Web Logger";
$config['app_version'] = "0.1";
/*
|--------------------------------------------------------------------------
| Base Site URL

Wyświetl plik

@ -10,7 +10,7 @@ class Qra {
return qra2latlong($strQRA);
}
function bearing($rx, $tx) {
function bearing($tx, $rx) {
$my = qra2latlong($tx);
$stn = qra2latlong($rx);

Wyświetl plik

@ -86,7 +86,7 @@
var marker, i;
/* Get QSO points via json*/
$.getJSON("/logbook/index.php/dashboard/map", function(data) {
$.getJSON("/<?php echo $this->config->item('directory'); ?>//index.php/dashboard/map", function(data) {
$.each(data.markers, function(i, val) {
/* Create Markers */

Wyświetl plik

@ -41,11 +41,9 @@
<li><a href="<?php echo site_url('search');?>" title="Search">Search</a></li>
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
<li><a href="<?php echo site_url('qso');?>" title="Add QSO">Add QSO</a></li>
<li><a href="<?php echo site_url('contest');?>" title="Contests">Contests</a></li>
<?php } ?>
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE){ ?>
<li><a href="<?php echo site_url('notes');?>" title="Notes">Notes</a></li>
<li><a href="<?php echo site_url('qsl');?>" title="Notes">QSLing</a></li>
<?php } ?>
<li><a href="<?php echo site_url('statistics');?>" title="Statistics">Statistics</a></li>
<?php if(($this->config->item('use_auth') && $this->session->userdata('user_type') >= 99) || $this->config->item('use_auth') === FALSE) { ?>

Wyświetl plik

@ -30,7 +30,7 @@
var marker, i;
/* Get QSO points via json*/
$.getJSON("/logbook/index.php/logbook/qso_map/25/<?php echo $this->uri->segment(3); ?>", function(data) {
$.getJSON("/<?php echo $this->config->item('directory'); ?>/index.php/logbook/qso_map/25/<?php echo $this->uri->segment(3); ?>", function(data) {
$.each(data.markers, function(i, val) {
/* Create Markers */

Wyświetl plik

@ -3,6 +3,10 @@
{
"selected_items":
[
[
"font",
"font: font-family: family"
],
[
"background",
"background: background-color: hex"
@ -12,34 +16,10 @@
"buffers":
[
{
"file": "application/controllers/search.php",
"file": "application/views/layout/header.php",
"settings":
{
"buffer_size": 704,
"line_ending": "Windows"
}
},
{
"file": "application/views/search/main.php",
"settings":
{
"buffer_size": 453,
"line_ending": "Windows"
}
},
{
"file": "application/models/logbook_model.php",
"settings":
{
"buffer_size": 14475,
"line_ending": "Windows"
}
},
{
"file": "application/controllers/logbook.php",
"settings":
{
"buffer_size": 6526,
"buffer_size": 5105,
"line_ending": "Windows"
}
}
@ -76,13 +56,44 @@
},
"file_history":
[
"/C/Users/Peter/git/HRD-Web-Frontend/application/config/config.php",
"/C/Users/Peter/Desktop/index.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/libraries/Qra.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/logbook.php",
"/C/Users/Peter/Desktop/legal/legal.pages.inc",
"/C/Users/Peter/Desktop/legal/legal.module",
"/C/Users/Peter/Desktop/sexybookmarks/includes/system.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/views.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/views_handler_field_node_sexybookmarks.inc",
"/C/Users/Peter/Downloads/disable_messages-6.x-1.1/disable_messages/README.txt",
"/C/Users/Peter/Desktop/sexybookmarks/includes/sexybookmarks.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/shorten.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/link.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/nd.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/node.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/nodereference.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/page_title.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/block.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/bouncer.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/boxes.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/content.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/ctools.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/custom_formatters.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/formatter_settings.inc",
"/C/Users/Peter/Desktop/sexybookmarks/includes/help.inc",
"/C/Users/Peter/Desktop/sexybookmarks/sexybookmarks.module",
"/C/Users/Peter/Desktop/sexybookmarks/plugins/content_types/sexybookmarks.inc",
"/C/Users/Peter/Desktop/legal.html",
"/C/Users/Peter/git/HRD-Web-Frontend/css/global.css",
"/C/Users/Peter/git/HRD-Web-Frontend/js/global.js",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/header.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/search.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/search/main.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/models/logbook_model.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/qsl.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/qsl/main.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/header.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/dashboard.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/view_log/qso.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/logbook.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/models/logbook_model.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/view_log/index.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/dashboard/index.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/backup.php",
@ -96,7 +107,6 @@
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/user.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/welcome.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/adif.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/config/config.php",
"/C/Users/Peter/Desktop/log.kml",
"/C/Users/Peter/git/HRD-Web-Frontend/application/config/routes.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/social/map.php",
@ -126,6 +136,9 @@
"case_sensitive": false,
"find_history":
[
"created",
"has been created",
"I agree with these terms",
"get_last_qsos",
"map_"
],
@ -145,105 +158,23 @@
"groups":
[
{
"selected": 3,
"selected": 0,
"sheets":
[
{
"buffer": 0,
"file": "application/controllers/search.php",
"file": "application/views/layout/header.php",
"settings":
{
"buffer_size": 704,
"buffer_size": 5105,
"regions":
{
},
"selection":
[
[
683,
683
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"tab_size": 4.0,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 1,
"file": "application/views/search/main.php",
"settings":
{
"buffer_size": 453,
"regions":
{
},
"selection":
[
[
453,
453
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage"
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 2,
"file": "application/models/logbook_model.php",
"settings":
{
"buffer_size": 14475,
"regions":
{
},
"selection":
[
[
0,
0
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"tab_size": 4.0,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 3,
"file": "application/controllers/logbook.php",
"settings":
{
"buffer_size": 6526,
"regions":
{
},
"selection":
[
[
3945,
3945
2218,
2218
]
],
"settings":
@ -252,7 +183,7 @@
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 2129.0,
"translation.y": 611.0,
"zoom_level": 1.0
},
"type": "text"

Wyświetl plik

@ -1,8 +1,12 @@
$(function(){
// Accordion
/* Load Tabs */
$("#tabs").tabs();
/* Theme buttons */
$( "button, input:submit", ".wrap_content" ).button();
$( "button, input:submit", ".contest_wrap" ).button();
/* Subnav options */
$( "#admin" ).click(function() {
$( "#submenu" ).toggle( 'blinds', null, 500 );
$( "#clear" ).toggle( 'blinds', null, 500 );