Skip to content

Commit

Permalink
Updates forms for Bootstrap5
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Scherz committed Nov 4, 2024
1 parent a3f6252 commit f8cfdc8
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 105 deletions.
6 changes: 3 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '3.3.3'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1.7.8'
gem 'rails', '~> 6.1.7.9'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.4'

Expand All @@ -16,7 +16,7 @@ gem 'net-protocol', '>= 0'
# Use nokogiri for java
gem 'nokogiri', '>= 1.16.5'
# Use Puma as the app server
gem 'puma', '>= 6.3.1'
gem 'puma', '>= 6.4.3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Devise for authentication
Expand All @@ -36,7 +36,7 @@ gem 'rails-controller-testing'
# Use rubocop for static code analysis
gem 'rubocop'
# bundler audit
gem 'rexml', '>= 3.3.2'
gem 'rexml', '>= 3.3.9'
gem 'rubocop-rails', require: false

gem 'rubocop-rspec', require: false
Expand Down
156 changes: 77 additions & 79 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7.8)
actionpack (= 6.1.7.8)
activesupport (= 6.1.7.8)
actioncable (6.1.7.10)
actionpack (= 6.1.7.10)
activesupport (= 6.1.7.10)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.8)
actionpack (= 6.1.7.8)
activejob (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
actionmailbox (6.1.7.10)
actionpack (= 6.1.7.10)
activejob (= 6.1.7.10)
activerecord (= 6.1.7.10)
activestorage (= 6.1.7.10)
activesupport (= 6.1.7.10)
mail (>= 2.7.1)
actionmailer (6.1.7.8)
actionpack (= 6.1.7.8)
actionview (= 6.1.7.8)
activejob (= 6.1.7.8)
activesupport (= 6.1.7.8)
actionmailer (6.1.7.10)
actionpack (= 6.1.7.10)
actionview (= 6.1.7.10)
activejob (= 6.1.7.10)
activesupport (= 6.1.7.10)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.8)
actionview (= 6.1.7.8)
activesupport (= 6.1.7.8)
actionpack (6.1.7.10)
actionview (= 6.1.7.10)
activesupport (= 6.1.7.10)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.8)
actionpack (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
actiontext (6.1.7.10)
actionpack (= 6.1.7.10)
activerecord (= 6.1.7.10)
activestorage (= 6.1.7.10)
activesupport (= 6.1.7.10)
nokogiri (>= 1.8.5)
actionview (6.1.7.8)
activesupport (= 6.1.7.8)
actionview (6.1.7.10)
activesupport (= 6.1.7.10)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.8)
activesupport (= 6.1.7.8)
activejob (6.1.7.10)
activesupport (= 6.1.7.10)
globalid (>= 0.3.6)
activemodel (6.1.7.8)
activesupport (= 6.1.7.8)
activerecord (6.1.7.8)
activemodel (= 6.1.7.8)
activesupport (= 6.1.7.8)
activestorage (6.1.7.8)
actionpack (= 6.1.7.8)
activejob (= 6.1.7.8)
activerecord (= 6.1.7.8)
activesupport (= 6.1.7.8)
activemodel (6.1.7.10)
activesupport (= 6.1.7.10)
activerecord (6.1.7.10)
activemodel (= 6.1.7.10)
activesupport (= 6.1.7.10)
activestorage (6.1.7.10)
actionpack (= 6.1.7.10)
activejob (= 6.1.7.10)
activerecord (= 6.1.7.10)
activesupport (= 6.1.7.10)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.8)
activesupport (6.1.7.10)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -115,10 +115,10 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.3.3)
concurrent-ruby (1.3.4)
crass (1.0.6)
csv (3.3.0)
date (3.3.4)
date (3.4.0)
devise (4.9.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand Down Expand Up @@ -149,7 +149,7 @@ GEM
gritter (1.2.0)
groupdate (6.4.0)
activesupport (>= 6.1)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jbuilder (2.12.0)
actionview (>= 5.0.0)
Expand All @@ -163,7 +163,7 @@ GEM
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.22.0)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -175,10 +175,10 @@ GEM
matrix (0.4.2)
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.24.1)
minitest (5.25.1)
msgpack (1.7.2)
mysql2 (0.5.6)
net-imap (0.4.14)
net-imap (0.5.0)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -192,18 +192,18 @@ GEM
net-smtp (0.5.0)
net-protocol
net-ssh (7.2.3)
nio4r (2.7.3)
nokogiri (1.16.6-aarch64-linux)
nio4r (2.7.4)
nokogiri (1.16.7-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm-linux)
nokogiri (1.16.7-arm-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm64-darwin)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86-linux)
nokogiri (1.16.7-x86-linux)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-darwin)
nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.25.1)
Expand All @@ -214,26 +214,26 @@ GEM
activerecord (> 4.0.0)
popper_js (2.11.8)
public_suffix (6.0.0)
puma (6.4.2)
puma (6.4.3)
nio4r (~> 2.0)
racc (1.8.0)
rack (2.2.9)
racc (1.8.1)
rack (2.2.10)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.8)
actioncable (= 6.1.7.8)
actionmailbox (= 6.1.7.8)
actionmailer (= 6.1.7.8)
actionpack (= 6.1.7.8)
actiontext (= 6.1.7.8)
actionview (= 6.1.7.8)
activejob (= 6.1.7.8)
activemodel (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
rails (6.1.7.10)
actioncable (= 6.1.7.10)
actionmailbox (= 6.1.7.10)
actionmailer (= 6.1.7.10)
actionpack (= 6.1.7.10)
actiontext (= 6.1.7.10)
actionview (= 6.1.7.10)
activejob (= 6.1.7.10)
activemodel (= 6.1.7.10)
activerecord (= 6.1.7.10)
activestorage (= 6.1.7.10)
activesupport (= 6.1.7.10)
bundler (>= 1.15.0)
railties (= 6.1.7.8)
railties (= 6.1.7.10)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -246,9 +246,9 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (6.1.7.8)
actionpack (= 6.1.7.8)
activesupport (= 6.1.7.8)
railties (6.1.7.10)
actionpack (= 6.1.7.10)
activesupport (= 6.1.7.10)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand All @@ -263,8 +263,7 @@ GEM
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.3.2)
strscan
rexml (3.3.9)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
Expand Down Expand Up @@ -343,11 +342,11 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.3)
sprockets (3.7.5)
base64
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.5.1)
sprockets-rails (3.5.2)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
Expand All @@ -362,8 +361,7 @@ GEM
net-scp (>= 1.1.2)
net-sftp (>= 2.1.2)
net-ssh (>= 2.8.0)
strscan (3.1.0)
thor (1.3.1)
thor (1.3.2)
tilt (2.4.0)
timeout (0.4.1)
turbolinks (5.2.1)
Expand All @@ -387,7 +385,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.16)
zeitwerk (2.7.1)

