diff --git a/theme/documentation/article_pages.md b/theme/documentation/article_pages.md index 33303daa..6767df90 100644 --- a/theme/documentation/article_pages.md +++ b/theme/documentation/article_pages.md @@ -17,6 +17,9 @@ This article is to be used as a general purpose article; designed for informatio ### Knowledge base article This article is to be used to promote knowledge sharing and to provide solutions for customer issues before reaching out to customer support engineer for additional help. It contains a sidebar of **Related Articles** to increase article visibility. +### Fast Track article +This article is built on top of the **Knowledge Base Articles** designed to be part of Liferay's fast-track publication program of providing a repository of verified solutions that have resolved one or more customer issues. It contains a fast track label at the top of the article, as well as a brief explanation about what fast track articles are at the bottom of the article. Articles published under this template are part of the Knowledge-Centered Service initiative. + ### Zendesk default article This article is to be used as the default Zendesk template with custom styling. It displays a navigation on the left side of the article containing all the articles in the current section. diff --git a/theme/package-lock.json b/theme/package-lock.json index 125bd7b4..747d648e 100644 --- a/theme/package-lock.json +++ b/theme/package-lock.json @@ -1,6 +1,6 @@ { "name": "liferay-zendesk-theme", - "version": "2.5.5", + "version": "2.6.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5755,9 +5755,9 @@ }, "dependencies": { "js-yaml": { - "version": "3.12.2", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz", - "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", + "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -7255,9 +7255,9 @@ "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" }, "js-yaml": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", - "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", + "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", "dev": true, "requires": { "argparse": "^1.0.7", diff --git a/theme/package.json b/theme/package.json index a50a008f..dab04911 100644 --- a/theme/package.json +++ b/theme/package.json @@ -105,5 +105,5 @@ "test": "jest", "zip": "zip -r Liferay-Help-Center.zip dist -x *.zat*" }, - "version": "2.5.5" + "version": "2.6.5" } diff --git a/theme/src/css/_zendesk-button.scss b/theme/src/css/_zendesk-button.scss index 9ecfa700..0f2efbd5 100644 --- a/theme/src/css/_zendesk-button.scss +++ b/theme/src/css/_zendesk-button.scss @@ -1,5 +1,6 @@ a[role="button"], -input[type="submit"] { +input[type="submit"], +label[role="button"] { @include button-size( $btn-padding-y, $btn-padding-x, diff --git a/theme/src/css/_zendesk-elements.scss b/theme/src/css/_zendesk-elements.scss index f82bdd7e..5f3b5a05 100644 --- a/theme/src/css/_zendesk-elements.scss +++ b/theme/src/css/_zendesk-elements.scss @@ -116,6 +116,27 @@ textarea, margin-bottom: $form-group-margin-bottom; } +.initiative-blurb { + font-style: italic; + padding: 3rem 0; + + .leading-text { + color: $color-warning; + font-weight: $font-weight-semi-bold; + } +} + +.initiative-label { + background-color: $color-warning-background; + color: $color-warning; + margin-bottom: 0.5rem; + text-transform: uppercase; + + &.label { + border-width: 0; + } +} + .label-sm { @include clay-label-size($label-sm); } diff --git a/theme/src/css/_zendesk-requests.scss b/theme/src/css/_zendesk-requests.scss index 7e500a4f..16846dcd 100644 --- a/theme/src/css/_zendesk-requests.scss +++ b/theme/src/css/_zendesk-requests.scss @@ -194,6 +194,32 @@ .autofit-padded > .autofit-col { padding-top: $padding-md; } + + .satisfaction-box { + background-color: $color-grey; + border-width: 0; + + h4 { + padding-top: $padding-default; + } + + input[type="radio"][value="good"] + label:hover { + border-color: $color-success; + color: $color-success; + } + + input[type="radio"][value="bad"] + label:hover { + border-color: $color-error; + color: $color-error; + } + + label[role="button"] { + border: 1px solid $color-border; + color: initial; + font-size: $small-font-size; + padding: $btn-padding-y $btn-padding-x; + } + } } .request-filter { diff --git a/theme/src/css/_zendesk-variables.scss b/theme/src/css/_zendesk-variables.scss index 3f1fb949..eb6518c3 100644 --- a/theme/src/css/_zendesk-variables.scss +++ b/theme/src/css/_zendesk-variables.scss @@ -20,6 +20,7 @@ $color-primary-focus: #004AD7 !default; $color-primary-focus-border: #71A2FF !default; $color-primary-hover: #0053F0 !default; $color-success: #287D3C !default; +$color-warning-background: #FFF4EC !default; $color-warning: #B95000 !default; $color-grey: #F5F7FA !default; diff --git a/theme/src/resources/manifest.json b/theme/src/resources/manifest.json index 21e4859d..b5279ffa 100644 --- a/theme/src/resources/manifest.json +++ b/theme/src/resources/manifest.json @@ -1,7 +1,7 @@ { "name": "Liferay Help Center Theme", "author": "Liferay", - "version": "2.5.5", + "version": "2.6.5", "api_version": 1, "default_locale": "en-us", "settings": [ diff --git a/theme/src/resources/templates/article_pages/fast_track.hbs b/theme/src/resources/templates/article_pages/fast_track.hbs new file mode 100644 index 00000000..3d511dc7 --- /dev/null +++ b/theme/src/resources/templates/article_pages/fast_track.hbs @@ -0,0 +1,159 @@ +
+
+
+ {{breadcrumbs}} +
+
+ + + {{dc 'article-fast_track'}} + + + {{#with article}} +
+

+ {{title}} + + {{#if internal}} + + + + {{/if}} +

+
+ +
+
+
+
+ + Avatar + +
+ +
+ {{#link 'user_profile' id=author.id}} +

+ {{author.name}} +

+ {{/link}} + +
    +
  • + {{#is created_at edited_at}} + {{date created_at timeago=true}} + {{else}} + {{t 'updated'}} {{date edited_at timeago=true}} + {{/is}} +
    • +
+
+
+ +
+
+
+ {{body}} +
+ +
+ +
+
+
+ + + +
+
+ {{t 'was_this_article_helpful'}} + +
+ {{vote 'up' role='radio' class='article-vote article-vote-up btn btn-outline-primary btn-sm'}} + + {{vote 'down' role='radio' class='article-vote article-vote-down btn btn-outline-primary btn-sm'}} +
+ + + {{vote 'label' class='article-vote-label'}} + +
+
+
+ +
+ {{../related_articles}} +
+
+ {{/with}} + +
+
+ + \ No newline at end of file diff --git a/theme/src/resources/templates/request_page.hbs b/theme/src/resources/templates/request_page.hbs index 6f75a6cb..8805883e 100644 --- a/theme/src/resources/templates/request_page.hbs +++ b/theme/src/resources/templates/request_page.hbs @@ -18,6 +18,8 @@
+ {{satisfaction}} +