instiki 0.10.0 → 0.10.1
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.
- data/CHANGELOG +174 -165
- data/README +68 -68
- data/app/controllers/admin_controller.rb +94 -94
- data/app/controllers/application.rb +135 -131
- data/app/controllers/file_controller.rb +129 -129
- data/app/controllers/wiki_controller.rb +354 -354
- data/app/helpers/application_helper.rb +68 -68
- data/app/models/author.rb +3 -3
- data/app/models/chunks/category.rb +33 -33
- data/app/models/chunks/chunk.rb +86 -86
- data/app/models/chunks/engines.rb +61 -54
- data/app/models/chunks/include.rb +41 -41
- data/app/models/chunks/literal.rb +31 -31
- data/app/models/chunks/nowiki.rb +28 -28
- data/app/models/chunks/test.rb +18 -18
- data/app/models/chunks/uri.rb +182 -182
- data/app/models/chunks/wiki.rb +141 -141
- data/app/models/file_yard.rb +58 -58
- data/app/models/page.rb +112 -112
- data/app/models/page_lock.rb +22 -22
- data/app/models/page_set.rb +89 -89
- data/app/models/revision.rb +123 -123
- data/app/models/web.rb +182 -176
- data/app/models/wiki_content.rb +207 -207
- data/app/models/wiki_service.rb +233 -233
- data/app/models/wiki_words.rb +23 -23
- data/app/views/admin/create_system.rhtml +83 -83
- data/app/views/admin/create_web.rhtml +69 -69
- data/app/views/admin/edit_web.rhtml +137 -136
- data/app/views/file/file.rhtml +18 -18
- data/app/views/file/import.rhtml +22 -22
- data/app/views/layouts/default.rhtml +86 -85
- data/app/views/markdown_help.rhtml +12 -12
- data/app/views/mixed_help.rhtml +6 -6
- data/app/views/navigation.rhtml +30 -30
- data/app/views/rdoc_help.rhtml +12 -12
- data/app/views/textile_help.rhtml +24 -24
- data/app/views/wiki/authors.rhtml +11 -11
- data/app/views/wiki/edit.rhtml +39 -39
- data/app/views/wiki/export.rhtml +12 -12
- data/app/views/wiki/feeds.rhtml +14 -14
- data/app/views/wiki/list.rhtml +64 -64
- data/app/views/wiki/locked.rhtml +23 -23
- data/app/views/wiki/login.rhtml +14 -14
- data/app/views/wiki/new.rhtml +31 -31
- data/app/views/wiki/page.rhtml +115 -115
- data/app/views/wiki/print.rhtml +14 -14
- data/app/views/wiki/published.rhtml +9 -9
- data/app/views/wiki/recently_revised.rhtml +26 -26
- data/app/views/wiki/revision.rhtml +103 -103
- data/app/views/wiki/rollback.rhtml +36 -36
- data/app/views/wiki/rss_feed.rhtml +22 -22
- data/app/views/wiki/search.rhtml +38 -38
- data/app/views/wiki/tex.rhtml +22 -22
- data/app/views/wiki/tex_web.rhtml +34 -34
- data/app/views/wiki/web_list.rhtml +18 -18
- data/app/views/wiki_words_help.rhtml +9 -9
- data/config/environment.rb +82 -82
- data/config/environments/development.rb +5 -5
- data/config/environments/production.rb +4 -4
- data/config/environments/test.rb +17 -17
- data/config/routes.rb +18 -18
- data/lib/active_record_stub.rb +31 -31
- data/lib/bluecloth_tweaked.rb +1127 -0
- data/lib/diff.rb +444 -444
- data/lib/instiki_errors.rb +14 -14
- data/lib/rdocsupport.rb +151 -151
- data/lib/redcloth_for_tex.rb +736 -736
- data/natives/osx/desktop_launcher/AppDelegate.h +18 -18
- data/natives/osx/desktop_launcher/AppDelegate.mm +109 -109
- data/natives/osx/desktop_launcher/Credits.html +15 -15
- data/natives/osx/desktop_launcher/English.lproj/MainMenu.nib/classes.nib +12 -12
- data/natives/osx/desktop_launcher/English.lproj/MainMenu.nib/info.nib +24 -24
- data/natives/osx/desktop_launcher/Info.plist +12 -12
- data/natives/osx/desktop_launcher/Instiki.xcode/project.pbxproj +592 -592
- data/natives/osx/desktop_launcher/Instiki_Prefix.pch +7 -7
- data/natives/osx/desktop_launcher/MakeDMG.sh +9 -9
- data/natives/osx/desktop_launcher/main.mm +14 -14
- data/natives/osx/desktop_launcher/version.plist +16 -16
- data/public/404.html +5 -5
- data/public/500.html +5 -5
- data/public/dispatch.rb +9 -9
- data/public/javascripts/edit_web.js +52 -52
- data/public/javascripts/prototype.js +336 -336
- data/public/stylesheets/instiki.css +222 -222
- data/script/breakpointer +4 -4
- data/script/server +93 -93
- metadata +4 -3
    
        data/app/views/file/file.rhtml
    CHANGED
    
    | @@ -1,19 +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 %>
         | 
