diff --git a/app/views/admin/create_system.rhtml b/app/views/admin/create_system.rhtml index 0ef6175c..f3b8ba99 100644 --- a/app/views/admin/create_system.rhtml +++ b/app/views/admin/create_system.rhtml @@ -21,10 +21,10 @@ The address can only consist of letters and digits.
- Name: Name: -    - Address: Address:
@@ -36,9 +36,9 @@
Everyone with this password will be able to do this, so pick it carefully!
- Password: -    - Verify: + +    +
diff --git a/app/views/admin/create_web.rhtml b/app/views/admin/create_web.rhtml index 86c4675d..2e6cde2f 100644 --- a/app/views/admin/create_web.rhtml +++ b/app/views/admin/create_web.rhtml @@ -21,9 +21,9 @@ The address can only consist of letters and digits.
- Name: -    - Address: + +    +
@@ -31,7 +31,7 @@

- Enter system password + and diff --git a/app/views/admin/edit_web.rhtml b/app/views/admin/edit_web.rhtml index 50ff95f1..984d3265 100644 --- a/app/views/admin/edit_web.rhtml +++ b/app/views/admin/edit_web.rhtml @@ -14,65 +14,63 @@

- Name:    - Address: Name:    + (Letters and digits only)

Specialize

- Markup: - <%= html_options({'Textile' => :textile, 'Markdown' => :markdown, 'Markdown+itex2MML' => :markdownMML, 'Mixed' => :mixed, 'RDoc' => :rdoc }, @web.markup) %> -    +    - Color: - <%= html_options({ 'Green' => '008B26', 'Purple' => '504685', 'Red' => 'DA0006', 'Orange' => 'FA6F00', 'Grey' => '8BA2B0' }, @web.color) %>

- - /> - Safe mode - - strip HTML tags and stylesheet options from the content of all pages + /> +
- /> - Brackets only - - require all wiki words to be as [[wiki word]], WikiWord links won't be created + /> +
- /> - Count pages + /> +
- /> + /> Allow uploads of no more than + size="20" /> kbytes - allow users to upload pictures and other files and include them on wiki pages
-

Stylesheet tweaks >> - + - add or change styles used by this web; styles defined here take precedence over instiki.css. Hint: View HTML source of a page you want to style to find ID names on individual - tags. + tags.
-
@@ -83,10 +81,10 @@ Setting the password to nothing will remove the password protection.
- Password: Password: -    - Verify: Verify:
@@ -97,20 +95,18 @@ The published version is accessible through URLs like /wiki/published/HomePage.
- /> - Publish this web + /> +
-

- - Enter system password +

+ and

...or forget changes and <%= link_to 'create a new web', :action => 'create_web' %> -

<%= end_form_tag %> @@ -123,13 +119,11 @@ :onsubmit => "return checkSystemPassword(document.getElementById('system_password_orphaned').value)", 'accept-charset' => 'utf-8' }) %> -

- +

Clean up by entering system password and -

<%= end_form_tag %> diff --git a/app/views/markdownMML_help.rhtml b/app/views/markdownMML_help.rhtml index 5b9e1631..6239e892 100644 --- a/app/views/markdownMML_help.rhtml +++ b/app/views/markdownMML_help.rhtml @@ -1,15 +1,15 @@

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

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
_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
diff --git a/app/views/markdown_help.rhtml b/app/views/markdown_help.rhtml index 15b98630..d787aedb 100644 --- a/app/views/markdown_help.rhtml +++ b/app/views/markdown_help.rhtml @@ -1,14 +1,14 @@

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
_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
diff --git a/app/views/wiki/search.rhtml b/app/views/wiki/search.rhtml index 789f867c..d9a682a9 100644 --- a/app/views/wiki/search.rhtml +++ b/app/views/wiki/search.rhtml @@ -28,7 +28,7 @@

Perhaps you should try expanding your query. Remember that Instiki searches for entire phrases, so if you search for "all that jazz" it will not match pages that contain these - words in separation—only as a sentence fragment. + words in separation — only as a sentence fragment.

If you're a high-tech computer wizard, you might even want try constructing a Ruby regular diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css index 578894c9..187e248b 100644 --- a/public/stylesheets/instiki.css +++ b/public/stylesheets/instiki.css @@ -126,7 +126,7 @@ text-decoration:none; div.help { font-family:verdana, arial, helvetica, sans-serif; -font-size:70%; +font-size:75%; } div.inputBox { diff --git a/vendor/plugins/maruku/lib/maruku/version.rb b/vendor/plugins/maruku/lib/maruku/version.rb index 7e5b5b63..380fb40c 100644 --- a/vendor/plugins/maruku/lib/maruku/version.rb +++ b/vendor/plugins/maruku/lib/maruku/version.rb @@ -19,7 +19,7 @@ #++ module MaRuKu - Version = '0.5.3' + Version = '0.5.4' MarukuURL = 'http://maruku.rubyforge.org/' @@ -27,6 +27,8 @@ module MaRuKu # # Note: it is not guaranteed that if it's false # then no special features will be used. + # + # So please, ignore it for now. def markdown_extra? true end