From 5503ebc6e5a3e16c2ac910501dfb805ee694bcc6 Mon Sep 17 00:00:00 2001 From: James <james@sourcefabric-DX4840.(none)> Date: Thu, 10 Nov 2011 15:54:38 -0500 Subject: [PATCH] SAAS-35: "Trial Period" box - done --- .../views/helpers/TrialRemaining.php | 2 +- .../views/scripts/partialviews/header.phtml | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/application/views/helpers/TrialRemaining.php b/airtime_mvc/application/views/helpers/TrialRemaining.php index baa1ac9e2..64a703a1c 100644 --- a/airtime_mvc/application/views/helpers/TrialRemaining.php +++ b/airtime_mvc/application/views/helpers/TrialRemaining.php @@ -11,6 +11,6 @@ class Airtime_View_Helper_TrialRemaining extends Zend_View_Helper_Abstract if($interval->format('%R') == '-'){ return "Trial expired."; } - return $interval->format('%a days'); + return $interval->format('%a'); } } diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml index 019f1dd4a..78daae413 100644 --- a/airtime_mvc/application/views/scripts/partialviews/header.phtml +++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml @@ -32,19 +32,23 @@ </div> <div class="listen-control-block"> <a class="" href="#"><span>Listen</span></a> - </div> - <?php if($this->is_trial){?> - <div class="trial-info-block"> - <ul> - <li>Trial remaining</li> - <li><?php echo $this->trial_remain?></li> - </ul> - </div> - <?php }?> + </div> <div class="personal-block"> <ul> <li><span class="name"><?php echo $this->user ?></span> | <a href="/Login/logout">Logout</a></li> </ul> </div> + <?php if($this->is_trial){?> + <div class="trial-box"> + <p>Your Trial expires in</p> + <div class="trial-box-calendar"> + <span class="trial-box-calendar-white"><?php echo $this->trial_remain?></span> + <div class="trial-box-calendar-gray">days</div> + </div> + <div class="trial-box-button"> + <a title="Purchase your copy of Airtime" href="#">Keep going on</a> + </div> + </div> + <?php }?> </div> <div id="jquery_jplayer_1" class="jp-jplayer" style="width:0px; height:0px;"></div>