diff --git a/Rakefile b/Rakefile index cc9289b..c0e7a17 100644 --- a/Rakefile +++ b/Rakefile @@ -6,7 +6,7 @@ require 'fileutils' include FileUtils NAME = "camping" -VERS = "1.4.2" +VERS = "1.5" CLEAN.include ['**/.*.sw?', '*.gem', '.config'] RDOC_OPTS = ['--quiet', '--title', "Camping, the Documentation", "--template", "extras/flipbook_rdoc.rb", @@ -59,7 +59,7 @@ spec = s.executables = ['camping'] s.add_dependency('activerecord', '>=1.14.2') - s.add_dependency('markaby', '>=0.4') + s.add_dependency('markaby', '>=0.5') s.add_dependency('metaid') s.required_ruby_version = '>= 1.8.2' diff --git a/examples/campsh/campsh.rb b/examples/campsh/campsh.rb index 29cc538..bc9d3b3 100644 --- a/examples/campsh/campsh.rb +++ b/examples/campsh/campsh.rb @@ -6,7 +6,7 @@ Camping.goes :CampSh module CampSh - NAME = 'CampCampSh' + NAME = 'CampSh' DESCRIPTION = %{ Script your own URL commands, then run these commands through the proxy with "cmd/CommandName". All scripts are versioned @@ -484,14 +484,13 @@ def layout def _navigation form :id => "navigationForm", :class => "navigation", :style => "font-size: 10px" do - a "Command List", :href => R(List), :title => "Alphabetical list of commands", :accesskey => "A" - text " | " - a "Recently Revised", :href => R(Recent), :title => "Pages sorted by when they were last changed", - :accesskey => "U" - text " | " - a "Authors", :href => R(Authors), :title => "Who wrote what" - text " | " - a "How To", :href => R(HowTo), :title => "How to use CampShell", :accesskey => "H" + [["Command List", R(List), "Alphabetical list of commands", "A"], + ["Recently Revised", R(Recent), "Pages sorted by when they were last changed", "U"], + ["Authors", R(Authors), "Who wrote what", "W"], + ["How To", R(HowTo), "How to use CampShell", "H"] + ].map do |txt, link, title, key| + a txt, :href => link, :title => title, :accesskey => key + end.join(" | ") end end @@ -522,11 +521,8 @@ def authors ul.authorList! do @authors.each do |author, cmds| li do - strong author - text " worked on: " + - cmds.map { |cmd| - capture { a cmd.name, :href => R(Show, cmd.name) } - }.join(", ") + strong(author) + " worked on: " + + cmds.map { |cmd| a cmd.name, :href => R(Show, cmd.name) }.join(", ") end end end