From 6afea5472c383d7196a5128b4f91f11ec782ad33 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Thu, 10 Dec 2015 13:02:14 -0600 Subject: [PATCH] Put homepage text into i18n Changed "File Details" to "Details" Fixes #1421 --- ...ller.rb => homepage_controller_behavior.rb} | 2 +- app/controllers/homepage_controller.rb | 3 --- app/controllers/sufia/homepage_controller.rb | 3 +++ app/helpers/sufia/sufia_helper_behavior.rb | 3 ++- app/views/homepage/_recents.html.erb | 18 ------------------ .../homepage/_announcement.html.erb | 0 .../{ => sufia}/homepage/_featured.html.erb | 0 .../homepage/_featured_fields.html.erb | 0 .../homepage/_featured_researcher.html.erb | 0 .../homepage/_featured_works.html.erb | 4 ++-- app/views/{ => sufia}/homepage/_home.html.erb | 0 .../homepage/_home_content.html.erb | 6 +++--- .../{ => sufia}/homepage/_home_header.html.erb | 0 .../{ => sufia}/homepage/_marketing.html.erb | 0 .../homepage/_recent_document.html.erb | 17 ++++++----------- .../sufia/homepage/_recently_uploaded.html.erb | 16 ++++++++++++++++ .../homepage/_sortable_featured.html.erb | 0 .../{ => sufia}/homepage/_tagcloud.html.erb | 0 app/views/{ => sufia}/homepage/index.html.erb | 0 config/locales/sufia.en.yml | 7 +++++-- config/routes.rb | 2 +- lib/generators/sufia/install_generator.rb | 6 +++--- spec/controllers/homepage_controller_spec.rb | 4 ++-- spec/routing/route_spec.rb | 2 +- .../homepage/_announcement.html.erb_spec.rb | 2 +- .../homepage/_featured_works.html.erb_spec.rb | 2 +- .../homepage/_home_header.html.erb_spec.rb | 4 ++-- 27 files changed, 49 insertions(+), 52 deletions(-) rename app/controllers/concerns/sufia/{homepage_controller.rb => homepage_controller_behavior.rb} (96%) delete mode 100644 app/controllers/homepage_controller.rb create mode 100644 app/controllers/sufia/homepage_controller.rb delete mode 100644 app/views/homepage/_recents.html.erb rename app/views/{ => sufia}/homepage/_announcement.html.erb (100%) rename app/views/{ => sufia}/homepage/_featured.html.erb (100%) rename app/views/{ => sufia}/homepage/_featured_fields.html.erb (100%) rename app/views/{ => sufia}/homepage/_featured_researcher.html.erb (100%) rename app/views/{ => sufia}/homepage/_featured_works.html.erb (75%) rename app/views/{ => sufia}/homepage/_home.html.erb (100%) rename app/views/{ => sufia}/homepage/_home_content.html.erb (79%) rename app/views/{ => sufia}/homepage/_home_header.html.erb (100%) rename app/views/{ => sufia}/homepage/_marketing.html.erb (100%) rename app/views/{ => sufia}/homepage/_recent_document.html.erb (57%) create mode 100644 app/views/sufia/homepage/_recently_uploaded.html.erb rename app/views/{ => sufia}/homepage/_sortable_featured.html.erb (100%) rename app/views/{ => sufia}/homepage/_tagcloud.html.erb (100%) rename app/views/{ => sufia}/homepage/index.html.erb (100%) diff --git a/app/controllers/concerns/sufia/homepage_controller.rb b/app/controllers/concerns/sufia/homepage_controller_behavior.rb similarity index 96% rename from app/controllers/concerns/sufia/homepage_controller.rb rename to app/controllers/concerns/sufia/homepage_controller_behavior.rb index d0df3da801..9357f53748 100644 --- a/app/controllers/concerns/sufia/homepage_controller.rb +++ b/app/controllers/concerns/sufia/homepage_controller_behavior.rb @@ -1,4 +1,4 @@ -module Sufia::HomepageController +module Sufia::HomepageControllerBehavior extend ActiveSupport::Concern included do diff --git a/app/controllers/homepage_controller.rb b/app/controllers/homepage_controller.rb deleted file mode 100644 index 361abb55fc..0000000000 --- a/app/controllers/homepage_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class HomepageController < ApplicationController - include Sufia::HomepageController -end diff --git a/app/controllers/sufia/homepage_controller.rb b/app/controllers/sufia/homepage_controller.rb new file mode 100644 index 0000000000..66d4814e6c --- /dev/null +++ b/app/controllers/sufia/homepage_controller.rb @@ -0,0 +1,3 @@ +class Sufia::HomepageController < ApplicationController + include Sufia::HomepageControllerBehavior +end diff --git a/app/helpers/sufia/sufia_helper_behavior.rb b/app/helpers/sufia/sufia_helper_behavior.rb index 767e83557e..ba5d06ee6b 100644 --- a/app/helpers/sufia/sufia_helper_behavior.rb +++ b/app/helpers/sufia/sufia_helper_behavior.rb @@ -47,7 +47,8 @@ def number_of_deposits(user) end def link_to_facet(field, field_string) - link_to(field, add_facet_params(field_string, field).merge!(controller: "catalog", action: "index")) + facet_params = add_facet_params(field_string, field) + link_to(field, catalog_index_path(facet_params)) end # @param values [Array] The values to display diff --git a/app/views/homepage/_recents.html.erb b/app/views/homepage/_recents.html.erb deleted file mode 100644 index 5796b0802a..0000000000 --- a/app/views/homepage/_recents.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -
- <% if recent_documents.blank? %> - <% msg = 'Login to see your recently added documents' if msg.blank? and current_user.blank? %> - <% msg = 'You have no documents to display. Contribute some of your documents!' if msg.blank? %> -

