diff --git a/app/assets/javascripts/admin/models/report.js b/app/assets/javascripts/admin/models/report.js index 939ce780f..254f18c79 100644 --- a/app/assets/javascripts/admin/models/report.js +++ b/app/assets/javascripts/admin/models/report.js @@ -87,7 +87,18 @@ Discourse.Report = Discourse.Model.extend({ } } return 'no-change'; - }.property('data', 'prev30Days') + }.property('data', 'prev30Days'), + + icon: function() { + switch( this.get('type') ) { + case 'flags': + return 'icon-flag'; + case 'likes': + return 'icon-heart'; + default: + return null; + } + }.property('type') }); Discourse.Report.reopenClass({ diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars index f4e12f4ef..0e9a3853b 100644 --- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars +++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars @@ -138,7 +138,7 @@
+ | {{i18n admin.dashboard.private_messages_short}} | {{i18n admin.dashboard.reports.today}} | {{i18n admin.dashboard.reports.yesterday}} | {{i18n admin.dashboard.reports.last_7_days}} | diff --git a/app/assets/javascripts/admin/templates/reports/summed_counts_report.js.handlebars b/app/assets/javascripts/admin/templates/reports/summed_counts_report.js.handlebars index 9cf065c1e..9978c8d6e 100644 --- a/app/assets/javascripts/admin/templates/reports/summed_counts_report.js.handlebars +++ b/app/assets/javascripts/admin/templates/reports/summed_counts_report.js.handlebars @@ -1,5 +1,10 @@
---|---|---|---|---|
{{title}} | ++ {{#if icon}} + + {{/if}} + {{title}} + | {{todayCount}} | {{yesterdayCount}} | {{lastSevenDaysCount}} | diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss index 31565b242..d832ea274 100644 --- a/app/assets/stylesheets/admin/admin_base.scss +++ b/app/assets/stylesheets/admin/admin_base.scss @@ -339,6 +339,15 @@ table { width: 460px; margin-left: 30px; + h4 { + font-weight: normal; + margin-bottom: 8px; + } + + i.icon { + color: #444; + } + table { width: 100%; @@ -346,6 +355,9 @@ table { font-weight: normal; text-align: center; } + th.title { + text-align: left; + } thead { tr:hover > td, tr:hover > th { diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 6ed179878..18c699eb9 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -824,6 +824,8 @@ en: no_problems: "No problems were found." moderators: 'Moderators:' admins: 'Admins:' + private_messages_short: "PMs" + private_messages_title: "Private Messages" reports: today: "Today" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 92921a1ec..bd51bdbde 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -306,23 +306,23 @@ en: xaxis: "Day" yaxis: "Number of Emails" user_to_user_private_messages: - title: "User-to-User Messages" + title: "User-to-User" xaxis: "Day" yaxis: "Number of private messages" system_private_messages: - title: "System Messages" + title: "System" xaxis: "Day" yaxis: "Number of private messages" moderator_warning_private_messages: - title: "Moderator Warning Messages" + title: "Moderator Warning" xaxis: "Day" yaxis: "Number of private messages" notify_moderators_private_messages: - title: "Notify Moderators Messages" + title: "Notify Moderators" xaxis: "Day" yaxis: "Number of private messages" notify_user_private_messages: - title: "Nofity User Messages" + title: "Nofity User" xaxis: "Day" yaxis: "Number of private messages"