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

Merge branch 'devel' into 2.3.x-saas

Browse source 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
This commit is contained in:
Martin Konecny 2013-01-15 13:44:44 -05:00
commit 8cd6bd9aa4
346 changed files with 48955 additions and 11856 deletions
Download patch file Download diff file Expand all files Collapse all files

24
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
View file

@ -1,37 +1,37 @@
<div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
<div class="button-bar">
<a href="#" id="add-show-close" class="icon-link"><span class="ui-icon ui-icon-circle-close"></span>Close</a>
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary">
<span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? "Add this show" : "Update show"); ?></span>
<a href="#" id="add-show-close" class="icon-link add-show-close"><span class="ui-icon ui-icon-circle-close"></span><? echo _("Close") ?></a>
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary">
<span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span>
</button>
</div>
<div class="clear"></div>
<h3 class="collapsible-header"><span class="arrow-icon"></span>What</h3>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("What") ?></h3>
<div id="schedule-show-what" class="collapsible-content">
<?php echo $this->what; ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span>When</h3>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("When") ?></h3>
<div id="schedule-show-when" class="collapsible-content">
<?php echo $this->when; ?>
<?php echo $this->repeats; ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span>Live Stream Input</h3>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Live Stream Input") ?></h3>
<div id="live-stream-override" class="collapsible-content">
<?php echo $this->live; ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span>Who</h3>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Who") ?></h3>
<div id="schedule-show-who" class="collapsible-content">
<?php echo $this->who; ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span>Style</h3>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Style") ?></h3>
<div id="schedule-show-style" class="collapsible-content">
<?php echo $this->style; ?>
</div>
<div class="button-bar bottom">
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary">
<span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? "Add this show" : "Update show"); ?></span>
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary">
<span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span>
</button>
</div>
</div>

1
airtime_mvc/application/views/scripts/schedule/add-show.phtml
View file

@ -1 +0,0 @@
<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>addShow</b></center>

1
airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml
View file

@ -1 +0,0 @@
<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>cancelCurrentShow</b></center>

1
airtime_mvc/application/views/scripts/schedule/cancel-show.phtml
View file

@ -1 +0,0 @@
<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>cancelShow</b></center>

1
airtime_mvc/application/views/scripts/schedule/clear-show.phtml
View file

@ -1 +0,0 @@
<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>clearShow</b></center>

1
airtime_mvc/application/views/scripts/schedule/delete-show.phtml
View file

@ -1 +0,0 @@
<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>deleteShow</b></center>

1
airtime_mvc/application/views/scripts/schedule/event-feed.phtml
View file

@ -1 +0,0 @@
<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>eventFeed</b></center>

1
airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml
View file

@ -1 +0,0 @@
<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>makeContextMenu</b></center>

1
airtime_mvc/application/views/scripts/schedule/move-show.phtml
View file

@ -1 +0,0 @@
<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>moveShow</b></center>

1
airtime_mvc/application/views/scripts/schedule/remove-group.phtml
View file

@ -1 +0,0 @@
<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>removeGroup</b></center>

1
airtime_mvc/application/views/scripts/schedule/resize-show.phtml
View file

@ -1 +0,0 @@
<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>resizeShow</b></center>

12
airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
View file

@ -2,12 +2,12 @@
<div><?php echo $this->additionalShowInfo; ?></div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="datatable">
<tr>
<th>Start</th>
<th>Title</th>
<th>Creator</th>
<th>Album</th>
<th>Length</th>
<th>Genre</th>
<th><? echo _("Start") ?></th>
<th><? echo _("Title") ?></th>
<th><? echo _("Creator") ?></th>
<th><? echo _("Album") ?></th>
<th><? echo _("Length") ?></th>
<th><? echo _("Genre") ?></th>
</tr>
<?php $i=0; ?>
<?php foreach($this->showContent as $row): ?>