codetriage · schneems · Apr 2, 2015 · Mar 29, 2015
diff --git 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
@@ -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
@@ -0,0 +1,8 @@
+<% [:notice, :error, :alert, :success].each do |level| %>
+  <% unless flash[level].blank? %>
+    <div class='alert alert-block <%="alert-#{level}" %>'>
+      <a class="close" data-dismiss="alert" href="#">&times;</a>
+      <%= content_tag :p, flash[level] %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/application/_head.html.erb b/app/views/application/_head.html.erb
@@ -0,0 +1,22 @@
+<head>
+  <meta charset="utf-8">
+  <title>Code Triage</title>
+
+  <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <%= csrf_meta_tags %>
+
+  <%= stylesheet_link_tag "application", media: "all" %>
+
+  <script src="http://heroku.github.com/template-app-bootstrap/jquery-1.7.1.min.js"></script>
+  <script src="http://heroku.github.com/template-app-bootstrap/jquery.replacetext.min.js"></script>
+  <%= javascript_include_tag "application" %>
+
+  <!--
+    IMPORTANT:
+    This is Heroku specific styling. Remove to customize.
+  -->
+  <link href="http://heroku.github.com/template-app-bootstrap/heroku.css" rel="stylesheet">
+  <!-- /// -->
+
+</head>
diff --git a/app/views/application/_nav.html.erb b/app/views/application/_nav.html.erb
@@ -0,0 +1,14 @@
+<div class="masthead">
+  <ul class="nav nav-pills pull-right">
+    <%- if user_signed_in? -%>
+      <li><%= image_tag current_user.avatar_url, class: 'img-rounded', height: 30, width: 30 %></li>
+      <li><%= link_to "Home", root_path %></li>
+      <li><%= link_to current_user.github, current_user %></li>
+      <li><%= link_to "Sign Out", destroy_user_session_path, method: :delete %></li>
+    <%- else -%>
+      <li><%= link_to "Home", root_path %></li>
+      <li class="active"><%= link_to 'Sign in', new_user_registration_path %></li>
+    <%- end -%>
+  </ul>
+  <h3 class="muted"><%= link_to "CodeTriage", root_path %></h3>
+</div>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,5 +1,38 @@
-<%= render 'layouts/head' %>
-  <div class="row-fluid marketing buffer">
-    <%= yield %>
+<!doctype html>
+<html>
+<%= render "head" %>
+<body>
+  <a class="hidden-xs" href="https://github.com/codetriage/codetriage"><img style="position: absolute; top: 0; left: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_darkblue_121621.png" alt="Fork me on GitHub"></a>
+  <div class="container-narrow">
+
+    <div class="row-fluid">
+      <%= render "nav" %>
+      <%= render "flashes" %>
+      <%= yield %>
+    </div>
+
+    <div class="footer">
+      <p><a href="/" class="brand" id="heroku">by <strong>heroku</strong></a></p>
+    </div>
+
   </div>
-<%= render 'layouts/footer' %>
+
+  <%= yield :js %>
+
+  <% if Rails.env.production? %>
+    <!-- google analytics -->
+    <script type="text/javascript">
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-2989055-1']);
+      _gaq.push(['_setDomainName', '.heroku.com']);
+      _gaq.push(['_trackPageview']);
+
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+    </script>
+  <% end -%>
+</body>
+</html>
diff --git a/app/views/layouts/home.html.erb b/app/views/layouts/home.html.erb
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
@@ -1,3 +1,16 @@
+<% unless user_signed_in? %>
+  <div class="jumbotron">
+    <h1>Help your favorite open source projects</h1>
+    <p class="lead">Sign up to receive a different open issue in your inbox every day from your favorite GitHub repos</p>
+    <a class="btn btn-large btn-success" href="<%= new_user_registration_path %>">Sign up today</a>
+  </div>
+
+  <div class="jumbotron">
+    <h2></h2>
+    <p class="lead"><%= number_with_delimiter(User.count, delimiter: ',') %> developers are working on <%= Repo.count %> open source repos</p>
+  </div>
+<% end -%>
+
 <hr />
 
 <% if @repos_subs.present? %>

diff --git 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