IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 10:20:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: improves report-show mobile UI (#6229)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-08-01 19:54:27 -04:00 committed by GitHub
parent 859c98743f
commit 60f62f6f36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/templates/components/admin-report.hbs
View File

@ -68,13 +68,13 @@
{{else}} {{else}}
<div class="alert alert-info no-data"> <div class="alert alert-info no-data">
{{d-icon "pie-chart"}} {{d-icon "pie-chart"}}
{{i18n 'admin.dashboard.reports.no_data'}} <span>{{i18n 'admin.dashboard.reports.no_data'}}</span>
</div> </div>
{{/if}} {{/if}}
{{else}} {{else}}
{{#if showTimeoutError}} {{#if showTimeoutError}}
<div class="alert alert-error report-error timeout"> <div class="alert alert-error report-error timeout">
{{i18n "admin.dashboard.timeout_error"}} <span>{{i18n "admin.dashboard.timeout_error"}}</span>
</div> </div>
{{/if}} {{/if}}

18
app/assets/javascripts/admin/templates/reports-show.hbs
View File

@ -1,11 +1,7 @@
<div class="report-container"> {{admin-report
<div class="visualization"> showAllReportsLink=true
{{admin-report dataSourceName=model.type
showAllReportsLink=true filters=filters
dataSourceName=model.type reportOptions=reportOptions
filters=filters showFilteringUI=true
reportOptions=reportOptions onRefresh=(action "onParamsChange")}}
showFilteringUI=true
onRefresh=(action "onParamsChange")}}
</div>
</div>

6
app/assets/stylesheets/common/admin/admin_report.scss
View File

@ -6,6 +6,7 @@
align-self: flex-start; align-self: flex-start;
text-align: center; text-align: center;
padding: 3em; padding: 3em;
box-sizing: border-box;
} }
.report-error { .report-error {
@ -26,8 +27,9 @@
} }
} }
.conditional-loading-section { .conditional-loading-section.is-loading {
width: 100%; flex: 1;
margin: 0.5em 0;
} }
.report-header { .report-header {

1
app/assets/stylesheets/mobile.scss
View File

@ -22,6 +22,7 @@
@import "mobile/ring"; @import "mobile/ring";
@import "mobile/group"; @import "mobile/group";
@import "mobile/groups"; @import "mobile/groups";
@import "mobile/admin_reports";
@import "mobile/admin_report"; @import "mobile/admin_report";
@import "mobile/admin_report_table"; @import "mobile/admin_report_table";

24
app/assets/stylesheets/mobile/admin_reports.scss Normal file
View File

@ -0,0 +1,24 @@
.admin-reports {
.admin-report {
.report-body {
flex-direction: column;
.report-filters {
order: 0;
margin: 0;
}
.alert {
margin: 0;
order: 1;
flex: 1;
padding: 1em;
}
.admin-report-table,
.admin-report-chart {
order: 2;
}
}
}
}