Merge remote-tracking branch 'blattersturm/tweak/premium-tooltips' in…

…to master-pub
citizenfx · Aug 14, 2021 · 56b0b6a · 56b0b6a
2 parents 977fb77 + a81ae13
commit 56b0b6a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 0 deletions.
diff --git a/ext/cfx-ui/src/app/servers/components/detail/servers-detail.component.html b/ext/cfx-ui/src/app/servers/components/detail/servers-detail.component.html
@@ -44,6 +44,8 @@
 								[class.ag]="server.premium === 'ag'"
 								[class.au]="server.premium === 'au'"
 								[class.pt]="server.premium === 'pt'"
+								data-balloon-pos="right"
+								[attr.aria-label]="premiumName"
 							>
 								<span>{{ server.premium }}</span>
 							</div>

diff --git a/ext/cfx-ui/src/app/servers/components/detail/servers-detail.component.ts b/ext/cfx-ui/src/app/servers/components/detail/servers-detail.component.ts
@@ -220,6 +220,10 @@ export class ServersDetailComponent implements OnInit, OnDestroy {
 		});
 	}
 
+	get premiumName() {
+		return this.serversService.getNameForPremium(this.server.premium);
+	}
+
 	apFeedInitialized = false;
 
 	private updateServer() {

diff --git a/ext/cfx-ui/src/app/servers/components/list/servers-list-item.component.html b/ext/cfx-ui/src/app/servers/components/list/servers-list-item.component.html
@@ -25,6 +25,8 @@
 		[class.ag]="premium === 'ag'"
 		[class.au]="premium === 'au'"
 		[class.pt]="premium === 'pt'"
+		data-balloon-pos="right"
+		[attr.aria-label]="premiumName"
 	>
 		<span><div>{{ premium }}</div></span>
 	</div>

diff --git a/ext/cfx-ui/src/app/servers/components/list/servers-list-item.component.scss b/ext/cfx-ui/src/app/servers/components/list/servers-list-item.component.scss
@@ -92,6 +92,7 @@
 		bottom: 2px;
 
 		width: var(--q4);
+		pointer-events: none;
 
 		z-index: 1;
 

diff --git a/ext/cfx-ui/src/app/servers/components/list/servers-list-item.component.ts b/ext/cfx-ui/src/app/servers/components/list/servers-list-item.component.ts
@@ -66,6 +66,10 @@ export class ServersListItemComponent implements OnInit, OnChanges, OnDestroy, A
 		return this.rawServer.data.vars.premium;
 	}
 
+	get premiumName() {
+		return this.serversService.getNameForPremium(this.premium);
+	}
+
 	public ngOnInit() {
 		this.hoverIntent = hoverintent(this.elementRef.nativeElement, () => {
 			this.serversService.getServer(this.rawServer.address, true);

diff --git a/ext/cfx-ui/src/app/servers/servers.service.ts b/ext/cfx-ui/src/app/servers/servers.service.ts
@@ -342,6 +342,19 @@ export class ServersService {
 			.catch(() => new PinConfig());
 	}
 
+	getNameForPremium(premium: string) {
+		switch (premium) {
+			case 'pt':
+				return 'Element Club Platinum';
+			case 'au':
+				return 'Element Club Aurum';
+			case 'ag':
+				return 'Element Club Argentum';
+		}
+
+		return '';
+	}
+
 	parseAddress(addr: string): [string, number] {
 		if (!addr) {
 			return null;