Skip to content

Commit

Permalink
Merge pull request #18 from ivoa/iss6
Browse files Browse the repository at this point in the history
First prototype of an improved theme/style
  • Loading branch information
gmantele authored May 21, 2024
2 parents ca73cf4 + d32ed83 commit 606107a
Show file tree
Hide file tree
Showing 16 changed files with 729 additions and 137 deletions.
72 changes: 0 additions & 72 deletions content/_index.html

This file was deleted.

20 changes: 20 additions & 0 deletions content/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
The Virtual Observatory (VO) is the vision that astronomical datasets and other
resources should work as a seamless whole. Many projects and data centres
worldwide are working towards this goal. The International Virtual Observatory
Alliance (IVOA) is an organisation that debates and agrees the technical
standards that are needed to make the VO possible. It also acts as a focus for
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.

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/).

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

Internal IVOA discussions are publicly viewable in the "[Members](members)"
section.
2 changes: 1 addition & 1 deletion content/posts/2022/ivoa_newsletter_march/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ A new and important IVOA Architecture document (lead author Pat Dowler) was rele
The Closing Plenary and presentation by the TCG, emphasized progress of standards over the last 6 months, and reminded the audience of the Technical Coordination Group (TCG) and their role in the IVOA. The TCG is made up of Chairs and Vice-Chairs of working groups, interest groups, and committees. They are tasked with building consensus in the WG and community, assure coordination between WG/IG & the Committee for Science Priorities (CSP), liaison with the Executive committee, and support committee roles in the IVOA documents and standards process. TCG membership has a 3 year term with a possible 1 year extension. Members of the astronomical community are welcome to get involved in the IVOA and to consider a role in the TCG.

Here are several links to get involved:
| | | |
| Name | URL | Description |
| ----------------- | --------------------------------- | ------------------------------------------------- |
| IVOA Website | https://www.ivoa.net/ | Place to start |
| IVOA Wiki pages | https://wiki.ivoa.net/ | Collaboration area |
Expand Down
6 changes: 4 additions & 2 deletions layouts/_default/baseof.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
{{- partial "head.html" . -}}
<body>
{{- partial "header.html" . -}}
<div id="content">
<main>
{{- block "main" . }}{{- end }}
</div>
</main>
{{- partial "sitemap.html" . -}}
{{- partial "footer.html" . -}}
{{- partial "scripts.html" . -}}
</body>
</html>
5 changes: 2 additions & 3 deletions layouts/_default/single.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{{ define "main"}}

{{- partial "page-dates.html" . }}

<article class="w3-container w3-content">
<article>
<header>
<h1>{{ .Title }}</h1>
</header>
{{- partial "page-dates.html" . }}
{{ .Content }}
</article>

Expand Down
83 changes: 43 additions & 40 deletions layouts/index.html
Original file line number Diff line number Diff line change
@@ -1,56 +1,59 @@
{{ define "main" }}

<div class="carrousel" id="carrousel">
{{ range $elem_index, $elem_val := where .Site.Pages "Params.tags" "intersect" (slice "banner") }}
{{ if (eq $elem_index 0)}}
<div id="carrousel-{{$elem_index}}">
{{ else }}
<div id="carrousel-{{$elem_index}}" class="w3-hide">
{{ end }}
<section class="with-only-right-aside">
<main class="carrousel">
{{ range $elem_index, $elem_val := where .Site.Pages "Params.tags" "intersect" (slice "banner") }}
{{ if (eq $elem_index 0)}}
<div id="carrousel-{{$elem_index}}" class="carrousel-item active">
{{ else }}
<div id="carrousel-{{$elem_index}}" class="carrousel-item">
{{ end }}

{{ $featured_image := partial "func/GetFeaturedImage.html" . }}
<img class="carrousel-img" src="{{ $featured_image }}" />
{{ $featured_image := partial "func/GetFeaturedImage.html" . }}
<img class="carrousel-img" src="{{ $featured_image }}" />

<div class="carrousel-title">{{ .Title }}</div>
<div class="carrousel-title">{{ .Title }}</div>

