rework static page routing

dbarnhart · Jan 29, 2012 · e6e94bf · e6e94bf
1 parent 814aecf
commit e6e94bf
Show file tree

Hide file tree

Showing 37 changed files with 1,468 additions and 255 deletions.
diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
@@ -1,10 +1,5 @@
 class StaticPagesController < ApplicationController
-  def home
-  end
-
-  def help
-  end
-
-  def about
+  def show
+  	render :action => params[:page]
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,2 +1,10 @@
 module ApplicationHelper
+	def full_title(page_title)
+		base_title = "Ruby on Rails Tutorial Sample App"
+		if page_title.empty?
+			base_title
+		else
+			"#{base_title} | #{page_title}"
+		end
+	end
 end
diff --git a/app/helpers/static_pages_helper.rb b/app/helpers/static_pages_helper.rb
@@ -1,2 +1,5 @@
 module StaticPagesHelper
+	def static_page_path(page)
+		"pages/" + page
+	end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Ruby on Rails Tutorial Sample App | <%= yield(:title) %></title>
+  <title><%= full_title(yield(:title)) %></title>
+  <%= stylesheet_link_tag 'blueprint/screen', :media => 'screen' %>
+  <%= stylesheet_link_tag 'blueprint/print', :media => 'print' %>
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>

diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -4,4 +4,8 @@
 	This is the home page for the
 	<a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>
 	sample application.
+</p>
+<p>
+	<%= link_to "About", static_page_path('about') %>
+	<%= link_to "Help", static_page_path('help') %>
 </p>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,10 +1,7 @@
 RailsTest::Application.routes.draw do
-  get "static_pages/home"
-
-  get "static_pages/help"
-
-  get "static_pages/about"
-
+  root :to => 'static_pages#show', :page => 'home'
+  match 'pages/:page' => 'static_pages#show', :via => :get, :page => /home|about|help/
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

diff --git a/public/index.html b/public/index.html
diff --git a/vendor/assets/stylesheets/blueprint/ie.css b/vendor/assets/stylesheets/blueprint/ie.css
@@ -0,0 +1,36 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 1.0.1
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* ie.css */
+body {text-align:center;}
+.container {text-align:left;}
+* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
+* html legend {margin:0px -8px 16px 0;padding:0;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+html>body p code {*white-space:normal;}
+hr {margin:-8px auto 11px;}
+img {-ms-interpolation-mode:bicubic;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
+fieldset {padding-top:0;}
+legend {margin-top:-0.2em;margin-bottom:1em;margin-left:-0.5em;}
+textarea {overflow:auto;}
+label {vertical-align:middle;position:relative;top:-0.25em;}
+input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
+input.text:focus, input.title:focus {border-color:#666;}
+input.text, input.title, textarea, select {margin:0.5em 0;}
+input.checkbox, input.radio {position:relative;top:.25em;}
+form.inline div, form.inline p {vertical-align:middle;}
+form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
+button, input.button {position:relative;top:0.25em;}
diff --git a/vendor/assets/stylesheets/blueprint/plugins/buttons/icons/cross.png b/vendor/assets/stylesheets/blueprint/plugins/buttons/icons/cross.png
diff --git a/vendor/assets/stylesheets/blueprint/plugins/buttons/icons/key.png b/vendor/assets/stylesheets/blueprint/plugins/buttons/icons/key.png
diff --git a/vendor/assets/stylesheets/blueprint/plugins/buttons/icons/tick.png b/vendor/assets/stylesheets/blueprint/plugins/buttons/icons/tick.png
diff --git a/vendor/assets/stylesheets/blueprint/plugins/buttons/readme.txt b/vendor/assets/stylesheets/blueprint/plugins/buttons/readme.txt
@@ -0,0 +1,32 @@
+Buttons
+
+* Gives you great looking CSS buttons, for both <a> and <button>.
+* Demo: particletree.com/features/rediscovering-the-button-element
+
+
+Credits
+----------------------------------------------------------------
+
+* Created by Kevin Hale [particletree.com]
+* Adapted for Blueprint by Olav Bjorkoy [bjorkoy.com]
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this plugin to lib/settings.yml.
+   See compress.rb for instructions.
+
+2) Use the following HTML code to place the buttons on your site:
+
+  <button type="submit" class="button positive">
+    <img src="css/blueprint/plugins/buttons/icons/tick.png" alt=""/> Save
+  </button>
+
+  <a class="button" href="/password/reset/">
+    <img src="css/blueprint/plugins/buttons/icons/key.png" alt=""/> Change Password
+  </a>
+
+  <a href="#" class="button negative">
+    <img src="css/blueprint/plugins/buttons/icons/cross.png" alt=""/> Cancel
+  </a>