Permalink
Browse files

Merge branch 'master' into feature_schedule

  • Loading branch information...
2 parents 01f7963 + e5a4e62 commit 59dbd0b47516826a82b6d554c050d139234f5a88 @pmeth committed Sep 30, 2012
Showing with 8 additions and 3 deletions.
  1. +1 −0 header.php
  2. +1 −1 navigation.php
  3. +6 −2 public/index.php
View
@@ -1,4 +1,5 @@
<?php
+ ini_set('date.timezone','America/Toronto');
$css = array('bootstrap/css/bootstrap.css', 'css/truenorth.css');
if (isset($extra_css)) {
$css = array_merge($css, $extra_css);
View
@@ -28,7 +28,7 @@
<?php if ($page == 'index') : ?>
<div class="ribbon-wrapper">
<div class="ribbon-front">
- <h2>Toronto, Canada :: November 2 &amp; 3, 2012 :: <a href="tickets.php"><span class="earlybird">Early Bird Tickets on Sale Now</span></a></h2>
+ <h2>Toronto, Canada :: November 2 &amp; 3, 2012 :: <a href="tickets.php"><span class="earlybird"><?php if (time() < strtotime('2012-10-01')) echo 'Early Bird ';?>Tickets on Sale Now</span></a></h2>
</div>
<div class="ribbon-edge-topleft"></div>
<div class="ribbon-edge-topright"></div>
View
@@ -31,8 +31,12 @@
</div>
<div class="row">
<div class="span8 centered-text">
- <h1 style="float:left">Tickets just $150 for both days </h1>
- <h6>Hurry, prices go up Oct 1st!</h6>
+ <?php if (time() < strtotime('2012-10-01')) : ?>
+ <h1 style="float:left">Tickets just $150 for both days </h1>
+ <h6>Hurry, prices go up Oct 1st!</h6>
+ <?php else : ?>
+ <h1 style="float:left">Tickets just $200 for both days</h1>
+ <?php endif; ?>
<a href="tickets.php" class="btn btn-large btn-success">Order Your Tickets Now</a>
</div>
</div>

0 comments on commit 59dbd0b

Please sign in to comment.