Skip to content

Commit f66421e

Browse files
zihanKuangzihanKuang
authored
Merge branch 'master' into add-debug-events-doc
2 parents 38688d5 + 2de2f59 commit f66421e

File tree

7 files changed

+59
-3
lines changed

7 files changed

+59
-3
lines changed

‎assets/scss/_styles_project.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ body {
139139

140140
overflow-x: hidden;
141141
}
142+
.td-content .card img {
143+
width: 100% ;
144+
}
142145

143146
// Links
144147

‎content/en/cloud/academy/creating-content/extending-the-academy/images/example_badge.png‎

642 KB
Loading

‎content/en/cloud/academy/creating-content/extending-the-academy/images/example_email.png‎

282 KB
Loading

‎content/en/cloud/academy/creating-content/extending-the-academy/index.md‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,39 @@ For example, a **Learning Path** named **"Mastering Kubernetes"** might contain:
5050

5151
{{< alert type="warning" title="Content Isolation" >}}
5252
To ensure security and isolation, all of your content files must be placed within a directory named for your organization UUID. You'll learn the specifics of how to do this in our [hands-on tutorial](/cloud/academy/creating-your-learning-path/).
53-
{{< /alert >}}
53+
{{< /alert >}}
54+
55+
### Branded Email Communications
56+
57+
When using the Academy with [white-labeling](/cloud/self-hosted/white-labeling) enabled, all system-generated emails (badge awards, certificate awards, challenge registrations) automatically reflect your organization's branding.
58+
59+
Below is an example email template showing how badge award notifications appear when white-labeling is enabled. The parts enclosed in `{{}}` are automatically replaced with your organization's specific information:
60+
61+
**Email Template Structure:**
62+
```
63+
From: no-reply@{{OrganizationDomain}} ← Your custom domain
64+
Subject: New badge(s) awarded by {{OrganizationName}} ← Your organization name
65+
66+
Congratulations, {{Awardee}}! ← Student's name
67+
You have earned the following badges:
68+
69+
{{Badges}} ← Cicable badge with name and description
70+
71+
[Go to Profile Button{{PublicProfileLink}}] ← Direct link to profile
72+
73+
Share your achievements with the world:
74+
X | LinkedIn | Facebook
75+
---
76+
{{OrganizationName}} Academy | Powered by Layer5 Cloud
77+
```
78+
79+
Here is a real-world example of the email:
80+
![Example of Email](./images/example_email.png)
81+
82+
When users click the badge, they will go to the details in the Academy:
83+
![Example of Badge](./images/example_badge.png)
84+
85+
{{< alert type="info" title="Email Customization" >}}
86+
Email templates automatically incorporate your organization's logo and primary brand color as configured in your [Layer5 Cloud Organization Settings](https://cloud.layer5.io/identity/organizations). Custom email templates can be provided for Enterprise customers with specific branding requirements.
87+
{{< /alert >}}
88+

‎data/kanvas_discuss.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎layouts/shortcodes/meshery-design-embed.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,22 @@
2828
-->
2929
{{ $id := .Get "id" }}
3030

31+
<!-- get the design id from the id , the id contains embedded-design- as prefix -->
32+
{{ $designId := replace $id "embedded-design-" "" }}
33+
34+
35+
<!-- get the hostname for provider -->
36+
{{ $remoteProviderHost := .Get "host" | default "https://cloud.layer5.io" }}
37+
<!-- create design link -->
38+
{{ $designLink := printf "%s/catalog/content/design/%s" $remoteProviderHost $designId }}
39+
3140
<!--
3241
Retrieve the size for the embedding container.
3342
If not provided, "full" is used as default.
3443
-->
3544
{{ $size := .Get "size" | default "full" }}
3645
{{ $style := .Get "style" }}
46+
{{ $showOpenLink := .Get "showOpenLink" | default "true" }}
3747

3848
<style>
3949
.meshery-embed-container {
@@ -54,6 +64,7 @@
5464
width: 100%;
5565
height: 100%;
5666
}
67+
5768
</style>
5869

5970
<!--
@@ -66,6 +77,7 @@
6677
- Width: 100% (responsive to container width)
6778
- Border: 1px solid #eee (light border for visibility)
6879
-->
80+
<div style="display: flex; flex-direction: column; align-items: center; gap: 0.5rem;">
6981
<div
7082
id="{{ $id }}"
7183
{{- if $style -}}
@@ -75,6 +87,12 @@
7587
{{- end -}}
7688
></div>
7789

90+
<a href="{{ $designLink }}" target="_blank" rel="noopener noreferrer">
91+
Open Design
92+
</a>
93+
94+
</div>
95+
7896
<!--
7997
Embed Script:
8098
The JavaScript file (retrieved from the `src` attribute) is included here.

