1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
@@ -0,0 +1,32 | |||||
|
1 | <html> | |||
|
2 | <head> | |||
|
3 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> | |||
|
4 | <title>Wiki formatting</title> | |||
|
5 | <link rel="stylesheet" href="html.css" type="text/css"> | |||
|
6 | <style> | |||
|
7 | table td { vertical-align: top; background-color: #eee; } | |||
|
8 | table td code { font-size: 1.2em; } | |||
|
9 | </style> | |||
|
10 | </head> | |||
|
11 | <body> | |||
|
12 | ||||
|
13 | <table width="100%"> | |||
|
14 | <tr><th colspan="3"><p><strong>Font Styles</strong></p></th></tr> | |||
|
15 | <tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" /></th><td>*Strong*</td><td><strong>Strong</strong></td></tr> | |||
|
16 | <tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" /></th><td>_Italic_</td><td><em>Italic</em></td></tr> | |||
|
17 | <tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr> | |||
|
18 | <tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr> | |||
|
19 | <tr><th><img src="../../images/jstoolbar/bt_quote.png" style="border: 1px solid #bbb;" /></th><td>??Quote??</td><td><cite>Quote</cite></td></tr> | |||
|
20 | <tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" /></th><td>@Code@</td><td><code>Code</code></td></tr> | |||
|
21 | <tr><th colspan="3"><p><strong>Lists</strong></p></th></tr> | |||
|
22 | <tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr> | |||
|
23 | <tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr> | |||
|
24 | <tr><th colspan="3"><p><strong>Titles</strong></p></th></tr> | |||
|
25 | <tr><th><img src="../../images/jstoolbar/bt_heading.png" style="border: 1px solid #bbb;" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr> | |||
|
26 | <tr><th colspan="3"><p><strong>Links</strong></p></th></tr> | |||
|
27 | <tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr> | |||
|
28 | <tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr> | |||
|
29 | <tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr></table> | |||
|
30 | ||||
|
31 | </body> | |||
|
32 | </html> No newline at end of file |
@@ -0,0 +1,32 | |||||
|
1 | <html> | |||
|
2 | <head> | |||
|
3 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> | |||
|
4 | <title>Formatage Wiki</title> | |||
|
5 | <link rel="stylesheet" href="html.css" type="text/css"> | |||
|
6 | <style> | |||
|
7 | table td { vertical-align: top; background-color: #eee; } | |||
|
8 | table td code { font-size: 1.2em; } | |||
|
9 | </style> | |||
|
10 | </head> | |||
|
11 | <body> | |||
|
12 | ||||
|
13 | <table width="100%"> | |||
|
14 | <tr><th colspan="3"><p><strong>Mise en forme</strong></p></th></tr> | |||
|
15 | <tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" /></th><td>*Gras*</td><td><strong>Gras</strong></td></tr> | |||
|
16 | <tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" /></th><td>_Italique_</td><td><em>Italique</em></td></tr> | |||
|
17 | <tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" /></th><td>+Souligné+</td><td><ins>Souligné</ins></td></tr> | |||
|
18 | <tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" /></th><td>-Rayé-</td><td><del>Rayé</del></td></tr> | |||
|
19 | <tr><th><img src="../../images/jstoolbar/bt_quote.png" style="border: 1px solid #bbb;" /></th><td>??Citation??</td><td><cite>Citation</cite></td></tr> | |||
|
20 | <tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" /></th><td>@Code@</td><td><code>Code</code></td></tr> | |||
|
21 | <tr><th colspan="3"><p><strong>Listes</strong></p></th></tr> | |||
|
22 | <tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr> | |||
|
23 | <tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr> | |||
|
24 | <tr><th colspan="3"><p><strong>Titres</strong></p></th></tr> | |||
|
25 | <tr><th><img src="../../images/jstoolbar/bt_heading.png" style="border: 1px solid #bbb;" /></th><td>h2. Titre 2</td><td><h2>Titre 2</h2></td></tr> | |||
|
26 | <tr><th colspan="3"><p><strong>Liens</strong></p></th></tr> | |||
|
27 | <tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" /></th><td>[[Page wiki]]</td><td><a href="#">Page wiki</a></td></tr> | |||
|
28 | <tr><th></th><td>Demande #12</td><td>Demande <a href="#">#12</a></td></tr> | |||
|
29 | <tr><th></th><td>Révision r43</td><td>Révision <a href="#">r43</a></td></tr></table> | |||
|
30 | ||||
|
31 | </body> | |||
|
32 | </html> No newline at end of file |
@@ -6,7 +6,12 | |||||
6 |
|
6 | |||
7 | <% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %> |
|
7 | <% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %> | |
8 | <%= error_messages_for 'content' %> |
|
8 | <%= error_messages_for 'content' %> | |
9 | <p><%= f.text_area :text, :cols => 100, :rows => 25, :style => "width:99%;" %></p> |
|
9 | <div class="contextual"> | |
|
10 | <%= l(:setting_text_formatting) %>: | |||
|
11 | <%= link_to l(:label_help), {:controller => 'help', :ctrl => 'wiki', :page => 'syntax' }, | |||
|
12 | :onclick => "window.open('#{ url_for :controller => 'help', :ctrl => 'wiki', :page => 'syntax' }', '', 'resizable=yes, location=no, width=300, height=500, menubar=no, status=no, scrollbars=yes'); return false;" %> | |||
|
13 | </div> | |||
|
14 | <p><%= f.text_area :text, :cols => 100, :rows => 25, :style => "width:99.5%;" %></p> | |||
10 | <p><label><%= l(:field_comment) %></label><br /><%= f.text_field :comment, :size => 120 %></p> |
|
15 | <p><label><%= l(:field_comment) %></label><br /><%= f.text_field :comment, :size => 120 %></p> | |
11 | <p><%= submit_tag l(:button_save) %> |
|
16 | <p><%= submit_tag l(:button_save) %> | |
12 | <%= link_to_remote l(:label_preview), |
|
17 | <%= link_to_remote l(:label_preview), |
@@ -74,3 +74,5 pages: | |||||
74 | index: ch03.html |
|
74 | index: ch03.html | |
75 | lost_password: ch03s03.html |
|
75 | lost_password: ch03s03.html | |
76 | register: ch03s04.html |
|
76 | register: ch03s04.html | |
|
77 | wiki: | |||
|
78 | syntax: wiki_syntax.html No newline at end of file |
@@ -346,13 +346,13 jsToolBar.prototype.elements.del = { | |||||
346 | } |
|
346 | } | |
347 |
|
347 | |||
348 | // quote |
|
348 | // quote | |
349 |
|
|
349 | jsToolBar.prototype.elements.quote = { | |
350 |
|
|
350 | type: 'button', | |
351 |
|
|
351 | title: 'Inline quote', | |
352 |
|
|
352 | fn: { | |
353 |
|
|
353 | wiki: function() { this.singleTag('??') } | |
354 |
|
|
354 | } | |
355 | //} |
|
355 | } | |
356 |
|
|
356 | ||
357 | // code |
|
357 | // code | |
358 | jsToolBar.prototype.elements.code = { |
|
358 | jsToolBar.prototype.elements.code = { | |
@@ -364,7 +364,21 jsToolBar.prototype.elements.code = { | |||||
364 | } |
|
364 | } | |
365 |
|
365 | |||
366 | // spacer |
|
366 | // spacer | |
367 |
|
|
367 | jsToolBar.prototype.elements.space1 = {type: 'space'} | |
|
368 | ||||
|
369 | // heading | |||
|
370 | jsToolBar.prototype.elements.heading = { | |||
|
371 | type: 'button', | |||
|
372 | title: 'Heading', | |||
|
373 | fn: { | |||
|
374 | wiki: function() { | |||
|
375 | this.encloseSelection('','',function(str) { | |||
|
376 | str = str.replace(/\r/g,''); | |||
|
377 | return 'h2. '+str.replace(/\n/g,"\n* "); | |||
|
378 | }); | |||
|
379 | } | |||
|
380 | } | |||
|
381 | } | |||
368 |
|
|
382 | ||
369 | // br |
|
383 | // br | |
370 | //jsToolBar.prototype.elements.br = { |
|
384 | //jsToolBar.prototype.elements.br = { | |
@@ -410,6 +424,7 jsToolBar.prototype.elements.ol = { | |||||
410 | jsToolBar.prototype.elements.space3 = {type: 'space'} |
|
424 | jsToolBar.prototype.elements.space3 = {type: 'space'} | |
411 |
|
425 | |||
412 | // link |
|
426 | // link | |
|
427 | /* | |||
413 | jsToolBar.prototype.elements.link = { |
|
428 | jsToolBar.prototype.elements.link = { | |
414 | type: 'button', |
|
429 | type: 'button', | |
415 | title: 'Link', |
|
430 | title: 'Link', | |
@@ -438,3 +453,12 jsToolBar.prototype.elements.link.fn.wiki = function() { | |||||
438 | this.encloseSelection(stag,etag); |
|
453 | this.encloseSelection(stag,etag); | |
439 | } |
|
454 | } | |
440 | }; |
|
455 | }; | |
|
456 | */ | |||
|
457 | // link or wiki page | |||
|
458 | jsToolBar.prototype.elements.link = { | |||
|
459 | type: 'button', | |||
|
460 | title: 'Link', | |||
|
461 | fn: { | |||
|
462 | wiki: function() { this.encloseSelection("[[", "]]") } | |||
|
463 | } | |||
|
464 | } |
@@ -599,4 +599,8 div.wiki table, div.wiki td { | |||||
599 | padding: 4px; |
|
599 | padding: 4px; | |
600 | } |
|
600 | } | |
601 |
|
601 | |||
|
602 | div.wiki code { | |||
|
603 | font-size: 1.2em; | |||
|
604 | } | |||
|
605 | ||||
602 | #preview .preview { background: #fafbfc url(../images/draft.png); } |
|
606 | #preview .preview { background: #fafbfc url(../images/draft.png); } |
@@ -67,6 +67,9 | |||||
67 | .jstb_br { |
|
67 | .jstb_br { | |
68 | background-image: url(../images/jstoolbar/bt_br.png); |
|
68 | background-image: url(../images/jstoolbar/bt_br.png); | |
69 | } |
|
69 | } | |
|
70 | .jstb_heading { | |||
|
71 | background-image: url(../images/jstoolbar/bt_heading.png); | |||
|
72 | } | |||
70 | .jstb_ul { |
|
73 | .jstb_ul { | |
71 | background-image: url(../images/jstoolbar/bt_ul.png); |
|
74 | background-image: url(../images/jstoolbar/bt_ul.png); | |
72 | } |
|
75 | } |
General Comments 0
You need to be logged in to leave comments.
Login now