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/!index.html
*.sublime-*
*/cards/*

6
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');
}
/*
|--------------------------------------------------------------------------

2
application/controllers/welcome.php
View File

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

1
application/errors/error_404.php
View File

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

75
application/errors/error_db.php
View File

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

69
application/errors/error_general.php
View File

@@ -1,62 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Error</title>
<style type="text/css">
::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;
<?php
if (!isset($heading)) {
$heading = "Otsikko";
}
if (!isset($message)) {
$message = "Viesti";
}
a {
color: #003399;
background-color: transparent;
font-weight: normal;
}
?>
h1 {
color: #444;
background-color: transparent;
border-bottom: 1px solid #D0D0D0;
font-size: 19px;
font-weight: normal;
margin: 0 0 14px 0;
padding: 14px 15px 10px 15px;
}
<div class="row">
<div class="small-12 large-12 columns" id="adminmenu">
<div class="panel">
code {
font-family: Consolas, Monaco, Courier New, Courier, monospace;
font-size: 12px;
background-color: #f9f9f9;
border: 1px solid #D0D0D0;
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>
<h2><?php echo $heading; ?></h2>
<?php echo $message; ?>
</div>
</body>
</html>
</div>
</div>

2
application/views/new.php
View File

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

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

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