‎static/data/csv/pricing-list.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en"><head><meta name="description" content="Web word processing, presentations and spreadsheets"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0"><link rel="shortcut icon" href="//docs.google.com/favicon.ico"><title>Page Not Found</title><meta name="referrer" content="origin"><link href="//fonts.googleapis.com/css?family=Product+Sans" rel="stylesheet" type="text/css" nonce="9btfHF1xUW1gSFgqlFHELA"><style nonce="9btfHF1xUW1gSFgqlFHELA">.goog-inline-block{position:relative;display:-moz-inline-box;display:inline-block}* html .goog-inline-block{display:inline}*:first-child+html .goog-inline-block{display:inline}#drive-logo{margin:18px 0;position:absolute;white-space:nowrap}.docs-drivelogo-img{background-image:url(//ssl.gstatic.com/images/branding/googlelogo/1x/googlelogo_color_116x41dp.png);-webkit-background-size:116px 41px;background-size:116px 41px;display:inline-block;height:41px;vertical-align:bottom;width:116px}.docs-drivelogo-text{color:#000;display:inline-block;opacity:.54;text-decoration:none;font-family:"Product Sans",Arial,Helvetica,sans-serif;font-size:32px;text-rendering:optimizeLegibility;position:relative;top:-6px;left:-7px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media (-webkit-min-device-pixel-ratio:1.5),(min-resolution:144dpi){.docs-drivelogo-img{background-image:url(//ssl.gstatic.com/images/branding/googlelogo/2x/googlelogo_color_116x41dp.png)}}sentinel{}</style><style type="text/css" nonce="9btfHF1xUW1gSFgqlFHELA">body {background-color: #fff; font-family: Arial,sans-serif; font-size: 13px; margin: 0; padding: 0;}a, a:link, a:visited {color: #112ABB;}</style><style type="text/css" nonce="9btfHF1xUW1gSFgqlFHELA">.errorMessage {font-size: 12pt; font-weight: bold; line-height: 150%;}</style></head><body><div id="outerContainer"><div id="innerContainer"><div style="position: absolute; top: -80px;"><div style="margin: 18px 0; position: absolute; white-space: nowrap;"><a href="//support.google.com/docs/"><img height="35px" src="//ssl.gstatic.com/docs/common/product/spreadsheets_lockup2.png" alt="Google logo"/></a></div></div><div align="center"><p class="errorMessage" style="padding-top: 50px">Sorry, unable to open the file at this time.</p><p> Please check the address and try again. </p><div style="background: #F0F6FF; border: 1px solid black; margin-top: 35px; padding: 10px 125px; width: 300px;"><p><strong>Get stuff done with Google Drive</strong></p><p>Apps in Google Drive make it easy to create, store and share online documents, spreadsheets, presentations and more.</p><p>Learn more at <a href="https://drive.google.com/start/apps">drive.google.com/start/apps</a>.</p></div></div></div></div></body><style nonce="9btfHF1xUW1gSFgqlFHELA">html {height: 100%; overflow: auto;}body {height: 100%; overflow: auto;}#outerContainer {margin: auto; max-width: 750px;}#innerContainer {margin-bottom: 20px; margin-left: 40px; margin-right: 40px; margin-top: 80px; position: relative;}</style></html>
1+
<!DOCTYPE html><html lang="en"><head><meta name="description" content="Web word processing, presentations and spreadsheets"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0"><link rel="shortcut icon" href="//docs.google.com/favicon.ico"><title>Page Not Found</title><meta name="referrer" content="origin"><link href="//fonts.googleapis.com/css?family=Product+Sans" rel="stylesheet" type="text/css" nonce="ip-14pBXCy_NOiI_MzCcAw"><style nonce="ip-14pBXCy_NOiI_MzCcAw">.goog-inline-block{position:relative;display:-moz-inline-box;display:inline-block}* html .goog-inline-block{display:inline}*:first-child+html .goog-inline-block{display:inline}#drive-logo{margin:18px 0;position:absolute;white-space:nowrap}.docs-drivelogo-img{background-image:url(//ssl.gstatic.com/images/branding/googlelogo/1x/googlelogo_color_116x41dp.png);-webkit-background-size:116px 41px;background-size:116px 41px;display:inline-block;height:41px;vertical-align:bottom;width:116px}.docs-drivelogo-text{color:#000;display:inline-block;opacity:.54;text-decoration:none;font-family:"Product Sans",Arial,Helvetica,sans-serif;font-size:32px;text-rendering:optimizeLegibility;position:relative;top:-6px;left:-7px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media (-webkit-min-device-pixel-ratio:1.5),(min-resolution:144dpi){.docs-drivelogo-img{background-image:url(//ssl.gstatic.com/images/branding/googlelogo/2x/googlelogo_color_116x41dp.png)}}sentinel{}</style><style type="text/css" nonce="ip-14pBXCy_NOiI_MzCcAw">body {background-color: #fff; font-family: Arial,sans-serif; font-size: 13px; margin: 0; padding: 0;}a, a:link, a:visited {color: #112ABB;}</style><style type="text/css" nonce="ip-14pBXCy_NOiI_MzCcAw">.errorMessage {font-size: 12pt; font-weight: bold; line-height: 150%;}</style></head><body><div id="outerContainer"><div id="innerContainer"><div style="position: absolute; top: -80px;"><div style="margin: 18px 0; position: absolute; white-space: nowrap;"><a href="//support.google.com/docs/"><img height="35px" src="//ssl.gstatic.com/docs/common/product/spreadsheets_lockup2.png" alt="Google logo"/></a></div></div><div align="center"><p class="errorMessage" style="padding-top: 50px">Sorry, unable to open the file at this time.</p><p> Please check the address and try again. </p><div style="background: #F0F6FF; border: 1px solid black; margin-top: 35px; padding: 10px 125px; width: 300px;"><p><strong>Get stuff done with Google Drive</strong></p><p>Apps in Google Drive make it easy to create, store and share online documents, spreadsheets, presentations and more.</p><p>Learn more at <a href="https://drive.google.com/start/apps">drive.google.com/start/apps</a>.</p></div></div></div></div></body><style nonce="ip-14pBXCy_NOiI_MzCcAw">html {height: 100%; overflow: auto;}body {height: 100%; overflow: auto;}#outerContainer {margin: auto; max-width: 750px;}#innerContainer {margin-bottom: 20px; margin-left: 40px; margin-right: 40px; margin-top: 80px; position: relative;}</style></html>

0 commit comments

Comments
 (0)