diff --git a/Changelog.md b/Changelog.md index d72e62251..1cb82ccc2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -203,6 +203,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a * Reimplement photo export [#5685](https://github.com/diaspora/diaspora/pull/5685) * Add participation controls in the single post view [#5722](https://github.com/diaspora/diaspora/pull/5722) * Display polls on reshares [#5782](https://github.com/diaspora/diaspora/pull/5782) +* Remove footer from stream pages [#5816](https://github.com/diaspora/diaspora/pull/5816) # 0.4.1.2 diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index a1feaede6..ab2b6811f 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -6,6 +6,8 @@ class PeopleController < ApplicationController before_action :authenticate_user!, except: [:show, :stream] before_action :find_person, only: [:show, :stream, :hovercard] + layout proc { request.format == :mobile ? "application" : "with_header" }, only: %i( show contacts ) + respond_to :html, :except => [:tag_index] respond_to :json, :only => [:index, :show] respond_to :js, :only => [:tag_index] diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index 674d1ff4a..c86c26ea6 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -6,6 +6,8 @@ class PhotosController < ApplicationController before_action :authenticate_user!, :except => :show respond_to :html, :json + layout proc { request.format == :mobile ? "application" : "with_header" }, only: :index + def show @photo = if user_signed_in? current_user.photos_from(Person.find_by_guid(params[:person_id])).where(id: params[:id]).first diff --git a/app/controllers/streams_controller.rb b/app/controllers/streams_controller.rb index 22c2ecc37..52edbe5ec 100644 --- a/app/controllers/streams_controller.rb +++ b/app/controllers/streams_controller.rb @@ -7,6 +7,8 @@ class StreamsController < ApplicationController before_action :save_selected_aspects, :only => :aspects before_action :redirect_unless_admin, :only => :public + layout proc { request.format == :mobile ? "application" : "with_header" } + respond_to :html, :mobile, :json diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 9cea03112..e8d25dd73 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -8,6 +8,8 @@ class TagsController < ApplicationController helper_method :tag_followed? + layout proc { request.format == :mobile ? "application" : "with_header" }, only: :show + respond_to :html, :only => [:show] respond_to :json, :only => [:index, :show]