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

Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling

Browse source
This commit is contained in:
Albert Santoni 2015-09-04 11:21:00 -04:00
commit 1db1af3f2e
134 changed files with 119858 additions and 113185 deletions
Download patch file Download diff file Expand all files Collapse all files

91
airtime_mvc/application/views/scripts/billing/upgrade.phtml
View file

@ -120,30 +120,6 @@ function configureByCountry(countryCode)
});
}
function promoEligibilityCheck()
{
var newproductid = $("input[type='radio'][name='newproductid']:checked").val();
// newproductid can be undefined if the client is currently on an old plan
// and they just change the billing cycle value without selecting a new plan type.
// In this case, let's not check if they are eligible for the promo because
// they won't be able to upgrade without selecting a new plan first.
if (newproductid === undefined) {
return;
}
var newproductbillingcycle = $("input[type='radio'][name='newproductbillingcycle']:checked").val();
$.post("/billing/promo-eligibility-check", {"newproductid": newproductid,
"newproductbillingcycle": newproductbillingcycle, "csrf_token": $("#csrf").attr('value')})
.success(function(data) {
if (data.result == true) {
$("#promo-plan-eligible").show();
} else if ($("#promo-plan-eligible").is(":visible")) {
$("#promo-plan-eligible").hide();
}
});
}
$(document).ready(function() {
configureByCountry($("#country").val());
@ -152,11 +128,9 @@ $(document).ready(function() {
$("input[name='newproductid']").change(function() {
validatePlan();
recalculateTotals();
promoEligibilityCheck();
});
$("input[name='newproductbillingcycle']").change(function() {
recalculateTotals();
promoEligibilityCheck();
});
$("#country").change(function() {
@ -194,19 +168,15 @@ $(document).ready(function() {
</script>
<div class="ui-widget prefpanel clearfix padded-strong billing-panel">
<H2><?=_("Account Plans")?></H2>
<H4><?=_("Upgrade today to get more listeners and storage space!")?></H4>
<div>
<a href="https://www.airtime.pro/pricing#promo-details" target="_blank">
<img width="400px" height="133px" class="promo-banner" /></a>
</div>
<H2><?=_pro("Account Plans")?></H2>
<H4><?=_pro("Upgrade today to get more listeners and storage space!")?></H4>
<div class="pricing-grid">
<table>
<tr>
<th>Awesome Hobbyist</th>
<th>Awesome Starter</th>
<th>Awesome Plus</th>
<th>Awesome Premium</th>
<th>Hobbyist</th>
<th>Starter</th>
<th>Plus</th>
<th>Premium</th>
</tr>
<tr>
<td>1 Stream
@ -228,40 +198,25 @@ $(document).ready(function() {
<td class="last-column">64kbps, 128kbps, and 196kbps Stream Quality
</td>
</tr>
<tr class="august-promo">
<td>
<span>5 Listeners</span><br>
<div>10 Listeners</div>
<tr>
<td>5 Listeners
</td>
<td>
<span>40 Listeners per stream</span><br>
<div>80 Listeners per stream</div>
<td>40 Listeners per stream
</td>
<td>
<span>100 Listeners per stream</span><br>
<div>200 Listeners per stream</div>
<td>100 Listeners per stream
</td>
<td class="last-column">
<span>500 Listeners per stream</span><br>
<div>1000 Listeners per stream</div>
<td class="last-column">500 Listeners per stream
</td>
</tr>
<tr class="august-promo">
<td>
<span>2GB Storage</span><br>
<div>4GB Storage</div>
<tr>
<td>2GB Storage
</td>
<td>
<span>5GB Storage</span><br>
<div>10GB Storage</div>
<td>5GB Storage
</td>
<td>
<span>30GB Storage</span><br>
<div>60GB Storage</div>
<td>30GB Storage
</td>
<td class="last-column">
<span>150GB Storage</span><br>
<div>300GB Storage</div>
150GB Storage
</td>
</tr>
<tr>
@ -297,9 +252,9 @@ $(document).ready(function() {
</table>
</div>
<!--
<p> <a target="_blank" href="https://www.airtime.pro/pricing"><?=_("View Plans")?></a> (Opens in a new window)</p>
<p> <a target="_blank" href="https://www.airtime.pro/pricing"><?=_pro("View Plans")?></a> (Opens in a new window)</p>
-->
<p id="current_plan"><span>Your Current Plan:</span>
<p id="current_plan"><span><?php echo(_pro('Your Current Plan:')); ?></span>
<?php
$currentProduct = Billing::getClientCurrentAirtimeProduct();
echo($currentProduct["name"]);
@ -307,7 +262,7 @@ echo($currentProduct["name"]);
?>
</p>
<h3>Choose a plan:</h3>
<h3>echo(_pro('Choose a plan: ')); ?></h3>
<form id="<?php echo $form->getId(); ?>" method="<?php echo $form->getMethod() ?>" action="<?php echo
$form->getAction()?>" enctype="<?php echo $form->getEncType();?>">
@ -320,12 +275,8 @@ echo($currentProduct["name"]);
<?php echo $form->newproductbillingcycle ?>
</div>
<div id="billingcycle_disclaimer">
Save 15% on annual plans (Hobbyist plan excluded).
Save 15% on annual plans (Hobbyist plan excluded).
</div>
<div class="clearfix"></div>
<div id="promo-plan-eligible" style="display:none;">
Congratulations, you are eligible for an Awesome Promotional Plan!
</div>
<div class="clearfix"></div>
<div id="subtotal_box">
<b>Subtotal:</b><br>
@ -337,7 +288,7 @@ echo($currentProduct["name"]);
VAT will be added below if you are an EU resident without a valid VAT number.
</div>
<h3>Enter your payment details:</h3>
<h3><?=_pro("Please enter your payment details:");?></h3>
<?php if (isset($this->errorMessage)) {?>
<div class="errors"><?php echo $this->errorMessage ?></div>
<?php }?>

2
airtime_mvc/application/views/scripts/form/showbuilder.phtml
View file

@ -4,7 +4,7 @@
<?php echo $this->element->getElement('sb_date_end'); ?>
<?php echo $this->element->getElement('sb_time_end'); ?>
<a id="sb_submit" class="btn btn-small" href="#" title="Display shows in the specified date and time range">
<i class="icon-white icon-search"></i><?php echo " "._("Find Shows") ?>
<i class="icon-white icon-search"></i><span><?php echo _("Find Shows") ?></span>
</a>
<?php echo $this->element->getElement('sb_show_filter') ?>

6
airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
View file

@ -89,9 +89,9 @@
}
$nextDisabled = $this->element->getElement("sp_criteria_field_".$nextIndex)->getAttrib('disabled') == 'disabled'?true:false;
?>
<div <?php if (($i > 0) && $disabled) {
echo 'style=display:none';
} ?>>
<div <?php if (/*($i > 0) && */ $disabled) {
echo 'style=display:none';
} ?> >
<?php echo $this->element->getElement("sp_criteria_field_".$i."_".$j) ?>
<?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j) ?>
<?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?>

2
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
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 sprintf(_("Purchase an %s Pro plan!"), PRODUCT_NAME)?>" href="/billing/upgrade"><?php echo _("My Account") ?></a>
<a title="<?php echo sprintf(_pro("Purchase an %s plan!"), SAAS_PRODUCT_BRANDING_NAME)?>" href="/billing/upgrade"><?php echo _pro("My Account") ?></a>
</div>
</div>
<?php }?>

6
airtime_mvc/application/views/scripts/plupload/index.phtml
View file

@ -18,7 +18,7 @@
<div id="plupload_files"></div>
</form>
-->
<div id="upload_form" class="lib-content ui-widget ui-widget-content block-shadow padded wide-panel <?php if ($this->quotaLimitReached) { ?> hidden <?php } ?>">
<div id="upload_form" class="lib-content ui-widget ui-widget-content block-shadow padded content-pane wide-panel<?php if ($this->quotaLimitReached) { ?> hidden <?php } ?>">
<?php
$partitions = Application_Model_Systemstatus::GetDiskInfo();
$status = new StdClass;
@ -58,7 +58,7 @@
<table></table>
</div>
<div id="recent_uploads_wrapper" class="lib-content ui-widget ui-widget-content block-shadow wide-panel">
<div id="recent_uploads_wrapper" class="lib-content ui-widget ui-widget-content block-shadow content-pane wide-panel">
<div id="recent_uploads" class="outer-datatable-wrapper padded">
<div id="recent_uploads_filter">
<form>
@ -68,10 +68,8 @@
</form>
</div>
<H2><?php echo _("Recent Uploads")?></H2>
<div class="dataTables_scrolling">
<table id="recent_uploads_table" class="datatable lib-content ui-widget ui-widget-content block-shadow"
cellpadding="0" cellspacing="0"></table>
</div>
</div>
<div style="clear: both;"></div>
</div>

1
airtime_mvc/application/views/scripts/showbuilder/index.phtml
View file

@ -7,6 +7,7 @@
<div class="panel-header">
<div id="advanced-options" class="btn-group">
<button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
<span id="filter_message"></span>
<span class="caret"></span>
</button>
<div id="advanced_search" class="advanced_search form-horizontal dropdown-menu"></div>