diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 025057f55188da93d1552959a3e332dea3466152..c0e92159f7eefad11ef4fccb18f12f2f148c1cd8 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -1,9 +1,7 @@
class HelpController < ApplicationController
def wiki_syntax
- render :layout => false
end
def wiki_syntax_detailed
- render :layout => false
end
end
diff --git a/app/views/help/wiki_syntax.html.erb b/app/views/help/wiki_syntax.html.erb
index 68245f0cbdd7575b2344491ade55581e5907fc67..b8e2f7056b97c6eafb513e302b5eadd000b337c3 100644
--- a/app/views/help/wiki_syntax.html.erb
+++ b/app/views/help/wiki_syntax.html.erb
@@ -1,9 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Wiki Syntax Quick Reference</title>
-<style type="text/css">
+<% content_for :styles do %>
h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
table th { padding-top: 1em; }
@@ -12,11 +7,9 @@
table td h1 { font-size: 1.8em; text-align: left; }
table td h2 { font-size: 1.4em; text-align: left; }
table td h3 { font-size: 1.2em; text-align: left; }
-</style>
-</head>
-<body>
+<% end %>
-<h1>Wiki Syntax Quick Reference</h1>
+<h1><%= html_title "Wiki Syntax Quick Reference" %></h1>
<table width="100%">
<tr><th colspan="3">Font Styles</th></tr>
@@ -59,6 +52,3 @@
</table>
<p><a href="wiki_syntax_detailed" onclick="window.open('wiki_syntax_detailed', '', ''); return false;">More Information</a></p>
-
-</body>
-</html>
diff --git a/app/views/help/wiki_syntax_detailed.html.erb b/app/views/help/wiki_syntax_detailed.html.erb
index b1a22836413583bcf6e8fb08b7a71031e72374e1..679ffe50da6ed2ba47dbd8dd00725924b738fc21 100644
--- a/app/views/help/wiki_syntax_detailed.html.erb
+++ b/app/views/help/wiki_syntax_detailed.html.erb
@@ -1,9 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<title>Wiki Formatting</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<style type="text/css">
+<% content_for :styles do %>
body { font:80% Verdana,Tahoma,Arial,sans-serif; }
h1, h2, h3, h4 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
pre, code { font-size:120%; }
@@ -19,24 +14,22 @@
a.new { color: #b73535; }
.CodeRay .c { color:#666; }
-
+
.CodeRay .cl { color:#B06; font-weight:bold }
.CodeRay .dl { color:black }
.CodeRay .fu { color:#06B; font-weight:bold }
-
+
.CodeRay .il { background: #eee }
.CodeRay .il .idl { font-weight: bold; color: #888 }
-
+
.CodeRay .iv { color:#33B }
.CodeRay .r { color:#080; font-weight:bold }
-
+
.CodeRay .s { background-color:#fff0f0 }
.CodeRay .s .dl { color:#710 }
-</style>
-</head>
+<% end %>
-<body>
-<h1><a name="1" class="wiki-page"></a>Wiki formatting</h1>
+<h1><a name="1" class="wiki-page"></a><%= html_title "Wiki Formatting" %></h1>
<h2><a name="2" class="wiki-page"></a>Links</h2>
@@ -266,5 +259,3 @@ To go live, all you need to add is a database and a web server.
<span class="no"><strong>10</strong></span> <span class="r">end</span>
</code>
</pre>
-</body>
-</html>
diff --git a/app/views/layouts/help.html.erb b/app/views/layouts/help.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..1a64c478dd2b4da65174e33dda23c3ce77424463
--- /dev/null
+++ b/app/views/layouts/help.html.erb
@@ -0,0 +1,13 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+ <title><%= h html_title %></title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <style type="text/css">
+ <%= yield(:styles) %>
+ </style>
+ </head>
+<body>
+ <%= yield %>
+</body>
+</html>