-
Notifications
You must be signed in to change notification settings - Fork 105
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
refresh admin-panel #603
refresh admin-panel #603
Changes from 3 commits
c33496d
b08f3da
481b607
19468b1
21e73d8
f0c3558
04d4ce9
e3a8342
7031843
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,13 @@ | ||
.nested-fields.mb-3 | ||
.row | ||
.col-md-1 | ||
= link_to_remove_association f, class: 'btn btn-xs btn-warning' do | ||
= t('.remove_field') | ||
.col-md-7 | ||
= f.association :career_step, collection: @steps, hint: t('.step') | ||
.col-md-2 | ||
= f.input :order, hint: t('.order') | ||
.col-sm-1 | ||
= link_to_remove_association f, class: 'btn btn-xs btn-warning', title: t('.remove_field') do | ||
span.bi.bi-trash3-fill | ||
- if f.object.career_step | ||
.col-sm-1 | ||
= link_to edit_admin_career_step_path(@career, f.object.career_step), class: 'btn btn-outline-primary me-1', title: t('.edit') do | ||
span.bi.bi-gear-fill | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. если посчитать - стало 11 колонок, а не 12 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,10 +7,14 @@ table.table | |
tr | ||
th = han('career/step', 'name') | ||
th = han('career/step', 'created_at') | ||
th = t('.action') | ||
th = t('actions') | ||
tbody | ||
- steps.each do |step| | ||
tr | ||
td = link_to step.name, admin_career_step_path(career, step), class: 'text-decoration-none' | ||
td = l step.created_at, format: :long | ||
td = link_to t('.edit'), edit_admin_career_step_path(career, step), class: 'btn btn-primary' | ||
td | ||
= link_to admin_career_step_path(career, step), class: 'btn btn-outline-primary btn-sm me-1' do | ||
span.bi.bi-eye-fill | ||
= link_to edit_admin_career_step_path(career, step), class: 'btn btn-outline-primary btn-sm me-1', title: t('.edit') do | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. тут me-1 зачем? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
span.bi.bi-gear-fill |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,9 @@ | ||
- content_for :header do | ||
= t('.career_path') | ||
|
||
.row.mb-3 | ||
.col-sm-3 | ||
b = han('career', 'name') | ||
.col-sm-9 | ||
= @career.name | ||
= t('.career_track', name: @career.name) | ||
.coll | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. это что за класс такой? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. да хз, удалить наверное забыл |
||
= link_to edit_admin_career_path(@career), class: 'btn btn-primary mb-2' do | ||
span.bi.bi-gear.me-2 | ||
= t('.edit') | ||
|
||
.row.mb-3 | ||
.col-sm-3 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,18 @@ | ||
- content_for :header do | ||
= t('.admins') | ||
|
||
table.table | ||
thead | ||
tr | ||
th = sort_link(@q, 'name') | ||
th = sort_link(@q, 'state') | ||
th = sort_link(@q, 'email') | ||
th = sort_link(@q, 'created_at') | ||
th = t('actions') | ||
tbody | ||
- @admins.each do |admin| | ||
tr | ||
td = link_to admin, user_path(admin) | ||
td = admin.aasm(:state).human_state | ||
td = admin.email | ||
td = l admin.created_at, format: :short | ||
td | ||
= link_to user_path(admin), class: 'btn btn-outline-primary' do | ||
span.bi.bi-eye-fill | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. давай тоже маленькими |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ table.table | |
th = sort_link(@q, 'user') | ||
th = sort_link(@q, 'email') | ||
th = sort_link(@q, 'created_at') | ||
th = t('.action') | ||
th = t('actions') | ||
tbody | ||
- @resumes.each do |resume| | ||
tr | ||
|
@@ -27,9 +27,16 @@ table.table | |
td = resume.user.email | ||
td = l resume.created_at, format: :short | ||
td | ||
- if resume.may_restore? | ||
= link_to t('.restore'), restore_admin_resume_path(resume), method: :patch, class: 'btn btn-success btn-sm' | ||
- elsif resume.may_archive? | ||
= link_to t('.archive'), archive_admin_resume_path(resume), method: :patch, class: 'btn btn-danger btn-sm' | ||
.text-center | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. какая-то несогласованность, нигде этого нет, а тут есть |
||
= link_to resume_path(resume), class: 'btn btn-outline-primary btn-sm me-1' do | ||
span.bi.bi-eye-fill | ||
= link_to edit_admin_resume_path(resume), class: 'btn btn-outline-primary btn-sm me-1', title: t('.edit') do | ||
span.bi.bi-gear-fill | ||
- if resume.may_restore? | ||
= link_to restore_admin_resume_path(resume), method: :patch, class: 'btn btn-outline-primary btn-sm', data: { confirm: t('confirm') }, title: t('.restore') do | ||
span.bi.bi-activity | ||
- elsif resume.may_archive? | ||
= link_to archive_admin_resume_path(resume), method: :patch, class: 'btn btn-outline-primary btn-sm', data: { confirm: t('confirm') }, title: t('.archive') do | ||
span.bi.bi-file-earmark-zip | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. опасные кнопки, а цвета у них одинаковые и я бы confirm cделал попонятнее, типа согласны архивировать\заархивировать There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. иконка непонятная, давай поищем получше, для удаления можно корзину взять |
||
|
||
= paginate @resumes |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
ru: | ||
actions: Действия | ||
career: Карьерный трек | ||
steps: Шаг карьерного трека | ||
months_nominative_case: | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
лучше наверное красным? но хз
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
наверное вроде как по ярче смотрится