seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-604 show disconnected devices on audio profile screen

This commit is contained in:
Brian Smith 2014-03-02 15:06:23 -05:00
parent 55de15338f
commit 11a9d8b77b
3 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
web/app/assets/javascripts/accounts_audio_profile.js
View File

@ -30,21 +30,38 @@
function populateAccountAudio() {
// load Audio Driver dropdown
var devices = context.jamClient.TrackGetDevices();
var badAudioConfigs = [];
var allAudioConfigs = context.jamClient.FTUEGetAllAudioConfigurations();
var goodAudioConfigs = context.jamClient.FTUEGetGoodAudioConfigurations();
for (var i=0; i < allAudioConfigs.length; i++) {
console.log("allAudioConfigs[i]=%o", allAudioConfigs[i]);
if ($.inArray(allAudioConfigs[i], goodAudioConfigs) === -1) {
console.log("pushing %o onto badAudioConfigs", allAudioConfigs[i]);
badAudioConfigs.push(allAudioConfigs[i]);
}
}
// render CONNECTED device profiles
var options = {
devices: devices
configurations: goodAudioConfigs,
valid: 1
}
var template = context._.template($('#template-account-audio').html(), options, {variable: 'data'});
appendAudio(template);
// render DISCONNECTED device profiles
options = {
configurations: badAudioConfigs,
valid: 0
}
template = context._.template($('#template-account-audio').html(), options, {variable: 'data'});
appendAudio(template);
}
function appendAudio(template) {
$('#account-audio-content-scroller table tbody').replaceWith(template);
$('#account-audio-content-scroller table tbody').append(template);
}
function resetForm() {

6
web/app/assets/stylesheets/client/account.css.scss
View File

@ -162,7 +162,13 @@
}
}
tr.invalid-profile {
background-color:red;
}
img.invalid-profile {
vertical-align:middle;
}
.button-grey {
margin-right:6px;

25
web/app/views/clients/_account_audio_profile.html.erb
View File

@ -34,25 +34,28 @@
</tbody>
</table>
<br clear="all" />
<div class="left"><a href="#" data-purpose="add-profile" class="button-orange">ADD NEW PROFILE</a></div><div class="right"><a href="javascript:history.go(-1)" class="button-grey">BACK</a></div>
</div>
<br clear="all" />
<br clear="all" />
<br clear="all" />
<br clear="all" />
<div class="ml35">
<img src="/assets/content/icon_alert_big.png" class="invalid-profile" width="15" height="15" /> &mdash; INVALID CONFIGURATION OR DEVICE NOT CONNECTED
</div>
</div>
</div>
<!-- end content scrolling area -->
</div>
<script type="text/template" id="template-account-audio">
<tbody>
{% var keys = Object.keys(data.devices); %}
{% for (var i = 0; i < keys.length; i++) { %}
<tr>
<td>{{data.devices[keys[i]]}}</td>
<td class="actions"><a href="#" data-id="{{keys[i]}}" data-purpose="delete-audio-profile" class="button-orange">DELETE</a></td>
</tr>
{% } %}
</tbody>
{% var configs = data.configurations; %}
{% for (var i = 0; i < configs.length; i++) { %}
<tr>
<td>{{configs[i]}} &nbsp; {% if (data.valid === 0) { %} <img src="/assets/content/icon_alert_big.png" width="15" height="15" class="invalid-profile" /> {% } %}</td>
<td class="actions"><a href="#" data-id="{{configs[i]}}" data-purpose="delete-audio-profile" class="button-orange">DELETE</a></td>
</tr>
{% } %}
</script>