increase contrast on lane buttons, fix font definition

NEWSITE_CONTRIBUTERS.md

@@ -1,17 +0,0 @@
-# Basic Concept, Design and Guiding Light
-
-* Ken Fallon
-
-# Implementaion and Design Touches
-
-* Lee Hanken
-* Roan Horning
-
-# Constructive Feedback and Forward Looks
-
-* Archer72 (Mark Rice)
-* Dave Morris
-* kwoot
-
-Thanks to all the contributers who helped give HPR 
-its 2025 facelift!

README.md

@@ -68,5 +68,5 @@ and add the label "**Feature Request**".
 * Ken Fallon
 * norrist
 * Paul Jewell
-* Lee Hanken
+
 

public_html/css/bebas/OFL.txt

@@ -1,93 +0,0 @@
-Copyright (c) 2010-2012 Patrick Wagesreiter (mail@patrickwagesreiter.at)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

public_html/css/hpr.css

@@ -10,86 +10,55 @@ https://creativecommons.org/publicdomain/
  *		-- https://developer.mozilla.org/en-US/docs/Learn/CSS/CSS_layout/Responsive_Design
  *	- Matthew James Tayler: Responsive Font Size (Optimal Text at Every Breakpoint) 
  *		-- https://matthewjamestaylor.com/responsive-font-size
- *	- CSS-Tricks: Linearly Scale font-size with CSS c
- *	#welcome > p {
- *	font-size: 1.25rem;
- *	font-weight: 450;
- *	}lamp() Based on the Viewport
+ *	- CSS-Tricks: Linearly Scale font-size with CSS clamp() Based on the Viewport
  *		-- https://css-tricks.com/linearly-scale-font-size-with-css-clamp-based-on-the-viewport/
 */
