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

Commit 53b6153

Browse files
author
Yuma Soga
committed
Some fixes
1 parent 9b3bd89 commit 53b6153

File tree

7 files changed

+13
-24
lines changed

7 files changed

+13
-24
lines changed

app/assets/javascripts/application.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
1111
// about supported directives.
1212
//
13-
//= require jquery3
14-
//= require jquery_ujs
13+
//= require jquery
1514
//= require rails-ujs
15+
//= require_tree .
1616
//= require turbolinks
1717
//= require toastr
1818
//= require popper
1919
//= require bootstrap
20-
//= require_tree .

app/controllers/application_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def put_ver_link
1919
{ url: "#{root_url}regulation", text: "会則" },
2020
{ url: "#{root_url}visit-interview", text: "見学・取材について" },
2121
{ url: "#{root_url}f-and-q", text: "よくある質問 (F&Q)"},
22-
{ url: "#{root_url}privacy-policy", text: "Privacy Policy(個人情報保護方針)"}
22+
{ url: "#{root_url}privacy-policy", text: "Privacy & Policy(個人情報保護方針)"}
2323
]
2424
end
2525
end

app/helpers/application_helper.rb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ def full_title(page_title)
99
end
1010

1111
def next_event_url
12-
latest_event = get_latest_event
13-
if Date.parse(latest_event['started_at']) > Date.today
14-
latest_event['event_url']
12+
unless ENV["CODERDOJO_KONAN_JP_OFFLINE_MODE"]
13+
latest_event = get_latest_event
14+
if Date.parse(latest_event['started_at']) > Date.today
15+
latest_event['event_url']
16+
else
17+
nil
18+
end
1519
else
1620
nil
1721
end

app/views/layouts/staticpages.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
55
%meta{:name => "viewport", :content => "width=device-width, initial-scale=1, shrink-to-fit=no"}/
66
%title= full_title(yield(:title))
7-
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
8-
= javascript_include_tag 'application', 'data-turbolinks-track' => true
7+
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => 'reload'
8+
= javascript_include_tag 'application', 'data-turbolinks-track' => 'reload'
99
= csrf_meta_tags
1010
= favicon_link_tag
1111
%meta{:content => "summary", :name => "twitter:card"}/

public/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@
275275

276276
.background-image {
277277
background-color: #FFFFFF;
278-
background-image: url(https://dka575ofm4ao0.cloudfront.net/assets/better_error_pages/templates/background/background-e1d28eee7cab6e890134c7271be33d66.png) !important;
278+
background-image:
279279
}
280280

281281
.primary-text-color {

test/application_system_test_case.rb

Lines changed: 0 additions & 5 deletions
This file was deleted.

test/system/posts_test.rb

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)