-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1f0bbb7
commit 7834691
Showing
6 changed files
with
95 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,4 +8,4 @@ | |
//= require bootstrap | ||
//= require blacklight/blacklight | ||
|
||
//= require_tree . | ||
//= require_tree . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
<%# This changed between spotlight versions. TODO: Will have to dig into if this is still working. How it was changed and how to change it it have same effects. %> | ||
<div class="navbar-right"> | ||
|
||
<ul class="nav navbar-nav"> | ||
<%= render_nav_actions do |config, action|%> | ||
<li><%= action %></li> | ||
<% end %> | ||
</ul> | ||
|
||
<ul class="nav navbar-nav"> | ||
<%# removed line render '/spotlight/shared/locale_picker' %> | ||
<% if current_user %> | ||
<li class="dropdown"> | ||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=current_user.username%> <b class="caret"></b></a> | ||
<ul class="dropdown-menu"> | ||
<% if can? :manage, Spotlight::Site.instance %> | ||
<li><%= link_to t(:'spotlight.header_links.edit_site'), spotlight.edit_site_path %></li> | ||
<% end %> | ||
<% if can? :create, Spotlight::Exhibit %> | ||
<li> | ||
<%= link_to t(:'spotlight.header_links.create_exhibit'), spotlight.new_exhibit_path %> | ||
</li> | ||
<li class="divider"></li> | ||
<% end %> | ||
<% if current_exhibit && can?(:curate, current_exhibit) %> | ||
<li> | ||
<%= link_to t('spotlight.header_links.dashboard'), spotlight.exhibit_dashboard_path(current_exhibit) %> | ||
</li> | ||
<li class="divider"></li> | ||
<% end %> | ||
<%# new code %> | ||
<% if Rails.env.production? || Rails.env.tdldev? %> | ||
<li><%= link_to t("hyrax.toolbar.profile.logout"), "#{request.base_url}/Shibboleth.sso/Logout?return=#{request.base_url}/sign_out" %> </li> | ||
<% else %> | ||
<li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li> | ||
<% end %> | ||
</ul> | ||
</li> | ||
<% end %> | ||
<%# end of our code %> | ||
<% if current_exhibit and show_contact_form? %> | ||
<li> | ||
<%= link_to t('spotlight.header_links.contact'), spotlight.new_exhibit_contact_form_path(current_exhibit), data: {behavior: 'contact-link', target: 'new_contact_form' } %> | ||
</li> | ||
<% end %> | ||
</ul> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<%# Cahgne source view to remove bg-dark %> | ||
<nav class="navbar navbar-expand-md navbar-dark topbar" role="navigation" aria-label="<%= t('spotlight.topbar.label') %>"> | ||
<div class="<%= container_classes %>"> | ||
<%= link_to application_name, main_app.root_path, class: 'mb-0 navbar-brand navbar-logo' %> | ||
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="<%= t :toggle_nav %>"> | ||
<span class="navbar-toggler-icon"></span> | ||
</button> | ||
|
||
<div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse"> | ||
<%= render partial: 'shared/user_util_links' %> | ||
</div> | ||
</div> | ||
</nav> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# frozen_string_literal: true | ||
# looks like Spot light no longer depends on SirTrevor | ||
# https://github.com/madebymany/sir-trevor-rails#upgrade-guide-to-v060 | ||
# class SirTrevorRails::Block | ||
# def self.custom_block_types | ||
# %w[ | ||
# Browse | ||
# FeaturedPages | ||
# Heading | ||
# Iframe | ||
# LinkToSearch | ||
# List | ||
# Oembed | ||
# Quote | ||
# Rule | ||
# SearchResults | ||
# SolrDocuments | ||
# SolrDocumentsCarousel | ||
# SolrDocumentsEmbed | ||
# SolrDocumentsFeatures | ||
# SolrDocumentsGrid | ||
# Text | ||
# UploadedItems | ||
# Video | ||
# ] | ||
# # this is nto working for the moment the list above is hard code version | ||
# # You can define your custom block types directly here or in your engine config. | ||
# # Spotlight::Engine.config.sir_trevor_widgets | ||
# end | ||
# end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters