From ff6c3a078a9ac23b5ff640f9a2cc3aabb728ed4c Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 18 Dec 2010 14:29:12 -0800 Subject: [PATCH] Remove the old redirect system. --- doc-src/Rules | 8 ++++---- doc-src/assets/htaccess | 1 + doc-src/content/reference.haml | 4 ---- doc-src/layouts/redirect.haml | 5 ----- 4 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 doc-src/content/reference.haml delete mode 100644 doc-src/layouts/redirect.haml diff --git a/doc-src/Rules b/doc-src/Rules index e3a15741..2be98d80 100644 --- a/doc-src/Rules +++ b/doc-src/Rules @@ -18,7 +18,7 @@ end compile '/' do filter :haml, :ugly => true - layout item[:redirect] ? "redirect" : (item[:layout] ? item[:layout] : "main") + layout item[:layout] ? item[:layout] : "main" end compile '/search-data/' do @@ -28,7 +28,7 @@ end compile '/examples/*/' do filter :haml, :ugly => true filter :highlight - layout item[:redirect] ? "redirect" : (item[:layout] ? item[:layout] : "example") + layout item[:layout] ? item[:layout] : "example" end sass_options = Compass.sass_engine_options @@ -44,7 +44,7 @@ end compile '/reference/*/' do filter :haml, :ugly => true filter :highlight - layout item[:redirect] ? "redirect" : (item[:layout] ? item[:layout] : "main") + layout item[:layout] ? item[:layout] : "main" end compile '*' do @@ -53,7 +53,7 @@ compile '*' do elsif item[:extension] == "haml" filter :haml, :ugly => true end - layout item[:redirect] ? "redirect" : (item[:layout] ? item[:layout] : "main") + layout item[:layout] ? item[:layout] : "main" end route '/search-data/' do diff --git a/doc-src/assets/htaccess b/doc-src/assets/htaccess index 397dfca7..597b19c5 100644 --- a/doc-src/assets/htaccess +++ b/doc-src/assets/htaccess @@ -1,4 +1,5 @@ RedirectMatch 301 /docs/ /reference/compass/ RedirectMatch 301 /docs/tutorials/(.*) /help/tutorials/$1 RedirectMatch 301 /docs/(.*) /$1 +RedirectMatch 301 /reference/ /reference/compass/ diff --git a/doc-src/content/reference.haml b/doc-src/content/reference.haml deleted file mode 100644 index 594a4334..00000000 --- a/doc-src/content/reference.haml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Compass Documentation -redirect: /reference/compass/ ---- \ No newline at end of file diff --git a/doc-src/layouts/redirect.haml b/doc-src/layouts/redirect.haml deleted file mode 100644 index 5c7c76ff..00000000 --- a/doc-src/layouts/redirect.haml +++ /dev/null @@ -1,5 +0,0 @@ -!!!5 -- # This template redirects. -%html{:dir => "ltr", :lang => "en"} - %head - %meta{:"http-equiv" => "refresh", :content => "0;#{@item[:redirect]}"}/ \ No newline at end of file