PLATFORMS
aarch64-linux
Expand Down Expand Up @@ -426,12 +424,12 @@ DEPENDENCIES
net-protocol
nokogiri (>= 1.16.5)
petergate
puma (>= 6.3.1)
rails (~> 6.1.7.8)
puma (>= 6.4.3)
rails (~> 6.1.7.9)
rails-controller-testing
rb-readline
recaptcha
rexml (>= 3.3.2)
rexml (>= 3.3.9)
rspec-rails (~> 4.1.0)
rspec_junit_formatter
rubocop
Expand Down
6 changes: 3 additions & 3 deletions app/views/change_requests/_form.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@

<div class="field">
<%= form.label :authentication_needed %>
<%= form.check_box :authentication_needed, :class => "form-control" %>
<%= form.check_box :authentication_needed%>
</div><br/>

<div class="field">
<%= form.label :custom_error_pages %>
<%= form.check_box :custom_error_pages, :class => "form-control" %>
<%= form.check_box :custom_error_pages%>
</div><br/>

<div class="field">
Expand All @@ -49,7 +49,7 @@

<div class="field">
<%= form.label :change_completed %>
<%= form.check_box :change_completed, :class => "form-control" %>
<%= form.check_box :change_completed%>
</div><br/>

<div class="field">
Expand Down
4 changes: 2 additions & 2 deletions app/views/hosting_environments/_form.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
<% end %>

<div class="field">
<%= form.label :title %>
<%= form.label :title, class: 'text-white' %>
<%= form.text_field :title, :class => "form-control" %>
</div><br/>

<div class="field">
<%= form.label :description %>
<%= form.label :description, class: 'text-white' %>
<%= form.text_field :description, :class => "form-control" %>
</div>
<br/><br/>
Expand Down
10 changes: 5 additions & 5 deletions app/views/software_records/_form.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@
<%= form_with(model: software_record, local: true) do |form| %>
<ul class="nav nav-tabs" id="softwareRecordTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="general-tab" data-bs-toggle="tab" href="#general" role="tab" aria-controls="general"
<a class="nav-link active text-white" id="general-tab" data-bs-toggle="tab" href="#general" role="tab" aria-controls="general"
aria-selected="true">General</a>
</li>
<li class="nav-item">
<a class="nav-link" id="server-environment-tab" data-bs-toggle="tab" href="#server-environment" role="tab" aria-controls="server-environment"
<a class="nav-link text-white" id="server-environment-tab" data-bs-toggle="tab" href="#server-environment" role="tab" aria-controls="server-environment"
aria-selected="false">Server Environment</a>
</li>
<li class="nav-item">
<a class="nav-link" id="change-management-tab" data-bs-toggle="tab" href="#change-management" role="tab" aria-controls="change-management"
<a class="nav-link text-white" id="change-management-tab" data-bs-toggle="tab" href="#change-management" role="tab" aria-controls="change-management"
aria-selected="false">Change Management</a>
</li>
<li class="nav-item">
<a class="nav-link" id="upgrade-history-tab" data-bs-toggle="tab" href="#upgrade-history" role="tab" aria-controls="upgrade-history"
<a class="nav-link text-white" id="upgrade-history-tab" data-bs-toggle="tab" href="#upgrade-history" role="tab" aria-controls="upgrade-history"
aria-selected="false">Upgrade History</a>
</li>
<li class="nav-item">
<a class="nav-link" id="maintenance-log-tab" data-bs-toggle="tab" href="#maintenance-log" role="tab" aria-controls="maintenance-log"
<a class="nav-link text-white" id="maintenance-log-tab" data-bs-toggle="tab" href="#maintenance-log" role="tab" aria-controls="maintenance-log"
aria-selected="false">Maintenance Log</a>
</li>
</ul>
Expand Down
Loading

0 comments on commit f8cfdc8

Please sign in to comment.