Merge remote-tracking branch 'origin/master'

frontend/src/app/component/einstellungen/editieren/editieren.component.html

@@ -35,7 +35,7 @@
       </div>
       <div class="input-row margin-auto einstellungen_buttons_wrapper">
         <button routerLink="/einstellungen" mat-raised-button>Abbrechen</button>
-        <button mat-raised-button (click)="saveDialog(feedForm.value)" [disabled]="feedForm.invalid">
+        <button mat-raised-button (click)="saveFeed(feedForm.value)" [disabled]="feedForm.invalid">
           <mat-icon>save</mat-icon>
           Speichern
         </button>

frontend/src/app/component/einstellungen/einstellungen.component.css

@@ -25,3 +25,10 @@
   margin-right: auto;
   max-width: 800px;
 }
+
+.notActive {
+  background-color: white;
+  filter:alpha(opacity=50); /* IE */
+  opacity: 0.5; /* Safari, Opera */
+  -moz-opacity:0.50; /* FireFox */
+}

frontend/src/app/component/einstellungen/einstellungen.component.html

@@ -2,7 +2,7 @@
 <div class="content">
   <div class="text-center">
     <div class="container" *ngFor="let feed of feeds">
-      <div class="row feed-list-row">
+      <div class="row feed-list-row" [ngClass]="{'notActive': feed.active == false}">
         <div class="col-2 text-center padding-0 margin-auto">
           <img class="feed-icon" src="{{feed.icon}}" alt="Feed-Icon">
         </div>