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/plugins/PageLayoutInitPlugin.php
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/js/airtime/library/spl.js
This commit is contained in:
Duncan Sommerville 2015-10-29 11:21:24 -04:00
commit 95aae317c6
26 changed files with 189 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/billing/invoices.phtml
View file

@ -5,7 +5,7 @@ $topTextClass = "";
if (array_key_exists("planupdated", $_GET))
{
$topText = _pro("<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle.");
$topTextClass = "status-good";
$topTextClass = "invoice-status-good";
}
else {
$topText = _pro("Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button.");

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

@ -274,7 +274,7 @@ echo($currentProduct["name"]);
<form id="<?php echo $form->getId(); ?>" method="<?php echo $form->getMethod() ?>" action="<?php echo
$form->getAction()?>" enctype="<?php echo $form->getEncType();?>">
<?php echo $form->csrf ?>
<?php echo $form->csrf_upgrade ?>
<div id="plantype">
<?php echo $form->newproductid ?>
@ -353,8 +353,9 @@ echo($currentProduct["name"]);
<div id="vaterror"></div>
</div>
<div class="clearfix"></div>
<div>
<?php echo $billingForm->csrf_client ?>
<div>
<div class="billing_checkbox">
<?=$billingForm->getElement("71")->renderViewHelper(); ?>
</div>
@ -379,7 +380,7 @@ echo($currentProduct["name"]);
<b>Total:</b> <span id="total"></span>
</div>
<input type="submit" class="btn right-floated" value="Submit Order" id="atpro_submitorder"></input>
<input type="submit" class="btn right-floated" value="Submit Order" id="atpro_submitorder">
<div class="clearfix"></div>
</form>
</div>

12
airtime_mvc/application/views/scripts/embed/player.phtml
View file

@ -5,8 +5,12 @@
<link rel="stylesheet" href="<?php echo $this->css?>" type="text/css">
<script src="<?php echo $this->mrp_js?>" type="text/javascript"></script>
<script src="<?php echo $this->jquery?>" type="text/javascript"></script>
<script src="<?php echo $this->jquery_i18n?>" type="text/javascript"></script>
<script src="/locale/general-translation-table" type="text/javascript"></script>
<link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'>
<script type="text/javascript">
$.i18n.setDictionary(general_dict);
var RETRY_DELAY_MSECS = 2000; //Delay before trying to reconnect to stream after an error.
var MAX_MOBILE_SCREEN_WIDTH = 760;
@ -309,9 +313,9 @@
if (data.current === null) {
if (data.currentShow != null && data.currentShow.length > 0) {
//Master/show source have no current track but they do have a current show.
$("p.now_playing").html("On Air:" + "<span>" + data.currentShow[0].name + "</span>");
$("p.now_playing").html($.i18n._("On Air") + "<span>" + data.currentShow[0].name + "</span>");
} else {
$("p.now_playing").html("Off Air" + "<span>Offline</span>");
$("p.now_playing").html($.i18n._("Off Air") + "<span>"+ $.i18n._("Offline") + "</span>");
}
time_to_next_track_starts = 20000;
} else {
@ -340,7 +344,7 @@
}
if (data.next === null) {
$("ul.schedule_list").find("li").html("Nothing scheduled");
$("ul.schedule_list").find("li").html($.i18n._("Nothing scheduled"));
} else {
$("ul.schedule_list").find("li").html(data.next.name);
}
@ -404,7 +408,7 @@
<div style="clear:both"></div>
<div class="airtime_schedule">
<p class="airtime_next">Next</p>
<p class="airtime_next"><?php echo _("Next") ?></p>
<ul class="schedule_list">
<li></li>
</ul>

4
airtime_mvc/application/views/scripts/form/player.phtml
View file

@ -9,8 +9,8 @@
</div>
<div id="player_instructions">
Customize the player by configuring the options below. When you are done,
copy the embeddable code below and paste it into your website's HTML.
<?php echo _("Customize the player by configuring the options below. When you are done,
copy the embeddable code below and paste it into your website's HTML.") ?>
</div>
<?php echo $this->element->getElement('player_title')->render(); ?>

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

@ -47,7 +47,7 @@
<div style="padding-bottom: 2px;">Storage</div>
<div class="disk_usage_progress_bar"></div>
<div class="disk_usage_percent_in_use"><?php echo sprintf("%01.1f%% ", $used/$total*100) . _("in use") ?></div>
<div class="disk_usage_used" style="width:<?php echo sprintf("%01.1f%%", $used/$total*100) ?>;"></div>
<div class="disk_usage_used" style="width:<?php echo sprintf("%01.1f%%", min(100, $used/$total*100)) ?>;"></div>
<div style="margin-top: 17px; font-size: 12px;"><?php echo sprintf("%01.1fGB of %01.1fGB", $used/pow(2, 30), $total/pow(2, 30)); ?></div>
</div>