| 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 19 | 
             
            </p>
         | 
    
        data/app/views/file/import.rhtml
    CHANGED
    
    | @@ -1,23 +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 %>
         | 
| 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 23 | 
             
            </p>
         | 
| @@ -1,85 +1,86 @@ | |
| 1 | 
            -
             | 
| 2 | 
            -
             | 
| 3 | 
            -
             | 
| 4 | 
            -
             | 
| 5 | 
            -
             | 
| 6 | 
            -
             | 
| 7 | 
            -
                <%  | 
| 8 | 
            -
                  <%= @ | 
| 9 | 
            -
                <%  | 
| 10 | 
            -
                  <%= @title %>
         | 
| 11 | 
            -
                <%  | 
| 12 | 
            -
             | 
| 13 | 
            -
             | 
| 14 | 
            -
               | 
| 15 | 
            -
             | 
| 16 | 
            -
              < | 
| 17 | 
            -
             | 
| 18 | 
            -
             | 
| 19 | 
            -
                 | 
| 20 | 
            -
             | 
| 21 | 
            -
                 | 
| 22 | 
            -
             | 
| 23 | 
            -
                 | 
| 24 | 
            -
             | 
| 25 | 
            -
             | 
| 26 | 
            -
             | 
| 27 | 
            -
               | 
| 28 | 
            -
             | 
| 29 | 
            -
              < | 
| 30 | 
            -
             | 
| 31 | 
            -
             | 
| 32 | 
            -
             | 
| 33 | 
            -
             | 
| 34 | 
            -
               | 
| 35 | 
            -
             | 
| 36 | 
            -
             | 
| 37 | 
            -
             | 
| 38 | 
            -
             | 
| 39 | 
            -
             | 
| 40 | 
            -
             | 
| 41 | 
            -
             | 
| 42 | 
            -
             | 
| 43 | 
            -
             | 
| 44 | 
            -
             | 
| 45 | 
            -
             | 
| 46 | 
            -
             | 
| 47 | 
            -
             | 
| 48 | 
            -
            < | 
| 49 | 
            -
             | 
| 50 | 
            -
             | 
| 51 | 
            -
             | 
| 52 | 
            -
             | 
| 53 | 
            -
             | 
| 54 | 
            -
             | 
| 55 | 
            -
                   | 
| 56 | 
            -
             | 
| 57 | 
            -
             | 
| 58 | 
            -
             | 
| 59 | 
            -
             | 
| 60 | 
            -
             | 
| 61 | 
            -
             | 
| 62 | 
            -
             | 
| 63 | 
            -
             | 
| 64 | 
            -
             | 
| 65 | 
            -
             | 
| 66 | 
            -
             | 
| 67 | 
            -
             | 
| 68 | 
            -
             | 
| 69 | 
            -
             | 
| 70 | 
            -
            <%= @ | 
| 71 | 
            -
             | 
| 72 | 
            -
             | 
| 73 | 
            -
             | 
| 74 | 
            -
                < | 
| 75 | 
            -
                < | 
| 76 | 
            -
                < | 
| 77 | 
            -
                </ | 
| 78 | 
            -
             | 
| 79 | 
            -
             | 
| 80 | 
            -
             | 
| 81 | 
            -
             | 
| 82 | 
            -
             | 
| 83 | 
            -
             | 
| 84 | 
            -
             | 
| 85 | 
            -
            </ | 
| 1 | 
            +
            <!DOCTYPE html
         | 
| 2 | 
            +
            PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         | 
| 3 | 
            +
            "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
         | 
| 4 | 
            +
            <html xmlns="http://www.w3.org/1999/xhtml">
         | 
| 5 | 
            +
            <head>
         | 
| 6 | 
            +
              <title>
         | 
| 7 | 
            +
                <% if @page and (@page.name == 'HomePage') and (%w( show published print ).include?(@action_name)) %>
         | 
| 8 | 
            +
                  <%= @web.name %>
         | 
