From 982ef5cdcefcb7a7de2619b825f52cc131d916be Mon Sep 17 00:00:00 2001 From: Aaron Quint Date: Thu, 27 Jan 2011 10:13:17 -0800 Subject: [PATCH] Fix master docs link, upload general logo --- lib/sammyjs-org.rb | 3 +-- public/images/sammy-logo.gif | Bin 0 -> 7119 bytes views/docs.textile | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 public/images/sammy-logo.gif diff --git a/lib/sammyjs-org.rb b/lib/sammyjs-org.rb index fd4ebd4..99ee4ac 100644 --- a/lib/sammyjs-org.rb +++ b/lib/sammyjs-org.rb @@ -48,11 +48,10 @@ class SammyjsOrg < Sinatra::Application redirect "/docs/api/#{@current_version}/" end - get '/docs/api/?:version?/:page?' do + get '/docs/api/?:version?/?:page?' do @general_header = true @version = params[:version] || @current_version @page = params[:page] || 'index' - puts @page.inspect if @page =~ /\.html$/ haml "= html('docs/api/#{@version}/#{@page}')", :layout => :simple else diff --git a/public/images/sammy-logo.gif b/public/images/sammy-logo.gif new file mode 100644 index 0000000000000000000000000000000000000000..bae768b27626e34387ab2b8ac4ba736a5b6c5ce5 GIT binary patch literal 7119 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 ZHGxi+LKRZ90JEiAWQ0gwhXcTs{{uequucE~ literal 0 HcmV?d00001 diff --git a/views/docs.textile b/views/docs.textile index 897df4d..6fb1c29 100644 --- a/views/docs.textile +++ b/views/docs.textile @@ -15,7 +15,7 @@ The API docs are generated from inline comments in the source. The API documenta *"View the documentation for the latest stable version":/docs/api/stable* -*"View the API docs for master/edge":/docs/api/master* +*"View the API docs for master/edge":/docs/api/master/* h3(#blocks). Building Blocks