Skip to content

Commit

Permalink
Merge pull request #65 from rdai10/dev
Browse files Browse the repository at this point in the history
2.6.5
  • Loading branch information
rdai10 authored Mar 28, 2019
2 parents 941eda2 + 2940226 commit 1e279f2
Show file tree
Hide file tree
Showing 11 changed files with 225 additions and 10 deletions.
3 changes: 3 additions & 0 deletions theme/documentation/article_pages.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
14 changes: 7 additions & 7 deletions theme/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,5 @@
"test": "jest",
"zip": "zip -r Liferay-Help-Center.zip dist -x *.zat*"
},
"version": "2.5.5"
"version": "2.6.5"
}
3 changes: 2 additions & 1 deletion theme/src/css/_zendesk-button.scss
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
21 changes: 21 additions & 0 deletions theme/src/css/_zendesk-elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
26 changes: 26 additions & 0 deletions theme/src/css/_zendesk-requests.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions theme/src/css/_zendesk-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion theme/src/resources/manifest.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
159 changes: 159 additions & 0 deletions theme/src/resources/templates/article_pages/fast_track.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
<div class="container-fluid container-fluid-max-xl main-content">
<div class="row">
<div class="col-sm-12">
{{breadcrumbs}}
</div>
</div>

<span class="initiative-label label label-sm" title="{{dc 'article-fast_track'}}">
{{dc 'article-fast_track'}}
</span>

{{#with article}}
<div class="row">
<h1 class="article-title col-md-7" title="{{title}}">
{{title}}

{{#if internal}}
<svg class="lexicon-icon lexicon-icon-lock" title="{{t 'internal'}}">
<use xlink:href="#lock" />
</svg>
{{/if}}
</h1>
</div>

<div class="row">
<div class="col-md-7">
<div class="article-author">
<div class="avatar sticker sticker-circle sticker-lg sticker-primary">
<span class="sticker-overlay">
<img alt="Avatar" class="sticker-img" src="{{author.avatar_url}}" />
</span>
</div>

<div class="article-meta">
{{#link 'user_profile' id=author.id}}
<h4 class="author-name">
{{author.name}}
</h4>
{{/link}}

<ul class="meta-group secondary-font secondary-text-color">
<li class="meta-data">
{{#is created_at edited_at}}
{{date created_at timeago=true}}
{{else}}
{{t 'updated'}} {{date edited_at timeago=true}}
{{/is}}
</li>
</ul>
</div>
</div>

<section class="article-info">
<div class="article-content">
<div class="article-body">
{{body}}
</div>

<div class="article-attachments">
<ul class="attachments">
{{#each ../attachments}}
<li class="attachment-item">
<svg class="lexicon-icon lexicon-icon-paperclip">
<use xlink:href="#paperclip" />
</svg>

<a href="{{url}}" target="_blank">{{name}}</a>

<div class="attachment-meta">
<span class="meta-data">{{size}}</span>
<a href="{{url}}" target="_blank">{{t 'download'}}</a>
</div>
</li>
{{/each}}
</ul>
</div>
</div>
</section>

<aside class="initiative-blurb">
<span class="leading-text">{{dc 'article-fast_track'}}:</span> {{dc 'article-fast_track_disclaimer'}}
</aside>

<footer class="article-footer">
<div class="article-votes">
<span class="article-votes-question">{{t 'was_this_article_helpful'}}</span>

<div class="article-votes-controls" role='radiogroup'>
{{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'}}
</div>

<small class="article-votes-count">
{{vote 'label' class='article-vote-label'}}
</small>
</div>
</footer>
</div>

<div class="article-relatives col-md-4 offset-sm-1">
{{../related_articles}}
</div>
</div>
{{/with}}

<section id="stillNeedHelp"></section>
</div>

<script>
$(function() {
const userTags = window.HelpCenter.user.tags;
if (Liferay.hasKBPermission(userTags)) {
Liferay.render(
Liferay.CallToAction,
{
actionItems: [
{
iconId: '#ticket',
link: '{{page_path 'new_request'}}',
message: "{{dc 'let_us_know_if_you_cant_find_a_solution_to_your_issue'}}",
name: '{{dc 'submit_a_ticket'}}'
},
{
disclaimer: '{{dc 'homepage-contact_us_asterisk_description'}}',
iconId: '#contact',
link: '/hc/articles/360017784212',
message: '{{dc 'homepage-contact_us_description'}}',
name: '{{dc 'mega_menu-contact_us'}}'
},
{
disclaimer: '{{dc 'homepage-ask_the_community_asterisk_description'}}',
iconId: '#community',
link: 'https://community.liferay.com/ ',
message: "{{dc 'homepage-ask_the_community_description'}}",
name: '{{dc 'homepage-ask_the_community'}}'
}
],
className: 'need-help row',
promotions: [
{
description: '{{dc 'homepage-liferay_university_description'}}',
name: '{{dc 'homepage-liferay_university'}}',
url: 'https://university.liferay.com/'
},
{
description: '{{dc 'homepage-liferay_global_services_description'}}',
name: '{{dc 'homepage-liferay_global_services'}}',
url: 'https://www.liferay.com/consulting'
}
],
sectionHeading: '{{dc 'still_need_help'}}'
},
document.getElementById('stillNeedHelp')
);
}
});
</script>
2 changes: 2 additions & 0 deletions theme/src/resources/templates/request_page.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
</h2>

<section class="request-container-inner">
{{satisfaction}}

<ul class="comment-list">
{{#each comments}}
<li class="comment" id="{{anchor}}">
Expand Down
2 changes: 2 additions & 0 deletions theme/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ module.exports = {
'*article-content*',
'button-unstyled',
'expanded',
'*initiative*',
'*loading-animation*',
'nav-card',
'nav-stacked',
Expand All @@ -102,6 +103,7 @@ module.exports = {
'products-landing',
'products-landing-tab-content',
'products-landing-tablist',
'*request-container*',
'*request_description_hint*',
'*search-result-description*',
'*search-results-list*',
Expand Down

0 comments on commit 1e279f2

Please sign in to comment.