From 044f511455fd17c97f6b3617830dba4659cd2256 Mon Sep 17 00:00:00 2001
From: Yuchen Wang <yuchen@yuchen-MacBookPro.(none)>
Date: Thu, 12 Jan 2012 15:47:08 -0500
Subject: [PATCH] SAAS-141: Tweaks for trial balloon

Done
---
 airtime_mvc/application/views/helpers/TrialRemaining.php    | 3 +++
 .../application/views/scripts/partialviews/header.phtml     | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/views/helpers/TrialRemaining.php b/airtime_mvc/application/views/helpers/TrialRemaining.php
index 64a703a1c..bdbd0caae 100644
--- a/airtime_mvc/application/views/helpers/TrialRemaining.php
+++ b/airtime_mvc/application/views/helpers/TrialRemaining.php
@@ -5,6 +5,9 @@ class Airtime_View_Helper_TrialRemaining extends Zend_View_Helper_Abstract
     public function trialRemaining()
     {
         $ending_date = Application_Model_Preference::GetTrialEndingDate();
+        if ($ending_date == '') {
+            return '';
+        }
         $datetime1 = new DateTime();
         $datetime2 = new DateTime($ending_date);
         $interval = $datetime1->diff($datetime2);
diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml
index e747f025d..82381e4da 100644
--- a/airtime_mvc/application/views/scripts/partialviews/header.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml
@@ -36,15 +36,15 @@
       <li><span class="name"><?php echo $this->user ?></span> | <a href="/Login/logout">Logout</a></li>
     </ul>
   </div>
-  <?php if($this->is_trial){?>
+  <?php if($this->trial_remain != '' && $this->trial_remain != "Trial expired."){?>
   <div class="trial-box">
-      <p>Your Trial expires in</p>
+      <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="https://account.sourcefabric.com/clientarea.php" target="_blank">Buy Now</a>
+            <a title="Purchase your copy of Airtime" href="https://account.sourcefabric.com/clientarea.php" target="_blank">My Account</a>
       </div>
   </div>
   <?php }?>