swanky changes

src/templates/src/about.html

@@ -16,7 +16,7 @@
 			The Handmade Network's activities are funded by the <a href="{{ .FoundationUrl }}">Handmade Software Foundation</a>, a (soon-to-be) 501(c)(3) nonprofit corporation.
 		</p> -->
 		<p>
-			We can teach programmers how things actually work. We can teach users to expect better. We can build the best software you've ever seen. <b>Join us.</b>
+			We can teach programmers how things actually work. We can teach users to expect better. We can build the best software you've ever seen. <a href="{{ .RolesUrl }}"><b>Join us.</b></a>
 		</p>
 	</div>
 

src/templates/src/contact.html

@@ -3,14 +3,12 @@
 {{ define "content" }}
 <div class="content-block">
 	<div class="description mw7 ph3 ph0-ns">
-		<p>If you are experiencing technical issues with the site, please send a detailed email to <a href="mailto:team@handmade.network">team@handmade.network</a> with a description of the problem, and we'll do our best to address it in a timely manner.</p>
+		<p>
-		<p>For administrative issues, such as moderation disputes or content revisions, contact any of the staff by email:</p>
+			If you are experiencing technical issues with the site, please send a detailed email to <a href="mailto:team@handmade.network">team@handmade.network</a> with a description of the problem, and we'll do our best to address it in a timely manner.
-		<ul>
+		</p>
-			<li><a href="mailto:team@handmade.network">team@handmade.network</a></li>
+		<p>
-			<li><a href="mailto:ryan@handmade.network">ryan@handmade.network</a></li>
+			For administrative issues, such as moderation disputes or content revisions, contact any of the staff on Discord, or by email at <a href="mailto:team@handmade.network">team@handmade.network</a>.
-			<li><a href="mailto:ben@handmade.network">ben@handmade.network</a></li>
+		</p>
-			<li><a href="mailto:asaf@handmade.network">asaf@handmade.network</a></li>
-		</ul>
 	</div>
 </div>
 {{ end }}

src/templates/src/include/footer.html

@@ -7,14 +7,14 @@
         <li class="{{ $footerClasses }}">
             <a href="{{ .Footer.HomepageUrl }}">Main Page</a>
         </li>
-        <li class="{{ $footerClasses }}">
-            <a href="{{ .Footer.AboutUrl }}">About</a>
-        </li>
         <li class="{{ $footerClasses }}">
             <a href="{{ .Footer.ManifestoUrl }}">Manifesto</a>
         </li>
         <li class="{{ $footerClasses }}">
-            <a href="{{ .Footer.ForumsUrl }}">Forums</a>
+            <a href="{{ .Footer.AboutUrl }}">About</a>
+        </li>
+        <li class="{{ $footerClasses }}">
+            <a href="{{ .Footer.RolesUrl }}">Roles</a>
         </li>
         <li class="{{ $footerClasses }}">
             <a href="{{ .Footer.ProjectIndexUrl }}">Projects</a>

src/templates/src/role_design.html

@@ -17,7 +17,7 @@
             Create cover art and infographics for <a target="_blank" href="https://handmade.network/education/http">educational articles</a>
         </li>
         <li>
-            Redesign this very website, and create reusable styles and UI components
+            Redesign this very website, and design reusable styles and UI components
         </li>
         <li>
             Make sure our home page engages prospective community members and gets people excited about our mission

src/templates/types.go

@@ -76,7 +76,7 @@ type Footer struct {
 	CodeOfConductUrl           string
 	CommunicationGuidelinesUrl string
 	ProjectIndexUrl            string
-	ForumsUrl                  string
+	RolesUrl                   string
 	ContactUrl                 string
 	SearchActionUrl            string
 }

src/website/base_data.go

@@ -12,7 +12,8 @@ func getBaseDataAutocrumb(c *RequestContext, title string) templates.BaseData {
 }
 
 // NOTE(asaf): If you set breadcrumbs, the breadcrumb for the current project will automatically be prepended when necessary.
-//             If you pass nil, no breadcrumbs will be created.
+//
+//	If you pass nil, no breadcrumbs will be created.
 func getBaseData(c *RequestContext, title string, breadcrumbs []templates.Breadcrumb) templates.BaseData {
 	var project models.Project
 	if c.CurrentProject != nil {
@@ -84,7 +85,7 @@ func getBaseData(c *RequestContext, title string, breadcrumbs []templates.Breadc
 			ManifestoUrl:               hmnurl.BuildManifesto(),
 			CommunicationGuidelinesUrl: hmnurl.BuildCommunicationGuidelines(),
 			ProjectIndexUrl:            hmnurl.BuildProjectIndex(1),
-			ForumsUrl:                  hmnurl.HMNProjectContext.BuildForum(nil, 1),
+			RolesUrl:                   hmnurl.BuildStaffRolesIndex(),
 			ContactUrl:                 hmnurl.BuildContactPage(),
 			SearchActionUrl:            "https://duckduckgo.com",
 		},

src/website/staticpages.go

@@ -28,6 +28,7 @@ func About(c *RequestContext) ResponseData {
 	type TemplateData struct {
 		templates.BaseData
 		FoundationUrl    string
+		RolesUrl         string
 		EducationLeadUrl string
 		AdvocacyLeadUrl  string
 		DesignLeadUrl    string
@@ -37,6 +38,7 @@ func About(c *RequestContext) ResponseData {
 	res.MustWriteTemplate("about.html", TemplateData{
 		BaseData:         getBaseDataAutocrumb(c, "About"),
 		FoundationUrl:    hmnurl.BuildFoundation(),
+		RolesUrl:         hmnurl.BuildStaffRolesIndex(),
 		EducationLeadUrl: hmnurl.BuildStaffRole("education"),
 		AdvocacyLeadUrl:  hmnurl.BuildStaffRole("advocacy"),
 		DesignLeadUrl:    hmnurl.BuildStaffRole("design"),