diff options
| -rw-r--r-- | cgi/bins.cgi | 6 | ||||
| -rw-r--r-- | cgi/home.cgi | 26 | ||||
| -rw-r--r-- | cgi/stuff-i-want.cgi | 56 | ||||
| -rwxr-xr-x | cgi/user.cgi | 2 | ||||
| -rw-r--r-- | cgi/whisky-shelf.cgi | 14 |
5 files changed, 48 insertions, 56 deletions
diff --git a/cgi/bins.cgi b/cgi/bins.cgi index fb959f1..5ed6ffa 100644 --- a/cgi/bins.cgi +++ b/cgi/bins.cgi @@ -88,9 +88,7 @@ def graphic_collection(resp) end $page = - $cgi.div { - $cgi.h2 { "Our Next Bin Collections" } + - next_collection - } + $cgi.h2 { "Our Next Bin Collections" } + + next_collection # vim: set filetype=ruby: diff --git a/cgi/home.cgi b/cgi/home.cgi index b8caad9..b7dfb5d 100644 --- a/cgi/home.cgi +++ b/cgi/home.cgi @@ -1,17 +1,15 @@ $page = - $cgi.div { $cgi.h1 { "Welcome!" } } + - $cgi.div { - $cgi.h2 { "Speak Gently Over the Telephone" } + - $cgi.blockquote { - "It is one of the commonest as well as one of the most amusing human idiosyncrasies to imagine that the louder one shouts into the transmitter of a telephone the more perfectly and comfortably does the sound reach the person at the other end. Great numbers of people who in the ordinary affairs of life are tranquil and soft-toned, will habitually yell into a telephone receiver as if they were rooting for the home team. These are, perhaps the same people who think that he who has not the remotest knowledge of English can grasp it without difficulty if only it is shouted at him loudly enough. The theory that prompts vociferousness in the one case is as false as that which prompts it in the other." + - $cgi.br + $cgi.br + - "If a person does not understand English, no amount of shouting will make him understand it. If he understands a little English, he can best make out what another is saying to him when the other is calm. If he understands English very well, he will appreciate whatever is said to him all the more if it is not said in the key at which one usually hails a boat 300 yards off shore on a windy day." + - $cgi.br + $cgi.br + - "It is the same way with a telephone. If it is entirely out of order there is no more sense in yelling into the transmitter than there would be in hallooing at the moon. If it is not working well, this can be best overcome by patience strongly reinforced with clear enunciation. If it is working properly, the person at the other end can hear most distinctly when the tone employed is that used in ordinary conversation among decent people." + - $cgi.br + $cgi.br + - "— Christian Science Monitor" - } + - $cgi.p { "From Bell Telephone News, Volume 2, Number 7, Page 18." } - } + $cgi.h1 { "Welcome!" } + + $cgi.h2 { "Speak Gently Over the Telephone" } + + $cgi.blockquote { + "It is one of the commonest as well as one of the most amusing human idiosyncrasies to imagine that the louder one shouts into the transmitter of a telephone the more perfectly and comfortably does the sound reach the person at the other end. Great numbers of people who in the ordinary affairs of life are tranquil and soft-toned, will habitually yell into a telephone receiver as if they were rooting for the home team. These are, perhaps the same people who think that he who has not the remotest knowledge of English can grasp it without difficulty if only it is shouted at him loudly enough. The theory that prompts vociferousness in the one case is as false as that which prompts it in the other." + + $cgi.br + $cgi.br + + "If a person does not understand English, no amount of shouting will make him understand it. If he understands a little English, he can best make out what another is saying to him when the other is calm. If he understands English very well, he will appreciate whatever is said to him all the more if it is not said in the key at which one usually hails a boat 300 yards off shore on a windy day." + + $cgi.br + $cgi.br + + "It is the same way with a telephone. If it is entirely out of order there is no more sense in yelling into the transmitter than there would be in hallooing at the moon. If it is not working well, this can be best overcome by patience strongly reinforced with clear enunciation. If it is working properly, the person at the other end can hear most distinctly when the tone employed is that used in ordinary conversation among decent people." + + $cgi.br + $cgi.br + + "— Christian Science Monitor" + } + + $cgi.p { "From Bell Telephone News, Volume 2, Number 7, Page 18." } # vim: set filetype=ruby: diff --git a/cgi/stuff-i-want.cgi b/cgi/stuff-i-want.cgi index 8cafe23..a7f1d2e 100644 --- a/cgi/stuff-i-want.cgi +++ b/cgi/stuff-i-want.cgi @@ -1,32 +1,30 @@ $page = - $cgi.div { - $cgi.h2 { "Wishlists" } + - $cgi.h3 { "Amazon" } + - $cgi.ul { - $cgi.li { $cgi.a(href: "https://www.amazon.co.uk/hz/wishlist/ls/3SB878GWKV1OG", target: "_blank") { "Books" } } + - $cgi.li { $cgi.a(href: "https://www.amazon.co.uk/hz/wishlist/ls/2N0PIE381SAVM", target: "_blank") { "Board Games" } } + - $cgi.li { $cgi.a(href: "https://www.amazon.co.uk/hz/wishlist/ls/3HVX4XFFH7TFR", target: "_blank") { "Misc" } } - } + - $cgi.h3 { "DriveThruRPG" } + - $cgi.ul { - $cgi.li { $cgi.a(href: "https://www.drivethrurpg.com/wishlist_public.php?public_id=3288195&list_id=3986366", target: "_blank") { "Roleplaying Games" } } - } + - $cgi.h3 { "Master of Malt" } + - $cgi.ul { - $cgi.li { $cgi.a(href: "https://www.masterofmalt.com/lists/buy-niuan-paque/", target: "_blank") { "Whisky" } } + - $cgi.li { $cgi.a(href: "https://www.masterofmalt.com/lists/denis-cheet-glynn/", target: "_blank") { "Not Whisky" } } - } + - $cgi.h3 { "Steam" } + - $cgi.ul { - $cgi.li { $cgi.a(href: "https://store.steampowered.com/wishlist/profiles/76561197996305593/#sort=order&ex_earlyaccess=1&ex_prerelease=1", target: "_blank") { "Video Games" } } - } + $cgi.h2 { "Wishlists" } + + $cgi.h3 { "Amazon" } + + $cgi.ul { + $cgi.li { $cgi.a(href: "https://www.amazon.co.uk/hz/wishlist/ls/3SB878GWKV1OG", target: "_blank") { "Books" } } + + $cgi.li { $cgi.a(href: "https://www.amazon.co.uk/hz/wishlist/ls/2N0PIE381SAVM", target: "_blank") { "Board Games" } } + + $cgi.li { $cgi.a(href: "https://www.amazon.co.uk/hz/wishlist/ls/3HVX4XFFH7TFR", target: "_blank") { "Misc" } } } + - $cgi.div { - $cgi.h2 { "Things" } + - $cgi.ul { - $cgi.li { $cgi.a(href: "https://eater.net/shop", target: "_blank") { "Ben Eater's Complete 8-bit breadboard computer kit bundle" } } + - $cgi.li { $cgi.a(href: "https://drop.com/buy/drop-mt3-dasher-keycap-set/?defaultSelectionIds=967197", target: "_blank") { "DROP MT3 Dasher keycap set" } } + - $cgi.li { $cgi.a(href: "https://shop.darkwoodscoffee.co.uk/collections/courses-and-events/products/sca-foundation-brewing-course?variant=12969866133548", target: "_blank") { "SCA Foundation Coffee Brewing Course" } } + - $cgi.li { $cgi.a(href: "https://www.hamradiostore.co.uk/mrq800-triband-6-2-70-mobile-antenna", target: "_blank") { "Moonraker 6/2/70 Whip" } } - } + $cgi.h3 { "DriveThruRPG" } + + $cgi.ul { + $cgi.li { $cgi.a(href: "https://www.drivethrurpg.com/wishlist_public.php?public_id=3288195&list_id=3986366", target: "_blank") { "Roleplaying Games" } } + } + + $cgi.h3 { "Master of Malt" } + + $cgi.ul { + $cgi.li { $cgi.a(href: "https://www.masterofmalt.com/lists/buy-niuan-paque/", target: "_blank") { "Whisky" } } + + $cgi.li { $cgi.a(href: "https://www.masterofmalt.com/lists/denis-cheet-glynn/", target: "_blank") { "Not Whisky" } } + } + + $cgi.h3 { "Steam" } + + $cgi.ul { + $cgi.li { $cgi.a(href: "https://store.steampowered.com/wishlist/profiles/76561197996305593/#sort=order&ex_earlyaccess=1&ex_prerelease=1", target: "_blank") { "Video Games" } } + } + + $cgi.h2 { "Things" } + + $cgi.ul { + $cgi.li { $cgi.a(href: "https://eater.net/shop", target: "_blank") { "Ben Eater's Complete 8-bit breadboard computer kit bundle" } } + + $cgi.li { $cgi.a(href: "https://drop.com/buy/drop-mt3-dasher-keycap-set/?defaultSelectionIds=967197", target: "_blank") { "DROP MT3 Dasher keycap set" } } + + $cgi.li { $cgi.a(href: "https://shop.darkwoodscoffee.co.uk/collections/courses-and-events/products/sca-foundation-brewing-course?variant=12969866133548", target: "_blank") { "SCA Foundation Coffee Brewing Course" } } + + $cgi.li { $cgi.a(href: "https://www.hamradiostore.co.uk/mrq800-triband-6-2-70-mobile-antenna", target: "_blank") { "Moonraker 6/2/70 Whip" } } } + +# vim: set filetype=ruby: diff --git a/cgi/user.cgi b/cgi/user.cgi index 86a99f5..6df7e2a 100755 --- a/cgi/user.cgi +++ b/cgi/user.cgi @@ -77,7 +77,7 @@ def page(title, jumbotitle = title) $cgi.h1(class: "jumbo") { jumbotitle } + toplinks } + - $page + + $cgi.div { $page } + $cgi.div(id: "quote") { rquote } } } diff --git a/cgi/whisky-shelf.cgi b/cgi/whisky-shelf.cgi index 7645ba6..8933109 100644 --- a/cgi/whisky-shelf.cgi +++ b/cgi/whisky-shelf.cgi @@ -20,13 +20,11 @@ data = JSON.parse(File.read("../inc/shelf.json")) $page = $cgi.h2 { "What's on my shelf?" } + - $cgi.div { - $cgi.h3 { "Open" } + - shelf_contents(data, "open") + - $cgi.h3 { "Unopened" } + - shelf_contents(data, "new") + - $cgi.h3 { "Finished" } + - shelf_contents(data, "gone") - } + $cgi.h3 { "Open" } + + shelf_contents(data, "open") + + $cgi.h3 { "Unopened" } + + shelf_contents(data, "new") + + $cgi.h3 { "Finished" } + + shelf_contents(data, "gone") # vim: set filetype=ruby: |