From 1fc2a3e17187d5cfab8aef964597ddeccc0be6f6 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Wed, 16 Jun 2010 16:48:14 -0400 Subject: [PATCH] Rename "outreach+research" -> "learning". * Move learning stuff from "community" to it. * Set up a redirection page for "outreach+research.html". --- collects/meta/web/navbar.rkt | 2 +- collects/meta/web/www/community.rkt | 9 ------ collects/meta/web/www/index.rkt | 6 ++-- .../{outreach+research.rkt => learning.rkt} | 29 +++++++++++++++---- collects/meta/web/www/main.rkt | 6 ++-- collects/meta/web/www/people.rkt | 2 +- 6 files changed, 31 insertions(+), 23 deletions(-) rename collects/meta/web/www/{outreach+research.rkt => learning.rkt} (80%) diff --git a/collects/meta/web/navbar.rkt b/collects/meta/web/navbar.rkt index 8e46071315..f86fcb1272 100644 --- a/collects/meta/web/navbar.rkt +++ b/collects/meta/web/navbar.rkt @@ -1,5 +1,5 @@ #lang at-exp s-exp "common.rkt" (require "www/main.rkt" "download/main.rkt" "minis/main.rkt" "stubs/main.rkt") -(set-navbar! (list main download -docs planet community outreach+research) +(set-navbar! (list main download -docs planet community learning) help) diff --git a/collects/meta/web/www/community.rkt b/collects/meta/web/www/community.rkt index 376fd3e833..aab51d8d24 100644 --- a/collects/meta/web/www/community.rkt +++ b/collects/meta/web/www/community.rkt @@ -13,15 +13,6 @@ on @a[href: "http://freenode.net"]{@tt{freenode.net}} @mdash an informal discussion channel for all things related to Racket. @irc-logs{Browse the logs}.}] - @parlist[@strong{Resources for Learning} - (apply parlist @text{Documentation for getting started:} intros) - @text{@-cookbook @mdash useful recipes, many of which apply to Racket.} - @text{@-htdp @mdash a textbook for introductory programming, but also - worthwhile for experience programmers who are new to @|ldquo|functional - programming.@|rdquo|} - @text{@-plai @mdash a textbook on programming languages.} - @text{@-teachscheme @mdash a workshop to train teachers using @-htdp in - the classroom.}] @parlist[@strong{PLT Scheme Inc.} @text{@blog @mdash announcements, helpful hints, and thoughtful rants.} @text{@people @mdash the people behind Racket.}] diff --git a/collects/meta/web/www/index.rkt b/collects/meta/web/www/index.rkt index 1b0b569bfa..adb077825d 100644 --- a/collects/meta/web/www/index.rkt +++ b/collects/meta/web/www/index.rkt @@ -1,6 +1,6 @@ #lang at-exp s-exp "shared.rkt" -(require "code.rkt" "download.rkt" "outreach+research.rkt" racket/string) +(require "code.rkt" "download.rkt" "learning.rkt" racket/string) (define (doc s) (string-append "http://docs.racket-lang.org/" s)) @@ -262,8 +262,8 @@ @p{Whether you're just @-htdp{starting out}, want to know more about programming language @-plai{applications} or @-redex{models}, looking to @continue{expand your horizons}, or ready to dive into - @outreach+research{research}, Racket can help you become a better - programmer and system builder.})))) + @learning{research}, Racket can help you become a better programmer + and system builder.})))) (define (alts-panel l1 l2) (define l (append l1 l2)) diff --git a/collects/meta/web/www/outreach+research.rkt b/collects/meta/web/www/learning.rkt similarity index 80% rename from collects/meta/web/www/outreach+research.rkt rename to collects/meta/web/www/learning.rkt index 012471dcc1..56427131fe 100644 --- a/collects/meta/web/www/outreach+research.rkt +++ b/collects/meta/web/www/learning.rkt @@ -13,10 +13,18 @@ @a[href: "http://www.cs.utah.edu/plt/publications/"]{Utah PLT Publications}) ;; TODO: add calpoly & byu? -(provide outreach+research) -(define outreach+research - @page[#:title "Outreach & Research" - #:link-title @list{Outreach@|nbsp|&@|nbsp|Research}]{ +(provide learning) +(define learning + @page{ + @parlist[@strong{Resources for Learning} + (apply parlist @text{Documentation for getting started:} intros) + @text{@-cookbook @mdash useful recipes, many of which apply to Racket.} + @text{@-htdp @mdash a textbook for introductory programming, but also + worthwhile for experience programmers who are new to @|ldquo|functional + programming.@|rdquo|} + @text{@-plai @mdash a textbook on programming languages.} + @text{@-teachscheme @mdash a workshop to train teachers using @-htdp in + the classroom.}] @parlist[ @strong{Outreach} @text{@-teachscheme @mdash a workshop to train teachers using @-htdp in @@ -29,7 +37,7 @@ @|graduate-study|.}]}) (define graduate-study - @page[#:file "common-plt-app.html" #:part-of outreach+research]{ + @page[#:file "common-plt-app.html" #:part-of learning]{ @(define (box-style border-width color) @list{border: @|border-width|px solid black; padding: 5px; @; background: @|color|@";"}) @@ -81,9 +89,18 @@ @a[href: "http://www.cs.brown.edu/~sk/"]{Shriram}}}) (define techreports - @page[#:file "techreports/" #:part-of outreach+research + @page[#:file "techreports/" #:part-of learning #:title "Technical Reports" #:extra-headers @meta[http-equiv: "refresh" content: "0;url=http://plt-scheme.org/techreports/"]]{ TODO}) + +;; redirection page for the previous name of this page +(define outreach+research + @page[#:part-of learning + #:title "Outreach & Research" + #:link-title @list{Outreach@|nbsp|&@|nbsp|Research} + #:extra-headers + @meta[http-equiv: "refresh" content: "0;url=learning.html"]]{ + Moved.}) diff --git a/collects/meta/web/www/main.rkt b/collects/meta/web/www/main.rkt index c31e38d576..db00b382de 100644 --- a/collects/meta/web/www/main.rkt +++ b/collects/meta/web/www/main.rkt @@ -1,5 +1,5 @@ #lang at-exp s-exp "shared.rkt" -(require "index.rkt" "download.rkt" "community.rkt" "outreach+research.rkt" - "help.rkt" "new-name.rkt") -(provide (rename-out [index main]) download community outreach+research help) +(require "index.rkt" "download.rkt" "community.rkt" "learning.rkt" "help.rkt" + "new-name.rkt") +(provide (rename-out [index main]) download community learning help) diff --git a/collects/meta/web/www/people.rkt b/collects/meta/web/www/people.rkt index 341539396b..3463c76a83 100644 --- a/collects/meta/web/www/people.rkt +++ b/collects/meta/web/www/people.rkt @@ -1,6 +1,6 @@ #lang at-exp s-exp "shared.rkt" -;;TODO: combine the info in outreach+research.rkt into a list of structs here +;;TODO: combine the info in learning.rkt into a list of structs here (define places (ul (map (lambda (p) (let-values ([(place-name place-url person-name person-url)