diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index 96a4dd4..0000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,41 +0,0 @@ - - - - <%= @title ? "Zoomix / #{@title}" : 'Zoomix' %> - <%= stylesheet_link_tag "application", :media => "all" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - - -
-
-

- <%= link_to image_tag('logo.png', alt: 'Zoomix', width: 240), root_path %>Always by your side. -

- -
-
- -<%= yield %> - -
- -
-<% if notice %> -

<%= notice %>

-<% end %> -<% if alert %> -

<%= alert %>

-<% end %> - - diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim new file mode 100644 index 0000000..ba5087a --- /dev/null +++ b/app/views/layouts/application.html.slim @@ -0,0 +1,28 @@ +doctype html +html id=controller.controller_name + head + title= @title ? "Zoomix / #{@title}" : 'Zoomix' + = stylesheet_link_tag "application", :media => "all" + = javascript_include_tag "application" + = csrf_meta_tags + body + #wrapper + header + h1= link_to image_tag('logo.png', alt: 'Zoomix', width: 240), root_path + p Always by your side. + nav + ul + - if user_signed_in? + li= link_to 'ログアウト', destroy_user_session_path, method: :delete + - else + li= link_to 'ログイン', user_omniauth_authorize_path(:twitter) + #main + = yield + + footer + p © 2012 dbsh5th Web Apllication Team [#{link_to 'About Us', about_path}] + + - if notice + p#notice= notice + - if alert + p#alert= alert