From 77e99b820ae4f60ead7ed1a04d14e5c6d434f148 Mon Sep 17 00:00:00 2001
From: Antonia Gaete <antoniagaete@osuosl.org>
Date: Tue, 17 Oct 2023 11:50:18 -0700
Subject: [PATCH] Add osl theme to forked repo of Mainroad

---
 assets/css/style.css                        | 346 +++++++++++++++++---
 default.md                                  |  10 +
 layouts/_default/baseof.html                |   1 +
 layouts/index.html                          |  21 +-
 layouts/partials/footer.html                |  61 +++-
 layouts/partials/header.html                |   1 -
 layouts/partials/logo.html                  |  14 +-
 layouts/partials/post_meta/author.html      |   2 +-
 layouts/partials/post_meta/blog_header.html |  18 +
 layouts/partials/post_meta/date.html        |   6 +-
 layouts/partials/sidebar.html               |  12 +-
 static/js/formsender-error.js               |  28 ++
 12 files changed, 431 insertions(+), 89 deletions(-)
 create mode 100644 default.md
 create mode 100644 layouts/partials/post_meta/blog_header.html
 create mode 100644 static/js/formsender-error.js

diff --git a/assets/css/style.css b/assets/css/style.css
index be3bb1d1..8ae34160 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1,4 +1,4 @@
-{{- $highlightColor := .Site.Params.style.vars.highlightColor | default (.Site.Params.highlightColor | default "#e22d30") -}}
+{{- $highlightColor := .Site.Params.style.vars.highlightColor | default (.Site.Params.highlightColor | default "#D73F09") -}}
 
 {{- $fontSans := `"Open Sans", Helvetica, Arial, sans-serif` -}}
 {{- $fontMono := `SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace` -}}
@@ -55,27 +55,16 @@ body {
 	font-size: .875rem;
 	line-height: 1.6;
 	word-wrap: break-word;
-	background: #f7f7f7;
+	background: #fff;
 	-webkit-font-smoothing: antialiased;
 }
 
 .container {
 	position: relative;
 	width: 100%;
-	max-width: 1080px;
 	margin: 0 auto;
 }
 
