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

UX: Display large numbers with delimiters.

This commit is contained in:
Guo Xiang Tan 2017-01-09 15:54:31 +08:00
parent 00bd782dad
commit cbc6aee137
7 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,19 @@
{{/if}} {{/if}}
<a href="{{report.reportUrl}}">{{report.title}}</a> <a href="{{report.reportUrl}}">{{report.title}}</a>
</td> </td>
<td class="value">{{report.todayCount}}</td>
<td class="value {{report.yesterdayTrend}}" title={{report.yesterdayCountTitle}}>{{report.yesterdayCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}</td> <td class="value">{{number report.todayCount}}</td>
<td class="value {{report.sevenDayTrend}}" title={{report.sevenDayCountTitle}}>{{report.lastSevenDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}</td>
<td class="value {{report.thirtyDayTrend}}" title={{report.thirtyDayCountTitle}}>{{report.lastThirtyDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}</td> <td class="value {{report.yesterdayTrend}}" title={{report.yesterdayCountTitle}}>
<td class="value">{{report.total}}</td> {{number report.yesterdayCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
</td>
<td class="value {{report.sevenDayTrend}}" title={{number report.sevenDayCountTitle}}>
{{number report.lastSevenDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
</td>
<td class="value {{report.thirtyDayTrend}}" title={{number report.thirtyDayCountTitle}}>
{{number report.lastThirtyDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
</td>
<td class="value">{{number report.total}}</td>

10
app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
View File

@ -1,6 +1,6 @@
<td class="title">{{report.title}}</td> <td class="title">{{report.title}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'newuser'}}{{value-at-tl report.data level="0"}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'newuser'}}{{number (value-at-tl report.data level="0")}}{{/link-to}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'basic'}}{{value-at-tl report.data level="1"}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'basic'}}{{number (value-at-tl report.data level="1")}}{{/link-to}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'member'}}{{value-at-tl report.data level="2"}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'member'}}{{number (value-at-tl report.data level="2")}}{{/link-to}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'regular'}}{{value-at-tl report.data level="3"}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'regular'}}{{number (value-at-tl report.data level="3")}}{{/link-to}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'leader'}}{{value-at-tl report.data level="4"}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'leader'}}{{number (value-at-tl report.data level="4")}}{{/link-to}}</td>

14
app/assets/javascripts/admin/templates/dashboard.hbs
View File

@ -228,7 +228,7 @@
</div> </div>
</div> </div>
</td> </td>
<td class="value">{{data.num_clicks}}</td> <td class="value">{{number data.num_clicks}}</td>
</tr> </tr>
</tbody> </tbody>
{{/each}} {{/each}}
@ -248,8 +248,8 @@
<tbody> <tbody>
<tr> <tr>
<td class="title">{{s.domain}}</td> <td class="title">{{s.domain}}</td>
<td class="value">{{s.num_clicks}}</td> <td class="value">{{number s.num_clicks}}</td>
<td class="value">{{s.num_topics}}</td> <td class="value">{{number s.num_topics}}</td>
</tr> </tr>
</tbody> </tbody>
{{/each}} {{/each}}
@ -261,16 +261,16 @@
<thead> <thead>
<tr> <tr>
<th class="title">{{top_referrers.title}} ({{i18n 'admin.dashboard.reports.last_30_days'}})</th> <th class="title">{{top_referrers.title}} ({{i18n 'admin.dashboard.reports.last_30_days'}})</th>
<th>{{top_referrers.ytitles.num_clicks}}</th> <th>{{number top_referrers.ytitles.num_clicks}}</th>
<th>{{top_referrers.ytitles.num_topics}}</th> <th>{{number top_referrers.ytitles.num_topics}}</th>
</tr> </tr>
</thead> </thead>
{{#each top_referrers.data as |r|}} {{#each top_referrers.data as |r|}}
<tbody> <tbody>
<tr> <tr>
<td class="title">{{#link-to 'adminUser' r.user_id r.username}}{{unbound r.username}}{{/link-to}}</td> <td class="title">{{#link-to 'adminUser' r.user_id r.username}}{{unbound r.username}}{{/link-to}}</td>
<td class="value">{{r.num_clicks}}</td> <td class="value">{{number r.num_clicks}}</td>
<td class="value">{{r.num_topics}}</td> <td class="value">{{number r.num_topics}}</td>
</tr> </tr>
</tbody> </tbody>
{{/each}} {{/each}}

2
app/assets/javascripts/admin/templates/groups-type.hbs
View File

@ -6,7 +6,7 @@
<li> <li>
{{#link-to "adminGroup" group.type group.name}}{{group.name}} {{#link-to "adminGroup" group.type group.name}}{{group.name}}
{{#if group.userCountDisplay}} {{#if group.userCountDisplay}}
<span class="count">{{group.userCountDisplay}}</span> <span class="count">{{number group.userCountDisplay}}</span>
{{/if}} {{/if}}
{{/link-to}} {{/link-to}}
</li> </li>

4
app/assets/javascripts/admin/templates/users-list-show.hbs
View File

@ -55,8 +55,8 @@
<td class='email'>{{unbound user.email}}</td> <td class='email'>{{unbound user.email}}</td>
<td>{{{unbound user.last_emailed_age}}}</td> <td>{{{unbound user.last_emailed_age}}}</td>
<td>{{{unbound user.last_seen_age}}}</td> <td>{{{unbound user.last_seen_age}}}</td>
<td>{{{unbound user.topics_entered}}}</td> <td>{{number user.topics_entered}}</td>
<td>{{{unbound user.posts_read_count}}}</td> <td>{{number user.posts_read_count}}</td>
<td>{{{unbound user.time_read}}}</td> <td>{{{unbound user.time_read}}}</td>
<td>{{{unbound user.created_at_age}}}</td> <td>{{{unbound user.created_at_age}}}</td>

4
app/assets/javascripts/discourse/helpers/application.js.es6
View File

@ -11,9 +11,9 @@ registerUnbound('number', (orig, params) => {
orig = parseInt(orig, 10); orig = parseInt(orig, 10);
if (isNaN(orig)) { orig = 0; } if (isNaN(orig)) { orig = 0; }
let title = orig; let title = I18n.toNumber(orig, { precision: 0 });
if (params.numberKey) { if (params.numberKey) {
title = I18n.t(params.numberKey, { number: orig }); title = I18n.t(params.numberKey, { number: title });
} }
let classNames = 'number'; let classNames = 'number';

4
config/locales/client.en.yml
View File

@ -2081,7 +2081,9 @@ en:
one: "view" one: "view"
other: "views" other: "views"
replies: "Replies" replies: "Replies"
views_long: "this topic has been viewed {{number}} times" views_long:
one: "this topic has been viewed 1 time"
other: "this topic has been viewed {{number}} times"
activity: "Activity" activity: "Activity"
likes: "Likes" likes: "Likes"
likes_lowercase: likes_lowercase: