Merge pull request #2450 from tulibraries/qa

Week 0f 08-23-2022
tulibraries · Aug 23, 2022 · a465e5b · a465e5b
2 parents cbddd9c + 0fc0269
commit a465e5b
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 43 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -111,7 +111,7 @@ jobs:
 
   qa_deploy:
     docker:
-      - image: cimg/python:3.7.11
+      - image: cimg/python:3.9.10
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_PASSWORD
@@ -128,7 +128,7 @@ jobs:
 
   stage_deploy:
     docker:
-      - image: cimg/python:3.7.11
+      - image: cimg/python:3.9.10
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_PASSWORD
@@ -145,7 +145,7 @@ jobs:
 
   prod_deploy:
     docker:
-      - image: cimg/python:3.7.11
+      - image: cimg/python:3.9.10
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_PASSWORD

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -356,7 +356,7 @@ GEM
       omniauth (~> 2.0)
     orm_adapter (0.5.0)
     os (1.1.4)
-    paper_trail (12.3.0)
+    paper_trail (13.0.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
     parallel (1.22.1)
@@ -371,7 +371,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
     pry-rails (0.3.9)
@@ -574,7 +574,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.17.1)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss
@@ -572,6 +572,19 @@
   .library-event:first-of-type, .library-news:first-of-type {
     padding-left: 14px;
   }
+
+  a.view-all-blogs {
+    display: block;
+    margin-left: 14px;
+    margin-right: 14px;
+    padding: 7px;
+    background-color: $crystal-blue;
+    color: $royal-blue;
+    padding-right: 35px;
+    font-family: "faustina bold" !important;
+    font-size: 135%;
+    font-weight: 900;
+  }
 }
 
 .access-link {

diff --git a/app/assets/stylesheets/partials/_categories.scss b/app/assets/stylesheets/partials/_categories.scss
@@ -11,6 +11,7 @@
 			}
 			.category-icon {
 				opacity: .5;
+        max-width: 130px;
 			}
 		}
 	}

diff --git a/app/views/blogs/index.html.erb b/app/views/blogs/index.html.erb
@@ -6,27 +6,6 @@
   </div>
 </div>
 
-<div class="row highlights">
-  <% unless @highlights.nil? %>
-  <% @highlights.each do |highlight| %>
-  <div class="col-12 col-lg-6 highlight">
-    <% if highlight.image.attached?  %>
-    <%= link_to (image_tag highlight.custom_image(600, 264), class: "decorative", alt: ""), strip_tags(highlight.link) %>
-    <% end %>
-    <div class="highlight-caption">
-      <h2><%= link_to highlight.label.truncate(52), strip_tags(highlight.link) %></h2>
-      <div class="highlight-description">
-        <%= strip_tags(highlight.blurb.truncate(120).html_safe) %>
-      </div>
-      <div class="unnecessary-link">
-        <%= link_to t("manifold.blogs.read_more"), strip_tags(highlight.link), class: "read-more" %>
-      </div>
-    </div>
-  </div>
-  <% end %>
-  <% end %>
-</div>
-
 <div class="row" id="blog-section">
   <div class="col-12 section-title">
     <h2><%= t("manifold.blogs.read_more") %></h2>

diff --git a/app/views/webpages/_categories.html.erb b/app/views/webpages/_categories.html.erb
@@ -11,7 +11,7 @@
 					<% unless category.image.attachment.nil? %>
 						<%= image_tag category.image, class: "category-icon decorative", alt: "" %> 
 					<% else %>
-						<%= image_tag "T.png", class: "decorative", alt: "" %>
+						<%= image_tag "T.png", class: "category-icon decorative p-3", alt: "" %>
 					<% end %>
 						<br /><%= category.name %>
 					<% end %>

diff --git a/app/views/webpages/_featured.html.erb b/app/views/webpages/_featured.html.erb
@@ -11,4 +11,8 @@
       </div>
 		</div>
   <% end %>
-<% end %>
+<% end %>
+
+<div class="col-12 text-right px-0">
+  <%= link_to "View library blogs", blogs_path, class: "view-all-blogs" %>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -429,8 +429,7 @@ en:
         eleven: Reading
         twelve: Scholarly Communications & Open Publishing
         thirteen: Speaker
-        fourteen: What Comes Next
-        fifteen: Workshop
+        fourteen: Workshop
       index:
         page_title: Events & Exhibits
         current_exhibits_label: Current Exhibits
@@ -739,22 +738,19 @@ en:
       library_instruction:
         title: "Request a Library Instruction Session"
         intro_html: >-
-                    <p>Teaching librarians will have limited on-campus availability, and can arrange
-                    in-person instruction by request. Librarians can provide online instruction for
-                    classes in all formats, either synchronously through Zoom or asynchronously.
-                    Asynchronous instruction can include pre-recorded lectures, interactive tutorials,
-                    demonstrations via screen recording, information literacy assignments, and more.
-                    Please use this form to schedule a synchronous session, or to indicate that you’d
-                    like a librarian to contact you about asynchronous instruction.</p>
+                    <p>Librarians can partner with instructors to help your students achieve course learning goals related to 
+                    research, information and digital literacy, and more. Invite a librarian to visit your in-person or online 
+                    class using this form. Your request will be forwarded to a subject librarian, and you can expect a response 
+                    within 48 hours.</p>
         course_title: Course Title
         course_code: Course Code (e.g,. SOC 0832)
         first_choice_date: First Choice Date
         second_choice_date: Second Choice Date
         instruction_mode: Mode of Instruction
         instruction_mode_options:
-          one: Synchronous via Zoom
-          two: Asynchronous
-          three: I'm not sure
+          one: In-person
+          two: Online
+          three: Hybrid/Other
         class_time: Time Class Meets
         class_days: Day(s) Class Meets
         number_of_students: Number of Students
@@ -927,13 +923,13 @@ en:
         intro_html: >-
                     <p>Spouses/partners of current Temple University faculty and staff members may apply for a library 
                     borrowing card that will allow them to borrow up to ten items at a time and 2-hour use of the guest 
-                    computers on the ground floor of the Tuttleman Learning Center.</p>
+                    computers on the first floor of Charles Library.</p>
                     <p>The spouse/partner borrowing card does not allow for off-site access to databases as the University 
                     Libraries contracts with database vendors prohibit this. Once your application is received, and your 
                     status is confirmed, it may take up to two weeks for you to receive your card in the mail.</p>
                     <p>To begin this process, the sponsoring faculty/staff member must fill out the below form and submit 
                     for approval.</p>
-                    <p>You may contact the Circulation/Reserve Unit of Paley Library at 215-204-8212 if you have any questions.</p>
+                    <p>You may contact the Circulation/Reserve Unit of Charles Library at 215-204-8212 if you have any questions.</p>
         partner_name: Name of Spouse/Partner
         partner_email: Email of Spouse/Partner
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ @@
     			}
     			.category-icon {
     				opacity: .5;
+            max-width: 130px;
     			}
     		}
     	}
@@ Expand Down @@