Skip to content

Commit 89661ad

Browse files
nalabjpnalabjp
committed
Convert erb to haml
1 parent ed5c09f commit 89661ad

36 files changed

+582
-738
lines changed

‎app/views/blog_post_page/details.html.haml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
<%= scrivito_details_for 'Permalink' do %>
2-
<%= scrivito_tag :div, @obj, :_permalink %>
3-
<% end %>
4-
5-
<%= scrivito_medium_dialog do %>
6-
<%= scrivito_details_for "Title" do %>
7-
<%= scrivito_tag :div, @obj, :title %>
8-
<% end %>
9-
<% end %>
1+
= scrivito_details_for 'Permalink' do
2+
= scrivito_tag :div, @obj, :_permalink
3+
= scrivito_medium_dialog do
4+
= scrivito_details_for "Title" do
5+
= scrivito_tag :div, @obj, :title

‎app/views/blog_post_page/index.html.haml

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
1-
<article>
2-
<div class="container">
3-
<div class="row">
4-
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
5-
<div class="fontsize-bigger">
6-
<%= scrivito_tag_list :ul, @obj, :toclist do |list, child| %>
7-
<%= list.tag :li do %>
8-
<%= link_to child.display_title, scrivito_path(child) %>
9-
<% end %>
10-
<% end %>
11-
12-
<%= scrivito_tag :h1, @obj, :title %>
13-
<%= scrivito_tag :div, @obj, :abstract %>
14-
<%= scrivito_image_tag @obj, :image, class: "img-responsive" %>
15-
<%= scrivito_tag :div, @obj, :body %>
16-
<hr>
17-
<%= content_tag :div, scrivito_value(@obj.last_changed.strftime("更新日: %Y年%m月%d日")),
18-
class: "text-muted text-right h5" %>
19-
<div style="margin-left: 0px; padding-bottom: 30px;"></div>
20-
<%= render 'shared/sitemap_sotechsha' if @sts_posts %>
21-
</div>
22-
</div>
23-
</div>
24-
</div>
25-
</article>
1+
%article
2+
.container
3+
.row
4+
.col-lg-8.col-lg-offset-2.col-md-10.col-md-offset-1
5+
.fontsize-bigger
6+
= scrivito_tag_list :ul, @obj, :toclist do |list, child|
7+
= list.tag :li do
8+
= link_to child.display_title, scrivito_path(child)
9+
= scrivito_tag :h1, @obj, :title
10+
= scrivito_tag :div, @obj, :abstract
11+
= scrivito_image_tag @obj, :image, class: "img-responsive"
12+
= scrivito_tag :div, @obj, :body
13+
%hr/
14+
= content_tag :div, scrivito_value(@obj.last_changed.strftime("更新日: %Y年%m月%d日")), |
15+
class: "text-muted text-right h5" |
16+
%div{:style => "margin-left: 0px; padding-bottom: 30px;"}
17+
= render 'shared/sitemap_sotechsha' if @sts_posts

‎app/views/blog_post_page/thumbnail.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<%= scrivito_thumbnail BlogPostPage.description_for_editor, :content %>
1+
= scrivito_thumbnail BlogPostPage.description_for_editor, :content

‎app/views/docs/index.html.haml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
<% provide(:title, @title) %>
2-
<% provide(:url, @url ) %>
3-
4-
<div class="container" style="line-height: 2.2em;">
5-
<section class="keiyaku" style="padding: 50px 0px 50px 0px;">
6-
<h2 style="text-align: center; padding-bottom: 50px;"><%= @title %></h2>
7-
<ul style="font-size: 120%">
8-
<% @docs.each do |doc| %>
9-
<li><%= link_to doc.title, doc.url %></li>
10-
<% end %>
11-
</ul>
12-
</section>
13-
</div>
1+
- provide(:title, @title)
2+
- provide(:url, @url )
3+
.container{:style => "line-height: 2.2em;"}
4+
%section.keiyaku{:style => "padding: 50px 0px 50px 0px;"}
5+
%h2{:style => "text-align: center; padding-bottom: 50px;"}= @title
6+
%ul{:style => "font-size: 120%"}
7+
- @docs.each do |doc|
8+
%li= link_to doc.title, doc.url

