Better filename conventions: "main.rkt"s that would just require the

necessary modules are now "all.rkt"s; "shard.rkt"s turn to
"resources.rkt".

Also, "navbar.rkt" changes to "all.rkt", since it was doing the same
thing (in addition to setting the navbar).

collects/meta/build/build

@@ -1922,7 +1922,7 @@ BUILD_WEB() {
   _rmcd "$maindir/$webdir"
   local webflags=""
   webflags="$webflags -w -f -o $maindir/$webdir"
-  webflags="$webflags -e $maindir/$internaldir/web/main.rkt"
+  webflags="$webflags -e $maindir/$internaldir/web/all.rkt"
   # distribute only if this is a normal build
   if [[ "$prewebdir" = "$prewebdir_default" ]]; then
     separator "Making and distributing web content"

collects/meta/web/README

@@ -4,7 +4,13 @@
 
 * download: content of download site (only installer pages and such)
 
-* minis: smaller sites which are implemented in one-file each.
+* */all.rkt: files that just require all the necessary modules to build
+  the ahole site
+
+* */resources.rkt: files that define the resources for a site (icon,
+  css, logo)
+
+* minis: smaller sites which are implemented in one-file each
 
 * stubs: template "sites" that are intended to be hooked into other
   systems to get the plt look.

collects/meta/web/all.rkt

@@ -1,5 +1,5 @@
 #lang meta/web
 
-(require "www/main.rkt" "download/main.rkt" "minis/main.rkt" "stubs/main.rkt")
+(require "www/all.rkt" "download/all.rkt" "minis/all.rkt" "stubs/all.rkt")
 (set-navbar! (list main download -docs planet community learning)
              help)

collects/meta/web/build.rkt

@@ -8,7 +8,7 @@ exec "$exe" "$0" "$@"
 #lang racket/base
 
 (require racket/cmdline racket/runtime-path racket/file scribble/html
-         "common/distribute.rkt" "config.rkt" "navbar.rkt")
+         "common/distribute.rkt" "config.rkt" "all.rkt")
 
 (define build-mode #f)
 (define output-dir (current-directory))

collects/meta/web/common/resources.rkt

@@ -6,7 +6,7 @@
 ;; sites.  They could be included from a single place, but then when one
 ;; machine crashes the rest won't work right.  (Note: do not add
 ;; resources that are specific to only one site here, do so in the
-;; site's shared.rkt file)
+;; site's "resources.rkt" file)
 
 (require "utils.ss")
 

collects/meta/web/download/all.rkt

@@ -0,0 +1,3 @@
+#lang racket/base
+
+(require "index.rkt" "version.rkt")

collects/meta/web/download/download-pages.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "data.rkt" "installer-pages.rkt"
+(require "resources.rkt" "data.rkt" "installer-pages.rkt"
          (prefix-in pre: "../stubs/pre.rkt"))
 
 (provide render-download-page)

collects/meta/web/download/index.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "data.rkt" "../www/download.rkt")
+(require "resources.rkt" "data.rkt" "../www/download.rkt")
 
 (define (in-ftp . paths)
   (string-join (cons "/var/ftp/pub/racket" paths) "/"))

