From c169456ee5ce4d0aea00a3ef5ac3ad9eb9df6818 Mon Sep 17 00:00:00 2001 From: Roman Rizzi Date: Thu, 30 May 2019 16:17:16 -0300 Subject: [PATCH] DEV: Create new component to reify the user fields (#7655) --- .../templates/components/reviewable-field.hbs | 6 +++++ .../templates/components/reviewable-user.hbs | 26 +++++++++---------- 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 app/assets/javascripts/discourse/templates/components/reviewable-field.hbs diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs new file mode 100644 index 0000000000..cf9e69ed6d --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs @@ -0,0 +1,6 @@ +{{#if value }} +
+
{{name}}
+
{{value}}
+
+{{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs index f55516363d..f1b08f79d6 100644 --- a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs +++ b/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs @@ -12,21 +12,19 @@ {{/if}} - {{#if reviewable.payload.name}} -
-
{{i18n "review.user.name"}}
-
{{reviewable.payload.name}}
-
- {{/if}} -
-
{{i18n "review.user.email"}}
-
{{reviewable.payload.email}}
-
+ + {{reviewable-field classes='reviewable-user-details name' + name=(i18n 'review.user.name') + value=reviewable.payload.name}} + + {{reviewable-field classes='reviewable-user-details email' + name=(i18n 'review.user.email') + value=reviewable.payload.email}} + {{#each userFields as |f|}} -
-
{{f.name}}
-
{{f.value}}
-
+ {{reviewable-field classes='reviewable-user-details user-field' + name=f.name + value=f.value}} {{/each}}