<%= msg %>

- <% else %> -
- - - - - - <%= render partial: "recent_document", collection: recent_documents, locals: {display_thumbs: display_thumbs, display_access: display_access} %> -
DepositorFile Details
-
- <% end %> - -
diff --git a/app/views/homepage/_announcement.html.erb b/app/views/sufia/homepage/_announcement.html.erb similarity index 100% rename from app/views/homepage/_announcement.html.erb rename to app/views/sufia/homepage/_announcement.html.erb diff --git a/app/views/homepage/_featured.html.erb b/app/views/sufia/homepage/_featured.html.erb similarity index 100% rename from app/views/homepage/_featured.html.erb rename to app/views/sufia/homepage/_featured.html.erb diff --git a/app/views/homepage/_featured_fields.html.erb b/app/views/sufia/homepage/_featured_fields.html.erb similarity index 100% rename from app/views/homepage/_featured_fields.html.erb rename to app/views/sufia/homepage/_featured_fields.html.erb diff --git a/app/views/homepage/_featured_researcher.html.erb b/app/views/sufia/homepage/_featured_researcher.html.erb similarity index 100% rename from app/views/homepage/_featured_researcher.html.erb rename to app/views/sufia/homepage/_featured_researcher.html.erb diff --git a/app/views/homepage/_featured_works.html.erb b/app/views/sufia/homepage/_featured_works.html.erb similarity index 75% rename from app/views/homepage/_featured_works.html.erb rename to app/views/sufia/homepage/_featured_works.html.erb index 4406908c3e..a886ec60aa 100644 --- a/app/views/homepage/_featured_works.html.erb +++ b/app/views/sufia/homepage/_featured_works.html.erb @@ -6,7 +6,7 @@
@@ -14,6 +14,6 @@ <% end %> <% else %> <% end %> diff --git a/app/views/homepage/_home.html.erb b/app/views/sufia/homepage/_home.html.erb similarity index 100% rename from app/views/homepage/_home.html.erb rename to app/views/sufia/homepage/_home.html.erb diff --git a/app/views/homepage/_home_content.html.erb b/app/views/sufia/homepage/_home_content.html.erb similarity index 79% rename from app/views/homepage/_home_content.html.erb rename to app/views/sufia/homepage/_home_content.html.erb index 1d81e051df..47a4a430c6 100644 --- a/app/views/homepage/_home_content.html.erb +++ b/app/views/sufia/homepage/_home_content.html.erb @@ -1,14 +1,14 @@
- <%= render partial: 'recents', locals: { recent_documents: @recent_documents, msg: t('sufia.homepage.no_public'), display_thumbs: true, display_access: false } %> + <%= render 'recently_uploaded', recent_documents: @recent_documents %>
diff --git a/app/views/homepage/_home_header.html.erb b/app/views/sufia/homepage/_home_header.html.erb similarity index 100% rename from app/views/homepage/_home_header.html.erb rename to app/views/sufia/homepage/_home_header.html.erb diff --git a/app/views/homepage/_marketing.html.erb b/app/views/sufia/homepage/_marketing.html.erb similarity index 100% rename from app/views/homepage/_marketing.html.erb rename to app/views/sufia/homepage/_marketing.html.erb diff --git a/app/views/homepage/_recent_document.html.erb b/app/views/sufia/homepage/_recent_document.html.erb similarity index 57% rename from app/views/homepage/_recent_document.html.erb rename to app/views/sufia/homepage/_recent_document.html.erb index c9c1811180..8dbc145630 100644 --- a/app/views/homepage/_recent_document.html.erb +++ b/app/views/sufia/homepage/_recent_document.html.erb @@ -1,18 +1,13 @@ - <% if display_thumbs %> - - <%= link_to_profile recent_document.depositor("no depositor value") %> - <%= link_to curation_concerns_generic_work_path(recent_document) do %> - <%= render_thumbnail_tag recent_document, { width: 45 }, false %> - <% end %> - - <% end %> + + <%= link_to_profile recent_document.depositor("no depositor value") %> + <%= link_to curation_concerns_generic_work_path(recent_document) do %> + <%= render_thumbnail_tag recent_document, { width: 45 }, false %> + <% end %> +

