diff --git a/app/assets/stylesheets/screen.scss b/app/assets/stylesheets/screen.scss index 9fa207d11..4b0ac7fe1 100644 --- a/app/assets/stylesheets/screen.scss +++ b/app/assets/stylesheets/screen.scss @@ -24,9 +24,6 @@ line-height: 1; margin: 10px auto; } -.buffer { - margin: 30px auto; -} h2 { margin: 0 auto 20px 0; } diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 36e987aba..e576f0c69 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,10 +1,6 @@ class PagesController < ApplicationController - - layout 'home' - def index @repos = Repo.repos_needing_help_for_user(current_user) @repos_subs = current_user.repo_subscriptions.page(params[:page]||1).per_page(params[:per_page]||50) if user_signed_in? end - end diff --git a/app/views/application/_flashes.html.erb b/app/views/application/_flashes.html.erb new file mode 100644 index 000000000..44acfab03 --- /dev/null +++ b/app/views/application/_flashes.html.erb @@ -0,0 +1,8 @@ +<% [:notice, :error, :alert, :success].each do |level| %> + <% unless flash[level].blank? %> +
+ × + <%= content_tag :p, flash[level] %> +
+ <% end %> +<% end %> diff --git a/app/views/application/_head.html.erb b/app/views/application/_head.html.erb new file mode 100644 index 000000000..69674ab3d --- /dev/null +++ b/app/views/application/_head.html.erb @@ -0,0 +1,22 @@ + + + Code Triage + + + + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag "application", media: "all" %> + + + + <%= javascript_include_tag "application" %> + + + + + + diff --git a/app/views/application/_nav.html.erb b/app/views/application/_nav.html.erb new file mode 100644 index 000000000..d29c94965 --- /dev/null +++ b/app/views/application/_nav.html.erb @@ -0,0 +1,14 @@ +
+ +

<%= link_to "CodeTriage", root_path %>

+
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb deleted file mode 100644 index 71180128b..000000000 --- a/app/views/layouts/_footer.html.erb +++ /dev/null @@ -1,28 +0,0 @@ - - -
-

by heroku

-
- - - - <%= yield :js %> - - <% if Rails.env.production? %> - - - <% end -%> - - - diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb deleted file mode 100644 index ad6056f78..000000000 --- a/app/views/layouts/_head.html.erb +++ /dev/null @@ -1,55 +0,0 @@ - - - - - Code Triage - - - - <%= csrf_meta_tags %> - - <%= stylesheet_link_tag "application", media: "all" %> - - - - <%= javascript_include_tag "application" %> - - - - - - - - - -
- -
- -
-
    - <%- if user_signed_in? -%> -
  • <%= image_tag current_user.avatar_url, class: 'img-rounded', height: 30, width: 30 %>
    • -
  • <%= link_to "Home", root_path %>
    • -
  • <%= link_to current_user.github, current_user %>
    • -
  • <%= link_to "Sign Out", destroy_user_session_path, method: :delete %>
    • - <%- else -%> -
  • <%= link_to "Home", root_path %>
    • -
  • <%= link_to 'Sign in', new_user_registration_path %>
    • - <%- end -%> -
-

<%= link_to "CodeTriage", root_path %>

-
- - <% [:notice, :error, :alert, :success].each do |level| %> - <% unless flash[level].blank? %> -
- × - <%= content_tag :p, flash[level] %> -
- <% end %> - <% end %> -
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6dd552282..e7fa14c3d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,5 +1,38 @@ -<%= render 'layouts/head' %> -
- <%= yield %> + + +<%= render "head" %> + + +
+ +
+ <%= render "nav" %> + <%= render "flashes" %> + <%= yield %> +
+ +
+

by heroku

+
+
-<%= render 'layouts/footer' %> + + <%= yield :js %> + + <% if Rails.env.production? %> + + + <% end -%> + + diff --git a/app/views/layouts/home.html.erb b/app/views/layouts/home.html.erb deleted file mode 100644 index cf01c86ae..000000000 --- a/app/views/layouts/home.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -<%= render 'layouts/head' %> - <% unless user_signed_in? %> - -
-

Help your favorite open source projects

-

Sign up to receive a different open issue in your inbox every day from your favorite GitHub repos

- Sign up today -
- -
-

-

<%= number_with_delimiter(User.count, delimiter: ',') %> developers are working on <%= Repo.count %> open source repos

-
- <% end -%> - - -
- <%= yield %> -
-<%= render 'layouts/footer' %> diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb index 3d56000b2..dc678dddf 100644 --- a/app/views/pages/index.html.erb +++ b/app/views/pages/index.html.erb @@ -1,3 +1,16 @@ +<% unless user_signed_in? %> +
+

Help your favorite open source projects

+

Sign up to receive a different open issue in your inbox every day from your favorite GitHub repos

+ Sign up today +
+ +
+

+

<%= number_with_delimiter(User.count, delimiter: ',') %> developers are working on <%= Repo.count %> open source repos

+
+<% end -%> +
<% if @repos_subs.present? %> diff --git a/test/functional/pages_controller_test.rb b/test/functional/pages_controller_test.rb index 38adbb412..02cfdc7ca 100644 --- a/test/functional/pages_controller_test.rb +++ b/test/functional/pages_controller_test.rb @@ -13,7 +13,6 @@ class PagesControllerTest < ActionController::TestCase assert_not_nil assigns(:repos), 'assigns to repos' assert_not_nil assigns(:repos_subs), 'assigns to repos_subs' assert_template :index, 'render index template' - assert_template({layout: 'home'}, 'render home layout') end test "not signed in user" do