| 9 | 
            +
                <% elsif @web %>
         | 
| 10 | 
            +
                  <%= @title %> in <%= @web.name %>
         | 
| 11 | 
            +
                <% else %>
         | 
| 12 | 
            +
                  <%= @title %>
         | 
| 13 | 
            +
                <% end %>
         | 
| 14 | 
            +
              </title>
         | 
| 15 | 
            +
             | 
| 16 | 
            +
              <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         | 
| 17 | 
            +
             | 
| 18 | 
            +
              <style type="text/css">
         | 
| 19 | 
            +
                h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 { 
         | 
| 20 | 
            +
                  color: #<%= @web ? @web.color : "393" %>; 
         | 
| 21 | 
            +
                }
         | 
| 22 | 
            +
             | 
| 23 | 
            +
                #Container, #Content {
         | 
| 24 | 
            +
                  width: <%= @content_width || "600" %>px;
         | 
| 25 | 
            +
                }
         | 
| 26 | 
            +
                <%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
         | 
| 27 | 
            +
              </style>
         | 
| 28 | 
            +
             | 
| 29 | 
            +
              <link rel="Stylesheet" href="/stylesheets/instiki.css" type="text/css" media="screen" />
         | 
| 30 | 
            +
             | 
| 31 | 
            +
              <style type="text/css">
         | 
| 32 | 
            +
                <%= @style_additions %>
         | 
| 33 | 
            +
                <%= @web ? @web.additional_style : '' %>
         | 
| 34 | 
            +
              </style>
         | 
| 35 | 
            +
              
         | 
| 36 | 
            +
              <% if @web %>
         | 
| 37 | 
            +
                <link rel="alternate" type="application/rss+xml" title="<%= h @web.name %> - Headlines RSS" 
         | 
| 38 | 
            +
                      href="<%= url_for :controller => 'wiki', :web => @web.address, 
         | 
| 39 | 
            +
                                  :action => 'rss_with_headlines' %>"
         | 
| 40 | 
            +
                />
         | 
| 41 | 
            +
                <link rel="alternate" type="application/rss+xml" title="<%= h @web.name %> - Full Pages RSS" 
         | 
| 42 | 
            +
                      href="<%= url_for :controller => 'wiki', :web => @web.address, 
         | 
| 43 | 
            +
                                  :action => 'rss_with_content' %>"
         | 
| 44 | 
            +
                />
         | 
| 45 | 
            +
              <% end %>
         | 
| 46 | 
            +
            </head>
         | 
| 47 | 
            +
             | 
| 48 | 
            +
            <body>
         | 
| 49 | 
            +
            <div id="Container">
         | 
| 50 | 
            +
            <div id="Content">
         | 
| 51 | 
            +
              <h1 id="pageName">
         | 
| 52 | 
            +
                <% if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) %>
         | 
| 53 | 
            +
                  <%= @web.name %>
         | 
| 54 | 
            +
                <% elsif @web %>
         | 
| 55 | 
            +
                  <small><%= @web.name %></small><br />
         | 
| 56 | 
            +
                  <%= @title %>
         | 
| 57 | 
            +
                <% else %>
         | 
| 58 | 
            +
                  <%= @title %>
         | 
| 59 | 
            +
                <% end %>
         | 
| 60 | 
            +
              </h1>
         | 
| 61 | 
            +
             | 
| 62 | 
            +
            <% if @flash[:error] %> <div id="error">
         | 
| 63 | 
            +
                <hr/><p><%= @flash[:error].to_s %></p><hr/></div>
         | 
| 64 | 
            +
            <% end %>
         | 
| 65 | 
            +
             | 
| 66 | 
            +
            <% if @flash[:info] %> <div id="info">
         | 
| 67 | 
            +
                <hr/><p><%= @flash[:info].to_s %></p><hr/></div>
         | 
| 68 | 
            +
            <% end %>
         | 
| 69 | 
            +
             | 
| 70 | 
            +
            <%= render 'navigation' unless @web.nil? || @hide_navigation %>
         | 
| 71 | 
            +
            <%= @content_for_layout %>
         | 
| 72 | 
            +
             | 
| 73 | 
            +
            <% if @show_footer %>
         | 
| 74 | 
            +
                <div id="footer">
         | 
| 75 | 
            +
                <p>This site is running on <a href="http://instiki.org/">Instiki</a></p>
         | 
| 76 | 
            +
                <br/>
         | 
| 77 | 
            +
                <p>Powered by <a href="http://rubyonrails.com/">Ruby on Rails</a></p>
         | 
