Skip to content

Commit

Permalink
notes on our overriden views
Browse files Browse the repository at this point in the history
  • Loading branch information
rawOrlando committed Jan 31, 2024
1 parent bc669f3 commit c270eb4
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 34 deletions.
1 change: 1 addition & 0 deletions app/views/catalog/_index_default.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<%# This whole file was changed from source %>
<% doc_presenter = index_presenter(document) %>
<%# default partial to display solr document fields in catalog index view -%>
<dl class="document-metadata dl-horizontal dl-invert">
Expand Down
2 changes: 2 additions & 0 deletions app/views/devise/confirmations/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<h2>Resend confirmation instructions</h2>

<%# This is where we changed from source %>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %>

Expand All @@ -14,3 +15,4 @@
<% end %>
<%= render "devise/shared/links" %>
<%# End of change from source %>
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<%# 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">
Expand All @@ -7,6 +8,7 @@
</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>
Expand All @@ -26,6 +28,7 @@
</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 %>
Expand All @@ -34,6 +37,7 @@
</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' } %>
Expand Down
2 changes: 2 additions & 0 deletions app/views/spotlight/feature_pages/_page_options.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<div>
<%= f.check_box :published %>
</div>
<%# This is where we changed from source %>
<div>
<%= f.check_box :in_menu? %>
</div>
<%# End of change from source %>
<div>
<%= f.check_box :display_sidebar?, disabled: @page.child_pages.published.present? %>
</div>
Expand Down
2 changes: 2 additions & 0 deletions app/views/spotlight/feature_pages/_sidebar.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<%# 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. %>
<% cache_unless current_user, [current_exhibit, @page] do %>
<div id="sidebar" class="col-md-3" role="complementary">
<ol class="nav sidenav">
Expand Down
34 changes: 0 additions & 34 deletions app/views/spotlight/pages/_order_pages.html.erb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<%# 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. %>
<% solr_documents_embed_block.with_solr_helper(self) %>

<div class="content-block items-block row">
Expand All @@ -6,9 +8,12 @@

<div class="items-col spotlight-flexbox pull-<%= solr_documents_embed_block.content_align %> <%= solr_documents_embed_block.text? ? "col-md-6" : "col-md-12" %> ">
<% solr_documents_embed_block.each_document do |block_options, document| %>
<%# Our code %>
<% doc_presenter = index_presenter(document) %>
<%# end of our %>
<div class="box" data-id="<%= document.id %>">
<%= render_document_partials document, blacklight_config.view.embed.partials, (blacklight_config.view.embed.locals || {}).reverse_merge(block: solr_documents_embed_block) %>
<%# Our code %>
<% if solr_documents_embed_block.primary_caption? %>
<div class="caption primary-caption">
<%= doc_presenter.field_value solr_documents_embed_block.primary_caption_field %>
Expand All @@ -19,6 +24,7 @@
<%= doc_presenter.field_value solr_documents_embed_block.secondary_caption_field %>
</div>
<% end %>
<%# end of our code %>
</div>
<% end %>
</div>
Expand Down

0 comments on commit c270eb4

Please sign in to comment.