From 4bb689166d1e7378fd80015fc7016ee07ad234ab Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Mon, 15 Jul 2013 19:25:39 +0300 Subject: [PATCH] Refactoring, standardisation and small fixes --- .gitignore | 1 + application/config/constants.php | 8 ++- application/controllers/welcome.php | 2 +- application/errors/error_404.php | 1 - application/errors/error_db.php | 77 +++++++----------------- application/errors/error_general.php | 73 +++++----------------- application/views/new.php | 2 - application/views/yllapito/dashboard.php | 2 + 8 files changed, 47 insertions(+), 119 deletions(-) diff --git a/.gitignore b/.gitignore index 9048853..7da00c2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ */cache/* */cache/!index.html *.sublime-* +*/cards/* diff --git a/application/config/constants.php b/application/config/constants.php index 4a879d3..37c71bb 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -1,4 +1,8 @@ -load->view('_footer', $data); } - # code... + } public function upload() diff --git a/application/errors/error_404.php b/application/errors/error_404.php index fc90c5b..ef56692 100644 --- a/application/errors/error_404.php +++ b/application/errors/error_404.php @@ -1,5 +1,4 @@ - - -Database Error - - - -
-

- -
- - \ No newline at end of file +load->view("_footer", $data); \ No newline at end of file diff --git a/application/errors/error_general.php b/application/errors/error_general.php index fd63ce2..17d72ea 100644 --- a/application/errors/error_general.php +++ b/application/errors/error_general.php @@ -1,62 +1,19 @@ - - - -Error - - - -
-

- -
- - \ No newline at end of file +

+ + + + diff --git a/application/views/new.php b/application/views/new.php index c6b893e..17785cd 100644 --- a/application/views/new.php +++ b/application/views/new.php @@ -9,8 +9,6 @@ Suunnittele oma eKorttisi ja lähetä se ystävällesi! Samalla voit osallistua arvontaan josta voit voittaa huikean hienoja palkintoja.

- - diff --git a/application/views/yllapito/dashboard.php b/application/views/yllapito/dashboard.php index 9a8ba30..c2ff031 100644 --- a/application/views/yllapito/dashboard.php +++ b/application/views/yllapito/dashboard.php @@ -3,9 +3,11 @@