instiki 0.9.2 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (102) hide show
  1. data/CHANGELOG +165 -0
  2. data/README +68 -172
  3. data/app/controllers/admin_controller.rb +94 -0
  4. data/app/controllers/application.rb +131 -0
  5. data/app/controllers/file_controller.rb +129 -0
  6. data/app/controllers/wiki_controller.rb +354 -0
  7. data/{libraries/view_helper.rb → app/helpers/application_helper.rb} +68 -33
  8. data/app/models/author.rb +3 -3
  9. data/app/models/chunks/category.rb +33 -31
  10. data/app/models/chunks/chunk.rb +86 -20
  11. data/app/models/chunks/engines.rb +54 -38
  12. data/app/models/chunks/include.rb +41 -29
  13. data/app/models/chunks/literal.rb +31 -19
  14. data/app/models/chunks/nowiki.rb +28 -31
  15. data/app/models/chunks/test.rb +18 -18
  16. data/app/models/chunks/uri.rb +182 -97
  17. data/app/models/chunks/wiki.rb +141 -82
  18. data/app/models/file_yard.rb +58 -0
  19. data/app/models/page.rb +112 -86
  20. data/app/models/page_lock.rb +22 -23
  21. data/app/models/page_set.rb +89 -64
  22. data/app/models/revision.rb +123 -90
  23. data/app/models/web.rb +176 -89
  24. data/app/models/wiki_content.rb +207 -105
  25. data/app/models/wiki_service.rb +233 -83
  26. data/app/models/wiki_words.rb +23 -25
  27. data/app/views/{wiki/new_system.rhtml → admin/create_system.rhtml} +83 -78
  28. data/app/views/{wiki/new_web.rhtml → admin/create_web.rhtml} +69 -64
  29. data/app/views/admin/edit_web.rhtml +136 -0
  30. data/app/views/file/file.rhtml +19 -0
  31. data/app/views/file/import.rhtml +23 -0
  32. data/app/views/layouts/default.rhtml +85 -0
  33. data/app/views/markdown_help.rhtml +12 -16
  34. data/app/views/mixed_help.rhtml +7 -0
  35. data/app/views/navigation.rhtml +30 -19
  36. data/app/views/rdoc_help.rhtml +12 -16
  37. data/app/views/textile_help.rhtml +24 -28
  38. data/app/views/wiki/authors.rhtml +11 -13
  39. data/app/views/wiki/edit.rhtml +39 -31
  40. data/app/views/wiki/export.rhtml +12 -14
  41. data/app/views/wiki/feeds.rhtml +14 -10
  42. data/app/views/wiki/list.rhtml +64 -57
  43. data/app/views/wiki/locked.rhtml +23 -14
  44. data/app/views/wiki/login.rhtml +14 -11
  45. data/app/views/wiki/new.rhtml +31 -27
  46. data/app/views/wiki/page.rhtml +115 -81
  47. data/app/views/wiki/print.rhtml +14 -16
  48. data/app/views/wiki/published.rhtml +9 -10
  49. data/app/views/wiki/recently_revised.rhtml +27 -30
  50. data/app/views/wiki/revision.rhtml +103 -81
  51. data/app/views/wiki/rollback.rhtml +14 -9
  52. data/app/views/wiki/rss_feed.rhtml +22 -22
  53. data/app/views/wiki/search.rhtml +38 -15
  54. data/app/views/wiki/tex.rhtml +22 -22
  55. data/app/views/wiki/tex_web.rhtml +34 -34
  56. data/app/views/wiki/web_list.rhtml +18 -13
  57. data/app/views/wiki_words_help.rhtml +9 -8
  58. data/config/environment.rb +82 -0
  59. data/config/environments/development.rb +5 -0
  60. data/config/environments/production.rb +4 -0
  61. data/config/environments/test.rb +17 -0
  62. data/config/routes.rb +18 -0
  63. data/instiki +6 -67
  64. data/instiki.rb +3 -0
  65. data/lib/active_record_stub.rb +31 -0
  66. data/{libraries/diff → lib}/diff.rb +444 -475
  67. data/lib/instiki_errors.rb +15 -0
  68. data/{libraries → lib}/rdocsupport.rb +151 -155
  69. data/lib/redcloth_for_tex.rb +736 -0
  70. data/natives/osx/desktop_launcher/AppDelegate.h +18 -0
  71. data/natives/osx/desktop_launcher/AppDelegate.mm +109 -0
  72. data/natives/osx/desktop_launcher/Credits.html +16 -0
  73. data/natives/osx/desktop_launcher/English.lproj/InfoPlist.strings +0 -0
  74. data/natives/osx/desktop_launcher/English.lproj/MainMenu.nib/classes.nib +13 -0
  75. data/natives/osx/desktop_launcher/English.lproj/MainMenu.nib/info.nib +24 -0
  76. data/natives/osx/desktop_launcher/English.lproj/MainMenu.nib/objects.nib +0 -0
  77. data/natives/osx/desktop_launcher/Info.plist +13 -0
  78. data/natives/osx/desktop_launcher/Instiki.xcode/project.pbxproj +592 -0
  79. data/natives/osx/desktop_launcher/Instiki_Prefix.pch +7 -0
  80. data/natives/osx/desktop_launcher/MakeDMG.sh +9 -0
  81. data/natives/osx/desktop_launcher/main.mm +14 -0
  82. data/natives/osx/desktop_launcher/version.plist +16 -0
  83. data/public/404.html +6 -0
  84. data/public/500.html +6 -0
  85. data/public/dispatch.rb +10 -0
  86. data/public/favicon.ico +0 -0
  87. data/public/javascripts/edit_web.js +52 -0
  88. data/public/javascripts/prototype.js +336 -0
  89. data/{app/views/static_style_sheet.rhtml → public/stylesheets/instiki.css} +221 -198
  90. data/script/breakpointer +4 -0
  91. data/script/server +93 -0
  92. metadata +59 -32
  93. data/app/controllers/wiki.rb +0 -389
  94. data/app/models/chunks/match.rb +0 -19
  95. data/app/views/bottom.rhtml +0 -4
  96. data/app/views/top.rhtml +0 -49
  97. data/app/views/wiki/edit_web.rhtml +0 -138
  98. data/libraries/action_controller_servlet.rb +0 -177
  99. data/libraries/erb.rb +0 -490
  100. data/libraries/madeleine_service.rb +0 -68
  101. data/libraries/redcloth_for_tex.rb +0 -869
  102. data/libraries/web_controller_server.rb +0 -81