Title<%= link_to truncate(recent_document.title_or_label, length: 28, separator: ' '), curation_concerns_file_set_path(recent_document) %> - <% if display_access %> - <%= render_visibility_label(recent_document) %> - <% end %>

Filename<%= link_to truncate(recent_document.label, length: 25), diff --git a/app/views/sufia/homepage/_recently_uploaded.html.erb b/app/views/sufia/homepage/_recently_uploaded.html.erb new file mode 100644 index 0000000000..cc53df3460 --- /dev/null +++ b/app/views/sufia/homepage/_recently_uploaded.html.erb @@ -0,0 +1,16 @@ +

+ <% if recent_documents.blank? %> +

<%= t('.no_public') %>

+ <% else %> +
+ + + + + + <%= render partial: "recent_document", collection: recent_documents %> +
<%= t('.depositor') %><%= t('.details') %>
+
+ <% end %> + +
diff --git a/app/views/homepage/_sortable_featured.html.erb b/app/views/sufia/homepage/_sortable_featured.html.erb similarity index 100% rename from app/views/homepage/_sortable_featured.html.erb rename to app/views/sufia/homepage/_sortable_featured.html.erb diff --git a/app/views/homepage/_tagcloud.html.erb b/app/views/sufia/homepage/_tagcloud.html.erb similarity index 100% rename from app/views/homepage/_tagcloud.html.erb rename to app/views/sufia/homepage/_tagcloud.html.erb diff --git a/app/views/homepage/index.html.erb b/app/views/sufia/homepage/index.html.erb similarity index 100% rename from app/views/homepage/index.html.erb rename to app/views/sufia/homepage/index.html.erb diff --git a/config/locales/sufia.en.yml b/config/locales/sufia.en.yml index 1de942c087..c34af1f90a 100644 --- a/config/locales/sufia.en.yml +++ b/config/locales/sufia.en.yml @@ -64,10 +64,13 @@ en: tab_label: 'Featured Works' title: 'Featured Works' no_works: 'No works have been featured' - recently_uploaded: 'Recently Uploaded' + recently_uploaded: + depositor: 'Depositor' + details: 'Details' + tab_label: 'Recently Uploaded' + no_public: 'No public work has been contributed.' explore: 'Explore' sr_explore: 'Popular Keywords' - no_public: 'No public work has been contributed.' dashboard: title: "My Dashboard" greeting: "Hello, " diff --git a/config/routes.rb b/config/routes.rb index 0615ef7851..a77b131b63 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ resources :homepage, only: 'index' # Route the home page as the root - root to: 'homepage#index' + root to: 'sufia/homepage#index' match 'batch_edits/clear' => 'batch_edits#clear', as: :batch_edits_clear, via: [:get, :post] diff --git a/lib/generators/sufia/install_generator.rb b/lib/generators/sufia/install_generator.rb index 1729cf0047..92f4e1d68b 100644 --- a/lib/generators/sufia/install_generator.rb +++ b/lib/generators/sufia/install_generator.rb @@ -84,9 +84,9 @@ def inject_routes gsub_file 'config/routes.rb', /('welcome#index')/, '\1, as: :welcome_root' # Name welcome root to from CurationConcerns routing_code = "\n Hydra::BatchEdit.add_routes(self)\n" \ - " # This must be the very last route in the file because it has a catch-all route for 404 errors. - # This behavior seems to show up only in production mode. - mount Sufia::Engine => '/'\n root to: 'homepage#index'\n" + " # This must be the very last route in the file because it has a catch-all route for 404 errors.\n" \ + " # This behavior seems to show up only in production mode.\n" \ + " mount Sufia::Engine => '/'\n" sentinel = /devise_for :users/ inject_into_file 'config/routes.rb', routing_code, after: sentinel, verbose: false diff --git a/spec/controllers/homepage_controller_spec.rb b/spec/controllers/homepage_controller_spec.rb index 83e3b02191..49422b4a31 100644 --- a/spec/controllers/homepage_controller_spec.rb +++ b/spec/controllers/homepage_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' -describe HomepageController, type: :controller do - routes { Rails.application.class.routes } +describe Sufia::HomepageController, type: :controller do + routes { Sufia::Engine.routes } describe "#index" do let(:user) { create(:user) } diff --git a/spec/routing/route_spec.rb b/spec/routing/route_spec.rb index 7524e3e4e4..5525e1e299 100644 --- a/spec/routing/route_spec.rb +++ b/spec/routing/route_spec.rb @@ -5,7 +5,7 @@ describe 'Homepage' do it 'routes the root url to the homepage controller' do - expect(get: '/').to route_to(controller: 'homepage', action: 'index') + expect(get: '/').to route_to(controller: 'sufia/homepage', action: 'index') end end diff --git a/spec/views/homepage/_announcement.html.erb_spec.rb b/spec/views/homepage/_announcement.html.erb_spec.rb index b7a03386a8..d6ff1eaf0d 100644 --- a/spec/views/homepage/_announcement.html.erb_spec.rb +++ b/spec/views/homepage/_announcement.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "homepage/_announcement.html.erb" do +describe "sufia/homepage/_announcement.html.erb" do let(:groups) { [] } let(:ability) { instance_double("Ability") } let(:announcement) { ContentBlock.new(name: ContentBlock::ANNOUNCEMENT, value: announcement_value) } diff --git a/spec/views/homepage/_featured_works.html.erb_spec.rb b/spec/views/homepage/_featured_works.html.erb_spec.rb index 759ace39ae..d0c2cff1a4 100644 --- a/spec/views/homepage/_featured_works.html.erb_spec.rb +++ b/spec/views/homepage/_featured_works.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "homepage/_featured_works.html.erb" do +describe "sufia/homepage/_featured_works.html.erb" do let(:list) { FeaturedWorkList.new } subject { rendered } before { assign(:featured_work_list, list) } diff --git a/spec/views/homepage/_home_header.html.erb_spec.rb b/spec/views/homepage/_home_header.html.erb_spec.rb index a9c9d92160..777d8540df 100644 --- a/spec/views/homepage/_home_header.html.erb_spec.rb +++ b/spec/views/homepage/_home_header.html.erb_spec.rb @@ -1,13 +1,13 @@ require 'spec_helper' -describe "homepage/_home_header.html.erb" do +describe "sufia/homepage/_home_header.html.erb" do let(:groups) { [] } let(:ability) { instance_double("Ability") } describe "share your work button" do before do allow(controller).to receive(:current_ability).and_return(ability) allow(ability).to receive(:can?).with(:view_share_work, FileSet).and_return(can_view_share_work) - stub_template "homepage/_marketing.html.erb" => "marketing" + stub_template "sufia/homepage/_marketing.html.erb" => "marketing" render end context "when the user can view" do