diff --git a/application/controllers/Api.php b/application/controllers/Api.php index 14f3a7d5..8d71329a 100644 --- a/application/controllers/Api.php +++ b/application/controllers/Api.php @@ -50,11 +50,11 @@ class API extends CI_Controller { $data['api_keys'] = $this->api_model->keys(); - $data['page_title'] = "API Help"; + $data['page_title'] = "API Options"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('api/help'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } function generate($rights) { diff --git a/application/controllers/Station.php b/application/controllers/Station.php index d7001cfd..9e50db8e 100644 --- a/application/controllers/Station.php +++ b/application/controllers/Station.php @@ -24,9 +24,9 @@ class Station extends CI_Controller { // Render Page $data['page_title'] = "Station Profiles"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('station_profile/index'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } public function create() @@ -43,9 +43,9 @@ class Station extends CI_Controller { if ($this->form_validation->run() == FALSE) { $data['page_title'] = "Create Station Profile"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('station_profile/create'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } else { diff --git a/application/controllers/User.php b/application/controllers/User.php index 44a9f7a0..36a9754a 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -12,9 +12,9 @@ class User extends CI_Controller { $data['page_title'] = "Users"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('user/main'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } function add() { @@ -40,7 +40,7 @@ class User extends CI_Controller { { $data['page_title'] = "Add User"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); if($this->input->post('user_name')) { $data['user_name'] = $this->input->post('user_name'); @@ -56,7 +56,7 @@ class User extends CI_Controller { } else { $this->load->view('user/add', $data); } - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } else { @@ -79,7 +79,7 @@ class User extends CI_Controller { } $data['page_title'] = "Users"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $data['user_name'] = $this->input->post('user_name'); $data['user_email'] = $this->input->post('user_email'); $data['user_password'] = $this->input->post('user_password'); @@ -89,7 +89,7 @@ class User extends CI_Controller { $data['user_callsign'] = $this->input->post('user_callsign'); $data['user_locator'] = $this->input->post('user_locator'); $this->load->view('user/add'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } } @@ -119,7 +119,7 @@ class User extends CI_Controller { { $data['page_title'] = "Edit User"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $q = $query->row(); $data['id'] = $q->user_id; @@ -221,7 +221,7 @@ class User extends CI_Controller { } $this->load->view('user/edit', $data); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } else { @@ -250,7 +250,7 @@ class User extends CI_Controller { } $data['page_title'] = "Edit User"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $data['user_name'] = $this->input->post('user_name'); $data['user_email'] = $this->input->post('user_email'); $data['user_password'] = $this->input->post('user_password'); @@ -261,7 +261,7 @@ class User extends CI_Controller { $data['user_locator'] = $this->input->post('user_locator'); $data['user_timezone'] = $this->input->post('user_timezone'); $this->load->view('user/edit'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } } @@ -278,9 +278,9 @@ class User extends CI_Controller { $data['user_callsign'] = $q->user_callsign; $data['user_locator'] = $q->user_locator; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('user/profile'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } function delete() { @@ -297,9 +297,9 @@ class User 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('user/delete'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } else { diff --git a/application/views/api/help.php b/application/views/api/help.php index 07f92e9a..0fbaf384 100644 --- a/application/views/api/help.php +++ b/application/views/api/help.php @@ -1,95 +1,66 @@ -
- -

API

- - - - - - - - - - +
+
session->flashdata('notice')) { ?>
session->flashdata('notice'); ?>
-

API Keys

+
+
+ +
+
+
API or Application Programming Interface lets third party systems access Cloudlog
+

You will need to generate API keys if you wish to use tools like CloudlogCAT.

-num_rows() > 0) { ?> + num_rows() > 0) { ?> - +
+ + + + + + + + + result() as $row) { ?> + + + - - - - + + + - result() as $row) { ?> + - - -
API KeyRightsStatus
key; ?> + rights == "rw") { + echo "Read & Write"; + } elseif($row->rights == "r") { + echo "Read Only"; + } else { + echo "Unknown"; + } + + ?> -
API KeyRightsStatus
status); ?> - Test
key; ?> +
- rights == "rw") { - echo "Read & Write"; - } elseif($row->rights == "r") { - echo "Read Only"; - } else { - echo "Unknown"; - } - - ?> + +

