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

Added remove button for station logo on preferences page

Browse source
This commit is contained in:
Duncan Sommerville 2015-02-24 12:12:30 -05:00
parent 69d588d2f6
commit 5e256df061
5 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -146,6 +146,15 @@ class PreferenceController extends Zend_Controller_Action
$this->view->form = $watched_dirs_pref; $this->view->form = $watched_dirs_pref;
} }
public function removeLogoAction()
{
$this->view->layout()->disableLayout();
// Remove reliance on .phtml files to render requests
$this->_helper->viewRenderer->setNoRender(true);
Application_Model_Preference::SetStationLogo("");
}
public function streamSettingAction() public function streamSettingAction()
{ {
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();

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

@ -589,13 +589,12 @@ class Application_Model_Preference
public static function SetStationLogo($imagePath) public static function SetStationLogo($imagePath)
{ {
if (!empty($imagePath)) { if (empty($imagePath)) {
$image = @file_get_contents($imagePath); Logging::info("Removed station logo");
$image = base64_encode($image);
self::setValue("logoImage", $image);
} else {
Logging::warn("Attempting to set imagePath to empty string");
} }
$image = @file_get_contents($imagePath);
$image = base64_encode($image);
self::setValue("logoImage", $image);
} }
public static function GetStationLogo() public static function GetStationLogo()

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

@ -7,7 +7,11 @@
<?php echo $this->element->getElement('stationLogo')->render() ?> <?php echo $this->element->getElement('stationLogo')->render() ?>
<div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div> <button id="logo-remove-btn" value="Remove" class="btn">Remove</button>
<div id="Logo-img-container">
<img onError="this.onerror = '';this.style.visibility='hidden';$('#logo-remove-btn').hide();" id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" />
</div>
<?php echo $this->element->getElement('locale')->render() ?> <?php echo $this->element->getElement('locale')->render() ?>

8
airtime_mvc/public/css/styles.css
View file

@ -2187,6 +2187,14 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
height: 120px; height: 120px;
} }
.preferences #logo-remove-btn {
float: right;
}
.preferences #Logo-img-container {
float: left;
}
#show_time_info { #show_time_info {
font-size:12px; font-size:12px;
height:30px; height:30px;

4
airtime_mvc/public/js/airtime/preferences/preferences.js
View file

@ -104,6 +104,10 @@ $(document).ready(function() {
return false; return false;
}).next().hide(); }).next().hide();
$('#logo-remove-btn').click(function() {
$.post(baseUrl+'Preference/remove-logo', function(json){});
});
/* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert /* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert
$('#pref_save').live('click', function() { $('#pref_save').live('click', function() {
var data = $('#pref_form').serialize(); var data = $('#pref_form').serialize();