re derive from app application, but use merged layout
This commit is contained in:
parent
4e2c0c9687
commit
36929d35c8
@ -1,5 +1,6 @@
|
|||||||
module Merged
|
module Merged
|
||||||
class MergedController < ApplicationController
|
class MergedController < ::ApplicationController
|
||||||
before_action :authenticate_member!
|
before_action :authenticate_member!
|
||||||
|
layout "merged/application"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -6,7 +6,7 @@ module Merged
|
|||||||
blog.sections.last
|
blog.sections.last
|
||||||
end
|
end
|
||||||
def last_blog
|
def last_blog
|
||||||
self.class.last_blog
|
PagesHelper.last_blog
|
||||||
end
|
end
|
||||||
|
|
||||||
def header_list
|
def header_list
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
%html
|
%html
|
||||||
%head
|
%head
|
||||||
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
|
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
|
||||||
%title Hubfeenix
|
%title Merged CMS
|
||||||
%meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
|
%meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
|
||||||
= csrf_meta_tags
|
= csrf_meta_tags
|
||||||
= csp_meta_tag
|
= csp_meta_tag
|
||||||
|
@ -3,4 +3,5 @@ Rails.application.routes.draw do
|
|||||||
|
|
||||||
get ":id" , to: "merged/view#page" , id: :id
|
get ":id" , to: "merged/view#page" , id: :id
|
||||||
|
|
||||||
|
get :destroy_member_session , to: "merged/view#page"
|
||||||
end
|
end
|
||||||
|
@ -5,7 +5,7 @@ class ImagesTest < ActionDispatch::IntegrationTest
|
|||||||
|
|
||||||
def test_index
|
def test_index
|
||||||
visit "/merged/images"
|
visit "/merged/images"
|
||||||
assert_title page, "Dummy"
|
assert_title page, "Merged"
|
||||||
assert_text page, "Pages"
|
assert_text page, "Pages"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ class PageTest < ActionDispatch::IntegrationTest
|
|||||||
|
|
||||||
def test_returns_success
|
def test_returns_success
|
||||||
visit "/merged/pages"
|
visit "/merged/pages"
|
||||||
assert_title page, "Dummy"
|
assert_title page, "Merged"
|
||||||
assert_text page, "Pages"
|
assert_text page, "Pages"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ class StylesTest < ActionDispatch::IntegrationTest
|
|||||||
|
|
||||||
def test_returns_success
|
def test_returns_success
|
||||||
visit "/merged/styles/index"
|
visit "/merged/styles/index"
|
||||||
assert_title page, "Dummy"
|
assert_title page, "Merged"
|
||||||
assert_text page, "Styles"
|
assert_text page, "Styles"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user