Skip to content

Commit

Permalink
Merge branch 'DOI-USGS:dev' into jigsaw_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@chkim-usgs
chkim-usgs authored Jan 6, 2025
2 parents a944d34 + e7457b2 commit 7180bc1
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 156 deletions.
Binary file removed isis/src/docsys/assets/img/PIA26068.jpg
View file
Binary file not shown.
Binary file removed isis/src/docsys/assets/img/moon-cr.jpg
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion isis/src/docsys/assets/styles/IsisStyleCommon.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
/* Logo/Brand */

#isis-banner {
background: url(../img/PIA26068.jpg) no-repeat;
background: url(https://asc-docs.s3.us-west-2.amazonaws.com/common/img/PIA26068.jpg) no-repeat;
background-position: 50% 75%;
color: white;
padding: 3rem;
Expand Down
13 changes: 9 additions & 4 deletions isis/src/docsys/build/main.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,20 @@ Deborah Lee Soltesz
</div>
<div class="usa-card__container width-tablet">
<div class="usa-card__header">
<h4 class="usa-card__heading">Documentation Update</h4>
<h4 class="usa-card__heading">Some ISIS Docs have Moved</h4>
</div>
<div class="usa-card__body">
<p>
ISIS documentation, including tutorials, how-to guides, and software usage explanations, has been relocated to <a href="https://astrogeology.usgs.gov/docs/" target="_blank">the USGS Astrogeology Software Docs website</a>. Documentation for previous versions of ISIS remains accessible via the left navigation pane.
ISIS documentation, including ISIS tutorials, guides, and concepts,
has been moved to <a href="https://astrogeology.usgs.gov/docs/" target="_blank">USGS Astrogeology Software Docs</a>.
Manuals for each ISIS Application <a href="{$menuPath}Application/index.html" target="_blank">remain here</a>,
as do docs for previous ISIS versions, accessible via the left panel.

</p>
</div>
<div class="usa-card__footer">
<a href="https://astrogeology.usgs.gov/docs" class="usa-button">Visit USGS Astrogeology Software Docs</a>
<div class="usa-card__footer" style="display: flex;">
<a href="https://astrogeology.usgs.gov/docs" class="usa-button">Go to USGS Astrogeology Software Docs</a>
<a href="{$menuPath}Application/index.html" class="usa-button">Go to ISIS App Manuals</a>
</div>
</div>
</div>
Expand Down
248 changes: 97 additions & 151 deletions isis/src/docsys/build/menu.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,93 +4,100 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">

<!--
This stylesheet will be used to generate the menu for all pages,
Include this file in other XSL files, define variable for menuPath,
and apply the template mode writeMenu .
Author
Deborah Lee Soltesz
12/13/2002
-->
<xsl:template mode="writeFrontPageMenu" name="writeFrontPageMenu">

<nav aria-label="usa-sidenav" class="sidenav">

<div id="nav-title">
<div id="nav-title-text-box">
<em id="nav-title-text">ISIS<br />Documentation</em>
</div>
</div>

<ul class="usa-sidenav">
<li class="usa-sidenav__item">
<a href="{$menuPath}index.html" target="_top" id="homeLink">Home/About</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/index.html" target="_top" id="homeLink">Application&#160;Manuals</a>
<ul class="usa-sidenav__sublist">
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/index.html">By Category</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/alpha.html">By Alphabetical</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/oldvnew.html">Old vs. New</a>
</li>
</ul>
</li>
<li class="usa-sidenav__item">
<a href="https://github.com/DOI-USGS/ISIS3">GitHub</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Object/Developer/index.html">API</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov">Versions</a>
<ul class="usa-sidenav__sublist">
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov">Public&#160;Release</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.3.0/">8.3.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.2.0/">8.2.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.1.0/">8.1.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.0.0/">8.0.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/7.2.0/">7.2.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/7.1.0/">7.1.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/7.0.0/">7.0.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/6.0.0/">6.0.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/3.9.0/">3.9.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/3.5.0/">3.5.0</a>
</li>
</ul>
</li>
</ul>
</nav>

</xsl:template>
<!--
This stylesheet will be used to generate the menu for all pages,
Include this file in other XSL files, define variable for menuPath,
and apply the template mode writeMenu .
Authors:
Deborah Lee Soltesz - 2/13/2002
Jacob Cain and Amy Stamile - 11/22/2024
-->

<xsl:template mode="writeMenuContents" name="writeMenuContents">
<ul class="usa-sidenav">
<li class="usa-sidenav__item">
<a href="{$menuPath}index.html" target="_top" id="homeLink">Home/About</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/index.html" target="_top" id="homeLink">Application&#160;Manuals</a>
<ul class="usa-sidenav__sublist">
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/index.html">By Category</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/alpha.html">By Alphabetical</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/oldvnew.html">Old vs. New</a>
</li>
</ul>
</li>
<li class="usa-sidenav__item">
<a href="https://github.com/DOI-USGS/ISIS3">GitHub</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Object/Developer/index.html">API</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov">Versions</a>
<ul class="usa-sidenav__sublist">
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov">Public&#160;Release</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.3.0/">8.3.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.2.0/">8.2.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.1.0/">8.1.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.0.0/">8.0.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/7.2.0/">7.2.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/7.1.0/">7.1.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/7.0.0/">7.0.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/6.0.0/">6.0.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/3.9.0/">3.9.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/3.5.0/">3.5.0</a>
</li>
</ul>
</li>
</ul>
</xsl:template>

<xsl:template mode="writeFrontPageMenu" name="writeFrontPageMenu">

<nav aria-label="usa-sidenav" class="sidenav">

<div id="nav-title">
<div id="nav-title-text-box">
<em id="nav-title-text">ISIS Application<br />Manuals</em>
</div>
</div>

<xsl:call-template name="writeMenuContents"/>

</nav>

</xsl:template>

<xsl:template mode="writeMenu" name="writeMenu">

<nav aria-label="usa-sidenav" class="sidenav">
Expand All @@ -100,73 +107,12 @@ Deborah Lee Soltesz
<img id="nav-title-logo" height="65" src="{$menuPath}assets/img/isis-logo-yellow-notxt.svg"></img>
</div>
<div id="nav-title-text-box">
<em id="nav-title-text">ISIS<br />Documentation</em>
<em id="nav-title-text">ISIS Application<br />Manuals</em>
</div>
</div>

<ul class="usa-sidenav">
<li class="usa-sidenav__item">
<a href="{$menuPath}index.html" target="_top" id="homeLink">Home/About</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/index.html" target="_top" id="homeLink">Application&#160;Manuals</a>
<ul class="usa-sidenav__sublist">
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/index.html">By Category</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/alpha.html">By Alphabetical</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Application/oldvnew.html">Old vs. New</a>
</li>
</ul>
</li>
<li class="usa-sidenav__item">
<a href="https://github.com/DOI-USGS/ISIS3">GitHub</a>
</li>
<li class="usa-sidenav__item">
<a href="{$menuPath}Object/Developer/index.html">API</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov">Versions</a>
<ul class="usa-sidenav__sublist">
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov">Public&#160;Release</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.3.0/">8.3.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.2.0/">8.2.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.1.0/">8.1.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/8.0.0/">8.0.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/7.2.0/">7.2.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/7.1.0/">7.1.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/7.0.0/">7.0.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/6.0.0/">6.0.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/3.9.0/">3.9.0</a>
</li>
<li class="usa-sidenav__item">
<a href="https://isis.astrogeology.usgs.gov/3.5.0/">3.5.0</a>
</li>
</ul>
</li>
</ul>
<xsl:call-template name="writeMenuContents"/>

</nav>

</xsl:template>
Expand Down

0 comments on commit 7180bc1

Please sign in to comment.