Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preview homepage refresh #23

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
55b43e2
OSG Homepage Refresh
CannonLock Feb 17, 2022
ced7e06
Rough draft of world image
CannonLock Feb 28, 2022
ed99d49
Make Homepage Responsive
CannonLock Mar 11, 2022
a567516
Make links relative
CannonLock Mar 11, 2022
a3d1d7f
Make links relative
CannonLock Mar 11, 2022
c84d44c
Update the button border radius
CannonLock Mar 11, 2022
09b1952
Wording Update
CannonLock Mar 11, 2022
88f7577
First round of improvements for the AP page.
bbockelm Mar 11, 2022
6a1a293
Tweak text around the AP on the homepage.
bbockelm Mar 11, 2022
f5341aa
Make Hero Image relative
CannonLock Mar 11, 2022
62006c2
Scrub text on the new homepage.
bbockelm Mar 11, 2022
456dd2a
Fix PATh capitalization.
bbockelm Mar 11, 2022
893d1b5
Refresh styles across website
CannonLock Mar 16, 2022
de90ae1
Merge remote-tracking branch 'upstream/preview-homepage-refresh' into…
CannonLock Mar 16, 2022
4cdaa06
Make bg relative
CannonLock Mar 17, 2022
ae5a5c8
Fix height listeners
CannonLock Mar 17, 2022
b8fbc21
Bust Homepage Cache
CannonLock Mar 18, 2022
4617c4f
Make Globe Relative
CannonLock Mar 18, 2022
e0a7901
Initial commit on sharing capacity
CannonLock Mar 22, 2022
e4d5dc1
Update Event SCSS
CannonLock Mar 25, 2022
f5c8331
AP Page Changes
CannonLock Mar 25, 2022
fbc1995
Merge in Master
CannonLock Apr 28, 2022
f274ebe
Delete Files
CannonLock Apr 28, 2022
0865a00
Add back submodule
CannonLock Apr 29, 2022
a06ee38
Update so the preview works
CannonLock Jul 25, 2022
6f1f263
Tiny Change to trigger a build
CannonLock Oct 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions 404.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
---
layout: container
title: 404 Not Found
layout: title-main-container
title: 404 Page Not Found
permalink: /404.html
---

# 404 Page Not Found

