Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing

This commit is contained in:
Albert Santoni 2015-11-17 17:34:33 -05:00
commit 4fd61cb088
9 changed files with 26 additions and 15 deletions

View file

@ -21,7 +21,7 @@
<div class="publish-sources" ng-repeat="source in sources.toPublish">
<input ng-disabled="{{source.status == 2}}" ng-model="publishData[source.source]" type="checkbox" name="publish_sources" id="{{source.source}}">
<label class="source-name" for="{{source.source}}">{{source.label}}</label>
<span ng-if="source.status == 2" style="margin: auto"><a href="/preference#{{source.source}}-heading"><?php echo _("You aren't connected to this source.") ?></a></span>
<span ng-if="source.status == 2" style="margin: auto"><a href="<?php echo Application_Common_OsPath::getBaseDir() . 'preference#{{source.source}}-heading' ?>"><?php echo _("You aren't connected to this source.") ?></a></span>
</div>
<div ng-if="sources.toPublish.length == 0">
<?php echo _("You have already published this track to all available sources!") . "<br/>"

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(_pro("Purchase an %s plan!"), SAAS_PRODUCT_BRANDING_NAME)?>" href="/billing/upgrade"><?php echo _pro("My Account") ?></a>
<a title="<?php echo sprintf(_pro("Purchase an %s plan!"), SAAS_PRODUCT_BRANDING_NAME)?>" href="<?php echo Application_Common_OsPath::getBaseDir() . 'billing/upgrade' ?>"><?php echo _pro("My Account") ?></a>
</div>
</div>
<?php }?>