Ekokumppanit/ystavakylaecard
1
0
Fork 0
mirror of https://github.com/Ekokumppanit/ystavakylaecard.git synced 2026-01-26 03:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring, standardisation and small fixes

Browse Source
This commit is contained in:
Ismo Vuorinen
2013-07-15 19:25:39 +03:00
parent a4bdf517cb
commit 4bb689166d
8 changed files with 47 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -5,3 +5,4 @@
*/cache/* */cache/*
*/cache/!index.html */cache/!index.html
*.sublime-* *.sublime-*
*/cards/*

8
application/config/constants.php
View File

@@ -1,4 +1,8 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); <?php
if (! defined('BASEPATH')) {
exit('No direct script access allowed');
}
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@@ -38,4 +42,4 @@ define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
/* End of file constants.php */ /* End of file constants.php */
/* Location: ./application/config/constants.php */ /* Location: ./application/config/constants.php */

2
application/controllers/welcome.php
View File

@@ -94,7 +94,7 @@ class Welcome extends CI_Controller
$this->load->view('_footer', $data); $this->load->view('_footer', $data);
} }
# code...
} }
public function upload() public function upload()

1
application/errors/error_404.php
View File

@@ -1,5 +1,4 @@
<?php <?php
$ci = &get_instance(); $ci = &get_instance();
$data = array( $data = array(

77
application/errors/error_db.php
View File

@@ -1,62 +1,29 @@
<!DOCTYPE html> <?php
<html lang="en"> $ci = &get_instance();
<head>
<title>Database Error</title>
<style type="text/css">
::selection{ background-color: #E13300; color: white; } $data = array(
::moz-selection{ background-color: #E13300; color: white; } "user" => $ci->erkana->getUser()
::webkit-selection{ background-color: #E13300; color: white; } );
body { $ci->load->view("_header", $data);
background-color: #fff;
margin: 40px; if (!isset($heading)) {
font: 13px/20px normal Helvetica, Arial, sans-serif; $heading = "Otsikko";
color: #4F5155; }
if (!isset($message)) {
$message = "Viesti";
} }
a { ?>
color: #003399;
background-color: transparent;
font-weight: normal;
}
h1 { <div class="row">
color: #444; <div class="small-12 large-12 columns" id="adminmenu">
background-color: transparent; <div class="panel">
border-bottom: 1px solid #D0D0D0;
font-size: 19px;
font-weight: normal;
margin: 0 0 14px 0;
padding: 14px 15px 10px 15px;
}
code { <h2><?php echo $heading; ?></h2>
font-family: Consolas, Monaco, Courier New, Courier, monospace; <?php echo $message; ?>
font-size: 12px; </div>
background-color: #f9f9f9; </div>
border: 1px solid #D0D0D0; </div>
color: #002166;
display: block;
margin: 14px 0 14px 0;
padding: 12px 10px 12px 10px;
}
#container { <?php $ci->load->view("_footer", $data);
margin: 10px;
border: 1px solid #D0D0D0;
-webkit-box-shadow: 0 0 8px #D0D0D0;
}
p {
margin: 12px 15px 12px 15px;
}
</style>
</head>
<body>
<div id="container">
<h1><?php echo $heading; ?></h1>
<?php echo $message; ?>
</div>
</body>
</html>

73
application/errors/error_general.php
View File

@@ -1,62 +1,19 @@
<!DOCTYPE html> <?php
<html lang="en"> if (!isset($heading)) {
<head> $heading = "Otsikko";
<title>Error</title> }
<style type="text/css"> if (!isset($message)) {
$message = "Viesti";
::selection{ background-color: #E13300; color: white; }
::moz-selection{ background-color: #E13300; color: white; }
::webkit-selection{ background-color: #E13300; color: white; }
body {
background-color: #fff;
margin: 40px;
font: 13px/20px normal Helvetica, Arial, sans-serif;
color: #4F5155;
} }
a { ?>
color: #003399;
background-color: transparent;
font-weight: normal;
}
h1 { <div class="row">
color: #444; <div class="small-12 large-12 columns" id="adminmenu">
background-color: transparent; <div class="panel">
border-bottom: 1px solid #D0D0D0;
font-size: 19px;
font-weight: normal;
margin: 0 0 14px 0;
padding: 14px 15px 10px 15px;
}
code { <h2><?php echo $heading; ?></h2>
font-family: Consolas, Monaco, Courier New, Courier, monospace; <?php echo $message; ?>
font-size: 12px; </div>
background-color: #f9f9f9; </div>
border: 1px solid #D0D0D0; </div>
color: #002166;
display: block;
margin: 14px 0 14px 0;
padding: 12px 10px 12px 10px;
}
#container {
margin: 10px;
border: 1px solid #D0D0D0;
-webkit-box-shadow: 0 0 8px #D0D0D0;
}
p {
margin: 12px 15px 12px 15px;
}
</style>
</head>
<body>
<div id="container">
<h1><?php echo $heading; ?></h1>
<?php echo $message; ?>
</div>
</body>
</html>

2
application/views/new.php
View File

@@ -9,8 +9,6 @@
Suunnittele oma eKorttisi ja lähetä se ystävällesi! Suunnittele oma eKorttisi ja lähetä se ystävällesi!
Samalla voit osallistua arvontaan josta voit voittaa huikean hienoja palkintoja. Samalla voit osallistua arvontaan josta voit voittaa huikean hienoja palkintoja.
</p> </p>
</div> </div>
</div> </div>
</div> </div>

2
application/views/yllapito/dashboard.php
View File

@@ -3,9 +3,11 @@
<div class="large-12 columns"> <div class="large-12 columns">
<div class="panel"> <div class="panel">
<pre><?php <pre><?php
if (empty($user)) { if (empty($user)) {
$user = new stdClass(); $user = new stdClass();
} }
var_export($user); var_export($user);
?></pre> ?></pre>