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

fixes few icons deprecations warnings (#6915)

This commit is contained in:
Joffrey JAFFEUX 2019-01-21 16:56:05 +01:00 committed by GitHub
parent 0cf8f10158
commit a9edcb2e10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 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

@ -69,7 +69,7 @@
</div> </div>
{{else}} {{else}}
<div class="alert alert-info report-alert no-data"> <div class="alert alert-info report-alert no-data">
{{d-icon "pie-chart"}} {{d-icon "chart-pie"}}
{{#if model.reportUrl}} {{#if model.reportUrl}}
<a href="{{model.reportUrl}}" class="report-url"> <a href="{{model.reportUrl}}" class="report-url">
<span> <span>
@ -192,7 +192,7 @@
class="refresh-report-btn btn-primary" class="refresh-report-btn btn-primary"
action=(action "refreshReport") action=(action "refreshReport")
label="admin.dashboard.reports.refresh_report" label="admin.dashboard.reports.refresh_report"
icon="refresh"}} icon="sync"}}
</div> </div>
</div> </div>
{{/if}} {{/if}}

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

@ -26,13 +26,13 @@
<div class="dashboard-stats totals"> <div class="dashboard-stats totals">
<table> <table>
<tr> <tr>
<td class="title">{{d-icon "shield"}} {{i18n 'admin.dashboard.admins'}}</td> <td class="title">{{d-icon "shield-alt"}} {{i18n 'admin.dashboard.admins'}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'admins'}}{{admins}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'admins'}}{{admins}}{{/link-to}}</td>
<td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.suspended'}}</td> <td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.suspended'}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}</td>
</tr> </tr>
<tr> <tr>
<td class="title">{{d-icon "shield"}} {{i18n 'admin.dashboard.moderators'}}</td> <td class="title">{{d-icon "shield-alt"}} {{i18n 'admin.dashboard.moderators'}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'moderators'}}{{moderators}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'moderators'}}{{moderators}}{{/link-to}}</td>
<td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.silenced'}}</td> <td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.silenced'}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'silenced'}}{{silenced}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'silenced'}}{{silenced}}{{/link-to}}</td>

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

@ -95,10 +95,10 @@
{{/if}} {{/if}}
<td class="user-status"> <td class="user-status">
{{#if user.admin}} {{#if user.admin}}
{{d-icon "shield" title="admin.title" }} {{d-icon "shield-alt" title="admin.title" }}
{{/if}} {{/if}}
{{#if user.moderator}} {{#if user.moderator}}
{{d-icon "shield" title="admin.moderator" }} {{d-icon "shield-alt" title="admin.moderator" }}
{{/if}} {{/if}}
{{#if user.second_factor_enabled}} {{#if user.second_factor_enabled}}
{{d-icon "lock" title="admin.user.second_factor_enabled" }} {{d-icon "lock" title="admin.user.second_factor_enabled" }}

2
app/assets/javascripts/discourse/templates/group-index.hbs
View File

@ -41,7 +41,7 @@
<td class='group-owner'> <td class='group-owner'>
{{#if m.owner}} {{#if m.owner}}
<strong class="group-owner-label"> <strong class="group-owner-label">
{{d-icon "shield"}} {{d-icon "shield-alt"}}
</strong> </strong>
{{/if}} {{/if}}
</td> </td>

4
app/models/report.rb
View File

@ -648,10 +648,10 @@ class Report
url = Proc.new { |key| "/admin/users/list/#{key}" } url = Proc.new { |key| "/admin/users/list/#{key}" }
admins = User.real.admins.count admins = User.real.admins.count
report.data << { url: url.call("admins"), icon: "shield", key: "admins", x: label.call("admin"), y: admins } if admins > 0 report.data << { url: url.call("admins"), icon: "shield-alt", key: "admins", x: label.call("admin"), y: admins } if admins > 0
moderators = User.real.moderators.count moderators = User.real.moderators.count
report.data << { url: url.call("moderators"), icon: "shield", key: "moderators", x: label.call("moderator"), y: moderators } if moderators > 0 report.data << { url: url.call("moderators"), icon: "shield-alt", key: "moderators", x: label.call("moderator"), y: moderators } if moderators > 0
suspended = User.real.suspended.count suspended = User.real.suspended.count
report.data << { url: url.call("suspended"), icon: "ban", key: "suspended", x: label.call("suspended"), y: suspended } if suspended > 0 report.data << { url: url.call("suspended"), icon: "ban", key: "suspended", x: label.call("suspended"), y: suspended } if suspended > 0