diff --git a/manifest.json b/manifest.json index 20475aed3..004b9c333 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Copenhagen", "author": "Zendesk", - "version": "1.2.0", + "version": "1.3.0", "api_version": 1, "default_locale": "en-us", "settings": [{ @@ -119,5 +119,113 @@ "description": "community_image_description", "label": "community_image_label" }] + }, { + "label": "search_group_label", + "variables":[{ + "identifier": "instant_search", + "type": "checkbox", + "description": "instant_search_description", + "label": "instant_search_label", + "value": true + }, { + "identifier": "scoped_kb_search", + "type": "checkbox", + "description": "scoped_knowledge_base_search_description", + "label": "scoped_knowledge_base_search_label", + "value": true + }, { + "identifier": "scoped_community_search", + "type": "checkbox", + "description": "scoped_community_search_description", + "label": "scoped_community_search_label", + "value": true + }] + }, { + "label": "home_page_group_label", + "variables": [{ + "identifier": "show_recent_activity", + "type": "checkbox", + "description": "recent_activity_description", + "label": "recent_activity_label", + "value": true + }] + }, { + "label": "article_page_group_label", + "variables": [{ + "identifier": "show_articles_in_section", + "type": "checkbox", + "description": "articles_in_section_description", + "label": "articles_in_section_label", + "value": true + }, { + "identifier": "show_article_author", + "type": "checkbox", + "description": "article_author_description", + "label": "article_author_label", + "value": true + }, { + "identifier": "show_article_comments", + "type": "checkbox", + "description": "article_comments_description", + "label": "article_comments_label", + "value": true + }, { + "identifier": "show_follow_article", + "type": "checkbox", + "description": "follow_article_description", + "label": "follow_article_label", + "value": true + }, { + "identifier": "show_recently_viewed_articles", + "type": "checkbox", + "description": "recently_viewed_articles_description", + "label": "recently_viewed_articles_label", + "value": true + }, { + "identifier": "show_related_articles", + "type": "checkbox", + "description": "related_articles_description", + "label": "related_articles_label", + "value": true + }, { + "identifier": "show_article_sharing", + "type": "checkbox", + "description": "article_sharing_description", + "label": "article_sharing_label", + "value": true + }] + }, { + "label": "section_page_group_label", + "variables": [{ + "identifier": "show_follow_section", + "type": "checkbox", + "description": "follow_section_description", + "label": "follow_section_label", + "value": true + }] + }, { + "label": "community_post_group_label", + "variables": [{ + "identifier": "show_follow_post", + "type": "checkbox", + "description": "follow_post_description", + "label": "follow_post_label", + "value": true + }, { + "identifier": "show_post_sharing", + "type": "checkbox", + "description": "post_sharing_description", + "label": "post_sharing_label", + "value": true + }] + }, { + "label": "community_topic_group_label", + "variables": [{ + "identifier": "show_follow_topic", + "type": "checkbox", + "description": "follow_topic_description", + "label": "follow_topic_label", + "value": true + }] }] } diff --git a/style.css b/style.css index d88c7a9b4..ddf6bb720 100644 --- a/style.css +++ b/style.css @@ -561,6 +561,7 @@ ul { .avatar { display: inline-block; position: relative; + margin-right: 10px; } .avatar img { @@ -1156,10 +1157,11 @@ ul { @media (min-width: 1024px) { .article { - flex: 1 0 66%; + flex: 1; max-width: 66%; min-width: 640px; padding: 0 30px; + margin: 0 auto; } } @@ -1202,6 +1204,10 @@ ul { } } +.article-title.no-author { + margin-bottom: 0.067em; +} + .article-title .icon-lock::before { content: "\1F512"; font-size: 20px; @@ -1228,7 +1234,6 @@ ul { .article-meta { display: inline-block; - margin-left: 10px; vertical-align: middle; } @@ -2336,7 +2341,6 @@ ul { .post-meta { display: inline-block; flex: 1; - margin-left: 10px; vertical-align: middle; } diff --git a/templates/article_page.hbs b/templates/article_page.hbs index baced14bd..a4d4e1789 100644 --- a/templates/article_page.hbs +++ b/templates/article_page.hbs @@ -2,29 +2,31 @@
- {{t 'comments'}} -
-{{t 'comments_count' count=article.comment_count}}
- {{#if comments}} -- {{#each comments}} --
-
-
-
-
- {{#if author.agent}}
-
- {{/if}}
-
-
-
-
- {{#link 'user_profile' id=author.id}}
- {{author.name}}
- {{/link}}
-
-
-
diff --git a/templates/community_post_list_page.hbs b/templates/community_post_list_page.hbs
index f8ae31c72..639b3340a 100644
--- a/templates/community_post_list_page.hbs
+++ b/templates/community_post_list_page.hbs
@@ -1,6 +1,6 @@
- {{search submit=false class='search search-full' scoped=true}}
+ {{search submit=false class='search search-full' scoped=settings.scoped_community_search}}
diff --git a/templates/community_post_page.hbs b/templates/community_post_page.hbs
index 5603f4c3b..23cbd1e99 100644
--- a/templates/community_post_page.hbs
+++ b/templates/community_post_page.hbs
@@ -2,7 +2,7 @@
@@ -29,7 +29,9 @@
{{post.status_name}}
{{/is}}
- {{subscribe}}
+ {{#if settings.show_follow_post}}
+ {{subscribe}}
+ {{/if}}
@@ -90,15 +92,17 @@
-
+ {{#if settings.show_post_sharing}}
+
+ {{/if}}
diff --git a/templates/community_topic_list_page.hbs b/templates/community_topic_list_page.hbs
index 11d685b08..cc7dc994d 100644
--- a/templates/community_topic_list_page.hbs
+++ b/templates/community_topic_list_page.hbs
@@ -1,6 +1,6 @@
- {{search submit=false class='search search-full' scoped=true}}
+ {{search submit=false class='search search-full' scoped=settings.scoped_community_search}}
diff --git a/templates/community_topic_page.hbs b/templates/community_topic_page.hbs
index dbaebec52..effa14417 100644
--- a/templates/community_topic_page.hbs
+++ b/templates/community_topic_page.hbs
@@ -2,7 +2,7 @@
@@ -18,9 +18,11 @@
- {{subscribe}}
-
+ {{#if settings.show_follow_topic}}
+
+ {{subscribe}}
+
+ {{/if}}
diff --git a/templates/home_page.hbs b/templates/home_page.hbs
index d58d61a62..6275c9a9f 100644
--- a/templates/home_page.hbs
+++ b/templates/home_page.hbs
@@ -1,6 +1,6 @@
- {{search submit=false instant=true class='search search-full'}}
+ {{search submit=false instant=settings.instant_search class='search search-full'}}
@@ -64,6 +64,8 @@
{{/if}}
- {{recent_activity}}
+ {{#if settings.show_recent_activity}}
+ {{recent_activity}}
+ {{/if}}
diff --git a/templates/section_page.hbs b/templates/section_page.hbs
index b51342abf..a2b49aff1 100644
--- a/templates/section_page.hbs
+++ b/templates/section_page.hbs
@@ -14,7 +14,9 @@
{{/if}}
- {{subscribe}}
+ {{#if settings.show_follow_section}}
+ {{subscribe}}
+ {{/if}}
{{#if section.description}}
- {{#if editor}} -- {{date edited_at timeago=true}}
- - {{t 'edited'}}
- {{else}}
- - {{date created_at timeago=true}}
+ {{#if settings.show_article_comments}}
+
+
+
+
+ {{t 'sort_by'}}
+
+ {{#each comment_sorters}}
+ {{name}}
+ {{/each}}
+
+
+ {{/if}}
+
+
+
- {{user_avatar class='user-avatar'}}
-
-
- {{wysiwyg 'body'}}
-
- {{input type='submit'}}
+ {{#form 'comment' class='comment-form'}}
+
+ {{user_avatar class='user-avatar'}}
-
- {{/form}}
+
+ {{wysiwyg 'body'}}
+
+ {{input type='submit'}}
+
+
+ {{/form}}
-
+
+
+ {{/if}}
+ {{t 'comments'}} +
+{{t 'comments_count' count=article.comment_count}}
+ {{#if comments}} ++ {{#each comments}} +-
+
+
+
+
+ {{#if author.agent}}
+
{{/if}}
-
-
-
- {{#with ticket}}
-
- {{t 'request'}}{{id}}
-
- {{/with}}
- {{#if pending}}
- {{t 'pending_approval'}}
- {{/if}}
+
+
+
+
+ {{#link 'user_profile' id=author.id}}
+ {{author.name}}
+ {{/link}}
+
+
+
+
+ {{#with ticket}}
+
+ {{t 'request'}}{{id}}
+
+ {{/with}}
+ {{#if pending}}
+ {{t 'pending_approval'}}
+ {{/if}}
+
-
-
- {{body}}
-
-
-
- {{vote 'up' role='radio' class='vote-up' selected_class='vote-voted'}}
- {{vote 'sum' class='vote-sum'}}
- {{vote 'down' role='radio' class='vote-down' selected_class='vote-voted'}}
+ {{body}}
-
- {{actions}}
+
+
+
+ {{vote 'up' role='radio' class='vote-up' selected_class='vote-voted'}}
+ {{vote 'sum' class='vote-sum'}}
+ {{vote 'down' role='radio' class='vote-down' selected_class='vote-voted'}}
+
+
+ {{actions}}
+
-
-
- {{/each}}
-
+ + {{/each}} + - {{pagination}} + {{pagination}} - {{#form 'comment' class='comment-form'}} -+ {{#if editor}} +- {{date edited_at timeago=true}}
+ - {{t 'edited'}}
+ {{else}}
+ - {{date created_at timeago=true}}
+ {{/if}}
+
+{{comment_callout}}
- -{{comment_callout}}
+{{topic.description}}
-{{section.description}}
{{/if}}