‎app/views/docs/show.html.haml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
<% provide(:title, @doc.title) %>
2-
<% provide(:url, @url) %>
3-
4-
<div class="container" style="line-height: 1.9em;">
5-
<section class="keiyaku" style="padding: 50px 0px 100px 0px;">
6-
<%= raw @content %>
7-
</section>
8-
</div>
1+
- provide(:title, @doc.title)
2+
- provide(:url, @url)
3+
.container{:style => "line-height: 1.9em;"}
4+
%section.keiyaku{:style => "padding: 50px 0px 100px 0px;"}
5+
= raw @content

‎app/views/download/details.html.haml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
<%= scrivito_medium_dialog do %>
2-
<%= scrivito_details_for do %>
3-
<%= scrivito_tag :div, @obj, :blob do %>
4-
<%= link_to @obj.description_for_editor, scrivito_path(@obj), :target => :blank %>
5-
<% end %>
6-
<% end %>
7-
8-
<%= scrivito_details_for do %>
9-
<%= number_to_human_size @obj.meta_data[:content_length] %>
10-
<% end %>
11-
<% end %>
1+
= scrivito_medium_dialog do
2+
= scrivito_details_for do
3+
= scrivito_tag :div, @obj, :blob do
4+
= link_to @obj.description_for_editor, scrivito_path(@obj), :target => :blank
5+
= scrivito_details_for do
6+
= number_to_human_size @obj.meta_data[:content_length]

‎app/views/footer_widget/details.html.haml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
<%= scrivito_medium_dialog do %>
2-
<%= scrivito_details_for FooterWidget.description_for_editor do %>
3-
<% end %>
4-
<% end %>
1+
= scrivito_medium_dialog do
2+
= scrivito_details_for FooterWidget.description_for_editor do

‎app/views/footer_widget/show.html.haml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
<div class="col-12">
2-
<div class="col-3 cover-bg-blue">
3-
<%= scrivito_tag :h5, widget, :headline, class:'cover-text-white', style:'padding-top:20px;' %>
4-
<%= scrivito_tag :p, widget, :paragraph, class:'cover-text-white', style:'padding-bottom:60; padding-top:20px;' %>
5-
</div>
6-
</div>
7-
1+
.col-12
2+
.col-3.cover-bg-blue
3+
= scrivito_tag :h5, widget, :headline, class:'cover-text-white', style:'padding-top:20px;'
4+
= scrivito_tag :p, widget, :paragraph, class:'cover-text-white', style:'padding-bottom:60; padding-top:20px;'

‎app/views/footer_widget/thumbnail.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<%= scrivito_thumbnail FooterWidget.description_for_editor %>
1+
= scrivito_thumbnail FooterWidget.description_for_editor

‎app/views/headline_widget/details.html.haml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<%= scrivito_small_dialog do %>
2-
<%= scrivito_details_for 'Anchor' do %>
3-
<%= scrivito_tag(:div, widget, :anchor) %>
4-
<% end %>
5-
<% end %>
1+
= scrivito_small_dialog do
2+
= scrivito_details_for 'Anchor' do
3+
= scrivito_tag(:div, widget, :anchor)

‎app/views/headline_widget/show.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<div class="headline-anchor" id="<%= widget.anchor %>"></div>
2-
<%= scrivito_tag :h2, widget, :headline, class: "headline" %>
1+
.headline-anchor{:id => "#{widget.anchor}"}
2+
= scrivito_tag :h2, widget, :headline, class: "headline"

‎app/views/headline_widget/thumbnail.html.haml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
<%= scrivito_thumbnail HeadlineWidget.description_for_editor, :headline do %>
1+
= scrivito_thumbnail HeadlineWidget.description_for_editor, :headline do
22
A headline widget with an Anchor ID attribute.
3-
<% end %>

‎app/views/image/details.html.haml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1-
<%= scrivito_medium_dialog do %>
2-
<%= scrivito_details_for do %>
3-
<%= scrivito_image_tag @obj %>
4-
<% end %>
5-
6-
<%= scrivito_details_for do %>
7-
<% if @obj.meta_data[:width] && @obj.meta_data[:height]%>
8-
<div>
9-
<%= @obj.meta_data[:width] %> × <%= @obj.meta_data[:height] %> px
10-
</div>
11-
<% end %>
12-
13-
<div>
14-
<%= number_to_human_size @obj.meta_data[:content_length] %>
15-
</div>
16-
<% end %>
17-
<% end %>
1+
= scrivito_medium_dialog do
2+
= scrivito_details_for do
3+
= scrivito_image_tag @obj
4+
= scrivito_details_for do
5+
- if @obj.meta_data[:width] && @obj.meta_data[:height]
6+
%div
7+
= @obj.meta_data[:width]
8+
× #{@obj.meta_data[:height]} px
9+
%div
10+
= number_to_human_size @obj.meta_data[:content_length]

‎app/views/image_widget/show.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<%= scrivito_image_tag widget, :image, style:'padding-top:-50px;',
2-
:class => "img-responsive" %>
1+
= scrivito_image_tag widget, :image, style:'padding-top:-50px;', |
2+
:class => "img-responsive" |

‎app/views/image_widget/thumbnail.html.haml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
<%= scrivito_thumbnail ImageWidget.description_for_editor, :image do %>
1+
= scrivito_thumbnail ImageWidget.description_for_editor, :image do
22
A widget with an image.
3-
<% end %>

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

Lines changed: 74 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,75 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport"
7-
content="width=device-width, initial-scale=1,
8-
minimum-scale=1, maximum-scale=1, user-scalable=no">
1+
!!!
2+
%html
3+
%head
4+
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
5+
%meta{:charset => "utf-8"}/
6+
%meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/
7+
%meta{:content => "width=device-width, initial-scale=1,\n\t\t minimum-scale=1, maximum-scale=1, user-scalable=no", :name => "viewport"}/
8+
%title= full_title(yield(:title))
9+
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
10+
= javascript_include_tag 'application', 'data-turbolinks-track' => true
11+
= csrf_meta_tags
12+
= scrivito_head_tags if using_scrivito?
13+
%meta{:content => "715330868", :property => "fb:admins"}/
14+
%meta{:content => "805184859580207", :property => "fb:app_id"}/
15+
%meta{:content => "#{full_title(yield(:title))}", :property => "og:title"}/
16+
%meta{:content => "#{full_url(yield(:url))}", :property => "og:url"}/
17+
%meta{:content => "#{meta_description(yield(:meta_description))}", :name => "description"}/
18+
%meta{:content => "#{meta_description(yield(:meta_description))}", :property => "og:description"}/
19+
%meta{:content => "website", :property => "og:type"}/
20+
%meta{:content => "https://coderdojo.jp/og-image.png", :property => "og:image"}/
21+
%meta{:content => "image/png", :property => "og:image:type"}/
22+
%meta{:content => "CoderDojo Japan", :property => "og:site_name"}/
23+
%meta{:content => "summary", :name => "twitter:card"}/
24+
%meta{:content => "@CoderDojoJapan", :name => "twitter:site"}/
25+
%meta{:content => "#{full_title(yield(:title))}", :name => "twitter:title"}/
26+
%meta{:content => "#{meta_description(yield(:meta_description))}", :name => "twitter:description"}/
27+
%meta{:content => "https://coderdojo.jp/og-image.png", :name => "twitter:image"}/
28+
%meta{:content => "#{full_url(yield(:url))}", :name => "twitter:url"}/
29+
%link{:href => "/img/apple-icon-57x57.png", :rel => "apple-touch-icon", :sizes => "57x57"}/
30+
%link{:href => "/img/apple-icon-60x60.png", :rel => "apple-touch-icon", :sizes => "60x60"}/
31+
%link{:href => "/img/apple-icon-72x72.png", :rel => "apple-touch-icon", :sizes => "72x72"}/
32+
%link{:href => "/img/apple-icon-76x76.png", :rel => "apple-touch-icon", :sizes => "76x76"}/
33+
%link{:href => "/img/apple-icon-114x114.png", :rel => "apple-touch-icon", :sizes => "114x114"}/
34+
%link{:href => "/img/apple-icon-120x120.png", :rel => "apple-touch-icon", :sizes => "120x120"}/
35+
%link{:href => "/img/apple-icon-144x144.png", :rel => "apple-touch-icon", :sizes => "144x144"}/
36+
%link{:href => "/img/apple-icon-152x152.png", :rel => "apple-touch-icon", :sizes => "152x152"}/
37+
%link{:href => "/img/apple-icon-180x180.png", :rel => "apple-touch-icon", :sizes => "180x180"}/
38+
%link{:href => "/img/android-icon-192x192.png", :rel => "icon", :sizes => "192x192", :type => "image/png"}/
39+
%link{:href => "/img/favicon-16x16.png", :rel => "icon", :sizes => "16x16", :type => "image/png"}/
40+
%link{:href => "/img/favicon-32x32.png", :rel => "icon", :sizes => "32x32", :type => "image/png"}/
41+
%link{:href => "/img/favicon-96x96.png", :rel => "icon", :sizes => "96x96", :type => "image/png"}/
42+
%link{:href => "/manifest.json", :rel => "manifest"}/
43+
%link{:color => "#1373ce", :href => "/img/safari-pinned-tab.svg", :rel => "mask-icon"}/
44+
%meta{:content => "#ffffff", :name => "msapplication-TileColor"}/
45+
%meta{:content => "/img/ms-icon-144x144.png", :name => "msapplication-TileImage"}/
46+
%meta{:content => "#ffffff", :name => "theme-color"}/
47+
%link{:href => "https://fonts.googleapis.com/css?family=Fjalla+One", :rel => "stylesheet", :type => "text/css"}/
48+
/ HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries
49+
/ WARNING: Respond.js doesn't work if you view the page via file://
50+
/[if lt IE 9]
51+
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
52+
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
53+
%body
54+
- flash.each do |message_type, message|
55+
%div{:class => "alert alert-#{message_type}"}= message
56+
= yield
57+
= scrivito_body_tags if using_scrivito?
58+
= render 'shared/footer'
59+
#fb-root
60+
:javascript
61+
(function(d, s, id) {
62+
var js, fjs = d.getElementsByTagName(s)[0];
63+
if (d.getElementById(id)) return;
64+
js = d.createElement(s); js.id = id;
65+
js.src = "//connect.facebook.net/ja_JP/sdk.js#xfbml=1&version=v2.8&appId=805184859580207";
66+
fjs.parentNode.insertBefore(js, fjs);
67+
}(document, 'script', 'facebook-jssdk'));
68+
:javascript
69+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
70+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
71+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
72+
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
973

