Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas

Conflicts:
	airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
This commit is contained in:
Albert Santoni 2014-06-25 19:03:13 -04:00
commit 338fd06f81
10 changed files with 573 additions and 53 deletions

View file

@ -6,7 +6,7 @@
<div class="trial-box-calendar-gray"><?php echo _("days") ?></div>
</div>
<div class="trial-box-button">
<a title="<?php echo _('Purchase your copy of Airtime')?>" href="https://account.sourcefabric.com/clientarea.php" target="_blank"><?php echo _("My Account") ?></a>
<a title="<?php echo _("Purchase an Airtime Pro plan!")?>" href="/billing/upgrade" target="_blank"><?php echo _("My Account") ?></a>
</div>
</div>
<?php }?>