Merge branch 'master' of https://github.com/ualbertalib/library-cms

merging
ualbertalib · Jul 17, 2019 · 1b350d9 · 1b350d9
2 parents ec27553 + 83f93e9
commit 1b350d9
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 36 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem 'sqlite3'
 
 gem 'mysql2', '~> 0.5.2'
 # Use Puma as the app server
-gem 'puma', '~> 3.12'
+gem 'puma', '~> 4.0'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
@@ -18,7 +18,7 @@ gem 'uglifier', '>= 1.3.0'
 gem 'execjs'
 gem 'mini_racer'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.5'
+gem 'jbuilder', '~> 2.9'
 # Use Redis adapter to run Action Cable in production
 # gem 'redis', '~> 4.0'
 # Use ActiveModel has_secure_password

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -51,20 +51,20 @@ GEM
       io-like (~> 0.3.0)
     arel (9.0.0)
     bindex (0.5.0)
-    bootsnap (1.4.2)
+    bootsnap (1.4.4)
       msgpack (~> 1.0)
     builder (3.2.3)
     byebug (11.0.1)
-    capybara (3.16.1)
+    capybara (3.26.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (~> 1.5)
       xpath (~> 3.2)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
+    childprocess (1.0.1)
+      rake (< 13.0)
     chromedriver-helper (2.1.1)
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
@@ -86,7 +86,7 @@ GEM
     erubi (1.8.0)
     erubis (2.7.0)
     execjs (2.7.0)
-    ffi (1.9.25)
+    ffi (1.10.0)
     friendly_id (5.2.5)
       activerecord (>= 4.0.0)
     globalid (0.4.2)
@@ -109,15 +109,14 @@ GEM
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     io-like (0.3.0)
-    jbuilder (2.8.0)
+    jbuilder (2.9.1)
       activesupport (>= 4.2.0)
-      multi_json (>= 1.2)
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     kramdown (1.17.0)
-    libv8 (6.7.288.46.1)
+    libv8 (7.3.492.27.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -132,20 +131,20 @@ GEM
     method_source (0.9.2)
     mimemagic (0.3.3)
     mini_magick (4.9.2)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    mini_racer (0.2.4)
-      libv8 (>= 6.3)
+    mini_racer (0.2.6)
+      libv8 (>= 6.9.411)
     minitest (5.11.3)
-    msgpack (1.2.9)
-    multi_json (1.13.1)
+    msgpack (1.2.10)
     mysql2 (0.5.2)
-    nio4r (2.3.1)
-    nokogiri (1.10.2)
+    nio4r (2.4.0)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    public_suffix (3.0.3)
-    puma (3.12.1)
-    rack (2.0.6)
+    public_suffix (3.1.1)
+    puma (4.0.1)
+      nio4r (~> 2.0)
+    rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.3)
@@ -179,7 +178,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    regexp_parser (1.3.0)
+    regexp_parser (1.5.1)
     ruby_dep (1.5.0)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
@@ -195,12 +194,11 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (3.141.0)
-      childprocess (~> 0.5)
+    selenium-webdriver (3.142.3)
+      childprocess (>= 0.5, < 2.0)
       rubyzip (~> 1.2, >= 1.2.2)
     sexp_processor (4.11.0)
-    spring (2.0.2)
-      activesupport (>= 4.2)
+    spring (2.1.0)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
@@ -211,7 +209,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.0)
+    sqlite3 (1.4.1)
     temple (0.8.0)
     thor (0.20.3)
     thread_safe (0.3.6)
@@ -243,11 +241,11 @@ DEPENDENCIES
   execjs
   friendly_id
   htmlentities
-  jbuilder (~> 2.5)
+  jbuilder (~> 2.9)
   listen (>= 3.0.5, < 3.2)
   mini_racer
   mysql2 (~> 0.5.2)
-  puma (~> 3.12)
+  puma (~> 4.0)
   rails (~> 5.2.3)
   selenium-webdriver
   spring

diff --git a/app/views/hosted_journals/index.html.erb b/app/views/hosted_journals/index.html.erb
@@ -0,0 +1,19 @@
+<div class="cms">
+<h1>Journals hosted by UALibraries on OJS</h1>
+
+<table>
+  <tr>
+    <th>Title</th>
+    <th>URL</th>
+    <th></th>
+  </tr>
+
+  <% @hosted_journals.each do |hosted_journal| %>
+    <tr>
+      <td><%= link_to hosted_journal.title, hosted_journal_path(hosted_journal) %></td>
+      <td><%= hosted_journal.url %></td>
+
+    </tr>
+  <% end %>
+</table>
+</div>
diff --git a/app/views/profiles/index.html.haml b/app/views/profiles/index.html.haml
@@ -36,19 +36,19 @@
       - if @unit == "augustana"
         %ul.unit-top
           %li
-            Unit Head:<br/>
-            <a href="/staff/nancy-goebel" data-no-turbolink="true">Nancy Goebel</a> 
+            Interim Head:<br/>
+            <a href="/staff/katherine-koch" data-no-turbolink="true">Katherine Koch</a> 
           %li
             Location:<br/>
             <a href="/locations/augustana" data-no-turbolink="true">Augustana Library</a> 
           %li
             Phone:<br/>
-            <a href="tel:780-679-1156">780-679-1189</a>
+            <a href="tel:780-679-1189">780-679-1189</a>
           %li.last
             Website: 
             <a href="https://www.library.ualberta.ca/augustana/">www.library.ualberta.ca/augustana</a></br>
             Email:
-            <a href="mailto:nancy.goebel@ualberta.ca">nancy.goebel@ualberta.ca</a>
+            <a href="mailto:katherine.koch@ualberta.ca">katherine.koch@ualberta.ca</a>
       - if @unit == "bib"
         %ul.unit-top
           %li
@@ -66,7 +66,7 @@
         %ul.unit-top
           %li
             Interim Head:<br/>
-            <a href="/staff/denis-lacroix" data-no-turbolink="true">Denis Lacroix</a> 
+            <a href="/staff/debbie-feisst" data-no-turbolink="true">Debbie Feisst</a> 
           %li
             Location:<br/>
             <a href="/locations/staint" data-no-turbolink="true">Campus Saint Jean</a> 
@@ -75,7 +75,7 @@
             <a href="780-465-8710">780-465-8710</a>
           %li.last
             Email:<br/>
-            <a href="mailto:denis.lacroix@ualberta.ca">denis.lacroix@ualberta.ca</a>
+            <a href="mailto:debbie.feisst@ualberta.ca">debbie.feisst@ualberta.ca</a>
       - if @unit == "business"
         %ul.unit-top
           %li.col-md-2
@@ -118,7 +118,7 @@
       - if @unit == "education"
         %ul.unit-top
           %li
-            Unit Head:<br/>
+            Interim Head:<br/>
             <a href="/staff/debbie-feisst" data-no-turbolink="true">Debbie Feisst</a>
           %li
             Location:<br/>