Add icon to sortable table
This commit is contained in:
@@ -372,6 +372,44 @@ $sidebar-active: #f4fcd0;
|
|||||||
color: $text-medium;
|
color: $text-medium;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.icon-sortable {
|
||||||
|
font-family: "icons";
|
||||||
|
font-size: $small-font-size;
|
||||||
|
padding-right: $line-height / 2;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
&::before,
|
||||||
|
&::after {
|
||||||
|
left: 6px;
|
||||||
|
opacity: 0.25;
|
||||||
|
position: absolute;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::before {
|
||||||
|
content: "\57";
|
||||||
|
top: -2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
content: "\52";
|
||||||
|
bottom: -10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.asc {
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.desc {
|
||||||
|
|
||||||
|
&::before {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 02. Sidebar
|
// 02. Sidebar
|
||||||
// -----------
|
// -----------
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
module BudgetInvestmentsHelper
|
module BudgetInvestmentsHelper
|
||||||
def budget_investments_advanced_filters(params)
|
def budget_investments_advanced_filters(params)
|
||||||
params.map { |af| t("admin.budget_investments.index.filters.#{af}") }.join(', ')
|
params.map { |af| t("admin.budget_investments.index.filters.#{af}") }.join(", ")
|
||||||
end
|
end
|
||||||
|
|
||||||
def link_to_investments_sorted_by(column)
|
def link_to_investments_sorted_by(column)
|
||||||
@@ -10,7 +10,7 @@ module BudgetInvestmentsHelper
|
|||||||
translation = t("admin.budget_investments.index.list.#{column}")
|
translation = t("admin.budget_investments.index.list.#{column}")
|
||||||
|
|
||||||
link_to(
|
link_to(
|
||||||
"#{translation} <span class='#{icon}'></span>".html_safe,
|
"#{translation} <span class='icon-sortable #{icon}'></span>".html_safe,
|
||||||
admin_budget_budget_investments_path(sort_by: column, direction: direction)
|
admin_budget_budget_investments_path(sort_by: column, direction: direction)
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
@@ -18,9 +18,9 @@ module BudgetInvestmentsHelper
|
|||||||
def set_sorting_icon(direction, sort_by)
|
def set_sorting_icon(direction, sort_by)
|
||||||
if sort_by.to_s == params[:sort_by]
|
if sort_by.to_s == params[:sort_by]
|
||||||
if direction == "desc"
|
if direction == "desc"
|
||||||
"icon-arrow-top"
|
"desc"
|
||||||
else
|
else
|
||||||
"icon-arrow-down"
|
"asc"
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
""
|
""
|
||||||
|
|||||||
@@ -641,7 +641,7 @@ feature 'Admin budget investments' do
|
|||||||
expect('B First Investment').to appear_before('A Second Investment')
|
expect('B First Investment').to appear_before('A Second Investment')
|
||||||
expect('A Second Investment').to appear_before('C Third Investment')
|
expect('A Second Investment').to appear_before('C Third Investment')
|
||||||
within('th', text: 'ID') do
|
within('th', text: 'ID') do
|
||||||
expect(page).to have_css(".icon-arrow-top")
|
expect(page).to have_css(".icon-sortable.desc")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -651,7 +651,7 @@ feature 'Admin budget investments' do
|
|||||||
expect('A Second Investment').to appear_before('B First Investment')
|
expect('A Second Investment').to appear_before('B First Investment')
|
||||||
expect('B First Investment').to appear_before('C Third Investment')
|
expect('B First Investment').to appear_before('C Third Investment')
|
||||||
within('th', text: 'Title') do
|
within('th', text: 'Title') do
|
||||||
expect(page).to have_css(".icon-arrow-top")
|
expect(page).to have_css(".icon-sortable.desc")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -661,7 +661,7 @@ feature 'Admin budget investments' do
|
|||||||
expect('C Third Investment').to appear_before('A Second Investment')
|
expect('C Third Investment').to appear_before('A Second Investment')
|
||||||
expect('A Second Investment').to appear_before('B First Investment')
|
expect('A Second Investment').to appear_before('B First Investment')
|
||||||
within('th', text: 'Supports') do
|
within('th', text: 'Supports') do
|
||||||
expect(page).to have_css(".icon-arrow-top")
|
expect(page).to have_css(".icon-sortable.desc")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -673,7 +673,7 @@ feature 'Admin budget investments' do
|
|||||||
expect('C Third Investment').to appear_before('A Second Investment')
|
expect('C Third Investment').to appear_before('A Second Investment')
|
||||||
expect('A Second Investment').to appear_before('B First Investment')
|
expect('A Second Investment').to appear_before('B First Investment')
|
||||||
within('th', text: 'ID') do
|
within('th', text: 'ID') do
|
||||||
expect(page).to have_css(".icon-arrow-down")
|
expect(page).to have_css(".icon-sortable.asc")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -683,7 +683,7 @@ feature 'Admin budget investments' do
|
|||||||
expect('C Third Investment').to appear_before('B First Investment')
|
expect('C Third Investment').to appear_before('B First Investment')
|
||||||
expect('B First Investment').to appear_before('A Second Investment')
|
expect('B First Investment').to appear_before('A Second Investment')
|
||||||
within('th', text: 'Title') do
|
within('th', text: 'Title') do
|
||||||
expect(page).to have_css(".icon-arrow-down")
|
expect(page).to have_css(".icon-sortable.asc")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -693,7 +693,7 @@ feature 'Admin budget investments' do
|
|||||||
expect('B First Investment').to appear_before('A Second Investment')
|
expect('B First Investment').to appear_before('A Second Investment')
|
||||||
expect('A Second Investment').to appear_before('C Third Investment')
|
expect('A Second Investment').to appear_before('C Third Investment')
|
||||||
within('th', text: 'Supports') do
|
within('th', text: 'Supports') do
|
||||||
expect(page).to have_css(".icon-arrow-down")
|
expect(page).to have_css(".icon-sortable.asc")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -705,7 +705,7 @@ feature 'Admin budget investments' do
|
|||||||
expect('B First Investment').to appear_before('A Second Investment')
|
expect('B First Investment').to appear_before('A Second Investment')
|
||||||
expect('A Second Investment').to appear_before('C Third Investment')
|
expect('A Second Investment').to appear_before('C Third Investment')
|
||||||
within('th', text: 'ID') do
|
within('th', text: 'ID') do
|
||||||
expect(page).to have_css(".icon-arrow-top")
|
expect(page).to have_css(".icon-sortable.desc")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -715,7 +715,7 @@ feature 'Admin budget investments' do
|
|||||||
expect('A Second Investment').to appear_before('B First Investment')
|
expect('A Second Investment').to appear_before('B First Investment')
|
||||||
expect('B First Investment').to appear_before('C Third Investment')
|
expect('B First Investment').to appear_before('C Third Investment')
|
||||||
within('th', text: 'Title') do
|
within('th', text: 'Title') do
|
||||||
expect(page).to have_css(".icon-arrow-top")
|
expect(page).to have_css(".icon-sortable.desc")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -725,7 +725,7 @@ feature 'Admin budget investments' do
|
|||||||
expect('C Third Investment').to appear_before('A Second Investment')
|
expect('C Third Investment').to appear_before('A Second Investment')
|
||||||
expect('A Second Investment').to appear_before('B First Investment')
|
expect('A Second Investment').to appear_before('B First Investment')
|
||||||
within('th', text: 'Supports') do
|
within('th', text: 'Supports') do
|
||||||
expect(page).to have_css(".icon-arrow-top")
|
expect(page).to have_css(".icon-sortable.desc")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -737,7 +737,7 @@ feature 'Admin budget investments' do
|
|||||||
expect('B First Investment').to appear_before('A Second Investment')
|
expect('B First Investment').to appear_before('A Second Investment')
|
||||||
expect('A Second Investment').to appear_before('C Third Investment')
|
expect('A Second Investment').to appear_before('C Third Investment')
|
||||||
within('th', text: 'ID') do
|
within('th', text: 'ID') do
|
||||||
expect(page).to have_css(".icon-arrow-top")
|
expect(page).to have_css(".icon-sortable.desc")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user