From 78fe946e573b4a813e19a0a5fb59d346d703ef43 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 22 May 2012 12:40:08 +0200 Subject: [PATCH] CC-3712 : Trial end date overlaps with Airtime Clock --- airtime_mvc/application/layouts/scripts/layout.phtml | 6 +++--- .../views/scripts/partialviews/header.phtml | 12 ------------ .../views/scripts/partialviews/trialBox.phtml | 12 ++++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 airtime_mvc/application/views/scripts/partialviews/trialBox.phtml diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index 70ba1ff90..de43830b4 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -9,14 +9,14 @@ +partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?>
versionNotify(); $sss = $this->SourceSwitchStatus(); $scs = $this->SourceConnectionStatus(); ?> - partial('partialviews/header.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(), - "live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'], + partial('partialviews/header.phtml', array("live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'], "scheduled_play_switch"=>$sss['scheduled_play'])) ?> navigation()->menu()->setPartial($partial); ?> @@ -28,7 +28,7 @@ navigation()->menu() ?>
- +
layout()->content ?>
diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml index af6ae2b86..b325e3fb6 100644 --- a/airtime_mvc/application/views/scripts/partialviews/header.phtml +++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml @@ -61,17 +61,5 @@
    • - trial_remain != '' && $this->trial_remain != "Trial expired."){?> -
    -

    Your trial expires in

    -
    - trial_remain?> -
    days
    -
    -
    - My Account -
    -
    -
    diff --git a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml new file mode 100644 index 000000000..7fb28258a --- /dev/null +++ b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml @@ -0,0 +1,12 @@ +trial_remain != '' && $this->trial_remain != "Trial expired."){?> +
    +

    Your trial expires in

    +
    + trial_remain?> +
    days
    +
    +
    + My Account +
    +
    + \ No newline at end of file