gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate to fontawesome 6

Browse source
This commit is contained in:
Sasi Olin 2022-05-18 06:31:12 +02:00
parent a79e9ee993
commit d31233c033
63 changed files with 153 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -165,7 +165,7 @@ gem 'turbolinks'
gem 'active_model_serializers'
# as icon font
gem 'font-awesome-rails'
gem 'font-awesome-sass'
# for markdown
gem 'redcarpet'

6
Gemfile.lock
View file

@ -227,8 +227,8 @@ GEM
fastimage (2.2.6)
feature (1.4.0)
ffi (1.15.5)
font-awesome-rails (4.7.0.8)
railties (>= 3.2, < 8.0)
font-awesome-sass (6.1.1)
sassc (~> 2.0)
geckodriver-helper (0.24.0)
archive-zip (~> 0.7)
globalid (1.0.0)
@ -661,7 +661,7 @@ DEPENDENCIES
factory_bot_rails
faker
feature
font-awesome-rails
font-awesome-sass
geckodriver-helper
gravtastic
haml-rails

BIN
app/assets/fonts/mastodon.eot
View file

Binary file not shown.

BIN
app/assets/fonts/mastodon.otf
View file

Binary file not shown.

14
app/assets/fonts/mastodon.svg
View file

@ -1,14 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
<defs>
<font id="mastodon" horiz-adv-x="1000" >
<font-face font-family="mastodon" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
<missing-glyph horiz-adv-x="1000" />
<glyph glyph-name="logo" unicode="&#xe800;" d="M947 251c-14-71-123-148-248-163-66-8-130-15-199-12-112 5-200 27-200 27 0-11 0-21 2-31 14-111 109-118 200-121 91-3 172 23 172 23l3-83c0 0-63-34-177-40-62-3-140 2-230 25-197 52-230 262-235 474-2 63-1 122-1 172 0 217 142 280 142 280 72 33 195 47 323 48l3 0c128-1 251-15 322-48 0 0 142-63 142-280 0 0 2-160-19-271m-148 254l0-263-104 0 0 255c0 54-23 81-68 81-50 0-75-32-75-96l0-140-104 0 0 140c0 64-25 96-75 96-45 0-68-27-68-81l0-255-104 0 0 263c0 54 14 96 41 128 29 31 66 48 112 48 53 0 93-21 120-62l26-43 26 43c27 41 67 62 120 62 46 0 83-17 112-48 27-32 41-74 41-128" horiz-adv-x="1000" />
<glyph glyph-name="logo_alt" unicode="&#xe801;" d="M945 251c-14-71-122-148-247-163-65-8-129-15-198-12-112 5-200 27-200 27 0-11 1-22 2-31 15-111 110-118 199-121 91-3 172 23 172 23l4-83c0 0-64-34-177-40-62-4-139 1-230 25-195 52-229 262-234 474-1 63 0 122 0 172 0 217 141 280 141 280 72 33 194 47 322 48l3 0c127-1 250-15 321-48 0 0 142-63 142-280 0 0 2-160-20-271m-628 183c0-39-31-70-70-70-38 0-70 31-70 70 0 39 32 71 70 71 39 0 70-32 70-71m253 0c0-39-31-70-70-70-39 0-70 31-70 70 0 39 31 71 70 71 39 0 70-32 70-71m253 0c0-39-32-70-70-70-39 0-70 31-70 70 0 39 31 71 70 71 38 0 70-32 70-71" horiz-adv-x="1000" />
</font>
</defs>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/assets/fonts/mastodon.ttf
View file

Binary file not shown.

BIN
app/assets/fonts/mastodon.woff
View file

Binary file not shown.

BIN
app/assets/fonts/suse-icons.eot
View file

Binary file not shown.

11
app/assets/fonts/suse-icons.svg
View file

@ -1,11 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by Fontastic.me</metadata>
<defs>
<font id="suse-icons" horiz-adv-x="512">
<font-face font-family="suse-icons" units-per-em="512" ascent="480" descent="-32"/>
<missing-glyph horiz-adv-x="512" />
<glyph unicode="&#97;" d="M500 256c0-135-110-244-244-244-135 0-244 109-244 244 0 135 109 244 244 244 134 0 244-109 244-244z m-304-6l0 0z m77 67c11 10 25 16 40 15 31-1 55-27 54-58-1-15-7-28-18-38-11-11-25-16-40-15-31 1-55 27-54 57 1 15 7 29 18 39m-82-185c14-2 29-4 45-4 44 0 92 8 121 21 19 8 31 13 39 20 3 3 4 6 6 10l1 3c1 3 3 10 3 14 1 1 1 3 0 4-1 1-3 0-4-1-13-8-45-22-76-23-37-1-112 38-120 42l-1 1c-2 4-13 31-16 37 55-36 100-56 134-59 39-4 68 17 81 26 3 2 5 3 5 4l1 1c-2 14-22 79-37 94-4 5-8 9-14 13-55 32-186 51-192 52l-1 0 0-1c0 0-1-27-1-30-7 2-36 12-76 21-25-34-40-76-40-122 0-60 25-113 65-152 7 36 36 33 77 29m128 164c9 0 17-5 17-11 0-7-8-12-17-12-10 0-17 5-17 12 0 6 7 11 17 11m-9-58c10 0 20 3 28 10 7 7 12 17 12 27 1 22-16 40-38 41-10 0-20-4-27-11-8-7-12-16-13-27 0-21 16-39 38-40"/>
</font></defs></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/assets/fonts/suse-icons.ttf
View file

Binary file not shown.

BIN
app/assets/fonts/suse-icons.woff
View file

Binary file not shown.

2
app/assets/javascripts/osem-datatables.js
View file

@ -41,7 +41,7 @@ function truncatify(selector) {
function iconize(selector, value, icon, title) {
$(selector).each(function(){
if ($(this).text() == value) {
$(this).html("<i class='fa fa-" + icon + "' title='" + title + "'></i>");
$(this).html("<i class='fa-solid fa-" + icon + "' title='" + title + "'></i>");
}
});
}

2
app/assets/stylesheets/application.css
View file

@ -7,7 +7,6 @@
*= require osem-schedule-print
*= require osem-dashboard
*= require osem-splash
*= require font-awesome
*= require osem-fonts
*= require bootstrap-markdown
*= require bootstrap-datetimepicker
@ -17,7 +16,6 @@
*= require osem-navbar
*= require selectize
*= require selectize.bootstrap3
*= require mastodon
*= require bootstrap-select
*= require conferences
*/

45
app/assets/stylesheets/mastodon.scss
View file

@ -1,45 +0,0 @@
@font-face {
font-family: 'mastodon';
src: font-url('mastodon.eot');
src: local('☺'),
font-url('mastodon.otf') format('opentype'),
font-url('mastodon.woff') format('woff'),
font-url('mastodon.ttf') format('truetype'),
font-url('mastodon.svg') format('svg');
font-weight: normal;
font-style: normal;
}
[class^="icon-"]:before, [class*=" icon-"]:before {
font-family: "mastodon";
font-style: normal;
font-weight: normal;
speak: none;
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: .2em;
text-align: center;
/* opacity: .8; */
/* For safety - reset parent styles, that can break glyph codes*/
font-variant: normal;
text-transform: none;
/* fix buttons height, for twitter bootstrap */
line-height: 1em;
/* you can be more comfortable with increased icons size */
/* font-size: 120%; */
/* Font smoothing. That was taken from TWBS */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
.icon-mastodon:before { content: '\e800'; } /* '' */
.icon-mastodon_alt:before { content: '\e801'; } /* '' */

2
app/assets/stylesheets/osem-dashboard.scss
View file

@ -1,6 +1,6 @@
@import "breakpoints.scss";
.dashbox span.fa {
.dashbox span.fa-solid {
line-height: 1.1em;
@include breakpoint(sm) {
font-size: 3em;

46
app/assets/stylesheets/osem-fonts.scss
View file

@ -1,45 +1 @@
/* Generated with http://fontastic.me/ and app/assets/images/suse.svg */
@charset "UTF-8";
@font-face {
font-family: "suse-icons";
src:font-url("suse-icons.eot");
src:font-url("suse-icons.eot?#iefix") format("embedded-opentype"),
font-url("suse-icons.woff") format("woff"),
font-url("suse-icons.ttf") format("truetype"),
font-url("suse-icons.svg#suse-icons") format("svg");
font-weight: normal;
font-style: normal;
}
[data-icon]:before {
font-family: "suse-icons" !important;
content: attr(data-icon);
font-style: normal !important;
font-weight: normal !important;
font-variant: normal !important;
text-transform: none !important;
speak: none;
line-height: 1;
font-smoothing: antialiased;
}
/* We have to repeat this for every symbol that extends font awesome. So if
you add fa-rutzelfuz you need to copy and paste these two...
*/
[class^="fa-suse"]:before,
[class*=" fa-suse"]:before {
font-family: "suse-icons" !important;
font-style: normal !important;
font-weight: normal !important;
font-variant: normal !important;
text-transform: none !important;
speak: none;
line-height: 1;
font-smoothing: antialiased;
}
.fa-suse:before {
content: "a";
}
@import "font-awesome";

2
app/assets/stylesheets/osem-splash.scss
View file

@ -161,7 +161,7 @@
-ms-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out;
transition: all 0.5s ease-in-out;
i.fa {
i.fa-solid {
line-height: inherit;
}
&.show {

1
app/assets/stylesheets/strap-on.scss
View file

@ -18,7 +18,6 @@ $navbar-default-link-hover-color: #000000;
// Reset and dependencies
@import "bootstrap/normalize";
@import "bootstrap/print";
@import "bootstrap/glyphicons";
// Core CSS
@import "bootstrap/scaffolding";

4
app/helpers/format_helper.rb
View file

@ -100,9 +100,9 @@ module FormatHelper
def icon_for_todo(bool)
if bool
'fa fa-check'
'fa-solid fa-check'
else
'fa fa-times'
'fa-solid fa-xmark'
end
end

2
app/models/survey_question.rb
View file

@ -7,7 +7,7 @@ class SurveyQuestion < ActiveRecord::Base
# Order of this list should not be changed without proper action!
enum kind: [:boolean, :choice, :string, :text, :datetime, :numeric]
ICONS = { boolean: 'dot-circle-o', choice: 'check-square-o', string: 'edit', text: 'align-left', datetime: 'clock-o', numeric: 'slack' }.freeze
ICONS = { boolean: 'circle-dot', choice: 'square-check', string: 'pen-to-square', text: 'align-left', datetime: 'clock', numeric: 'hashtag' }.freeze
validates :title, presence: true
validates :possible_answers, :max_choices, :min_choices, presence: true, if: :choice?

6
app/views/admin/comments/index.html.haml
View file

@ -8,15 +8,15 @@
%ul.nav.nav-tabs#commentsTable
%li.active
%a{ href: '#unread_comments', 'data-toggle' => 'tab' }
%span.fa.fa-comment
%span.fa-solid.fa-comment
Unread
%li
%a{ href: '#posted_comments', 'data-toggle' => 'tab' }
%span.fa.fa-pencil
%span.fa-solid.fa-pencil
Posted
%li
%a{ href: '#all_comments', 'data-toggle' => 'tab' }
%span.fa.fa-comments-o
%span.fa-solid.fa-comments
All
.tab-content
.tab-pane.active#unread_comments

12
app/views/admin/conferences/index.html.haml
View file

@ -4,13 +4,13 @@
icon: "user", subtitle: "User", value: @total_user, delta: @new_user
.col-sm-3.col-xs-3
= render "big_statistic",
icon: "check-square", subtitle: "Registration", value: @total_reg, delta: @new_reg
icon: "square-check", subtitle: "Registration", value: @total_reg, delta: @new_reg
.col-sm-3.col-xs-3
= render "big_statistic",
icon: "file-text", subtitle: "Submission", value: @total_submissions, delta: @new_submissions
icon: "file-lines", subtitle: "Submission", value: @total_submissions, delta: @new_submissions
.col-sm-3.col-xs-3
= render "big_statistic",
icon: "archive", subtitle: "Withdrawn", value: @total_withdrawn, delta: @new_withdrawn, reverse: true
icon: "box-archive", subtitle: "Withdrawn", value: @total_withdrawn, delta: @new_withdrawn, reverse: true
.row#registrations
.col-md-8
@ -33,15 +33,15 @@
%ul.nav.nav-tabs#recentTable
%li.active
%a{ href: '#recent_user', 'data-toggle' => 'tab' }
%span.fa.fa-user
%span.fa-solid.fa-user
Recent Users
%li
%a{ href: '#recent_reg', 'data-toggle' => 'tab' }
%span.fa.fa-check-square
%span.fa-solid.fa-square-check
Recent Registrations
%li
%a{ href: '#recent_submissions', 'data-toggle' => 'tab' }
%span.fa.fa-file-text
%span.fa-solid.fa-file-lines
Recent Submissions
.tab-content
.tab-pane.active#recent_user

18
app/views/admin/conferences/show.html.haml
View file

@ -1,5 +1,5 @@
%h1
%span.fa.fa-tachometer
%span.fa-solid.fa-gauge-high
Dashboard for #{@conference.title}
%hr
.row
@ -8,13 +8,13 @@
icon: "user", subtitle: "Registration", value: @total_reg, delta: @new_reg
.col-sm-3.col-xs-3
= render "big_statistic",
icon: "check-square", subtitle: "Submission", value: @total_submissions, delta: @new_submissions
icon: "square-check", subtitle: "Submission", value: @total_submissions, delta: @new_submissions
.col-sm-3.col-xs-3
= render "big_statistic",
icon: "file-text", subtitle: "Hour", value: @program_length, delta: @new_program_length
icon: "file-lines", subtitle: "Hour", value: @program_length, delta: @new_program_length
.col-sm-3.col-xs-3
= render "big_statistic",
icon: "archive", subtitle: "Withdrawn", value: @total_withdrawn, delta: @new_withdrawn
icon: "box-archive", subtitle: "Withdrawn", value: @total_withdrawn, delta: @new_withdrawn
.row
.col-md-12
@ -41,15 +41,15 @@
%ul.nav.nav-tabs#doughnut_tabs
%li.active
%a{ href: '#distribution_all', 'data-toggle' => 'tab' }
%span.fa.fa-star
%span.fa-solid.fa-star
All
%li
%a{ href: '#distribution_confirmed', 'data-toggle' => 'tab' }
%span.fa.fa-comment
%span.fa-solid.fa-comment
Confirmed
%li
%a{ href: '#distribution_withdrawn', 'data-toggle' => 'tab' }
%span.fa.fa-archive
%span.fa-solid.fa-box-archive
Withdrawn
.tab-content
.tab-pane.active#distribution_all
@ -91,11 +91,11 @@
%ul.nav.nav-tabs#recentTable
%li{ 'class' => "active #{hidden_if_conference_over(@conference)}" }
%a{ href: '#recent_reg', 'data-toggle' => 'tab' }
%span.fa.fa-user
%span.fa-solid.fa-user
Recent Registrations
%li{ 'class' => "#{hidden_if_conference_over(@conference)}" }
%a{ href: '#recent_submissions', 'data-toggle' => 'tab' }
%span.fa.fa-file-text
%span.fa-solid.fa-file-lines
Recent Submissions
.tab-content
.tab-pane.active#recent_reg

2
app/views/admin/events/_datatable_row.haml
View file

@ -69,4 +69,4 @@
= link_to new_admin_conference_survey_path(@conference.short_title,
survey: { surveyable_type: 'Event', surveyable_id: event.id }),
class: 'btn btn-success' do
.fa.fa-plus
.fa-solid.fa-plus

2
app/views/admin/events/index.html.haml
View file

@ -85,7 +85,7 @@
%th
%b State
%th
.fa.fa-comment
.fa-solid.fa-comment
%th Add Survey
- @events.each do |event|
= render 'datatable_row',

4
app/views/admin/events/registrations.html.haml
View file

@ -35,6 +35,6 @@
= check_box_tag @conference.short_title, @event.id, event_registration.attended, class: 'switch-checkbox', url: "#{toggle_attendance_admin_conference_program_event_path(@conference, @event, events_registration_id: event_registration)}&&event_registration[attended]="
%td
- if event_registration.registration.attended
%i.fa.fa-check.text-success
%i.fa-solid.fa-check.text-success
- else
%i.fa.fa-close.text-danger
%i.fa-solid.fa-xmark.text-danger

2
app/views/admin/lodgings/index.html.haml
View file

@ -12,7 +12,7 @@
.thumbnail
- unless lodging.picture?
%p.text-center
%i.fa.fa-home.fa-5x
%i.fa-solid.fa-house.fa-5x
- else
- if lodging.website_link.present?
= link_to(lodging.website_link, class: 'thumbnail') do

2
app/views/admin/organizations/index.html.haml
View file

@ -27,7 +27,7 @@
= organization.conferences.past.count
%td.text-center
- unless organization.code_of_conduct.blank?
= fa_icon 'check', title: 'yes'
= icon 'fa-solid', 'check', title: 'yes'
%td
.btn-group
= link_to 'Admins', admins_admin_organization_path(organization),

2
app/views/admin/registrations/index.html.haml
View file

@ -43,7 +43,7 @@
checkboxSwitch("[class='switch-checkbox']");
if (codeOfConductPresent) {
iconize("td.code-of-conduct", "true", "check", "accepted");
iconize("td.code-of-conduct", "false", "exclamation-circle", "Has not accepted Code of Conduct");
iconize("td.code-of-conduct", "false", "circle-exclamation", "Has not accepted Code of Conduct");
};
// truncatify("td.truncate");
},

4
app/views/admin/sponsorship_levels/index.html.haml
View file

@ -21,9 +21,9 @@
= sponsorship_level.position
.btn-group-vertical{role: "group"}
= link_to(up_admin_conference_sponsorship_level_path(@conference.short_title, sponsorship_level.id), method: :patch, class: 'btn btn-default btn-xs') do
%i.fa.fa-chevron-up
%i.fa-solid.fa-chevron-up
= link_to(down_admin_conference_sponsorship_level_path(@conference.short_title, sponsorship_level.id), method: :patch, class: 'btn btn-default btn-xs') do
%i.fa.fa-chevron-down
%i.fa-solid.fa-chevron-down
%td
= link_to 'Edit', edit_admin_conference_sponsorship_level_path(@conference.short_title, sponsorship_level.id),
method: :get, class: 'btn btn-primary'

4
app/views/admin/survey_questions/_form.html.haml
View file

@ -35,7 +35,7 @@
.form-group
%select.selectpicker.form-control{ id: 'survey_question_kind', name: 'survey_question[kind]' }
- SurveyQuestion.kinds.each do |kind|
%option{ id: "#{kind.second}", 'data-icon' => "fa fa-#{SurveyQuestion::ICONS[kind.first.to_sym]}", selected: @survey_question.kind == kind.first }
%option{ id: "#{kind.second}", 'data-icon' => "fa-solid fa-#{SurveyQuestion::ICONS[kind.first.to_sym]}", selected: @survey_question.kind == kind.first }
= kind.first
= f.submit nil, class: 'btn btn-primary'
.col-md-6
@ -89,7 +89,7 @@
.form-group{ class: 'datetimepicker' }
.input-group
.input-group-addon
%span.fa.fa-calendar
%span.fa-solid.fa-calendar
%input.form-control{ readonly: 'readonly' }
.kinds.numeric{ class: @survey_question.numeric? ? '' : 'hidden' }
%input.form-control{ type: 'number' }

2
app/views/admin/surveys/_survey_question.html.haml
View file

@ -35,7 +35,7 @@
.form-group{ class: 'datetimepicker' }
.input-group
.input-group-addon
%span.fa.fa-calendar
%span.fa-solid.fa-calendar
%input.form-control{ readonly: 'readonly', name: "survey_submission[#{survey_question.id}][]", value: survey_reply.text, required: survey_question.mandatory }
- elsif survey_question.numeric?
%input.form-control{ type: 'number', name: "survey_submission[#{survey_question.id}][]", value: survey_reply.text, required: survey_question.mandatory }

6
app/views/admin/surveys/_survey_question_title.html.haml
View file

@ -12,11 +12,11 @@
= survey_question.max_choices
choices )
- if survey_question.mandatory
%span.fa.fa-asterisk.text-danger
%span.fa-solid.fa-asterisk.text-danger
- if can? :edit, @survey
%p.pull-right
= "(#{survey_question.survey_replies.count} replies)"
= link_to edit_admin_conference_survey_survey_question_path(@conference.short_title, @survey, survey_question) do
%span.fa.fa-edit
%span.fa-solid.fa-pen-to-square
= link_to admin_conference_survey_survey_question_path(@conference.short_title, @survey, survey_question), method: :delete, data: { confirm: 'Are you sure you want to delete this question?' } do
%span.fa.fa-times
%span.fa-solid.fa-xmark

4
app/views/admin/users/_event_registrations.html.haml
View file

@ -20,6 +20,6 @@
%td= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event)
%td
- if @user.attended_event?(event)
%i.fa.fa-check.text-success
%i.fa-solid.fa-check.text-success
- else
%i.fa.fa-times.text-danger
%i.fa-solid.fa-xmark.text-danger

4
app/views/application/_big_statistic.haml
View file

@ -1,8 +1,8 @@
- reverse ||= false
- variant = variant_from_delta(delta, reverse: reverse)
.dashbox.text-center
%span.fa
= fa_icon(icon)
%span
= icon('fa-solid', icon)
= value
%p.text-nowrap
%small

2
app/views/conference_registrations/_registration_info.html.haml
View file

@ -2,7 +2,7 @@
- code_of_conduct_link = link_to 'Code of Conduct', '#',
data: { toggle: 'modal', target: '#modal-code-of-conduct'}
- if @registration.accepted_code_of_conduct
= fa_icon 'check-square-o'
= icon 'fa-solid', 'square-check'
I have read and accepted the
= code_of_conduct_link
- else

2
app/views/conference_registrations/_tickets.html.haml
View file

@ -23,4 +23,4 @@
%p
= button_tag(type: 'submit', class: 'btn btn-success btn-lg pull-right') do
Support
%i.fa.fa-shopping-cart
%i.fa-solid.fa-cart-shopping

32
app/views/conference_registrations/show.html.haml
View file

@ -17,17 +17,19 @@
- unless @conference.code_of_conduct.blank?
.row
.col-md-12
%h4= fa_stacked_icon 'handshake-o', base: 'square-o', text: 'Code of Conduct'
%h4= fa_stacked_icon 'handshake-o', base: 'square-dashed', text: 'Code of Conduct'
%ul.fa-ul
- if @registration.accepted_code_of_conduct
%li.text-info
= fa_icon('check li')
%span.fa-li
= icon('fa-solid', 'check')
You have accepted the
= link_to 'Code of Conduct', '#',
data: { toggle: 'modal', target: '#modal-code-of-conduct'}
- else
%li.text-warning
= fa_icon('exclamation-circle li')
%span.fa-li
= icon('fa-solid', 'circle-exclamation')
You need to accept the
= link_to 'Code of Conduct', '#',
data: { toggle: 'modal', target: '#modal-code-of-conduct'}
@ -38,8 +40,8 @@
.col-md-12
%h4
%span.fa-stack
%i.fa.fa-square-o.fa-stack-2x
%i.fa.fa-info.fa-stack-1x
%i.fa-solid.fa-square-dashed.fa-stack-2x
%i.fa-solid.fa-info.fa-stack-1x
Surveys
%ul
@ -49,8 +51,8 @@
.col-md-12
%h4
%span.fa-stack
%i.fa.fa-square-o.fa-stack-2x
%i.fa.fa-check.fa-stack-1x
%i.fa-solid.fa-square-dashed.fa-stack-2x
%i.fa-solid.fa-check.fa-stack-1x
Registered to the following event(s)
%ul
- @registration.events.each do |event|
@ -63,8 +65,8 @@
.col-md-12
%h4
%span.fa-stack
%i.fa.fa-square-o.fa-stack-2x
%i.fa.fa-question.fa-stack-1x
%i.fa-solid.fa-square-dashed.fa-stack-2x
%i.fa-solid.fa-question.fa-stack-1x
Events that require registration
%ul
- @registration.conference.program.events.remaining_for_registration(@registration).each do |event|
@ -77,8 +79,8 @@
.col-md-12
%h4
%span.fa-stack
%i.fa.fa-square-o.fa-stack-2x
%i.fa.fa-ticket.fa-stack-1x
%i.fa-solid.fa-square-dashed.fa-stack-2x
%i.fa-solid.fa-ticket.fa-stack-1x
Tickets
- if @tickets.any?
Total Purchased:
@ -139,8 +141,8 @@
- if @conference.participants.any?
%h4
%span.fa-stack
%i.fa.fa-square-o.fa-stack-2x
%i.fa.fa-group.fa-stack-1x
%i.fa-solid.fa-square-dashed.fa-stack-2x
%i.fa-solid.fa-user-group.fa-stack-1x
= @conference.participants.count
Registered
= word_pluralize(@conference.participants.count, 'Attendee')
@ -150,8 +152,8 @@
- if @conference.program.speakers.confirmed.any?
%h4
%span.fa-stack
%i.fa.fa-square-o.fa-stack-2x
%i.fa.fa-microphone.fa-stack-1x
%i.fa-solid.fa-square-dashed.fa-stack-2x
%i.fa-solid.fa-microphone.fa-stack-1x
= @conference.program.speakers.confirmed.count
Confirmed
= word_pluralize(@conference.program.speakers.confirmed.count, 'Speaker')

2
app/views/conferences/_code_of_conduct.haml
View file

@ -10,7 +10,7 @@
.modal-content
.modal-header
%button.close{ data: { dismiss: 'modal' } }
%i.fa.fa-close
%i.fa-solid.fa-xmark
%h3.modal-title Code of Conduct
.modal-body
= markdown organization.code_of_conduct

2
app/views/conferences/_footer.haml
View file

@ -1,6 +1,6 @@
.scroll-top-wrapper
= link_to "#banner", class: "smoothscroll" do
%i.fa.fa-2x.fa-arrow-circle-up
%i.fa-solid.fa-2x.fa-circle-arrow-up
:javascript
$(function(){

4
app/views/conferences/_gallery.html.haml
View file

@ -9,9 +9,9 @@
<!-- Controls -->
%a{ class: "left carousel-control", href: "#carousel-example-generic", role: "button", "data-slide" => "prev" }
%span.fa.fa-chevron-left
%span.fa-solid.fa-chevron-left
%a{ class: "right carousel-control", href: "#carousel-example-generic", role: "button", "data-slide" => "next" }
%span.fa.fa-chevron-right
%span.fa-solid.fa-chevron-right
:javascript

4
app/views/conferences/_lodging.haml
View file

@ -31,9 +31,9 @@
%p.text-center
- if lodging.website_link.present?
= link_to(lodging.website_link, class: 'thumbnail') do
%i.fa.fa-home.fa-5x
%i.fa-solid.fa-house.fa-5x
- else
%i.fa.fa-home.fa-5x
%i.fa-solid.fa-house.fa-5x
.caption
%h3.text-center
= lodging.name

2
app/views/conferences/_modal_description.haml
View file

@ -5,7 +5,7 @@
.modal-content
.modal-header
%button.close{ data: { dismiss: 'modal' } }
%i.fa.fa-close
%i.fa-solid.fa-xmark
%h3.modal-title
= object.try(:title) || object.try(:name)
.modal-body

16
app/views/conferences/_social_media.haml
View file

@ -5,25 +5,25 @@
.col-md-12.text-center
- if contact.blog?
= link_to "#{ contact.blog }" do
%i.fa.fa-rss-square.fa-4x
%i.fa-solid.fa-square-rss.fa-4x
- if contact.facebook?
= link_to "#{ contact.facebook }" do
%i.fa.fa-facebook-square.fa-4x
%i.fa-solid.fa-facebook.fa-4x
- if contact.twitter?
= link_to "#{ contact.twitter }" do
%i.fa.fa-twitter.fa-4x
%i.fa-solid.fa-twitter.fa-4x
- if contact.instagram?
= link_to "#{ contact.instagram }" do
%i.fa.fa-instagram.fa-4x
%i.fa-solid.fa-instagram.fa-4x
- if contact.googleplus?
= link_to "#{ contact.googleplus }" do
%i.fa.fa-google-plus-square.fa-4x
%i.fa-solid.fa-google-plus.fa-4x
- if contact.mastodon?
= link_to "#{ contact.mastodon }" do
%i.fa.icon-mastodon.fa-4x
%i.fa-solid.fa-mastodon.fa-4x
- if contact.youtube?
= link_to "#{ contact.youtube }" do
%i.fa.fa-youtube.fa-4x
%i.fa-solid.fa-youtube.fa-4x
- if contact.email?
= mail_to "#{ contact.email }" do
%i.fa.fa-envelope-o.fa-4x
%i.fa-solid.fa-envelope.fa-4x

2
app/views/conferences/_tickets.haml
View file

@ -21,5 +21,5 @@
.word_break
= markdown(ticket.description)
%button.btn-block.btn.btn-lg.btn-success
%i.fa.fa-ticket.fa-fw
%i.fa-solid.fa-ticket.fa-fw
= humanized_money_with_symbol(ticket.price)

2
app/views/conferences/_venue.haml
View file

@ -20,7 +20,7 @@
title: venue.name, class: "img-responsive"
- else
%p.text-center
%span.fa.fa-university.fa-5x
%span.fa-solid.fa-building-columns.fa-5x
.caption
%h3.text-center
= venue.name

4
app/views/conferences/index.html.haml
View file

@ -13,8 +13,8 @@
Older conferences
%span.notranslate
= "(#{@antiquated.count})"
%i.fa.fa-chevron-right
%i.fa.fa-chevron-down{ style: 'display: none' }
%i.fa-solid.fa-chevron-right
%i.fa-solid.fa-chevron-down{ style: 'display: none' }
#antiquated.collapse
- @antiquated.each do |conference|
= render '/conferences/conference_details', conference: conference

2
app/views/devise/registrations/_form_fields_openid.html.haml
View file

@ -10,7 +10,7 @@
%li{ style: "list-style: none; margin-left: 20px;" }
= link_to user_openid_path(openid, user_id: current_user.id), method: :delete,
data: { confirm: "Remove association with #{openid.provider} account?" } do
%span.fa.fa-times{ style: "color: red;" }
%span.fa-solid.fa-xmark.text-danger
%span #{openid.provider}:#{openid.email}
%br
- else

2
app/views/devise/shared/_openid_links.html.haml
View file

@ -5,4 +5,4 @@
id: "omniauth-#{provider}",
title: "Your #{provider} login",
method: :post do
%i{class: "fa fa-#{provider}"}
%i{class: "fa-brand fa-#{provider}"}

34
app/views/layouts/_admin_sidebar.html.haml
View file

@ -1,41 +1,41 @@
%ul.nav.nav-stacked.nav-pills.mySidebar.collapse.navbar-collapse#side-nav
.btn-group
%button{type:'button', class: 'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'}
%span.fa.fa-cog
%span.fa-solid.fa-gear
= @conference.short_title
%span.caret
%ul.dropdown-menu{role:'menu'}
%li
= link_to(admin_conferences_path) do
%span.fa.fa-home
%span.fa-solid.fa-house
All Conferences
- @conferences.each do |conference|
- if can? :show, conference
%li
= link_to(admin_conference_path(conference.short_title)) do
%span.fa.fa-cog
%span.fa-solid.fa-gear
Manage
= conference.short_title
- if can? :new, Conference.new
%li
= link_to(new_admin_conference_path) do
%span.fa.fa-plus
%span.fa-solid.fa-plus
New Conference
%hr
- if can? :show, @conference
%li{class: "#{active_nav_li(admin_conference_path(@conference.short_title))} nav-header nav-header-bigger"}
= link_to(admin_conference_path(@conference.short_title)) do
%span.fa.fa-tachometer
%span.fa-solid.fa-gauge-high
Dashboard
- if can? :show, @conference
%li{class: "#{active_nav_li(edit_admin_conference_path(@conference.short_title))}"}
- if can? :edit, @conference
= link_to(edit_admin_conference_path(@conference.short_title)) do
%span.fa.fa-home
%span.fa-solid.fa-house
Basics
- else
%a
%span.fa.fa-home
%span.fa-solid.fa-house
Basics
%ul
- if can? :update, Contact.new(conference_id: @conference.id)
@ -50,7 +50,7 @@
- if can? :show, Venue.new(conference_id: @conference.id)
%li{class: "#{active_nav_li(admin_conference_venue_path(@conference.short_title))}"}
= link_to(admin_conference_venue_path(@conference.short_title)) do
%span.fa.fa-road
%span.fa-solid.fa-road
Venue
%ul
- if @conference.venue && @conference.venue.persisted? && (can? :update, @conference.venue.rooms.build)
@ -62,7 +62,7 @@
- if can? :show, @conference.program
%li{class: "#{active_nav_li(admin_conference_program_path(@conference.short_title))}"}
= link_to admin_conference_program_path(@conference.short_title) do
%span.fa.fa-calendar
%span.fa-solid.fa-calendar
Program
- if @conference.program
%ul
@ -91,7 +91,7 @@
- if can? :update, Registration.new(conference_id: @conference.id)
%li{class: active_nav_li(admin_conference_registrations_path(@conference.short_title))}
= link_to(admin_conference_registrations_path(@conference.short_title)) do
%span.fa.fa-user
%span.fa-solid.fa-user
Registrations
%ul
- if can? :update, @conference
@ -104,7 +104,7 @@
- if (can? :manage, @conference.sponsorship_levels.build) || (can? :manage, @conference.sponsors.build) || (can? :manage, @conference.tickets.build)
%li
%a
%span.fa.fa-usd
%span.fa-solid.fa-dollar-sign
Donations
%ul
- if can? :update, @conference.sponsorship_levels.build
@ -119,31 +119,31 @@
- if can? :manage, @conference.booths.build
%li
= link_to admin_conference_booths_path(@conference.short_title) do
%span.fa.fa-shopping-bag
%span.fa-solid.fa-bag-shopping
= (t'booth').pluralize.capitalize
- if can? :update, @conference.email_settings
%li{class: active_nav_li(admin_conference_emails_path(@conference.short_title))}
= link_to(admin_conference_emails_path(@conference.short_title)) do
%span.fa.fa-envelope
%span.fa-solid.fa-envelope
E-Mails
%li{ class: active_nav_li(admin_conference_surveys_path(@conference.short_title)) }
= link_to(admin_conference_surveys_path(@conference.short_title)) do
%span.fa.fa-list-alt
%span.fa-solid.fa-list
Surveys
- if can? :index, Role.new(resource: @conference)
%li{class: active_nav_li(admin_conference_roles_path(@conference.short_title))}
= link_to(admin_conference_roles_path(@conference.short_title)) do
%span.fa.fa-group
%span.fa-solid.fa-user-group
Roles
- if can? :index, @conference.resources.new
%li
= link_to admin_conference_resources_path(@conference.short_title) do
%span.fa.fa-pencil-square
%span.fa-solid.fa-pencil
Resources
- if can?(:index, PaperTrail::Version.new(conference_id: @conference.id, item_type: 'Event')) || can?(:index, PaperTrail::Version.new(conference_id: @conference.id, item_type: 'Registration'))
%li{:class=> active_nav_li(admin_conference_revision_history_path(@conference.short_title))}
= link_to(admin_conference_revision_history_path(@conference.short_title)) do
%span.fa.fa-history
%span.fa-solid.fa-clock-rotate-left
Revision History

16
app/views/layouts/_admin_sidebar_index.html.haml
View file

@ -1,44 +1,44 @@
%ul.nav.nav-stacked.nav-pills.mySidebar.collapse.navbar-collapse#side-nav
.btn-group
%button{type: 'button', class: 'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'}
%span.fa.fa-home
%span.fa-solid.fa-house
All Conferences
%span.caret
%ul.dropdown-menu{role: 'menu'}
%li
= link_to(admin_conferences_path) do
%span.fa.fa-home
%span.fa-solid.fa-house
All Conferences
- @conferences.each do |conference|
- if can? :show, conference
%li
= link_to(admin_conference_path(conference.short_title)) do
%span.fa.fa-cog
%span.fa-solid.fa-gear
Manage
= conference.short_title
- if can? :new, Conference.new
%li
= link_to(new_admin_conference_path) do
%span.fa.fa-plus
%span.fa-solid.fa-plus
New Conference
- if can? :index, User
%hr
%li
= link_to(admin_users_path) do
%span.fa.fa-user
%span.fa-solid.fa-user
Users
- if can? :index, Organization
%li
= link_to(admin_organizations_path) do
%span.fa.fa-users
%span.fa-solid.fa-users
Organizations
- if can? :index, PaperTrail::Version
%li
= link_to(admin_revision_history_path) do
%span.fa.fa-history
%span.fa-solid.fa-clock-rotate-left
Revision History
- if ENV.fetch('ORGANIZATIONS_ENABLED', nil) == 'true'
%li
= link_to(admin_organizations_path) do
%span.fa.fa-group
%span.fa-solid.fa-user-group
Organizations

6
app/views/layouts/_navigation.html.haml
View file

@ -35,16 +35,16 @@
- if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
%li{class: "#{active_nav_li(new_ichain_registration_path('user'))}"}
= link_to(new_ichain_registration_path('user')) do
%span.fa.fa-heart
%span.fa-solid.fa-heart
Sign Up
- else
%li{class: "#{active_nav_li(new_registration_path('user'))}"}
= link_to(new_registration_path('user')) do
%span.fa.fa-heart
%span.fa-solid.fa-heart
Sign Up
%li.dropdown.visible-desktop
%a.dropdown-toggle{"data-toggle" => "dropdown", href: '#'}
%span.fa.fa-user
%span.fa-solid.fa-user
Sign In
%span.caret
.dropdown-menu

30
app/views/layouts/_user_menu.html.haml
View file

@ -1,6 +1,6 @@
- if can? :index, Comment
%li.dropdown-header
%span.fa.fa-comment
%span.fa-solid.fa-comment
Notifications (#{unread_notifications(current_user).length})
- if unread_notifications(current_user).length > 0
%li.dropdown-header Last 5 Comments for:
@ -13,71 +13,71 @@
- unless ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
%li
= link_to(edit_user_registration_path) do
%span.fa.fa-wrench
%span.fa-solid.fa-wrench
Edit Account
%li
= link_to(edit_user_path(current_user.id)) do
%span.fa.fa-user
%span.fa-solid.fa-user
Edit Profile
- if @conference && ((current_user && @conference.user_registered?(current_user)) || @conference.registration_open?)
%li
= link_to(conference_conference_registration_path(@conference)) do
%span.fa.fa-id-badge
%span.fa-solid.fa-id-badge
= @conference.short_title
registration
-if @conference && @conference.program
%li
= link_to(conference_program_proposals_path(@conference.short_title)) do
%span.fa.fa-comment
%span.fa-solid.fa-comment
My Submissions
%li
= link_to(conference_program_tracks_path(@conference.short_title)) do
%span.fa.fa-road
%span.fa-solid.fa-road
My Tracks
-if @conference && (@conference.call_for_booths.try(:open?) || current_user.booths.where(conference_id: @conference.id).count > 0)
%li
= link_to (conference_booths_path(@conference.short_title)) do
%span.fa.fa-shopping-bag
%span.fa-solid.fa-bag-shopping
My #{(t'booth').capitalize } Requests
%li
- if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
= link_to(destroy_user_ichain_session_path, method: 'delete') do
%span.fa.fa-minus
%span.fa-solid.fa-minus
Sign out
- else
= link_to(destroy_user_session_path, method: 'delete') do
%span.fa.fa-minus
%span.fa-solid.fa-minus
Sign out
- if can? :access, Admin
%li.divider
%li
- if Conference.any?
= link_to(admin_conferences_path()) do
%span.fa.fa-home
%span.fa-solid.fa-house
Administration
- if can? :new, Conference.new
=link_to(new_admin_conference_path) do
%span.fa.fa-plus
%span.fa-solid.fa-plus
New Conference
-if @conference && @conference.id && can?(:show, @conference)
%li
= link_to(admin_conference_path(@conference.short_title)) do
%span.fa.fa-cog
%span.fa-solid.fa-gear
Manage
%span.notranslate
= @conference.short_title
- if can? :manage, User.new
%li
= link_to(admin_users_path) do
%span.fa.fa-user
%span.fa-solid.fa-user
Users
- if can? :index, PaperTrail::Version
%li
= link_to(admin_revision_history_path) do
%span.fa.fa-history
%span.fa-solid.fa-clock-rotate-left
Revision History
- if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
%li
= link_to(admin_organizations_path) do
%span.fa.fa-group
%span.fa-solid.fa-user-group
Organizations

8
app/views/proposals/registrations.html.haml
View file

@ -34,11 +34,11 @@
%td= event_registration.created_at
%td.text-center
- if event_registration.attended
%i.fa.fa-check.text-success
%i.fa-solid.fa-check.text-success
- else
%i.fa.fa-times.text-danger
%i.fa-solid.fa-xmark.text-danger
%td
- if event_registration.registration.attended
%i.fa.fa-check.text-success
%i.fa-solid.fa-check.text-success
-else
%i.fa.fa-times.text-danger
%i.fa-solid.fa-xmark.text-danger

2
app/views/proposals/show.html.haml
View file

@ -40,7 +40,7 @@
%br
- if speaker.email_public?
= mail_to "#{ speaker.email }" do
%i.fa.fa-envelope-o.fa-2x
%i.fa-solid.fa-envelope.fa-2x
- if speaker.affiliation?
.text-muted
from

4
app/views/schedules/_carousel.html.haml
View file

@ -56,8 +56,8 @@
%a.left.carousel-control{ href: "#carousel-#{ date }-#{ hrs_per_slide }", |
role: "button", |
"data-slide" => "prev" }
%span.glyphicon.glyphicon-chevron-left
%span.fa-solid.fa-chevron-left
%a.right.carousel-control{ href: "#carousel-#{ date }-#{ hrs_per_slide }", |
role: "button", |
"data-slide" => "next" }
%span.glyphicon.glyphicon-chevron-right
%span.fa-solid.fa-chevron-right

6
app/views/schedules/_event.html.haml
View file

@ -22,17 +22,17 @@
= link_to 'more', conference_program_proposal_path(@conference.short_title, event.id) if event.abstract.length > 400
- if event_schedule.present?
%span.track
%span.fa.fa-clock-o
%span.fa-solid.fa-clock
%span.label{ style: "background-color: grey" }
= event_schedule.start_time.strftime('%H:%M')
\-
= event_schedule.end_time.strftime('%H:%M')
%span.track
%span.fa.fa-map-marker
%span.fa-solid.fa-location-dot
%span.label{ style: "background-color: grey" }
= event_schedule.room.name
- if event.track
%span.track
%span.fa.fa-road
%span.fa-solid.fa-road
%span.label{ style: "background-color: #{event.track.color}; color: #{ contrast_color(event.track.color) }" }
= event.track.name

4
app/views/schedules/events.html.haml
View file

@ -29,7 +29,7 @@
%span{ class: 'date-title', id: "#{ event_schedule.start_time.strftime('%Y-%m-%d') }" }
= date = event_schedule.start_time.strftime('%Y-%m-%d')
%a{ title: "Go up", class: "pull-right", href: "#program" }
%i{ class: "fa fa-angle-double-up fa-lg", 'aria-hidden' => true }
%i{ class: "fa-solid fa-angles-up fa-lg", 'aria-hidden' => true }
- unless event_schedule.start_time.strftime('%H:%M').eql?(time)
.col-xs-12.col-md-1
.start-time
@ -48,7 +48,7 @@
%span.date-title#unscheduled
Unscheduled events
%a{ title: "Go up", class: "pull-right", href: "#program" }
%i{ class: "fa fa-angle-double-up fa-lg", 'aria-hidden' => true }
%i{ class: "fa-solid fa-angles-up fa-lg", 'aria-hidden' => true }
- @unscheduled_events.each do |event|
.col-xs-12.col-md-12
.unscheduled-event

4
app/views/surveys/_list.html.haml
View file

@ -1,7 +1,7 @@
- surveys.each do |survey|
- if survey.survey_submissions.find_by(user: current_user)
%i.fa.fa-check-square-o.text-success{ title: 'Thank you for filling out the survey' }
%i.fa-solid.fa-square-check.text-success{ title: 'Thank you for filling out the survey' }
- else
%i.fa.fa-minus-square-o.text-danger{ title: 'Please fill out the survey' }
%i.fa-solid.fa-square-minus.text-danger{ title: 'Please fill out the survey' }
= link_to survey.title, conference_survey_path(conference.short_title, survey)
%br

2
app/views/surveys/show.html.haml
View file

@ -12,7 +12,7 @@
= @survey.end_date
- unless @survey.active?
%label
%i.fa.fa-exclamation-circle
%i.fa-solid.fa-circle-exclamation
This survey does not accept replies at this monent.
.row
.col-md-12

2
app/views/tickets/index.html.haml
View file

@ -39,7 +39,7 @@
.btn-group-vertical
= button_tag(type: 'submit', class: 'btn btn-success btn-lg') do
Continue
%i.fa.fa-shopping-cart
%i.fa-solid.fa-cart-shopping
= link_to 'Back to registration',
conference_conference_registration_path(@conference.short_title),
class: 'btn btn-default btn-sm'

8
app/views/tracks/index.html.haml
View file

@ -40,13 +40,13 @@
%tr
%td{style: "padding:15px 0px 0px 8px;"}
- if %w(new to_accept to_reject).include? track.state
%span{ title: 'In review', class: 'fa fa-eye' }
%span{ title: 'In review', class: 'fa-solid fa-eye' }
- elsif track.state == 'accepted'
%span{ title: 'Accepted', class: 'fa fa-check text-muted' }
%span{ title: 'Accepted', class: 'fa-solid fa-check text-muted' }
- elsif track.state == 'confirmed'
%spam{ title: 'Confirmed', class: 'fa fa-check text-success' }
%spam{ title: 'Confirmed', class: 'fa-solid fa-check text-success' }
- elsif %w(rejected withdrawn canceled).include? track.state
%span{ title: track.state.humanize, class: 'fa fa-ban'}
%span{ title: track.state.humanize, class: 'fa-solid fa-ban'}
%td{style: "padding: 15px 0px 0px 0px;"}
= link_to conference_program_track_path(@conference.short_title, track), class: 'btn' do
%span.label{style: "background-color: #{track.color}; color: #{ contrast_color(track.color) }"}

4
spec/features/surveys_spec.rb
View file

@ -41,7 +41,7 @@ feature Survey do
create :boolean_mandatory, survey: survey
visit conference_conference_registration_path(conference)
expect(find(:link, survey.title).sibling('.fa')[:title]).to eq('Please fill out the survey')
expect(find(:link, survey.title).sibling('.fa-solid')[:title]).to eq('Please fill out the survey')
click_link survey.title
choose 'Yes'
@ -49,7 +49,7 @@ feature Survey do
expect(flash).to eq('Successfully responded to survey.')
visit conference_conference_registration_path(conference)
expect(find(:link, survey.title).sibling('.fa')[:title]).to eq('Thank you for filling out the survey')
expect(find(:link, survey.title).sibling('.fa-solid')[:title]).to eq('Thank you for filling out the survey')
end
end
end