From 8694d7b8ae219f92aec20b5366bbb1e60385d5d8 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Wed, 16 Jun 2010 02:23:58 -0400 Subject: [PATCH] Provide resources from download (so do this from all uses of `define+provide-context'); dirlist uses that instead of www. Also dropped redundant provides of `page'. --- collects/meta/web/common/layout.rkt | 2 +- collects/meta/web/download/shared.rkt | 2 +- collects/meta/web/stubs/dirlist.rkt | 7 ++----- collects/meta/web/www/shared.rkt | 5 +---- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/collects/meta/web/common/layout.rkt b/collects/meta/web/common/layout.rkt index 17b94acf89..e63a234303 100644 --- a/collects/meta/web/common/layout.rkt +++ b/collects/meta/web/common/layout.rkt @@ -185,7 +185,7 @@ (make-style dir)))] [provides (if provide? #'(provide page-id plain-id copyfile-id - symlink-id) + symlink-id resources-id) #'(begin))]) #'(begin (define resources-id resources) diff --git a/collects/meta/web/download/shared.rkt b/collects/meta/web/download/shared.rkt index 0a29fc8e6c..80b1558d6a 100644 --- a/collects/meta/web/download/shared.rkt +++ b/collects/meta/web/download/shared.rkt @@ -1,5 +1,5 @@ #lang at-exp s-exp "../common.rkt" -(provide page (all-from-out "../common.rkt")) +(provide (all-from-out "../common.rkt")) (define+provide-context "download") diff --git a/collects/meta/web/stubs/dirlist.rkt b/collects/meta/web/stubs/dirlist.rkt index 4c623cc2e3..14aa11f2bb 100644 --- a/collects/meta/web/stubs/dirlist.rkt +++ b/collects/meta/web/stubs/dirlist.rkt @@ -2,9 +2,9 @@ ;; This stub is to generate fancy directory listings with the Racket style -(require (prefix-in www: (only-in "../www/shared.rkt" the-resources))) +(require (prefix-in dnld: (only-in "../download/shared.rkt" the-resources))) -(define-context "stubs/dirlist" #:resources www:the-resources) +(define-context "stubs/dirlist" #:resources dnld:the-resources) (require racket/port) (define (xml->string content) @@ -12,9 +12,6 @@ (with-output-to-string (lambda () (output-xml content))) "\\ ")) -;; (define (racket-navbar) (xml->string (www:the-resources 'navbar #f))) -;; (define (racket-favicon) (xml->string (www:the-resources 'favicon-headers))) - (define header+footer (delay (regexp-split #rx"{{{BODY}}}" (xml->string @page[#:id 'browse-downloads diff --git a/collects/meta/web/www/shared.rkt b/collects/meta/web/www/shared.rkt index 81344538e6..c9ca2c018f 100644 --- a/collects/meta/web/www/shared.rkt +++ b/collects/meta/web/www/shared.rkt @@ -1,8 +1,5 @@ #lang at-exp s-exp "../common.rkt" -(provide page (all-from-out "../common.rkt")) +(provide (all-from-out "../common.rkt")) (define+provide-context "www") - -;; needed for sites that use the icon from here (eg, blog.racket-lang.org) -(provide the-resources)