vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed status bar not showing

Browse source
This commit is contained in:
Alec Merdler 2017-07-26 11:24:12 -04:00
parent c271b1f386
commit 25f514a03d
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
static/css/quay.css
View file

@ -48,6 +48,12 @@
z-index: 2; z-index: 2;
} }
.announcement.inline .message {
display: flex;
justify-content: center;
align-items: center;
}
.announcement .spacer { .announcement .spacer {
display: inline-block; display: inline-block;
width: 45px; width: 45px;

6
static/directives/quay-service-status-bar.html
View file

@ -1,12 +1,12 @@
<div class="announcement inline" <div class="announcement inline"
ng-show="indicator != 'loading' && (scheduled_maintenances.length || incidents.length)"> ng-show="indicator != 'loading' && (scheduled_maintenances.length || incidents.length)">
<div ng-repeat="incident in incidents"> <div ng-repeat="incident in incidents" class="message">
<span class="quay-service-status-indicator" ng-class="indicator" <span class="quay-service-status-indicator" ng-class="indicator"
ng-if="indicator != 'loading'"></span> ng-if="indicator != 'loading'"></span>
<a ng-href="{{ incident.shortlink }}" class="quay-service-status-description">{{ incident.name }}</a> <a ng-href="{{ incident.shortlink }}" class="quay-service-status-description">{{ incident.name }}</a>
</div> </div>
<div ng-repeat="scheduled in scheduled_maintenances"> <div ng-repeat="scheduled in scheduled_maintenances" class="message">
<i class="fa fa-calendar" style="margin-right: 6px;"></i> <i class="fa fa-calendar" style="margin-right: 6px;"></i>
<span ng-switch on="scheduled.status" style="vertical-align: middle"> <span ng-switch on="scheduled.status" style="vertical-align: middle">
<span ng-switch-when="scheduled"> <span ng-switch-when="scheduled">

3
static/js/directives/structural/quay-require/quay-require.directive.ts
View file

@ -16,6 +16,7 @@ import { Directive, Inject, Input, AfterContentInit } from 'ng-metadata/core';
export class QuayRequireDirective implements AfterContentInit { export class QuayRequireDirective implements AfterContentInit {
@Input('<quayRequire') public requiredFeatures: string[] = []; @Input('<quayRequire') public requiredFeatures: string[] = [];
private ngIfDirective: ng.IDirective; private ngIfDirective: ng.IDirective;
constructor(@Inject('Features') private features: any, constructor(@Inject('Features') private features: any,
@ -27,7 +28,7 @@ export class QuayRequireDirective implements AfterContentInit {
} }
public ngAfterContentInit(): void { public ngAfterContentInit(): void {
const attrs: {[name: string]: any} = {'ngIf': () => this.features.matchesFeatures(this.requiredFeatures)}; const attrs: {[name: string]: () => boolean} = {'ngIf': () => this.features.matchesFeatures(this.requiredFeatures)};
(<Function>this.ngIfDirective.link).apply(this.ngIfDirective, (<Function>this.ngIfDirective.link).apply(this.ngIfDirective,
[ [

4
templates/base.html
View file

@ -154,7 +154,9 @@ mixpanel.init("{{ mixpanel_key }}", { track_pageview : false, debug: {{ is_debug
{% endif %} {% endif %}
<div class="quay-message-bar"></div> <div class="quay-message-bar"></div>
<div class="quay-service-status-bar" quay-require="['BILLING']"></div> <div quay-require="['BILLING']">
<div class="quay-service-status-bar"></div>
</div>
<div id="padding-container"> <div id="padding-container">
<div id="co-l-view-container"> <div id="co-l-view-container">