MOBILE-2638 badges: Align fields with web version

main
Pau Ferrer Ocaña 2018-12-18 10:04:56 +01:00
parent 7343267fd0
commit ed07feaea9
4 changed files with 21 additions and 29 deletions

View File

@ -17,10 +17,10 @@
"addon.badges.issuerdetails": "badges", "addon.badges.issuerdetails": "badges",
"addon.badges.issueremail": "badges", "addon.badges.issueremail": "badges",
"addon.badges.issuername": "badges", "addon.badges.issuername": "badges",
"addon.badges.issuerurl": "badges",
"addon.badges.language": "badges", "addon.badges.language": "badges",
"addon.badges.noalignment": "badges", "addon.badges.noalignment": "badges",
"addon.badges.nobadges": "badges", "addon.badges.nobadges": "badges",
"addon.badges.noendorsement": "badges",
"addon.badges.norelated": "badges", "addon.badges.norelated": "badges",
"addon.badges.recipientdetails": "badges", "addon.badges.recipientdetails": "badges",
"addon.badges.relatedbages": "badges", "addon.badges.relatedbages": "badges",

View File

@ -1,9 +1,9 @@
{ {
"alignment": "Competencies alignment", "alignment": "Competency",
"badgedetails": "Badge details", "badgedetails": "Badge details",
"badges": "Badges", "badges": "Badges",
"bendorsement": "Endorsement", "bendorsement": "Endorsement",
"claimcomment": "Endorsement Comment", "claimcomment": "Endorsement comment",
"claimid": "Claim URL", "claimid": "Claim URL",
"contact": "Contact", "contact": "Contact",
"dateawarded": "Date issued", "dateawarded": "Date issued",
@ -15,15 +15,15 @@
"imagecaption": "Image caption", "imagecaption": "Image caption",
"issuancedetails": "Badge expiry", "issuancedetails": "Badge expiry",
"issuerdetails": "Issuer details", "issuerdetails": "Issuer details",
"issuername": "Issuer name",
"issueremail": "Email", "issueremail": "Email",
"issuername": "Issuer name",
"issuerurl": "Issuer URL",
"language": "Language", "language": "Language",
"noalignment": "This badge does not have a competencies alignment.", "noalignment": "This badge does not have any competencies specified.",
"nobadges": "There are no badges available.", "nobadges": "There are no badges available.",
"noendorsement": "This badge does not have an endorsement.", "norelated": "This badge does not have any related badges.",
"norelated": "This badge does not have related badges.",
"recipientdetails": "Recipient details", "recipientdetails": "Recipient details",
"relatedbages": "Related badges", "relatedbages": "Related badges",
"version": "Version", "version": "Version",
"warnexpired": " (This badge has expired!)" "warnexpired": "(This badge has expired!)"
} }

View File

