diff options
| author | yhirano <yhirano@me.com> | 2017-05-08 10:35:25 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-08 03:35:25 +0200 |
| commit | 48594b18e6285d87ee2f58daa08d356b571c8aa6 (patch) | |
| tree | 58401bb04d522822b1463dd754a9555f1de3d755 /app/views/admin | |
| parent | b18504adfefe521ab1486e1fa04662e9084fbe32 (diff) | |
Added haml-lint and fix warnings (#2773)
* add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/accounts/_card.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/reports/_report.html.haml | 6 | ||||
| -rw-r--r-- | app/views/admin/settings/edit.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/admin/accounts/_card.html.haml b/app/views/admin/accounts/_card.html.haml index 549d10f59..bb33582eb 100644 --- a/app/views/admin/accounts/_card.html.haml +++ b/app/views/admin/accounts/_card.html.haml @@ -6,7 +6,7 @@ %tr %td= t('admin.accounts.show.targeted_reports') %td= link_to pluralize(account.targeted_reports.count, t('admin.accounts.show.report')), admin_reports_path(target_account_id: account.id) - - if account.silenced? or account.suspended? + - if account.silenced? || account.suspended? %tr %td= t('admin.accounts.moderation.title') %td diff --git a/app/views/admin/reports/_report.html.haml b/app/views/admin/reports/_report.html.haml index 2be1f8f2a..d5eb161b9 100644 --- a/app/views/admin/reports/_report.html.haml +++ b/app/views/admin/reports/_report.html.haml @@ -6,15 +6,15 @@ %td.reporter = link_to report.account.acct, admin_account_path(report.account.id) %td.comment - %span{title: report.comment} + %span{ title: report.comment } = truncate(report.comment, length: 30, separator: ' ') %td.stats - unless report.statuses.empty? - %span{title: t('admin.accounts.statuses')} + %span{ title: t('admin.accounts.statuses') } = fa_icon('comment') = report.statuses.count - unless report.media_attachments.empty? - %span{title: t('admin.accounts.media_attachments')} + %span{ title: t('admin.accounts.media_attachments') } = fa_icon('camera') = report.media_attachments.count %td diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index 59a8f53ed..edb69e360 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -5,7 +5,7 @@ %table.table %thead %tr - %th{width: '40%'} + %th{ width: '40%' } = t('admin.settings.setting') %th %tbody |