diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
new file mode 100644
index 00000000..c0e92159
--- /dev/null
+++ b/app/controllers/help_controller.rb
@@ -0,0 +1,7 @@
+class HelpController < ApplicationController
+ def wiki_syntax
+ end
+
+ def wiki_syntax_detailed
+ end
+end
diff --git a/public/help/wiki_syntax.html b/app/views/help/wiki_syntax.html.erb
similarity index 73%
rename from public/help/wiki_syntax.html
rename to app/views/help/wiki_syntax.html.erb
index 6886f340..6b3b95d8 100644
--- a/public/help/wiki_syntax.html
+++ b/app/views/help/wiki_syntax.html.erb
@@ -1,24 +1,15 @@
-
-
-
-
-
-Wiki formatting
-
-
-
-
-Wiki Syntax Quick Reference
+<%= html_title "Wiki Syntax Quick Reference" %>
| Font Styles |
|---|
@@ -48,7 +39,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
| http://foo.bar | http://foo.bar |
|---|
| "Foo":http://foo.bar | Foo |
|---|
-| Redmine links |
|---|
+| ChiliProject links |
|---|
 | [[Wiki page]] | Wiki page |
|---|
| Issue #12 | Issue #12 |
|---|
| Revision r43 | Revision r43 |
|---|
@@ -60,7 +51,4 @@ table td h3 { font-size: 1.2em; text-align: left; }
| !attached_image! | |
|---|
-More Information
-
-
-
+More Information
diff --git a/public/help/wiki_syntax_detailed.html b/app/views/help/wiki_syntax_detailed.html.erb
similarity index 83%
rename from public/help/wiki_syntax_detailed.html
rename to app/views/help/wiki_syntax_detailed.html.erb
index 0c9cea34..28a6bc77 100644
--- a/public/help/wiki_syntax_detailed.html
+++ b/app/views/help/wiki_syntax_detailed.html.erb
@@ -1,9 +1,4 @@
-
-
-
-RedmineWikiFormatting
-
-
-
+<% end %>
-
-Wiki formatting
+<%= html_title "Wiki Formatting" %>
Links
- Redmine links
+ ChiliProject links
- Redmine allows hyperlinking between issues, changesets and wiki pages from anywhere wiki formatting is used.
+ ChiliProject allows hyperlinking between issues, changesets and wiki pages from anywhere wiki formatting is used.
- Link to an issue: #124 (displays
#124, link is striked-through if the issue is closed)
- Link to a changeset: r758 (displays r758)
- Link to a changeset with a non-numeric hash: commit:c6f4d0fd (displays c6f4d0fd).
- - Link to a changeset of another project: sandbox:r758 (displays sanbox:r758)
+ - Link to a changeset of another project: sandbox:r758 (displays sandbox:r758)
- Link to a changeset with a non-numeric hash: sandbox:c6f4d0fd (displays sandbox:c6f4d0fd).
@@ -130,8 +123,8 @@
Escaping:
-
-http://www.redmine.org, someone@foo.bar
+https://www.chiliproject.org, someone@foo.bar
- displays: http://www.redmine.org, someone@foo.bar
+ displays: https://www.chiliproject.org, someone@foo.bar
If you want to display a specific text instead of the URL, you can use the standard textile syntax:
-"Redmine web site":http://www.redmine.org
+"ChiliProject web site":https://www.chiliproject.org
- displays: Redmine web site
+ displays: ChiliProject web site
Text formatting
- For things such as headlines, bold, tables, lists, Redmine supports Textile syntax. See http://www.textism.com/tools/textile/ for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.
+ For things such as headlines, bold, tables, lists, ChiliProject supports Textile syntax. See http://www.textism.com/tools/textile/ for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.
Font style
@@ -195,7 +188,7 @@ h2. Subheading
h3. Subsubheading
- Redmine assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.
+ ChiliProject assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.
Paragraphs
@@ -205,7 +198,7 @@ p>. right aligned
p=. centered
- This is centered paragraph.
+ This is a centered paragraph.
Blockquotes
@@ -233,7 +226,7 @@ To go live, all you need to add is a database and a web server.
Macros
- Redmine has the following builtin macros:
+ ChiliProject has the following builtin macros:
hello_worldSample macro.
includeInclude a wiki page. Example:
@@ -266,5 +259,3 @@ To go live, all you need to add is a database and a web server.
10 end
-
-
diff --git a/app/views/layouts/help.html.erb b/app/views/layouts/help.html.erb
new file mode 100644
index 00000000..1a64c478
--- /dev/null
+++ b/app/views/layouts/help.html.erb
@@ -0,0 +1,13 @@
+
+
+
+ <%= h html_title %>
+
+
+
+
+ <%= yield %>
+
+
diff --git a/lib/redmine/wiki_formatting/textile/helper.rb b/lib/redmine/wiki_formatting/textile/helper.rb
index 71996138..18efc1aa 100644
--- a/lib/redmine/wiki_formatting/textile/helper.rb
+++ b/lib/redmine/wiki_formatting/textile/helper.rb
@@ -20,9 +20,8 @@ module Redmine
module Textile
module Helper
def wikitoolbar_for(field_id)
- # Is there a simple way to link to a public resource?
- url = "#{Redmine::Utils.relative_url_root}/help/wiki_syntax.html"
-
+ url = url_for(:controller => 'help', :action => 'wiki_syntax')
+
help_link = l(:setting_text_formatting) + ': ' +
link_to(l(:label_help), url,
:onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;",
diff --git a/test/functional/help_controller_test.rb b/test/functional/help_controller_test.rb
new file mode 100644
index 00000000..f37c7ab6
--- /dev/null
+++ b/test/functional/help_controller_test.rb
@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class HelpControllerTest < ActionController::TestCase
+ test "renders wiki_syntax properly" do
+ get "wiki_syntax"
+
+ assert_select "h1", "Wiki Syntax Quick Reference"
+ end
+
+ test "renders wiki_syntax_detailed properly" do
+ get "wiki_syntax_detailed"
+
+ assert_select "h1", "Wiki Formatting"
+ end
+end