You have no API Keys.

+ - - status); ?> - Test - +

+ Generate Key with Read & Write Access + Generate Key with Read Only Access +

- - - - - -

You have no API Keys.

- - -

Generate API Key

- - -There are a number of API calls you can make from other applications, with output available in either XML or JSON. -

API Guide

-

Description

-Query the logbook, and output in XML format. -

Syntax

-
  • /search/format=<format>/query=<field><=|~><value>{(and|or)...}/limit=<num>/fields=<field1>,{<field2>/order=<field>
    -

    Example

    -Search for entries with a call beginning with M0 and a locator beginning with I or J, show the callsign and locator fields, order it by callsign and limit the results to 10. -
  • /search/format=xml/query=Call~M0*(and)(Locator~I*(or)Locator~J*)/limit=10/fields=distinct(Call),Locator/order=Call(asc)
    -
  • Run it! (XML) or Run it! (JSON) +
    • +
    + diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php new file mode 100644 index 00000000..e24a8590 --- /dev/null +++ b/application/views/interface_assets/footer.php @@ -0,0 +1,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php new file mode 100644 index 00000000..9e47d3f2 --- /dev/null +++ b/application/views/interface_assets/header.php @@ -0,0 +1,108 @@ + + + + + + + + + + + + <?php if(isset($page_title)) { echo $page_title; } ?> - Cloudlog + + + + \ No newline at end of file diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index b75820fd..88568151 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -1,101 +1,106 @@ -
    -

    - - session->flashdata('notice')) { ?> -
    - session->flashdata('notice'); ?> -
    + +
    + +
    + session->flashdata('message')) { ?> + +
    +

    session->flashdata('message'); ?>

    +
    - load->helper('form'); +
    +
    + +
    +
    +
    +

    - ?> - + session->flashdata('notice')) { ?> +
    + session->flashdata('notice'); ?> +
    + -
    + load->helper('form'); ?> - - - - - + - - - - + +
    + + + Shortname for the station location for example Home (IO87IP) +
    - - - - +
    + + + Station City for example Inverness +
    - +
    + + + If you do not know your ITU Zone click Here to find it! +
    - - - - +
    + + + Station Gridsquare for example IO87IP, if you are at a gridline enter the gridsquare with a comma for example IO77,IO78,IO87,IO88. +
    - - - - +
    + + + Station IOTA Reference for example EU-005. +
    - - - - +
    + + + Station SOTA Reference. +
    - - - - + - - - - + + + +
    - - - - - - - - - - - - - - -
    Station Profile Name
    Station Callsign
    DXCC # For Country +
    + + + Station Callsign for example 2M0SQL/P +
    + +
    + num_rows() > 0) { ?> - - + + + + Station DXCC +
    -
    City
    Country -
    Cnty
    CQ Zone
    ITU Zone
    Gridsquare
    IOTA Reference
    SOTA Reference
    - -
    - - - -
    \ No newline at end of file +
    \ No newline at end of file diff --git a/application/views/station_profile/index.php b/application/views/station_profile/index.php index fe5bdc81..78305bd8 100644 --- a/application/views/station_profile/index.php +++ b/application/views/station_profile/index.php @@ -1,41 +1,40 @@ -
    -

    - -

    Station Profiles define locations of operating positions, useful for portable operating or using a friends QTH.

    +
    +
    session->flashdata('message')) { ?> - -
    -

    session->flashdata('message'); ?>

    -
    + +
    +

    session->flashdata('message'); ?>

    +
    -
    -
    - - - - +
    + +
    +
    +
    Lets Explore Operating Locations
    +

    Station Profiles define locations of operating positions, useful for portable operating or using a friends QTH.

    - if ($stations->num_rows() > 0) - { - ?> + num_rows() > 0) { ?> + +
    + - - - - - - - - - - + + + + + + + + + + - result() as $row) - { - ?> + + + result() as $row) { ?> @@ -46,21 +45,16 @@ - + - + +
    Profile NameCountryGridsquareCityIOTASOTACntyCQITUProfile NameCountryGridsquareCityIOTASOTACntyCQITU
    station_profile_name;?> station_country;?>station_cnty;?> station_cq;?> station_itu;?>station_id; ?>">Deletestation_id; ?>" class="btn btn-danger"> Delete
    + - } - - } else { - echo "

    Nothing to show

    "; - } - - ?> -
    - - Create Station Profile +

    Create a Station Location

    +
    +
    -
    -
    \ No newline at end of file +
    \ No newline at end of file diff --git a/application/views/user/add.php b/application/views/user/add.php index de65b8c3..0c2e19a3 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -1,94 +1,89 @@ -
    - -

    Add user

    +
    +
    session->flashdata('notice')) { ?>
    session->flashdata('notice'); ?>
    -load->helper('form'); +
    +
    Create User Account
    +
    +
    +

    -?> - + load->helper('form'); ?> + -
    - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    + + + ".$username_error."
    "; } ?> + - - - - - -
    Username - ".$username_error.""; } ?> -
    Level -
    E-mail - ".$email_error.""; } ?> -
    Password - ".$password_error.""; } ?> -
    First name - ".$firstname_error.""; } ?> -
    Last name - ".$lastname_error.""; } ?> -
    Callsign - ".$callsign_error.""; } ?> -
    Locator - ".$locator_error.""; } ?> -
    Timezone
    - -
    +
    + + +
    + +
    + + + ".$email_error."
    "; } ?> +
    + +
    + + + ".$password_error."
    "; } ?> +
    + +
    + + + ".$firstname_error."
    "; } ?> +
    + +
    + + + ".$lastname_error."
    "; } ?> +
    + +
    + + + ".$callsign_error."
    "; } ?> +
    + +
    + + + ".$locator_error."
    "; } ?> +
    + +
    + + +
    + + + + + + - \ No newline at end of file diff --git a/application/views/user/delete.php b/application/views/user/delete.php index da780d38..b934a465 100644 --- a/application/views/user/delete.php +++ b/application/views/user/delete.php @@ -1,18 +1,18 @@ -
    +
    +
    +
    +
    + Delete User Account +
    +
    +
    -

    Edit user

    -
    - - -
    uri->segment(3); ?>" name="users"> - - - - -
    Are you sure you want to delete ?
    - -
    No, do not delete this user
    - -
    +

    Are you sure you want to delete the user account ?

    +
    uri->segment(3); ?>" name="users"> + + No, do not delete this user +
    +
    +
    diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 1e537d26..1fc511b0 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -1,130 +1,137 @@ -
    +
    -

    Edit user

    +
    + session->flashdata('message')) { ?> + +
    +

    session->flashdata('message'); ?>

    +
    + - - +
    + Edit User +
    +
    +
    +

    -$this->load->helper('form'); + + load->helper('form'); ?> + +
    uri->segment(3); ?>" name="users"> +
    + + + ".$username_error."
    "; } ?> +
    -?> -uri->segment(3); ?>" name="users"> - - - - - - - - - - - config->item('auth_level'); - echo $l[$user_type]; - }?> - - + - - - - - - - - - - - - - - - - - - - - - - - - - - +
    + + + ".$firstname_error."
    "; } else { ?> + + - - - - +
    + + + ".$lastname_error."
    "; } else { ?> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Username - ".$username_error.""; } ?> -
    Level - session->userdata('user_type') == 99) { ?> - + config->item('auth_level'); - while (list($key, $val) = each($levels)) { - ?> - + $levels = $this->config->item('auth_level'); + while (list($key, $val) = each($levels)) { + ?> + + + + config->item('auth_level'); + echo $l[$user_type]; + }?> + + +
    + + + ".$email_error."
    "; } ?> + + +
    + + + ".$password_error."
    "; } else { ?> +
    Leave blank to keep existing password
    E-mail - ".$email_error.""; } ?> -
    Password - ".$password_error.""; } else { ?> -
    Leave blank to keep existing password
    First name - ".$firstname_error.""; } else { ?> - -
    Last name - ".$lastname_error.""; } else { ?> - -
    Callsign - ".$callsign_error.""; } else { ?> - -
    Locator - ".$locator_error.""; } else { ?> - -
    Timezone
    Logbook of The World (LoTW) Username - ".$userlotwname_error.""; } ?> -
    Logbook of The World (LoTW) Password - ".$lotwpassword_error.""; } else { ?> -
    Leave blank to keep existing password
    eQSL.cc Username - ".$usereqslname_error.""; } ?> -
    eQSL.cc Password - ".$eqslpassword_error.""; } else { ?> -
    Leave blank to keep existing password
    eQSL.cc QTH Nickname -
    - -
    +
    + + + ".$callsign_error."
    "; } else { ?> + +
    + +
    + + + ".$locator_error."
    "; } else { ?> + +
    + +
    + + +
    + +
    + + + ".$userlotwname_error."
    "; } ?> +
    + +
    + + + ".$lotwpassword_error."
    "; } else { ?> +
    Leave blank to keep existing password
    + +
    + +
    + + + ".$lotwpassword_error."
    "; } else { ?> +
    Leave blank to keep existing password
    + + + +
    + + + ".$eqslpassword_error."
    "; } else { ?> +
    Leave blank to keep existing password
    + + + +
    + + +
    + + + + + + - + diff --git a/application/views/user/main.php b/application/views/user/main.php index 4311c5af..4c17ee5a 100644 --- a/application/views/user/main.php +++ b/application/views/user/main.php @@ -1,65 +1,50 @@ -

    Users

    - - - - - - - - - -
    - -

    Cloudlog Users

    - -
    -
    +
    +
    session->flashdata('notice')) { ?>
    session->flashdata('notice'); ?>
    - - - - - - - +
    +
    + +
    +
    +
    Cloudlog Needs Users You make them here.
    +

    +
    +
    UserE-mailTypeOptions
    + + + + + + + + + - result() as $row) { ?> - '; ?> - - - - - - -
    UserE-mailTypeOptions
    user_id; ?>">user_name; ?>user_email; ?>config->item('auth_level'); echo $l[$row->user_type]; ?>user_id; ?>">Edit user_id; ?>">Delete
    -
    -
    - Add user -
    + $i = 0; + foreach ($results->result() as $row) { ?> + '; ?> + user_id; ?>">user_name; ?> + user_email; ?> + config->item('auth_level'); echo $l[$row->user_type]; ?> + user_id; ?>" class="btn btn-primary btn-sm"> Edit user_id; ?>" class="btn btn-danger btn-sm"> Delete + + + +
    - +

    + Add user +

    +
    + + + \ No newline at end of file diff --git a/application/views/user/profile.php b/application/views/user/profile.php index d7017251..f135a51b 100644 --- a/application/views/user/profile.php +++ b/application/views/user/profile.php @@ -1,32 +1,15 @@ - +
    - +
    - - - - -
    - -
    - -

    session->userdata('user_name')."'s profile"; ?>

    - +
    +
    + session->userdata('user_name')."'s profile"; ?> +
    +
    +
    +

    +
    @@ -63,9 +46,10 @@
    Username
    -
    session->userdata('user_id'); ?>">Edit profile
    - +session->userdata('user_id'); ?>">Edit profile +
    +
    +
    -