summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorSasha Sorokin <dafri.nochiterov8@gmail.com>2020-01-11 08:14:45 +0700
committerEugen Rochko <eugen@zeonfederated.com>2020-01-11 02:14:45 +0100
commit36426ed4ad450320f4a4e598c41355a6d8faad66 (patch)
tree6147b29c13f01608f4b5e2ec35a4d7a75e5907d5 /app/views
parent630b5136ec0c533154947bb3c410db63cd76426c (diff)
Use heading actions and placeholders in settings (#12801)
This commit: - Refactors centered text blocks currently used for placeholders for empty tables and puts styles for it in separate class - .centered-text, simply aliasing text-align: center. Which is furtherly used in this commit. - Improves applications settings page to use heading actions, moving "New application" button there, and displaying placeholder "You have no applications" in place of empty table. - Improves custom emoji settings page to use heading action for "Upload" button, making it more easily accessible without need to scroll through all of the emojis. - Improves email domain blocks settings page, moving "Add new" to the heading actions and using placeholder "No e-mail domains currently blacklisted" instead of showing empty table.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/custom_emojis/index.html.haml6
-rw-r--r--app/views/admin/email_domain_blocks/index.html.haml23
-rw-r--r--app/views/filters/index.html.haml3
-rw-r--r--app/views/settings/applications/index.html.haml33
4 files changed, 37 insertions, 28 deletions
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index 7320ce1bbda..389e9dd7190 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -4,6 +4,9 @@
- content_for :header_tags do
= javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+- content_for :heading_actions do
+ = link_to t('admin.custom_emojis.upload'), new_admin_custom_emoji_path, class: 'button'
+
.filters
.filter-subset
%strong= t('admin.accounts.location.title')
@@ -81,6 +84,3 @@
= paginate @custom_emojis
-%hr.spacer/
-
-= link_to t('admin.custom_emojis.upload'), new_admin_custom_emoji_path, class: 'button'
diff --git a/app/views/admin/email_domain_blocks/index.html.haml b/app/views/admin/email_domain_blocks/index.html.haml
index 7bb204e5290..c1cc470b64c 100644
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@@ -1,14 +1,19 @@
- content_for :page_title do
= t('admin.email_domain_blocks.title')
-.table-wrapper
- %table.table
- %thead
- %tr
- %th= t('admin.email_domain_blocks.domain')
- %th
- %tbody
- = render @email_domain_blocks
+- content_for :heading_actions do
+ = link_to t('admin.email_domain_blocks.add_new'), new_admin_email_domain_block_path, class: 'button'
+
+- if @email_domain_blocks.count == 0
+ %div.muted-hint.center-text=t 'admin.email_domain_blocks.empty'
+- else
+ .table-wrapper
+ %table.table
+ %thead
+ %tr
+ %th= t('admin.email_domain_blocks.domain')
+ %th
+ %tbody
+ = render @email_domain_blocks
= paginate @email_domain_blocks
-= link_to t('admin.email_domain_blocks.add_new'), new_admin_email_domain_block_path, class: 'button'
diff --git a/app/views/filters/index.html.haml b/app/views/filters/index.html.haml
index 2f7d96f968f..8ace638ca3a 100644
--- a/app/views/filters/index.html.haml
+++ b/app/views/filters/index.html.haml
@@ -5,8 +5,7 @@
= link_to t('filters.new.title'), new_filter_path, class: 'button'
- if @filters.count == 0
- %div{ style: 'display: flex; justify-content: center' }
- %div.muted-hint= t 'filters.index.empty'
+ %div.muted-hint.center-text= t 'filters.index.empty'
- else
.table-wrapper
%table.table
diff --git a/app/views/settings/applications/index.html.haml b/app/views/settings/applications/index.html.haml
index 919472c2e8b..1cb94760fb8 100644
--- a/app/views/settings/applications/index.html.haml
+++ b/app/views/settings/applications/index.html.haml
@@ -1,20 +1,25 @@
- content_for :page_title do
= t('doorkeeper.applications.index.title')
-.table-wrapper
- %table.table
- %thead
- %tr
- %th= t('doorkeeper.applications.index.application')
- %th= t('doorkeeper.applications.index.scopes')
- %th
- %tbody
- - @applications.each do |application|
+- content_for :heading_actions do
+ = link_to t('doorkeeper.applications.index.new'), new_settings_application_path, class: 'button'
+
+- if @applications.count == 0
+ %div.muted-hint.center-text=t 'doorkeeper.applications.index.empty'
+- else
+ .table-wrapper
+ %table.table
+ %thead
%tr
- %td= link_to application.name, settings_application_path(application)
- %th= application.scopes
- %td
- = table_link_to 'times', t('doorkeeper.applications.index.delete'), settings_application_path(application), method: :delete, data: { confirm: t('doorkeeper.applications.confirmations.destroy') }
+ %th= t('doorkeeper.applications.index.application')
+ %th= t('doorkeeper.applications.index.scopes')
+ %th
+ %tbody
+ - @applications.each do |application|
+ %tr
+ %td= link_to application.name, settings_application_path(application)
+ %th= application.scopes
+ %td
+ = table_link_to 'times', t('doorkeeper.applications.index.delete'), settings_application_path(application), method: :delete, data: { confirm: t('doorkeeper.applications.confirmations.destroy') }
= paginate @applications
-= link_to t('doorkeeper.applications.index.new'), new_settings_application_path, class: 'button'