Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas-dev' into saas-dev-publishing

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
This commit is contained in:
Albert Santoni 2015-11-18 12:38:18 -05:00
commit 965a78c54a
16 changed files with 191 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/layouts/scripts/layout.phtml
View file

@ -22,7 +22,9 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?>
<div id="Panel" class="sticky">
<?php if($this->suspended) : ?>
<?php if ($this->suspended && $this->isTrial()) : ?>
<?php echo $this->partial('partialviews/suspendedtrial.phtml'); ?>
<?php elseif ($this->suspended && !$this->isTrial()) : ?>
<?php echo $this->partial('partialviews/suspended.phtml'); ?>
<?php else : ?>