| 78 | 
            +
                </div>
         | 
| 79 | 
            +
            <% end %>
         | 
| 80 | 
            +
             | 
| 81 | 
            +
            </div> <!-- Content -->
         | 
| 82 | 
            +
             | 
| 83 | 
            +
            </div> <!-- Container -->
         | 
| 84 | 
            +
             | 
| 85 | 
            +
            </body>
         | 
| 86 | 
            +
            </html>
         | 
| @@ -1,12 +1,12 @@ | |
| 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">→</td><td><em>your text</em></td></tr>
         | 
| 4 | 
            -
              <tr><td>**your text**</td><td class="arrow">→</td><td><strong>your text</strong></td></tr>
         | 
| 5 | 
            -
              <tr><td>`my code`</td><td class="arrow">→</td><td><code>my code</code></td></tr>
         | 
| 6 | 
            -
              <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">→</td><td>• Bulleted list<br />• Second item</td></tr>
         | 
| 7 | 
            -
              <tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">→</td><td>1. Numbered list<br />2. Second item</td></tr>
         | 
| 8 | 
            -
              <tr><td>[link name](URL)</td><td class="arrow">→</td><td><a href="URL">link name</a></td></tr>
         | 
| 9 | 
            -
              <tr><td>***</td><td class="arrow">→</td><td>Horizontal ruler</td></tr>
         | 
| 10 | 
            -
              <tr><td><http://url><br /><email@add.com></td><td class="arrow">→</td><td>Auto-linked</td></tr>
         | 
| 11 | 
            -
              <tr><td></td><td class="arrow">→</td><td>Image</td></tr>
         | 
| 12 | 
            -
            </table>
         | 
| 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">→</td><td><em>your text</em></td></tr>
         | 
| 4 | 
            +
              <tr><td>**your text**</td><td class="arrow">→</td><td><strong>your text</strong></td></tr>
         | 
| 5 | 
            +
              <tr><td>`my code`</td><td class="arrow">→</td><td><code>my code</code></td></tr>
         | 
| 6 | 
            +
              <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">→</td><td>• Bulleted list<br />• Second item</td></tr>
         | 
| 7 | 
            +
              <tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">→</td><td>1. Numbered list<br />2. Second item</td></tr>
         | 
| 8 | 
            +
              <tr><td>[link name](URL)</td><td class="arrow">→</td><td><a href="URL">link name</a></td></tr>
         | 
| 9 | 
            +
              <tr><td>***</td><td class="arrow">→</td><td>Horizontal ruler</td></tr>
         | 
| 10 | 
            +
              <tr><td><http://url><br /><email@add.com></td><td class="arrow">→</td><td>Auto-linked</td></tr>
         | 
| 11 | 
            +
              <tr><td></td><td class="arrow">→</td><td>Image</td></tr>
         | 
| 12 | 
            +
            </table>
         | 
    
        data/app/views/mixed_help.rhtml
    CHANGED
    
    | @@ -1,7 +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>.
         | 
| 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 7 | 
             
            </p>
         | 
    
        data/app/views/navigation.rhtml
    CHANGED
    
    | @@ -1,30 +1,30 @@ | |
| 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, ' | 
| 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 | 
            -
                        | 
| 26 | 
            -
              <% else %>
         | 
| 27 | 
            -
              	<%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> | 
         | 
| 28 | 
            -
              <% end%>
         | 
| 29 | 
            -
             | 
| 30 | 
            -
            </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, '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 | 
            +
                       onfocus="if (this.value == 'Search' ) this.value = '' " />
         | 
| 26 | 
            +
              <% else %>
         | 
| 27 | 
            +
              	<%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> | 
         | 
| 28 | 
            +
              <% end%>
         | 
| 29 | 
            +
             | 
| 30 | 
            +
            </form>
         | 
    
        data/app/views/rdoc_help.rhtml
    CHANGED
    
    | @@ -1,12 +1,12 @@ | |
| 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">→</td><td><em>your text</em></td></tr>
         | 
| 4 | 
            -
              <tr><td>*your text*</td><td class="arrow">→</td><td><strong>your text</strong></td></tr>
         | 
| 5 | 
            -
              <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">→</td><td>• Bulleted list<br />• Second item</td></tr>
         | 
| 6 | 
            -
              <tr><td>1. Numbered list<br />2. Second item</td><td class="arrow">→</td><td>1. Numbered list<br />2. Second item</td></tr>
         | 
| 7 | 
            -
              <tr><td>+my_code+</td><td class="arrow">→</td><td><code>my_code</code></td></tr>
         | 