10-
<title><%= full_title(yield(:title)) %></title>
11-
12-
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
13-
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
14-
<%= csrf_meta_tags %>
15-
<%= scrivito_head_tags if using_scrivito? %>
16-
17-
<meta property="fb:admins" content="715330868" />
18-
<meta property="fb:app_id" content="805184859580207" />
19-
<meta property="og:title" content="<%= full_title(yield(:title)) %>">
20-
<meta property="og:url" content="<%= full_url(yield(:url)) %>">
21-
<meta name="description" content="<%= meta_description(yield(:meta_description)) %>" />
22-
<meta property="og:description" content="<%= meta_description(yield(:meta_description)) %>" />
23-
24-
<meta property="og:type" content="website">
25-
<meta property="og:image" content="https://coderdojo.jp/og-image.png">
26-
<meta property="og:image:type" content="image/png">
27-
<meta property="og:site_name" content="CoderDojo Japan">
28-
29-
<meta name="twitter:card" content="summary" />
30-
<meta name="twitter:site" content="@CoderDojoJapan" />
31-
<meta name="twitter:title" content="<%= full_title(yield(:title)) %>" />
32-
<meta name="twitter:description" content="<%= meta_description(yield(:meta_description)) %>" />
33-
<meta name="twitter:image" content="https://coderdojo.jp/og-image.png" />
34-
<meta name="twitter:url" content="<%= full_url(yield(:url)) %>" />
35-
36-
<link rel="apple-touch-icon" sizes="57x57" href="/img/apple-icon-57x57.png">
37-
<link rel="apple-touch-icon" sizes="60x60" href="/img/apple-icon-60x60.png">
38-
<link rel="apple-touch-icon" sizes="72x72" href="/img/apple-icon-72x72.png">
39-
<link rel="apple-touch-icon" sizes="76x76" href="/img/apple-icon-76x76.png">
40-
<link rel="apple-touch-icon" sizes="114x114" href="/img/apple-icon-114x114.png">
41-
<link rel="apple-touch-icon" sizes="120x120" href="/img/apple-icon-120x120.png">
42-
<link rel="apple-touch-icon" sizes="144x144" href="/img/apple-icon-144x144.png">
43-
<link rel="apple-touch-icon" sizes="152x152" href="/img/apple-icon-152x152.png">
44-
<link rel="apple-touch-icon" sizes="180x180" href="/img/apple-icon-180x180.png">
45-
<link rel="icon" type="image/png" sizes="192x192" href="/img/android-icon-192x192.png">
46-
<link rel="icon" type="image/png" sizes="16x16" href="/img/favicon-16x16.png">
47-
<link rel="icon" type="image/png" sizes="32x32" href="/img/favicon-32x32.png">
48-
<link rel="icon" type="image/png" sizes="96x96" href="/img/favicon-96x96.png">
49-
<link rel="manifest" href="/manifest.json">
50-
<link rel="mask-icon" href="/img/safari-pinned-tab.svg" color="#1373ce">
51-
<meta name="msapplication-TileColor" content="#ffffff">
52-
<meta name="msapplication-TileImage" content="/img/ms-icon-144x144.png">
53-
<meta name="theme-color" content="#ffffff">
54-
55-
<link href='https://fonts.googleapis.com/css?family=Fjalla+One' rel='stylesheet' type='text/css'>
56-
57-
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
58-
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
59-
<!--[if lt IE 9]>
60-
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
61-
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
62-
<![endif]-->
63-
</head>
64-
<body>
65-
<% flash.each do |message_type, message| %>
66-
<div class="alert alert-<%= message_type %>"><%= message %></div>
67-
<% end %>
68-
<%= yield %>
69-
<%= scrivito_body_tags if using_scrivito? %>
70-
<%= render 'shared/footer' %>
71-
</body>
72-
73-
<div id="fb-root"></div>
74-
<script>(function(d, s, id) {
75-
var js, fjs = d.getElementsByTagName(s)[0];
76-
if (d.getElementById(id)) return;
77-
js = d.createElement(s); js.id = id;
78-
js.src = "//connect.facebook.net/ja_JP/sdk.js#xfbml=1&version=v2.8&appId=805184859580207";
79-
fjs.parentNode.insertBefore(js, fjs);
80-
}(document, 'script', 'facebook-jssdk'));</script>
81-
82-
<script>
83-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
84-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
85-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
86-
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
87-
88-
ga('create', 'UA-62337761-1', 'auto');
89-
ga('send', 'pageview');
90-
</script>
91-
92-
</html>
74+
ga('create', 'UA-62337761-1', 'auto');
75+
ga('send', 'pageview');

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<%= scrivito_head_tags %>
5-
<%= stylesheet_link_tag 'application', media: 'all' %>
6-
<%= csrf_meta_tags %>
7-
</head>
8-
<body class="scrivito_dialog">
9-
<%= scrivito_body_tags %>
10-
<%= yield %>
11-
<%= javascript_include_tag 'application' %>
12-
</body>
13-
</html>
1+
!!!
2+
%html
3+
%head
4+
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
5+
= scrivito_head_tags
6+
= stylesheet_link_tag 'application', media: 'all'
7+
= csrf_meta_tags
8+
%body.scrivito_dialog
9+
= scrivito_body_tags
10+
= yield
11+
= javascript_include_tag 'application'

‎app/views/login_page/details.html.haml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<%= scrivito_medium_dialog do %>
2-
<%= scrivito_details_for "Title" do %>
3-
<%= scrivito_tag :div, @obj, :title %>
4-
<% end %>
5-
<% end %>
1+
= scrivito_medium_dialog do
2+
= scrivito_details_for "Title" do
3+
= scrivito_tag :div, @obj, :title

0 commit comments

Comments
 (0)