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

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

Merged
merged 4 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions docs/site/assets/css/page.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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%;
}
Expand Down
51 changes: 41 additions & 10 deletions docs/site/assets/js/cldrsite.js
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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: {
Expand All @@ -149,8 +169,11 @@ const SiteMap = {
};

const PageContents = {
components: {
SubContents,
},
props: {
tree: {
children: {
type: Object,
required: true,
},
Expand All @@ -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>
`,
};
Expand Down Expand Up @@ -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() {
Expand All @@ -399,6 +420,7 @@ if (myPath === "sitemap.html") {
},
props: {
path: String,
anchorElements: Object,
},
computed: {
/** base path: 'index' or 'downloads/cldr-33' */
Expand All @@ -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;
Expand All @@ -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");
Loading