diff --git a/new-racket-web/web/common/layout.rkt b/new-racket-web/web/common/layout.rkt index 3b8d62a26e..aefa3a6d3c 100644 --- a/new-racket-web/web/common/layout.rkt +++ b/new-racket-web/web/common/layout.rkt @@ -131,21 +131,21 @@ (define (icon name) @i[class: name]{}) (define (row . content) (apply div class: "row" content)) - (define download-promise (lazy (dict-ref (force (first (unbox navbar-info))) 'download))) - (define main-promise (lazy (second (unbox navbar-info)))) + (define download-promise (dict-ref (force (first (unbox navbar-info))) 'download)) + (define main-promise (force (second (unbox navbar-info)))) @div[class: "navbar" gumby-fixed: "top" id: "nav1"]{ @row{ @a[class: "toggle" gumby-trigger: "#nav1 > .row > ul" href: "#"]{ @icon{icon-menu}} - @a[class: "five columns logo" href: (url-of (force main-promise))]{ + @a[class: "five columns logo" href: (url-of main-promise)]{ @img[class: "logo" src: logo]} @ul[class: "five columns"]{ @li{@a[href: "http://pkg.racket-lang.org"]{Packages}} @li{@a[href: "http://docs.racket-lang.org"]{Documentation}} @li{@a[href: "http://blog.racket-lang.org"]{Blog}} @li{@div[class: "medium metro info btn icon-left entypo icon-install"]{ - @(force download-promise)}}}}}) + @download-promise}}}}}) (define html-preamble @list{ diff --git a/new-racket-web/web/www/index.rkt b/new-racket-web/web/www/index.rkt index b045cafa07..57bc8295a0 100644 --- a/new-racket-web/web/www/index.rkt +++ b/new-racket-web/web/www/index.rkt @@ -7,7 +7,7 @@ ;; -- use links ;; -- indentation -(require "resources.rkt" "code.rkt" "download.rkt" "learning.rkt" "gumby.rkt") +(require "resources.rkt" "code.rkt" "download.rkt" "learning.rkt" "gumby.rkt" "people.rkt") (define (doc path . text) (apply a href: (list "http://docs.racket-lang.org/" path) text)) @@ -448,7 +448,7 @@ Chat in the @tt[style: "background-color: #d8d8e8;"]{@big{@strong{#racket}}} cha discussion channel for all things related to Racket. (@a[href: "https://botbot.me/freenode/racket/"]{Browse the logs}.)} -@p{@a[href: "http://racket-lang.org/people.html"]{People} — +@p{@people — The people behind Racket.} } diff --git a/new-racket-web/web/www/learning.rkt b/new-racket-web/web/www/learning.rkt index 1049d5da28..326bec1f87 100644 --- a/new-racket-web/web/www/learning.rkt +++ b/new-racket-web/web/www/learning.rkt @@ -1,14 +1,15 @@ #lang meta/web -(require "resources.rkt" "people.rkt" "techreports.rkt" "old-techreports.rkt") +(require "resources.rkt" "people.rkt" "techreports.rkt" "old-techreports.rkt" "gumby.rkt") (provide learning) (define learning - @page[#:window-title "Racket Learning" #:part-of 'learning + @page[#:window-title "Racket Learning" #:part-of 'learning #:width 'full #:description '@{Racket-related learning resources. Introductions to Racket, @; the Racket Guide, Computer Science textbooks that use Racket, @; outreach programs, and graduate studies.}]{ + @columns[8 #:row? #t]{ @parlist[@strong{Resources for Learning} (apply parlist @text{Documentation for getting started:} intros) @text{@-htdp — a textbook for introductory programming, but also @@ -30,7 +31,7 @@ @a[href: pubs]{@(place-name place)}))) @parlist[@strong{Graduate Study} @text{We welcome applications from students interested in - @|graduate-study|.}]}) + @|graduate-study|.}]}}) (define graduate-study @page[#:file "common-plt-app.html" #:part-of 'learning]{ @@ -51,7 +52,8 @@ @a[href: (person-url person)]{ @(regexp-replace #rx" .*$" (person-name person) "")}) ", ")) - @h1{Graduate Study with PLT} + @columns[8 #:row? #t]{ + @h2{Graduate Study with PLT} @p{An open letter to graduate applicants:} @div[style: (box-style 3 "#dddddd")]{ @p*{ @@ -90,7 +92,7 @@ innovation, you should strongly consider graduate study with us. We look forward to hearing from you. All of us, no matter where we may live.} - @p[align: 'right]{—@responsible-people}}) + @p[align: 'right]{—@responsible-people}}}) ;; redirection page for the previous name of this page (define outreach+research diff --git a/new-racket-web/web/www/new-name.rkt b/new-racket-web/web/www/new-name.rkt index 4c1b0cefc8..73bba6dded 100644 --- a/new-racket-web/web/www/new-name.rkt +++ b/new-racket-web/web/www/new-name.rkt @@ -2,19 +2,21 @@ (require "resources.rkt") -(define name i) +(define (name . a) (apply span class: 'italic a)) (define (url str) (tt (a href: str str))) (define styles @style/inline{ + .italic { font-style: italic; } + tt { font-family: Inconsolata; } .nestedheading { text-align: center; font-weight: bold; font-size: large; } .nested { - width: 80%; + width: 40%; margin-left: auto; margin-right: auto; margin-top: 1em; @@ -24,7 +26,7 @@ margin-left: auto; margin-right: auto; margin-top: 2em; - width: 90%; + width: 45%; } .faqques { font-weight: bold; diff --git a/new-racket-web/web/www/people.rkt b/new-racket-web/web/www/people.rkt index ccc0d461ce..fc7d23f7f8 100644 --- a/new-racket-web/web/www/people.rkt +++ b/new-racket-web/web/www/people.rkt @@ -1,6 +1,6 @@ #lang meta/web -(require "resources.rkt") +(require "resources.rkt" "gumby.rkt") (define (make-all place person) ;; The first person in a place is the one responsible for it @@ -100,15 +100,19 @@ people (make-finder 'people people person-nick)))) (provide people) +(define acks-url "https://github.com/plt/racket/blob/master/racket/collects/acks/acks.rkt") (define people @page[#:window-title "Racket People: The PLT Group" #:part-of 'community - #:description "PLT: the group that is the Racket development team."]{ + #:description "PLT: the group that is the Racket development team." + #:width 'full]{ + @columns[8 #:center? #t #:row? #t]{ @p{“PLT” refers to the group that is the core of the Racket development team. PLT consists of numerous people distributed across several different universities in the USA: - @(ul (map (λ (p) @li{@a[href: (place-url p)]{ - @(place-name p), @(place-location p)}}) + @(ul style: "margin-left: 20px" + (map (λ (p) @li{@a[href: (place-url p)]{ + @(place-name p), @(place-location p)}}) all-places))} - @p{Also, Racket is supported by a band of volunteers who contribute not + @p{Also, Racket is supported by a band of volunteers who @a[href: acks-url]{contribute} not only code and documentation but also infectious enthusiasm—too many to - name but whose help and encouragement make this fun and worthwhile.}}) + name but whose help and encouragement make this fun and worthwhile.}}})