@@ -0,0 +1,19 @@
1
+ <%
2
+ @title = "Upload #{@file_name}"
3
+ @hide_navigation = false
4
+ %>
5
+
6
+ <p>
7
+ <%= form_tag({:controller => 'file', :web => @web_name, :action => 'file'}, {:multipart => true}) %>
8
+ <p>
9
+ File to upload:
10
+ <br/>
11
+ <input type="file" name="file" size="40" />
12
+ </p>
13
+ <p>
14
+ <input type="submit" value="Update" /> as
15
+ <input type="text" name="author" id="authorName" value="<%= @author %>"
16
+ onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
17
+ </p>
18
+ <%= end_form_tag %>
19
+ </p>
@@ -0,0 +1,23 @@
1
+ <p>
2
+ <%= form_tag({}, {:multipart => true}) %>
3
+ <p>
4
+ File to upload:
5
+ <br/>
6
+ <input type="file" name="file" size="40" />
7
+ </p>
8
+ <p>
9
+ System password:
10
+ <br/>
11
+ <input type="password" id="system_password" name="system_password" />
12
+ </p>
13
+ <p>
14
+ <input type="submit" value="Update" /> as
15
+ <input type="text" name="author" id="authorName" value="<%= @author %>"
16
+ onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
17
+ <% if @page %>
18
+ | <%= link_to 'Cancel', :web => @web.address, :action => 'file'%> <small>(unlocks page)</small>
19
+ <% end %>
20
+
21
+ </p>
22
+ <%= end_form_tag %>
23
+ </p>
@@ -0,0 +1,85 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <html xmlns="http://www.w3.org/1999/xhtml">
3
+ <head>
4
+ <title>
5
+ <% if @page and (@page.name == 'HomePage') and (%w( show published print ).include?(@action_name)) %>
6
+ <%= @web.name %>
7
+ <% elsif @web %>
8
+ <%= @title %> in <%= @web.name %>
9
+ <% else %>
10
+ <%= @title %>
11
+ <% end %>
12
+ </title>
13
+
14
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
15
+
16
+ <style type="text/css">
17
+ h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 {
18
+ color: #<%= @web ? @web.color : "393" %>;
19
+ }
20
+
21
+ #Container, #Content {
22
+ width: <%= @content_width || "600" %>px;
23
+ }
24
+ <%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
25
+ </style>
26
+
27
+ <link rel="Stylesheet" href="/stylesheets/instiki.css" type="text/css" media="screen" />
28
+
29
+ <style type="text/css">
30
+ <%= @style_additions %>
31
+ <%= @web ? @web.additional_style : '' %>
32
+ </style>
33
+
34
+ <% if @web %>
35
+ <link rel="alternate" type="application/rss+xml" title="<%= h @web.name %> - Headlines RSS"
36
+ href="<%= url_for :controller => 'wiki', :web => @web.address,
37
+ :action => 'rss_with_headlines' %>"
38
+ />
39
+ <link rel="alternate" type="application/rss+xml" title="<%= h @web.name %> - Full Pages RSS"
40
+ href="<%= url_for :controller => 'wiki', :web => @web.address,
41
+ :action => 'rss_with_content' %>"
42
+ />
43
+ <% end %>
44
+ </head>
45
+
46
+ <body>
47
+ <div id="Container">
48
+ <div id="Content">
49
+
50
+ <h1 id="pageName">
51
+ <% if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) %>
52
+ <%= @web.name %>
53
+ <% elsif @web %>
54
+ <small><%= @web.name %></small><br />
55
+ <%= @title %>
56
+ <% else %>
57
+ <%= @title %>
58
+ <% end %>
59
+ </h1>
60
+
61
+ <% if @flash[:error] %> <div id="error">
62
+ <hr/><p><%= @flash[:error].to_s %></p><hr/></div>
63
+ <% end %>
64
+
65
+ <% if @flash[:info] %> <div id="info">
66
+ <hr/><p><%= @flash[:info].to_s %></p><hr/></div>
67
+ <% end %>
68
+
69
+ <%= render 'navigation' unless @web.nil? || @hide_navigation %>
70
+ <%= @content_for_layout %>
71
+
72
+ <% if @show_footer %>
73
+ <div id="footer">
74
+ <p>This site is running on <a href="http://instiki.org/">Instiki</a></p>
75
+ <br/>
76
+ <p>Powered by <a href="http://rubyonrails.com/">Ruby on Rails</a></p>
77
+ </div>
78
+ <% end %>
79
+
80
+ </div> <!-- Content -->
81
+
82
+ </div> <!-- Container -->
83
+
84
+ </body>
85
+ </html>
@@ -1,16 +1,12 @@
1
- <div id="TextileHelp" style="float: right; width: 250px; margin-top: 5px">
2
- <h3>Markdown formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">advanced</a>)</h3>
3
- <table cellspacing="0" cellpadding="0">
4
- <tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
5
- <tr><td>**your text**</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
6
- <tr><td>`my code`</td><td class="arrow">&rarr;</td><td><code>my code</code></td></tr>
7
- <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
8
- <tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
9
- <tr><td>[link name](URL)</td><td class="arrow">&rarr;</td><td><a href="URL">link name</a></td></tr>
10
- <tr><td>***</td><td class="arrow">&rarr;</td><td>Horizontal ruler</td></tr>
11
- <tr><td>&lt;http://url><br />&lt;email@add.com></td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
12
- <tr><td>![Alt text](URL)</td><td class="arrow">&rarr;</td><td>Image</td></tr>
13
- </table>
14
-
15
- <%= sub_template "wiki_words_help" %>
16
- </div>
1
+ <h3>Markdown formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">advanced</a>)</h3>
2
+ <table cellspacing="0" cellpadding="0">
3
+ <tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
4
+ <tr><td>**your text**</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
5
+ <tr><td>`my code`</td><td class="arrow">&rarr;</td><td><code>my code</code></td></tr>
6
+ <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
7
+ <tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
8
+ <tr><td>[link name](URL)</td><td class="arrow">&rarr;</td><td><a href="URL">link name</a></td></tr>
9
+ <tr><td>***</td><td class="arrow">&rarr;</td><td>Horizontal ruler</td></tr>
10
+ <tr><td>&lt;http://url><br />&lt;email@add.com></td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
11
+ <tr><td>![Alt text](URL)</td><td class="arrow">&rarr;</td><td>Image</td></tr>
12
+ </table>
@@ -0,0 +1,7 @@
1
+ <%= render 'textile_help' %>
2
+
3
+ <h3>Markdown</h3>
4
+ <p>
5
+ In addition to Textile, this wiki also understands
6
+ <a target="_new" href="http://daringfireball.net/projects/markdown/syntax">Markdown</a>.
7
+ </p>
@@ -1,19 +1,30 @@
1
- <%
2
- def list_item(title, url, description, accesskey = nil)
3
- if @title == title
4
- "<b class=\"navOn\" title=\"#{description}\" accesskey=\"#{accesskey}\">#{title}</b>"
5
- else
6
- "<a href=\"#{url}\" title=\"#{description}\" accesskey=\"#{accesskey}\">#{title}</a>"
7
- end
8
- end
9
- %>
10
-
11
- <form id="navigationForm" class="navigation" action="../search/" action="get" style="font-size: 10px">
12
- <%= list_item "Home Page", "../show/HomePage", "Home, Sweet Home", "H" %> |
13
- <%= list_item "All Pages", "../list/", "Alphabetically sorted list of pages", "A" %> |
14
- <%= list_item "Recently Revised", "../recently_revised/", "Pages sorted by when they were last changed", "U" %> |
15
- <%= list_item "Authors", "../authors/", "Who wrote what" %> |
16
- <%= list_item "Feeds", "../feeds/", "Subscribe to changes by RSS" %> |
17
- <%= list_item "Export", "../export/", "Download a zip with all the pages in this wiki", "X" %> |
18
- <input type="text" id="searchField" name="query" style="font-size: 10px" value="Search" onClick="this.value == 'Search' ? this.value = '' : true">
19
- </form>
1
+ <%
2
+ def list_item(text, link_options, description, accesskey = nil)
3
+ link_options[:controller] = 'wiki'
4
+ link_options[:web] = @web.address
5
+ link_to_unless_current(text, link_options, :title => description, :accesskey => accesskey) {
6
+ content_tag('b', text, 'title' => description, 'accesskey' => accesskey, 'class' => 'navOn')
7
+ }
8
+ end
9
+ %>
10
+
11
+ <form id="navigationForm" class="navigation" action="../search/" method="get" style="font-size: 10px">
12
+
13
+ <% if @action_name != 'published' then %>
14
+ <%= list_item 'Home Page', {:action => 'show', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> |
15
+ <%= list_item 'All Pages', {:action => 'list'}, 'Alphabetically sorted list of pages', 'A' %> |
16
+ <%= list_item 'Recently Revised', {:action =>'recently_revised'},
17
+ 'Pages sorted by when they were last changed', 'U'
18
+ %> |
19
+ <%= list_item 'Authors', {:action => 'authors'}, 'Who wrote what' %> |
20
+ <%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by RSS' %> |
21
+ <%= list_item 'Export', {:action => 'export'},
22
+ 'Download a zip with all the pages in this wiki', 'X'
23
+ %> |
24
+ <input type="text" id="searchField" name="query" style="font-size: 10px" value="Search"
25
+ onClick="this.value == 'Search' ? this.value = '' : true" />
26
+ <% else %>
27
+ <%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> |
28
+ <% end%>
29
+
30
+ </form>
@@ -1,16 +1,12 @@
1
- <div id="TextileHelp" style="float: right; width: 250px; margin-top: 5px">
2
- <h3>RDoc formatting tips (<a target="_new" href="http://rdoc.sourceforge.net/doc/files/markup/simple_markup_rb.html">advanced</a>)</h3>
3
- <table cellspacing="0" cellpadding="0">
4
- <tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
5
- <tr><td>*your text*</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
6
- <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
7
- <tr><td>1. Numbered list<br />2. Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
8
- <tr><td>+my_code+</td><td class="arrow">&rarr;</td><td><code>my_code</code></td></tr>
9
- <tr><td>---</td><td class="arrow">&rarr;</td><td>Horizontal ruler</td></tr>
10
- <tr><td>[[URL linkname]]</td><td class="arrow">&rarr;</td><td><a href="URL">linkname</a></td></tr>
11
- <tr><td>http://url<br />mailto:e@add.com</td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
12
- <tr><td>imageURL</td><td class="arrow">&rarr;</td><td>Image</td></tr>
13
- </table>
14
-
15
- <%= sub_template "wiki_words_help" %>
16
- </div>
1
+ <h3>RDoc formatting tips (<a target="_new" href="http://rdoc.sourceforge.net/doc/files/markup/simple_markup_rb.html">advanced</a>)</h3>
2
+ <table cellspacing="0" cellpadding="0">
3
+ <tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
4
+ <tr><td>*your text*</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
5
+ <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
6
+ <tr><td>1. Numbered list<br />2. Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
7
+ <tr><td>+my_code+</td><td class="arrow">&rarr;</td><td><code>my_code</code></td></tr>
8
+ <tr><td>---</td><td class="arrow">&rarr;</td><td>Horizontal ruler</td></tr>
9
+ <tr><td>[[URL linkname]]</td><td class="arrow">&rarr;</td><td><a href="URL">linkname</a></td></tr>
10
+ <tr><td>http://url<br />mailto:e@add.com</td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
11
+ <tr><td>imageURL</td><td class="arrow">&rarr;</td><td>Image</td></tr>
12
+ </table>
@@ -1,28 +1,24 @@
1
- <div id="TextileHelp" style="float: right; width: 250px; margin-top: 5px">
2
- <h3>Textile formatting tips (<a href="#" onClick="quickRedReference(); return false;">advanced</a>)</h3>
3
- <table cellspacing="0" cellpadding="0">
4
- <tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
5
- <tr><td>*your text*</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
6
- <tr><td>%{color:red}hello%</td><td class="arrow">&rarr;</td><td><span style="color: red;">hello</span></td></tr>
7
- <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
8
- <tr><td># Numbered list<br /># Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
9
- <tr><td>"linkname":URL</td><td class="arrow">&rarr;</td><td><a href="URL">linkname</a></td></tr>
10
- <tr><td>|a|table|row|<br />|b|table|row|</td><td class="arrow">&rarr;</td><td>Table</td></tr>
11
- <tr><td>http://url<br />email@address.com</td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
12
- <tr><td>!imageURL!</td><td class="arrow">&rarr;</td><td>Image</td></tr>
13
- </table>
14
-
15
- <%= sub_template "wiki_words_help" %>
16
- </div>
17
-
18
- <script language="JavaScript">
19
- function quickRedReference() {
20
- window.open(
21
- "http://hobix.com/textile/quick.html",
22
- "redRef",
23
- "height=600,width=550,channelmode=0,dependent=0," +
24
- "directories=0,fullscreen=0,location=0,menubar=0," +
25
- "resizable=0,scrollbars=1,status=1,toolbar=0"
26
- );
27
- }
28
- </script>
1
+ <h3>Textile formatting tips (<a href="#" onClick="quickRedReference(); return false;">advanced</a>)</h3>
2
+ <table cellspacing="0" cellpadding="0">
3
+ <tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
4
+ <tr><td>*your text*</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr>
5
+ <tr><td>%{color:red}hello%</td><td class="arrow">&rarr;</td><td><span style="color: red;">hello</span></td></tr>
6
+ <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
7
+ <tr><td># Numbered list<br /># Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
8
+ <tr><td>"linkname":URL</td><td class="arrow">&rarr;</td><td><a href="URL">linkname</a></td></tr>
9
+ <tr><td>|a|table|row|<br />|b|table|row|</td><td class="arrow">&rarr;</td><td>Table</td></tr>
10
+ <tr><td>http://url<br />email@address.com</td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
11
+ <tr><td>!imageURL!</td><td class="arrow">&rarr;</td><td>Image</td></tr>
12
+ </table>
13
+
14
+ <script language="JavaScript">
15
+ function quickRedReference() {
16
+ window.open(
17
+ "http://hobix.com/textile/quick.html",
18
+ "redRef",
19
+ "height=600,width=550,channelmode=0,dependent=0," +
20
+ "directories=0,fullscreen=0,location=0,menubar=0," +
21
+ "resizable=0,scrollbars=1,status=1,toolbar=0"
22
+ );
23
+ }
24
+ </script>
@@ -1,13 +1,11 @@
1
- <% @title = "Authors" %><%= sub_template "top" %>
2
-
3
- <ul id="authorList">
4
- <% for author in @authors %>
5
- <li>
6
- <%= @web.make_link(author) %>
7
- co- or authored:
8
- <%= @web.select.pages_authored_by(author).collect { |page| page.link }.join ", " %>
9
- </li>
10
- <% end %>
11
- </ul>
12
-
13
- <%= sub_template "bottom" %>
1
+ <% @title = 'Authors' %>
2
+
3
+ <ul id="authorList">
4
+ <% for author in @authors %>
5
+ <li>
6
+ <%= link_to_page author %>
7
+ co- or authored:
8
+ <%= @web.select.pages_authored_by(author).collect { |page| link_to_page(page.name) }.join ', ' %>
9
+ </li>
10
+ <% end %>
11
+ </ul>
@@ -1,31 +1,39 @@
1
- <%
2
- @title = "Editing #{@page.name}"
3
- @content_width = 720
4
- @hide_navigation = true
5
- %><%= sub_template "top" %>
6
-
7
- <%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
8
-
9
- <%= render_markup_help %>
10
-
11
- <form id="editForm" action="../save/<%= @page.name %>" method="post" onSubmit="cleanAuthorName();">
12
- <p>
13
- <textarea name="content" style="width: 450px; height: 500px"><%= @page.content %></textarea>
14
- </p>
15
- <p>
16
- <input type="submit" value="Update"> as
17
- <input type="text" name="author" id="authorName" value="<%= @author %>"
18
- onClick="this.value == 'AnonymousCoward' ? this.value = '' : true">
19
- | <a href="../cancel_edit/<%= @page.name %>">Cancel</a> <small>(unlocks page)</small>
20
- </p>
21
- </form>
22
-
23
- <script language="JavaScript1.2">
24
- function cleanAuthorName() {
25
- if (document.getElementById('authorName').value == "") {
26
- document.getElementById('authorName').value = 'AnonymousCoward';
27
- }
28
- }
29
- </script>
30
-
31
- <%= sub_template "bottom" %>
1
+ <%
2
+ @title = "Editing #{@page.name}"
3
+ @content_width = 720
4
+ @hide_navigation = true
5
+ %>
6
+
7
+ <%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
8
+
9
+ <div id="MarkupHelp" style="float: right; width: 250px; margin-top: 5px">
10
+ <%= render("#{@web.markup}_help") %>
11
+ <%= render 'wiki_words_help' %>
12
+ </div>
13
+
14
+ <%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name},
15
+ {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();'})
16
+ %>
17
+
18
+ <p>
19
+ <textarea name="content" style="width: 450px; height: 500px"><%= @page.content %></textarea>
20
+ </p>
21
+ <p>
22
+ <input type="submit" value="Submit" accesskey="s"/> as
23
+ <input type="text" name="author" id="authorName" value="<%= @author %>"
24
+ onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
25
+ |
26
+ <%= link_to('Cancel', {:web => @web.address, :action => 'cancel_edit', :id => @page.name},
27
+ {:accesskey => 'c'})
28
+ %>
29
+ <small>(unlocks page)</small>
30
+ </p>
31
+ <%= end_form_tag %>
32
+
33
+ <script language="JavaScript1.2">
34
+ function cleanAuthorName() {
35
+ if (document.getElementById('authorName').value == "") {
36
+ document.getElementById('authorName').value = 'AnonymousCoward';
37
+ }
38
+ }
39
+ </script>
@@ -1,14 +1,12 @@
1
- <% @title = "Export" %><%= sub_template "top" %>
2
-
3
- <p>You can export all the pages in this web as a zip file in either HTML (with working links and all) or the pure markup (to import in another wiki).</p>
4
-
5
- <ul id="feedsList">
6
- <li><a href="../export_html">HTML</a>
7
- <li><a href="../export_markup">Markup (<%= @web.markup %>)</a>
8
- <% if OPTIONS[:pdflatex] && @web.markup == :textile %>
9
- <li><a href="../export_tex">TeX</a>
10
- <li><a href="../export_pdf">PDF</a>
11
- <% end %>
12
- </ul>
13
-
14
- <%= sub_template "bottom" %>
1
+ <% @title = "Export" %>
2
+
3
+ <p>You can export all the pages in this web as a zip file in either HTML (with working links and all) or the pure markup (to import in another wiki).</p>
4
+
5
+ <ul id="feedsList">
6
+ <li><%= link_to 'HTML', :web => @web.address, :action => 'export_html' %></li>
7
+ <li><%= link_to "Markup (#{@web.markup.to_s.capitalize})", :web => @web.address, :action => 'export_markup' %></li>
8
+ <% if OPTIONS[:pdflatex] && @web.markup == :textile %>
9
+ <li><%= link_to 'TeX', :web => @web.address, :action => 'export_tex' %></li>
10
+ <li><%= link_to 'PDF', :web => @web.address, :action => 'export_pdf' %></li>
11
+ <% end %>
12
+ </ul>
@@ -1,10 +1,14 @@
1
- <% @title = "Feeds" %><%= sub_template "top" %>
2
-
3
- <p>You can subscribe to this wiki by RSS and get either just the headlines of the pages that change or the entire page.</p>
4
-
5
- <ul id="feedsList">
6
- <li><a href="../rss_with_content<%= "?password=#{web.password}" if web.password %>">Full content (RSS 2.0)</a>
7
- <li><a href="../rss_with_headlines<%= "?password=#{web.password}" if web.password %>">Headlines (RSS 2.0)</a>
8
- </ul>
9
-
10
- <%= sub_template "bottom" %>
1
+ <% @title = "Feeds" %>
2
+
3
+ <p>You can subscribe to this wiki by RSS and get either just the headlines of the pages that change or the entire page.</p>
4
+
5
+ <ul id="feedsList">
6
+ <li>
7
+ <% if @rss_with_content_allowed %>
8
+ <%= link_to 'Full content (RSS 2.0)', :web => @web.address, :action => :rss_with_content %>
9
+ <% end %>
10
+ </li>
11
+ <li>
12
+ <%= link_to 'Headlines (RSS 2.0)', :web => @web.address, :action => :rss_with_headlines %>
13
+ </li>
14
+ </ul>