Merge branch 'master' of dev.sourcefabric.org:airtime

airtime_mvc/application/controllers/LocaleController.php

@@ -166,6 +166,7 @@ class LocaleController extends Zend_Controller_Action
             "Are you sure you want to remove the watched folder?" => _("Are you sure you want to remove the watched folder?"),
             "This path is currently not accessible." => _("This path is currently not accessible."),
             //preferences/streamsetting.js
+        	"Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." => _("Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided."),
             "Connected to the streaming server" => _("Connected to the streaming server"),
             "The stream is disabled" => _("The stream is disabled"),
             "Getting information from the server..." => _("Getting information from the server..."),

airtime_mvc/application/views/scripts/form/stream-setting-form.phtml

@@ -20,6 +20,7 @@
             </dt>
             <dd id="<?php echo $s_name?>Type-element">
                 <?php echo $this->element->getElement('type')?>
+                <span class='stream_type_help_icon'></span>
             </dd>
             
             <dt id="<?php echo $s_name?>Bitrate-label">

airtime_mvc/application/views/scripts/preference/stream-setting.phtml

@@ -1,15 +1,15 @@
 <div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong stream-config">
-    <h2 <?php if($this->enable_stream_conf == "true"){?>style="float:left"<?php }?>><? echo _("Stream Settings") ?></h2>
+    <h2 <?php if($this->enable_stream_conf == "true"){?>style="float:left"<?php }?>><?php echo _("Stream Settings") ?></h2>
     <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
     <?php if($this->enable_stream_conf == "true"){?>
     <form method="post" id="stream_form" enctype="application/x-www-form-urlencoded">
-    <button name="stream_save" id="stream_save" type="button" class="btn btn-small right-floated"><? echo _("Save") ?></button>
+    <button name="stream_save" id="stream_save" type="button" class="btn btn-small right-floated"><?php echo _("Save") ?></button>
     <div style="clear:both"></div>
     <?php }?>
   <?php echo $this->statusMsg;?>
   <div style="float: left; margin-right: 10px; width: 490px; overflow: auto;">
     <fieldset class="padded stream-setting-global">
