diff --git a/deps/tools/configServer/src/resources/frcvision.js b/deps/tools/configServer/src/resources/frcvision.js index 2c74a94..21e96a3 100644 --- a/deps/tools/configServer/src/resources/frcvision.js +++ b/deps/tools/configServer/src/resources/frcvision.js @@ -39,6 +39,14 @@ function displayStatus(message) { $('#status-content').html(''); } +function displaySuccess(message) { + $('#status-content').html(''); +} + +function dismissStatus() { + $('.alert').alert('close'); +} + // Enable and disable buttons based on connection status var connectedButtonIds = ['systemRestart', 'networkApproach', 'networkAddress', 'networkMask', 'networkGateway', 'networkDNS', 'visionUp', 'visionDown', 'visionTerm', 'visionKill', 'systemReadOnly', 'systemWritable', 'visionClient', 'visionTeam', 'visionDiscard', 'addConnectedCamera', 'addCamera', 'applicationType']; var connectedButtonClasses = ['cameraName', 'cameraPath', 'cameraAlternatePaths', 'cameraPixelFormat', 'cameraWidth', 'cameraHeight', 'cameraFps', 'cameraBrightness', 'cameraWhiteBalance', 'cameraExposure', 'cameraProperties', 'streamWidth', 'streamHeight', 'streamFps', 'streamCompression', 'streamDefaultCompression', 'cameraRemove', 'cameraCopyConfig'] @@ -196,6 +204,7 @@ function connect() { case 'applicationSaveComplete': $('#applicationSave').button('reset'); updateApplicationView(); + displaySuccess('Application successfully uploaded! See the Vision Status tab for status and console output'); break; case 'systemReadOnly': displayReadOnly(); @@ -694,8 +703,10 @@ var applicationFiles = []; function updateApplicationView() { if ($('#applicationType').val().startsWith("upload")) { $('#applicationUpload').collapse('show'); + $('#applicationSaveText').text('Upload and Save'); } else { $('#applicationUpload').collapse('hide'); + $('#applicationSaveText').text('Save'); } $('#applicationFile').val(null); applicationFiles = []; @@ -703,10 +714,12 @@ function updateApplicationView() { $('#applicationType').change(function() { updateApplicationView(); + dismissStatus(); }); $('#applicationFile').change(function() { applicationFiles = this.files; + dismissStatus(); }); $('#applicationSave').click(function() { diff --git a/deps/tools/configServer/src/resources/index.html b/deps/tools/configServer/src/resources/index.html index cf8001d..5ab7a9c 100644 --- a/deps/tools/configServer/src/resources/index.html +++ b/deps/tools/configServer/src/resources/index.html @@ -438,7 +438,7 @@