-
+@font-face {
+  font-family: "GNUTypewriter";
+  src:
+    local("GNUTypewriter"),
+    url("/css/gnutypewriter/gtw.woff") format("woff");
+}
 @font-face {
   font-family: "BebasNeue";
   src:
-    local("BEBAS NEUE"),
-    url("/css/bebas/BebasNeue.woff2") format("woff2"),
-    url("/css/bebas/BebasNeue.woff") format("woff"),
-    url("/css/bebas/BebasNeue.otf") format("opentype");
+    local("BebasNeue"),
+    url("/css/bebas/BebasNeue.woff") format("woff");
 }
 @font-face {
   font-family: "PatrickHand";
   src:
-    local("Patrick Hand"),
-	url("/css/patrickhand/PatrickHand-Regular.woff2") format("woff2"),
-    url("/css/patrickhand/PatrickHand-Regular.woff") format("woff"),
-	url("/css/patrickhand/PatrickHand-Regular.ttf") format("truetype");
+    local("PatrickHand"),
+    url("/css/patrickhand/PatrickHand-Regular.ttf") format("truetype");
 }
 :root {
 	--background-primary: #fffff7/*#fafafa#fbfbee #dfdfdf */;
 	--text-primary: #4d4d4d; /* HPR Grey */
 	--banner-text-primary: #000000;
-	--banner-background-color: #40a5b9; 
-	/* --background-secondary: #4d4d4d; */
-	--background-secondary: #00003e;
+	--background-secondary: #4d4d4d;
 	--text-secondary: #dfdfdf;
 	--link-primary: #004852 /*#154a60*/;
 	--link-primary-hover: #b54c08/*#f8961e*/;
 	--link-secondary: #a8f8ff;
 	--link-secondary-hover: #f9e9c2;
-	--link-title-color: #00003e;
-	--link-navigation-hover: #030303;
-	--primary-content-line-height: 1.45;
 
-	--font-family-hpr: Verdana, Arial, Helvetica, sans-serif; /* 1em/1.5 OpenDyslexic, */;
-	--font-size-default: clamp(1rem, 15px + 0.3vw, 1.07rem);
-	--font-size-emphasis: clamp(1.1rem, 15px + 0.3vw, 1.25rem);
-
-	--episode-nav-padding: clamp(0.15em, 15px + 0.3vw, 0.4em);
-	--show-notes-pre-background: #f9e9c2; 
-	--logo-font-family: var(--font-family-hpr);  
-	--logo-font-weight: bolder;
-	--logo-font-size: 7.5rem;
-	--logo-letter-spacing: -0.65rem;
-	--logo-line-height: 0.75;
-	--logo-margin: 0 0 0.25rem 0;
-
-	--tagline-font-family:"BebasNeue", sans-serif; 
-	--lane-button-font-family: "PatrickHand", var(--font-family-hpr); 
 	--lane-button-border: #80b4c0;
 	--input-border-primary: #4d4d4d;
 
 	--link-spacing-horizontal: clamp(0.5rem, -0.25rem + 3vw, 2.5rem);
 
+	--font-family-hpr: Verdana, Arial, Helvetica, sans-serif; /* 1em/1.5 OpenDyslexic, */;
+	--font-size-default: clamp(1rem, 15px + 0.3vw, 1.07rem);
 
 	--shadow-main-header-color: hsl(190deg 48% 49% / 0.2);
 	--shadow-secondary-color: hsl(0, 0%, 30.2%);
 	--shadow-cards: var(--shadow-secondary-color);
-
-	--content-max-width: 1080pt;
-
   /* screen breakpoints */
 	--for-phone-only: 599px;
     --for-tablet-portrait-up: 600px;
     --for-tablet-landscape-up: 900px;
 	--for-desktop-up: 1200px;
     --for-big-desktop-up: 1800px; 
-
-	--default-header-x-font-weight: bold;
-	--default-header-x-margin: 1.25rem 0 0.75rem 0;
-	--default-header-1-font-size: 1.5rem;
-	--default-header-2-font-size: 1.45rem;
-	--default-header-3-font-size: 1.25rem;
-	--default-header-4-font-size: 1.15rem;
 }
 
 html {
@@ -111,27 +80,24 @@ body {
 	padding: 0;
 	min-height: 100vh;
 }
-#top_navigation {
-	display: flex;
-	flex-direction: row-reverse;
-	justify-content: space-between;
+
+body > nav {
 	background-color: var(--background-secondary);
 	color: var(--text-secondary);
-	padding: 0.5rem;
 }
-#top_navigation > nav a {
+body > nav a {
 	color: var(--link-secondary);
 }
-#top_navigation > nav a:hover {
+body > nav a:hover {
 	color: var(--link-secondary-hover);
 }
-#top_navigation > nav menu {
+body > nav ul {
 	background-color: inherit;
 	color: inherit;
 	margin: 0;
 	padding: 0.25rem;
 }
-#top_navigation > nav menu li {
+body > nav ul li {
 	display: inline-block;
 	background-color: inherit;
 	color: inherit;
@@ -140,30 +106,23 @@ body {
 	padding: 0;
 	padding-right: var(--link-spacing-horizontal);
 }
-#top_navigation > nav menu li a {
+body > nav ul li a {
 	padding: 0.25rem 0;
 }
 body > header {
-	padding: clamp(0.5rem, -0.25rem + 3vw, 1rem) 0.25rem;
-	background-color: var(--banner-background-color);
-	background-image: url("/images/main-header-background.png");
-	background-size: cover;
-	background-repeat: no-repeat;
-	background-position: left top;
-	color: var(--banner-text-primary);
-	align-items: center;
-	border-top: var(--background-secondary) solid 1rem;
-}
-body > header .bounding-box {
-	background: none;
 	display: flex;
 	flex-direction: row;
 	flex-flow: wrap;
 	justify-content: space-between;
-	max-width: var(--content-max-width);
-	margin: 0 auto;
+	padding: 0.25rem;
+	background-image: url("/images/hpr-splatter-logo.svg"), url("/images/main-header-background.png");
+	background-size: 59%, cover;
+	background-repeat: no-repeat, no-repeat;
+	background-position: right -15px top -20px, left top;
+	color: var(--banner-text-primary);
+	align-items: center;
 }
-body > header .bounding-box > * {
+body > header > * {
 	margin: 0;
 	padding: 0;
 	flex: 1 1 auto;
@@ -173,9 +132,6 @@ body > header .bounding-box > * {
 body > main {
 	flex: 1 0 auto;
 	padding: 0.25rem;
-	max-width: var(--content-max-width);
-	margin-left: auto;
-	margin-right: auto;
 }
 body > footer {
 	flex: 0 1 auto;
@@ -186,10 +142,6 @@ body > footer {
 	text-align: center;
 	line-height: 1.25;
 }
-body > footer #copyright {
-	max-width: var(--content-max-width);
-	margin: 0 auto;
-}
 body > footer a {
 	color: var(--link-secondary);
 }
@@ -222,27 +174,27 @@ blockquote {
 }
 
 h1 {
-	font-size: var(--default-header-1-font-size);
-	margin: var(--default-header-x-margin);
+	font-size: 1.5rem;
+	margin: 1.25rem 0 0.75rem 0;
 }
 
 h2,
 article * h1,
 section > header:first-child {
-	font-size: var(--default-header-2-font-size);
-	margin: var(--default-header-x-margin);
+	font-size: 1.45rem;
+	margin: 1.25rem 0 0.75rem 0;
 }
 
 h3,
 article * h2 {
-	font-size: var(--default-header-3-font-size);
-	margin: var(--default-header-x-margin);
+	font-size: 1.25rem;
+	margin: 1.25rem 0 0.75rem 0;
 }
 
 h4,
 article * h3 {
-	font-size: var(--default-header-4-font-size);
-	margin: var(--default-header-x-margin);
+	font-size: 1.15rem;
+	margin: 1.25rem 0 0.75rem 0;
 }
 
 img {
@@ -250,7 +202,7 @@ img {
 	height: auto;
 }
 
-dl, ul {
+ul {
 	padding-left: 1.15rem;
 }
 
@@ -261,28 +213,9 @@ li {
 li:last-child {
 	margin-bottom: 0.25rem;
 }
-
-dt, dd {
-	line-height: 1.25;
-}
-
-dt {
-    display: list-item;
-    list-style-type: disc;
-	margin-bottom: 0.15rem;
-}
-
-dd {
-	margin-bottom: 0.35rem;
-	margin-left: 1rem;
-}
-
 a {
+	text-decoration: none;
 	color: var(--link-primary);
-	text-decoration-style: dotted;
-	text-decoration-color: inherit;
-    text-decoration-thickness: .125rem;
-    text-underline-offset: 0.2rem;
 }
 a:hover {
 	cursor: pointer;
@@ -316,7 +249,7 @@ p.meta span label {
 article > p,
 #main_content > p,
 #main_content > section > p {
-	line-height: var(--primary-content-line-height);
+	line-height: 1.45;
 }
 .lane {
 	display: flex;
@@ -324,25 +257,15 @@ article > p,
 	flex-wrap: wrap;
 	gap: 1.0rem;
 	justify-content: space-around;
-}
-.lane.stack {
-	flex-direction: column;
-	justify-content: flex-start;
-}
-.lane.stack > * {
-	flex: 1 0 100%;
+	justify-items: space-around;
+
 }
 #podcast_lane > .lane,
 #project_lane > .lane,
 #latest_lane.lane {
-	justify-content: space-around;
+	justify-content: flex-start;
 }
-.lane > article,
-#welcome > p {
-	font-size: var(--font-size-emphasis);
-	font-weight: 450;
-}
-#hosts tr {
+.lane > article {
 	/* Add shadows to create the "card" effect */
 	border-top: thin solid var(--shadow-cards);
 	border-left: thin solid var(--shadow-cards);
@@ -352,11 +275,10 @@ article > p,
       2px 4px 4px var(--shadow-cards);
 	transition: 0.3s;
 	flex: 1 0 100%;
-	overflow: auto;
+	overflow-x: scroll;
 	padding-bottom: 1rem;
 }
-.lane > article:hover,
-#hosts tr:hover {
+.lane > article:hover {
 	box-shadow: 
       4px 8px 8px var(--shadow-cards),
       8px 16px 16px var(--shadow-cards);
@@ -365,8 +287,7 @@ article > p,
 	margin-left: 1rem;
 	margin-right: 1rem;
 }
-.lane > article > header,
-.lane > article > h3:first-child {
+.lane > article > header {
 	background: var(--background-secondary);
 	padding: 1.5rem 1rem 1rem 1rem;
 	margin: 0;
@@ -374,38 +295,12 @@ article > p,
 	font-size: 1.45rem;
 	color: var(--background-primary);
 }
-.lane > article > header > .index-link {
-	float: right;
-}
-.lane.stack > article  {
-	border-radius: 0.5rem;
-	border: thin solid var(--background-secondary);
-	max-width: calc(100vw - 12px);
-}
-.lane.stack > article > header,
-.lane.stack > article > h3:first-child {
-	border-top-left-radius: 0.5rem;
-	border-top-right-radius: 0.5rem;
-}
-.lane > article > header a,
-.lane > article > h3:first-child a {
+.lane > article > header a {
 	color: var(--link-secondary);
 }
-.lane > article > header a:hover,
-.lane > article > h3:first-child:hover {
+.lane > article > header a:hover {
 	color: var(--link-secondary-hover);
 }
-.lane.stack> * > header * {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-.lane.stack > * > header p {
-	font-size: var(--default-header-4-font-size);
-	margin-left: 22px;
-}
-.lane.stack > article > footer {
-	margin-bottom: 1rem;
-}
 a.lane-button {
 	display: flex;
 	flex-direction: column;
@@ -421,7 +316,7 @@ a.lane-button {
 
 }
 a.lane-button p {
-	font-family: var(--lane-button-font-family);
+	font-family: 'PatrickHand', sans-serif;
 	text-transform: lowercase;
 	font-size: 1.4em;
 	mask-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.1)), url("../images/charcoal.png");
@@ -484,62 +379,30 @@ section:nth-of-type(even) .lane a:nth-of-type(4) {
 	text-transform: uppercase;
 }
 #tag_line {
-	line-height: 1.1;
+	line-height: 1;
 }
 #tag_line *,
 #title * {
 	margin: 0;
 	padding: 0;
-	flex: 1 1 auto;
-	background: none;
 }
-#title {
-	background-image:  url("/images/hpr-splatter-logo.svg");
-	background-repeat: no-repeat;
-	background-size: 15rem;
-	background-position: left 8.5em top -2em;
+#title h1 {
+	font-size: 7.5rem;
+	letter-spacing: -0.65rem;
+	line-height: 0.75;
 }
-#title a {
-	color: var(--link-title-color);
-}
-#title a:hover {
-	color: var(--link-primary-hover);
-}
-#title #site_acronym {
-	font-family: var(--logo-font-family);
-	font-size: var(--logo-font-size);
-	font-weight: var(--logo-font-weight); 
-	letter-spacing: var(--logo-letter-spacing);
-	line-height: var(--logo-line-height);
-	margin: var(--logo-margin);
-	color: transparent;
-}
-#title #site_acronym a {
-	text-decoration: none;
-	text-shadow: 0 1px var(--link-secondary);
-}
-#title #site_name {
-	font-size: var(--default-header-2-font-size);
-	font-weight: bold;
-}
-#tag_line {
-	text-align: center;
-}
-#tag_line #tag1,
-#tag_line #tag2 {
+#tag_line h2 {
 	text-transform: uppercase;
-	font-family: var(--tagline-font-family);
-	font-size: clamp(1.03rem, -0.25rem + 3vw, var(--default-header-4-font-size));
-	font-weight: var(--default-header-x-font-weight);
+	font-family: "BebasNeue", sans-serif;
+	font-size: 1.15rem;
 	letter-spacing: 0.05rem;
 }
-#tag_line #tag1 {
-	font-size: clamp(2.1rem, calc(100vw - 360px + 1rem), 2.3rem);;
+#tag_line h2:first-child {
+	font-size: 2rem;
 }