-        <legend><? echo _("Global Settings") ?></legend>
+        <legend><?php echo _("Global Settings") ?></legend>
         <dl class="zend_form">
         <?php if($this->form->getElement('output_sound_device') != null){?>
             <dt id="hardwareOut-label">
@@ -32,8 +32,7 @@
             <dt id="vorbisMetadata-label">
                 <label class="required">
                     <?php echo $this->form->getElement('icecast_vorbis_metadata')->getLabel() ?> :
-                    <span class='icecast_metadata_help_icon'>
+                    <span class='icecast_metadata_help_icon'></span>
-                    </span>
                 </label>
             </dt>
             <dd id="vorbisMetadata-element">
@@ -104,7 +103,7 @@
   </div>
   <div style="float: left; width: 600px;">
     <fieldset class="padded">
-    <legend><? echo _("Output Stream Settings") ?></legend>
+    <legend><?php echo _("Output Stream Settings") ?></legend>
     <?php
         for($i=1;$i<=$this->num_stream;$i++){
             echo $this->form->getSubform("s".$i."_subform");
@@ -113,7 +112,7 @@
     </fieldset>
     <?php if($this->enable_stream_conf == "true"){?>
     <br />
-    <button name="stream_save" id="stream_save" type="button" class="btn btn-small right-floated"><? echo _("Save") ?></button>
+    <button name="stream_save" id="stream_save" type="button" class="btn btn-small right-floated"><?php echo _("Save") ?></button>
     <?php }?>
   </div>
     </form>

airtime_mvc/public/css/styles.css

@@ -125,7 +125,7 @@ select {
 
 .airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon,
 .playlist_type_help_icon, .master_username_help_icon, .repeat_tracks_help_icon,
-.admin_username_help_icon {
+.admin_username_help_icon, .stream_type_help_icon {
         cursor: help;
         position: relative;
         display:inline-block; zoom:1;

airtime_mvc/public/js/airtime/preferences/streamsetting.js

@@ -67,11 +67,11 @@ function validate(ele,evt) {
 
 
 function showForIcecast(ele){
-    var div = ele.closest("div")
+    var div = ele.closest("div");
-    div.find("#outputMountpoint-label").show()
+    div.find("#outputMountpoint-label").show();
-    div.find("#outputMountpoint-element").show()
+    div.find("#outputMountpoint-element").show();
-    div.find("#outputUser-label").show()
+    div.find("#outputUser-label").show();
-    div.find("#outputUser-element").show()
+    div.find("#outputUser-element").show();
     div.find("select[id$=data-type]").find("option[value='ogg']").removeAttr("disabled");
     div.find("select[id$=data-type]").find("option[value='opus']").removeAttr("disabled");
 }
@@ -111,128 +111,128 @@ function checkLiquidsoapStatus(){
 
 function setLiveSourceConnectionOverrideListener(){
     $("[id=connection_url_override]").click(function(event){
-        var url_input = $(this).parent().find("#stream_url").children()
+        var url_input = $(this).parent().find("#stream_url").children();
-        url_input.removeAttr("readonly")
+        url_input.removeAttr("readonly");
 		
-        $(this).parent().find("div[id$='_dj_connection_url_actions']").show()
+        $(this).parent().find("div[id$='_dj_connection_url_actions']").show();
-        event.preventDefault()
+        event.preventDefault();
-    })
+    });
     
     // set action for "OK" and "X"
-    var live_dj_actions = $("#live_dj_connection_url_actions")
+    var live_dj_actions = $("#live_dj_connection_url_actions");
-    var live_dj_input = live_dj_actions.parent().find("#stream_url").children()
+    var live_dj_input = live_dj_actions.parent().find("#stream_url").children();
-    var master_dj_actions = $("#master_dj_connection_url_actions")
+    var master_dj_actions = $("#master_dj_connection_url_actions");
-    var master_dj_input = master_dj_actions.parent().find("#stream_url").children()
+    var master_dj_input = master_dj_actions.parent().find("#stream_url").children();
     
     live_dj_actions.find("#ok").click(function(event){
-    	event.preventDefault()
+    	event.preventDefault();
-        var url = live_dj_input.val()
+        var url = live_dj_input.val();
-        live_dj_input.val(url)
+        live_dj_input.val(url);
-        live_dj_input.attr("readonly", "readonly")
+        live_dj_input.attr("readonly", "readonly");
-        live_dj_actions.hide()
+        live_dj_actions.hide();
         $.get(baseUrl+"Preference/set-source-connection-url/", {format: "json", type: "livedj", url:encodeURIComponent(url), override: 1});
-    	event.preventDefault()
+    	event.preventDefault();
-    })
+    });
     
     live_dj_actions.find("#reset").click(function(event){
-    	event.preventDefault()
+    	event.preventDefault();
-        var port = $("#dj_harbor_input_port").val()
+        var port = $("#dj_harbor_input_port").val();
-        var mount = $("#dj_harbor_input_mount_point").val()
+        var mount = $("#dj_harbor_input_mount_point").val();
-        var url = "http://"+location.hostname+":"+port+"/"+mount
+        var url = "http://"+location.hostname+":"+port+"/"+mount;
         if (port == '' || mount == '') {
-            url = 'N/A'
+            url = 'N/A';
         }
-        live_dj_input.val(url)
+        live_dj_input.val(url);
-        live_dj_input.attr("readonly", "readonly")
+        live_dj_input.attr("readonly", "readonly");
-        live_dj_actions.hide()
+        live_dj_actions.hide();
         $.get(baseUrl+"Preference/set-source-connection-url", {format: "json", type: "livedj", url:encodeURIComponent(url), override: 0});
-    	event.preventDefault()
+    	event.preventDefault();
-    })
+    });
     
     master_dj_actions.find("#ok").click(function(event){
-        var url = master_dj_input.val()
+        var url = master_dj_input.val();
-        master_dj_input.val(url)
+        master_dj_input.val(url);
-        master_dj_input.attr("readonly", "readonly")
+        master_dj_input.attr("readonly", "readonly");
-        master_dj_actions.hide()
+        master_dj_actions.hide();
-        $.get(baseUrl+"Preference/set-source-connection-url", {format: "json", type: "masterdj", url:encodeURIComponent(url), override: 1})
+        $.get(baseUrl+"Preference/set-source-connection-url", {format: "json", type: "masterdj", url:encodeURIComponent(url), override: 1});
-        event.preventDefault()
+        event.preventDefault();
-    })
+    });
     
     master_dj_actions.find("#reset").click(function(event){
-        var port = $("#master_harbor_input_port").val()
+        var port = $("#master_harbor_input_port").val();
-        var mount = $("#master_harbor_input_mount_point").val()
+        var mount = $("#master_harbor_input_mount_point").val();
-        var url = "http://"+location.hostname+":"+port+"/"+mount
+        var url = "http://"+location.hostname+":"+port+"/"+mount;
         if (port == '' || mount == '') {
-            url = 'N/A'
+            url = 'N/A';
         }
-        master_dj_input.val(url)
+        master_dj_input.val(url);
-        master_dj_input.attr("readonly", "readonly")
+        master_dj_input.attr("readonly", "readonly");
-        master_dj_actions.hide()
+        master_dj_actions.hide();
-        $.get(baseUrl+"Preference/set-source-connection-url", {format: "json", type: "masterdj", url:encodeURIComponent(url), override: 0})
+        $.get(baseUrl+"Preference/set-source-connection-url", {format: "json", type: "masterdj", url:encodeURIComponent(url), override: 0});
-        event.preventDefault()
+        event.preventDefault();
-    })
+    });
 }
 
 
 function setupEventListeners() {
     // initial stream url
     $("dd[id=outputStreamURL-element]").each(function(){
-        rebuildStreamURL($(this))
+        rebuildStreamURL($(this));
     })
     
     $("input:[id$=-host], input:[id$=-port], input:[id$=-mount]").keyup(function(){
-        rebuildStreamURL($(this))
+        rebuildStreamURL($(this));
-    })
+    });
     
     $("input:[id$=-port]").keypress(function(e){
-        validate($(this),e)
+        validate($(this),e);
-    })
+    });
     
     $("select:[id$=-output]").change(function(){
-        rebuildStreamURL($(this))
+        rebuildStreamURL($(this));
-    })
+    });
     
     if(!$("#output_sound_device").is(':checked')){
-        $("select[id=output_sound_device_type]").attr('disabled', 'disabled')
+        $("select[id=output_sound_device_type]").attr('disabled', 'disabled');
     }else{
-        $("select[id=output_sound_device_type]").removeAttr('disabled')
+        $("select[id=output_sound_device_type]").removeAttr('disabled');
     }
     
     $("#output_sound_device").change(function(){
         if($(this).is(':checked')){
-        	$("select[id=output_sound_device_type]").removeAttr('disabled')
+        	$("select[id=output_sound_device_type]").removeAttr('disabled');
         }else{
-        	$("select[id=output_sound_device_type]").attr('disabled', 'disabled')
+        	$("select[id=output_sound_device_type]").attr('disabled', 'disabled');
         }
-    })
+    });
     
     $("select[id$=data-type]").change(function(){
         if($(this).val() == 'ogg'){
-            restrictOggBitrate($(this), true)
+            restrictOggBitrate($(this), true);
         }else{
-            restrictOggBitrate($(this), false)
+            restrictOggBitrate($(this), false);
         }
-    })
+    });
-    
+
     $("select[id$=data-type]").each(function(){
         if($(this).val() == 'ogg'){
-            restrictOggBitrate($(this), true)
+            restrictOggBitrate($(this), true);
         }
-    })
+    });
     
     $("select[id$=data-output]").change(function(){
         if($(this).val() == 'shoutcast'){
-            hideForShoutcast($(this))
+            hideForShoutcast($(this));
         }else{
-            showForIcecast($(this))
+            showForIcecast($(this));
         }
-    })
+    });
     
     $("select[id$=data-output]").each(function(){
         if($(this).val() == 'shoutcast'){
-            hideForShoutcast($(this))
+            hideForShoutcast($(this));
         }
-    })
+    });
     
     $('.toggle legend').click(function() {
         $(this).parent().toggleClass('closed');
@@ -243,7 +243,7 @@ function setupEventListeners() {
         $(this).next().toggle('fast');
         $(this).toggleClass("closed");
         return false;
-    })
+    });
     
     setLiveSourceConnectionOverrideListener();
     
