diff --git a/ghost/admin/app/components/dashboard/dashboard-v5.hbs b/ghost/admin/app/components/dashboard/dashboard-v5.hbs index 96cc0c55a8..80df21eb67 100644 --- a/ghost/admin/app/components/dashboard/dashboard-v5.hbs +++ b/ghost/admin/app/components/dashboard/dashboard-v5.hbs @@ -4,11 +4,11 @@ {{else}} {{#if this.areMembersEnabled}} -
+
-
+
-
- -
+
+
+ +
- {{#if this.hasPaidTiers}} -
-
-
- -
+ {{#if this.hasPaidTiers}} +
+ +
-
- -
-
-
+
+ +
-
-
-
- -
+
+ +
-
- -
-
-
- {{/if}} +
+ +
+ {{/if}} +
-
+
{{/if}} {{#if this.areNewslettersEnabled}} -
- +
+
{{/if}} -
+

Recent posts

-
+
Recent posts
-
+

Activity

-
+

Resources

-
+
diff --git a/ghost/admin/app/components/dashboard/v5/chart-email-open-rate.hbs b/ghost/admin/app/components/dashboard/v5/chart-email-open-rate.hbs deleted file mode 100644 index 404f6453a0..0000000000 --- a/ghost/admin/app/components/dashboard/v5/chart-email-open-rate.hbs +++ /dev/null @@ -1,29 +0,0 @@ -

Email

- -
-
-
-
{{this.dataSubscribers}}
-
Newsletter subscribers
-
- -
-
{{this.dataEmailsSent}}
-
Emails sent in the past 30 days
-
-
- -
-

Email open rate

- {{#if this.loading}} -
- {{else}} - - {{/if}} -
-
- diff --git a/ghost/admin/app/components/dashboard/v5/chart-email.hbs b/ghost/admin/app/components/dashboard/v5/chart-email.hbs new file mode 100644 index 0000000000..3d2b46969e --- /dev/null +++ b/ghost/admin/app/components/dashboard/v5/chart-email.hbs @@ -0,0 +1,28 @@ +

Email

+
+
+

Newsletter subscribers

+
{{this.dataSubscribers}}
+
+2.2%
+
+ +
+

Emails sent in the past 30 days

+
{{this.dataEmailsSent}}
+
+2.2%
+
+ +
+

Email open rate

+ {{#if this.loading}} +
+ {{else}} + + {{/if}} +
+
+ diff --git a/ghost/admin/app/components/dashboard/v5/chart-email-open-rate.js b/ghost/admin/app/components/dashboard/v5/chart-email.js similarity index 98% rename from ghost/admin/app/components/dashboard/v5/chart-email-open-rate.js rename to ghost/admin/app/components/dashboard/v5/chart-email.js index bf74a5c56c..c75a8feeed 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-email-open-rate.js +++ b/ghost/admin/app/components/dashboard/v5/chart-email.js @@ -64,6 +64,6 @@ export default class ChartEmailOpenRate extends Component { } get chartHeight() { - return 150; + return 100; } } diff --git a/ghost/admin/app/components/dashboard/v5/chart-engagement.hbs b/ghost/admin/app/components/dashboard/v5/chart-engagement.hbs index a4992b02d4..a1a2991a72 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-engagement.hbs +++ b/ghost/admin/app/components/dashboard/v5/chart-engagement.hbs @@ -16,14 +16,16 @@
-
-
-
{{this.data30Days}}
-
Engaged in past 30 days
+
+
+

Engaged in past 30 days

+
{{this.data30Days}}
+
+2.2%
-
-
{{this.data7Days}}
-
Engaged in past 7 days
+
+

Engaged in past 7 days

+
{{this.data7Days}}
+
-1.1%
\ No newline at end of file diff --git a/ghost/admin/app/components/dashboard/v5/chart-members-counts.hbs b/ghost/admin/app/components/dashboard/v5/chart-members-counts.hbs index aa26b845d2..3bbc18cf52 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-members-counts.hbs +++ b/ghost/admin/app/components/dashboard/v5/chart-members-counts.hbs @@ -1,16 +1,18 @@ -
-
-
{{format-number this.totalMembers}}
-
{{gh-pluralize this.totalMembers "Total member" without-count=true}}
+

Overview

+
+
+

{{gh-pluralize this.totalMembers "Total member" without-count=true}}

+
{{format-number this.totalMembers}}
+
+2.2%
- -
-
{{format-number this.paidMembers}}
-
{{gh-pluralize this.paidMembers "Paid member" without-count=true}}
+
+

{{gh-pluralize this.paidMembers "Paid member" without-count=true}}

+
{{format-number this.paidMembers}}
+
+3.3%
- -
-
{{format-number this.freeMembers}}
-
{{gh-pluralize this.freeMembers "Free member" without-count=true}}
+
+

{{gh-pluralize this.freeMembers "Free member" without-count=true}}

+
{{format-number this.freeMembers}}
+
-1.1%
\ No newline at end of file diff --git a/ghost/admin/app/components/dashboard/v5/chart-monthly-revenue.hbs b/ghost/admin/app/components/dashboard/v5/chart-monthly-revenue.hbs index f0b48a4c9a..9fbdd0217a 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-monthly-revenue.hbs +++ b/ghost/admin/app/components/dashboard/v5/chart-monthly-revenue.hbs @@ -1,6 +1,6 @@ -

MRR

+

Monthly revenue (MMR)

{{#if this.loading}} -
+
{{else}} Paid members +

Paid members

{{#if this.loading}} -
+
{{else}}
-

Paid mix

+

Paid mix

{{#if this.loading}} -
+
{{else}} Total members +

Total members

{{#if this.loading}} -
+
{{else}} Total paid +

Total paid

{{#if this.loading}} -
+
{{else}}