Fix wrong adoption of static HTML

* Do use proper counting of skills for skill set
* Do not use example brand logo, but logo provided by API
  (once implemented in toolkit)
* Open verification in new tab
* Do not use pending state.
This commit is contained in:
Daniel Siepmann 2020-10-19 15:43:09 +02:00
parent 060d432f15
commit 8137b7678b
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
4 changed files with 10 additions and 6 deletions

View file

@ -7,20 +7,22 @@
<span class="sd-title">{title}</span> <span class="sd-title">{title}</span>
<div class="sd-info"> <div class="sd-info">
<f:if condition="{count}"> <f:if condition="{count}">
<span>{skillSet.skills -> f:count()}</span> <span>{count}</span>
</f:if> </f:if>
<a href="{detailUrl}" target="_blank">View on SkillDisplay</a> <a href="{detailUrl}" target="_blank">View on SkillDisplay</a>
</div> </div>
</div> </div>
<f:if condition="{brandLogoUrl}">
<div class="sd-brand"> <div class="sd-brand">
<img src="{f:uri.resource(extensionName: 'skilldisplay', path: 'Images/htl3r.jpg')}" /> <img src="{brandLogoUrl}" />
</div> </div>
</f:if>
</div> </div>
<p class="sd-description">{description -> f:format.html()}</p> <p class="sd-description">{description -> f:format.html()}</p>
<div class="sd-buttons"> <div class="sd-buttons">
<a href="{verificationUrl}" class="sd-button sd-learner sd-verified"> <a href="{verificationUrl}" target="_blank" class="sd-button sd-learner">
<div class="sd-hint"> <div class="sd-hint">
<f:image src="{f:uri.resource(extensionName: 'skilldisplay', path: 'Images/pending.svg')}" title="Pending" alt="Indicates self assessment is pending" /> <f:image src="{f:uri.resource(extensionName: 'skilldisplay', path: 'Images/default.svg')}" title="Not learned yet" alt="Indicates self assessment is not done yet" />
</div> </div>
<div class="sd-type">Self Assessment</div> <div class="sd-type">Self Assessment</div>
</a> </a>

View file

@ -6,6 +6,7 @@
title: skillSet.name, title: skillSet.name,
count: '{skillSet.skills -> f:count()}', count: '{skillSet.skills -> f:count()}',
detailUrl: 'https://my.skilldisplay.eu/skillset/{skillSet.id}', detailUrl: 'https://my.skilldisplay.eu/skillset/{skillSet.id}',
brandLogoUrl: skillSet.mediaPublicUrl,
verificationUrl: '{sd:verification.url(skillSet: skillSet.id)}', verificationUrl: '{sd:verification.url(skillSet: skillSet.id)}',
description: skillSet.description description: skillSet.description
})} })}

View file

@ -5,6 +5,7 @@
{f:render(partial: 'VerificationBox', arguments: { {f:render(partial: 'VerificationBox', arguments: {
title: skill.title, title: skill.title,
detailUrl: 'https://my.skilldisplay.eu/skill/{skill.id}/0', detailUrl: 'https://my.skilldisplay.eu/skill/{skill.id}/0',
brandLogoUrl: skill.mediaPublicUrl,
verificationUrl: '{sd:verification.url(skill: skill.id)}', verificationUrl: '{sd:verification.url(skill: skill.id)}',
description: skill.description description: skill.description
})} })}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB