Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 15:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add the style parameter

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2020-08-19 11:54:50 +03:00
parent 8c2c165480
commit ea6c11c3a4
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/icon_helper.rb
View file

@ -1,7 +1,7 @@
module IconHelper
include FontAwesome::Sass::Rails::ViewHelpers
def icon_fw(icon, text = nil, html_options = {})
def icon_fw(style, name, text = nil, html_options = {})
text, html_options = nil, text if text.is_a?(Hash)
if html_options.key?(:class)
@ -10,6 +10,6 @@ module IconHelper
html_options[:class] = "fa-fw"
end
icon(icon, text, html_options)
icon(style, name, text, html_options)
end
end

10
app/views/shared/_navbar.html.erb
View file

@ -67,16 +67,16 @@
<%= content_tag :span, t('layouts.navigation.options'), class: 'visible-xs-inline' %>
</a>
<ul class="dropdown-menu">
<li><%= link_to icon_fw('sign-out', t('common.logout')), logout_path %></li>
<li><%= link_to icon_fw('fas', 'sign-out', t('common.logout')), logout_path %></li>
<li class="divider"></li>
<li class="dropdown-header"><%= current_user.display_name %></li>
<li><%= link_to icon_fw('wrench', t('layouts.navigation.preferences')), preferences_path, accesskey: 'u', title: t('layouts.navigation.preferences_title') %></li>
<li><%= link_to icon_fw('download', t('layouts.navigation.export')), data_path, accesskey: 'e', title: t('layouts.navigation.export_title') %></li>
<li><%= link_to icon_fw('upload', t('layouts.navigation.import')), import_data_path, accesskey: 'i', title: t('layouts.navigation.import_title') %></li>
<li><%= link_to icon_fw('fas', 'wrench', t('layouts.navigation.preferences')), preferences_path, accesskey: 'u', title: t('layouts.navigation.preferences_title') %></li>
<li><%= link_to icon_fw('fas', 'download', t('layouts.navigation.export')), data_path, accesskey: 'e', title: t('layouts.navigation.export_title') %></li>
<li><%= link_to icon_fw('fas', 'upload', t('layouts.navigation.import')), import_data_path, accesskey: 'i', title: t('layouts.navigation.import_title') %></li>
<% if current_user.is_admin? %>
<li class="divider"></li>
<li class="dropdown-header"><%= t('layouts.navigation.admin') %></li>
<li><%= link_to icon_fw('users', t('layouts.navigation.manage_users')), users_path, accesskey: 'a', title: t('layouts.navigation.manage_users_title') %></li>
<li><%= link_to icon_fw('fas', 'users', t('layouts.navigation.manage_users')), users_path, accesskey: 'a', title: t('layouts.navigation.manage_users_title') %></li>
<% end %>
</ul>
</li>

4
test/helpers/icon_helper_test.rb
View file

@ -4,10 +4,10 @@ class IconHelperTest < ActionView::TestCase
include IconHelper
test 'icon_fw generates fixed-width class' do
assert_equal '<i class="fa fa-gear fa-fw"></i>', icon_fw('gear')
assert_equal '<i class="fas fa-gear fa-fw"></i>', icon_fw('fas', 'gear')
end
test 'icon_fw accepts an additional class' do
assert_equal '<i class="fa fa-gear fa-fw myclass"></i>', icon_fw('gear', class: 'myclass')
assert_equal '<i class="fas fa-gear fa-fw myclass"></i>', icon_fw('fas', 'gear', class: 'myclass')
end
end