Skip to content

Commit

Permalink
Merge pull request #2357 from tulibraries/qa
Browse files Browse the repository at this point in the history 
Week of 05-16-2022
  • Loading branch information
@cdoyle-temple
cdoyle-temple authored May 16, 2022
2 parents c5f35bf + 36cde85 commit 27e9196
Show file tree
Hide file tree
Showing 14 changed files with 117 additions and 86 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby "2.7.2"

gem "rails", "~> 6.1.5"
gem "rails", "~> 6.1.6"
gem "timecop"
gem "administrate", ">= 0.16.0"
gem "ancestry"
Expand Down
146 changes: 73 additions & 73 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,40 @@ GEM
specs:
action-draft (0.4.0)
rails (>= 5.2)
actioncable (6.1.5.1)
actionpack (= 6.1.5.1)
activesupport (= 6.1.5.1)
actioncable (6.1.6)
actionpack (= 6.1.6)
activesupport (= 6.1.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.5.1)
actionpack (= 6.1.5.1)
activejob (= 6.1.5.1)
activerecord (= 6.1.5.1)
activestorage (= 6.1.5.1)
activesupport (= 6.1.5.1)
actionmailbox (6.1.6)
actionpack (= 6.1.6)
activejob (= 6.1.6)
activerecord (= 6.1.6)
activestorage (= 6.1.6)
activesupport (= 6.1.6)
mail (>= 2.7.1)
actionmailer (6.1.5.1)
actionpack (= 6.1.5.1)
actionview (= 6.1.5.1)
activejob (= 6.1.5.1)
activesupport (= 6.1.5.1)
actionmailer (6.1.6)
actionpack (= 6.1.6)
actionview (= 6.1.6)
activejob (= 6.1.6)
activesupport (= 6.1.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.5.1)
actionview (= 6.1.5.1)
activesupport (= 6.1.5.1)
actionpack (6.1.6)
actionview (= 6.1.6)
activesupport (= 6.1.6)
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.5.1)
actionpack (= 6.1.5.1)
activerecord (= 6.1.5.1)
activestorage (= 6.1.5.1)
activesupport (= 6.1.5.1)
actiontext (6.1.6)
actionpack (= 6.1.6)
activerecord (= 6.1.6)
activestorage (= 6.1.6)
activesupport (= 6.1.6)
nokogiri (>= 1.8.5)
actionview (6.1.5.1)
activesupport (= 6.1.5.1)
actionview (6.1.6)
activesupport (= 6.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -46,22 +46,22 @@ GEM
activemodel (>= 5.2.0)
activestorage (>= 5.2.0)
activesupport (>= 5.2.0)
activejob (6.1.5.1)
activesupport (= 6.1.5.1)
activejob (6.1.6)
activesupport (= 6.1.6)
globalid (>= 0.3.6)
activemodel (6.1.5.1)
activesupport (= 6.1.5.1)
activerecord (6.1.5.1)
activemodel (= 6.1.5.1)
activesupport (= 6.1.5.1)
activestorage (6.1.5.1)
actionpack (= 6.1.5.1)
activejob (= 6.1.5.1)
activerecord (= 6.1.5.1)
activesupport (= 6.1.5.1)
activemodel (6.1.6)
activesupport (= 6.1.6)
activerecord (6.1.6)
activemodel (= 6.1.6)
activesupport (= 6.1.6)
activestorage (6.1.6)
actionpack (= 6.1.6)
activejob (= 6.1.6)
activerecord (= 6.1.6)
activesupport (= 6.1.6)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.5.1)
activesupport (6.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -91,7 +91,7 @@ GEM
autoprefixer-rails (10.4.2.0)
execjs (~> 2)
aws-eventstream (1.2.0)
aws-partitions (1.580.0)
aws-partitions (1.583.0)
aws-sdk-core (3.130.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
Expand All @@ -100,7 +100,7 @@ GEM
aws-sdk-kms (1.56.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.113.2)
aws-sdk-s3 (1.114.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
Expand All @@ -114,12 +114,12 @@ GEM
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
brakeman (5.2.2)
brakeman (5.2.3)
browser (5.3.1)
builder (3.2.4)
byebug (11.1.3)
cancancan (3.3.0)
capybara (3.36.0)
capybara (3.37.1)
addressable
matrix
mini_mime (>= 0.1.3)
Expand Down Expand Up @@ -168,7 +168,7 @@ GEM
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (2.20.0)
faker (2.21.0)
i18n (>= 1.8.11, < 2)
faraday (2.2.0)
faraday-net_http (~> 2.0)
Expand Down Expand Up @@ -255,15 +255,15 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json-canonicalization (0.3.0)
json-ld (3.2.0)
json-ld (3.2.1)
htmlentities (~> 4.3)
json-canonicalization (~> 0.3)
link_header (~> 0.0, >= 0.0.8)
multi_json (~> 1.15)
rack (~> 2.2)
rdf (~> 3.2)
json-schema (2.8.1)
addressable (>= 2.4)
json-schema (3.0.0)
addressable (>= 2.8)
jwt (2.3.0)
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand All @@ -284,7 +284,7 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
lockbox (0.6.8)
loofah (2.16.0)
loofah (2.17.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.2.8)
Expand Down Expand Up @@ -314,18 +314,18 @@ GEM
msgpack (1.4.5)
multi_json (1.15.0)
multi_xml (0.6.0)
mutant (0.11.8)
mutant (0.11.10)
diff-lcs (~> 1.3)
parser (~> 3.1.0)
regexp_parser (~> 2.3, >= 2.3.1)
sorbet-runtime (~> 0.5.0)
unparser (~> 0.6.5)
mutant-rspec (0.11.8)
mutant (= 0.11.8)
mutant-rspec (0.11.10)
mutant (= 0.11.10)
rspec-core (>= 3.8.0, < 4.0.0)
nenv (0.3.0)
nio4r (2.5.8)
nokogiri (1.13.4)
nokogiri (1.13.6)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
notiffany (0.1.3)
Expand Down Expand Up @@ -375,7 +375,7 @@ GEM
pry (~> 0.13.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.6)
public_suffix (4.0.7)
puma (5.6.4)
nio4r (~> 2.0)
racc (1.6.0)
Expand All @@ -386,20 +386,20 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.1.5.1)
actioncable (= 6.1.5.1)
actionmailbox (= 6.1.5.1)
actionmailer (= 6.1.5.1)
actionpack (= 6.1.5.1)
actiontext (= 6.1.5.1)
actionview (= 6.1.5.1)
activejob (= 6.1.5.1)
activemodel (= 6.1.5.1)
activerecord (= 6.1.5.1)
activestorage (= 6.1.5.1)
activesupport (= 6.1.5.1)
rails (6.1.6)
actioncable (= 6.1.6)
actionmailbox (= 6.1.6)
actionmailer (= 6.1.6)
actionpack (= 6.1.6)
actiontext (= 6.1.6)
actionview (= 6.1.6)
activejob (= 6.1.6)
activemodel (= 6.1.6)
activerecord (= 6.1.6)
activestorage (= 6.1.6)
activesupport (= 6.1.6)
bundler (>= 1.15.0)
railties (= 6.1.5.1)
railties (= 6.1.6)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -415,9 +415,9 @@ GEM
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (6.1.5.1)
actionpack (= 6.1.5.1)
activesupport (= 6.1.5.1)
railties (6.1.6)
actionpack (= 6.1.6)
activesupport (= 6.1.6)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand All @@ -426,9 +426,9 @@ GEM
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdf (3.2.6)
rdf (3.2.7)
link_header (~> 0.0, >= 0.0.8)
regexp_parser (2.3.1)
regexp_parser (2.4.0)
representable (3.1.1)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
Expand Down Expand Up @@ -470,12 +470,12 @@ GEM
rswag-ui (2.5.1)
actionpack (>= 3.1, < 7.1)
railties (>= 3.1, < 7.1)
rubocop (1.28.2)
rubocop (1.29.1)
parallel (~> 1.10)
parser (>= 3.1.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.17.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
Expand Down Expand Up @@ -533,7 +533,7 @@ GEM
skylight-core (= 4.3.2)
skylight-core (4.3.2)
activesupport (>= 4.2.0)
sorbet-runtime (0.5.9928)
sorbet-runtime (0.5.9959)
spring (2.1.1)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
Expand Down Expand Up @@ -648,7 +648,7 @@ DEPENDENCIES
pry-byebug
pry-rails
puma (~> 5.6)
rails (~> 6.1.5)
rails (~> 6.1.6)
rails-controller-testing
rails-erd
rspec-activemodel-mocks
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/services.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
li.selected {
a {
color: $seagreen;
font-family: "Faustina";
font-weight: 900;
}
}
Expand Down
2 changes: 2 additions & 0 deletions app/dashboards/webpage_dashboard.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class WebpageDashboard < Administrate::BaseDashboard
multiple: false,
),
virtual_tour: Field::String,
tutorial_path: Field::String,
categories: Field::HasMany,
accounts: Field::HasMany.with_options(admin_only: true),
external_link: Field::BelongsTo.with_options(order: "title"),
Expand Down Expand Up @@ -63,6 +64,7 @@ class WebpageDashboard < Administrate::BaseDashboard
:draft_description,
:group,
:categories,
:tutorial_path,
:virtual_tour,
:accounts,
:layout,
Expand Down
10 changes: 8 additions & 2 deletions app/views/fields/string/_form.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<div class="field-unit__label">
<%= f.label field.attribute %>
<% if is_admin? %>
<% if field.attribute == :slug %>
<% if [:tutorial_path].include? field.attribute %>
<p style="height:1.5rem"></p>
<% end %>
<% if [:slug].include? field.attribute %>
<p style="height:3rem"></p>
<% end %>
<% if field.attribute == :title || field.attribute == :name %>
<% if [:title, :name].include? field.attribute %>
<p style="height:4rem"></p>
<% end %>
<% end %>
Expand All @@ -18,5 +21,8 @@
<% if field.attribute == :name || field.attribute == :title %>
<p><%= t("manifold.default.fields.string.renaming") %></p>
<% end %>
<% if field.attribute == :tutorial_path %>
<p><%= t("manifold.default.fields.string.tutorial_path") %></p>
<% end %>
<% end %>
</div>
1 change: 0 additions & 1 deletion app/views/webpages/_none.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
<%= @webpage.description %>
3 changes: 3 additions & 0 deletions app/views/webpages/_tutorial.html.erb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div class="mt-4 temple-library-tutorial">
<iframe width="850px" height="650px" style="max-width: 100%;" src="https://alt.library.temple.edu/tutorials/<%= @webpage.tutorial_path %>"></iframe>
</div>
11 changes: 5 additions & 6 deletions app/views/webpages/_virtual-tour.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<%= @webpage.description %>
<div style="position:relative; height:0; padding-top:56.25%">
<iframe style="position:absolute; top:0; left:0; width:100%; height:100%;"
src="<%= @webpage.virtual_tour %>" name="TOUR NAME"
width="100%" height="100%" frameborder="0" allowfullscreen="true"
allow="fullscreen; accelerometer; gyroscope; magnetometer; vr; camera; microphone">
</iframe>
<iframe style="position:absolute; top:0; left:0; width:100%; height:100%;"
src="<%= @webpage.virtual_tour %>" name="TOUR NAME"
width="100%" height="100%" frameborder="0" allowfullscreen="true"
allow="fullscreen; accelerometer; gyroscope; magnetometer; vr; camera; microphone">
</iframe>
</div>
3 changes: 2 additions & 1 deletion app/views/webpages/show.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@

<h1><%= title @webpage.title %></h1>
<div class="text-left page-description">
<div><%= @webpage.description %></div>
<%= render @webpage.layout.parameterize %>
</div>
</div>

<% unless @webpage.layout == "Virtual Tour" %>
<% unless ["Virtual Tour", "Tutorial"].include?(@webpage.layout) %>
<div class="col-12 col-md-3">

<% if @webpage.external_link.present? %>
Expand Down
1 change: 1 addition & 0 deletions config/initializers/dashboard_collections.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class Application < Rails::Application

config.page_layouts = ["None",
"Email",
"Tutorial",
"Virtual Tour"
]

Expand Down
Loading

0 comments on commit 27e9196

Please sign in to comment.