GNM-1243 Prüfen, ob Toaster Meldung so dicht an den SPEICHERN Button ranrücken muss, Abstand ggf reduzieren
GNM-1009 Verlinkung in der Anwendung auf das Benutzerhandbuch
diff --git a/src/app/common-components/main-navigation/main-navigation.component.css b/src/app/common-components/main-navigation/main-navigation.component.css
index 7f3837a..60d35cb 100644
--- a/src/app/common-components/main-navigation/main-navigation.component.css
+++ b/src/app/common-components/main-navigation/main-navigation.component.css
@@ -9,7 +9,8 @@
*
******************************************************************************
*/
-.navbar-nav{
+
+.navbar-nav {
display: inline-flex;
}
@@ -21,7 +22,7 @@
float: right;
vertical-align: middle;
padding-top: 13px;
- padding-right: 20px;
+ padding-right: 20px;
}
.divider-right {
@@ -52,12 +53,12 @@
cursor: default;
}
-.dropdown-open:hover {
- background-color: transparent;
+.dropdown-open:hover {
+ background-color: transparent;
}
-.navbar-default .navbar-nav > .open > a,
-.navbar-default .navbar-nav > .open > a:focus {
+.navbar-default .navbar-nav>.open>a,
+.navbar-default .navbar-nav>.open>a:focus {
filter: brightness(95%);
}
@@ -82,5 +83,4 @@
.version-info-simple {
position: inherit;
-
-}
+}
\ No newline at end of file
diff --git a/src/app/common-components/main-navigation/main-navigation.component.html b/src/app/common-components/main-navigation/main-navigation.component.html
index b416bb6..28a0bdb 100644
--- a/src/app/common-components/main-navigation/main-navigation.component.html
+++ b/src/app/common-components/main-navigation/main-navigation.component.html
@@ -22,18 +22,28 @@
<div *ngIf="router.url === '/overview' || router.url === '/reminders'" style="border-right: solid 1px #c3c3c3; margin: 10px 0 10px 0">
</div>
- <div>
- <button style="float: right" type="button" class="btn btn-link navbar-btn" (click)="goToOverview()">
- <span class="glyphicon glyphicon-home active-navitem-hover" [ngClass]="{'active-navitem': router.url === '/overview'}"></span>
- </button>
- <span style="float: right; cursor: default" type="text" class="btn btn-link navbar-btn">
- <span class="glyphicon glyphicon-bell" id="bell" [title]="sessionContext.getUpcomingReminder()? 'Es gibt mindestens einen fälligen Maßnahmeantrag' : ''"
- [style.color]="sessionContext.setBellColor()">
- </span>
+
+ <div class="btn btn-link navbar-btn">
+ <span class="glyphicon glyphicon-bell" id="bell" [title]="sessionContext.getUpcomingReminder()? 'Es gibt mindestens einen fälligen Maßnahmeantrag' : ''"
+ [style.color]="sessionContext.setBellColor()">
</span>
</div>
+
+ <div>
+ <button type="button" class="btn btn-link navbar-btn" (click)="goToOverview()">
+ <span class="glyphicon glyphicon-home active-navitem-hover" [ngClass]="{'active-navitem': router.url === '/overview'}"></span>
+ </button>
+ </div>
+
+ <div class="btn btn-link navbar-btn">
+ <a href="" title="Hilfe" target="_blank">
+ <span class="glyphicon glyphicon-question-sign"></span>
+ </a>
+ </div>
+
<div class="dropdown-open nav-user nav-overview-user" style="padding-top: 10px">
- <a class="btn btn-logout dropdown-toggle" style="min-width: 160px;" type="button" data-toggle="dropdown" href="#" aria-expanded="true">
+ <a class="btn btn-logout dropdown-toggle" style="min-width: 160px;" type="button" data-toggle="dropdown" href="#"
+ aria-expanded="true">
{{sessionContext.getAccessTokenDecoded()?.name}}
<span class="caret"></span>
</a>
diff --git a/src/app/common-components/toaster/toaster.component.html b/src/app/common-components/toaster/toaster.component.html
index b37ee9a..2311854 100644
--- a/src/app/common-components/toaster/toaster.component.html
+++ b/src/app/common-components/toaster/toaster.component.html
@@ -10,13 +10,13 @@
******************************************************************************
-->
-<p-toast [style]="{marginTop: '80px'}"></p-toast>
+<p-toast [style]="{marginTop: '90px'}"></p-toast>
-<p-toast [style]="{marginTop: '80px'}" position="top-left" key="tl"></p-toast>
+<p-toast [style]="{marginTop: '90px'}" position="top-left" key="tl"></p-toast>
-<p-toast [style]="{marginTop: '80px'}" position="top-center" key="tc"></p-toast>
+<p-toast [style]="{marginTop: '90px'}" position="top-center" key="tc"></p-toast>
-<p-toast [style]="{marginTop: '80px'}" styleClass="custom-toast" key="custom" position="bottom-center"></p-toast>
+<p-toast [style]="{marginTop: '90px'}" styleClass="custom-toast" key="custom" position="bottom-center"></p-toast>
<p-toast position="center" key="deletec" (onClose)="onSingleGMReject()" [modal]="true" [baseZIndex]="5000">
<ng-template let-message pTemplate="message">
diff --git a/src/app/common/session-context.ts b/src/app/common/session-context.ts
index fd7de65..44c97ae 100644
--- a/src/app/common/session-context.ts
+++ b/src/app/common/session-context.ts
@@ -28,7 +28,6 @@
@Injectable()
export class SessionContext {
- private timeoutId: any;
public centralHttpResultCode$: EventEmitter<number> = new EventEmitter<number>();
public settings;
public reminderAvailable = false;
diff --git a/src/app/pages/grid-measure-detail/grid-measure-detail.component.html b/src/app/pages/grid-measure-detail/grid-measure-detail.component.html
index a60f858..0239997 100644
--- a/src/app/pages/grid-measure-detail/grid-measure-detail.component.html
+++ b/src/app/pages/grid-measure-detail/grid-measure-detail.component.html
@@ -34,7 +34,7 @@
</div>
<div id="collapse1" class="panel-collapse collapse in">
<div class="panel-body">
- <app-grid-measure-detail-header (isValidForSave)=" this.validForSave = $event;" [isReadOnlyForm]="readOnlyForm"
+ <app-grid-measure-detail-header (isValidForSave)="this.validForSave = $event;" [isReadOnlyForm]="readOnlyForm"
[id]="id" [showSpinnerGrid]="showSpinner" [gridMeasureDetail]="gridMeasureDetail">
</app-grid-measure-detail-header>
</div>
diff --git a/src/app/pages/grid-measure-detail/grid-measure-detail.component.ts b/src/app/pages/grid-measure-detail/grid-measure-detail.component.ts
index 325b0a3..e6f3464 100644
--- a/src/app/pages/grid-measure-detail/grid-measure-detail.component.ts
+++ b/src/app/pages/grid-measure-detail/grid-measure-detail.component.ts
@@ -14,7 +14,7 @@
import { LockHelperService } from './../../services/lock-helper.service';
import { GridMeasure } from './../../model/grid-measure';
import {
- Component, OnInit, ViewChild, OnDestroy, EventEmitter, ChangeDetectorRef, AfterViewChecked, HostBinding
+ Component, OnInit, ViewChild, OnDestroy, EventEmitter, ChangeDetectorRef, AfterViewChecked, HostBinding, Output
} from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { DaterangepickerConfig } from 'ng2-daterangepicker';
@@ -40,7 +40,6 @@
export class GridMeasureDetailComponent implements OnInit, OnDestroy, AfterViewChecked {
-
private unlockInProgress = false;
dragEntered = false;
console = console;
