From 854d1dd032b71dc1ace2d967a9305ad427f45b05 Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Tue, 5 May 2020 16:52:01 +0200 Subject: [PATCH] Improve form filter style --- app/assets/stylesheets/forms.css.scss | 4 +++- app/views/exercises/index.html.slim | 13 +++++++------ app/views/internal_users/index.html.slim | 19 ++++++++++--------- app/views/proxy_exercises/index.html.slim | 7 ++++--- .../request_for_comments/index.html.slim | 13 +++++++------ app/views/study_groups/index.html.slim | 13 +++++++------ app/views/submissions/index.html.slim | 13 +++++++------ 7 files changed, 45 insertions(+), 37 deletions(-) diff --git a/app/assets/stylesheets/forms.css.scss b/app/assets/stylesheets/forms.css.scss index c94a27e1..fc7dd6d0 100644 --- a/app/assets/stylesheets/forms.css.scss +++ b/app/assets/stylesheets/forms.css.scss @@ -12,9 +12,11 @@ } .filter-form { - .form-group { + .row:not(:last-child) { margin-bottom: 1em; + } + .form-group { &:not(:last-child) { margin-right: 1em; } diff --git a/app/views/exercises/index.html.slim b/app/views/exercises/index.html.slim index c6dbc8f4..337eebab 100644 --- a/app/views/exercises/index.html.slim +++ b/app/views/exercises/index.html.slim @@ -1,12 +1,13 @@ h1 = Exercise.model_name.human(count: 2) = render(layout: 'shared/form_filters') do |f| - .form-group - = f.label(:execution_environment_id_eq, t('activerecord.attributes.exercise.execution_environment'), class: 'sr-only') - = f.collection_select(:execution_environment_id_eq, ExecutionEnvironment.with_exercises, :id, :name, class: 'form-control', prompt: t('activerecord.attributes.exercise.execution_environment')) - .form-group - = f.label(:title_cont, t('activerecord.attributes.exercise.title'), class: 'sr-only') - = f.search_field(:title_cont, class: 'form-control', placeholder: t('activerecord.attributes.exercise.title')) + .row.px-3 + .form-group + = f.label(:execution_environment_id_eq, t('activerecord.attributes.exercise.execution_environment'), class: 'sr-only') + = f.collection_select(:execution_environment_id_eq, ExecutionEnvironment.with_exercises, :id, :name, class: 'form-control', prompt: t('activerecord.attributes.exercise.execution_environment')) + .form-group + = f.label(:title_cont, t('activerecord.attributes.exercise.title'), class: 'sr-only') + = f.search_field(:title_cont, class: 'form-control', placeholder: t('activerecord.attributes.exercise.title')) .table-responsive table.table.mt-4 diff --git a/app/views/internal_users/index.html.slim b/app/views/internal_users/index.html.slim index 59c23f70..a1b338d9 100644 --- a/app/views/internal_users/index.html.slim +++ b/app/views/internal_users/index.html.slim @@ -1,15 +1,16 @@ h1 = InternalUser.model_name.human(count: 2) = render(layout: 'shared/form_filters') do |f| - .form-group - = f.label(:consumer_id_eq, t('activerecord.attributes.internal_user.consumer'), class: 'sr-only') - = f.collection_select(:consumer_id_eq, Consumer.with_internal_users, :id, :name, class: 'form-control', prompt: t('activerecord.attributes.internal_user.consumer')) - .form-group - = f.label(:email_cont, t('activerecord.attributes.internal_user.email'), class: 'sr-only') - = f.search_field(:email_cont, class: 'form-control', placeholder: t('activerecord.attributes.internal_user.email')) - .form-group - = f.label(:role_eq, t('activerecord.attributes.internal_user.role'), class: 'sr-only') - = f.select(:role_eq, User::ROLES.map { |role| [t("users.roles.#{role}"), role] }, {}, class: 'form-control', prompt: t('activerecord.attributes.internal_user.role')) + .row.px-3 + .form-group + = f.label(:consumer_id_eq, t('activerecord.attributes.internal_user.consumer'), class: 'sr-only') + = f.collection_select(:consumer_id_eq, Consumer.with_internal_users, :id, :name, class: 'form-control', prompt: t('activerecord.attributes.internal_user.consumer')) + .form-group + = f.label(:email_cont, t('activerecord.attributes.internal_user.email'), class: 'sr-only') + = f.search_field(:email_cont, class: 'form-control', placeholder: t('activerecord.attributes.internal_user.email')) + .form-group + = f.label(:role_eq, t('activerecord.attributes.internal_user.role'), class: 'sr-only') + = f.select(:role_eq, User::ROLES.map { |role| [t("users.roles.#{role}"), role] }, {}, class: 'form-control', prompt: t('activerecord.attributes.internal_user.role')) .table-responsive table.table.mt-4 diff --git a/app/views/proxy_exercises/index.html.slim b/app/views/proxy_exercises/index.html.slim index af569e4e..b4fe7acc 100644 --- a/app/views/proxy_exercises/index.html.slim +++ b/app/views/proxy_exercises/index.html.slim @@ -1,9 +1,10 @@ h1 = ProxyExercise.model_name.human(count: 2) = render(layout: 'shared/form_filters') do |f| - .form-group - = f.label(:title_cont, t('activerecord.attributes.proxy_exercise.title'), class: 'sr-only') - = f.search_field(:title_cont, class: 'form-control', placeholder: t('activerecord.attributes.proxy_exercise.title')) + .row.px-3 + .form-group + = f.label(:title_cont, t('activerecord.attributes.proxy_exercise.title'), class: 'sr-only') + = f.search_field(:title_cont, class: 'form-control', placeholder: t('activerecord.attributes.proxy_exercise.title')) .table-responsive table.table.mt-4 diff --git a/app/views/request_for_comments/index.html.slim b/app/views/request_for_comments/index.html.slim index a91b0de8..93d3052c 100644 --- a/app/views/request_for_comments/index.html.slim +++ b/app/views/request_for_comments/index.html.slim @@ -1,12 +1,13 @@ h1 = RequestForComment.model_name.human(count: 2) = render(layout: 'shared/form_filters') do |f| - .form-group - = f.label(:exercise_title_cont, t('activerecord.attributes.request_for_comments.exercise'), class: 'sr-only') - = f.search_field(:exercise_title_cont, class: 'form-control', placeholder: t('activerecord.attributes.request_for_comments.exercise')) - .form-group - = f.label(:title_cont, t('request_for_comments.solved'), class: 'sr-only') - = f.select(:solved_not_eq, [[t('request_for_comments.show_all'), 2], [t('request_for_comments.show_unsolved'), 1], [t('request_for_comments.show_solved'), 0]]) + .row.px-3 + .form-group + = f.label(:exercise_title_cont, t('activerecord.attributes.request_for_comments.exercise'), class: 'sr-only') + = f.search_field(:exercise_title_cont, class: 'form-control', placeholder: t('activerecord.attributes.request_for_comments.exercise')) + .form-group + = f.label(:title_cont, t('request_for_comments.solved'), class: 'sr-only') + = f.select(:solved_not_eq, [[t('request_for_comments.show_all'), 2], [t('request_for_comments.show_unsolved'), 1], [t('request_for_comments.show_solved'), 0]]) .table-responsive table.table.sortable.mt-4 diff --git a/app/views/study_groups/index.html.slim b/app/views/study_groups/index.html.slim index be9405e3..6b7e07bf 100644 --- a/app/views/study_groups/index.html.slim +++ b/app/views/study_groups/index.html.slim @@ -1,12 +1,13 @@ h1 = StudyGroup.model_name.human(count: 2) = render(layout: 'shared/form_filters') do |f| - .form-group - = f.label(:consumer_id_eq, t('activerecord.attributes.internal_user.consumer'), class: 'sr-only') - = f.collection_select(:consumer_id_eq, Consumer.with_study_groups, :id, :name, class: 'form-control', prompt: t('activerecord.attributes.internal_user.consumer')) - .form-group - = f.label(:name_cont, t('activerecord.attributes.study_group.name'), class: 'sr-only') - = f.search_field(:name_cont, class: 'form-control', placeholder: t('activerecord.attributes.study_group.name')) + .row.px-3 + .form-group + = f.label(:consumer_id_eq, t('activerecord.attributes.internal_user.consumer'), class: 'sr-only') + = f.collection_select(:consumer_id_eq, Consumer.with_study_groups, :id, :name, class: 'form-control', prompt: t('activerecord.attributes.internal_user.consumer')) + .form-group + = f.label(:name_cont, t('activerecord.attributes.study_group.name'), class: 'sr-only') + = f.search_field(:name_cont, class: 'form-control', placeholder: t('activerecord.attributes.study_group.name')) .table-responsive table.table.mt-4 diff --git a/app/views/submissions/index.html.slim b/app/views/submissions/index.html.slim index b37e07eb..cff0eef5 100644 --- a/app/views/submissions/index.html.slim +++ b/app/views/submissions/index.html.slim @@ -1,12 +1,13 @@ h1 = Submission.model_name.human(count: 2) = render(layout: 'shared/form_filters') do |f| - .form-group - = f.label(:exercise_id_eq, t('activerecord.attributes.submission.exercise'), class: 'sr-only') - = f.collection_select(:exercise_id_eq, Exercise.with_submissions, :id, :title, class: 'form-control', prompt: t('activerecord.attributes.submission.exercise')) - .form-group - = f.label(:cause_eq, t('activerecord.attributes.submission.cause'), class: 'sr-only') - = f.select(:cause_eq, Submission.select(:cause).distinct.map(&:cause).sort, class: 'form-control', prompt: t('activerecord.attributes.submission.cause')) + .row.px-3 + .form-group + = f.label(:exercise_id_eq, t('activerecord.attributes.submission.exercise'), class: 'sr-only') + = f.collection_select(:exercise_id_eq, Exercise.with_submissions, :id, :title, class: 'form-control', prompt: t('activerecord.attributes.submission.exercise')) + .form-group + = f.label(:cause_eq, t('activerecord.attributes.submission.cause'), class: 'sr-only') + = f.select(:cause_eq, Submission.select(:cause).distinct.map(&:cause).sort, class: 'form-control', prompt: t('activerecord.attributes.submission.cause')) .table-responsive table.table.mt-4