Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'master' into v4-alpha #491

Merged
merged 24 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6bd6758
chore: upgrading zcli to latest version
luis-almeida Jan 24, 2024
2ea7203
Merge pull request #458 from zendesk/luis.upgrade_zcli
luis-almeida Jan 24, 2024
48a2aa0
feat: add satisfaction response to request details
codella Jan 29, 2024
943b22a
Merge pull request #459 from zendesk/codella/add-survey-response-rati…
codella Feb 8, 2024
c0e9e75
chore(release): 3.2.0
zd-svc-github-copenhagen-theme Feb 8, 2024
26ac337
fix: open survey response links in a new tab
vecerek Feb 27, 2024
b7d6485
Merge pull request #463 from zendesk/ULTRA-1037-open-survey-links-in-…
vecerek Feb 28, 2024
69f405b
chore(release): 3.2.1
zd-svc-github-copenhagen-theme Feb 28, 2024
03b0e7e
Revert "fix: open survey response links in a new tab"
vecerek Feb 28, 2024
9f7e319
Merge pull request #464 from zendesk/revert-463-ULTRA-1037-open-surve…
vecerek Feb 28, 2024
4cb4005
fix: remove stray </li> from header
zdrve Feb 14, 2024
55789fc
Merge pull request #460 from zendesk/zdrve-patch-1
luis-almeida Feb 28, 2024
eb563a4
chore(release): 3.2.2
zd-svc-github-copenhagen-theme Feb 28, 2024
9a4d63a
chore: added translation strings for the New Request Form
Fredx87 Mar 20, 2024
e6d86e9
Merge pull request #468 from zendesk/gianluca/translation-strings
Fredx87 Mar 20, 2024
4a5dffc
chore: download translations
anpa Mar 22, 2024
ee8ef95
Merge pull request #470 from zendesk/andre_download_translations
anpa Mar 22, 2024
0665eb9
chore: added translation string for the New Request Form
Fredx87 Apr 22, 2024
e9f92c0
Merge pull request #474 from zendesk/gianluca/add-credit-card-string
Fredx87 Apr 25, 2024
5abed62
feat: override colors for zd-summary-block elements
sunesimonsen May 30, 2024
5a0235c
chore: build styles
sunesimonsen May 30, 2024
fdf09ab
Merge pull request #488 from zendesk/ssimonsen/zd-summary-block
sunesimonsen May 30, 2024
1780aa1
chore(release): 3.3.0
zd-svc-github-copenhagen-theme May 30, 2024
40fea5a
Merge branch 'master' into v4-alpha
anpa Jun 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
* @zendesk/vikings

# LOCALIZATION
**/translations/en-us.yml @zendesk/localization
translations.yml @zendesk/localization
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
# [3.3.0](https://github.com/zendesk/copenhagen_theme/compare/v3.2.2...v3.3.0) (2024-05-30)


### Features