{{ with .Params.author | default .Site.Params.author }}
<div class="carrousel-author">{{.}}</div>
{{end}}
{{ with .Params.author | default .Site.Params.author }}
<div class="carrousel-author">{{.}}</div>
{{end}}

<a href="{{ .RelPermalink }}" class="carrousel-action">
READ <i class="fa-solid fa-arrow-right"></i>
</a>
<a href="{{ .RelPermalink }}" class="carrousel-action">
READ <i class="fa-solid fa-arrow-right"></i>
</a>

</div>
{{ end }}

<div class="carrousel-btn carrousel-btn-left" id="carrousel-left">
<i class="fa-solid fa-chevron-left"></i>
</div>

<div class="carrousel-btn carrousel-btn-right" id="carrousel-right">
<i class="fa-solid fa-chevron-right"></i>
</div>
</div>

<div class="cards">
<div class="card">
<div class="card-title">
IVOA News & Upcoming Meetings
</div>
<div class="card-list">
<ul>
{{ range first 3 (where .Site.Pages "Params.tags" "intersect" (slice "news")) }}
<li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
{{ end }}
</ul>
{{ end }}

<div class="carrousel-btn carrousel-btn-left" id="carrousel-left">
<i class="fa-solid fa-chevron-left"></i>
</div>

</div>
<div class="carrousel-btn carrousel-btn-right" id="carrousel-right">
<i class="fa-solid fa-chevron-right"></i>
</div>
</main>

<aside class="right cards">
<div class="card">
<div class="card-title">
IVOA News & Upcoming Meetings
</div>
<div class="card-list">
<ul>
{{ range first 3 (where .Site.Pages "Params.tags" "intersect" (slice "news")) }}
<li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
{{ end }}
</ul>
</div>

</div>
</div>
</aside>
</section>

<!-- rendered content from content/_index.html -->
<div>
{{- .Content -}}
</div>

{{ end }}
4 changes: 2 additions & 2 deletions layouts/partials/footer.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<footer class="footer">
&copy; IVOA.net {{ now.Format "2006"}}
<footer>
&copy; IVOA.net. Contact the <a href="mailto:[email protected]">IVOA Webmaster</a>
</footer>
8 changes: 2 additions & 6 deletions layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="stylesheet" href="/css/w3pro.css">
<link rel="stylesheet" href="/css/fa.min.css">
<link rel="stylesheet" href="/css/base.css">


<script src="/js/main.js" async></script>
<link rel="stylesheet" href="{{ .Site.Home.Permalink}}/css/fa.min.css">
<link rel="stylesheet" href="{{ .Site.Home.Permalink}}/css/ivoa.css">

<title>IVOA.net - International Virtual Observatory Alliance</title>
</head>
21 changes: 12 additions & 9 deletions layouts/partials/header.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<nav class="header">

<a class="header-title" href="{{ .Site.Home.RelPermalink}}">
International Virtual Observatory Alliance
<header>
<a class="header-logo" href="{{ .Site.Home.RelPermalink}}">
<img src="/images/ivoa_logo.png">
<span>International Virtual<br/>Observatory Alliance</span>
</a>

<a href="{{ .Site.Home.RelPermalink}}">
<img class="header-logo" src="/images/ivoa_logo.png">
</a>
</nav>
<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>
</nav>
</header>
1 change: 1 addition & 0 deletions layouts/partials/scripts.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<script src="{{ .Site.Home.Permalink}}/js/main.js" async></script>
70 changes: 70 additions & 0 deletions layouts/partials/sitemap.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<div class="sitemap">
<div class="cards">

<div class="card">
<div class="card-title">About the IVOA</div>

<div class="card-list">
<ul>
<li>
<a href="{{ .Site.Home.Permalink}}/pages/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>
</ul>
</div>
</div>

<div class="card">
<div class="card-title">For Astronomers</div>

<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>
</ul>
</div>
</div>

<div class="card">
<div class="card-title">For Developers</div>

<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="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>
</ul>
</div>
</div>

<div class="card">
<div class="card-title">For Members</div>

<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="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>
</ul>
</div>

</div>

</div>

</div>
Loading

0 comments on commit 606107a

Please sign in to comment.