External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 18:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

added link to monitoring page in the account dropdown menu for admin users only

Browse Source
This commit is contained in:
Jared Tabor
2014-07-18 11:15:44 -04:00
parent a75c455633
commit b35da4557f
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/ui/static/js/controllers/Home.js
View File

@@ -25,12 +25,12 @@ function Home($scope, $compile, $routeParams, $rootScope, $location, Wait, Dashb
awToolTip: "Refresh the page", awToolTip: "Refresh the page",
ngClick: "refresh()", ngClick: "refresh()",
ngShow:"socketStatus == 'error'" ngShow:"socketStatus == 'error'"
},
stream: {
ngClick: "showActivity()",
awToolTip: "View Activity Stream",
mode: 'all'
} }
// stream: {
// ngClick: "showActivity()",
// awToolTip: "View Activity Stream",
// mode: 'all'
// }
}; };
html = Button({ html = Button({
@@ -39,11 +39,11 @@ function Home($scope, $compile, $routeParams, $rootScope, $location, Wait, Dashb
toolbar: true toolbar: true
}); });
// html += Button({ html += Button({
// btn: buttons.stream, btn: buttons.stream,
// action: 'stream', action: 'stream',
// toolbar: true toolbar: true
// }); });
e = angular.element(document.getElementById('home-list-actions')); e = angular.element(document.getElementById('home-list-actions'));
e.html(html); e.html(html);

1
awx/ui/static/less/main-layout.less
View File

@@ -62,7 +62,6 @@ body {
#account-submenu { #account-submenu {
margin-right: 5px; margin-right: 5px;
height: 140px; /* shouldn't need this, but for some reason we do */
} }
@media (max-width: 1075px) { @media (max-width: 1075px) {

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

@@ -183,6 +183,7 @@
<a href="" id="main_view_user" ng-click="viewCurrentUser()">Account Settings</a></li> <a href="" id="main_view_user" ng-click="viewCurrentUser()">Account Settings</a></li>
<a href="" id="main_view_license" ng-click="viewLicense()">View License</a></li> <a href="" id="main_view_license" ng-click="viewLicense()">View License</a></li>
<a href="https://ansibleworks.zendesk.com/anonymous_requests/new" id="main_contact_support" target="_blank">Contact Support</a></li> <a href="https://ansibleworks.zendesk.com/anonymous_requests/new" id="main_contact_support" target="_blank">Contact Support</a></li>
<a id="main_munin" target="_blank" ng-show="user_is_superuser" href="http://munin-monitoring.org/">Monitor Tower</a></li>
<a href="#/logout" id="main_logout">Logout</a> <a href="#/logout" id="main_logout">Logout</a>
</nav> </nav>
@@ -217,6 +218,7 @@
<li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</a></li> <li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</a></li>
<li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li> <li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
<li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li> <li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li>
<li><a id="main_munin" target="_blank" ng-show="user_is_superuser" href="http://munin-monitoring.org/">Monitor Tower</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a id="main_logout" href="#/logout">Logout</a></li> <li><a id="main_logout" href="#/logout">Logout</a></li>
</ul> </ul>
@@ -231,6 +233,7 @@
<li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</a></li> <li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</a></li>
<li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li> <li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
<li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li> <li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li>
<li><a id="main_munin" target="_blank" ng-show="user_is_superuser" href="http://munin-monitoring.org/">Monitor Tower</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a id="main_logout" href="#/logout">Logout</a></li> <li><a id="main_logout" href="#/logout">Logout</a></li>
</ul> </ul>