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

Merge branch 'saas-dev' into saas-landing-page

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/views/scripts/embed/player.phtml
This commit is contained in:
drigato 2015-05-28 13:25:18 -04:00
commit 8f8b0b7f4d
46 changed files with 1033 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

14
airtime_mvc/application/views/scripts/form/preferences.phtml
View file

@ -2,8 +2,22 @@
<?php echo $this->element->getElement('csrf') ?>
<?php echo $this->element->getSubform('preferences_general') ?>
<h3 class="collapsible-header" id="tunein-pref-heading"><span class="arrow-icon"></span><?php echo _("TuneIn Settings"); ?></h3>
<div class="collapsible-content" id="tunein-settings">
<?php echo $this->element->getSubform('preferences_tunein') ?>
</div>
<?php //No soundcloud stuff on Airtime Pro -- Albert ?>
<h3 class="collapsible-header" id="dangerous-heading"><span class="arrow-icon"></span><?php echo _("Dangerous Options") ?></h3>
<div class="collapsible-content" id="dangerous-settings">
<?php echo $this->element->getSubform('preferences_danger') ?>
</div>
<br>
<?php echo $this->element->submit->render() ?>
</form>

14
airtime_mvc/application/views/scripts/form/preferences_danger.phtml Normal file
View file

@ -0,0 +1,14 @@
<fieldset class="padded">
<dl class="zend_form">
<div class="warning" style="margin-bottom: 10px;">
<p class="warning-label">
<strong>Warning:</strong> These functions will have <strong>permanent and lasting effects</strong>
on your Airtime station. Think carefully before using them!
</p>
</div>
<?php echo $this->element->getElement('clear_library')->render() ?>
</dl>
</fieldset>

18
airtime_mvc/application/views/scripts/form/preferences_tunein.phtml Normal file
View file

@ -0,0 +1,18 @@
<fieldset class="padded">
<dl class="zend_form">
<?php if($this->element->getElement("enable_tunein")->hasErrors()) {
echo $this->element->getElement('enable_tunein')->renderErrors();
}
?>
<?php echo $this->element->getElement('enable_tunein')->renderViewHelper() ?>
<?php echo $this->element->getElement('enable_tunein')->renderLabel() ?>
<?php echo $this->element->getElement('tunein_station_id')->render() ?>
<?php echo $this->element->getElement('tunein_partner_id')->render() ?>
<?php echo $this->element->getElement('tunein_partner_key')->render() ?>
</dl>
</fieldset>

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

@ -3,12 +3,11 @@
font-size: 200px !important;
}
</style>
<?php $upgradeLink = Application_Common_OsPath::getBaseDir() . "billing/upgrade"; ?>
<?php if ($this->quotaLimitReached) { ?>
<div class="errors quota-reached">
Disk quota exceeded. You cannot upload files until you
<a target="_parent" href=<?php $baseUrl = Application_Common_OsPath::getBaseDir(); echo $baseUrl . "billing/upgrade"?>>
upgrade your storage
</a>.
<?php printf(_pro("Disk quota exceeded. You cannot upload files until you %s upgrade your storage"),
"<a target=\"_parent\" href=$upgradeLink>");?></a>.
</div>
<?php
}

27
airtime_mvc/application/views/scripts/systemstatus/index.phtml
View file

@ -1,31 +1,6 @@
<table width="60%" cellpadding="0" cellspacing="0" border="0" class="statustable">
<thead>
<tr class="ui-state-default strong">
<td><?php echo _("Service") ?></td>
<td><?php echo _("Status") ?></td>
<td><?php echo _("Uptime") ?></td>
<td><?php echo _("CPU") ?></td>
<td><?php echo _("Memory") ?></td>
</tr>
</thead>
<tbody>
<!--
<tr class="odd">
<td><?php echo sprintf(_("%s Version"), PRODUCT_NAME) ?></td>
<td>1.9.3</td>
<td>&nbsp;</td>
</tr>
-->
<?php $i=0; ?>
<?php foreach($this->status->services as $key=>$value): ?>
<tr class="<?php echo ($i&1) == 0 ? "even":"odd"; $i++; ?>" id="<?php echo $value["name"]; ?>">
<td><?php echo $value["name"]; ?></td>
<td><span></span></td>
<td></td>
<td></td>
<td></td>
</tr>
<?php endforeach; ?>
<tr id="partitions" class="even">
<th colspan="5"><?php echo _("Disk Space") ?></th>
</tr>