diff --git a/app/views/markdownMML_help.rhtml b/app/views/markdownMML_help.rhtml index 06b2e4e6..1d33dcae 100644 --- a/app/views/markdownMML_help.rhtml +++ b/app/views/markdownMML_help.rhtml @@ -1,15 +1,3 @@

Markdown+itex2MML formatting tips (basics, extended syntax, metadata, theorems)

For a complete list of LaTeX commands supported here, see the itex2MML Commands Summary.

- - - - - - - - - - - - -
_your text_→your text
**your text**→your text
`my code`→my code
* Bulleted list
* Second item		→• Bulleted list
• Second item
1. Numbered list
1. Second item		→1. Numbered list
2. Second item
Definition list
: is useful		→
Definition list
is useful
[link name](URL)→link name
![Alt text](URL)→Image
## Header ##
### Subheader ###
#### Etc. ####		→Header
Subheader
Etc.
***→Horizontal ruler
<http://url>
<email@add.com>		→Auto-linked
+<%= render(:file => "markdown_table") -%> \ No newline at end of file diff --git a/app/views/markdownPNG_help.html.erb b/app/views/markdownPNG_help.html.erb index 89d44a5d..a6016414 100644 --- a/app/views/markdownPNG_help.html.erb +++ b/app/views/markdownPNG_help.html.erb @@ -1,16 +1,2 @@

Markdown+blahtex/PNG formatting tips (basics, extended syntax, metadata)

- - - - - - - - - - - - - - -
_your text_→your text
**your text**→your text
`my code`→my code
$LaTeX code$→Insert an inline
math expression
\[LaTeX code\]→Insert a math
expression on
its own line
* Bulleted list
* Second item		→• Bulleted list
• Second item
1. Numbered list
1. Second item		→1. Numbered list
2. Second item
Definition list
: is useful		→
Definition list
is useful
[link name](URL)→link name
![Alt text](URL)→Image
## Header ##
### Subheader ###
#### Etc. ####		→Header
Subheader
Etc.
***→Horizontal ruler
<http://url>
<email@add.com>		→Auto-linked
+<%= render(:file => "markdown_table") -%> diff --git a/app/views/markdown_help.rhtml b/app/views/markdown_help.rhtml index d787aedb..991babe8 100644 --- a/app/views/markdown_help.rhtml +++ b/app/views/markdown_help.rhtml @@ -1,14 +1,2 @@

Markdown formatting tips (basics, extended syntax, metadata)

- - - - - - - - - - - - -
_your text_→your text
**your text**→your text
`my code`→my code
* Bulleted list
* Second item		→• Bulleted list
• Second item
1. Numbered list
1. Second item		→1. Numbered list
2. Second item
Definition list
: is useful		→
Definition list
is useful
[link name](URL)→link name
![Alt text](URL)→Image
## Header ##
### Subheader ###
#### Etc. ####		→Header
Subheader
Etc.
***→Horizontal ruler
<http://url>
<email@add.com>		→Auto-linked
+<%= render(:file => "markdown_table") -%> diff --git a/app/views/markdown_table.html.erb b/app/views/markdown_table.html.erb new file mode 100644 index 00000000..0837deb9 --- /dev/null +++ b/app/views/markdown_table.html.erb @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + +
_your text_→your text
**your text**→your text
`my code`→my code
* Bulleted list
* Second item		→• Bulleted list
• Second item
1. Numbered list
1. Second item		→1. Numbered list
2. Second item
Definition list
: is useful		→
Definition list
is useful
[link name](URL)→link name
![Alt text](URL)→Image
## Header ##
### Subheader ###
#### Subsubhead####
##### Etc. #####		→Header +
Subheader
Subsubhead +
Etc.
***→Horizontal rule
Some text[^fine] here.
[^fine]: The fine print.		→A footnote
*[LA]: Los Angeles
*[ppm]: parts per million		→Abbreviations
diff --git a/app/views/textile_help.rhtml b/app/views/textile_help.rhtml index 81899d01..e0bf82a4 100644 --- a/app/views/textile_help.rhtml +++ b/app/views/textile_help.rhtml @@ -2,12 +2,11 @@ - + -
_your text_→your text
*your text*→your text
%{color:red}hello%→hello
%{color:red}hello%→hello
* Bulleted list
* Second item		→• Bulleted list
• Second item
# Numbered list
# Second item		→1. Numbered list
2. Second item
"linkname":URL→linkname
|a|table|row|
|b|table|row|		→Table
http://url
email@address.com		→Auto-linked
!imageURL!→Image
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml index f1934a4b..6644f7e9 100644 --- a/app/views/wiki/edit.rhtml +++ b/app/views/wiki/edit.rhtml @@ -5,8 +5,8 @@ -%>
- <%= render(:file => "#{@web.markup}_help") %> - <%= render(:file => 'wiki_words_help') %> +<%= render(:file => "#{@web.markup}_help") -%> +<%= render(:file => 'wiki_words_help') unless @web.brackets_only? -%>
<% form_tag({ :action => 'save', :web => @web.address, :id => @page.name }, diff --git a/app/views/wiki/new.rhtml b/app/views/wiki/new.rhtml index f45c9d0b..339fdd34 100644 --- a/app/views/wiki/new.rhtml +++ b/app/views/wiki/new.rhtml @@ -5,8 +5,8 @@ -%>
- <%= render(:file => "#{@web.markup}_help") %> - <%= render(:file => 'wiki_words_help') %> +<%= render(:file => "#{@web.markup}_help") -%> +<%= render(:file => 'wiki_words_help') unless @web.brackets_only? -%>
diff --git a/app/views/wiki/rollback.rhtml b/app/views/wiki/rollback.rhtml index 05ddcc01..0f4b5bad 100644 --- a/app/views/wiki/rollback.rhtml +++ b/app/views/wiki/rollback.rhtml @@ -7,8 +7,8 @@ <%= "

Please correct the error that caused this error in rendering:
#{params["msg"]}

" if params["msg"] %>
- <%= render(:file => "#{@web.markup}_help") %> - <%= render(:file => 'wiki_words_help') %> +<%= render(:file => "#{@web.markup}_help") -%> +<%= render(:file => 'wiki_words_help') unless @web.brackets_only? -%>
<% form_tag({:web => @web.address, :action => 'save', :id => @page.name}, diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css index 3056e0b3..c4bc91ba 100644 --- a/public/stylesheets/instiki.css +++ b/public/stylesheets/instiki.css @@ -346,7 +346,7 @@ white-space:nowrap; div#MarkupHelp td.arrow { color:#666; -padding:0 0.75em; +padding:0 0.75em 0 0; } div#MarkupHelp h3 {