CLDR-18001 site: add Contents to sidebar, fix arrow (#4121)

unicode-org · Oct 9, 2024 · 2fbada0 · 2fbada0
1 parent 21b753d
commit 2fbada0
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 17 deletions.
diff --git a/docs/site/assets/css/page.css b/docs/site/assets/css/page.css
@@ -789,22 +789,20 @@ body.page header .subpages a:hover {
   border: 1pt solid #99f;
 }
 
-.navBar .subpages {
+.navBar .subpages,
+.navBar .submap {
   list-style: none;
   margin: 0.3em;
   padding: 0;
 }
 
-.navBar .subpages li {
+.navBar .subpages li,
+.pagecontents .submap {
   /* hanging indent if the subpage content wraps */
   padding-left: 1em;
   text-indent: -1em;
 }
 
-.subpages .hasChildren {
-  float: right;
-}
-
 header {
   width: "100%";
   background-color: #5555ff;
@@ -876,12 +874,16 @@ div.sitemap {
   padding: 1em;
 }
 
-div.submap {
+.sitemap div.submap {
   margin-left: 1em;
   border-left: 1px solid gray;
   padding-left: 0.5em;
 }
 
+.submap a {
+  padding-left: 0.25em;
+}
+
 div.sitemap {
   height: 90%;
 }

diff --git a/docs/site/assets/js/cldrsite.js b/docs/site/assets/js/cldrsite.js
@@ -1,5 +1,9 @@
 const { ref } = Vue;
 
+// load anchor.js - must be before the sidebar loads. might as well do this
+// first thing.
+anchors.add("h1, h2, h3, h4, h5, h6, caption, dfn");
+
 // site management
 
 let myPath = window.location.pathname.slice(1) || "index.html";
@@ -81,13 +85,13 @@ const SubPagesPopup = {
     },
   },
   template: `
-          <div class="subpages">
+          <div class="subpageList">
           <div class="navHeader">Subpages</div>
           <ul class="subpages" >
               <li v-for="subpage of children" :key="subpage.path">
                   <a v-bind:href="subpage.href">
                       {{ subpage.title }}
-                       <span class="hasChildren" v-if="subpage.children">❱</span>
+                       <span class="hasChildren" v-if="subpage.children">&nbsp;❱</span>
                   </a>
               </li>
           </ul>
@@ -124,6 +128,22 @@ const SubMap = {
   `,
 };
 
+const SubContents = {
+  name: "SubContents",
+  props: {
+    title: String,
+    href: String,
+    children: Object,
+  },
+  setup() {},
+  template: `
+    <div class="submap">
+      <a v-bind:href="href" v-bind:title="path">{{title}}</a>
+      <SubContents v-if="children && children.length" v-for="child in children" :key="child.href" :title="child.title" :href="child.href" :children="child.children" />
+    </div>
+  `,
+};
+
 const SiteMap = {
   props: {
     tree: {
@@ -149,8 +169,11 @@ const SiteMap = {
 };
 
 const PageContents = {
+  components: {
+    SubContents,
+  },
   props: {
-    tree: {
+    children: {
       type: Object,
       required: true,
     },
@@ -159,6 +182,7 @@ const PageContents = {
   template: `
     <div class="pagecontents">
         <div class="navHeader">Contents</div>
+        <SubContents v-if="children && children.length" v-for="child in children" :key="child.href" :title="child.title" :href="child.href" :children="child.children" />
     </div>
   `,
 };
@@ -381,13 +405,10 @@ if (myPath === "sitemap.html") {
         // is the site map shown?
         const showmap = ref(true);
 
-        const contents = ref(null);
-
         return {
           tree,
           status,
           showmap,
-          contents,
         };
       },
       mounted() {
@@ -399,6 +420,7 @@ if (myPath === "sitemap.html") {
       },
       props: {
         path: String,
+        anchorElements: Object,
       },
       computed: {
         /** base path:  'index' or 'downloads/cldr-33' */
@@ -423,6 +445,17 @@ if (myPath === "sitemap.html") {
             children: (usermap[path].children ?? []).length > 0,
           }));
         },
+        contents() {
+          // For now we generate a flat map
+          // this
+          const objects = this.anchorElements?.map(({ textContent, id }) => ({
+            title: textContent,
+            href: `#${id}`,
+            children: null,
+          }));
+          if (!objects?.length) return null;
+          return objects;
+        },
         ourTitle() {
           if (this.tree?.value) {
             if (this.path === "") return this.rootTitle;
@@ -437,17 +470,15 @@ if (myPath === "sitemap.html") {
       },
       template: `
       <div class="navBar" v-if="contents || (children.length)">
-        <PageContents v-if="contents" />
+        <PageContents v-if="contents" :children="contents" />
         <SubPagesPopup v-if="children.length" :children="children"/>
       </div>`,
     },
     {
       // path of / goes to /index.html
       path: myPath,
+      anchorElements: anchors.elements,
     }
   );
   sapp.mount("#sidebar");
 }
-
-// load anchor.js
-anchors.add("h1, h2, h3, h4, h5, h6, caption, dfn");