* override colors for zd-summary-block elements ([5abed62](https://github.com/zendesk/copenhagen_theme/commit/5abed628bfa68a71bbcc459263ad5421e5a0c566))

## [3.2.2](https://github.com/zendesk/copenhagen_theme/compare/v3.2.1...v3.2.2) (2024-02-28)


### Bug Fixes

* remove stray </li> from header ([4cb4005](https://github.com/zendesk/copenhagen_theme/commit/4cb4005801a2097ec6d8a08ec7407fa14cc47269))

## [3.2.1](https://github.com/zendesk/copenhagen_theme/compare/v3.2.0...v3.2.1) (2024-02-28)


### Bug Fixes

* open survey response links in a new tab ([26ac337](https://github.com/zendesk/copenhagen_theme/commit/26ac337f14ca2295dd03a94b672911e0787eb643))

# [3.2.0](https://github.com/zendesk/copenhagen_theme/compare/v3.1.6...v3.2.0) (2024-02-08)


### Features

* add satisfaction response to request details ([48a2aa0](https://github.com/zendesk/copenhagen_theme/commit/48a2aa0eef4d16a6699bb8027c640a5334482117))

## [3.1.6](https://github.com/zendesk/copenhagen_theme/compare/v3.1.5...v3.1.6) (2023-10-05)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@types/styled-components": "^5.1.26",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"@typescript-eslint/parser": "^6.1.0",
"@zendesk/zcli": "1.0.0-beta.38",
"@zendesk/zcli": "1.0.0-beta.40",
"concurrently": "8.0.1",
"dotenv": "16.0.3",
"eslint": "8.35.0",
Expand Down
1 change: 0 additions & 1 deletion src/modules/new-request-form/translations/en-us.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# If you are building your own theme, you can remove this file and just load the translation JSON files, or provide
# your translations with a different method.
#

title: "Copenhagen Theme New Request Form"
packages:
- "new-request-form"
Expand Down
11 changes: 11 additions & 0 deletions style.css

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

14 changes: 14 additions & 0 deletions styles/_summary.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/***** Summary component *****/
zd-summary-block {
// As the Help Center already provides the base styling in a theme agnostic
// way, we will only override the colors here.
background: #f3f6f6;

[dir="ltr"] & {
border-left-color: #859fa1;
}

[dir="rtl"] & {
border-right-color: #859fa1;
}
}
1 change: 1 addition & 0 deletions styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@
@import "content-tags";
@import "wysiwyg";
@import "upload_dropzone";
@import "summary";
1 change: 0 additions & 1 deletion templates/header.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
{{link "sign_out" role="menuitem"}}
</li>
{{/if}}
</li>
</ul>
</nav>
</div>
Expand Down
36 changes: 36 additions & 0 deletions templates/request_page.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,42 @@
</dl>
{{/if}}

{{#with satisfaction_response}}
{{#with rating}}
<dl class="request-details">
<dt>{{t 'rating'}}</dt>
<dd>
<div>
{{#is scale_type 'numeric'}}
{{t 'numerical_rating' value=value max_value=max_value}}
{{else}}
{{scale_value}}
{{/is}}
</div>

{{#link 'survey_response' id=../id}}
{{#if ../editable}}
{{t 'edit_feedback'}}
{{else}}
{{t 'view_feedback'}}
{{/if}}
{{/link}}
</dd>
</dl>
{{else}}
{{#if editable}}
<dl class="request-details">
<dt>{{t 'rating'}}</dt>
<dd>
{{#link 'survey_response' id=id}}
{{t 'add_feedback'}}
{{/link}}
</dd>
</dl>
{{/if}}
{{/with}}
{{/with}}

<dl class="request-details">
<dt>{{t 'requester'}}</dt>
<dd>{{request.requester.name}}</dd>
Expand Down
10 changes: 5 additions & 5 deletions translations/ar.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"articles_in_section_description": "إظهار العمود الجانبي للمقالات في الجزء",
"articles_in_section_label": "مقالات في الجزء",
"article_author_description": "إظهار صورة الكاتب واسمه",
"article_author_label": "الكاتب",
"article_comments_description": "إظهار التعليقات على المقالات",
"article_comments_label": "تعليقات",
"article_page_group_label": "عناصر صفحة المقال",
"article_sharing_description": "إظهار مشاركة وسائل التواصل الاجتماعية على المقال",
"article_sharing_label": "المشاركة الاجتماعية",
"articles_in_section_description": "إظهار العمود الجانبي للمقالات في الجزء",
"articles_in_section_label": "مقالات في الجزء",
"background_color_description": "لون خلفية مركز المساعدة",
"background_color_label": "لون الخلفية",
"brand_color_description": "لون العلامة التجارية لعناصر التصفح الرئيسية",
Expand Down Expand Up @@ -35,9 +35,9 @@
"fonts_group_label": "الخطوط",
"heading_font_description": "خط العناوين",
"heading_font_label": "خط العناوين",
"home_page_group_label": "عناصر الصفحة الرئيسية",
"homepage_background_image_description": "صورة الخلفية الرئيسية للصفحة الرئيسية",
"homepage_background_image_label": "صورة الخلفية الرئيسية للصفحة الرئيسية",
"home_page_group_label": "عناصر الصفحة الرئيسية",
"hover_link_color_description": "لون النص لحالة التحويم الخاصة بعناصر الارتباط",
"hover_link_color_label": "لون ارتباط التحويم",
"images_group_label": "صور",
Expand All @@ -49,10 +49,10 @@
"logo_label": "شعار",
"post_sharing_description": "إظهار مشاركة الوسائط الاجتماعية على منشور",
"post_sharing_label": "المشاركة الاجتماعية",
"recently_viewed_articles_description": "إظهار المقالات التي شوهدت حديثًا",
"recently_viewed_articles_label": "مقالات شوهدت حديثًا",
"recent_activity_description": "إظهار النشاط الحديث على الصفحة الرئيسية",
"recent_activity_label": "النشاط الحديث",
"recently_viewed_articles_description": "إظهار المقالات التي شوهدت حديثًا",
"recently_viewed_articles_label": "مقالات شوهدت حديثًا",
"related_articles_description": "إظهار مقالات ذات صلة",
"related_articles_label": "مقالات ذات صلة",
"request_list_beta_description": "يمكن للمستخدمين فرز الطلبات وترشيحها وإضافة الأعمدة وإزالتها",
Expand Down
10 changes: 5 additions & 5 deletions translations/bg.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"articles_in_section_description": "Показване в страничен панел на статиите в раздела",
"articles_in_section_label": "Статии в раздела",
"article_author_description": "Показване на снимка и име на автора",
"article_author_label": "Автор",
"article_comments_description": "Показване на коментарите към статиите",
"article_comments_label": "Коментари",
"article_page_group_label": "Елементи на страницата на статия",
"article_sharing_description": "Показване на икони за споделяне на статията в социални мрежи",
"article_sharing_label": "Социални мрежи",
"articles_in_section_description": "Показване в страничен панел на статиите в раздела",
"articles_in_section_label": "Статии в раздела",
"background_color_description": "Цвят на фона на вашия Помощен център",
"background_color_label": "Цвят на фона",
"brand_color_description": "Брандов цвят за основните навигационни елементи",
Expand Down Expand Up @@ -35,9 +35,9 @@
"fonts_group_label": "Шрифтове",
"heading_font_description": "Шрифт за заглавки",
"heading_font_label": "Шрифт на заглавка",
"home_page_group_label": "Елементи на началната страница",
"homepage_background_image_description": "Главно изображение на началната страница",
"homepage_background_image_label": "Главно изображение на начална страница",
"home_page_group_label": "Елементи на началната страница",
"hover_link_color_description": "Цвят на текста при състояние на задържане на курсора над елементите на линка",
"hover_link_color_label": "Цвят на линка при задържане на курсора",
"images_group_label": "Изображения",
Expand All @@ -49,10 +49,10 @@
"logo_label": "Лого",
"post_sharing_description": "Показване на икони за споделяне на постинга в социални мрежи",
"post_sharing_label": "Социални мрежи",
"recently_viewed_articles_description": "Показване на последно разглежданите статии",
"recently_viewed_articles_label": "Последно разглеждани",
"recent_activity_description": "Показване на последната активност на началната страница",
"recent_activity_label": "Последна активност",
"recently_viewed_articles_description": "Показване на последно разглежданите статии",
"recently_viewed_articles_label": "Последно разглеждани",
"related_articles_description": "Показване на сродни статии",
"related_articles_label": "Сродни статии",
"request_list_beta_description": "Потребителите могат да сортират и филтрират заявки, да добавят и премахват колони",
Expand Down
10 changes: 5 additions & 5 deletions translations/cs.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"articles_in_section_description": "Zobrazí postranní panel s články v oddílu.",
"articles_in_section_label": "Články v oddílu",
"article_author_description": "Zobrazí obrázek a jméno autora.",
"article_author_label": "Autor",
"article_comments_description": "Zobrazí komentáře k článkům.",
"article_comments_label": "Komentáře",
"article_page_group_label": "Elementy stránky článku",
"article_sharing_description": "Zobrazí u článku sdílení na sociálních sítích.",
"article_sharing_label": "Sdílení na sociálních sítích",
"articles_in_section_description": "Zobrazí postranní panel s články v oddílu.",
"articles_in_section_label": "Články v oddílu",
"background_color_description": "Barva pozadí vašeho Centra nápovědy",
"background_color_label": "Barva pozadí",
"brand_color_description": "Barva značky pro hlavní prvky navigace",
Expand Down Expand Up @@ -35,9 +35,9 @@
"fonts_group_label": "Písma",
"heading_font_description": "Písma pro nadpisy",
"heading_font_label": "Písmo nadpisu",
"home_page_group_label": "Elementy domovské stránky",
"homepage_background_image_description": "Obrázek na pozadí na domovské stránce",
"homepage_background_image_label": "Obrázek pozadí domovské stránky",
"home_page_group_label": "Elementy domovské stránky",
"hover_link_color_description": "Barva textu prvků odkazu při přechodu myší",
"hover_link_color_label": "Barva odkazu při přechodu myší",
"images_group_label": "Obrázky",
Expand All @@ -49,10 +49,10 @@
"logo_label": "Logo",
"post_sharing_description": "Zobrazí u příspěvku sdílení na sociálních sítích.",
"post_sharing_label": "Sdílení na sociálních sítích",
"recently_viewed_articles_description": "Zobrazí nedávno zobrazené články.",
"recently_viewed_articles_label": "Nedávno zobrazené",
"recent_activity_description": "Zobrazí na domovské stránce nedávnou aktivitu.",
"recent_activity_label": "Nedávná aktivita",
"recently_viewed_articles_description": "Zobrazí nedávno zobrazené články.",
"recently_viewed_articles_label": "Nedávno zobrazené",
"related_articles_description": "Zobrazí související články.",
"related_articles_label": "Související články",
"request_list_beta_description": "Uživatelé mohou třídit a filtrovat požadavky, přidávat a odebírat sloupce",
Expand Down
10 changes: 5 additions & 5 deletions translations/da.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"articles_in_section_description": "Vis sidepanel med artikler i sektion",
"articles_in_section_label": "Artikler i sektion",
"article_author_description": "Vis forfatters billede og navn",
"article_author_label": "Forfatter",
"article_comments_description": "Vis kommentarer til artikler",
"article_comments_label": "Kommentarer",
"article_page_group_label": "Artikelsideelementer",
"article_sharing_description": "Vis ikoner til deling af artikel på social medier",
"article_sharing_label": "Social deling",
"articles_in_section_description": "Vis sidepanel med artikler i sektion",
"articles_in_section_label": "Artikler i sektion",
"background_color_description": "Baggrundsfarve på dit Help Center",
"background_color_label": "Baggrundsfarve",
"brand_color_description": "Brand-farve for større navigationselementer",
Expand Down Expand Up @@ -35,9 +35,9 @@
"fonts_group_label": "Skrifttyper",
"heading_font_description": "Skrifttype til overskrifter",
"heading_font_label": "Overskriftsskrifttype",
"home_page_group_label": "Startsideelementer",
"homepage_background_image_description": "Baggrundsbillede på startsiden",
"homepage_background_image_label": "Start-baggrundsbillede",
"home_page_group_label": "Startsideelementer",
"hover_link_color_description": "Tekstfarve for linkelementer i pegetilstand",
"hover_link_color_label": "Farve på link når der peges",
"images_group_label": "Billeder",
Expand All @@ -49,10 +49,10 @@
"logo_label": "Logo",
"post_sharing_description": "Vis ikon til deling af opslag på social medier",
"post_sharing_label": "Social deling",
"recently_viewed_articles_description": "Vis seneste viste artikler",
"recently_viewed_articles_label": "Senest vist",
"recent_activity_description": "Vis seneste aktivitet på startside",
"recent_activity_label": "Seneste aktivitet",
"recently_viewed_articles_description": "Vis seneste viste artikler",
"recently_viewed_articles_label": "Senest vist",
"related_articles_description": "Vis relaterede artikler",
"related_articles_label": "Relaterede artikler",
"request_list_beta_description": "Brugere kan sortere og filtrere anmodninger, tilføje og fjerne kolonner",
Expand Down
10 changes: 5 additions & 5 deletions translations/de.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"articles_in_section_description": "Seitenleiste mit Beiträgen im Abschnitt anzeigen",
"articles_in_section_label": "Beiträge in Abschnitt",
"article_author_description": "Bild und Namen des Autors anzeigen",
"article_author_label": "Autor",
"article_comments_description": "Kommentare zu Beiträgen anzeigen",
"article_comments_label": "Kommentare",
"article_page_group_label": "Elemente auf Beitragsseiten",
"article_sharing_description": "Funktionen zum Teilen auf Social Media in Beitrag anzeigen",
"article_sharing_label": "Teilen auf Social Media",
"articles_in_section_description": "Seitenleiste mit Beiträgen im Abschnitt anzeigen",
"articles_in_section_label": "Beiträge in Abschnitt",
"background_color_description": "Hintergrundfarbe für Ihr Help Center",
"background_color_label": "Hintergrundfarbe",
"brand_color_description": "Markenspezifische Farbe für die wichtigsten Navigationselemente",
Expand Down Expand Up @@ -35,9 +35,9 @@
"fonts_group_label": "Schriftarten",
"heading_font_description": "Schriftart für Überschriften",
"heading_font_label": "Schriftart für Überschriften",
"home_page_group_label": "Elemente auf Homepage",
"homepage_background_image_description": "Hero-Bild auf der Homepage",
"homepage_background_image_label": "Hero-Bild für die Homepage",
"home_page_group_label": "Elemente auf Homepage",
"hover_link_color_description": "Textfarbe für den Hover-Status von Link-Elementen",
"hover_link_color_label": "Farbe des Hover-Links",
"images_group_label": "Bilder",
Expand All @@ -49,10 +49,10 @@
"logo_label": "Logo",
"post_sharing_description": "Funktionen zum Teilen auf Social Media in Post anzeigen",
"post_sharing_label": "Teilen auf Social Media",
"recently_viewed_articles_description": "Zuletzt aufgerufene Beiträge anzeigen",
"recently_viewed_articles_label": "Zuletzt aufgerufene Beiträge",
"recent_activity_description": "Neueste Aktivität auf Homepage anzeigen",
"recent_activity_label": "Neueste Aktivität",
"recently_viewed_articles_description": "Zuletzt aufgerufene Beiträge anzeigen",
"recently_viewed_articles_label": "Zuletzt aufgerufene Beiträge",
"related_articles_description": "Verwandte Beiträge anzeigen",
"related_articles_label": "Verwandte Beiträge",
"request_list_beta_description": "Benutzer können Anfragen sortieren und filtern sowie Spalten hinzufügen und entfernen",
Expand Down
Loading
Loading