Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hidden buttons in navbar #221

Merged
merged 1 commit into from
Apr 9, 2024
Merged

hidden buttons in navbar #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/app/appmarket/appdetails/appdetails.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,8 @@ hr{
cursor: default!important;
color: gray;
}

.thumbnail{
border: none;
box-shadow: none;
}
4 changes: 4 additions & 0 deletions src/app/appmarket/appmanagement/app-preview/apppreview.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,7 @@ hr{
.bs-callout-info h4 {
color: #5bc0de;
}
.thumbnail{
border: none;
box-shadow: none;
}
4 changes: 2 additions & 2 deletions src/app/shared/navbar/navbar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
{{ 'NAVBAR.LOGIN_REGISTER' | translate }}
</button>
</li>
<li>
<li *ngIf="isServiceAvailable">
<button *ngIf="router.url != '/about'" class="btn navbar-btn" [routerLink]="['/about']">
{{ 'NAVBAR.ABOUT' | translate }}
</button>
Expand All @@ -122,7 +122,7 @@
{{ 'NAVBAR.BACK' | translate }}
</button>
</li>
<li class="dropdown">
<li *ngIf="isServiceAvailable" class="dropdown">
<a style="display: inline-block" class="dropdown-toggle dropdown-lang" aria-expanded="false"
aria-haspopup="true" data-toggle="dropdown" href="#" role="button">
<img alt="language" class="lang-circle-icon" src="{{[getPathToCurrent()]}}"/>
Expand Down
5 changes: 4 additions & 1 deletion src/app/shared/navbar/navbar.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {InternationalizationService} from '../../service/internationalization.se
import {ModalNotificationSendComponent} from '../modal/modal-notification-send/modal-notification-send.component';
import {DatePipe} from '@angular/common';
import {UserDataService} from '../../service/userdata.service';
import {ServiceUnavailableService} from '../../service-unavailable/service-unavailable.service';

@Component({
selector: 'app-navbar',
Expand Down Expand Up @@ -36,7 +37,8 @@ export class NavbarComponent implements OnInit {
private datePipe: DatePipe,
private languageService: InternationalizationService,
private domainService: DomainService,
private userDataService: UserDataService) {
private userDataService: UserDataService,
private serviceAvailability: ServiceUnavailableService) {
}

useLanguage(language: string) {
Expand All @@ -52,6 +54,7 @@ export class NavbarComponent implements OnInit {
}

ngOnInit() {
this.isServiceAvailable = this.serviceAvailability.isServiceAvailable;
this.getSupportedLanguages();
if (this.authService.isLogged()) {
if (this.authService.hasRole('ROLE_SYSTEM_ADMIN')) {
Expand Down