@ -42,9 +42,9 @@
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="badge.issuercontact"> <ion-item text-wrap *ngIf="badge.issuercontact">
<h2>{{ 'addon.badges.contact' | translate}}</h2> <h2>{{ 'addon.badges.contact' | translate}}</h2>
<p> <p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no">
<core-format-text clean="true" [text]="badge.issuercontact"></core-format-text> <core-format-text [text]="badge.issuercontact"></core-format-text>
</p> </a></p>
</ion-item> </ion-item>
</ion-item-group> </ion-item-group>
@ -105,12 +105,12 @@
</ion-item-divider> </ion-item-divider>
<ion-item text-wrap *ngIf="badge.dateissued"> <ion-item text-wrap *ngIf="badge.dateissued">
<h2>{{ 'addon.badges.dateawarded' | translate}}</h2> <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
<p>{{badge.dateissued | coreToLocaleString }}</p> <p>{{badge.dateissued * 1000 | coreFormatDate }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="badge.dateexpire"> <ion-item text-wrap *ngIf="badge.dateexpire">
<h2>{{ 'addon.badges.expirydate' | translate}}</h2> <h2>{{ 'addon.badges.expirydate' | translate}}</h2>
<p> <p>
{{ badge.dateexpire | coreToLocaleString }} {{ badge.dateexpire * 1000 | coreFormatDate }}
<span class="text-danger" *ngIf="currentTime >= badge.dateexpire"> <span class="text-danger" *ngIf="currentTime >= badge.dateexpire">
{{ 'addon.badges.warnexpired' | translate }} {{ 'addon.badges.warnexpired' | translate }}
</span> </span>
@ -142,7 +142,7 @@
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="badge.endorsement.dateissued"> <ion-item text-wrap *ngIf="badge.endorsement.dateissued">
<h2>{{ 'addon.badges.dateawarded' | translate}}</h2> <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
<p>{{ badge.endorsement.dateissued | coreToLocaleString }}</p> <p>{{ badge.endorsement.dateissued * 1000 | coreFormatDate }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="badge.endorsement.claimid"> <ion-item text-wrap *ngIf="badge.endorsement.claimid">
<h2>{{ 'addon.badges.claimid' | translate}}</h2> <h2>{{ 'addon.badges.claimid' | translate}}</h2>
@ -157,14 +157,6 @@
</p> </p>
</ion-item> </ion-item>
</ion-item-group> </ion-item-group>
<ion-item-group *ngIf="badge.relatedbadges && !badge.endorsement">
<ion-item-divider color="light">
<h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
</ion-item-divider>
<ion-item text-wrap>
<h2>{{ 'addon.badges.noendorsement' | translate}}</h2>
</ion-item>
</ion-item-group>
<!-- Related badges --> <!-- Related badges -->
<ion-item-group *ngIf="badge.relatedbadges"> <ion-item-group *ngIf="badge.relatedbadges">

View File

@ -1,9 +1,9 @@
{ {
"addon.badges.alignment": "Competencies alignment", "addon.badges.alignment": "Competency",
"addon.badges.badgedetails": "Badge details", "addon.badges.badgedetails": "Badge details",
"addon.badges.badges": "Badges", "addon.badges.badges": "Badges",
"addon.badges.bendorsement": "Endorsement", "addon.badges.bendorsement": "Endorsement",
"addon.badges.claimcomment": "Endorsement Comment", "addon.badges.claimcomment": "Endorsement comment",
"addon.badges.claimid": "Claim URL", "addon.badges.claimid": "Claim URL",
"addon.badges.contact": "Contact", "addon.badges.contact": "Contact",
"addon.badges.dateawarded": "Date issued", "addon.badges.dateawarded": "Date issued",
@ -17,15 +17,15 @@
"addon.badges.issuerdetails": "Issuer details", "addon.badges.issuerdetails": "Issuer details",
"addon.badges.issueremail": "Email", "addon.badges.issueremail": "Email",
"addon.badges.issuername": "Issuer name", "addon.badges.issuername": "Issuer name",
"addon.badges.issuerurl": "Issuer URL",
"addon.badges.language": "Language", "addon.badges.language": "Language",
"addon.badges.noalignment": "This badge does not have a competencies alignment.", "addon.badges.noalignment": "This badge does not have any competencies specified.",
"addon.badges.nobadges": "There are no badges available.", "addon.badges.nobadges": "There are no badges available.",
"addon.badges.noendorsement": "This badge does not have an endorsement.", "addon.badges.norelated": "This badge does not have any related badges.",
"addon.badges.norelated": "This badge does not have related badges.",
"addon.badges.recipientdetails": "Recipient details", "addon.badges.recipientdetails": "Recipient details",
"addon.badges.relatedbages": "Related badges", "addon.badges.relatedbages": "Related badges",
"addon.badges.version": "Version", "addon.badges.version": "Version",
"addon.badges.warnexpired": " (This badge has expired!)", "addon.badges.warnexpired": "(This badge has expired!)",
"addon.block_activitymodules.pluginname": "Activities", "addon.block_activitymodules.pluginname": "Activities",
"addon.block_myoverview.all": "All", "addon.block_myoverview.all": "All",
"addon.block_myoverview.favourites": "Starred", "addon.block_myoverview.favourites": "Starred",