collects/meta/web/download/installer-pages.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "data.rkt")
+(require "resources.rkt" "data.rkt")
 
 (define (render-installer-page installer)
   (define path (installer-path installer))

collects/meta/web/download/main.rkt

@@ -1,3 +0,0 @@
-#lang racket/base
-
-(require "shared.rkt" "index.rkt" "version.rkt")

collects/meta/web/download/version.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "data.rkt")
+(require "resources.rkt" "data.rkt")
 
 (define version.txt
   (plain (format "~s" `((recent ,current-version) (stable ,current-version)))))

collects/meta/web/minis/bugs.rkt

@@ -42,7 +42,7 @@
       @option[selected: 'true value: (caddr s)]{@(cadr s)}
       @option[value: (cadr s)]{@(car s)})))
 
-(require "../www/main.rkt")
+(require (only-in "../www/all.rkt" download))
 
 (define (cgi-link from . to)
   (apply symlink (format "/www/cgi-bin/~a" from) to))

collects/meta/web/minis/drracket.rkt

@@ -9,7 +9,7 @@
 (define index
   (page #:title "DrRacket" #:extra-headers (delay headers) (center-div logo)))
 
-(require (only-in "../www/main.rkt" main))
+(require (only-in "../www/all.rkt" main))
 
 (define (logo)
   (define (text->lines text)

collects/meta/web/stubs/blog.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require (prefix-in www: (only-in "../www/shared.rkt" the-resources))
+(require (prefix-in www: (only-in "../www/resources.rkt" the-resources))
          racket/port)
 
 (define-context "stubs/blog" #:resources www:the-resources)

collects/meta/web/stubs/dirlist.rkt

@@ -2,7 +2,7 @@
 
 ;; This stub is to generate fancy directory listings with the Racket style
 
-(require (prefix-in dnld: (only-in "../download/shared.rkt" the-resources)))
+(require (prefix-in dnld: (only-in "../download/resources.rkt" the-resources)))
 
 (define-context "stubs/dirlist" #:resources dnld:the-resources)
 

collects/meta/web/stubs/wiki.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require (prefix-in www: (only-in "../www/shared.rkt" the-resources)))
+(require (prefix-in www: (only-in "../www/resources.rkt" the-resources)))
 
 (define-context "stubs/wiki" #:resources www:the-resources)
 

collects/meta/web/www/bib.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt")
+(require "resources.rkt")
 
 ;; bib values are hash tables mapping field names (symbols) to strings.
 ;; Keywords can also be used for the field names, which makes them meta-fields

collects/meta/web/www/code.rkt

@@ -1,7 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt"
-         syntax-color/module-lexer setup/xref scribble/xref)
+(require syntax-color/module-lexer setup/xref scribble/xref)
 
 (provide code)
 

collects/meta/web/www/community.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "people.rkt" "irc.rkt"
+(require "resources.rkt" "people.rkt" "irc.rkt"
          "../minis/lists.rkt"
          "../stubs/blog.rkt" "../stubs/git.rkt"
          (prefix-in pre: "../stubs/pre.rkt"))

collects/meta/web/www/download.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "../download/download-pages.rkt")
+(require "resources.rkt" "../download/download-pages.rkt")
 
 (provide download-button download)
 

collects/meta/web/www/guidelines.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt")
+(require "resources.rkt")
 
 (define styles
   @style/inline{

collects/meta/web/www/help.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "community.rkt")
+(require "resources.rkt" "community.rkt")
 
 (provide help)
 (define help

collects/meta/web/www/index.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "code.rkt" "download.rkt" "learning.rkt")
+(require "resources.rkt" "code.rkt" "download.rkt" "learning.rkt")
 
 (define (doc s)
   (string-append "http://docs.racket-lang.org/" s))

collects/meta/web/www/irc.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt")
+(require "resources.rkt")
 
 (provide irc-quick)
 

collects/meta/web/www/learning.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "people.rkt" "techreports.rkt")
+(require "resources.rkt" "people.rkt" "techreports.rkt")
 
 (provide learning)
 (define learning

collects/meta/web/www/new-name.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt")
+(require "resources.rkt")
 
 (define name i)
 

collects/meta/web/www/people.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt")
+(require "resources.rkt")
 
 (define (make-all place person)
   ;; The first person in a place is the one responsible for it

collects/meta/web/www/techreports.rkt

@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "people.rkt" "../download/data.rkt"
+(require "resources.rkt" "people.rkt" "../download/data.rkt"
          "bib.rkt" (prefix-in - version/utils))
 
 ;; New style TR entries -------------------------------------------------------