This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit bde36e57 authored by Daniel Rainer's avatar Daniel Rainer
Browse files

Merge branch 'frontend_refactoring' into 'development'

Frontend refactoring

See merge request sharing/codeability-sharing-platform!29
parents 127eca32 3ab8d7fb
Branches
Tags
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
......@@ -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-->
......
......@@ -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"
......@@ -322,10 +322,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>
......
{
"exercise": {
"commingSoon": "demnächst verfügbar :-)",
"comingSoon": "demnächst verfügbar :-)",
"details": {
"details": "Details",
"rating": "Trefferqualität",
......
{
"exercise": {
"commingSoon": "comming soon",
"comingSoon": "coming soon",
"details": {
"details": "Details",
"rating": "Hit quality",
......
{
"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}}\"."
},
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment