Skip to content

Commit a80df71

Browse files
authored
Merge pull request #696 from LLNL/refresh
Refresh About page and other scattered updates
2 parents 506ef24 + 0fc7a29 commit a80df71

5 files changed

Lines changed: 40 additions & 41 deletions

File tree

about/contributing.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ Finally, open <http://localhost:4000> in a web browser.
4747

4848
*Note:* The [RADIUSS website](https://software.llnl.gov/radiuss/) and [product catalog](https://software.llnl.gov/radiuss/projects/) "live" on this URL but are managed by a [separate repo](https://github.com/LLNL/radiuss).
4949

50-
### Tips
50+
## Tips
5151

5252
The gems in your sourcefile get updated frequently. It is a good idea to occasionally run `bundle update` from within your project's root directory to make sure the software on your computer is up to date.
5353

5454
Sometimes there can be dependency conflicts if your local version of Ruby is different from this repo or GitHub pages deployment settings. You can find the version number of each of GitHub Page's current dependency's [here](https://pages.github.com/versions/). You can often avoid dependency issues if you use the same versions, including for Ruby.
5555

5656
For example, the default version of Ruby used to deploy GitHub Pages on github.com as of 2021-04-08 was Ruby 2.7.1. If you tried running Ruby version 3.0.0 locally on macOS, you'll need to do some extra steps to correctly install the dependencies for this repository. You'd need to run `bundle add webrick` as it is no longer a prepackaged dependency with Ruby in 3.0.0. You may also need to run `gem install eventmachine -- --with-openssl-dir=/usr/local/opt/openssl@1.1` as MacOS >10.14 doesn't use OpenSSL from the same path as is still assumed to be in by eventmachine.
5757

58-
### Spellcheck
58+
## Spellcheck
5959

6060
The [GitHub workflow](https://github.com/LLNL/llnl.github.io/blob/main/.github/workflows/main.yaml) currently includes an action for a Rust tool called [crate-ci/typos](https://github.com/marketplace/actions/typos-action) that will spellcheck all posts and pages. If your CI fails, spelling suggestions will be shown and you can manually update the mistakes, or [install typos](https://github.com/crate-ci/typos#install) and have all errors fixed automatically:
6161

6262
```bash
6363
typos ./_posts ./README.md ./about/faq.md ./about/contributing.md --write-changes
6464
```
6565

66-
If a word needs to be ignored, see [instructions](https://github.com/crate-ci/typos#false-positives) for adding an entry to the [_typos.toml](https://github.com/LLNL/llnl.github.io/blob/main/_typos.toml) file.
66+
If a word needs to be ignored, see [instructions](https://github.com/crate-ci/typos#false-positives) for adding an entry to the [`_typos.toml`](https://github.com/LLNL/llnl.github.io/blob/main/_typos.toml) file.
6767

6868
{% endcapture %}
6969
{% assign accordionContent = accordionContent | markdownify %}
@@ -112,11 +112,11 @@ Repos that appear on the [RADIUSS site](https://software.llnl.gov/radiuss/projec
112112

113113
{% capture accordionContent %}
114114

115-
### Project Tags
115+
## Project Tags
116116

117117
See the FAQ [How do I include my repo in the LLNL organization and/or this website’s catalog?](https://software.llnl.gov/about/faq/#catalog) for information about tagging an individual repo. See the topic [How do I update or use the catalog categories?](https://software.llnl.gov/about/contribute/#categories) above for information about managing the categories.
118118

119-
### Project Logos
119+
## Project Logos
120120

121121
The home page displays a logo next to each repo when they appear under the topic categories. If a repo has its own logo, that should display. If not, then the LLNL logo displays by default. There are two steps to adding a logo to this website:
122122

@@ -167,7 +167,7 @@ The informational pages on this site (e.g., this page, [About](/about), [FAQ](/a
167167
* News post titles in title case
168168
* Accordion titles in the form of a sentence-case question
169169

170-
**To update the banner on the home page:** The existing RADIUSS message is in a container using the [`button.html` include file](https://github.com/LLNL/llnl.github.io/blob/main/_includes/components/button.html).
170+
**To update the banners on the home page:** The existing RADIUSS and IPO messages are in `<div>` containers using the [`button.html` include file](https://github.com/LLNL/llnl.github.io/blob/main/_includes/components/button.html).
171171

172172
**To modify the site menu:** Update the menu in the [`header.html`](https://github.com/LLNL/llnl.github.io/blob/main/_includes/header.html), rather than adding each page to the menu using page attributes.
173173

@@ -180,17 +180,17 @@ The informational pages on this site (e.g., this page, [About](/about), [FAQ](/a
180180
{% capture accordionContent %}
181181
This site's [visualizations](../../visualize) are governed by several scripts and queries. See the following `README` files for details:
182182

183-
* [scripts/README.md](https://github.com/LLNL/llnl.github.io/blob/main/_visualize/scripts/README.md): data collection scripts
184-
* [_visualize/README.md](https://github.com/LLNL/llnl.github.io/blob/main/_visualize/README.md): queries to GitHub's GraphQL API
185-
* [visualize/README.md](https://github.com/LLNL/llnl.github.io/blob/main/visualize/README.md): data storage
183+
* [`scripts/README.md`](https://github.com/LLNL/llnl.github.io/blob/main/_visualize/scripts/README.md): data collection scripts
184+
* [`_visualize/README.md`](https://github.com/LLNL/llnl.github.io/blob/main/_visualize/README.md): queries to GitHub's GraphQL API
185+
* [`visualize/README.md`](https://github.com/LLNL/llnl.github.io/blob/main/visualize/README.md): data storage
186186

187187
{% endcapture %}
188188
{% assign accordionContent = accordionContent | markdownify %}
189189
{% include components/accordion.html title='How do I modify the visualizations?' slug='viz' content=accordionContent %}
190190

191191
{% capture accordionContent %}
192192

193-
### Future Materials Science category
193+
## Materials Science Category
194194

195195
Add `Materials Science` into the catalog browse by adding this code (alphabetically among the other categories) to `/visualize/github-data/category_info.json`:
196196

@@ -211,11 +211,11 @@ Add `Materials Science` into the catalog browse by adding this code (alphabetica
211211
]
212212
},
213213

214-
### Deprecated RADIUSS features
214+
## RADIUSS Features
215215

216-
April 2022: RADIUSS launched at [github.com/llnl/radiuss](https://github.com/llnl/radiuss). See tasks in [issue 567](https://github.com/LLNL/llnl.github.io/issues/567). If we ever want/need to reinstate RADIUSS browsing, branding, and other features on this site, here's what to do:
216+
April 2022: RADIUSS launched at [github.com/llnl/radiuss](https://github.com/llnl/radiuss). See tasks in [issue 567](https://github.com/LLNL/llnl.github.io/issues/567). If we ever want/need to reinstate RADIUSS browsing, branding, and other features on *this* site, here's what to do:
217217

218-
* Add `RADIUSS` back into the catalog browse (i.e., to "live" on this website) by adding this code (as lines 154-168) to `/visualize/github-data/category_info.json`:
218+
* Add `RADIUSS` back into the catalog browse (i.e., to "live" on this website) by replacing the existing code (lines 190–205) in `/visualize/github-data/category_info.json` with this:
219219

220220
```bash
221221
"RADIUSS": {
@@ -235,9 +235,9 @@ April 2022: RADIUSS launched at [github.com/llnl/radiuss](https://github.com/lln
235235
},
236236
```
237237

238-
Note that `/project/category_info_radiuss.json` is not currently being used. If it were to be reinstated, it would need its categories updated to match the latest Catalog (e.g., `Docs and Tutorials``).
238+
Note that `/project/category_info_radiuss.json` is not currently being used. If it were to be reinstated, it would need its categories updated to match the latest Catalog (e.g., `Docs and Tutorials`).
239239

240-
* Comment back in lines 31-38 in `Category.service.js`
240+
<!--* Comment back in lines 31-38 in `Category.service.js`
241241
242242
```bash
243243
this.containsRadiussTopics = function(catTopics, repoTopics) {
@@ -248,23 +248,23 @@ Note that `/project/category_info_radiuss.json` is not currently being used. If
248248
}
249249
return false;
250250
};
251-
```
251+
```-->
252252

253253
* Update link/text on home page
254-
* Update links/text on Policies & Guidelines page
255-
* Update links/text on FAQ page
254+
* Update links/text on [Policies & Guidelines](/about/policies)
255+
* Update links/text on [FAQ](/about/faq)
256256
* Update relevant READMEs
257257
* Update links/text on <https://dev.llnl.gov/radiuss/>
258258
* Point URL alias <https://radiuss.llnl.gov> back to `/explore/#/RADIUSS` (request this of <webmaster-comp@llnl.gov>)
259259

260260
No changes yet, if ever:
261261

262-
* Policies & Guidelines are currently still on this site: (/about/policies)
263-
* RADIUSS logo (`radiuss.svg`) is still in the `/assets/` folder
262+
* [Policies & Guidelines](/about/policies) are currently still on this site
263+
* RADIUSS logo (`radiuss-icon-bw.png`) is still in the `/assets/images/` folder
264264

265265
{% endcapture %}
266266
{% assign accordionContent = accordionContent | markdownify %}
267-
{% include components/accordion.html title='For site admins only: notes on future and deprecated features' slug='admins' content=accordionContent %}
267+
{% include components/accordion.html title='For site admins: notes on deprecated features' slug='admins' content=accordionContent %}
268268

269269
</div>
270270
<!-- END: Accordions -->

about/index.md

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ LLNL is a Department of Energy ([DOE](https://www.energy.gov/national-laboratori
3939
</div>
4040
</div>
4141

42-
We often work with other national labs, universities, and industry partners. Working on these projects is a lot easier when we can share code directly. The Exascale Computing Project ([ECP](https://www.exascaleproject.org)) uses OSS to develop the exascale ecosystem of apps, analytics, infrastructure, and so much more. Future breakthroughs will likely owe some debt to the best practices and accelerated development made possible by OSS.
42+
We often work with other national labs, universities, and industry partners. Working on these projects is a lot easier when we can share code directly. The DOE's Exascale Computing Project ([ECP](https://www.exascaleproject.org)) (2016–2024) used OSS to develop the exascale ecosystem of apps, analytics, infrastructure, and so much more. Future breakthroughs will likely owe some debt to the best practices and accelerated development made possible by OSS.
4343

4444
One of the great things about a large government organization is that we're not motivated by profit. "The greater good" might sound like a cliché, but it's true. LLNL's national security mission governs our work, so our OSS portfolio of apps, libraries, compilers, and other tools support that mission. This includes everything from monitoring the performance of our supercomputers to making multiphysics codes run more smoothly.
4545

@@ -68,39 +68,38 @@ This website abounds with examples of projects that have found a home in the ope
6868
<!-- START: Quicklinks boxes -->
6969
{% capture cardContent %}
7070
* [LLNL Software News](/news)
71+
* [LLNL Computing News](https://computing.llnl.gov/topic/open-source-software)
72+
* [The Lab that Launched a Thousand Software Projects](https://computing.llnl.gov/about/newsroom/lab-launched-thousand-software-projects)
7173
* [The Case for Open Source Software](https://18f.gsa.gov/2018/07/12/the-case-for-open-source-software/)
72-
* [OSS Spotlight: LLNL and ZFS on Linux](https://medium.com/codedotgov/oss-spotlight-lawrence-livermore-national-laboratory-and-zfs-on-linux-6596fca6e5f6)
73-
* [Spack, A Lab-Developed ‘App Store for Supercomputers,’ becoming Standard-Bearer](https://www.llnl.gov/news/spack-lab-developed-app-store-supercomputers-becoming-standard-bearer)
74+
* [Ambassadors of Code](https://str.llnl.gov/2018-01/lee) (*Science & Technology Review* cover story)
7475
{% endcapture %}
7576
{% assign cardContent = cardContent | markdownify %}
76-
{% include components/card.html title='Open Source at LLNL' content=cardContent classes="h-100" %}
77+
{% include components/card.html title='News Coverage' content=cardContent classes="h-100" %}
7778
<!-- END: Quicklinks boxes -->
7879
</div>
7980
<div class="col-12 col-lg-4">
8081
<!-- START: Quicklinks boxes -->
81-
{% capture cardTitle %}
82-
*Science & Technology Review* coverage
83-
{% endcapture %}
8482
{% capture cardContent %}
85-
* [Ambassadors of Code (cover story)](https://str.llnl.gov/2018-01/lee)
86-
* [Ambassadors of Code (video, 3:04)](https://youtu.be/nTxMn1NWHQU)
87-
* [Commentary by Bruce Hendrickson](https://str.llnl.gov/2018-01/comjan18)
88-
* [Visualization Software Stands the Test of Time](https://str.llnl.gov/2021-05/brugger)
83+
* [UnifyFS: User-Level File System for Supercomputers](https://computing.llnl.gov/projects/unifyfs)
84+
* [UMap: An Application-Oriented, User-Level Memory-Mapping Library](https://computing.llnl.gov/projects/umap)
85+
* [zfp: Compressed Floating-Point and Integer Arrays](https://computing.llnl.gov/projects/zfp)
86+
* [Variorum: Vendor-Agnostic Power Management](https://computing.llnl.gov/projects/variorum)
87+
* [The Laboratory’s Habit of Innovation](https://str.llnl.gov/past-issues/march-2024/laboratorys-habit-innovation) (*Science & Technology Review* cover story)
8988
{% endcapture %}
90-
{% assign cardTitle = cardTitle | markdownify %}
9189
{% assign cardContent = cardContent | markdownify %}
92-
{% include components/card.html title=cardTitle content=cardContent classes="h-100" %}
90+
{% include components/card.html title='R&D 100 Winners (2023–2024)' content=cardContent classes="h-100" %}
9391
<!-- END: Quicklinks boxes -->
9492
</div>
9593
<div class="col-12 col-lg-4">
9694
<!-- START: Quicklinks boxes -->
9795
{% capture cardContent %}
98-
* [Releasing Open Source Software at the Lab (poster)](https://computing.llnl.gov/sites/default/files/COMP_Poster_OSS.pdf)
99-
* [Open Source at LLNL (video, 11:31)](https://youtu.be/kL4wIYhNVxE)
100-
* [Open Source at LLNL (slides)](https://computing.llnl.gov/sites/default/files/2020CompExpo_Open_Source.pdf)
96+
* [How Will El Capitan Run? Software and Storage Solutions Powering NNSA’s First Exascale Supercomputer](https://www.youtube.com/watch?v=K7ccgEoJnuM) (5:56)
97+
* [Supercomputer Problems You’ve Never Heard Of](https://www.youtube.com/watch?v=IZSWymZmkc0) (5:39)
98+
* [Ambassadors of Code](https://www.youtube.com/watch?v=nTxMn1NWHQU) (3:04)
99+
* [An Introduction to Open Source Software](https://www.youtube.com/watch?v=kL4wIYhNVxE) (11:31)
101100
{% endcapture %}
102101
{% assign cardContent = cardContent | markdownify %}
103-
{% include components/card.html title='LLNL Computing Virtual Expo Materials' content=cardContent classes="h-100" %}
102+
{% include components/card.html title='Multimedia' content=cardContent classes="h-100" %}
104103
<!-- END: Quicklinks boxes -->
105104
</div>
106105
</div>

assets/js/news/news.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module('tid-custom', ['ngAnimate'])
4141

4242
angular.module("app", ['tid-custom']).controller("PostController", function($scope, $sce) {
4343
$scope.sortByValue = '-date';
44-
$scope.lowerBoundYear = 2021;
44+
$scope.lowerBoundYear = 2023;
4545

4646
for (var i = 0; i < posts.items.length; i++) {
4747
var post = posts.items[i],

assets/js/news/release.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ angular.module("app", ['ngAnimate']).controller("ReleaseController", function($s
55
$scope.releases = [];
66
$scope.activeYear = null;
77

8-
$scope.lowerBoundYear = 2021;
8+
$scope.lowerBoundYear = 2023;
99

1010
$scope.filterByPublishedAt = function(value, index, array) {
1111
return !$scope.activeYear || ($scope.activeYear && value.publishedAt.value.getFullYear() == $scope.activeYear);

news/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: News
33
layout: default
4-
description: Get answers to frequently asked questions about Lawrence Livermore National Laboratory's open source software.
4+
description: Get answers to frequently asked questions about LLNL's open source software.
55
permalink: /news/
66
breadcrumb: News
77
---

0 commit comments

Comments
 (0)