From c046c510dd0df43719d26e55b36d076c2bfee021 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Tue, 10 May 2016 16:42:27 -0300 Subject: [PATCH] Display period for discussions in comment paragraph plugin --- src/plugins/comment_paragraph/hotspot/article-content/article-content.component.ts | 12 ++++++++++++ src/plugins/comment_paragraph/hotspot/article-content/article-content.html | 11 +++++++++++ src/plugins/comment_paragraph/hotspot/article-content/article-content.scss | 20 ++++++++++++++++++++ src/plugins/comment_paragraph/index.ts | 3 ++- src/plugins/comment_paragraph/languages/en.json | 3 ++- src/plugins/comment_paragraph/languages/pt.json | 3 ++- 6 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 src/plugins/comment_paragraph/hotspot/article-content/article-content.component.ts create mode 100644 src/plugins/comment_paragraph/hotspot/article-content/article-content.html create mode 100644 src/plugins/comment_paragraph/hotspot/article-content/article-content.scss diff --git a/src/plugins/comment_paragraph/hotspot/article-content/article-content.component.ts b/src/plugins/comment_paragraph/hotspot/article-content/article-content.component.ts new file mode 100644 index 0000000..2230fb3 --- /dev/null +++ b/src/plugins/comment_paragraph/hotspot/article-content/article-content.component.ts @@ -0,0 +1,12 @@ +import { Input, Inject, Component } from "ng-forward"; +import {Hotspot} from "../../../../app/hotspot/hotspot.decorator"; + +@Component({ + selector: "comment-paragraph-article-content-hotspot", + templateUrl: "plugins/comment_paragraph/hotspot/article-content/article-content.html", +}) +@Hotspot("article_extra_content") +export class CommentParagraphArticleContentHotspotComponent { + + @Input() article: noosfero.Article; +} diff --git a/src/plugins/comment_paragraph/hotspot/article-content/article-content.html b/src/plugins/comment_paragraph/hotspot/article-content/article-content.html new file mode 100644 index 0000000..810f9b3 --- /dev/null +++ b/src/plugins/comment_paragraph/hotspot/article-content/article-content.html @@ -0,0 +1,11 @@ +
+ {{"comment-paragraph-plugin.discussion.header" | translate}} + + {{"comment-paragraph-plugin.discussion.editor.start_date.label" | translate}} + {{ctrl.article.start_date | amDateFormat:'DD/MM/YYYY'}} + + + {{"comment-paragraph-plugin.discussion.editor.end_date.label" | translate}} + {{ctrl.article.end_date | amDateFormat:'DD/MM/YYYY'}} + +
diff --git a/src/plugins/comment_paragraph/hotspot/article-content/article-content.scss b/src/plugins/comment_paragraph/hotspot/article-content/article-content.scss new file mode 100644 index 0000000..f321148 --- /dev/null +++ b/src/plugins/comment_paragraph/hotspot/article-content/article-content.scss @@ -0,0 +1,20 @@ +.discussion-header { + @extend .pull-right; + margin-bottom: 20px; + .date { + text-transform: lowercase; + font-size: 16px; + .description { + font-weight: bold; + color: #BFBFBF; + } + .value { + font-size: 15px; + color: #969696; + } + } + .description { + font-weight: bold; + color: #BFBFBF; + } +} diff --git a/src/plugins/comment_paragraph/index.ts b/src/plugins/comment_paragraph/index.ts index 798c51b..de3f4ec 100644 --- a/src/plugins/comment_paragraph/index.ts +++ b/src/plugins/comment_paragraph/index.ts @@ -2,6 +2,7 @@ import {AllowCommentComponent} from "./allow-comment/allow-comment.component"; import {CommentParagraphArticleButtonHotspotComponent} from "./hotspot/comment-paragraph-article-button.component"; import {CommentParagraphFormHotspotComponent} from "./hotspot/comment-paragraph-form.component"; import {DiscussionEditorComponent} from "./article/cms/discussion-editor/discussion-editor.component"; +import {CommentParagraphArticleContentHotspotComponent} from "./hotspot/article-content/article-content.component"; export let mainComponents: any = [AllowCommentComponent, DiscussionEditorComponent]; -export let hotspots: any = [CommentParagraphArticleButtonHotspotComponent, CommentParagraphFormHotspotComponent]; +export let hotspots: any = [CommentParagraphArticleButtonHotspotComponent, CommentParagraphFormHotspotComponent, CommentParagraphArticleContentHotspotComponent]; diff --git a/src/plugins/comment_paragraph/languages/en.json b/src/plugins/comment_paragraph/languages/en.json index d89f0bf..0bb95c6 100644 --- a/src/plugins/comment_paragraph/languages/en.json +++ b/src/plugins/comment_paragraph/languages/en.json @@ -1,5 +1,6 @@ { "comment-paragraph-plugin.title": "Paragraph Comments", "comment-paragraph-plugin.discussion.editor.start_date.label": "From", - "comment-paragraph-plugin.discussion.editor.end_date.label": "To" + "comment-paragraph-plugin.discussion.editor.end_date.label": "To", + "comment-paragraph-plugin.discussion.header": "Open for comments" } diff --git a/src/plugins/comment_paragraph/languages/pt.json b/src/plugins/comment_paragraph/languages/pt.json index 43750a3..89ce633 100644 --- a/src/plugins/comment_paragraph/languages/pt.json +++ b/src/plugins/comment_paragraph/languages/pt.json @@ -1,5 +1,6 @@ { "comment-paragraph-plugin.title": "Comentários por Parágrafo", "comment-paragraph-plugin.discussion.editor.start_date.label": "De", - "comment-paragraph-plugin.discussion.editor.end_date.label": "Até" + "comment-paragraph-plugin.discussion.editor.end_date.label": "Até", + "comment-paragraph-plugin.discussion.header": "Aberto para comentários" } -- libgit2 0.21.2