fix Edit this page and footer navigator, versioning

sbt · Feb 29, 2024 · 9d13784 · 9d13784
1 parent 722479c
commit 9d13784
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/theme/src/main/assets/page.st b/theme/src/main/assets/page.st
@@ -161,7 +161,9 @@ $!
                           "search.suggest",
                           "search.highlight",
                           "content.code.copy",
-                          "navigation.footer"
+                          "navigation.footer",
+                          "content.action.edit",
+                          "content.tooltips"
                 ],
                 "search":  "$page.base$assets/javascripts/workers/search.b8dbb3d2.min.js",
                 "translations":  {

diff --git a/theme/src/main/assets/partials/content.st b/theme/src/main/assets/partials/content.st
@@ -1,14 +1,13 @@
+$ if (page.source_url) $
+  <a href="$page.source_url$" title="Edit this page" class="md-content__button md-icon">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10 20H6V4h7v5h5v3.1l2-2V8l-6-6H6c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h4v-2m10.2-7c.1 0 .3.1.4.2l1.3 1.3c.2.2.2.6 0 .8l-1 1-2.1-2.1 1-1c.1-.1.2-.2.4-.2m0 3.9L14.1 23H12v-2.1l6.1-6.1 2.1 2.1Z"></path></svg>
+  </a>
+$ endif $
+
 <div class="md-content__searchable">
   $page.content$
 </div>
 
-$ if (page.source_url) $
-  <div>
-    <a href="$page.source_url$" title="Edit this page" class="md-source-file md-edit">
-      Edit this page
-    </a>
-  </div>
-$ endif $
 <div class="print-only">
   <span class="md-source-file md-version">
     $page.properties.("project.version.short")$

diff --git a/theme/src/main/assets/partials/footer.st b/theme/src/main/assets/partials/footer.st
@@ -22,15 +22,15 @@ $!
 !$
 <footer class="md-footer">
   $ if (page.next.html || page.prev.html) $
-    <nav class="md-footer-nav__inner md-grid" aria-label="footer"
+    <nav class="md-footer__inner md-grid" aria-label="Footer">
       $ if (page.prev.html) $
-        <a href="$page.prev.href$" class="md-footer__link md-footer__link--prev" aria-label="$page.prev.title$" title="$page.prev.title$">
+        <a href="$page.prev.href$" class="md-footer__link md-footer__link--prev" aria-label="$page.prev.title$">
           <div class="md-footer__button md-icon">
-            <i class="md-icon md-icon--arrow-back md-footer-nav__button"></i>
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20 11v2H8l5.5 5.5-1.42 1.42L4.16 12l7.92-7.92L13.5 5.5 8 11h12Z"/></svg>
           </div>
           <div class="md-footer__title">
             <span class="md-footer__direction">
-                Previous
+              Previous
             </span>
             <div class="md-ellipsis">
               $page.prev.title$
@@ -39,17 +39,17 @@ $!
         </a>
       $ endif $
       $ if (page.next.html) $
-        <a href="$page.next.href$" class="md-footer__link md-footer__link--next" aria-label="$page.next.title$" title="$page.next.title$">
+        <a href="$page.next.href$" class="md-footer__link md-footer__link--next" aria-label="$page.next.title$">
           <div class="md-footer__title">
             <span class="md-footer__direction">
-                Next
+              Next
             </span>
             <div class="md-ellipsis">
               $page.next.title$
             </div>
           </div>
           <div class="md-footer__button md-icon">
-               <i class="md-icon md-icon--arrow-forward md-footer-nav__button"></i>
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M4 11v2h12l-5.5 5.5 1.42 1.42L19.84 12l-7.92-7.92L10.5 5.5 16 11H4Z"/></svg>
           </div>
         </a>
       $ endif $

diff --git a/theme/src/main/assets/partials/header.st b/theme/src/main/assets/partials/header.st
@@ -39,6 +39,9 @@ $!
           <span class="md-ellipsis">
            $page.home.title$
           </span>
+          <div class="md-version">
+            <span class="md-version__current">$page.properties.("project.version.short")$</span>
+          </div>
         </div>
         <div class="md-header__topic" data-md-component="header-topic">
           <span class="md-ellipsis">