-#tag_line #tag3 {
-	text-align: center;
+#tag_line h3 {
 	text-transform: capitalize;
-	font-weight: var(--default-header-x-font-weight);
+	font-size: 1.15rem;
 }
 #site_url {
 	font-family: "GNUTypewriter", monospace;
@@ -561,281 +424,81 @@ fieldset > table td select {
 	display: block;
 	font-size: 1rem;
 }
+
 fieldset > table {
 	width: calc(100vw + -16vw + -1rem);
 	max-width: 100%;
 }
-input {
+
+fieldset > table td input,
+fieldset > table td textarea {
+	width: calc(100vw + -16vw + -1.5rem);
+	max-width: 100%;
 	border: thin solid var(--input-border-primary);
 	border-radius: 0.2rem;
 	margin-bottom: 0.5rem;
 	padding: 0.5rem;
 }
-input[type="submit"] {
-	background-color: var(--background-secondary);
-	color: var(--text-secondary);
-	font-weight: 400;
-	width: fit-content;
-}
-input[type="submit"]:hover {
-	background-color: var(--link-primary-hover);
-	color: var(--background-primary);
-}
-select {
-	appearance: auto;
+
+fieldset > table td select {
+	appearance: none;
 	background: var(--background-primary);
 	color: var(--text-primary);
+	width: calc(100vw + -16vw + -0.40rem);
 	border: 1px solid var(--input-border-primary);
 	border-radius: 0.25rem;
 	cursor: pointer;
 	margin-bottom: 0.5rem;
 	padding: 0.5rem;
 }
-select:focus{
+fieldset > table td select:focus{
     background: var(--background-secondary);
 	color: var(--text-secondary);
-}select:active {
+}
+fieldset > table td select:active {
     background: var(--background-secondary);
 	color: var(--text-primary);
 }
-fieldset > input,
-fieldset > table td input,
-fieldset > table td textarea {
-	width: calc(100vw + -16vw + -1.5rem);
-	max-width: 100%;
-}
-fieldset > table td select {
-	width: calc(100vw + -16vw + -0.40rem);
-}
 fieldset > table td input[type="radio"] {
 	display: initial;
 	width: initial;
 	margin-bottom: 0.5rem;
 }
-#youtube {
-	--video-ratio: calc(390 / 640);
-	width: min(calc(89vw + 0px), 640px);
-	height: min(calc(calc(89vw + 0px) * var(--video-ratio)), 390px);
-}
-#upload_method pre {
-	max-width: 80vw;
-	overflow-x: scroll;
-}
-#search form {
-	flex: 1 1 100%;
-}
-#search fieldset {
-	padding-top: 1rem;
-}
-#search fieldset > legend {
-	font-weight: var(--default-header-x-font-weight);
-}
-#search fieldset > input {
-	width: 94%;
-}
-#search fieldset > input[type="submit"] {
-	width: 100%;
-}
-#search fieldset > p {
-	margin-top: 0.5rem;
-	margin-bottom: 0.5rem;
+
+fieldset > input {
+	background: var(--background-secondary);
+	color: white;
+	font-weight: 600;
+	padding: 0.5rem;
+	border: thin solid var(--input-border-primary);
+	border-radius: 0.2rem;
 }
 .no-css {
-	display: none !important;
-}
-#tags .date {
-	margin:0;
-	font-size: 1rem;
-}
-#tags #tag_initial_letter_index {
-	columns: 3 auto;
-}
-#tags #tag_initial_letter_index  li {
-	font-weight: bold;
-	list-style: none;
-}
-#tags .tag-index {
-	columns: 3 calc(var(--for-tablet-landscape-up) /3 );
-	column-gap: 1rem;
-}
-#tags .index-link {
-	text-align: right;
-}
-#comments > article > .show-meta {
-	font-size: smaller;
-}
-#hosts tr {
-	gap: 0;
-	justify-content: flex-start;
-}
-#hosts td {
-	display: inline-block;
-}
-#hosts td:nth-child(-n+2) {
-	background: var(--background-secondary);
-	color: var(--background-primary);
-}
-#hosts td:nth-child(2) {
-    display: inline-flex;
-}
-#hosts td:nth-child(-n+2) a {
-	color: var(--link-secondary);
-	flex: 1;
-}
-#hosts td:nth-child(-n+2) a:hover {
-	color: var(--link-secondary-hover);
-}
-#hosts td:nth-child(-n+2) a strong {
-    display: inline-block;
-	line-height: 1.5rem;
-}
-#hosts td:nth-child(2) {
-	padding: 0.25rem 0 0 8px;
-	width: calc(100% - 90px);	
-}
-
-#hosts td:nth-last-child(-n+2) {
-	padding: 0.5rem 0 0 95px;
-}
-#hosts td:nth-last-child(2)::before {
-	content: ;
-	content: "License: ";
-}
-#hosts td:nth-last-child(1)::before {
-	content: "Last Show: ";
-}
-#hosts td > img {
-	border-radius: 0.25rem;
-}
-#host {
-	justify-content: center;
-	align-items: center;
-	gap: 0.5rem;
-}
-#host_id {
-	text-align: center;
-}
-#host_id > h2 {
-	margin-top: 0;
-}
-#host_id img {
-	border-radius: 0.25rem;
-}
-#host_meta {
-	flex: 1;
-	padding: 0 0 0.75rem 0;
-}
-#host_meta > div,
-#host_meta > p {
-	margin: 0.25rem 0;
-	line-height: var(--primary-content-line-height);
-}
-#host_meta > div > p {
-	display: inline-block;
-	margin: 0;
-	padding: 0;
-}
-.series-description {
-	margin: 0;
-	padding: 0;
-	font-style: italic;
-}
-.sr-only {
-	position: absolute;
-	width: 1px;
-	height: 1px;
-	padding: 0;
-	margin: -1px;
-	overflow: hidden;
-	clip: rect(0, 0, 0, 0);
-	border: 0;
-}
-#show_notes {
-	max-width: 98vw;
-}
-#show_notes pre
-{
-    overflow: auto;
-}
-#show_notes code {
-	display: inline-block;
-    background-color: var(--show-notes-pre-background);
-    border: 1px solid #ddd;
-	padding: 0.1em 0;
-}
-nav.episodes {
-	color: var(--background-primary);
-	font-size: 0.9em;
-	display: flex;
-	flex-direction: row;
-	justify-content: space-around;
-	max-width: 100vw;
-}
-nav.episodes span {
-	color: var(--text-primary);
-	display: inline-block;
-	text-align: center;
-	border: solid thin var(--text-primary);
-}
-nav.episodes span:nth-child(-n+2),
-nav.episodes span:nth-child(-n+2) a {
-	border-top-left-radius: 2rem;
-	border-bottom-left-radius: 2rem;
-}
-nav.episodes span:nth-child(n+3),
-nav.episodes span:nth-child(n+3) a {
-	border-top-right-radius: 2rem;
-	border-bottom-right-radius: 2rem;
-}
-nav.episodes span.no-link, 
-nav.episodes span a {
-	padding: 0.3em var(--episode-nav-padding) 0.1em var(--episode-nav-padding);
-	display: inline-block;
-	min-width: 4.4em;
-	min-height: 1.5em;
-}
-nav.episodes span a:hover {
-	background-color: var(--link-primary-hover);
-	color: var(--link-secondary-hover);
-}
-nav.episodes svg {
-	margin: 0 0.2rem;
-	height: 0.85em;
-	max-width: 13px;
-	vertical-align: middle;
-}
-nav.episodes span a svg #arrow,
-nav.episodes span a svg #bar {
-	stroke: var(--link-primary);
-	fill: var(--link-primary);
-}
-nav.episodes span a:hover svg #arrow,
-nav.episodes span a:hover svg #bar {
-	stroke: var(--link-secondary-hover);
-	fill: var(--link-secondary-hover);
+	display: none;
 }
 @media (min-width: 600px) {
-	body > header .bounding-box {
+	body > header {
+		background-size: 200pt, cover;
+		background-position: left 128pt top -12pt, left top;
 		justify-content: space-between;
 	}
 	#tag_line {
-		line-height: 1;
+		text-align: center;
 	}
-	#title #tag1 {
+	#title h1 {
 		font-size: 7.5rem;
 		letter-spacing: -0.65rem;
 		line-height: 0.75;
 	}
