Skip to content
This repository was archived by the owner on Mar 19, 2020. It is now read-only.

Commit effb8bb

Browse files
author
Yuma Soga
committed
#35 Add Partial footer and header
1 parent 510e3bc commit effb8bb

File tree

6 files changed

+57
-88
lines changed

6 files changed

+57
-88
lines changed

‎app/controllers/application_controller.rb

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,16 @@ class ApplicationController < ActionController::Base
77

88
private
99
def put_ver_link
10-
@first_link = { :url => "#{root_url}", :text => "ROOT" }
11-
@second_link = { :url => "#{root_url}", :text => "ROOT" }
12-
@third_link = { :url => "#{root_url}visit-interview", :text => "見学・取材について" }
13-
@fourth_link = { :url => "#{root_url}f-and-q", :text => "よくある質問 (F&Q)" }
14-
@first_link_footer = { url: "#{root_url}pages", text: "ページ一覧" }
15-
@second_link_footer = { url: "#{root_url}regulation", text: "会則" }
10+
@header_links = [
11+
{ url: "#{root_url}", text: "ROOT" },
12+
{ url: "#{root_url}", text: "ROOT" },
13+
{ url: "#{root_url}visit-interview", text: "見学・取材について" },
14+
{ url: "#{root_url}f-and-q", text: "よくある質問 (F&Q)" }
15+
]
16+
17+
@footer_links = [
18+
{ url: "#{root_url}pages", text: "ページ一覧" },
19+
{ url: "#{root_url}regulation", text: "会則" }
20+
]
1621
end
1722
end

‎app/views/application/_footer.haml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
%footer.bg-dark
2+
.footer-connect
3+
.container
4+
.row
5+
.col-lg-12.mx-auto.my-3.text-center.text-white
6+
.footer-social
7+
%h5 Social Links
8+
.footer-social-icons
9+
%a.mx-1{ target: "_blank" , href: "https://twitter.com/coderdojo_konan", title: "Twitter" }
10+
= fa_icon "twitter 2x"
11+
%a.mx-1{ target: "_blank", href: "http://facebook.com/Coderdojo.Konan/", title: "Facebook" }
12+
= fa_icon "facebook 2x"
13+
%a.mx-1{ target: "_blank", href: "https://www.instagram.com/coderdojo_konan/", title: "Instagram" }
14+
= fa_icon "instagram 2x"
15+
%a.mx-1{ target: "_blank", href: "https://github.com/CoderDojo-Konan-Okayama", title: "Github" }
16+
= fa_icon "github 2x"
17+
%a.mx-1{ target: "_blank", href: "https://www.youtube.com/channel/UCRN6euxI9l10q6I-gVewVcw", title: "YouTube" }
18+
= fa_icon "youtube 2x"
19+
.row
20+
.col-lg-8.mx-auto.my-1.text-center.text-white
21+
.footer-links
22+
- @footer_links.each do |fotter_link|
23+
= link_to fotter_link[:text], fotter_link[:url], { :class => "mx-1" }
24+
.row
25+
.col-lg-12.col-lg-12.mx-auto.my-3.text-center.text-white
26+
%p Copyright © 2018 CoderDojo Konan Okayama

