External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-24 12:25:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

Socket connection help

Browse Source 
Revised help text, adding status icons. Added clear overlay under the modal dialog. Rotated the network icon left by 45 deg.
This commit is contained in:
Chris Houseknecht
2014-07-30 17:06:20 -04:00
parent 56255777bc
commit 10d0fa7631
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/static/js/help/ChromeSocketHelp.js
View File

@@ -21,9 +21,8 @@ angular.module('ChromeSocketHelpDefinition', [])
src: 'socket_indicator.png', src: 'socket_indicator.png',
maxWidth: 360 maxWidth: 360
}, },
box: "<p>When live events are streaming the connection status indicator will be green. Red or orange indicates the " + box: "<p><i class=\"fa icon-socket-ok\"></i> indicates live events are streaming and the browser is connected to the live events server.</p><p>If the indicator continually shows <i class=\"fa icon-socket-error\"></i> " +
"browser is having difficulty connecting to the server, and live events are no longer being received.</p><p>If the indicator " + "or <i class=\"fa icon-socket-connecting\"></i>, then live events are not streaming, and the browser is having difficulty connecting to the live events server. In this case click Next for troubleshooting help.</p>"
"appears red or orange, click next for troubleshooting help.</p>"
}, { }, {
intro: 'Live events connection:', intro: 'Live events connection:',
icon: { icon: {

5
awx/ui/static/js/help/FirefoxSocketHelp.js
View File

@@ -21,9 +21,8 @@ angular.module('FFSocketHelpDefinition', [])
src: 'socket_indicator.png', src: 'socket_indicator.png',
maxWidth: 360 maxWidth: 360
}, },
box: "<p>When live events are streaming the connection status indicator will be green. Red or orange indicates the " + box: "<p><i class=\"fa icon-socket-ok\"></i> indicates live events are streaming and the browser is connected to the live events server.</p><p>If the indicator continually shows <i class=\"fa icon-socket-error\"></i> " +
"browser is having difficulty connecting to the server, and live events are no longer being received.</p><p>If the indicator " + "or <i class=\"fa icon-socket-connecting\"></i>, then live events are not streaming, and the browser is having difficulty connecting to the live events server. In this case click Next for troubleshooting help.</p>"
"appears red or orange, click Next for troubleshooting help.</p>"
}, { }, {
intro: 'Live events connection:', intro: 'Live events connection:',
icon: { icon: {

5
awx/ui/static/js/help/SafariSocketHelp.js
View File

@@ -21,9 +21,8 @@ angular.module('SafariSocketHelpDefinition', [])
src: 'socket_indicator.png', src: 'socket_indicator.png',
maxWidth: 360 maxWidth: 360
}, },
box: "<p>When live events are streaming the connection status indicator will be green. Red or orange indicates the " + box: "<p><i class=\"fa icon-socket-ok\"></i> indicates live events are streaming and the browser is connected to the live events server.</p><p>If the indicator continually shows <i class=\"fa icon-socket-error\"></i> " +
"browser is having difficulty connecting to the server, and live events are no longer being received.</p><p>If the indicator " + "or <i class=\"fa icon-socket-connecting\"></i>, then live events are not streaming, and the browser is having difficulty connecting to the live events server. In this case click Next for troubleshooting help.</p>"
"appears red or orange, click next for troubleshooting help.</p>"
}, { }, {
intro: 'Live events connection:', intro: 'Live events connection:',
icon: { icon: {

4
awx/ui/static/less/ansible-ui.less
View File

@@ -1549,6 +1549,10 @@ tr td button i {
color: @grey-txt; color: @grey-txt;
font-size: 14px; font-size: 14px;
} }
.fa-rss {
transform:rotate(-45deg);
}
} }
/* Activity Stream Widget */ /* Activity Stream Widget */

7
awx/ui/static/lib/ansible/Utilities.js
View File

@@ -408,6 +408,12 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
$('#help-modal-dialog').dialog('close'); $('#help-modal-dialog').dialog('close');
} }
}); });
$('.overlay').css({
width: $(document).width(),
height: $(document).height()
}).fadeIn();
// Show the dialog // Show the dialog
$('#help-modal-dialog').dialog({ $('#help-modal-dialog').dialog({
position: { position: {
@@ -424,6 +430,7 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
hide: 500, hide: 500,
resizable: false, resizable: false,
close: function () { close: function () {
$('.overlay').hide();
$('#help-modal-dialog').empty(); $('#help-modal-dialog').empty();
} }
}); });