The page you were looking for was not found.
If you believe this was in error, please contact <mailto:[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This repository contains the source code of the OSG website; it is not the publi

The real webpage for the OSG is <https://www.opensciencegrid.org>.

# Deployment
# Deployment

To have your changes merged into master you must create a PR and get one review. If you don't have anyone in mind you can request _@CannonLock_ and he will review it the next morning.

Expand Down
88 changes: 49 additions & 39 deletions _about/team.html
Original file line number Diff line number Diff line change
@@ -1,51 +1,61 @@
---
layout: container
layout: title-main
title: The OSG Team
---

<div class="container-fluid">
<h1>Executive Team</h1><br>
<div class="row">
{% for member in site.data.orgs.exec-team.personnel %}
{% for person_hash in site.data.people %}
<div class="container-xxl">
<h2 class="ps-3">Executive Team</h2>
<div class="row g-0 rounded bg-light pb-3 pe-3">
{% for member in site.data.orgs.exec-team.personnel %}
{% for person_hash in site.data.people %}
{% assign person = person_hash[1] %}
{% if person.shortname == member %}
<div class="col-12 col-sm-6 col-md-4 col-lg-3 col-xl-3 pt-3 ps-3 d-flex">
<div class="card shadow border-0 flex-grow-1">
<img class="card-img-top" src="{{person.image | relative_url}}" alt="Card image cap">
<div class="card-body d-flex flex-column">
<div class="card-text">
{% if person.website %}
<b><a href="{{person.website}}">{{person.name}}</a></b><br>
{% else %}
<b>{{person.name}}</b><br>
{% endif %}
<small>{{person.institution}}</small><br><br>
</div>
<div class="card-text mt-auto"><i>{{person.title}}</i><br></div>
</div>
</div>
</div>
{% endif %}
{% endfor %}
{% endfor %}
</div>
<br>
</div>
<div class="container-xxl">
<h2 class="ps-3">Full Team</h2>
<div class="row g-0 bg-light rounded bg-light pb-2 pe-2">
{% assign people = site.data.people | sort %}
{% for person_hash in people %}
{% assign person = person_hash[1] %}
{% if person.shortname == member %}
<div class="card p-0" style="width: 12rem;">
<img class="card-img-top" src="{{person.image | relative_url}}" alt="Card image cap">
<div class="card-body d-flex flex-column">
<div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xxl-2 pt-2 ps-2 d-flex">
<div class="card border-0 shadow flex-grow-1">
<img class="card-img-top" src="{{person.image}}" alt="Card image cap">
<div class="card-body d-flex flex-column">
<div class="card-text">
<b><a href="{{person.website}}">{{person.name}}</a></b><br>
<small>{{person.institution}}</small><br><br>
{% if person.website %}
<b><a href="{{person.website}}">{{person.name}}</a></b><br>
{% else %}
<b>{{person.name}}</b><br>
{% endif %}
<small>{{person.institution}}</small><br><br>
</div>
<div class="card-text mt-auto"><i>{{person.title}}</i><br></div>
</div>
</div>
{% endif %}
{% endfor %}
{% endfor %}
</div>
<br>
</div>

<h1>Full Team</h1><br>

<div class="container-fluid">
<div class="row">
{% assign people = site.data.people | sort %}
{% for person_hash in people %}
{% assign person = person_hash[1] %}
<div class="card p-0" style="width: 12rem;">
<img class="card-img-top" src="{{person.image}}" alt="Card image cap">
<div class="card-body d-flex flex-column">
<div class="card-text">
<b><a href="{{person.website}}">{{person.name}}</a></b><br>
<small>{{person.institution}}</small><br><br>
</div>
<div class="card-text mt-auto"><i>{{person.title}}</i><br></div>
</div>
</div>
{% endfor %}
<br>
</div>
</div>
{% endfor %}
<br>
</div>
</div>

3 changes: 3 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ collections:
spotlights:
permalink: /spotlights/:title.html
output: true
services:
permalink: /services/:title.html
output: true

sass:
style: compressed
Expand Down
37 changes: 37 additions & 0 deletions _data/footer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
- name: About
id: about
children:
- name: Introduction
url: /about/introduction
- name: Consortium Members
url: /about/organization
- name: OSG Team
url: /about/team
- name: Publications
url: /about/publications
- name: Services
id: services
children:
- name: Open Science Pool
url: /about/open_science_pool
- name: Open Science Data Federation
url: /about/osdf
- name: User Spotlights
url: /spotlight.html
- name: Documentation
id: documentation
children:
- name: User
url: https://support.opensciencegrid.org/support/home
- name: System Admin
url: https://opensciencegrid.org/docs/
- name: Security
url: https://opensciencegrid.org/security/
- name: Engagement
id: engagement
children:
- name: News
url: /news.html
- name: Events
url: /events.html

4 changes: 2 additions & 2 deletions _includes/about_contents.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="col-md-3">
<nav class="d-none d-md-block bg-light sidebar p-2">
<nav class="d-none d-md-block bg-light sidebar p-3">
{% for section in site.data.about %}
<h5>{{ section.title }}</h5>
{% include about_ul.html items=section.docs %}
{% endfor %}
<a class="nav-link" href="{{ '/acknowledging.html' | relative_url }}">Acknowledging OSG</a>
<h5>Documentation</h5>
<h5 class="pt-2">Documentation</h5>
<ul class="nav nav-pills flex-column">
<li class="nav-item"><a class="nav-link" href="https://support.opensciencegrid.org/">Users</a></li>
<li class="nav-item"><a class="nav-link" href="https://opensciencegrid.org/docs/">Sysadmins</a></li>
Expand Down
14 changes: 7 additions & 7 deletions _includes/cards/spotlight-card.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{% if include.article %}
{% assign article = include.article %}
{% endif %}
<a class="text-decoration-none" href="{{ article.url | default: include.url | relative_url }}">
<div class="card hover-shadow border-0 h-100">
{% if article.card_src or include.card_src %}
<img height="{{ include.height | default: '200' }}" src="{{ include.card_src | default: article.card_src }}" class="card-img-top" alt="article">
<a class="text-decoration-none" href="{{ article.url | relative_url }}">
<div class="card border-0 hover-shadow h-100 {{ include.class }}">
{% if article.card_image or include.card_image %}
<img height="{{ include.height | default: '200' }}" src="{{ include.card_image | default: article.card_image | relative_url }}" class="card-img-top" alt="article">
{% endif %}
<div class="card-body d-flex flex-column">
<h3 class="text-decoration-none">{{ article.title }}</h3>
<h4 class="text-decoration-none">{{ article.title }}</h4>
{% unless include.no_date %}
<div>
<span class="text-muted text-decoration-none">{{ article.date | date: "%B %e, %Y"}}</span>
</div>
{% endunless %}
<hr/>
<hr>
<span class="text-decoration-none text-dark">
{% if include.content | markdownify | strip_html %}
{{ include.content }}
{{ article.content }}
{% else %}
{{ article.excerpt | markdownify | strip_html }}
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion _includes/image-title-card.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<div class="col-6 d-flex">
<h3 class="mt-auto mb-auto">{{ include.title }}</h3>
</div>
</div>
</div
2 changes: 1 addition & 1 deletion _includes/image-title-desc-card.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="row mt-4 mb-4 {{ include.class }}">
<div class="col-4 col-md-3 col-xxl-2 d-flex">
<div class="col-4 col-md-3 d-flex">
<a class="d-flex w-100" href="{{ include.url }}">
<img class="w-100 mt-auto mb-auto" src="{{ include.img_src | relative_url }}" alt="{{ include.img_alt}}" />
</a>
Expand Down
34 changes: 30 additions & 4 deletions _includes/layout/footer.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
<footer>
<div class="container-xxl my-5">
<hr/>
Funded by the National Science Foundation under Grant Nos. 2030508, 1836650, and 1148698. Any opinions, findings, and conclusions or recommendations expressed in this material are those of the author(s) and do not necessarily reflect the views of the National Science Foundation.
<footer id="footer" class="mt-auto">
<div class="shadow bg-secondary">
<div class="container-xxl">
<div class="row justify-content-center py-5">
<div class="col-auto me-4 d-none d-md-flex">
<a class="my-auto" href="{{ '/' | relative_url }}"><img style="height:5rem" src="{{ '/assets/images/logos/OSG-logo.svg' | relative_url }}" alt="OSG logo"></a>
</div>
<div class="col-12 col-md-8 col-lg-8">
<div class="row justify-content-between my-2">
{% for category in site.data.footer %}
<div class="col-6 col-lg-4 col-xl-3 my-2">
<table>
<tr><th>{{ category.name }}</th></tr>
{% for child in category.children %}
<tr><td><a href="{{ child.url | relative_url }}">{{ child.name }}</a></td></tr>
{% endfor %}
</table>
</div>
{% endfor %}
</div>
</div>
</div>
</div>
</div>
<div class="container-xxl">
<div class="row py-5">
<div class="col text-center">
This work is supported by <a href="https://www.nsf.gov/div/index.jsp?div=OAC">NSF</a> under Grant Nos. 2030508, 1836650, and 1148698. Any opinions, findings, and conclusions or recommendations expressed in this material are those of the author(s) and do not necessarily reflect the views of the National Science Foundation.. <br />
</div>
</div>
</div>
</footer>
5 changes: 2 additions & 3 deletions _includes/layout/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<meta name="viewport" content="width=device-width">
<link rel="icon" href="/favicon.ico">

{% seo %}

{% if jekyll.environment == "production" %}

{% if site.google_analytics and site.production %}
Expand Down Expand Up @@ -35,8 +33,9 @@
{% endfor %}

{% for js in include.js %}
<script src="{{ js.src | relative_url }}" type="text/javascript" {{ js.loading}}></script>
<script src="{{ js.src | relative_url }}" type="{{ js.type | default: 'text/javascript' }}" {{ js.loading}}></script>
{% endfor %}
<script src="{{ '/assets/js/base.js' | relative_url }}" defer></script>

{% for css in include.css %}
<link href="{{ css.href | relative_url }}" media="screen, tv, projection" title="Default" rel="stylesheet">
Expand Down
15 changes: 12 additions & 3 deletions _includes/layout/header.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<header>
<nav class="navbar navbar-expand-md navbar-dark bg-dark">
<nav class="navbar navbar-light navbar-expand-md {% if page.url == '/' %}bg-secondary{% endif %}">
<div class="container-xxl">
<a class="navbar-brand pt-1 pb-1" href="{{ '/' | relative_url }}"><img height="55" src="{{ '/assets/images/logos/OSG-logo.svg' | relative_url }}" alt="OSG logo"></a>
<a class="navbar-brand pt-1 pb-1" href="{{ '/' | relative_url }}">
{% if page.url == "/" %}
<img class="my-1" height="36" style="height: 2rem" src="{{ '/assets/images/logos/OSG_Logo_Text.svg' | relative_url }}" alt="OSG logo">
{% else %}
<img style="height: 3rem" src="{{ '/assets/images/logos/OSG-logo.svg' | relative_url }}" alt="OSG logo">
{% endif %}
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down Expand Up @@ -49,6 +55,9 @@
</li>
</ul>
</div>
</div> <!-- End Container -->
</div>
</nav>
<div class="container-xxl">
<hr class="my-0"/>
</div>
</header>
8 changes: 8 additions & 0 deletions _includes/picture.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{% assign extension = include.extension | default: 'jpg' %}

<div style="height:{{include.height}};">
<picture>
<source type="image/webp" srcset="{{ include.path | append: '.webp' | relative_url }}">
<img class="h-100" src="{{ include.path | append: '.' | append: extension | relative_url }}" alt="{{ include.alt }}">
</picture>
</div>
10 changes: 10 additions & 0 deletions _layouts/body.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!doctype html>
<html lang="{{ site.lang | default: 'en-US' }}">
<head>
{% assign head = layout.head_extension | default: page.head_extension %}
{% include layout/head.html js=page.js_extension css=page.css_extension head=layout.head_extension %}
</head>
<body>
{{ content }}
</body>
</html>
2 changes: 1 addition & 1 deletion _layouts/container.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
layout: default
layout: main
---


Expand Down
22 changes: 8 additions & 14 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
<!doctype html>
<html lang="{{ site.lang | default: 'en-US' }}">
<head data-proofer-ignore>
{% assign head = layout.head_extension | default: page.head_extension %}
{% include layout/head.html js=page.js_extension css=page.css_extension head=layout.head_extension %}
</head>
<body>
{% include layout/header.html %}
<main>
{{ content }}
</main>
{% include layout/footer.html %}
</body>
</html>
---
layout: body
---

{% include layout/header.html %}
{{ content }}
{% include layout/footer.html %}

7 changes: 7 additions & 0 deletions _layouts/main.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
layout: default
---

<main>
{{ content }}
</main>
4 changes: 2 additions & 2 deletions _layouts/padded-default.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: default
layout: main
---

<div class="py-5">
<div class="py-2">
{{ content }}
</div>
4 changes: 2 additions & 2 deletions _layouts/posts.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
layout: container
layout: title-main-container
---

<div class="row justify-content-center">
<div class="col-12 col-xl-7 col-lg-8 col-md-10">
<div class="col-12 col-md-10 col-lg-9 col-xl-8">
<section class="news-article">
{% if page.title %}
<div class="mb-1">
Expand Down
Loading