API layout

steveklabnik · steveklabnik · commit af4d271cbfe0 · 2011-08-29T20:15:02.000-04:00
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
@@ -1,3 +1,2 @@
 class ApiController < ApplicationController
-  layout false
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,3 +1,9 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  helper_method :title
+
+  def title t=nil
+    @title = t unless t.blank?
+    @title
+  end
 end
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
@@ -1,6 +1,6 @@
 class StaticController < ApplicationController
   def root; end
-  def api_root; render :layout => false; end
+  def api_root; render :layout => "api"; end
   def newest_version
     render :json => {:version => "1.0.0"}
   end
diff --git a/app/views/api/rels/index.html.haml b/app/views/api/rels/index.html.haml
@@ -1,9 +1,7 @@
-%h1 All rels
+- title "All rels"
 
 %p Here's a list of all of the relations the API supports:
 
 %ul
   - @rels.each do |rel|
     %li= link_to rel.slug, rel
-
-%p= link_to "Back to API root", root_path, :rel => "root"
diff --git a/app/views/api/rels/show.html.haml b/app/views/api/rels/show.html.haml
@@ -1,6 +1,5 @@
-%h1= "The '#{@rel.slug}' Relation"
+- title "The '#{@rel.slug}' Relation"
 
 %p= @rel.description
 
 %p= link_to "Back to list of all rels", rels_path, :rel => "/rels/rel-index"
-%p= link_to "Back to API root", root_path, :rel => "root"
diff --git a/app/views/layouts/api.html.haml b/app/views/layouts/api.html.haml
@@ -0,0 +1,9 @@
+!!! 5
+%html
+  %head
+    %title Hackety Hack API: #{title}
+  %body
+    %h1 Hackety Hack API: #{title}
+    = yield
+    %footer
+      You can go #{link_to "back to the API root", root_path}
diff --git a/app/views/static/api_root.html.haml b/app/views/static/api_root.html.haml
@@ -1,4 +1,4 @@
-%h1 Welcome to the Hackety Hack API!
+= title "Welcome"
 
 %p!= "For a list of the relations we've defined for this API, go " + link_to("here", rels_path, :rel => "/rels/rel-index")
 %p!= "You can find the latest released version of Hackety Hack " + link_to("here", newest_version_path, :rel => "/rels/current-application-version") + "."

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`class ApiController < ApplicationController`
`2`		`- layout false`
`3`	`2`	`end`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%h1 Welcome to the Hackety Hack API!`
	`1`	`+= title "Welcome"`
`2`	`2`
`3`	`3`	`%p!= "For a list of the relations we've defined for this API, go " + link_to("here", rels_path, :rel => "/rels/rel-index")`
`4`	`4`	`%p!= "You can find the latest released version of Hackety Hack " + link_to("here", newest_version_path, :rel => "/rels/current-application-version") + "."`