Working on bootstrap
Got Apache config and .htaccess back. PICKLES minified CSS files. Updated Time's static variables to be class constants
This commit is contained in:
Josh Sherman
parent
b779690b49
commit
7ed16d9a56
7 changed files with 170 additions and 884 deletions
|
|
@ -2,6 +2,52 @@
|
|||
|
||||
$config = array(
|
||||
|
||||
'environments' => array(
|
||||
'local' => 'pickles.local',
|
||||
'production' => 'pickles.prod',
|
||||
),
|
||||
|
||||
'php' => array(
|
||||
'local' => array(
|
||||
'date.timezone' => 'America/New_York',
|
||||
'display_errors' => true,
|
||||
'error_reporting' => -1,
|
||||
'session.gc_maxlifetime' => Time::DAY,
|
||||
),
|
||||
'production' => array(
|
||||
'date.timezone' => 'America/New_York',
|
||||
'display_errors' => false,
|
||||
'error_reporting' => -1,
|
||||
'session.gc_maxlifetime' => Time::DAY,
|
||||
),
|
||||
),
|
||||
|
||||
'pickles' => array(
|
||||
'disabled' => false,
|
||||
'session' => 'files',
|
||||
'template' => 'index',
|
||||
'module' => 'home',
|
||||
//'404' => 'error/404',
|
||||
'datasource' => 'mysql',
|
||||
'cache' => 'memcached',
|
||||
'profiler' => array(
|
||||
'local' => false,
|
||||
'production' => false,
|
||||
),
|
||||
'logging' => array(
|
||||
'local' => true,
|
||||
'production' => false,
|
||||
),
|
||||
'minify' => array(
|
||||
'local' => true,
|
||||
'production' => false,
|
||||
),
|
||||
),
|
||||
|
||||
'site' => array(
|
||||
'name' => 'PICKLES Bootstrap',
|
||||
|
||||
),
|
||||
);
|
||||
|
||||
?>
|
||||
|
|
|
|||
56
bootstrap/public/.htaccess
Normal file
56
bootstrap/public/.htaccess
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
# Sets the expires header
|
||||
#ExpiresActive on
|
||||
#ExpiresDefault "access plus 10 years"
|
||||
|
||||
# Sets up ETags
|
||||
FileETag MTime Size
|
||||
|
||||
# Sets up compression
|
||||
SetOutputFilter DEFLATE
|
||||
SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
|
||||
SetEnvIfNoCase Request_URI \.pdf$ no-gzip dont-vary
|
||||
|
||||
# Prevent session IDs from appearing
|
||||
php_value session.use_only_cookies 1
|
||||
php_value session.use_trans_sid 0
|
||||
|
||||
# Sets up the mod_rewrite engine
|
||||
RewriteEngine on
|
||||
RewriteBase /
|
||||
|
||||
# Strips the trailing slash
|
||||
RewriteRule ^(.+)/$ $1 [R]
|
||||
|
||||
# Strips the preceeding subdomain
|
||||
# RewriteCond %{SERVER_ADDR} ^74\.207\.225\.243
|
||||
# RewriteCond %{HTTP_HOST} ^(.+).scenekids.com$ [NC]
|
||||
# RewriteRule ^(.*)$ http://scenekids.com [R=301,L]
|
||||
|
||||
# Doesn't rewrite any files that actually exist
|
||||
RewriteCond %{REQUEST_FILENAME} -f [NC,OR]
|
||||
RewriteCond %{REQUEST_FILENAME} -d [NC]
|
||||
RewriteRule .* - [L]
|
||||
|
||||
# Sends error pages to / with a 301
|
||||
#RewriteRule ^error$ / [R=301,L]
|
||||
|
||||
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
|
||||
|
||||
# Rewrites static content with an appended timestamp
|
||||
RewriteRule ^(.+)\.([\d]+)\.(css|js|gif|png|jpg|jpeg)$ /$1.$3 [NC,QSA,L]
|
||||
|
||||
# TODO Add additional rewrites for ID's / pagination
|
||||
RewriteRule ^(.+)$ index.php?request=$1 [NC,QSA]
|
||||
|
||||
# Set up the error documents
|
||||
ErrorDocument 400 /error
|
||||
ErrorDocument 401 /error
|
||||
ErrorDocument 403 /error
|
||||
ErrorDocument 404 /error
|
||||
ErrorDocument 500 /error
|
||||
|
||||
# Blocks access to .htaccess
|
||||
<Files .htaccess>
|
||||
order allow,deny
|
||||
deny from all
|
||||
</Files>
|
||||
842
bootstrap/public/css/bootstrap.min.css
vendored
842
bootstrap/public/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
1
bootstrap/public/css/foundation.min.css
vendored
Normal file
1
bootstrap/public/css/foundation.min.css
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
.clear { clear:both }.clear-left { clear:left }.clear-right{ clear:right }.pointer { cursor:pointer }.hidden { display:none }.float-left { float:left }.float-right{ float:right }.italic { font-style:italic }.oblique { font-style:oblique }.small-caps { font-variant:small-caps }.bold { font-weight:bold }.absolute { position:absolute }.fixed { position:fixed }.relative { position:relative }.center { text-align:center }.left { text-align:left }.right { text-align:right }.underline { text-decoration:underline }.overline { text-decoration:overline }.strike { text-decoration:line-through }.blink { text-decoration:blink }.upper { text-transform:uppercase }.lower { text-transform:lowercase }.capitalize { text-transform:capitalize }.top { vertical-align:top }.middle { vertical-align:middle }.bottom { vertical-align:bottom }.nowrap { white-space:nowrap }.normal { text-transform:none; font-style:normal; font-weight:normal; text-decoration:none }
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
|
||||
|
||||
<link rel="stylesheet" href="<?php echo $__dynamic->css('/css/bootstrap.css'); ?>" />
|
||||
<link rel="stylesheet" href="<?php echo $__dynamic->css('/css/foundation.css'); ?>" />
|
||||
<link rel="stylesheet" href="<?php echo $__dynamic->css('/css/core.css'); ?>" />
|
||||
|
||||
<script type="text/javascript">
|
||||
|
|
@ -33,7 +34,7 @@
|
|||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<a class="brand" href="/"><img src="/img/logo-header.png" /> <?php echo $__config->site['name']; ?></a>
|
||||
<a class="brand" href="/"><?php echo $__config->site['name']; ?></a>
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav">
|
||||
<li class="active"><a href="#">Home</a></li>
|
||||
|
|
|
|||
|
|
@ -30,70 +30,81 @@ class Time
|
|||
*
|
||||
* Seconds in a minute
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $minute = 60;
|
||||
const MINUTE = 60;
|
||||
|
||||
/**
|
||||
* Hour
|
||||
*
|
||||
* Seconds in an hour (minute * 60)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $hour = 3600;
|
||||
const HOUR = 3600;
|
||||
|
||||
/**
|
||||
* Day
|
||||
*
|
||||
* Seconds in a day (hour * 24)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $day = 86400;
|
||||
const DAY = 86400;
|
||||
|
||||
/**
|
||||
* Week
|
||||
*
|
||||
* Seconds in a week (day * 7)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $week = 604800;
|
||||
const WEEK = 604800;
|
||||
|
||||
/**
|
||||
* Month
|
||||
*
|
||||
* Seconds in a month (day * 30)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $month = 2592000;
|
||||
const MONTH = 2592000;
|
||||
|
||||
/**
|
||||
* Quarter
|
||||
*
|
||||
* Seconds in a quarter (day * 90)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $quarter = 7776000;
|
||||
const QUARTER = 7776000;
|
||||
|
||||
/**
|
||||
* Year
|
||||
*
|
||||
* Seconds in a year (day * 365)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $year = 31536000;
|
||||
const YEAR = 31536000;
|
||||
|
||||
/**
|
||||
* Decade
|
||||
*
|
||||
* Seconds in a decade (year * 10)
|
||||
*
|
||||
* @var integer
|
||||
*/
|
||||
const DECADE = 315360000;
|
||||
|
||||
/**
|
||||
* Century
|
||||
*
|
||||
* Seconds in a decade (decade * 10)
|
||||
*
|
||||
* @var integer
|
||||
*/
|
||||
const CENTURY = 3153600000;
|
||||
|
||||
// }}}
|
||||
|
||||
|
|
|
|||
39
jar.php
39
jar.php
|
|
@ -6895,70 +6895,81 @@ class Time
|
|||
*
|
||||
* Seconds in a minute
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $minute = 60;
|
||||
const MINUTE = 60;
|
||||
|
||||
/**
|
||||
* Hour
|
||||
*
|
||||
* Seconds in an hour (minute * 60)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $hour = 3600;
|
||||
const HOUR = 3600;
|
||||
|
||||
/**
|
||||
* Day
|
||||
*
|
||||
* Seconds in a day (hour * 24)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $day = 86400;
|
||||
const DAY = 86400;
|
||||
|
||||
/**
|
||||
* Week
|
||||
*
|
||||
* Seconds in a week (day * 7)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $week = 604800;
|
||||
const WEEK = 604800;
|
||||
|
||||
/**
|
||||
* Month
|
||||
*
|
||||
* Seconds in a month (day * 30)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $month = 2592000;
|
||||
const MONTH = 2592000;
|
||||
|
||||
/**
|
||||
* Quarter
|
||||
*
|
||||
* Seconds in a quarter (day * 90)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $quarter = 7776000;
|
||||
const QUARTER = 7776000;
|
||||
|
||||
/**
|
||||
* Year
|
||||
*
|
||||
* Seconds in a year (day * 365)
|
||||
*
|
||||
* @static
|
||||
* @var integer
|
||||
*/
|
||||
public static $year = 31536000;
|
||||
const YEAR = 31536000;
|
||||
|
||||
/**
|
||||
* Decade
|
||||
*
|
||||
* Seconds in a decade (year * 10)
|
||||
*
|
||||
* @var integer
|
||||
*/
|
||||
const DECADE = 315360000;
|
||||
|
||||
/**
|
||||
* Century
|
||||
*
|
||||
* Seconds in a decade (decade * 10)
|
||||
*
|
||||
* @var integer
|
||||
*/
|
||||
const CENTURY = 3153600000;
|
||||
|
||||
// }}}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue