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

Release v0.3.0 #44

Merged
merged 40 commits into from
Oct 6, 2023
Merged

Release v0.3.0 #44

merged 40 commits into from
Oct 6, 2023

Conversation

jtherrmann
Copy link
Contributor

For reference, here's a diff of the template files against their upstream versions:

diff -ur ./copyright.html /home/jth/code/mkdocs-asf-theme/asf_theme/partials/copyright.html
--- ./copyright.html	2023-10-06 11:34:17.617855230 -0800
+++ /home/jth/code/mkdocs-asf-theme/asf_theme/partials/copyright.html	2023-10-04 13:29:26.163267474 -0800
@@ -20,20 +20,26 @@
   IN THE SOFTWARE.
 -->
 
+<!-- Adapted from https://github.com/squidfunk/mkdocs-material/blob/9.4.2/src/templates/partials/copyright.html -->
+
 <!-- Copyright and theme information -->
 <div class="md-copyright">
-  {% if config.copyright %}
-    <div class="md-copyright__highlight">
-      {{ config.copyright }}
-    </div>
-  {% endif %}
-  {% if not config.extra.generator == false %}
-    Made with
-    <a
-      href="https://squidfunk.github.io/mkdocs-material/"
-      target="_blank" rel="noopener"
-    >
-      Material for MkDocs
+  <div class="md-copyright__highlight">
+    {% if config.copyright or config.theme.copyright %}
+      &copy; <span id="copyright-year"></span>
+      <script type="text/javascript">
+          current_year = new Date().getFullYear();
+          document.getElementById("copyright-year").innerHTML=current_year;
+      </script>
+      {{ config.copyright if config.copyright else config.theme.copyright}}
+    {% endif %}
+    <!-- ASF non-discrimination disclaimer-->
+    &nbsp;&nbsp;
+    <a href="https://www.alaska.edu/nondiscrimination"
+       target="_blank"
+       class="md-copyright-link">
+      UA is an AA/EO employer and educational institution and prohibits
+      illegal discrimination against any individual
     </a>
-  {% endif %}
-</div>
+  </div>
+</div>
\ No newline at end of file
diff -ur ./footer.html /home/jth/code/mkdocs-asf-theme/asf_theme/partials/footer.html
--- ./footer.html	2023-10-06 11:35:20.637641712 -0800
+++ /home/jth/code/mkdocs-asf-theme/asf_theme/partials/footer.html	2023-10-04 13:29:26.163267474 -0800
@@ -20,6 +20,8 @@
   IN THE SOFTWARE.
 -->
 
+<!-- Adapted from https://github.com/squidfunk/mkdocs-material/blob/9.4.2/src/templates/partials/footer.html -->
+
 <!-- Footer -->
 <footer class="md-footer">
 
@@ -82,6 +84,42 @@
         {% endif %}
       </nav>
     {% endif %}
+      <!-- ASF Footer information-->
+      <div class="md-grid">
+        <div class="md-footer-container md-grid">
+          <div class="md-footer-container-item">
+            <img src="{{ 'assets/images/asf-logo-blue-nav.png' | url }}"
+                 alt="ASF Logo"
+                 class="md-footer-logo">
+          </div>
+          <div class="md-footer-container-item md-about-us">
+            <h1>About Us</h1>
+            <p>
+              The Alaska Satellite Facility downlinks, processes, archives, and
+              distributes remote-sensing data to scientific users around the world.
+              ASF’s mission is to make remote-sensing data accessible.
+            </p>
+            <p>
+              <a href="https://asf.alaska.edu/about-asf/" target="_blank">
+                Read More
+              </a>
+            </p>
+          </div>
+          <div class="md-footer-container-item md-contact-info">
+            <h1>Contact Info</h1>
+            <p>
+              Alaska Satellite Facility<br>
+              2156 Koyukuk Drive<br>
+              Fairbanks, AK 99775<br>
+              (907) 474-5041<br>
+              [email protected]<br>
+            </p>
+            <p>
+              <a href="javascript:feedback.showForm();">Send Us A Message</a>
+            </p>
+          </div>
+        </div>
+      </div>
   {% endif %}
 
   <!-- Further information -->
@@ -90,9 +128,7 @@
       {% include "partials/copyright.html" %}
 
       <!-- Social links -->
-      {% if config.extra.social %}
-        {% include "partials/social.html" %}
-      {% endif %}
+      {% include "partials/social.html" %}
     </div>
   </div>
 </footer>
diff -ur ./header.html /home/jth/code/mkdocs-asf-theme/asf_theme/partials/header.html
--- ./header.html	2023-10-06 11:35:36.341597561 -0800
+++ /home/jth/code/mkdocs-asf-theme/asf_theme/partials/header.html	2023-10-04 13:50:17.416007521 -0800
@@ -20,6 +20,8 @@
   IN THE SOFTWARE.
 -->
 
+<!-- Adapted from https://github.com/squidfunk/mkdocs-material/blob/9.4.2/src/templates/partials/header.html -->
+
 <!-- Determine classes -->
 {% set class = "md-header" %}
 {% if "navigation.tabs.sticky" in features %}
@@ -35,6 +37,19 @@
     aria-label="{{ lang.t('header') }}"
   >
 
+    {% if config.theme.asf_logo %}
+    <!-- Link to ASF -->
+    <a
+      href="{{ config.theme.asf_logo_url }}"
+      title="ASF"
+      class="md-header__button md-logo"
+      aria-label="ASF"
+      data-md-component="logo"
+    >
+      <img src="{{ config.theme.asf_logo | url }}" alt="logo" />
+    </a>
+    {% endif %}
+
     <!-- Link to home -->
     <a
       href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}"
@@ -85,7 +100,7 @@
     {% endif %}
 
     <!-- Button to open search modal -->
-    {% if "material/search" in config.plugins %}
+    {% if "search" in config.plugins %}
       <label class="md-header__button md-icon" for="__search">
         {% set icon = config.theme.icon.search or "material/magnify" %}
         {% include ".icons/" ~ icon ~ ".svg" %}
Only in /home/jth/code/mkdocs-asf-theme/asf_theme/partials/: search.html
diff -ur ./social.html /home/jth/code/mkdocs-asf-theme/asf_theme/partials/social.html
--- ./social.html	2023-10-06 11:35:48.729569052 -0800
+++ /home/jth/code/mkdocs-asf-theme/asf_theme/partials/social.html	2023-10-04 13:29:26.163267474 -0800
@@ -20,9 +20,11 @@
   IN THE SOFTWARE.
 -->
 
+<!-- Adapted from https://github.com/squidfunk/mkdocs-material/blob/9.4.2/src/templates/partials/social.html -->
+
 <!-- Social links -->
 <div class="md-social">
-  {% for social in config.extra.social %}
+  {% for social in config.theme.social + config.extra.social %}
 
     <!-- Automatically set rel=me for Mastodon -->
     {% set rel = "noopener" %}

@jtherrmann jtherrmann added the minor Bump the minor version number of this project label Oct 6, 2023
@jtherrmann jtherrmann requested a review from jhkennedy October 6, 2023 20:23
@jtherrmann jtherrmann mentioned this pull request Oct 6, 2023
3 tasks
jhkennedy
jhkennedy previously approved these changes Oct 6, 2023
Copy link
Contributor

@jhkennedy jhkennedy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! 👍 :shipit:

I left one minor nitpick suggestion, but it doesn't need to block this PR.

asf_theme/partials/copyright.html Outdated Show resolved Hide resolved
@jhkennedy jhkennedy merged commit f70ea00 into main Oct 6, 2023
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
minor Bump the minor version number of this project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants