External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 13:10:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

working commit of move of websocket status

Browse Source
This commit is contained in:
John Mitchell
2015-06-10 13:53:02 -04:00
parent b19c427e9c
commit 0ee9dea3f0
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/static/js/main-menu/menu-default.partial.html
View File

@@ -10,7 +10,8 @@
<a menu-item link-to="jobs" title="Jobs" class="MenuItem"> <a menu-item link-to="jobs" title="Jobs" class="MenuItem">
Jobs Jobs
</a> </a>
<a link-to="userEdit" model="{ user_id: currentUser }" class="MenuItem MenuItem--right MenuItem--fixed MenuItem-username"> <web-socket-status class="MenuItem MenuItem--socketStatus MenuItem--right MenuItem--fixed"></web-socket-status>
<a link-to="userEdit" model="{ user_id: currentUser }" class="MenuItem MenuItem--right MenuItem--fixed MenuItem--username">
<i class="MenuItem-icon MenuItem-icon--labelled"> <i class="MenuItem-icon MenuItem-icon--labelled">
<aw-icon name="User"></aw-icon> <aw-icon name="User"></aw-icon>
</i> </i>

9
awx/ui/static/js/main-menu/menu-item.block.less
View File

@@ -118,13 +118,20 @@
} }
} }
&-username { &--socketStatus {
@media screen and (max-width: @menu-breakpoint) {
display: none;
}
}
&--username {
padding-right: 0.25rem; padding-right: 0.25rem;
@media screen and (max-width: @menu-breakpoint) { @media screen and (max-width: @menu-breakpoint) {
order: 1; // moves this to the bottom order: 1; // moves this to the bottom
} }
@media screen and (min-width: (@menu-breakpoint + 1px)) { @media screen and (min-width: (@menu-breakpoint + 1px)) {
max-width: 110px; max-width: 110px;
margin-left: -3px;
} }
} }

8
awx/ui/static/js/main-menu/web-socket-status.partial.html
View File

@@ -1,13 +1,11 @@
<button <button
ng-click="socketHelp()" aw-tool-tip="{{socketTip}}"
aw-pop-over="{{socketTip}}" tip-watch="socketTip"
aw-pop-over-watch="socketTip"
data-popover-title="Live Events" data-popover-title="Live Events"
data-placement="left" data-placement="bottom"
data-trigger="hover" data-trigger="hover"
data-container="body" data-container="body"
class="Button--pseudo" class="Button--pseudo"
ng-if="socketStatus !== 'ok'"> ng-if="socketStatus !== 'ok'">
<i class="fa icon-socket-{{socketStatus}}"></i> <i class="fa icon-socket-{{socketStatus}}"></i>
</button> </button>

4
awx/ui/static/js/shared/Socket.js
View File

@@ -51,10 +51,10 @@ angular.module('SocketIO', ['AuthService', 'Utilities'])
var result = ''; var result = '';
switch(status) { switch(status) {
case 'error': case 'error':
result = "Live events: error connecting to the Tower server. Click for troubleshooting help."; result = "Live events: error connecting to the Tower server.";
break; break;
case 'connecting': case 'connecting':
result = "Live events: attempting to connect to the Tower server. Click for troubleshooting help."; result = "Live events: attempting to connect to the Tower server.";
break; break;
case "ok": case "ok":
result = "Live events: connected. Pages containing job status information will automatically update in real-time."; result = "Live events: connected. Pages containing job status information will automatically update in real-time.";

6
awx/ui/templates/ui/index.html
View File

@@ -36,12 +36,6 @@
</main-menu> </main-menu>
<div class="container-fluid"> <div class="container-fluid">
<div class="row">
<div class="col-lg-11"></div>
<div class="col-lg-1" style="display: flex;">
<web-socket-status style="margin-left: auto;"></web-socket-status>
</div>
</div>
<div class="container-fluid" id="#content-container"> <div class="container-fluid" id="#content-container">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">