Updated page <title>s to reflect portal context. Fixes #380

app/models/portal.rb

@@ -16,6 +16,9 @@ def initialize(args={})
 
   private
 
+  def configured_title
+    I18n.t('ddr.public.portal.%{controller_name}.title', :default => I18n.t('blacklight.application_name'))
+  end
 
   def item_or_collection_documents(local_ids)
     local_ids ? documents(item_or_collection_documents_search(local_ids)) : []

app/models/portal/digital_collections.rb

@@ -21,7 +21,7 @@ def item_count
   end
 
   def title
-    parent_collection_document.title
+    parent_collection_document ? parent_collection_document.title : configured_title
   end
 
   def abstract

app/views/catalog/_search_header.html.erb

@@ -5,3 +5,7 @@
 <%= render 'collection_matches' %>
 
 <%= render 'sort_and_per_page' %>
+
+<% if @portal %>
+  <%= content_for :page_title, t('blacklight.search.page_title.title', :constraints => render_search_to_page_title(params), :application_name => @portal.title + ' - Duke Libraries -') %>
+<% end %>

app/views/catalog/_show_default.html.erb

@@ -13,6 +13,6 @@
   <%= render partial: 'show_license_default', locals: { document: @document } %>
 </div>
 
-
 <%= render partial: 'related_items', locals: {document: @document} %>
 
+<%= content_for :page_title, t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => document.collection.title + ' - Duke Libraries').html_safe %>

app/views/digital_collections/index.html.erb

@@ -8,8 +8,7 @@
     <%= render 'home_showcase' %>
   <% else %>
     <% unless has_search_parameters? %>
-    <%= render partial: 'collection_submast', locals: { document: @portal.collection } %>
-      <!-- <h1><%# t("ddr.public.portal.#{params[:collection] || controller_name}.title") %></h1> -->
+      <%= render partial: 'collection_submast', locals: { document: @portal.collection } %>
     <% end %>
   <% end %>
 </div>
@@ -34,10 +33,8 @@
     <%= render 'home' %>
 
     <%# set the html title for collection portal page -%>
-    <% if @portal.collection %>
-      <%= content_for :page_title, t("ddr.public.portal.#{params[:collection] || controller_name}.title", :default => @portal.title) + " - Duke Libraries" %>
-    <% else %>
-      <%= content_for :page_title, t("ddr.public.portal.#{params[:collection] || controller_name}.title", :default => t("blacklight.welcome"))  %>
+    <% if @portal %>
+      <%= content_for :page_title, @portal.title + " - Duke Libraries" %>
     <% end %>
   <% else %>
     <%= render 'search_results' %>

app/views/digital_collections/index_portal.html.erb

@@ -20,19 +20,18 @@
 <div id="content" class="col-md-9 col-sm-8">
   <% unless has_search_parameters? %>
 
-  <%= render partial: "home_featured_collections"%>
+    <%= render partial: "home_featured_collections"%>
 
-  <h3 class="feature-head">Featured Items</h3>
-  <%= render partial: "home_highlights" %>
+    <h3 class="feature-head">Featured Items</h3>
+    <%= render partial: "home_highlights" %>
 
-  <%= render partial: "show_blog_posts" %>
+    <%= render partial: "show_blog_posts" %>
 
     <%# set the html title for collection portal page -%>
-    <% if @portal.collection %>
-      <%= content_for :page_title, t("ddr.public.portal.#{params[:collection] || controller_name}.title", :default => @portal.title) + " - Duke Libraries" %>
-    <% else %>
-      <%= content_for :page_title, t("ddr.public.portal.#{params[:collection] || controller_name}.title", :default => t("blacklight.welcome"))  %>
+    <% if @portal %>
+      <%= content_for :page_title, @portal.title + " - Duke Libraries" %>
     <% end %>
+
   <% else %>
     <%= render 'search_results' %>
   <% end %>