Skip to content

Commit 46362e3

Browse files
authored
Merge branch 'master' into underline-quiz
2 parents b64d6b7 + 17a015a commit 46362e3

File tree

11 files changed

+48
-19
lines changed

11 files changed

+48
-19
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ assignees: ''
2828

2929
---
3030
#### Contributor Guide and Resources
31-
- 📚 [Instructions for contributing to academy-example](https://github.com/layer5io/academy-example/blob/master/CONTRIBUTING.md)
31+
- 📚 [Instructions for contributing to academy-theme](https://github.com/layer5io/academy-theme/blob/master/CONTRIBUTING.md)
3232
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
3333
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
3434
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/ci.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ assignees: ''
1818
<!-- Stipulations of functional behavior or non-functional items that must be in-place in order for the issue to be closed. -->
1919

2020
---
21-
#### Contributor [Guides](https://docs.meshery.io/project/contributing) and Resources
22-
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
21+
#### Contributor Guide and Resources
22+
- 📚 [Instructions for contributing to academy-theme](https://github.com/layer5io/academy-theme/blob/master/CONTRIBUTING.md)
23+
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
2324
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
24-
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
25+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: 🙋🏾🙋🏼‍Question
4+
url: https://discuss.layer5.io
5+
about: Submit your question on the discussion forum.

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ assignees: ''
1313

1414
---
1515

16-
#### [Contributor Guides](https://docs.meshery.io/project/contributing) and Resources
17-
- 📚 [Instructions for contributing to documentation](https://docs.meshery.io/project/contributing/contributing-docs)
18-
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
19-
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
16+
#### Contributor Guide and Resources
17+
- 📚 [Instructions for contributing to academy-theme](https://github.com/layer5io/academy-theme/blob/master/CONTRIBUTING.md)
18+
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
2019
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
21-
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
20+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: 💡 Feature Request
3-
about: Suggest an enhancement to Meshery.
3+
about: Suggest an enhancement to academy-theme.
44
title: ''
55
labels: 'kind/enhancement'
66
assignees: ''
@@ -21,5 +21,7 @@ assignees: ''
2121
<!-- [Optional] Any visual diagrams of the desired user interface. -->
2222

2323
---
24-
**[Contributor Guide](https://docs.meshery.io/project/contributing)**
24+
- 📚 [Instructions for contributing to academy-theme](https://github.com/layer5io/academy-theme/blob/master/CONTRIBUTING.md)
25+
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
2526
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
27+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/question.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

layouts/partials/badge.html

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{{- $b := .badge -}}
2+
{{- $contentId := .curriculaId -}}
3+
{{- $orgId := .orgId | default "" -}}
4+
5+
{{- $svg := cond (partial "is-url.html" $b.svg) $b.svg (partial "banner-url.html" (dict "uuid" $orgId "banner" $b.svg )) -}}
6+
{{- $png := cond (partial "is-url.html" $b.png) $b.png (partial "banner-url.html" (dict "uuid" $orgId "banner" $b.svg )) -}}
7+
8+
{{- $badge := "nil" -}}
9+
10+
{{- if $b }}
11+
{{- $badge = dict
12+
"title" $b.title
13+
"description" $b.description
14+
"label" $contentId
15+
"svg" $svg
16+
"png" $png
17+
-}}
18+
{{- end -}}
19+
20+
21+
{{- return $badge -}}

layouts/partials/is-url.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{{- $s := . -}}
2+
{{- $isUrl := or (strings.HasPrefix $s "http://") (strings.HasPrefix $s "https://") -}}
3+
{{- return $isUrl -}}

layouts/partials/learning-path.json.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"title": {{ .Title | jsonify }},
2424
"description": {{ .Description | jsonify }},
2525
"banner": {{ $banner_url | jsonify }},
26-
"badge": {{ .Params.badge | jsonify }},
26+
"badge": {{ partial "badge.html" (dict "badge" .Params.badge "curriculaId" $id "orgId" $uuid ) | jsonify }},
2727
"certificate": {{ .Params.certificate | jsonify }},
2828
"permalink": {{ .Permalink | jsonify }},
2929
"categories": {{ .Params.Categories | jsonify }},

layouts/partials/title.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
{{- $title := $page.Title -}}
44

5+
{{/*
56
{{- if eq $page.Type "test" -}}
67
{{- $title = partial "test/title.html" $page -}}
78
{{- end -}}
9+
*/}}
810

911
{{- return $title -}}

0 commit comments

Comments
 (0)