Skip to content

Commit

Permalink
Merge pull request #23 from ivoa/iss22
Browse files Browse the repository at this point in the history
  • Loading branch information
@JeremyMcCormick
JeremyMcCormick authored May 22, 2024
2 parents 606107a + 34f52cc commit 432cd5f
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Now, you will be able to see a local preview of the site at this address in your

## Adding Content to the Site

The ["What is the VO?" page](content/pages/about/what_is_vo.md) provides a simple example of a markdown file. Most pages that you would likely add or change will similarily be located under [content/pages](https://github.com/ivoa/ivoa-web/tree/main/content/pages) in the repository.
The ["What is the VO?" page](content/about/what_is_vo.md) provides a simple example of a markdown file. Most pages that you would likely add or change will similarily be located under [content/pages](https://github.com/ivoa/ivoa-web/tree/main/content/pages) in the repository.

A typical markdown file will have a header followed by the page content, as in:

Expand All @@ -119,7 +119,7 @@ For example, here is the link in the index to the "What is the VO" webpage.

```
<li>
<a href="{{<ref "pages/about/what_is_vo">}}">What is the VO?</a>
<a href="{{<ref "about/what_is_vo">}}">What is the VO?</a>
</li>
```

Expand Down
8 changes: 4 additions & 4 deletions content/_index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ VO aspirations, a framework for discussing and sharing VO ideas and technology,
and body for promoting and publicising the VO.

To learn more about the IVOA as an organisation, read the
"[About](/pages/about/)" section.
"[About](about/)" section.

To learn more about the VO from a user's point of view, including how to find VO
tools and services, read the "[Astronomers](/pages/astronomers/)" section. There
is also a page about the [VO for students and the public](/pages/astronomers/vo_for_public/).
tools and services, read the "[Astronomers](astronomers/)" section. There
is also a page about the [VO for students and the public](astronomers/vo_for_public/).

To learn how to publish VO services, or write VO-compatible software, start by
reading the "[Deployers/Developers](/deployers)" section.
reading the "[Deployers/Developers](deployers)" section.

Internal IVOA discussions are publicly viewable in the "[Members](members)"
section.
0 content/pages/about/what_is_vo.md → content/about/what_is_vo.md
View file
File renamed without changes.
0 content/pages/astronomers/getting_started.md → content/astronomers/getting_started.md
View file
File renamed without changes.
0 ...posts/2022/ivoa_newsletter_march/index.md → ...ent/newsletter/202203_march_newsletter.md
View file
File renamed without changes.
Binary file modified content/posts/2022/multi_messenger_astronomy/cover.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions layouts/partials/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</a>
<nav>
<a href="{{ .Site.Home.Permalink}}">Home</a>
<a href="{{ .Site.Home.Permalink}}/pages/astronomers/">Astronomers</a>
<a href="{{ .Site.Home.Permalink}}/pages/deployers/">Deployers</a>
<a href="{{ .Site.Home.Permalink}}/pages/members/">Members</a>
<a href="{{ .Site.Home.Permalink}}/pages/about/">About</a>
<a href="{{ .Site.Home.Permalink}}/astronomers/">Astronomers</a>
<a href="{{ .Site.Home.Permalink}}/deployers/">Deployers</a>
<a href="{{ .Site.Home.Permalink}}/members/">Members</a>
<a href="{{ .Site.Home.Permalink}}/about/">About</a>
</nav>
</header>
34 changes: 17 additions & 17 deletions layouts/partials/sitemap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<div class="card-list">
<ul>
<li>
<a href="{{ .Site.Home.Permalink}}/pages/about/what_is_vo">
<a href="{{ .Site.Home.Permalink}}/about/what_is_vo/">
What is the VO?
</a>
</li>
<li><a href="https://www.ivoa.net/about/what-is-ivoa.html">What is the IVOA?</a></li>
<li><a href="https://www.ivoa.net/about/member-organizations.html">Who is involved?</a></li>
<li><a href="https://www.ivoa.net/about/roadmap.html">Accomplishments and future plans</a></li>
<li><a href="https://www.ivoa.net/about/contacts.html">How do I contact the IVOA?</a></li>
<li><a href="https://www.ivoa.net/about/participation.html">How can I participate?</a></li>
<li><a href="https://www.ivoa.net/members/IVOA_Code_of_Conduct.pdf">Code of Conduct</a></li>
<li><a href="{{ .Site.Home.Permalink}}/about/what-is-ivoa/">What is the IVOA?</a></li>
<li><a href="{{ .Site.Home.Permalink}}/about/member-organizations/">Who is involved?</a></li>
<li><a href="{{ .Site.Home.Permalink}}/about/roadmap/">Accomplishments and future plans</a></li>
<li><a href="{{ .Site.Home.Permalink}}/about/contacts/">How do I contact the IVOA?</a></li>
<li><a href="{{ .Site.Home.Permalink}}/about/participation/">How can I participate?</a></li>
<li><a href="{{ .Site.Home.Permalink}}/members/IVOA_Code_of_Conduct.pdf">Code of Conduct</a></li>
</ul>
</div>
</div>
Expand All @@ -26,12 +26,12 @@

<div class="card-list">
<ul>
<li><a href="{{ .Site.Home.Permalink}}/pages/astronomers/getting_started/">Getting Started</a></li>
<li><a href="https://www.ivoa.net/astronomers/using_the_vo.html">Using the VO</a></li>
<li><a href="https://www.ivoa.net/astronomers/vo_glossary.html">VO Glossary</a></li>
<li><a href="https://www.ivoa.net/astronomers/applications.html">VO Applications</a></li>
<li><a href="https://www.ivoa.net/newsletter/index.html">IVOA newsletter</a></li>
<li><a href="https://www.ivoa.net/astronomers/vo_for_public.html">VO for Students & Public</a></li>
<li><a href="{{ .Site.Home.Permalink}}/astronomers/getting_started/">Getting Started</a></li>
<li><a href="{{ .Site.Home.Permalink}}/astronomers/using_the_vo/">Using the VO</a></li>
<li><a href="{{ .Site.Home.Permalink}}/astronomers/vo_glossary/">VO Glossary</a></li>
<li><a href="{{ .Site.Home.Permalink}}/astronomers/applications/">VO Applications</a></li>
<li><a href="{{ .Site.Home.Permalink}}/newsletter/">IVOA newsletter</a></li>
<li><a href="{{ .Site.Home.Permalink}}/astronomers/vo_for_public/">VO for Students & Public</a></li>
</ul>
</div>
</div>
Expand All @@ -41,7 +41,7 @@

<div class="card-list">
<ul>
<li><a href="https://www.ivoa.net/deployers/intro_to_vo_concepts.html">Intro to VO Concepts</a></li>
<li><a href="{{ .Site.Home.Permalink}}/deployers/intro_to_vo_concepts">Intro to VO Concepts</a></li>
<li><a href="https://www.ivoa.net/documents/">IVOA Standards</a></li>
<li><a href="http://wiki.ivoa.net/twiki/bin/view/IVOA/PublishingInTheVONew">Guide to Publishing in the VO</a></li>
<li><a href="http://wiki.ivoa.net/twiki/bin/view/IVOA/VOGlossary">Technical Glossary</a></li>
Expand All @@ -55,11 +55,11 @@
<div class="card-list">
<ul>
<li><a href="http://wiki.ivoa.net/twiki/bin/view/IVOA/IvoaEvents">IVOA Calendar</a></li>
<li><a href="https://www.ivoa.net/members/index.html">Working Groups</a></li>
<li><a href="{{ .Site.Home.Permalink}}/members/">Working Groups</a></li>
<li><a href="http://wiki.ivoa.net/twiki/bin/view/IVOA/WebHome">Twiki</a></li>
<li><a href="https://www.ivoa.net/documents/">Documents in Progress</a></li>
<li><a href="https://www.ivoa.net/members/index.html">Mailing Lists</a></li>
<li><a href="https://www.ivoa.net/about/roadmap.html">IVOA Roadmap</a></li>
<li><a href="{{ .Site.Home.Permalink}}/members/">Mailing Lists</a></li>
<li><a href="{{ .Site.Home.Permalink}}/about/roadmap/">IVOA Roadmap</a></li>
</ul>
</div>

Expand Down

0 comments on commit 432cd5f

Please sign in to comment.