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

Fix for activity stream state, and hover state for power button on screens with width <900px

Browse Source
This commit is contained in:
Jared Tabor
2016-06-03 12:03:57 -07:00
parent a34a82c745
commit 67d161d818
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
awx/ui/client/src/activity-stream/activitystream.route.js
View File

@@ -18,25 +18,26 @@ export default {
label: "ACTIVITY STREAM" label: "ACTIVITY STREAM"
}, },
resolve: { resolve: {
features: ['FeaturesService', 'ProcessErrors', '$state', function(FeaturesService, ProcessErrors, $state) { features: ['FeaturesService', 'ProcessErrors', '$state', '$rootScope',
FeaturesService.get() function(FeaturesService, ProcessErrors, $state, $rootScope) {
.then(function(features) { var features = FeaturesService.get();
if(features){
if(FeaturesService.featureEnabled('activity_streams')) { if(FeaturesService.featureEnabled('activity_streams')) {
// Good to go - pass the features along to the controller.
return features; return features;
} }
else { else {
// The activity stream feature isn't enabled. Take the user
// back to the dashboard
$state.go('dashboard'); $state.go('dashboard');
} }
}) }
.catch(function (response) { $rootScope.featuresConfigured.promise.then(function(features){
ProcessErrors(null, response.data, response.status, null, { if(features){
hdr: 'Error!', if(FeaturesService.featureEnabled('activity_streams')) {
msg: 'Failed to get feature info. GET returned status: ' + return features;
response.status }
}); else {
$state.go('dashboard');
}
}
}); });
}], }],
subTitle: subTitle:

15
awx/ui/client/src/main-menu/main-menu.block.less
View File

@@ -204,16 +204,11 @@
flex: initial!important; flex: initial!important;
padding-top:0px; padding-top:0px;
} }
// gonna come back to this for hte hover when license is missing and
// screen size is less than 900px -- JT 6/2 .MainMenu-item--licenseMissing:hover{
// .MainMenu-item--licenseMissing:hover{ padding-top:20px;
// padding-top:5px; border-bottom: 5px solid @menu-link-btm-hov;
// border-bottom: 5px solid @menu-link-btm-hov; }
// border-left: 0px;
// padding-left: 21px;
// padding-right: 21px;
// margin-right: -1px;
// }
.MainMenu-itemImage--licenseMissing{ .MainMenu-itemImage--licenseMissing{
font-size: 20px!important; font-size: 20px!important;