‎app/views/application/_header.haml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
- flash.each do |key, value|
2+
#info{style: "display:none" }
3+
= content_tag(:p, value, class: "#{key}")
4+
%nav#mainNav.navbar.navbar-expand-lg.navbar-light.fixed-top
5+
.container-fluid
6+
%a.navbar-brand.js-scroll-trigger{:href => "#{root_url}#page-top"}
7+
%button.navbar-toggler.navbar-toggler-right{"aria-controls" => "navbarResponsive", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarResponsive", "data-toggle" => "collapse", :type => "button"}
8+
%span.navbar-toggler-icon
9+
#navbarResponsive.collapse.navbar-collapse
10+
%ul.navbar-nav.ml-auto
11+
- @header_links.each do |header_links|
12+
%li.nav-item
13+
= link_to header_links[:text], header_links[:url], { :class => "nav-link js-scroll-trigger" }

‎app/views/layouts/application.html.haml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@
2222
%meta{:coderdojo => "1881439892127060", :property => "fb:pages"}/
2323
%meta{:content => "CoderDojo 岡山 岡南", :name => "author"}/
2424
%body
25+
= render 'header'
2526
= yield
27+
= render 'footer'

‎app/views/layouts/pages.html.haml

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -25,51 +25,13 @@
2525
%meta{:content => "CoderDojo 岡山 岡南", :name => "author"}/
2626
%link{:href => "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800", :rel => "stylesheet", :type => "text/css"}/
2727
%link{:href => "https://fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic", :rel => "stylesheet", :type => "text/css"}/
28-
%body#page-top
29-
#notice{style: "display:none" }
30-
= notice
3128

32-
/ Navigation
33-
%nav#mainNav.navbar.navbar-expand-lg.navbar-light.fixed-top
34-
.container-fluid
35-
%a.navbar-brand.js-scroll-trigger{:href => "#{root_url}#page-top"}
36-
%button.navbar-toggler.navbar-toggler-right{"aria-controls" => "navbarResponsive", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarResponsive", "data-toggle" => "collapse", :type => "button"}
37-
%span.navbar-toggler-icon
38-
#navbarResponsive.collapse.navbar-collapse
39-
%ul.navbar-nav.ml-auto
40-
%li.nav-item
41-
%a.nav-link.js-scroll-trigger{:href => "#{@first_link[:url]}"}= @first_link[:text]
42-
%li.nav-item
43-
%a.nav-link.js-scroll-trigger{:href => "#{@second_link[:url]}"}= @second_link[:text]
44-
%li.nav-item
45-
%a.nav-link.js-scroll-trigger{:href => "#{@third_link[:url]}"}= @third_link[:text]
46-
%li.nav-item
47-
%a.nav-link.js-scroll-trigger{:href => "#{@fourth_link[:url]}"}= @fourth_link[:text]
29+
%body#page-top
30+
= render 'header'
4831
%article
4932
%section#page-content
5033
.container
5134
.row
5235
.col-lg-12.mx-auto.my-3
5336
= yield
54-
55-
%footer.bg-dark
56-
.footer-connect
57-
.container
58-
.row
59-
.col-lg-12.mx-auto.my-3.text-center.text-white
60-
.footer-social
61-
%h5 Social Links
62-
.footer-social-icons
63-
%a.mx-1{ target: "_blank" , href: "https://twitter.com/coderdojo_konan", title: "Twitter" }
64-
= fa_icon "twitter 2x"
65-
%a.mx-1{ target: "_blank", href: "http://facebook.com/Coderdojo.Konan/", title: "Facebook" }
66-
= fa_icon "facebook 2x"
67-
%a.mx-1{ target: "_blank", href: "https://www.instagram.com/coderdojo_konan/", title: "Instagram" }
68-
= fa_icon "instagram 2x"
69-
%a.mx-1{ target: "_blank", href: "https://github.com/CoderDojo-Konan-Okayama", title: "Github" }
70-
= fa_icon "github 2x"
71-
%a.mx-1{ target: "_blank", href: "https://www.youtube.com/channel/UCRN6euxI9l10q6I-gVewVcw", title: "YouTube" }
72-
= fa_icon "youtube 2x"
73-
.row
74-
.col-lg-12.col-lg-12.mx-auto.my-3.text-center.text-white
75-
%p Copyright © 2018 CoderDojo Konan Okayama
37+
= render 'footer'

‎app/views/layouts/staticpages.html.haml

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -24,45 +24,6 @@
2424
%link{:href => "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800", :rel => "stylesheet", :type => "text/css"}/
2525
%link{:href => "https://fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic", :rel => "stylesheet", :type => "text/css"}/
2626
%body#page-top
27-
- flash.each do |key, value|
28-
#info{style: "display:none" }
29-
= content_tag(:p, value, class: "#{key}")
30-
/ Navigation
31-
%nav#mainNav.navbar.navbar-expand-lg.navbar-light.fixed-top
32-
.container-fluid
33-
%a.navbar-brand.js-scroll-trigger{:href => "#{root_url}#page-top"}
34-
%button.navbar-toggler.navbar-toggler-right{"aria-controls" => "navbarResponsive", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarResponsive", "data-toggle" => "collapse", :type => "button"}
35-
%span.navbar-toggler-icon
36-
#navbarResponsive.collapse.navbar-collapse
37-
%ul.navbar-nav.ml-auto
38-
%li.nav-item
39-
%a.nav-link.js-scroll-trigger{:href => "#{@first_link[:url]}"}= @first_link[:text]
40-
%li.nav-item
41-
%a.nav-link.js-scroll-trigger{:href => "#{@second_link[:url]}"}= @second_link[:text]
42-
%li.nav-item
43-
%a.nav-link.js-scroll-trigger{:href => "#{@third_link[:url]}"}= @third_link[:text]
44-
%li.nav-item
45-
%a.nav-link.js-scroll-trigger{:href => "#{@fourth_link[:url]}"}= @fourth_link[:text]
27+
= render 'header'
4628
= yield
47-
48-
%footer.bg-dark
49-
.footer-connect
50-
.container
51-
.row
52-
.col-lg-12.mx-auto.my-3.text-center.text-white
53-
.footer-social
54-
%h5 Social Links
55-
.footer-social-icons
56-
%a.mx-1{ target: "_blank" , href: "https://twitter.com/coderdojo_konan", title: "Twitter" }
57-
= fa_icon "twitter 2x"
58-
%a.mx-1{ target: "_blank", href: "http://facebook.com/Coderdojo.Konan/", title: "Facebook" }
59-
= fa_icon "facebook 2x"
60-
%a.mx-1{ target: "_blank", href: "https://www.instagram.com/coderdojo_konan/", title: "Instagram" }
61-
= fa_icon "instagram 2x"
62-
%a.mx-1{ target: "_blank", href: "https://github.com/CoderDojo-Konan-Okayama", title: "Github" }
63-
= fa_icon "github 2x"
64-
%a.mx-1{ target: "_blank", href: "https://www.youtube.com/channel/UCRN6euxI9l10q6I-gVewVcw", title: "YouTube" }
65-
= fa_icon "youtube 2x"
66-
.row
67-
.col-lg-12.col-lg-12.mx-auto.my-3.text-center.text-white
68-
%p Copyright © 2018 CoderDojo Konan Okayama
29+
= render 'footer'

0 commit comments

Comments
 (0)