diff --git a/src/main/webapp/app/exercise/exercise-card/exercise-card.component.html b/src/main/webapp/app/exercise/exercise-card/exercise-card.component.html
index 8fb40b8b724424ced0d6cd318264b1a9456907ce..7280164a0b2ebb5c33cf71cc19471ea56123f2db 100644
--- a/src/main/webapp/app/exercise/exercise-card/exercise-card.component.html
+++ b/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-->
diff --git a/src/main/webapp/app/exercise/exercise-details/exercise-details.component.html b/src/main/webapp/app/exercise/exercise-details/exercise-details.component.html
index b9ee58f852a747bc8b4e11526fdefd98d40071ca..e1a8291712ca443f3e653bf6ade2abbc05b16e3b 100644
--- a/src/main/webapp/app/exercise/exercise-details/exercise-details.component.html
+++ b/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>
diff --git a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html
index 2a2f9692c8909bd26419521aafc29c31e2067327..81e17a45e3e0336e78192f7bf1f821652f97b5df 100644
--- a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html
+++ b/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>
diff --git a/src/main/webapp/i18n/de/exercise.json b/src/main/webapp/i18n/de/exercise.json
index e7b1ca14d71c6774c72e8155cf7d2af40efd4bb8..107a66268b0cc6a6b9b1e1424dfa9775ea9a8d38 100644
--- a/src/main/webapp/i18n/de/exercise.json
+++ b/src/main/webapp/i18n/de/exercise.json
@@ -1,6 +1,6 @@
{
"exercise": {
- "commingSoon": "demnächst verfügbar :-)",
+ "comingSoon": "demnächst verfügbar :-)",
"details": {
"details": "Details",
"rating": "Trefferqualität",
diff --git a/src/main/webapp/i18n/en/exercise.json b/src/main/webapp/i18n/en/exercise.json
index 2ce57e206ab0e1cffadc8e1ce29e05ead1af3a73..cfc6af3fa2ac0d40e29542ced416f2fedadaafcd 100644
--- a/src/main/webapp/i18n/en/exercise.json
+++ b/src/main/webapp/i18n/en/exercise.json
@@ -1,6 +1,6 @@
{
"exercise": {
- "commingSoon": "comming soon",
+ "comingSoon": "coming soon",
"details": {
"details": "Details",
"rating": "Hit quality",
diff --git a/src/main/webapp/i18n/en/home.json b/src/main/webapp/i18n/en/home.json
index c15f81ab25aadc7cbe618b0a2a9cbb3e1533a953..d63bab6d009534a1df352fb3ce4d932bfed5e520 100644
--- a/src/main/webapp/i18n/en/home.json
+++ b/src/main/webapp/i18n/en/home.json
@@ -1,8 +1,8 @@
{
"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}}\"."
},