-	#tag_line #tag2 {
+	#tag_line h2 {
 		font-size: 1.82rem;
 		letter-spacing: 0.05rem;
 	}
-	#tag_line #tag1 {
+	#tag_line h2:first-child {
 		font-size: 4rem;
 	}
-	#tag_line #tag3 {
+	#tag_line h3 {
 		font-size: 1.85rem;
-		letter-spacing: 0.05rem;
 		margin-left: 5rem;
 	}
 	#qr_code {
@@ -886,96 +549,23 @@ nav.episodes span a:hover svg #bar {
 		margin-bottom: 1.0rem;
 		width: 100%;
 	}
-	#search fieldset > input {
-		width: 55%;
-	}
-	#search fieldset > input[type="submit"] {
-		width: 40%;
-	}
 	body > main {
 		padding: 0.25rem 2rem;
 	}
+	.lane > article {
+		max-height: 40vw;
+		overflow-y: scroll
+	}
 	#latest_lane.lane section > ul {
 		margin: 0.5rem 3rem 0 1rem;	
 	}
-	#hosts tbody.lane.stack {
-		flex-direction: row;
-		justify-content: space-between;
-		gap: 1rem
-	}
-	#hosts tr {
-		flex: 1 1 45%;
-		max-width: 45%;
-	}
-	#host {
-		gap: 2rem;
-	}
-	nav.episodes {
-		display: inline-block;
-	}
 }
 @media (min-width: 900px) {
-	#podcast_lane > .lane,
-	#project_lane > .lane {
-		justify-content: flex-start;
-		gap: 2rem;
+	.lane > article {
+		flex-basis: 32%;
+		max-width: 32%;
 	}
 	#latest_lane.lane section {
 		flex: 1;
 	}
-	#hosts tr {
-		flex: 1 1 30%;
-		max-width: 30%;
-	}
-}
-@media (prefers-color-scheme: dark) {
-	:root {
-		--link-primary: #bbdfe7;
-		--link-header-hover: #b54c08; /* original --link-primary-hover */;
-		--link-primary-hover: var(--link-secondary-hover);
-		--background-primary: #4d4d4d; /* HPR Grey */
-		--text-primary: #dfdfdf /*#fffff7#fafafa#fbfbee #dfdfdf */;
-		--banner-text-primary: #b6b6b6; 
-		--shadow-secondary-color: hsl(0, 0%, 40%);
-		--input-border-primary: var(--shadow-secondary-color);
-		--lane-button-color: #d5e6ea;	
-		--show-notes-pre-background: #b54c08;
-	}
-	body > header {
-		background-image: url("/images/main-header-background-dark.png");
-		background-color: #22545a;
-	}	
-	img {
-		filter: brightness(0.70);
-	}
-	a.lane-button {
-		background-image: url("/images/lane-button-background-dark.png");
-		color: var(--lane-button-color);
-	}
-	a.lane-button img {
-		filter: none;
-	}
-	.lane > article > header {
-		color: var(--text-secondary);
-	}
-	#title a:hover {
-		color: var(--link-header-hover);
-	}
-	#hosts td:nth-child(-n+2) {
-		color: var(--text-primary);
-	}
-	nav.episodes span a:hover {
-		background-color: var(--link-primary-hover);
-		color: var(--link-navigation-hover);
-	}
-	nav.episodes span svg #arrow,
-	nav.episodes span svg #bar {
-		stroke: var(--text-primary);
-		fill: var(--text-primary);
-	}
-	nav.episodes span a:hover svg #arrow,
-	nav.episodes span a:hover svg #bar {
-		stroke: var(--link-navigation-hover);
-		fill: var(--link-navigation-hover);
-	}
-}
+}