-.container--outer {
-	margin: 25px auto;
-	box-shadow: 0 0 10px rgba(50, 50, 50, .17);
-}
-
-.wrapper {
-	padding: 25px;
-	background: #fff;
-}
-
 .flex {
 	display: -webkit-flex;
 	display: flex;
@@ -87,6 +76,9 @@ body {
 	-webkit-order: 1;
 	order: 1;
 	min-width: 0;
+	max-width: 1080px;
+	margin: auto;
+	background: #fff;
 }
 
 .sidebar {
@@ -159,14 +151,15 @@ h5,
 h6 {
 	margin: 0 0 20px;
 	margin: 0 0 1.25rem;
-	font-weight: 700;
+	font-weight: 400;
 	line-height: 1.3;
-	color: #000;
+	color: #D73F09;
 }
 
 h1 {
 	font-size: 32px;
 	font-size: 2rem;
+	padding-top: 15px;
 }
 
 h2 {
@@ -196,7 +189,7 @@ h6 {
 
 a {
 	color: #000;
-	text-decoration: none;
+	text-decoration: underline;
 }
 
 a:hover {
@@ -385,11 +378,18 @@ select {
 
 /* Header */
 .header {
-	background: #fff;
+	background: #D73F09;
+	position: relative;
+	width: 100vw;
+	left: 50%;
+	right: 50%;
+	margin-left: -50vw;
+	margin-right: -50vw;
 }
 
 .logo {
-	padding: 25px;
+	padding: 15px;
+	width: 100%;
 }
 
 .logo__link {
@@ -406,7 +406,7 @@ select {
 }
 
 .logo__text {
-	text-transform: uppercase;
+	/* text-transform: uppercase; */
 }
 
 .logo--mixed .logo__item {
@@ -414,8 +414,9 @@ select {
 }
 
 .logo--mixed .logo__img {
-	max-width: 128px;
-	max-height: 128px;
+	max-width: 250px;
+	max-height: 250px;
+	padding-left: 10px;
 }
 
 .logo--mixed .logo__text {
@@ -423,11 +424,17 @@ select {
 }
 
 .logo__title {
-	font-size: 32px;
-	font-size: 2rem;
-	font-weight: 700;
+	font-size: 28px;
+	font-weight: 500;
 	line-height: 1;
-	color: #000;
+	color: #fff;
+	padding: 2px;
+	padding-left: 10px;
+}
+
+.logo_subtitle {
+	background-color: #000;
+	padding: 10px;
 }
 
 .logo__tagline {
@@ -454,13 +461,21 @@ select {
 	display: none;
 }
 
+.menu {
+	display: inline-block;
+}
+
+.menu__container {
+	max-width: 1080px;
+}
+
 .menu__btn {
 	display: block;
 	width: 100%;
 	padding: 0;
 	font: inherit;
-	color: #fff;
-	background: #2a2a2a;
+	background: #fff;
+	color: #2a2a2a;
 	border: 0;
 	outline: 0;
 }
@@ -500,34 +515,116 @@ button:not(:-moz-focusring):focus > .menu__btn-title {
 
 .menu__list {
 	list-style: none;
-	background: #2a2a2a;
+	background: #fff;
+	position: relative;
+	margin-bottom: 10px;
+	margin-top: 10px;
 }
 
 .menu__item:hover {
-	background: {{ $highlightColor }};
+	background-color: rgba(0, 0, 0, 0.9);
+	color: #fff;
 }
 
 .menu__item:first-child {
 	border: 0;
 }
 
-.menu__item--active {
+/* .menu__item--active {
 	background: {{ $highlightColor }};
-}
+} */
 
 .menu__link {
 	display: block;
-	padding: 10px 15px;
-	padding: .625rem .9375rem;
-	font-weight: 700;
-	color: #fff;
+	/* margin-left: 2px;
+	margin-right: 2px; */
+	padding: 5px 10px;
+	padding: .4rem .9375rem;
+	font-weight: 400;
+	font-size: 16px;
+	color: #000;
 	text-transform: uppercase;
+	text-decoration: none;
+}
+
+.menu__container {
+	display: flex;
+}
+
+.dropdown__content {
+	display: none;
+	position: absolute;
+	background-color: rgba(0, 0, 0, 0.9);
+	color: #fff;
+	min-width: 250px;
+	max-width: 160px;
+	box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+	z-index: 1;
+}
+
+.third__dropdown {
+	display: none;
+	position: absolute;
+	left: 100%;
+	background-color: rgba(0, 0, 0, 0.9);
+	min-width: 220px;
+	box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+}
+
+.submenu__text {
+	color: #fff;
+	text-transform: none;
+	padding: 0;
+	font-size: 14px;
+	display: block;
+	width: 100%;
+}
+
+.thirdmenu__text {
+	color: #fff;
+	text-transform: none;
+	padding: 0;
+	font-size: 14px;
+}
+
+.submenu__link {
+	margin: 1px;
+}
+
+.thirdmenu__link {
+	margin: 0px;
+}
+
+.submenu__list {
+	list-style: none;
+}
+
+.thirdmenu__list {
+	list-style: none;
+}
+
+.menu__item:hover .dropdown__content {
+	display: flex;
+	flex-direction: column;
+}
+
+.menu__dropdown:hover .menu__link {
+	color: #fff;
+}
+
+.submenu__item:hover .third__dropdown {
+	display: flex;
+	flex-direction: column;
 }
 
 .menu__link:hover {
 	color: #fff;
 }
 
+.menu__item:hover .menu__link{
+	color: #fff;
+}
+
 .js .menu__list {
 	position: absolute;
 	z-index: 1;
@@ -552,9 +649,9 @@ button:not(:-moz-focusring):focus > .menu__btn-title {
 }
 
 @media screen and (min-width: 767px) {
-	.menu {
+	/* .menu {
 		border-bottom: 5px solid {{ $highlightColor }};
-	}
+	} */
 
 	.menu__btn {
 		display: none;
@@ -978,23 +1075,35 @@ video {
 /* Table */
 table {
 	width: 100%;
+	margin: 0;
 	margin-bottom: 20px;
 	margin-bottom: 1.25rem;
 	border-spacing: 0;
 	border-collapse: collapse;
-	border-top: 1px solid #ebebeb;
-	border-left: 1px solid #ebebeb;
+	border: 1px solid #fff;
 }
 
 td,
 th {
 	padding: 5px 10px;
-	border-right: 1px solid #ebebeb;
-	border-bottom: 1px solid #ebebeb;
+	border-right: 1px solid #fff;
+	border-bottom: 1px solid #fff;
 }
 
 th {
-	font-weight: 700;
+	background-color: #fff;
+	border: none;
+	font-weight: 400;
+	padding: 5px;
+	text-align: left;
+}
+
+tr:nth-child(odd) {
+	background-color: #F5F2ED;
+}
+
+.hosted_projects_table_name {
+	width: 300px;
 }
 
 /* Forms */
@@ -1194,6 +1303,44 @@ textarea {
 	text-decoration: underline;
 }
 
+.footer_headers {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	margin: auto;
+	margin-top: 20px;
+}
+
+.footer_links {
+	margin: 20px;
+	margin-left: 0px;
+	text-decoration: none;
+}
+
+.footer_contact_header p {
+	margin: 20px;
+}
+
+.footer_link_container {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	max-width: 170px;
+}
+
+.footer_link_container a {
+	text-decoration: none;
+}
+
+.footer_menu_link_container {
+	margin-left: 15px;
+	margin-right: 15px;
+}
+
+.footer_map_container {
+	margin-bottom: 10px;
+}
+
 /* Media Queries */
 @media screen and (max-width: 1475px) {
 	.container--outer {
@@ -1328,3 +1475,118 @@ textarea {
 		font-size: .6875rem;
 	}
 }
+
+/* Hosting Request Form */
+label {
+	display: block;
+	margin-bottom: 5px;
+}
+
+.form-select {
+	margin-bottom: 20px;
+	padding: 5px;
+	border-color: #d0d0d0;
+	border-radius: 2px; 
+	width: 200px;
+}
+
+.form-required {
+	color: #f00;
+}
+
+.form-item input {
+	margin-bottom: 20px;
+	width: 200px;
+}
+
+.form-inline {
+	display: flex;
+	margin: 5px;
+}
+
+.form-inline label {
+	margin: 5px;
+}
+
+textarea {
+	width: 200px;
+	height: 32px;
+	margin-bottom: 20px;
+	resize: both;
+	overflow: auto;
+}
+
+.form-submit {
+	background: #000;
+	box-shadow: none;
+	color: #fff;
+	border: medium none;
+	padding: 10px;
+	border-radius: 4px;
+	margin-bottom: 20px;
+	margin-left: 0;
+}
+
+.description {
+	margin-bottom: 5px;
+}
+
+/* Images */
+img[src$='#center'] {
+	display: block;
+	margin: auto;
+}
+
+img[src$='#center-white'] {
+	display: block;
+	margin: auto;
+	background: grey;
+}
+
+img[src$='#right'] {
+	float: right;
+}
+
+img[src$='#right-people'] {
+	float: right;
+	width: 110px;
+}
+
+img[src$='#right-barcamp'] {
+	float: right;
+	width: 200px;
+}
+
+img[src$='#right-bootcamp'] {
+	float: right;
+	height: 200px;
+	margin-left: 10px;
+	margin-right: 10px;
+}
+
+img[src$='#right-hosting'] {
+	float: right;
+	height: 221px;
+	width: 358.5px;
+	margin: 5px;
+}
+
+img[src$='#sponsors'] {
+	width: 200px;
+}
+
+img[src$='#right-faq'] {
+	float: right;
+	height: 250px;
+}
+
+img[src$='#blog'] {
+	width: 400px;
+}
+
+img[src$='#blog-center'] {
+	width: 500px;
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+}
\ No newline at end of file
diff --git a/default.md b/default.md
new file mode 100644
index 00000000..b2c51dee
--- /dev/null
+++ b/default.md
@@ -0,0 +1,10 @@
+---
+title: "{{ replace .TranslationBaseName '-' ' ' | title }}"
+description: ""
+date: "{{ .Date }}"
+thumbnail: ""
+categories:
+  - ""
+tags:
+  - ""
+---
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index ec4b96da..eeea59bb 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -49,6 +49,7 @@
 		{{ block "header" . }}{{ partial "header.html" . }}{{ end }}
 		<div class="wrapper flex">
 			<div class="primary">
+			{{ partial "menu.html" . }}
 			{{ block "main" . }}
 				{{ with .Content }}
 				<div class="content main__content clearfix">
diff --git a/layouts/index.html b/layouts/index.html
index fb829c18..639454b7 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,24 +1,5 @@
 {{ define "main" }}
 <main class="main list" role="main">
-	{{- with .Content }}
-	<div class="content main__content clearfix">
-		{{ . }}
-	</div>
-	{{- end }}
-	{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}
-	{{- range $paginator.Pages }}
-		{{- .Render "summary" }}
-	{{- end }}
-	{{- if and (eq $paginator.TotalNumberOfElements 0) (not $.Content) }}
-		<div class="warning">
-			{{ partial "svg/files.svg" (dict "class" "warning__icon") }}
-			<h3 class="warning__headline">{{ T "noposts_warning_title" | safeHTML }}</h3>
-			<div class="warning__text">
-				<p class="warning__description">{{ T "noposts_warning_description" | safeHTML }}</p>
-				<p class="warning__tip">{{ T "noposts_warning_tip" | safeHTML }}</p>
-			</div>
-		</div>
-	{{ end }}
+	{{ .Content }}
 </main>
-{{ partial "pagination.html" . }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 560cf484..52f1fd8d 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,9 +1,62 @@
 <footer class="footer">
 	<div class="container footer__container flex">
-		{{ partial "footer_links.html" . }}
-		<div class="footer__copyright">
-			&copy; {{ now.Format "2006" }} {{ .Site.Params.copyright | default .Site.Title }}.
-			<span class="footer__copyright-credits">{{ T "footer_credits" | safeHTML }}</span>
+		<div class="footer_headers">
+			<div class="footer_contact_container">
+				<p class="footer_contact_header">Contact Info</p>
+				<div class="footer_contant_info_container">
+					<p>
+						OSU Open Source Lab<br>
+						224 Milne Computer Center<br>
+						1800 SW Campus Way<br>
+						Corvallis, OR 97331<br>
+						<a href="mailto:info@osuosl.org" style="margin: 0px">info@osuosl.org</a><br>
+						Phone: 541-737-9900<br>
+
+						<div class="footer_map_container">
+						<a href="https://www.google.com/maps/place/Milne+Computer+Center,+1800+SW+Campus+Way,+Corvallis,+OR+97331">
+							<img src="/images/milne_street.png">
+						</a>
+						</div>
+
+						<div>
+						<a href="https://oregonstate.edu/copyright">Copyright</a>
+						&copy;2023<br> Oregon State University<br />
+						<a href="https://oregonstate.edu/official-web-disclaimer">Disclaimer</a>
+						</div>
+					</p>
+				</div>
+			</div>
+
+			<div class="footer_menu_link_container"><a class="footer_links">HOME</a></div>
+			<div class="footer_menu_link_container">
+				<a href="/about" class="footer_links">ABOUT</a>
+				<div class="footer_link_container">
+					<a href="/about">About OSL</a>
+					<a href="/faq">FAQ</a>
+					<a href="/contact">Contact Us</a>
+					<a href="/people">Staff</a>
+					<a href="/logos">Logos</a>
+					<a href="/donate">Donate</a>
+				</div>
+			</div>
+			<div class="footer_menu_link_container">
+				<a href="/services" class="footer_links">SERVICES</a>
+				<div class="footer_link_container">
+					<a href="/services/hosting">Hosting</a>
+					<a href="/services/aarch64">AARCH64 Development Hosting</a>
+					<a href="/services/powerdev">POWERLinux/OpnePOWER Development Hosting</a>
+					<a href="/services/ibm-z">IBM Z Development Hosting</a>
+				</div>
+			</div>
+			<div class="footer_menu_link_container">
+				<a href="/students" class="footer_links">STUDENT EXPERIENCE</a>
+				<div class="footer_link_container">
+					<a href="/about/employement">Employement</a>
+					<a href="/about/education">Education</a>
+					<a href="/student-stories">Student Stories</a>
+				</div>
+			</div>
+			<div class="footer_menu_link_container"><a href="/blog" class="footer_links">BLOG</a></div>
 		</div>
 	</div>
 </footer>
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 81b7e141..2078f785 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,6 +1,5 @@
 <header class="header">
 	<div class="container header__container">
 		{{ partial "logo.html" . }}
-		{{ partial "menu.html" . }}
 	</div>
 </header>
\ No newline at end of file
diff --git a/layouts/partials/logo.html b/layouts/partials/logo.html
index bf7d6689..965eaf61 100644
--- a/layouts/partials/logo.html
+++ b/layouts/partials/logo.html
@@ -7,18 +7,16 @@
 	{{- $logoMix := and $logoImage $logoTitle -}}
 
 	<div class="logo{{ with $logoMix }} logo--mixed{{ end }}">
-		<a class="logo__link" href="{{ "" | relLangURL }}"{{ with $logoTitle }} title="{{ . }}"{{ end }} rel="home">
+		<div class="logo__link" href="{{ "" | relLangURL }}"{{ with $logoTitle }} title="{{ . }}"{{ end }} rel="home">
 			{{ with $logoImage -}}
 				<div class="logo__item logo__imagebox">
 					<img class="logo__img" src="{{ . | relURL }}">
 				</div>
 			{{- end -}}
-			{{ with $logoTitle -}}
-				<div class="logo__item logo__text">
-					<div class="logo__title">{{ . }}</div>
-					{{ with $logoSubtitle }}<div class="logo__tagline">{{ . }}</div>{{ end }}
-				</div>
-			{{- end }}
-		</a>
+		</div>
+		
+	</div>
+	<div class="logo_item logo_subtitle">
+		{{ with $logoSubtitle }}<div class="logo__title">{{ . }}</div>{{ end }}
 	</div>
 {{- end }}
\ No newline at end of file
diff --git a/layouts/partials/post_meta/author.html b/layouts/partials/post_meta/author.html
index 0ee0fc93..db9f031d 100644
--- a/layouts/partials/post_meta/author.html
+++ b/layouts/partials/post_meta/author.html
@@ -3,4 +3,4 @@
 	{{ partial "svg/author.svg" (dict "class" "meta__icon") -}}
 	<span class="meta__text">{{ .Site.Author.name }}</span>
 </div>
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/layouts/partials/post_meta/blog_header.html b/layouts/partials/post_meta/blog_header.html
new file mode 100644
index 00000000..e2bdd77b
--- /dev/null
+++ b/layouts/partials/post_meta/blog_header.html
@@ -0,0 +1,18 @@
+{{- if .Param "authors" }}
+	by
+	{{ range .Param "authors" }}
+		{{ . }}
+	{{ end }}
+	on
+	{{- if not .Date.IsZero }}
+		<time datetime="{{ .Date.Format " 2006-01-02T15:04:05Z07:00" }}">
+			{{- .Date.Format (.Site.Params.dateformat | default "January 02, 2006") -}}
+		</time>
+		{{- if ne .Date .Lastmod }}
+		<time datetime="{{ .Lastmod.Format " 2006-01-02T15:04:05Z07:00" }}">(
+			{{- T "meta_lastmod" }}: {{ .Lastmod.Format (.Site.Params.dateformat | default "January 02, 2006") -}}
+			)</time>
+		{{- end -}}
+	{{- end }}
+	</span>
+{{- end }}
\ No newline at end of file
diff --git a/layouts/partials/post_meta/date.html b/layouts/partials/post_meta/date.html
index 33055a5b..3eaf1a64 100644
--- a/layouts/partials/post_meta/date.html
+++ b/layouts/partials/post_meta/date.html
@@ -1,12 +1,12 @@
 {{- if not .Date.IsZero }}
 <div class="meta__item-datetime meta__item">
-	{{ partial "svg/time.svg" (dict "class" "meta__icon") -}}
+	<!-- {{ partial "svg/time.svg" (dict "class" "meta__icon") -}} -->
 	<time class="meta__text" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">
-		{{- .Date | dateFormat (.Site.Params.dateformat | default "January 02, 2006") -}}
+		{{- .Date.Format (.Site.Params.dateformat | default "January 02, 2006") -}}
 	</time>
 	{{- if ne .Date .Lastmod }}
 	<time class="meta__text" datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}">(
-		{{- T "meta_lastmod" }}: {{ .Lastmod | dateFormat (.Site.Params.dateformat | default "January 02, 2006") -}}
+		{{- T "meta_lastmod" }}: {{ .Lastmod.Format (.Site.Params.dateformat | default "January 02, 2006") -}}
 	)</time>
 	{{- end -}}
 </div>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 90499fbf..e689c900 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -12,16 +12,8 @@
 {{- $root := . }}
 {{- with (default .Site.Params.sidebar.widgets .Params.widgets) -}}
 	{{- range $widget := . }}
-		{{- $widgetPath := printf "widgets/%s.html" $widget }}
-		{{- $widgetCached := false }}
-		{{- if isset $.Site.Params "widgets" }}
-			{{- $widgetCached = (index $.Site.Params.widgets $widget).cached }}
-		{{- end }}
-		{{- if eq $widgetCached true }}
-			{{- partialCached $widgetPath $root }}
-		{{- else }}
-			{{- partial $widgetPath $root }}
-		{{- end }}
+		{{- $p := printf "widgets/%s.html" $widget }}
+		{{- partial $p $root }}
 	{{- end }}
 {{- else }}
 	<p class="sidebar__warning"><strong>{{ T "sidebar_warning" }}:</strong><br>{{ T "sidebar_recommendation" }}</p>
diff --git a/static/js/formsender-error.js b/static/js/formsender-error.js
new file mode 100644
index 00000000..59d6898c
--- /dev/null
+++ b/static/js/formsender-error.js
@@ -0,0 +1,28 @@
+// Get error number and message from query string
+function getQueryVariable(variable) {
+    var query = window.location.search.substring(1);
+    var vars = query.split("&");
+    for (var i = 0; i < vars.length; i++) {
+        var pair = vars[i].split("=");
+        if (pair[0] == variable) {
+            return pair[1];
+        }
+    }
+    return (false);
+}
+
+var errorNumber = getQueryVariable("error");
+var errorMessage = getQueryVariable("message");
+
+// errorMessage will only be a string if a query string is present.
+// If a query string is present, there was an error. Format the message.
+if (typeof errorMessage == "string") {
+    errorMessage = errorMessage.replace("+", " ").replace("/", "");
+}
+
+// If both these exist, there was an error with the submission, write to page
+if (errorNumber && errorMessage) {
+    document.write("<h3 style='color:red'>An error occurred with your form submission</h3>",
+        "<p style='color:red'>Error number: ", errorNumber, "</p>",
+        "<p style='color:red'>Error message: ", errorMessage, "</p>");
+}
\ No newline at end of file