@@ -272,7 +272,7 @@ function setupEventListeners() {
             my: "left bottom",
             at: "right center"
         },
-    })
+    });
     
     $(".icecast_metadata_help_icon").qtip({
         content: {
@@ -293,7 +293,7 @@ function setupEventListeners() {
             my: "left bottom",
             at: "right center"
         },
-    })
+    });
     
     $("#auto_transition_help").qtip({
         content: {
@@ -314,7 +314,7 @@ function setupEventListeners() {
             my: "left bottom",
             at: "right center"
         },
-    })
+    });
     
     $("#auto_switch_help").qtip({
         content: {
@@ -335,7 +335,7 @@ function setupEventListeners() {
             my: "left bottom",
             at: "right center"
         },
-    })
+    });
     
     $(".stream_username_help_icon").qtip({
         content: {
@@ -356,7 +356,7 @@ function setupEventListeners() {
             my: "left bottom",
             at: "right center"
         },
-    })
+    });
     
     $(".admin_username_help_icon").qtip({
         content: {
@@ -377,7 +377,7 @@ function setupEventListeners() {
             my: "left bottom",
             at: "right center"
         },
-    })
+    });
     
     $(".master_username_help_icon").qtip({
         content: {
@@ -398,7 +398,33 @@ function setupEventListeners() {
             my: "left bottom",
             at: "right center"
         },
-    })
+    });
+    
+    $(".stream_type_help_icon").qtip({
+    	content: {
+            text: sprintf(
+                	$.i18n._("Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided."), 
+                    "<a target='_blank' href='https://wiki.sourcefabric.org/pages/viewpage.action?pageId=13632310'>", 
+                    "</a>",
+                    "<a target='_blank' href='https://wiki.sourcefabric.org/pages/viewpage.action?pageId=13632310'>", 
+                    "</a>")
+        },
+        hide: {
+            delay: 500,
+            fixed: true
+        },
+        style: {
+            border: {
+                width: 0,
+                radius: 4
+            },
+            classes: "ui-tooltip-dark ui-tooltip-rounded"
+        },
+        position: {
+            my: "left bottom",
+            at: "right center"
+        },
+    });
 }
 
 function setSliderForReplayGain(){