diff --git a/app/assets/javascripts/admin/components/mini-chart.js.es6 b/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6 similarity index 98% rename from app/assets/javascripts/admin/components/mini-chart.js.es6 rename to app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6 index e55e684c734..bd2087be79b 100644 --- a/app/assets/javascripts/admin/components/mini-chart.js.es6 +++ b/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6 @@ -3,7 +3,7 @@ import computed from 'ember-addons/ember-computed-decorators'; import loadScript from 'discourse/lib/load-script'; export default Ember.Component.extend({ - classNames: ["mini-chart"], + classNames: ["dashboard-mini-chart"], classNameBindings: ["trend", "oneDataPoint"], diff --git a/app/assets/javascripts/admin/components/mini-table.js.es6 b/app/assets/javascripts/admin/components/dashboard-mini-table.js.es6 similarity index 95% rename from app/assets/javascripts/admin/components/mini-table.js.es6 rename to app/assets/javascripts/admin/components/dashboard-mini-table.js.es6 index 7a1b0552d91..3ac28b5baed 100644 --- a/app/assets/javascripts/admin/components/mini-table.js.es6 +++ b/app/assets/javascripts/admin/components/dashboard-mini-table.js.es6 @@ -2,7 +2,7 @@ import { ajax } from 'discourse/lib/ajax'; import computed from 'ember-addons/ember-computed-decorators'; export default Ember.Component.extend({ - classNames: ["mini-table"], + classNames: ["dashboard-mini-table"], total: null, labels: null, diff --git a/app/assets/javascripts/admin/templates/components/mini-chart.hbs b/app/assets/javascripts/admin/templates/components/dashboard-mini-chart.hbs similarity index 81% rename from app/assets/javascripts/admin/templates/components/mini-chart.hbs rename to app/assets/javascripts/admin/templates/components/dashboard-mini-chart.hbs index 5b30980bbdd..f2728c6d6db 100644 --- a/app/assets/javascripts/admin/templates/components/mini-chart.hbs +++ b/app/assets/javascripts/admin/templates/components/dashboard-mini-chart.hbs @@ -2,18 +2,19 @@

{{title}}

- {{d-icon "question-circle"}} + {{#if help}} + {{d-icon "question-circle" title=help}} + {{/if}}
- {{#if oneDataPoint}} {{chartData.lastObject.y}} {{else}}
- {{total}} + {{number total}} {{#if trendIcon}} {{d-icon trendIcon}} diff --git a/app/assets/javascripts/admin/templates/components/mini-table.hbs b/app/assets/javascripts/admin/templates/components/dashboard-mini-table.hbs similarity index 93% rename from app/assets/javascripts/admin/templates/components/mini-table.hbs rename to app/assets/javascripts/admin/templates/components/dashboard-mini-table.hbs index 4c75f25902e..b7b0bdc61eb 100644 --- a/app/assets/javascripts/admin/templates/components/mini-table.hbs +++ b/app/assets/javascripts/admin/templates/components/dashboard-mini-table.hbs @@ -19,7 +19,7 @@ {{#each dataset as |data|}} - {{data}} + {{number data}} {{/each}} diff --git a/app/assets/javascripts/admin/templates/dashboard_next.hbs b/app/assets/javascripts/admin/templates/dashboard_next.hbs index 4e1c243e60d..a683ba27db8 100644 --- a/app/assets/javascripts/admin/templates/dashboard_next.hbs +++ b/app/assets/javascripts/admin/templates/dashboard_next.hbs @@ -9,15 +9,24 @@
- {{mini-chart dataSourceName="signups" startDate=startDate endDate=endDate}} - {{mini-chart dataSourceName="topics" startDate=startDate endDate=endDate}} + {{dashboard-mini-chart + dataSourceName="signups" + startDate=startDate + endDate=endDate + help="admin.dashboard.charts.signups.help"}} + + {{dashboard-mini-chart + dataSourceName="topics" + startDate=startDate + endDate=endDate + help="admin.dashboard.charts.topics.help"}}
- {{mini-table dataSourceName="users_by_trust_level"}} + {{dashboard-mini-table dataSourceName="users_by_trust_level"}}
diff --git a/app/assets/stylesheets/common/admin/dashboard_next.scss b/app/assets/stylesheets/common/admin/dashboard_next.scss index c0331ea784b..138085885f1 100644 --- a/app/assets/stylesheets/common/admin/dashboard_next.scss +++ b/app/assets/stylesheets/common/admin/dashboard_next.scss @@ -33,7 +33,7 @@ } } - .mini-table { + .dashboard-mini-table { .table-title { align-items: center; display: flex; @@ -75,11 +75,15 @@ justify-content: space-between; flex-wrap: wrap; - .mini-chart { + .dashboard-mini-chart { flex-grow: 1; width: calc(100% * (1/3) - 1px); margin-bottom: 1em; + .d-icon-question-circle { + cursor: pointer; + } + .chart-title { align-items: center; display: flex; @@ -127,7 +131,7 @@ .chart-trend { font-size: $font-up-5; position: absolute; - left: 1.5em; + left: 2em; top: .5em; display: flex; justify-content: space-between; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 0ce42828d3e..592af7dacbf 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2737,6 +2737,12 @@ en: page_views_short: "Pageviews" show_traffic_report: "Show Detailed Traffic Report" + charts: + signups: + help: Users created for this period + topics: + help: Topics created for this period + reports: today: "Today" yesterday: "Yesterday"