mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Adding Titles to pages

pull/106/merge
Peter Goodhall 2011-11-04 17:32:03 +00:00
rodzic d83c27c0e7
commit 3ed8928bd4
14 zmienionych plików z 7481 dodań i 45 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
application/controllers/adif.php
Wyświetl plik

@ -6,7 +6,10 @@ class adif extends CI_Controller {
/* Shows Export Views */
public function export() {
$this->load->view('layout/header');
$data['page_title'] = "ADIF Export";
$this->load->view('layout/header', $data);
$this->load->view('adif/main');
$this->load->view('layout/footer');
}

5
application/controllers/api.php
Wyświetl plik

@ -20,7 +20,10 @@ class API extends CI_Controller {
function help()
{
$this->load->view('layout/header');
$data['page_title'] = "API Help";
$this->load->view('layout/header', $data);
$this->load->view('api/help');
$this->load->view('layout/footer');
}

16
application/controllers/backup.php
Wyświetl plik

@ -6,7 +6,9 @@ class Backup extends CI_Controller {
public function index()
{
$this->load->view('layout/header');
$data['page_title'] = "Backup";
$this->load->view('layout/header', $data);
$this->load->view('backup/main');
$this->load->view('layout/footer');
}
@ -30,8 +32,10 @@ class Backup extends CI_Controller {
$data['status'] = true;
}
$this->load->view('layout/header');
$this->load->view('backup/adif_view', $data);
$data['page_title'] = "ADIF - Backup";
$this->load->view('layout/header', $data);
$this->load->view('backup/adif_view');
$this->load->view('layout/footer');
}
@ -52,8 +56,10 @@ class Backup extends CI_Controller {
$data['status'] = true;
}
$this->load->view('layout/header');
$this->load->view('backup/notes_view', $data);
$data['page_title'] = "Notes - Backup";
$this->load->view('layout/header', $data);
$this->load->view('backup/notes_view');
$this->load->view('layout/footer');
}

7
application/controllers/dashboard.php
Wyświetl plik

@ -45,9 +45,10 @@ class Dashboard extends CI_Controller {
$data['last_five_qsos'] = $this->logbook_model->get_last_qsos('9');
$this->load->view('layout/header');
$this->load->view('dashboard/index', $data);
$data['page_title'] = "Dashboard";
$this->load->view('layout/header', $data);
$this->load->view('dashboard/index');
$this->load->view('layout/footer');
}

19
application/controllers/notes.php
Wyświetl plik

@ -7,9 +7,9 @@ class Notes extends CI_Controller {
{
$this->load->model('note');
$data['notes'] = $this->note->list_all();
$this->load->view('layout/header');
$this->load->view('notes/main', $data);
$data['page_title'] = "Notes";
$this->load->view('layout/header', $data);
$this->load->view('notes/main');
$this->load->view('layout/footer');
}
@ -26,7 +26,8 @@ class Notes extends CI_Controller {
if ($this->form_validation->run() == FALSE)
{
$this->load->view('layout/header');
$data['page_title'] = "Add Notes";
$this->load->view('layout/header', $data);
$this->load->view('notes/add');
$this->load->view('layout/footer');
}
@ -45,8 +46,9 @@ class Notes extends CI_Controller {
$data['note'] = $this->note->view($id);
// Display
$this->load->view('layout/header');
$this->load->view('notes/view',$data);
$data['page_title'] = "Note";
$this->load->view('layout/header', $data);
$this->load->view('notes/view');
$this->load->view('layout/footer');
}
@ -65,8 +67,9 @@ class Notes extends CI_Controller {
if ($this->form_validation->run() == FALSE)
{
$this->load->view('layout/header');
$this->load->view('notes/edit', $data);
$data['page_title'] = "Edit Note";
$this->load->view('layout/header', $data);
$this->load->view('notes/edit');
$this->load->view('layout/footer');
}
else

17
application/controllers/qso.php
Wyświetl plik

@ -28,8 +28,10 @@ class QSO extends CI_Controller {
if ($this->form_validation->run() == FALSE)
{
$this->load->view('layout/header');
$this->load->view('qso/index', $data);
$data['page_title'] = "Add QSO";
$this->load->view('layout/header', $data);
$this->load->view('qso/index');
$this->load->view('layout/footer');
}
else
@ -51,8 +53,10 @@ class QSO extends CI_Controller {
$data['notice'] = "QSO Added";
// Load view to create another contact
$this->load->view('layout/header');
$this->load->view('qso/index', $data);
$data['page_title'] = "Add QSO";
$this->load->view('layout/header', $data);
$this->load->view('qso/index');
$this->load->view('layout/footer');
}
}
@ -74,8 +78,9 @@ class QSO extends CI_Controller {
if ($this->form_validation->run() == FALSE)
{
$this->load->view('layout/mini_header');
$this->load->view('qso/edit', $data);
$data['page_title'] = "Edit";
$this->load->view('layout/mini_header', $data);
$this->load->view('qso/edit');
$this->load->view('layout/mini_footer');
}
else

4
application/controllers/search.php
Wyświetl plik

@ -14,7 +14,9 @@ class Search extends CI_Controller {
}
}
$this->load->view('layout/header');
$data['page_title'] = "Search";
$this->load->view('layout/header', $data);
$this->load->view('search/main');
$this->load->view('layout/footer');
}

6
application/controllers/statistics.php
Wyświetl plik

@ -37,8 +37,10 @@ class Statistics extends CI_Controller {
$data['total_digi'] = $this->logbook_model->total_digi();
$this->load->view('layout/header');
$this->load->view('statistics/index', $data);
$data['page_title'] = "Statistics";
$this->load->view('layout/header', $data);
$this->load->view('statistics/index');
$this->load->view('layout/footer');
}
}

47
application/controllers/user.php
Wyświetl plik

@ -10,8 +10,10 @@ class User extends CI_Controller {
$data['results'] = $this->user_model->users();
$this->load->view('layout/header');
$this->load->view('user/main', $data);
$data['page_title'] = "Users";
$this->load->view('layout/header', $data);
$this->load->view('user/main');
$this->load->view('layout/footer');
}
@ -36,7 +38,9 @@ class User extends CI_Controller {
if ($this->form_validation->run() == FALSE)
{
$this->load->view('layout/header');
$data['page_title'] = "Add User";
$this->load->view('layout/header', $data);
if($this->input->post('user_name'))
{
$data['user_name'] = $this->input->post('user_name');
@ -48,7 +52,7 @@ class User extends CI_Controller {
$data['user_callsign'] = $this->input->post('user_callsign');
$data['user_locator'] = $this->input->post('user_locator');
$data['user_timezone'] = $this->input->post('user_timezone');
$this->load->view('user/add', $data);
$this->load->view('user/add');
} else {
$this->load->view('user/add', $data);
}
@ -73,7 +77,9 @@ class User extends CI_Controller {
redirect('user');
return;
}
$this->load->view('layout/header');
$data['page_title'] = "Users";
$this->load->view('layout/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');
@ -82,7 +88,7 @@ class User extends CI_Controller {
$data['user_lastname'] = $this->input->post('user_lastname');
$data['user_callsign'] = $this->input->post('user_callsign');
$data['user_locator'] = $this->input->post('user_locator');
$this->load->view('user/add', $data);
$this->load->view('user/add');
$this->load->view('layout/footer');
}
}
@ -111,7 +117,9 @@ class User extends CI_Controller {
if ($this->form_validation->run() == FALSE)
{
$this->load->view('layout/header');
$data['page_title'] = "Edit User";
$this->load->view('layout/header', $data);
$q = $query->row();
$data['id'] = $q->user_id;
@ -210,7 +218,9 @@ class User extends CI_Controller {
}
return;
}
$this->load->view('layout/header');
$data['page_title'] = "Edit User";
$this->load->view('layout/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');
@ -220,7 +230,7 @@ class User extends CI_Controller {
$data['user_callsign'] = $this->input->post('user_callsign');
$data['user_locator'] = $this->input->post('user_locator');
$data['user_timezone'] = $this->input->post('user_timezone');
$this->load->view('user/edit', $data);
$this->load->view('user/edit');
$this->load->view('layout/footer');
}
}
@ -228,10 +238,10 @@ class User extends CI_Controller {
function profile() {
$this->load->model('user_model');
$query = $this->user_model->get_by_id($this->session->userdata('user_id'));
$this->load->view('layout/header');
$data = $query->row();
$this->load->view('user/profile', $data);
$this->load->view('layout/header', $data);
$this->load->view('user/profile');
$this->load->view('layout/footer');
}
@ -248,8 +258,9 @@ class User extends CI_Controller {
if ($this->form_validation->run() == FALSE)
{
$this->load->view('layout/header');
$this->load->view('user/delete', $data);
$this->load->view('layout/header', $data);
$this->load->view('user/delete');
$this->load->view('layout/footer');
}
else
@ -276,10 +287,14 @@ class User extends CI_Controller {
$data = $query->row();
if ($this->form_validation->run() == FALSE)
{
$this->load->view('layout/header');
$this->load->view('user/login', $data);
$data['page_title'] = "Login";
$this->load->view('layout/header', $data);
$this->load->view('user/login');
$this->load->view('layout/footer');
}
else

5
application/views/backup/main.php
Wyświetl plik

@ -3,4 +3,9 @@
<p>Backup options.</p>
<ul>
<li><a href="<?php echo site_url('backup/adif'); ?>">Backup ADIF</a></li>
<li><a href="<?php echo site_url('backup/notes'); ?>">Backup Notes</a></li>
</ul>
</div>

2
application/views/layout/header.php
Wyświetl plik

@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>Web Logbook</title>
<title><?php echo $page_title; ?> - Cloudlog</title>
<link rel="stylesheet" href="<?php echo base_url();?>css/reset.css" type="text/css" />
<link type="text/css" href="<?php echo base_url(); ?>css/flick/jquery-ui-1.8.12.custom.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>/css/global.css">

7095
backup/logbook.adi 100644
Wyświetl plik

Plik diff jest za duży Load Diff

14
backup/notes.xml 100644
Wyświetl plik

@ -0,0 +1,14 @@
<notes>
<note>
<id>1</id>
<category>General</category>
<title>FO-29</title>
<contents><![CDATA[<strong>Notes about FO-29</strong>]]></contents>
</note>
<note>
<id>2</id>
<category>Antennas</category>
<title>ATU Settings</title>
<contents><![CDATA[Settings GO HERE!]]></contents>
</note>
</notes>

284
cloudlog.sublime-workspace
Wyświetl plik

@ -15,6 +15,70 @@
},
"buffers":
[
{
"file": "application/views/qso/index.php",
"settings":
{
"buffer_size": 12368,
"line_ending": "Windows"
}
},
{
"file": "application/views/layout/header.php",
"settings":
{
"buffer_size": 5131,
"line_ending": "Windows"
}
},
{
"file": "application/controllers/dashboard.php",
"settings":
{
"buffer_size": 4310,
"line_ending": "Windows"
}
},
{
"file": "application/controllers/logbook.php",
"settings":
{
"buffer_size": 6594,
"line_ending": "Windows"
}
},
{
"file": "application/controllers/search.php",
"settings":
{
"buffer_size": 752,
"line_ending": "Windows"
}
},
{
"file": "application/controllers/qso.php",
"settings":
{
"buffer_size": 3303,
"line_ending": "Windows"
}
},
{
"file": "application/controllers/user.php",
"settings":
{
"buffer_size": 11099,
"line_ending": "Windows"
}
},
{
"file": "application/controllers/notes.php",
"settings":
{
"buffer_size": 1976,
"line_ending": "Unix"
}
}
],
"build_system": "",
"command_palette":
@ -48,6 +112,7 @@
},
"file_history":
[
"/C/Users/Peter/git/HRD-Web-Frontend/application/config/config.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/qso/index.php",
"/C/Users/Peter/git/HRD-Web-Frontend/css/global.css",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/logbook.php",
@ -58,7 +123,6 @@
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/search/main.php",
"/C/Users/Peter/Desktop/.htaccess",
"/C/Users/Peter/git/HRD-Web-Frontend/js/global.js",
"/C/Users/Peter/git/HRD-Web-Frontend/application/config/config.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/qso.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/mini_header.php",
"/C/Users/Peter/git/HRD-Web-Frontend/css/popup.css",
@ -159,8 +223,226 @@
"groups":
[
{
"selected": 7,
"sheets":
[
{
"buffer": 0,
"file": "application/views/qso/index.php",
"settings":
{
"buffer_size": 12368,
"regions":
{
},
"selection":
[
[
2121,
2121
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 54.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 1,
"file": "application/views/layout/header.php",
"settings":
{
"buffer_size": 5131,
"regions":
{
},
"selection":
[
[
225,
225
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 2,
"file": "application/controllers/dashboard.php",
"settings":
{
"buffer_size": 4310,
"regions":
{
},
"selection":
[
[
1671,
1589
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 477.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 3,
"file": "application/controllers/logbook.php",
"settings":
{
"buffer_size": 6594,
"regions":
{
},
"selection":
[
[
1295,
1295
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 3744.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 4,
"file": "application/controllers/search.php",
"settings":
{
"buffer_size": 752,
"regions":
{
},
"selection":
[
[
752,
752
]
],
"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": 5,
"file": "application/controllers/qso.php",
"settings":
{
"buffer_size": 3303,
"regions":
{
},
"selection":
[
[
2565,
2565
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 1566.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 6,
"file": "application/controllers/user.php",
"settings":
{
"buffer_size": 11099,
"regions":
{
},
"selection":
[
[
10382,
10382
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 2960.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 7,
"file": "application/controllers/notes.php",
"settings":
{
"buffer_size": 1976,
"regions":
{
},
"selection":
[
[
1227,
1227
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 1157.0,
"zoom_level": 1.0
},
"type": "text"
}
]
}
],