Merge branch 'development' into dto_improvements

src/main/webapp/app/exercise/exercise-card/exercise-card.component.html

@@ -26,9 +26,9 @@
                     <div style="float: left;">
                         <p class="card-text" jhiTranslate="exercise.details.bookmark"></p>
                     </div>
-                        <ng-template #helpBookmark> {{ 'exercise.commingSoon' | translate}}</ng-template>
+                        <ng-template #helpBookmark> {{ 'exercise.comingSoon' | translate}}</ng-template>
                     <div class="form-check" style="float: right; padding-right: 10px;" [ngbTooltip]="helpBookmark">
-                        <input class="form-check-input" type="checkbox" value="" id="card-defaultCheck1" disabled="true">
+                        <input class="form-check-input" type="checkbox" value="" id="card-defaultCheck1" disabled>
                         <label class="form-check-label" for="card-defaultCheck1"></label>
                     </div>
                 </div> <!-- card bookmark end-->

src/main/webapp/app/exercise/exercise-details/exercise-details.component.html

@@ -2,7 +2,7 @@
     <div class="modal fade" id="myModal">
         <div class="modal-dialog modal-lg modal-dialog-centered">
             <div class="modal-content">
-                <ng-template #helpCommingSoon> {{ 'exercise.commingSoon' | translate}}</ng-template>
+                <ng-template #helpComingSoon> {{ 'exercise.comingSoon' | translate}}</ng-template>
 
                 <!-- Modal Header -->
                 <div class="modal-header">
@@ -70,9 +70,9 @@
                                     <div style="float: left;">
                                         <p class="card-text" jhiTranslate="exercise.details.bookmark"></p>
                                     </div>
-                                    <div class="form-check" style="float: right; padding-right: 10px;" [ngbTooltip]="helpCommingSoon" placement="right">
+                                    <div class="form-check" style="float: right; padding-right: 10px;" [ngbTooltip]="helpComingSoon" placement="right">
                                         <input class="form-check-input" type="checkbox" value=""
-                                            id="modal-defaultCheck1" disabled="true">
+                                            id="modal-defaultCheck1" disabled>
                                         <label class="form-check-label" for="modal-defaultCheck1"></label>
                                     </div>
                                 </div> <!-- modal bookmark end-->
@@ -81,7 +81,7 @@
                                     style="display: block; margin-bottom: 5px;"
                                     jhiTranslate="exercise.details.hitDetails">
                                 </button> -->
-                                <div [ngbTooltip]="helpCommingSoon" placement="bottom">
+                                <div [ngbTooltip]="helpComingSoon" placement="bottom">
                                 <button *ngIf="exercise.type == exerciseType.COLLECTION" type="button" class="btn btn-outline-secondary"
                                     style="display: block; margin-bottom: 5px;"
                                     jhiTranslate="exercise.details.allExercises"
@@ -108,10 +108,10 @@
                                 <a *ngFor="let action of exercise.originalResult.supportedActions" class="btn btn-outline-secondary" role="button" aria-pressed="true"
                                     style="float: left; margin-right: 5px; margin-top: 5px;" (click)="startAction(action, exercise)"
                                     >{{action.commandName}}</a>
-                                <div [ngbTooltip]="helpCommingSoon" placement="bottom">
+                                <div [ngbTooltip]="helpComingSoon" placement="bottom">
                                 <button *ngIf="exercise.type == exerciseType.COLLECTION" type="button" class="btn btn-outline-secondary"
                                     style="float: left; margin-right: 5px; margin-top: 5px;"
-                                    jhiTranslate="exercise.export.latex" title="{{ 'exercise.commingSoon' | translate}}"
+                                    jhiTranslate="exercise.export.latex" title="{{ 'exercise.comingSoon' | translate}}"
                                     disabled >
                                 </button>
                                 </div>
@@ -127,7 +127,7 @@
 
                 <!-- Modal footer -->
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal"
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal"
                         jhiTranslate="exercise.close"></button>
                 </div>
 

src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html

@@ -80,6 +80,7 @@
     </jhi-exercise-metadata-item>
 
     <jhi-exercise-metadata-item
+        *ngIf="exercise.difficulty"
         [description]="'exercise.metadata.difficulty'"
         [value]="'exercise.metadata.' + exercise.difficulty | translate">
     </jhi-exercise-metadata-item>
@@ -95,16 +96,19 @@
     </jhi-exercise-metadata-item>
 
     <jhi-exercise-metadata-item
+        *ngIf="exercise.type"
         [description]="'exercise.metadata.type'"
         [value]="'exercise.metadata.' + exercise.type | translate">
     </jhi-exercise-metadata-item>
 
     <jhi-exercise-metadata-item
+        *ngIf="exercise.structure"
         [description]="'exercise.metadata.structure'"
         [value]="'exercise.metadata.' + exercise.structure | translate">
     </jhi-exercise-metadata-item>
 
     <jhi-exercise-metadata-item
+        *ngIf="exercise.status"
         [description]="'exercise.metadata.status'"
         [value]="'exercise.metadata.' + exercise.status | translate">
     </jhi-exercise-metadata-item>

src/main/webapp/i18n/de/exercise.json

 {
   "exercise": {
-    "commingSoon": "demnächst verfügbar :-)",
+    "comingSoon": "demnächst verfügbar :-)",
     "details": {
       "details": "Details",
       "rating": "Trefferqualität",

src/main/webapp/i18n/en/exercise.json

 {
   "exercise": {
-    "commingSoon": "comming soon",
+    "comingSoon": "coming soon",
     "details": {
       "details": "Details",
       "rating": "Hit quality",

src/main/webapp/i18n/en/home.json

 {
   "home": {
-    "title": "<img src=\"/content/img/logo-top.png\" alt=\"codeAbility\" width=\"168px\"/>Joint Ressourcing of Teaching Material",
-    "subtitle": "The CodeAbility Sharing Plattform is ready",
-    "teaser": "<p>The  CodeAbility Sharing Plattform offers an infrastructure for the open exchange of programming teaching content.</p>\n      <p>This comprises programming exercises, lecture scripts and slides, and link collections to all aspects of programming education.</p>",
+    "title": "<img src=\"/content/img/logo-top.png\" alt=\"codeAbility\" width=\"168px\"/>Joint Resourcing of Teaching Material",
+    "subtitle": "The CodeAbility Sharing Platform is ready",
+    "teaser": "<p>The  CodeAbility Sharing Platform offers an infrastructure for the open exchange of programming teaching content.</p>\n      <p>This comprises programming exercises, lecture scripts and slides, and link collections to all aspects of programming education.</p>",
     "logged": {
       "message": "You are logged in as user \"{{username}}\"."
     },