Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: remove ? from new dashboard 

Link to actual report
This commit is contained in:
Sam 2018-05-14 11:33:36 +10:00
parent 9d97e1244e
commit 5f54b005a1
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/models/report.js.es6
View File

@ -1,13 +1,17 @@
import { ajax } from 'discourse/lib/ajax'; import { ajax } from 'discourse/lib/ajax';
import round from "discourse/lib/round"; import round from "discourse/lib/round";
import { fmt } from 'discourse/lib/computed';
import { fillMissingDates } from 'discourse/lib/utilities'; import { fillMissingDates } from 'discourse/lib/utilities';
import computed from 'ember-addons/ember-computed-decorators'; import computed from 'ember-addons/ember-computed-decorators';
const Report = Discourse.Model.extend({ const Report = Discourse.Model.extend({
average: false, average: false,
reportUrl: fmt("type", "/admin/reports/%@"), @computed("type", "start_date", "end_date")
reportUrl(type, start_date, end_date) {
start_date = moment(start_date).format("YYYY-MM-DD");
end_date = moment(end_date).format("YYYY-MM-DD");
return Discourse.getURL(`/admin/reports/${type}?start_date=${start_date}&end_date=${end_date}`);
},
valueAt(numDaysAgo) { valueAt(numDaysAgo) {
if (this.data) { if (this.data) {

6
app/assets/javascripts/admin/templates/components/dashboard-mini-chart.hbs
View File

@ -1,11 +1,9 @@
{{#conditional-loading-section isLoading=isLoading title=report.title}} {{#conditional-loading-section isLoading=isLoading title=report.title}}
<div class="chart-title"> <div class="chart-title">
<h3 title={{report.description}}> <h3 title={{report.description}}>
<a href="{{report.reportUrl}}">
{{report.title}} {{report.title}}
</a>
{{#if report.description}}
{{d-icon "question-circle"}}
{{/if}}
</h3> </h3>
<div class="chart-trend {{trend}}"> <div class="chart-trend {{trend}}">

3
app/assets/stylesheets/common/admin/dashboard_next.scss
View File

@ -182,6 +182,9 @@
h3 { h3 {
margin: 1em 0; margin: 1em 0;
a, a:visited {
color: $primary;
}
} }
} }