diff --git a/Gemfile b/Gemfile index e641a024..5bfbc143 100644 --- a/Gemfile +++ b/Gemfile @@ -79,3 +79,6 @@ gem 'iiif-presentation' gem 'omniauth-cas' gem 'sneakers' gem 'open_uri_redirections' + +# PUL Assets +gem 'pul-assets', github: 'pulibrary/pul_assets' diff --git a/Gemfile.lock b/Gemfile.lock index ebf9de9f..99fbe2aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GIT remote: git://github.com/sul-dlss/spotlight.git - revision: 282be810392c44e31ff1e48a309f5649f05cc999 + revision: e496307681e7df6ca9c0d5c07893c29c317b7f06 specs: - blacklight-spotlight (0.15.0) + blacklight-spotlight (0.17.1) acts-as-taggable-on (~> 3.5) autoprefixer-rails blacklight (~> 5.16) @@ -19,7 +19,7 @@ GIT faraday_middleware friendly_id (~> 5.1.0) github-markup - google-api-client + google-api-client (~> 0.8.0) legato lodash-rails mail_form (~> 1.5, >= 1.5.1) @@ -27,7 +27,7 @@ GIT nokogiri oauth2 openseadragon - paper_trail (~> 4.0.0.beta) + paper_trail (~> 4.0) rails (~> 4.0, >= 4.2.0) roar-rails sir_trevor_rails (~> 0.5.0b1) @@ -35,6 +35,17 @@ GIT tophat underscore-rails (~> 1.6) +PATH + remote: /Users/aliauw/Projects/work/pul_assets + specs: + pul-assets (0.2.2) + bourbon (~> 4.2.6) + breakpoint (~> 2.7.0) + jquery-tablesorter (~> 1.20.5) + modernizr-rails (~> 2.7.1) + normalize-rails (~> 3.0.3) + susy (~> 2.2.12) + GEM remote: https://rubygems.org/ specs: @@ -79,32 +90,29 @@ GEM amq-protocol (2.0.1) arel (6.0.3) ast (2.2.0) - astrolabe (1.3.1) - parser (~> 2.2) autoparse (0.3.3) addressable (>= 2.3.1) extlib (>= 0.9.15) multi_json (>= 1.0.0) - autoprefixer-rails (6.2.3) + autoprefixer-rails (6.3.3.1) execjs - json - bcrypt (3.1.10) + bcrypt (3.1.11) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - blacklight (5.17.1) + blacklight (5.18.0) bootstrap-sass (~> 3.2) deprecation kaminari (>= 0.15) nokogiri (~> 1.6) rails (>= 3.2.6, < 5) rsolr (~> 1.0.11) - blacklight-gallery (0.4.0) - blacklight (~> 5.12) + blacklight-gallery (0.4.1) + blacklight (>= 5.12, < 7) bootstrap-sass (~> 3.0) openseadragon (>= 0.2.0) rails - blacklight-oembed (0.0.4) - blacklight (~> 5.0) + blacklight-oembed (0.1.0) + blacklight (>= 5.0, < 7) bootstrap-sass (~> 3.0) rails ruby-oembed @@ -112,11 +120,17 @@ GEM autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap_form (2.3.0) + bourbon (4.2.6) + sass (~> 3.4) + thor (~> 0.19) breadcrumbs_on_rails (2.3.1) + breakpoint (2.7.0) + sass (~> 3.3) + sassy-maps (< 1.0.0) builder (3.2.2) bunny (2.2.2) amq-protocol (>= 2.0.1) - byebug (8.2.1) + byebug (8.2.2) cancancan (1.13.1) capistrano (3.4.0) i18n @@ -127,12 +141,13 @@ GEM sshkit (~> 1.2) capistrano-passenger (0.2.0) capistrano (~> 3.0) - capistrano-rails (1.1.5) + capistrano-rails (1.1.6) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-rails-console (1.0.0) + capistrano-rails-console (1.0.2) capistrano (>= 3.1.0, < 4.0.0) - capybara (2.5.0) + capybara (2.6.2) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -150,7 +165,7 @@ GEM childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) cliver (0.3.2) - coderay (1.1.0) + coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) @@ -158,20 +173,19 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.0) - coveralls (0.8.10) + concurrent-ruby (1.0.1) + coveralls (0.8.13) json (~> 1.8) - rest-client (>= 1.6.8, < 2) simplecov (~> 0.11.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) tins (~> 1.6.0) - crack (0.4.2) + crack (0.4.3) safe_yaml (~> 1.0.0) debug_inspector (0.0.2) - deprecation (0.2.2) + deprecation (1.0.0) activesupport - devise (3.5.3) + devise (3.5.6) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -186,14 +200,12 @@ GEM diff-lcs (1.2.5) diffy (3.1.0) docile (1.1.5) - domain_name (0.5.25) - unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) execjs (2.6.0) extlib (0.9.16) factory_girl (4.5.0) activesupport (>= 3.0.0) - factory_girl_rails (4.5.0) + factory_girl_rails (4.6.0) factory_girl (~> 4.5.0) railties (>= 3.0.0) faraday (0.9.2) @@ -225,16 +237,14 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - hashdiff (0.2.3) - hashie (3.4.2) - http-cookie (1.0.2) - domain_name (~> 0.5) + hashdiff (0.3.0) + hashie (3.4.3) i18n (0.7.0) iiif-presentation (0.0.5) activesupport (>= 3.2.18) faraday (~> 0.9.0) json - jbuilder (2.4.0) + jbuilder (2.4.1) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) jettywrapper (2.0.3) @@ -243,24 +253,26 @@ GEM i18n logger rubyzip - jquery-rails (4.0.5) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + jquery-tablesorter (1.20.5) + railties (>= 3.2, < 6) json (1.8.3) - jwt (1.5.2) + jwt (1.5.1) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) launchy (2.4.3) addressable (~> 2.3) - legato (0.6.2) + legato (0.7.0) multi_json little-plugger (1.1.4) - lodash-rails (3.10.1) + lodash-rails (4.6.1) railties (>= 3.1) logger (1.2.8) - logging (2.0.0) + logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) loofah (2.0.3) @@ -272,25 +284,26 @@ GEM activemodel (>= 3.2, < 5) memoist (0.14.0) method_source (0.8.2) - mime-types (2.99) - mini_magick (4.3.6) + mime-types (2.99.1) + mini_magick (4.4.0) mini_portile2 (2.0.0) - minitest (5.8.3) + minitest (5.8.4) + modernizr-rails (2.7.1) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (3.0.2) - netrc (0.11.0) - nokogiri (1.6.7.1) + nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) - oauth2 (1.0.0) + normalize-rails (3.0.3) + oauth2 (1.1.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) + rack (>= 1.2, < 3) omniauth (1.2.2) hashie (>= 1.2, < 4) rack (~> 1.0) @@ -303,14 +316,14 @@ GEM rails (> 3.2.0) orm_adapter (0.5.0) os (0.9.6) - paper_trail (4.0.1) + paper_trail (4.1.0) activerecord (>= 3.0, < 6.0) activesupport (>= 3.0, < 6.0) request_store (~> 1.1) - parser (2.2.3.0) - ast (>= 1.1, < 3.0) + parser (2.3.0.6) + ast (~> 2.2) pg (0.18.4) - poltergeist (1.8.1) + poltergeist (1.9.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -342,16 +355,16 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) railties (4.2.5) actionpack (= 4.2.5) activesupport (= 4.2.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.0.0) - rake (10.4.2) - rdoc (4.2.1) + rainbow (2.1.0) + rake (11.1.1) + rdoc (4.2.2) json (~> 1.4) redcarpet (3.3.4) representable (2.3.0) @@ -359,10 +372,6 @@ GEM request_store (1.3.0) responders (2.1.1) railties (>= 4.2.0, < 5.1) - rest-client (1.8.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) retriable (1.4.1) roar (1.0.4) representable (>= 2.0.1, < 2.4.0) @@ -375,7 +384,7 @@ GEM uber (>= 0.0.5) rsolr (1.0.13) builder (>= 2.1.2) - rspec-core (3.4.1) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -383,7 +392,7 @@ GEM rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.4.0) - rspec-rails (3.4.0) + rspec-rails (3.4.2) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) @@ -392,43 +401,45 @@ GEM rspec-mocks (~> 3.4.0) rspec-support (~> 3.4.0) rspec-support (3.4.1) - rubocop (0.35.1) - astrolabe (~> 1.3) - parser (>= 2.2.3.0, < 3.0) + rubocop (0.38.0) + parser (>= 2.3.0.6, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) - tins (<= 1.6.0) - rubocop-rspec (1.3.1) - ruby-oembed (0.9.0) + unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-rspec (1.4.0) + ruby-oembed (0.10.0) ruby-progressbar (1.7.5) - rubyzip (1.1.7) + rubyzip (1.2.0) safe_yaml (1.0.4) - sass (3.4.20) + sass (3.4.21) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassy-maps (0.4.0) + sass (~> 3.3) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) serverengine (1.5.11) sigdump (~> 0.2.2) - sigdump (0.2.3) + sigdump (0.2.4) signet (0.7.2) addressable (~> 2.3) faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) - simplecov (0.11.1) + simplecov (0.11.2) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sir_trevor_rails (0.5.0b1) - rails + sir_trevor_rails (0.5.0) + multi_json (~> 1.0) + rails (>= 3, < 5) redcarpet (>= 2.0.1, < 4) twitter-text (~> 1.4) sitemap_generator (5.1.0) @@ -442,18 +453,20 @@ GEM social-share-button (0.1.10) coffee-rails sass-rails - spring (1.6.2) + spring (1.6.4) sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.0) + sprockets-rails (3.0.4) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.11) - sshkit (1.8.1) + sshkit (1.9.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) + susy (2.2.12) + sass (>= 3.3.0, < 3.5) term-ansicolor (1.3.2) tins (~> 1.0) test_xml (0.1.7) @@ -468,7 +481,7 @@ GEM actionpack (>= 3.0.0) turbolinks (2.5.3) coffee-rails - twitter-text (1.13.0) + twitter-text (1.13.4) unf (~> 0.1.0) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -479,16 +492,17 @@ GEM underscore-rails (1.8.3) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) - vcr (3.0.0) - warden (1.2.4) + unf_ext (0.0.7.2) + unicode-display_width (1.0.2) + vcr (3.0.1) + warden (1.2.6) rack (>= 1.0) - web-console (2.2.1) + web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - webmock (1.22.3) + webmock (1.24.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -527,6 +541,7 @@ DEPENDENCIES pg poltergeist pry-rails + pul-assets! rails (= 4.2.5) rsolr (~> 1.0.6) rspec-rails diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 10d55cad..9b723cd2 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,5 +15,6 @@ //= require turbolinks// // Required by Blacklight //= require blacklight/blacklight +//= require pul-assets //= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index f9cd5b34..00000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any styles - * defined in the other CSS/SCSS files in this directory. It is generally better to create a new - * file per style scope. - * - *= require_tree . - *= require_self - */ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 00000000..c8852886 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,21 @@ +@import 'bootstrap-tagsinput'; +@import 'jquery.jcrop'; +@import 'bootstrap-sprockets'; +@import 'utils/variables__bootstrap'; // pul bootstrap variables override +@import 'sir-trevor'; +@import 'sir-trevor-icons'; +@import 'bootstrap'; +@import 'openseadragon/openseadragon'; +@import 'blacklight/blacklight'; +@import 'blacklight_gallery/default'; +@import 'spotlight/spotlight'; + +@import 'normalize-rails'; +@import 'pul-assets'; + +.viewer { + height: 400px; + iframe { + position: absolute; + } +} diff --git a/app/assets/stylesheets/blacklight.css.scss b/app/assets/stylesheets/blacklight.css.scss deleted file mode 100644 index 3519d906..00000000 --- a/app/assets/stylesheets/blacklight.css.scss +++ /dev/null @@ -1,5 +0,0 @@ -@import 'bootstrap-sprockets'; - -@import 'bootstrap'; - -@import 'blacklight/blacklight'; diff --git a/app/assets/stylesheets/blacklight_gallery.css.scss b/app/assets/stylesheets/blacklight_gallery.css.scss deleted file mode 100644 index 19af6827..00000000 --- a/app/assets/stylesheets/blacklight_gallery.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -/* - *= require blacklight_gallery/default - */ \ No newline at end of file diff --git a/app/assets/stylesheets/blacklight_oembed.css.scss b/app/assets/stylesheets/blacklight_oembed.css.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/app/assets/stylesheets/openseadragon.css b/app/assets/stylesheets/openseadragon.css deleted file mode 100644 index c1efc39f..00000000 --- a/app/assets/stylesheets/openseadragon.css +++ /dev/null @@ -1,3 +0,0 @@ -/* - *= require openseadragon/openseadragon - */ \ No newline at end of file diff --git a/app/assets/stylesheets/spotlight.scss b/app/assets/stylesheets/spotlight.scss deleted file mode 100644 index 3ba194a7..00000000 --- a/app/assets/stylesheets/spotlight.scss +++ /dev/null @@ -1,11 +0,0 @@ -/* -*= require social-share-button -*= require bootstrap-tagsinput -*= require jquery.jcrop -*/ -@import 'spotlight/variables_bootstrap'; -@import 'bootstrap-sprockets'; -@import 'sir-trevor'; -@import 'sir-trevor-icons'; -@import 'bootstrap'; -@import 'spotlight/spotlight'; \ No newline at end of file diff --git a/app/assets/stylesheets/viewer.scss b/app/assets/stylesheets/viewer.scss deleted file mode 100644 index 2016d881..00000000 --- a/app/assets/stylesheets/viewer.scss +++ /dev/null @@ -1,6 +0,0 @@ -.viewer { - height: 400px; - iframe { - position: absolute; - } -} diff --git a/app/views/catalog/_previous_next_doc.html.erb b/app/views/catalog/_previous_next_doc.html.erb new file mode 100644 index 00000000..13feadee --- /dev/null +++ b/app/views/catalog/_previous_next_doc.html.erb @@ -0,0 +1,30 @@ +<% #Using the Bootstrap Pagination class -%> +<% #DEPRECATED - using id="previousNextDocument" as a selector is deprecated and will be removed in Blacklight 6.0 %> +
+ <% if current_search_session %> +
+ <%=link_to t('blacklight.search.start_over'), start_over_path(current_search_session.try(:query_params) || {}), id: 'startOverLink', class: 'btn' %> + + <%= link_back_to_catalog class: 'btn' %> +
+ <% end %> + <% if @previous_document || @next_document %> +
+ <%= link_to_previous_document @previous_document %> | + + <%= item_page_entry_info %> | + + <%= link_to_next_document @next_document %> +
+ <% end %> + + + +
+ diff --git a/app/views/catalog/show.html.erb b/app/views/catalog/show.html.erb new file mode 100644 index 00000000..1e6dc8a1 --- /dev/null +++ b/app/views/catalog/show.html.erb @@ -0,0 +1,8 @@ +
+ <%= render_document_main_content_partial %> +
+ + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index afa67b64..77c9bc7d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,50 @@ - - - - Pomegranate - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> - <%= csrf_meta_tags %> - - - -<%= yield %> - - + + + + + + + + + + + + + <%= h(@page_title || application_name) %> + + <%= favicon_link_tag 'favicon.ico' %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag :modernizr %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + <%= content_for(:head) %> + <%= description %> + <%= twitter_card %> + <%= opengraph %> + + + + + + + <%= render partial: 'pul-assets/header_navbar' %> + <%= render partial: 'shared/masthead' %> + <%= content_for?(:header_content) ? yield(:header_content) : "" %> + + <%= render partial: 'shared/ajax_modal' %> + +
+
+ <%= render partial: '/flash_msg', layout: 'shared/flash_messages' %> + +
+ <%= content_for?(:content) ? yield(:content) : yield %> +
+ + <%= render :partial => 'shared/footer' %> + diff --git a/app/views/layouts/blacklight.html.erb b/app/views/layouts/blacklight.html.erb new file mode 100644 index 00000000..77c9bc7d --- /dev/null +++ b/app/views/layouts/blacklight.html.erb @@ -0,0 +1,50 @@ + + + + + + + + + + + + + <%= h(@page_title || application_name) %> + + <%= favicon_link_tag 'favicon.ico' %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag :modernizr %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + <%= content_for(:head) %> + <%= description %> + <%= twitter_card %> + <%= opengraph %> + + + + + + + <%= render partial: 'pul-assets/header_navbar' %> + <%= render partial: 'shared/masthead' %> + <%= content_for?(:header_content) ? yield(:header_content) : "" %> + + <%= render partial: 'shared/ajax_modal' %> + +
+
+ <%= render partial: '/flash_msg', layout: 'shared/flash_messages' %> + +
+ <%= content_for?(:content) ? yield(:content) : yield %> +
+ + <%= render :partial => 'shared/footer' %> + + diff --git a/app/views/layouts/spotlight/spotlight.html.erb b/app/views/layouts/spotlight/spotlight.html.erb new file mode 100644 index 00000000..77c9bc7d --- /dev/null +++ b/app/views/layouts/spotlight/spotlight.html.erb @@ -0,0 +1,50 @@ + + + + + + + + + + + + + <%= h(@page_title || application_name) %> + + <%= favicon_link_tag 'favicon.ico' %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag :modernizr %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + <%= content_for(:head) %> + <%= description %> + <%= twitter_card %> + <%= opengraph %> + + + + + + + <%= render partial: 'pul-assets/header_navbar' %> + <%= render partial: 'shared/masthead' %> + <%= content_for?(:header_content) ? yield(:header_content) : "" %> + + <%= render partial: 'shared/ajax_modal' %> + +
+
+ <%= render partial: '/flash_msg', layout: 'shared/flash_messages' %> + +
+ <%= content_for?(:content) ? yield(:content) : yield %> +
+ + <%= render :partial => 'shared/footer' %> + + diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb new file mode 100644 index 00000000..72e68c31 --- /dev/null +++ b/app/views/shared/_footer.html.erb @@ -0,0 +1,3 @@ +<%= render 'pul-assets/footer' %> + +<%= render 'shared/analytics' %> diff --git a/app/views/shared/_masthead.html.erb b/app/views/shared/_masthead.html.erb new file mode 100644 index 00000000..eef7cbae --- /dev/null +++ b/app/views/shared/_masthead.html.erb @@ -0,0 +1,33 @@ +<%= render 'spotlight/shared/report_a_problem' if show_contact_form? %> + +
+ <% if current_masthead %> + + + <% end %> + + <%= render 'shared/exhibit_navbar' if current_exhibit && resource_masthead? %> + +
+
+ <% if content_for? :masthead %> + <%= content_for :masthead %> + <% elsif current_exhibit %> + <%= current_exhibit.title %> + <% if current_exhibit.subtitle.present? %> + <%= current_exhibit.subtitle %> + <% end %> + <% else %> + <%= application_name %> + <% if current_site.subtitle.present? %> + <%= current_site.subtitle %> + <% end %> + <% end %> +
+
+ + <%= render 'shared/exhibit_navbar' if current_exhibit && !resource_masthead? %> +
+ + +<%= render 'shared/breadcrumbs' unless resource_masthead? %> diff --git a/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb b/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb new file mode 100644 index 00000000..52a9cd8a --- /dev/null +++ b/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb @@ -0,0 +1,40 @@ +<% solr_documents_features_block.with_solr_helper(self) %> +<% indicators = [] %> +<% html_id = "carousel-#{solr_documents_features_block.object_id}" %> + +
+ <% if solr_documents_features_block.documents? %> + + <% end %> +
diff --git a/config/application.rb b/config/application.rb index e91f29ff..a5ff5179 100644 --- a/config/application.rb +++ b/config/application.rb @@ -2,6 +2,8 @@ require 'rails/all' require 'open-uri' +require 'susy' +require 'breakpoint' # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production.