Skip to content

Commit

Permalink
Added Dads page
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewcockerham committed May 10, 2013
1 parent 878768d commit 3389bb5
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 15 deletions.
1 change: 1 addition & 0 deletions app/assets/stylesheets/styles.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ $baseFontFamily: Oxygen;
@import url(http://fonts.googleapis.com/css?family=Oxygen);

$navbarBackground: black;
$navbarBackgroundHighlight: black;

@import 'bootstrap';

Expand Down
6 changes: 6 additions & 0 deletions app/controllers/pages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,10 @@ def home

def action
end

def bryan
end

def dad
end
end
4 changes: 1 addition & 3 deletions app/views/layouts/_footer.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<div class="footer">
<small>
<%= link_to "One Month Rails", "http://onemonthrails.com" %>
by
<%= link_to "Mattan Griffel", "http://mattangriffel.com" %>
Copyright 2013
</small>
</div>
2 changes: 2 additions & 0 deletions app/views/layouts/_header.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<ul class='nav'>
<li><%= link_to "Home", root_path %></li>
<li><%= link_to "About", about_path %></li>
<li><%= link_to "Bryan", bryan_path %></li>
<li><%= link_to "Dad", dad_path %></li>
<!-- .nav, .navbar-search, .navbar-form, etc -->
</ul>
<ul class='nav pull-right'>
Expand Down
7 changes: 5 additions & 2 deletions app/views/pages/Bryan.html.erb
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
<h1>Pages#Bryan</h1>
<p>This is my first rails webpage. Hopefully soon I'll actually be helpful :)</p>
<h1>Hey Dude</h1>
<p>This is my first rails webpage. Hopefully soon I'll actually be helpful :)

Wanna meet tonight? Or how about Sunday evening?
</p>
5 changes: 1 addition & 4 deletions app/views/pages/about.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<h1>About</h1>
<p>
<%= link_to "One Month Rails", "http://onemonthrails.com" %>
is a project to teach
<%= link_to "Ruby on Rails", "http://rubyonrails.org" %>
in one month. This is the sample application.
SkillChest was created for the future of learning and working. Save all of your learning, including non-traditional learning such as conferences and certifications, and keep a verified record all in one place. This can then be share with employers.
</p>
4 changes: 4 additions & 0 deletions app/views/pages/dad.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<h1>Hey Dad!</h1>
<p>
So I'm teaching myself to code. Here is a website I made. What do you think? Looking forward to seeing you this weekend.
</p>
9 changes: 4 additions & 5 deletions app/views/pages/home.html.erb
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<div class="hero-unit">
<div class="row">
<div class="span4">
<!-- <div class="span4">
<h2>Navigation Bar</h2>
</div>
-->
<div class="span8">
<h1>Welcome to One Month Rails!</h1>
<h1>Welcome to SkillChest!</h1>
<p>
You found the home page for the
<%= link_to "One Month Rails", "http://onemonthrails.com"%>
application.
Store all of your learning and work experiences in one place.
</p>
<p>
<%= link_to "Create your SkillChest!", "#", class: "btn btn-primary btn-large" %>
Expand Down
4 changes: 3 additions & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

get "pages/Bryan"


get 'bryan' => 'pages#bryan'

get 'dad' => 'pages#dad'

# The priority is based upon order of creation:
# first created -> highest priority.
Expand Down

0 comments on commit 3389bb5

Please sign in to comment.