From 6a9f4b7b433ef5145ee2bfbec3a08d025954a110 Mon Sep 17 00:00:00 2001
From: druid <druid@druids-MacBook-Pro-2.local>
Date: Thu, 21 Jan 2021 12:01:55 +0200
Subject: [PATCH] Move credit number to title instead of description
---
src/components.d.ts | 2 ++
.../hy-content-list-item/hy-content-list-item.tsx | 5 +----
.../courses/hy-content-list/hy-content-list.tsx | 3 ++-
src/components/courses/hy-content-list/readme.md | 9 +++++----
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/components.d.ts b/src/components.d.ts
index e6a93069..668ae9da 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -243,6 +243,7 @@ export namespace Components {
variant: CheckboxVariants;
}
interface HyContentList {
+ creditsLabel: string;
dataItems: string;
linkLabel: string;
}
@@ -1528,6 +1529,7 @@ declare namespace LocalJSX {
variant?: CheckboxVariants;
}
interface HyContentList {
+ creditsLabel?: string;
dataItems?: string;
linkLabel?: string;
}
diff --git a/src/components/courses/hy-content-list-item/hy-content-list-item.tsx b/src/components/courses/hy-content-list-item/hy-content-list-item.tsx
index c08a3fe8..3df481f1 100644
--- a/src/components/courses/hy-content-list-item/hy-content-list-item.tsx
+++ b/src/components/courses/hy-content-list-item/hy-content-list-item.tsx
@@ -77,12 +77,9 @@ export class HyContentLstItem {
<div class="hy-content-list-item--metadata--item hy-content-list-item--metadata--item--first">
<span>{this._dateValue}</span>
</div>
- <div class="hy-content-list-item--metadata--item">
+ <div class="hy-content-list-item--metadata--item hy-content-list-item--metadata--item--last">
<span>{this.courseStudyFormat}</span>
</div>
- <div class="hy-content-list-item--metadata--item hy-content-list-item--metadata--item--last ">
- <span>{this.courseCredits}</span>
- </div>
</div>
{this._courseTags && (
<div class="hy-content-list-item--tags">
diff --git a/src/components/courses/hy-content-list/hy-content-list.tsx b/src/components/courses/hy-content-list/hy-content-list.tsx
index 2555aaff..d4c8f947 100644
--- a/src/components/courses/hy-content-list/hy-content-list.tsx
+++ b/src/components/courses/hy-content-list/hy-content-list.tsx
@@ -8,6 +8,7 @@ import {Component, ComponentInterface, Element, h, Host, Prop, State} from '@ste
})
export class HyContentList implements ComponentInterface {
@Prop() linkLabel: string = 'Go to course page';
+ @Prop() creditsLabel: string = 'cr';
@Prop() dataItems: string;
private _dataItems: [];
private variant: CourseVariants = CourseVariants.default;
@@ -34,8 +35,8 @@ export class HyContentList implements ComponentInterface {
let courseItem = courseObject[courseProperty];
let courseCode = courseItem['code'];
- let courseName = courseItem['name'];
let courseCredits = courseItem['credits'];
+ let courseName = courseItem['name'] + ', ' + courseCredits + ' ' + this.creditsLabel;
if (courseItem['tags']) {
let tags = JSON.parse(JSON.stringify(courseItem['tags']));
diff --git a/src/components/courses/hy-content-list/readme.md b/src/components/courses/hy-content-list/readme.md
index ec30e6a5..53ab92fe 100644
--- a/src/components/courses/hy-content-list/readme.md
+++ b/src/components/courses/hy-content-list/readme.md
@@ -4,10 +4,11 @@
## Properties
-| Property | Attribute | Description | Type | Default |
-| ----------- | ------------ | ----------- | -------- | --------------------- |
-| `dataItems` | `data-items` | | `string` | `undefined` |
-| `linkLabel` | `link-label` | | `string` | `'Go to course page'` |
+| Property | Attribute | Description | Type | Default |
+| -------------- | --------------- | ----------- | -------- | --------------------- |
+| `creditsLabel` | `credits-label` | | `string` | `'cr'` |
+| `dataItems` | `data-items` | | `string` | `undefined` |
+| `linkLabel` | `link-label` | | `string` | `'Go to course page'` |
## Dependencies
--
GitLab