From 1a8214fccc42bb9062762920a5b789615fae60b8 Mon Sep 17 00:00:00 2001 From: James Date: Fri, 2 Sep 2011 12:02:02 -0400 Subject: [PATCH] CC-2755: Ability to set trial ending date - codes for front end. - design needs to be integrated. --- airtime_mvc/application/layouts/scripts/layout.phtml | 2 +- airtime_mvc/application/layouts/scripts/library.phtml | 2 +- .../application/views/scripts/partialviews/header.phtml | 6 ++++++ airtime_mvc/public/css/styles.css | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index cb71ad951..1483cd3f3 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -10,7 +10,7 @@
- partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?> + partial('partialviews/header.phtml', array("user" => $this->loggedInAs(), "trial_remain"=> $this->trialRemaining())) ?> navigation()->menu()->setPartial($partial); ?> diff --git a/airtime_mvc/application/layouts/scripts/library.phtml b/airtime_mvc/application/layouts/scripts/library.phtml index cd55c2ec5..6a0f8e1db 100644 --- a/airtime_mvc/application/layouts/scripts/library.phtml +++ b/airtime_mvc/application/layouts/scripts/library.phtml @@ -10,7 +10,7 @@
- partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?> + partial('partialviews/header.phtml', array("user" => $this->loggedInAs(), "trial_remain"=> $this->trialRemaining())) ?> navigation()->menu()->setPartial($partial); ?> diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml index 136a11ed0..85d46224f 100644 --- a/airtime_mvc/application/views/scripts/partialviews/header.phtml +++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml @@ -30,6 +30,12 @@
  • +
    +
      +
    • Trial remaining
    • +
    • trial_remain?>
    • +
    +
    • About
    • diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index d12dfb8e8..ec707bfb9 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -82,7 +82,7 @@ select { position:relative; } -.now-playing-block, .show-block, .on-air-block, .time-info-block, .personal-block, .listen-control-block { +.now-playing-block, .show-block, .on-air-block, .time-info-block, .personal-block, .listen-control-block, .trial-info-block { height:100px; float:left; margin-right:10px;