| 8 | 
            -
              <tr><td>---</td><td class="arrow">→</td><td>Horizontal ruler</td></tr>
         | 
| 9 | 
            -
              <tr><td>[[URL linkname]]</td><td class="arrow">→</td><td><a href="URL">linkname</a></td></tr>
         | 
| 10 | 
            -
              <tr><td>http://url<br />mailto:e@add.com</td><td class="arrow">→</td><td>Auto-linked</td></tr>
         | 
| 11 | 
            -
              <tr><td>imageURL</td><td class="arrow">→</td><td>Image</td></tr>
         | 
| 12 | 
            -
            </table>
         | 
| 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">→</td><td><em>your text</em></td></tr>
         | 
| 4 | 
            +
              <tr><td>*your text*</td><td class="arrow">→</td><td><strong>your text</strong></td></tr>
         | 
| 5 | 
            +
              <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">→</td><td>• Bulleted list<br />• Second item</td></tr>
         | 
| 6 | 
            +
              <tr><td>1. Numbered list<br />2. Second item</td><td class="arrow">→</td><td>1. Numbered list<br />2. Second item</td></tr>
         | 
| 7 | 
            +
              <tr><td>+my_code+</td><td class="arrow">→</td><td><code>my_code</code></td></tr>
         | 
| 8 | 
            +
              <tr><td>---</td><td class="arrow">→</td><td>Horizontal ruler</td></tr>
         | 
| 9 | 
            +
              <tr><td>[[URL linkname]]</td><td class="arrow">→</td><td><a href="URL">linkname</a></td></tr>
         | 
| 10 | 
            +
              <tr><td>http://url<br />mailto:e@add.com</td><td class="arrow">→</td><td>Auto-linked</td></tr>
         | 
| 11 | 
            +
              <tr><td>imageURL</td><td class="arrow">→</td><td>Image</td></tr>
         | 
| 12 | 
            +
            </table>
         | 
| @@ -1,24 +1,24 @@ | |
| 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">→</td><td><em>your text</em></td></tr>
         | 
| 4 | 
            -
              <tr><td>*your text*</td><td class="arrow">→</td><td><strong>your text</strong></td></tr>
         | 
| 5 | 
            -
              <tr><td>%{color:red}hello%</td><td class="arrow">→</td><td><span style="color: red;">hello</span></td></tr>
         | 
| 6 | 
            -
              <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">→</td><td>• Bulleted list<br />• Second item</td></tr>
         | 
| 7 | 
            -
              <tr><td># Numbered list<br /># Second item</td><td class="arrow">→</td><td>1. Numbered list<br />2. Second item</td></tr>
         | 
| 8 | 
            -
              <tr><td>"linkname":URL</td><td class="arrow">→</td><td><a href="URL">linkname</a></td></tr>
         | 
| 9 | 
            -
              <tr><td>|a|table|row|<br />|b|table|row|</td><td class="arrow">→</td><td>Table</td></tr>
         | 
| 10 | 
            -
              <tr><td>http://url<br />email@address.com</td><td class="arrow">→</td><td>Auto-linked</td></tr>
         | 
| 11 | 
            -
              <tr><td>!imageURL!</td><td class="arrow">→</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 | 
            +
            <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">→</td><td><em>your text</em></td></tr>
         | 
| 4 | 
            +
              <tr><td>*your text*</td><td class="arrow">→</td><td><strong>your text</strong></td></tr>
         | 
| 5 | 
            +
              <tr><td>%{color:red}hello%</td><td class="arrow">→</td><td><span style="color: red;">hello</span></td></tr>
         | 
| 6 | 
            +
              <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">→</td><td>• Bulleted list<br />• Second item</td></tr>
         | 
| 7 | 
            +
              <tr><td># Numbered list<br /># Second item</td><td class="arrow">→</td><td>1. Numbered list<br />2. Second item</td></tr>
         | 
| 8 | 
            +
              <tr><td>"linkname":URL</td><td class="arrow">→</td><td><a href="URL">linkname</a></td></tr>
         | 
| 9 | 
            +
              <tr><td>|a|table|row|<br />|b|table|row|</td><td class="arrow">→</td><td>Table</td></tr>
         | 
| 10 | 
            +
              <tr><td>http://url<br />email@address.com</td><td class="arrow">→</td><td>Auto-linked</td></tr>
         | 
| 11 | 
            +
              <tr><td>!imageURL!</td><td class="arrow">→</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,11 +1,11 @@ | |
| 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 | 
            +
            <% @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>
         |