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

track type default

Browse source
This commit is contained in:
Codenift 2020-05-04 00:32:52 -04:00
parent f87dc5cbbc
commit 5ef67836cf
7 changed files with 93 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/common/FileDataHelper.php
View file

@ -442,7 +442,7 @@ class FileDataHelper {
$tt = $_COOKIE['tt_upload'];
} else {
// Use default track type
$tt = "MUS";
$tt = Application_Model_Preference::GetTrackTypeDefault();
}
return $tt;
}

1
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -42,6 +42,7 @@ class PreferenceController extends Zend_Controller_Action
{
Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);
Application_Model_Preference::SetStationDescription($values["stationDescription"]);
Application_Model_Preference::SetTrackTypeDefault($values["tracktypeDefault"]);
Application_Model_Preference::SetDefaultCrossfadeDuration($values["stationDefaultCrossfadeDuration"]);
Application_Model_Preference::SetDefaultFadeIn($values["stationDefaultFadeIn"]);
Application_Model_Preference::SetDefaultFadeOut($values["stationDefaultFadeOut"]);

7
airtime_mvc/application/forms/GeneralPreferences.php
View file

@ -100,6 +100,11 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
'value' => $defaultFadeOut,
));
$tracktypeDefault = new Zend_Form_Element_Select("tracktypeDefault");
$tracktypeDefault->setLabel(_("Track Type Upload Default"));
$tracktypeDefault->setMultiOptions(Application_Model_Library::getTracktypes());
$tracktypeDefault->setValue(Application_Model_Preference::GetTrackTypeDefault());
$this->addElement($tracktypeDefault);
// add intro playlist select here
$introPlaylistSelect = new Zend_Form_Element_Select("introPlaylistSelect");
@ -114,8 +119,6 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
$outroPlaylistSelect->setValue(Application_Model_Preference::GetOutroPlaylist());
$this->addElement($outroPlaylistSelect);
$podcast_album_override = new Zend_Form_Element_Radio('podcastAlbumOverride');
$podcast_album_override->setLabel(_('Overwrite Podcast Episode Metatags'));
$podcast_album_override->setMultiOptions(array(

11
airtime_mvc/application/models/Library.php
View file

@ -56,4 +56,15 @@ class Application_Model_Library
return $playlistNames;
}
public static function getTracktypes()
{
$track_type_options = array(NULL => _("None"));
$track_types = Application_Model_Tracktype::getTracktypes();
foreach ($track_types as $key => $tt) {
$track_type_options[$tt['code']] = $tt['type_name'];
}
return $track_type_options;
}
}

10
airtime_mvc/application/models/Preference.php
View file

@ -388,6 +388,16 @@ class Application_Model_Preference
return $val === '1' ? true : false;
}
public static function SetTrackTypeDefault($tracktype)
{
self::setValue("tracktype_default", $tracktype);
}
public static function GetTrackTypeDefault()
{
return self::getValue("tracktype_default");
}
public static function GetIntroPlaylist()
{
return self::getValue("intro_playlist");

2
airtime_mvc/application/views/scripts/form/preferences_general.phtml
View file

@ -25,6 +25,8 @@
<?php echo $this->element->getElement('weekStartDay')->render() ?>
<?php echo $this->element->getElement('tracktypeDefault')->render() ?>
<?php echo $this->element->getElement('stationDefaultFadeIn')->render() ?>
<?php echo $this->element->getElement('stationDefaultFadeOut')->render() ?>

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

@ -25,9 +25,11 @@
<?php
if (isset($_COOKIE['tt_upload'])) {
$ttsaved = $_COOKIE['tt_upload'];
$timer_icon = '<i class="icon-time icon-white"></i>';
} else {
// Use default track type
$ttsaved = "MUS";
// Use default track type
$ttsaved = Application_Model_Preference::GetTrackTypeDefault();
$timer_icon = '';
}
?>
@ -66,7 +68,7 @@
}
?>
<H2><?php echo _("Upload")?> <span id="upload_type" <?php echo ($showTracktypesDropdown && $ttTitle!="") ? 'style="color:#ff611f"' : "" ?>>
<?php echo ($showTracktypesDropdown && $ttTitle!="") ? $ttTitle : "Tracks"; ?></span></H2>
<?php echo ($showTracktypesDropdown && $ttTitle!="") ? $ttTitle : "Tracks"; ?></span> <?php echo $timer_icon; ?></H2>
<form action="/rest/media" method="post" id="add-media-dropzone" class="dropzone dz-clickable">
<?php echo $this->form->getElement('csrf') ?>
<div class="dz-message">