package.json

@@ -1,6 +1,6 @@
 {
   "name": "opt-cc",
-  "version": "1.7.1",
+  "version": "1.7.0",
   "author": "Florian Hartwich <hardi@noarch.de>",
   "private": true,
   "scripts": {

static/.angular-cli.json

@@ -42,15 +42,12 @@
   },
   "lint": [
     {
-      "files": "src/**/*.ts",
       "project": "src/tsconfig.app.json"
     },
     {
-      "files": "src/**/*.ts",
       "project": "src/tsconfig.spec.json"
     },
     {
-      "files": "src/**/*.ts",
       "project": "e2e/tsconfig.e2e.json"
     }
   ],

static/src/app/army/army.component.ts

@@ -9,7 +9,7 @@ import {CSSHelpers} from '../global.helpers';
 
 
 @Component({
-  selector: 'cc-army',
+  selector: 'army',
   templateUrl: './army.component.html',
   styleUrls: ['./army.component.css']
 })

static/src/app/common/show-error/show-error.component.ts

@@ -12,9 +12,9 @@ import {FormGroup, NgForm} from '@angular/forms';
 })
 export class ShowErrorComponent {
 
-  @Input('controlPath') controlPath;
+  @Input('path') controlPath;
 
-  @Input('displayName') displayName = '';
+  @Input('text') displayName = '';
 
   private form: FormGroup;
 

static/src/app/decorations/decoration.component.ts

@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 
 @Component({
-  selector: 'cc-decorations',
+  selector: 'decorations',
   templateUrl: './decoration.component.html',
   styleUrls: ['./decoration.component.css']
 })

static/src/app/decorations/edit-decoration/edit-decoration.component.html

@@ -9,7 +9,7 @@
            name="title"
            id="title"
            required maxlength="50"/>
-    <show-error displayName="Name" controlPath="title"></show-error>
+    <show-error text="Name" path="title"></show-error>
   </div>
 
   <div class="form-group">
@@ -21,7 +21,7 @@
       <option value="BLUFOR">{{fraction.BLUFOR}}</option>
       <option value="GLOBAL">Global</option>
     </select>
-    <show-error displayName="Fraktion" controlPath="fraction"></show-error>
+    <show-error text="Fraktion" path="fraction"></show-error>
   </div>
 
   <div class="form-group">
@@ -32,14 +32,14 @@
       <option value="true">Orden</option>
       <option value="false">Ribbon</option>
     </select>
-    <show-error displayName="Art" controlPath="type"></show-error>
+    <show-error text="Art" path="type"></show-error>
   </div>
 
   <div class="form-group">
     <label for="sort">Sortierung</label>
     <input id="sort" name="sort" type="number" class="form-control btn dropdown-toggle"
            [(ngModel)]="decoration.sortingNumber">
-    <show-error displayName="Sortierung" controlPath="sort"></show-error>
+    <show-error text="Sortierung" path="sort"></show-error>
   </div>
 
   <div class="form-group">
@@ -47,7 +47,7 @@
     <textarea id="description" name="description" class="form-control" rows="5"
               required
               [(ngModel)]="decoration.description"></textarea>
-    <show-error displayName="Beschreibung" controlPath="description"></show-error>
+    <show-error text="Beschreibung" path="description"></show-error>
   </div>
 
   <div class="form-group">

static/src/app/ranks/edit-rank/edit-rank.component.html

@@ -10,7 +10,7 @@
            id="title"
            required maxlength="50"/>
 
-    <show-error displayName="Name" controlPath="title"></show-error>
+    <show-error text="Name" path="title"></show-error>
   </div>
 
   <div class="form-group">
@@ -21,14 +21,14 @@
       <option value="OPFOR">{{fraction.OPFOR}}</option>
       <option value="BLUFOR">{{fraction.BLUFOR}}</option>
     </select>
-    <show-error displayName="Fraktion" controlPath="fraction"></show-error>
+    <show-error text="Fraktion" path="fraction"></show-error>
   </div>
 
   <div class="form-group">
     <label for="level">Stufe</label>
     <input id="level" name="level" type="number" class="form-control btn dropdown-toggle"
            [(ngModel)]="rank.level">
-    <show-error displayName="Stufe" controlPath="level"></show-error>
+    <show-error text="Stufe" path="level"></show-error>
   </div>
 
   <div class="form-group">

static/src/app/ranks/ranks.component.ts

@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 
 @Component({
-  selector: 'cc-ranks',
+  selector: 'ranks',
   templateUrl: './ranks.component.html',
   styleUrls: ['./ranks.component.css']
 })

static/src/app/request/request.component.ts

@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 
 @Component({
-  selector: 'cc-request',
+  selector: 'request',
   templateUrl: 'request.component.html',
   styleUrls: ['request.component.css']
 })

static/src/app/squads/edit-squad/edit-squad.component.html

@@ -10,7 +10,7 @@
            id="title"
            required maxlength="50"/>
 
-    <show-error displayName="Name" controlPath="title"></show-error>
+    <show-error text="Name" path="title"></show-error>
   </div>
 
   <div class="form-group">
@@ -21,14 +21,14 @@
       <option value="OPFOR">{{fraction.OPFOR}}</option>
       <option value="BLUFOR">{{fraction.BLUFOR}}</option>
     </select>
-    <show-error displayName="Fraktion" controlPath="fraction"></show-error>
+    <show-error text="Fraktion" path="fraction"></show-error>
   </div>
 
   <div class="form-group">
     <label for="sort">Sortierung</label>
     <input id="sort" name="sort" type="number" class="form-control btn dropdown-toggle"
            [(ngModel)]="squad.sortingNumber">
-    <show-error displayName="Sortierung" controlPath="sort"></show-error>
+    <show-error text="Sortierung" path="sort"></show-error>
   </div>
 
   <div class="form-group">

static/src/app/squads/squads.component.ts

@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 
 @Component({
-  selector: 'cc-users',
+  selector: 'users',
   templateUrl: './squads.component.html',
   styleUrls: ['./squads.component.css']
 })

static/src/app/statistic/campaign-submit/campaign-submit.component.html

@@ -9,7 +9,7 @@
            id="title"
            required maxlength="50"/>
 
-    <show-error displayName="Name" controlPath="title"></show-error>
+    <show-error text="Name" path="title"></show-error>
   </div>
 
   <button id="cancel"

static/src/app/statistic/stats.component.ts

@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 
 @Component({
-  selector: 'cc-stats',
+  selector: 'stats',
   templateUrl: './stats.component.html',
   styleUrls: ['./stats.component.css']
 })

static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts

@@ -4,7 +4,7 @@ import {Fraction} from '../../../utils/fraction.enum';
 import {PlayerUtils} from '../../../utils/player-utils';
 
 @Component({
-  selector: 'cc-scoreboard',
+  selector: 'scoreboard',
   templateUrl: './scoreboard.component.html',
   styleUrls: ['./scoreboard.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css']
 })

static/src/app/statistic/war-detail/war-detail.component.html

@@ -64,12 +64,12 @@
 
   <!--Sub-Components (=TABS)-->
   <div *ngIf="war">
-    <cc-scoreboard
+    <scoreboard
       *ngIf="tab === 0"
       [war]="war"
       [fractionFilterSelected]="fractionFilterSelected"
       (playerTabSwitch)="switchToPlayerTab($event)">
-    </cc-scoreboard>
+    </scoreboard>
     <war-detail-fraction
       *ngIf="tab === 1 && logData"
       [war]="war"

static/src/app/statistic/war-submit/war-submit.component.html

@@ -9,7 +9,7 @@
            id="title"
            required maxlength="50"/>
 
-    <show-error displayName="Name" controlPath="title"></show-error>
+    <show-error text="Name" path="title"></show-error>
   </div>
 
   <div class="form-group">

static/src/app/users/award-user/award-user.component.html

@@ -18,7 +18,7 @@
       </option>
     </select>
 
-    <show-error displayName="Auszeichnung" controlPath="decoration"></show-error>
+    <show-error text="Auszeichnung" path="decoration"></show-error>
   </div>
 
   <div class="div-table-row" [style.display]="decoPreviewDisplay" style="margin-top: 5px; margin-bottom:10px">
@@ -41,7 +41,7 @@
     <label for="reason">Begründung</label>
     <textarea class="form-control center-block" name="reason" [ngModel]="undefined" required
               id="reason" placeholder="Begründung eingeben..." rows="3" #awardTextArea></textarea>
-    <show-error displayName="Begründung" controlPath="reason"></show-error>
+    <show-error text="Begründung" path="reason"></show-error>
   </div>
 
 

static/src/app/users/edit-user/edit-user.component.html

@@ -11,7 +11,7 @@
            required
            maxlength="50"/>
 
-    <show-error displayName="Name" controlPath="title"></show-error>
+    <show-error text="Name" path="title"></show-error>
   </div>
 
   <div class="form-group">
@@ -28,7 +28,7 @@
       </option>
     </select>
 
-    <show-error displayName="Squad" controlPath="squad"></show-error>
+    <show-error text="Squad" path="squad"></show-error>
   </div>
 
   <div class="form-group" [style.display]="ranksDisplay">
@@ -41,7 +41,7 @@
       <option *ngFor="let rank of ranks" [value]="rank.level">{{rank.name}}</option>
     </select>
 
-    <show-error displayName="Squad" controlPath="squad"></show-error>
+    <show-error text="Squad" path="squad"></show-error>
   </div>
 
   <button id="cancel"

static/src/app/users/users.component.ts

@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 
 @Component({
-  selector: 'cc-users',
+  selector: 'users',
   templateUrl: 'users.component.html',
   styleUrls: ['users.component.css']
 })

static/tslint.json

@@ -109,7 +109,7 @@
     "component-selector": [
       true,
       "element",
-      "",
+      "cc",
       "kebab-case"
     ],
     "use-input-property-decorator": true,