Merge branch 'saas' into saas-embed-player

This commit is contained in:
drigato 2015-02-25 12:13:41 -05:00
commit cf11291877
38 changed files with 8964 additions and 85 deletions

View file

@ -7,7 +7,11 @@
<?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() ?>