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

Merge branch 'saas-dev' into saas-dev-facebook-radio

Browse source
This commit is contained in:
drigato 2015-11-24 11:22:18 -05:00
commit a2a30e5c42
23 changed files with 153 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,13 +193,13 @@ $(document).ready(function() {
</td>
</tr>
<tr>
<td>64kbps Stream Quality
<td>Up to 64kbps Stream Quality
</td>
<td>64kbps and 128kbps Stream Quality
<td>Up to 128kbps Stream Quality
</td>
<td>64kbps and 196kbps Stream Quality
<td>Up to 196kbps Stream Quality
</td>
<td class="last-column">64kbps, 128kbps, and 196kbps Stream Quality
<td class="last-column">Up to 196kbps Stream Quality
</td>
</tr>
<tr>
@ -222,7 +222,18 @@ $(document).ready(function() {
<td class="last-column">
150GB Storage
</td>
</tr>
</tr>
<tr>
<td>No Built-in Podcast
</td>
<td>2,000 Podcast Episode Downloads
</td>
<td>5,000 Podcast Episode Downloads
</td>
<td class="last-column">
10,000 Podcast Episode Downloads
</td>
</tr>
<tr>
<td>Ticket, Email, Forum Support
</td>

5
airtime_mvc/application/views/scripts/error/error-400.phtml
View file

@ -1,5 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN";
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@ -11,7 +10,7 @@
<h2><?php echo _("Bad Request!")?></h2>
<p><?php echo _("The requested action is not supported!")?></p>
<div class="button-bar">
<a class="toggle-button" href="<?php echo $this->baseUrl('dashboard/help'); ?>"><?php echo _("Help") ?></a>
<a class="toggle-button" href="<?php echo $this->helpUrl; ?>"><?php echo _("Help") ?></a>
</div>
</div>
</body>

5
airtime_mvc/application/views/scripts/error/error-403.phtml
View file

@ -1,5 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN";
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@ -11,7 +10,7 @@
<h2><?php echo _("Access Denied!")?></h2>
<p><?php echo _("You do not have permission to access this page!")?></p>
<div class="button-bar">
<a class="toggle-button" href="<?php echo $this->baseUrl('dashboard/help'); ?>"><?php echo _("Help") ?></a>
<a class="toggle-button" href="<?php echo $this->helpUrl; ?>"><?php echo _("Help") ?></a>
</div>
</div>
</body>

5
airtime_mvc/application/views/scripts/error/error-404.phtml
View file

@ -1,5 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN";
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@ -11,7 +10,7 @@
<h2><?php echo _("Page not found!")?></h2>
<p><?php echo _("We couldn't find the page you were looking for.")?></p>
<div class="button-bar">
<a class="toggle-button" href="<?php echo $this->baseUrl('dashboard/help'); ?>"><?php echo _("Help") ?></a>
<a class="toggle-button" href="<?php echo $this->helpUrl; ?>"><?php echo _("Help") ?></a>
</div>
</div>
</body>

5
airtime_mvc/application/views/scripts/error/error-500.phtml
View file

@ -1,5 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN";
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@ -11,7 +10,7 @@
<h2><?php echo _("Oops!")?></h2>
<p><?php echo _("Something went wrong!")?></p>
<div class="button-bar">
<a class="toggle-button" href="<?php echo $this->baseUrl('dashboard/help'); ?>"><?php echo _("Help") ?></a>
<a class="toggle-button" href="<?php echo $this->helpUrl; ?>"><?php echo _("Help") ?></a>
</div>
</div>
</body>

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

@ -1,4 +0,0 @@
<fieldset class="padded">
<?php echo $this->element->getElement('stationPodcastPrivacy')->render() ?>
<?php echo $this->element->getElement('stationPodcastFeedUrl')->render() ?>
</fieldset>

2
airtime_mvc/application/views/scripts/podcast/podcast.phtml
View file

@ -1,5 +1,3 @@
<div class="angular_wrapper" ng-controller="Podcast">
<div class="inner_editor_title">
<h2>

14
airtime_mvc/application/views/scripts/podcast/station.phtml
View file

@ -1,6 +1,6 @@
<div id="station_podcast">
<div class="angular_wrapper" ng-controller="StationPodcast">
<div class="station_podcast_wrapper">
<div class="station_podcast_wrapper content-pane">
<div class="inner_editor_title">
<h2>
<span class="title_obj_name"><?php echo _("My Podcast") ?></span>
@ -26,9 +26,6 @@
<label><?php echo _("Creator") ?></label>
<input name="podcast_creator" ng-model="podcast.creator" type="text"/>
<label><?php echo _("URL") ?></label>
<input disabled name="podcast_url" ng-model="podcast.url" type="text"/>
<label><?php echo _("Description") ?></label>
<textarea name="podcast_description" ng-model="podcast.description"></textarea>
@ -81,8 +78,12 @@
<?php echo $this->form->getSubform('preferences_podcast')->getElement("stationPodcastPrivacy")->renderViewHelper() ?>
</div>
<div style="clear:both"></div>
<?php echo $this->form->getSubform('preferences_podcast')->getElement("stationPodcastFeedUrl") ?>
<dt>
<label for="stationPodcastFeedUrl" class="optional">Feed URL</label>
</dt>
<dd>
<input type="url" ng-model="podcast.url" disabled="disabled" class="input_text" />
</dd>
</dl>
</fieldset>
</div>
@ -122,5 +123,4 @@
$(this).toggleClass("closed");
return false;
});
</script>