public_html/images/icons/arrow-first.svg

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   viewBox="0 0 12 12"
-   version="1.1"
-   id="arrow_first"
-   width="12"
-   height="12"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-    <path
-     id="arrow"
-     style="stroke-width:0.584448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-     d="M 9.9303359,11.572157 11.530286,10.119277 7.0035163,5.9964088 11.484768,1.9181465 9.8743209,0.45252151 3.7931149,5.986851 Z" />
-  <rect
-     style="stroke-width:0.524;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;marker-start:url(#Arrow1Lstart);paint-order:normal"
-     id="bar"
-     width="2.2"
-     height="11.263"
-     x="0.5"
-     y="0.36860976"
-     rx="0"
-     ry="0.0015425405" />
-</svg>

public_html/images/icons/arrow-last.svg

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   viewBox="0 0 12 12"
-   version="1.1"
-   id="arrow_last"
-   width="12"
-   height="12"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <path
-     id="arrow"
-     style="stroke-width:0.584448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-     d="M 2.0731448,11.604466 0.47319466,10.151586 4.9999643,6.0287178 0.51871266,1.9504555 2.1291598,0.48483049 8.2103658,6.01916 Z" />
-  <rect
-     style="stroke-width:0.524;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;marker-start:url(#Arrow1Lstart);paint-order:normal"
-     id="bar"
-     width="2.2"
-     height="11.263"
-     x="-11.503481"
-     y="0.40091875"
-     rx="0"
-     ry="0.0015425405"
-     transform="scale(-1,1)" />
-</svg>

public_html/images/icons/arrow-next.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   viewBox="0 0 12 12"
-   version="1.1"
-   id="arrow_next"
-   width="12"
-   height="12"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <path
-     id="arrow"
-     style="stroke-width:0.584448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-     d="M 2.0731448,11.604466 0.47319466,10.151586 4.9999643,6.0287178 0.51871266,1.9504555 2.1291598,0.48483049 8.2103658,6.01916 Z" />
-</svg>

public_html/images/icons/arrow-previous.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   viewBox="0 0 12 12"
-   version="1.1"
-   id="arrow_previous"
-   width="12"
-   height="12"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <path
-     id="arrow"
-     style="stroke-width:0.584448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-     d="M 9.9303359,11.572157 11.530286,10.119277 7.0035163,5.9964088 11.484768,1.9181465 9.8743209,0.45252151 3.7931149,5.986851 Z" />
-</svg>

site.cfg

@@ -10,7 +10,7 @@ driver: dbi:SQLite:hpr.db
 
 # Configure the location of the templates and the generated HTML
 [app_paths]
-templates_path: ./templates:./public_html/images/icons
+templates_path: ./templates
 output_path: ./public_html
 
 # Configure the root template page which pulls in the navigation and 
@@ -108,9 +108,9 @@ content: content-sitemap.tpl.html
 navigation: navigation-main.tpl.html
 content: content-tags.tpl.html
 
-[twt_episode]
+[twat_episode]
 navigation: navigation-get-shows.tpl.html
-content: content-twt_episode.tpl.html
+content: content-twat_episode.tpl.html
 multipage: true
 filename: eps/twt[id]/index.html
 

templates/content-correspondent.tpl.html

@@ -3,47 +3,68 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS "queries-correspondent.tpl.html" %-->
 <!--% USE DBI(constants.driver) %-->
-<!--% results_hpr_shows = DBI.prepare(query_hpr_shows) %-->
-	<!--% results_hpr_show_count = DBI.prepare(query_hpr_show_count) %-->
-	<!--% hpr_result_status = results_hpr_show_count.execute(id); %-->
-	<!--% hpr_shows = results_hpr_shows.execute(id); %-->
-	<!--% hpr_show_count = results_hpr_show_count.fetchrow_array %-->
+<!--% results_hpr_shows = DBI.prepare(query_hpr_shows)
+%-->
+<!--% results_hpr_show_count = DBI.prepare(query_hpr_show_count) %-->
+<!--% hpr_shows_to_count = results_hpr_show_count.execute(id); %-->
+<!--% hpr_shows = results_hpr_shows.execute(id); %-->
+<!--% hpr_show_count = 0 %-->
+<!--% FOREACH show IN hpr_shows_to_count %-->
+<!--% hpr_show_count = hpr_show_count +1; %-->
+<!--% END %-->
 
-	<!--% results_hpr_shows = DBI.prepare(query_twt_shows) %-->
-	<!--% results_twt_show_count = DBI.prepare(query_twt_show_count) %-->
-	<!--% twt_result_status = results_twt_show_count.execute(id); %-->
-	<!--% twt_shows = results_hpr_shows.execute(id); %-->
-	<!--% twt_show_count = results_twt_show_count.fetchrow_array %-->
+<!--% query_twat_show_count = DBI.prepare('
+		SELECT id
+		FROM twat_eps AS eps
+		WHERE eps.hostid = ?
+		')
+%-->
+<!--% query_twat_shows = DBI.prepare('
+		SELECT
+		eps.id,
+		CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
+		eps.date, eps.license, eps.duration,
+		eps.title, eps.summary, eps.tags,
+		eps.notes,
+		hosts.local_image,
+		hosts.hostid,
+		hosts.host, hosts.email, hosts.profile,
+		miniseries.name AS series, miniseries.id AS seriesid
+	FROM twat_eps AS eps
+	INNER JOIN hosts ON eps.hostid = hosts.hostid
+	INNER JOIN miniseries ON eps.series = miniseries.id
+	WHERE hosts.hostid = ?
+	ORDER BY eps.id DESC
+	')
+%-->
+<!--% twat_shows_to_count = query_twat_show_count.execute(id); %-->
+<!--% twat_shows = query_twat_shows.execute(id); %-->
+<!--% twat_show_count = 0 %-->
+<!--% FOREACH show IN twat_shows_to_count %-->
+<!--% twat_show_count = twat_show_count +1; %-->
+<!--% END %-->
 
-			<!--% hosts = DBI.tie('hosts', 'hostid') %-->
+<!--% hosts = DBI.tie('hosts', 'hostid') %-->
 
-			<!--% this_host = hosts.$id %-->
-			<h2 class="title">Correspondent</h2>
-			<div id="host" class="lane">
-				<div id="host_id">
-					<h2><!--% this_host.host %--></h2>
-					<p><!--% get_avatar(this_host.hostid, this_host.host) %--><br>
-					<label>Host ID</label>: <!--% this_host.hostid %--></p>
-				</div>
-				<div id="host_meta">
-					<p><label>email:</label> <u><!--% this_host.email %--></u></p>
-					<div><label>profile:</label> <!--% this_host.profile %--></div>
-					<p><label>episodes:</label> <strong><!--% hpr_show_count + twt_show_count %--></strong></p>
-				</div>
-			</div>
-			<div class="lane stack">
-				<!--% FOREACH hpr_show IN hpr_shows; %-->
-				<article>
-					<!--% show_summary(hpr_show, 'hide_host') %-->
-					<p class="listen-in"><!--% display_listen_in(hpr_show.id) %--></p>
-				</article>
-				<!--% END %-->
-				<!--% FOREACH twt_show IN twt_shows; %-->
-				<article>
+	<article>
+		<!--% this_host = hosts.$id %-->
+		<h2 class="title">Correspondent</h2>
+		<h2><!--% this_host.host %--></h2>
+		<p><!--% get_avatar(this_host.hostid, this_host.host) %--><br>
+		<label>Host ID</label>: <!--% this_host.hostid %--><br><br>
+		<label>email:</label> <u><!--% this_host.email %--></u><br>
+		<label>profile:</label> <!--% this_host.profile %--><br><br>
+		<label>episodes:</label> <strong><!--% hpr_show_count + twat_show_count %--></strong>
+		</p>
+	<!--% FOREACH hpr_show IN hpr_shows; %-->
 
-					<!--% twt_show_summary(twt_show, 'hide_host') %-->
-					<p class="listen-in"><!--% display_listen_in(twt_show.id,"twt") %--></p>
-				</article>
-				<!--% END %-->
-			</div>
-			<p><a href="<!--% absolute_url(baseurl) %-->../about.html#so_you_want_to_record_a_podcast">Become a Correspondent</a></p>
+	<!--% show_summary(hpr_show, 'hide_host') %-->
+    <p class="listen-in"><!--% display_listen_in(hpr_show.id) %--></p>
+	<!--% END %-->
+	<!--% FOREACH twat_show IN twat_shows; %-->
+
+		<!--% twat_show_summary(twat_show, 'hide_host') %-->
+		<p class="listen-in"><!--% display_listen_in(twat_show.id,"twat") %--></p>
+    <!--% END %-->
+	</article>
+	<p><a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">Become a Correspondent</a></p>

templates/content-correspondents.tpl.html

@@ -1,7 +1,7 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS 'shared-avatar.tpl.html' %-->
 	<h2 class="title">Correspondents</h2>
-	<p>For more information on how to become a Correspondent see our <a href="<!--% absolute_url(baseurl) %-->../about.html#so_you_want_to_record_a_podcast">contribute</a></center> page. To add a logo here, either email one to admin at hpr or setup your email on <a href="https://en.gravatar.com/">Gravatar</a>. To protect your browsing privacy we gather the images every hour and serve them directly from HPR.<p />
+	<p>For more information on how to become a Correspondent see our <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">contribute</a></center> page. To add a logo here, either email one to admin at hpr or setup your email on <a href="https://en.gravatar.com/">Gravatar</a>. To protect your browsing privacy we gather the images every hour and serve them directly from HPR.<p />
 <!--% USE DBI(constants.driver) %-->
 <!--% host_cnt = 0 %-->
 	<table id="hosts" class="hosts lane stack">
@@ -23,12 +23,13 @@
 	<tr class="lane">
 	<td><!--% get_avatar(host.hostid, host.host, host_cnt > 8) %--></td>
 
-		<td><a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(host.hostid) %-->.html"><strong><!--% host.host %--></strong><br>
-			Host ID: <!--% host.hostid %--></a></td>
+		<td><strong><!--% host.host %--></strong><br>
+
+			Host ID: <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(host.hostid) %-->.html"><!--% host.hostid %--></a></td>
 		<td><!--% host.license %--></td>
 		<td><!--% host.date %--></td>
 	</tr><!--% host_cnt = host_cnt + 1 %-->
 	<!--% END %-->
 	</tbody>
 	</table>
-	<p><a href="<!--% absolute_url(baseurl) %-->../about.html#so_you_want_to_record_a_podcast">Become a Correspondent</a></p>
+	<p><a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">Become a Correspondent</a></p>

templates/content-episode.tpl.html

@@ -26,7 +26,7 @@ Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pa
 <h3><!--% show_series(episode.series, episode.seriesid, "Part of the series") %--></h3> 
 <p><em><!--% episode.series_description %--></em></p>
 	</header>
-	<div id="show_notes"><!--% episode.notes %--></div>
+	<div><!--% episode.notes %--></div>
 <footer>
 <p>
 <!--% episode_navigation %-->

templates/content-episodes.tpl.html

@@ -4,7 +4,7 @@
         <p>
         All this information is available to the public. Scrape if you wish but if we can format the data for you then we're happy to help.
         </p>
-<div class="lane stack">
+<div class="lane">
 <!--% USE DBI(constants.driver) %-->
 <!--% FOREACH episodes IN DBI.query(query_episodes) 
 %-->
@@ -19,8 +19,8 @@
 		<!-- Creative Commons License -->
 		<a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="https://creativecommons.org/images/public/somerights20.png" width="88" height="31" /></a><br>The following work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/2.5/">Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License</a>.</p>
 	<p>Today With a Techie Radio was brought to you by <a href="https://en.wikipedia.org/wiki/Infonomicon">The Infonomicon Computer Club</a></p>
-	<div class="lane stack">
-	<!--% FOREACH twt_episode IN DBI.query('
+	<div class="lane">
+	<!--% FOREACH twat_episode IN DBI.query('
 	SELECT 
         eps.id, 
         eps.explicit, 
@@ -36,9 +36,8 @@
 	') 
 %-->
 	<article>
-	<!--% twt_show_summary(twt_episode) %-->
+	<!--% twat_show_summary(twat_episode) %-->
  </article>
 <!--% END %-->
-	</div>
 
 

templates/content-index.tpl.html

@@ -36,6 +36,7 @@
 
 	<!--% delta = date.calc.N_Delta_YMD(2005,9,19, date.format(date.now, '%Y'),date.format(date.now, '%m'),date.format(date.now, '%d')) %-->
 	<section id="welcome">
+		<header><h2>Welcome</h2></header>
 		<p>Hacker Public Radio is a technology focused podcast that releases shows every weekday Monday to Friday. Our shows are produced by listeners like you and can be on any topic that is of interest to hackers, makers, hobbyists, etc. We are a welcoming community that offers positive feedback and encourages respectful debate.</p>
 		<div id="call_for_shows">
 			<!--% display_call_for_shows() %-->
@@ -49,7 +50,7 @@
 			<p>Record</p>
 	  </a>
 	  <br class="no-css">
-	  <a class="lane-button" href="<!--% hub_baseurl %-->calendar.php">
+<a class="lane-button" href="https://hub.hackerpublicradio.org/calendar.php">
 			<img src="<!--% absolute_path(baseurl) %-->images/icons/calendar-2-line.svg" alt="" height="110">
 			<p>Schedule</p>
 	  </a>
@@ -70,7 +71,7 @@
 	  <div class="lane">
 	  <a class="lane-button" href="<!--% absolute_path(baseurl) %-->correspondents/index.html">
 			<img src="<!--% absolute_path(baseurl) %-->images/icons/user-fill.svg" alt="" height="110">
-			<p>Hosts</p>
+			<p>Host</p>
 	  </a>
 	  <br class="no-css">
 	  <a class="lane-button" href="<!--% absolute_path(baseurl) %-->series/index.html">
@@ -97,7 +98,7 @@
 	<dl>
 <!--% FOREACH latest_episodes IN DBI.query(query_latest_episodes)
 %-->
-<dt><a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html">hpr<!--% latest_episodes.id %--> (<!--% latest_episodes.date %-->) :: <!--% latest_episodes.title %--></a> by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->.html"><!--% latest_episodes.host %--></a></dt>
+<dt><a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html">hpr<!--% latest_episodes.id %--> (<!--% latest_episodes.date %-->) :: <!--% latest_episodes.title %--></a> by <!--% latest_episodes.host %--></dt>
 		<dd>
 		<!--% latest_episodes.summary %-->
         </dd>

templates/content-search.tpl.html

@@ -3,6 +3,16 @@
 		<h1>Search HPR.</h1>
 	</header>
 	<div class="lane">
+		<form name="google-search" method="get" action="https://www.google.com/search">
+			<fieldset><legend>Google</legend>
+				<input type="hidden" name="sitesearch" value="https://www.hackerpublicradio.org/" />
+				<input name="q" type="text" placeholder="Search HPR with Google"/>
+				<input type="submit" name="sa" value="Search HPR with Google" />
+				<p>
+				<a href="https://www.google.com/policies/privacy/">privacy policy</a>
+				</p>
+			</fieldset>
+		</form>
 		<form method="get" id="search" action="https://duckduckgo.com/">
 			<fieldset><legend>DuckDuckGo</legend>
 			<input type="hidden" name="sites" value="https://www.hackerpublicradio.org/"/>
@@ -16,16 +26,6 @@
 			</p>
 			</fieldset>
 		</form>
-		<form name="google-search" method="get" action="https://www.google.com/search">
-			<fieldset><legend>Google</legend>
-				<input type="hidden" name="sitesearch" value="https://www.hackerpublicradio.org/" />
-				<input name="q" type="text" placeholder="Search HPR with Google"/>
-				<input type="submit" name="sa" value="Search HPR with Google" />
-				<p>
-				<a href="https://www.google.com/policies/privacy/">privacy policy</a>
-				</p>
-			</fieldset>
-		</form>
 		<form method="get" action="https://www.bing.com/search">
 			<fieldset><legend>Bing</legend>
 				<input type="hidden" name="cp" value="utf-8" />

templates/content-syndication.tpl.html

@@ -78,7 +78,7 @@
 <div>
 <hr class="no-css">
 <h1>Other Download Options</h1>
-<div class="lane stack">
+<div class="lane syndication">
 <article>
   <header>
     <h2>Site Replication Sources</h2>

templates/content-twat_episode.tpl.html

@@ -55,8 +55,8 @@
 <p><!--% show_avatar(episode.hostid, episode.host) %-->
 Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% day_and_date(episode.date) %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
 <!--% display_tags(episode.tags) %--> <br>
-<!--% listen_now(episode, "twt", baseurl, media_baseurl) %-->
-<!--% display_listen_in(episode.id, "twt") %-->  
+<!--% listen_now(episode, "twat", baseurl, media_baseurl) %-->
+<!--% display_listen_in(episode.id, "twat") %-->  
 </p>
 <h3><!--% show_series(episode.series, episode.seriesid, "Part of the series") %--></h3> 
 <p><em><!--% episode.series_description %--></em></p>

templates/page.tpl.html

@@ -12,7 +12,7 @@
   <meta http-equiv="last-modified" content="<!--% format_feed_date(date.now) %-->">
   <meta name="keywords" content="Technology, Tech News, Education, Training" />
   <meta name="description" content="Hacker Public Radio is a podcast that releases shows every weekday Monday through Friday. Our shows are produced by the community (you) and can be on any topic that is of interest to hackers and hobbyists." />
-  <link rel="shortcut icon" href="/hpr.ico" >
+  <link rel="shortcut icon" href="<!--% absolute_url(baseurl) %-->hpr.ico" >
   <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Opus RSS" href="<!--% absolute_path(baseurl) %-->hpr_opus_rss.php" />
   <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Ogg Vorbis RSS" href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php" />
   <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio MP3 RSS" href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php" />

templates/queries-correspondent.tpl.html

@@ -1,12 +1,5 @@
-<!--% query_hpr_shows = 'WITH
-	comment_tallies AS (	
-		SELECT 
-			eps_id,
-			COUNT(eps_id) AS eps_tally
-		FROM comments
-		GROUP BY eps_id 
-	)
-	SELECT
+<!--% query_hpr_shows = '
+		SELECT
 		eps.id,
 		eps.explicit,
 		eps.date, eps.license, eps.duration,
@@ -15,44 +8,17 @@
 		hosts.local_image,
 		hosts.hostid,
 		hosts.host, hosts.email, hosts.profile,
-		miniseries.name AS series, miniseries.id AS seriesid,
-		COALESCE(comment_tallies.eps_tally,0) AS commentsTally
+		miniseries.name AS series, miniseries.id AS seriesid
 	FROM eps
 	INNER JOIN hosts ON eps.hostid = hosts.hostid
 	INNER JOIN miniseries ON eps.series = miniseries.id
-	LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
 	WHERE hosts.hostid = ? AND eps.date < date(\'now\', \'+1 days\')
 	ORDER BY eps.id + 0 DESC
 	'
 %-->
 <!--% query_hpr_show_count = '
-	SELECT COUNT(id) as Tally
+	SELECT id
 	FROM eps
 	WHERE eps.hostid = ? AND eps.date < date(\'now\', \'+1 days\')
 	'
 %-->
-<!--% query_twt_show_count = '
-		SELECT COUNT(id) as Tally
-		FROM twat_eps AS eps
-		WHERE eps.hostid = ?
-		'
-%-->
-<!--% query_twt_shows = '
-		SELECT
-			eps.id,
-			CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
-			eps.date, eps.license, eps.duration,
-			eps.title, eps.summary, eps.tags,
-			eps.notes,
-			hosts.local_image,
-			hosts.hostid,
-			hosts.host, hosts.email, hosts.profile,
-			miniseries.name AS series, miniseries.id AS seriesid
-		FROM twat_eps AS eps
-		INNER JOIN hosts ON eps.hostid = hosts.hostid
-		INNER JOIN miniseries ON eps.series = miniseries.id
-		WHERE hosts.hostid = ?
-		ORDER BY eps.id DESC
-		'
-%-->
-

templates/queries-episodes.tpl.html

@@ -1,24 +1,14 @@
-<!--% query_episodes = 'WITH
-	comment_tallies AS (	
-		SELECT 
-			eps_id,
-			COUNT(eps_id) AS eps_tally
-		FROM comments
-		GROUP BY eps_id 
-	)
-	SELECT
+<!--% query_episodes = 'SELECT
         eps.id,
         eps.explicit,
         eps.date, eps.license, eps.title, eps.summary,
         eps.duration, eps.notes, eps.tags,
         hosts.hostid,
         hosts.host, hosts.email, hosts.local_image,
-        miniseries.name AS series, miniseries.id AS seriesid,
-		COALESCE(comment_tallies.eps_tally,0) AS commentsTally
+        miniseries.name AS series, miniseries.id AS seriesid
     FROM eps
         INNER JOIN hosts ON eps.hostid = hosts.hostid
         INNER JOIN miniseries ON eps.series = miniseries.id
-		LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
         WHERE eps.date <= date(\'now\')
         ORDER BY eps.id + 0 DESC'
 %-->

templates/queries-series_episodes.tpl.html

@@ -14,24 +14,14 @@
 		 WHERE miniseries.id = ?
 		 ORDER BY name'
 %-->
-<!--% query_shows_sql = 'WITH
-	comment_tallies AS (	
-		SELECT 
-			eps_id,
-			COUNT(eps_id) AS eps_tally
-		FROM comments
-		GROUP BY eps_id 
-	)
-	SELECT
+<!--% query_shows_sql = 'SELECT
 	id, date, title,
 	duration, summary, notes,
 	explicit, eps.license, tags,
-	hosts.host, hosts.hostid,
-	COALESCE(comment_tallies.eps_tally,0) AS commentsTally
+	hosts.host, hosts.hostid
 	FROM eps
 	INNER JOIN hosts
 	ON eps.hostid = hosts.hostid
-	LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
 	WHERE series = ? AND eps.date < date(\'now\', \'+1 days\')
 	ORDER BY eps.id DESC
 	'

templates/rss-comments.tpl.xml

@@ -50,11 +50,11 @@
   %-->
 
   <item>
-    <title><!--% item.comment_author_name | html_strip  %--> says: <!--% item.comment_title | html_strip  %--></title>
-    <author>feedback.nospam@nospam.hackerpublicradio.org (<!--% item.comment_author_name | html_strip  %-->)</author>
+    <title><!--% item.comment_author_name | html_strip | xml_entity %--> says: <!--% item.comment_title | html_strip | xml_entity %--></title>
+    <author>feedback.nospam@nospam.hackerpublicradio.org (<!--% item.comment_author_name | html_strip | xml_entity %-->)</author>
     <link><!--% absolute_url(http_baseurl) %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html#comments</link>
     <description><![CDATA[<strong>
-    RE: hpr<!--% zero_pad_left(item.eps_id) %-->::<!--% item.episode_date %--> <em><!--% item.episode_title | html_strip  %--></em> by <a href="<!--% absolute_url(http_baseurl) %-->correspondents/<!--% zero_pad_left(item.host_id) %-->.html"><!--% item.host %--></a></strong><!--% rss_show_series(item.series_name, item.series_id) | html_strip  %--><br />
+    RE: hpr<!--% zero_pad_left(item.eps_id) %-->::<!--% item.episode_date %--> <em><!--% item.episode_title | html_strip | xml_entity %--></em> by <a href="<!--% absolute_url(http_baseurl) %-->correspondents/<!--% zero_pad_left(item.host_id) %-->.html"><!--% item.host %--></a></strong><!--% rss_show_series(item.series_name, item.series_id) | html_strip | xml_entity %--><br />
 <!--% display_episode_duration(item.episode_duration) %--><!--% display_listen_in(item.eps_id) %--><br /><!--% item.comment_text FILTER html_line_break %-->
 ]]></description>
     <pubDate><!--% format_feed_date(item.comment_timestamp) %--></pubDate>

templates/shared-episode-summary.tpl.html

@@ -41,7 +41,7 @@ or
 	<span><label>Flag:</label> <!--% display_explicit(show.explicit) %-->.</span> 
 	<span><!--% show_series(show.series, show.seriesid) %--></span>  <br>
 	<!--% IF hide_tags == "" %--><!--% display_tags(show.tags) %--><!--% END %-->
-	<!--% IF show.commentsTally || show.commentsTally == 0 %-->
+	<!--% IF show.comentsTally || show.commentsTally == 0 %-->
 	<span><label>Comments:</label> <!--% display_comments_tally(show.id, show.commentsTally) %--></span>
 	<!--% END %-->
 <!--% END %-->
@@ -56,7 +56,7 @@ or
 	<p class="summary"><!--% show.summary %--></p>
 <!--% END %-->
 
-<!--% MACRO twt_show_summary(show, hide_host) BLOCK %-->
+<!--% MACRO twat_show_summary(show, hide_host) BLOCK %-->
 
 	<h3 class="title"><a href="<!--% absolute_path(baseurl) %-->eps/twt<!--% zero_pad_left(show.id) %-->/index.html">Today with a Techie Ep.<!--% show.id %--> :: <!--% show.title %--></a> <!--% IF hide_host == "" %--> 
 		hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(show.hostid) %-->.html"><!--% show.host %--></a>

templates/shared-utils.tpl.html

@@ -93,7 +93,7 @@
 <!--% END %-->
 
 <!--% MACRO media_path(episode_id, episode_type, media_type, baseurl, media_baseurl) BLOCK %-->
-        <!--% IF episode_type == "twt" %-->
+        <!--% IF episode_type == "twat" %-->
                 <!--% episode_type = "twt" %-->
                 <!--% padding = 3 %-->
                 <!--% media_folder = "eps/"; padding = 3 %-->
@@ -117,20 +117,16 @@
 <!--% IF folder %-->
 <!--% folder = folder %--><!--% ELSE %--><!--% folder = "hpr" %-->
 <!--% END %-->
-<!--% arrow_first = "arrow-first.svg" %--> 
-<!--% arrow_prev = "arrow-previous.svg" %--> 
-<!--% arrow_next = "arrow-next.svg" %--> 
-<!--% arrow_last = "arrow-last.svg" %--> 
-<nav class="episodes" aria-description="Navigation to other episodes"><span><a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.earliest) %-->/index.html" rel="first" aria-label="first episode"><!--% INSERT $arrow_first %--><span class="no-css">&lt;&lt; </span>First</a></span>,
+<small><a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.earliest) %-->/index.html" rel="first">&lt;&lt; First</a>,
     <!--% IF links.previous %-->
-    <span><a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.previous) %-->/index.html" rel="previous" aria-label="previous episode"><!--% INSERT $arrow_prev %--><span class="no-css">&lt; </span>Previous</a></span>,
+    <a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.previous) %-->/index.html" rel="previous">&lt; Previous</a>,
     <!--% ELSE %-->
-    <span class="no-link"><!--% INSERT $arrow_prev %--><span class="no-css">&lt; </span>Previous</span>,
+    <span>&lt;</span> Previous,
     <!--% END %-->
     <!--% IF links.next %-->
-	<span><a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.next) %-->/index.html" rel="next" aria-label="next episode">Next<span class="no-css"> &gt;</span><!--% INSERT $arrow_next %--></a></span>, 
+    <a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.next) %-->/index.html" rel="next">Next &gt;</a>,
     <!--% ELSE %-->
-	<span class="no-link">Next<span class="no-css"> &gt;</span><!--% INSERT $arrow_next %--></span>, 
+    Next <span>&gt;</span>
     <!--% END %-->
-	<span><a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.latest) %-->/index.html" rel="last" aria-label="latest episode">Latest<span class="no-css"> &gt;&gt;</span><!--% INSERT $arrow_last %--></a></span></nav>
+    <a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.latest) %-->/index.html" rel="last">Latest &gt;&gt;</a></small>
 <!--% END %-->