Skip to content
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
24 changes: 12 additions & 12 deletions packages/cli/test/functional/test_site/expected/bugs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
<meta name="generator" content="MarkBind 4.0.2">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Open Bugs</title>
<link rel="stylesheet" href="../markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="../markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="../markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="../markbind/css/octicons.css">
<link rel="stylesheet" href="../markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="../markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="../markbind/css/markbind.min.css">
<script src="../markbind/js/polyfill.min.js"></script>
<script src="../markbind/js/vue.min.js"></script>
<script src="../markbind/js/markbind.min.js"></script>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/octicons.css">
<link rel="stylesheet" href="/test_site/markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="/test_site/markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/markbind.min.css">
<script src="/test_site/markbind/js/polyfill.min.js"></script>
<script src="/test_site/markbind/js/vue.min.js"></script>
<script src="/test_site/markbind/js/markbind.min.js"></script>
<script src="index.page-vue-render.js"></script>
<script src="../markbind/js/jquery.min.js"></script>
<script src="/test_site/markbind/js/jquery.min.js"></script>
<link rel="stylesheet" href="/test_site/plugins/testMarkbindPlugin/testMarkbindPluginStylesheet.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-anchors/markbind-plugin-anchors.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-tree/markbind-plugin-tree.css">
Expand Down Expand Up @@ -231,7 +231,7 @@ <h1 id="heading-in-footer-should-not-be-indexed"><span id="heading-in-footer-sho
</div>
</div>
</body>
<script src="../markbind/js/bootstrap-utility.min.js"></script>
<script src="/test_site/markbind/js/bootstrap-utility.min.js"></script>
<script>
MarkBind.setupWithSearch()
</script>
Expand Down
24 changes: 12 additions & 12 deletions packages/cli/test/functional/test_site/expected/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
<meta name="generator" content="MarkBind 4.0.2">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Hello World</title>
<link rel="stylesheet" href="markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="markbind/css/octicons.css">
<link rel="stylesheet" href="markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="markbind/css/markbind.min.css">
<script src="markbind/js/polyfill.min.js"></script>
<script src="markbind/js/vue.min.js"></script>
<script src="markbind/js/markbind.min.js"></script>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/octicons.css">
<link rel="stylesheet" href="/test_site/markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="/test_site/markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/markbind.min.css">
<script src="/test_site/markbind/js/polyfill.min.js"></script>
<script src="/test_site/markbind/js/vue.min.js"></script>
<script src="/test_site/markbind/js/markbind.min.js"></script>
<script src="index.page-vue-render.js"></script>
<script src="markbind/js/jquery.min.js"></script>
<script src="/test_site/markbind/js/jquery.min.js"></script>
<link rel="stylesheet" href="/test_site/plugins/testMarkbindPlugin/testMarkbindPluginStylesheet.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-anchors/markbind-plugin-anchors.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-tree/markbind-plugin-tree.css">
Expand Down Expand Up @@ -804,7 +804,7 @@ <h1 id="heading-in-footer-should-not-be-indexed"><span id="heading-in-footer-sho
</div>
</div>
</body>
<script src="markbind/js/bootstrap-utility.min.js"></script>
<script src="/test_site/markbind/js/bootstrap-utility.min.js"></script>
<script>
MarkBind.setupWithSearch()
</script>
Expand Down
24 changes: 12 additions & 12 deletions packages/cli/test/functional/test_site/expected/sub_site/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
<meta name="generator" content="MarkBind 4.0.2">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="../markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="../markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="../markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="../markbind/css/octicons.css">
<link rel="stylesheet" href="../markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="../markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="../markbind/css/markbind.min.css">
<script src="../markbind/js/polyfill.min.js"></script>
<script src="../markbind/js/vue.min.js"></script>
<script src="../markbind/js/markbind.min.js"></script>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/octicons.css">
<link rel="stylesheet" href="/test_site/markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="/test_site/markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/markbind.min.css">
<script src="/test_site/markbind/js/polyfill.min.js"></script>
<script src="/test_site/markbind/js/vue.min.js"></script>
<script src="/test_site/markbind/js/markbind.min.js"></script>
<script src="index.page-vue-render.js"></script>
<script src="../markbind/js/jquery.min.js"></script>
<script src="/test_site/markbind/js/jquery.min.js"></script>
<link rel="stylesheet" href="/test_site/plugins/testMarkbindPlugin/testMarkbindPluginStylesheet.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-anchors/markbind-plugin-anchors.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-tree/markbind-plugin-tree.css">
Expand Down Expand Up @@ -239,7 +239,7 @@ <h1 id="heading-in-footer-should-not-be-indexed"><span id="heading-in-footer-sho
</div>
</div>
</body>
<script src="../markbind/js/bootstrap-utility.min.js"></script>
<script src="/test_site/markbind/js/bootstrap-utility.min.js"></script>
<script>
MarkBind.setupWithSearch()
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
<meta name="generator" content="MarkBind 4.0.2">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<link rel="stylesheet" href="../../markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="../../markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="../../markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="../../markbind/css/octicons.css">
<link rel="stylesheet" href="../../markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="../../markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="../../markbind/css/markbind.min.css">
<script src="../../markbind/js/polyfill.min.js"></script>
<script src="../../markbind/js/vue.min.js"></script>
<script src="../../markbind/js/markbind.min.js"></script>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
Copy link
Contributor

@tlylt tlylt Sep 22, 2022

Choose a reason for hiding this comment

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

Is this a concern? I am thinking maybe it needs to read the files under the nested_sub_site, which maybe somehow could be different from the outer site (maybe due to a change in markbind version).

(hmm is subsite supposed to contain its own stylesheets etc?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, subsites also use the parent site's assets.

I understand the confusion; I don't think we're clearly communicating enough what subsites really are. (I was confused in the beginning as well, also I see it many times in #1870)

At the current its just a over the top way of saying: I will ensure your use of {{ baseUrl }} in subsites resolves correctly, if you try to use a file in the subsite from the parent site.

"Use" being anything that requires resolving these links correctly:

  • <include/panel>-ing it
  • {% include %}-ing it
  • probably more

I've come to think the status quo is fine (but the documentation clearly needs to be made clearer given all the confusion), but if you have any ideas please help to drive the discussion #1307! 🙌

cc @damithc

Copy link
Contributor

Choose a reason for hiding this comment

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

In the CS2103 website, se-book has it's own assets which are used when it is on its own e.g., https://se-education.org/se-book/
But when the se-book is being used as a sub-site inside CS2103 website, the outer site's assets are being used for the se-book as well (I think).

<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/octicons.css">
<link rel="stylesheet" href="/test_site/markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="/test_site/markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/markbind.min.css">
<script src="/test_site/markbind/js/polyfill.min.js"></script>
<script src="/test_site/markbind/js/vue.min.js"></script>
<script src="/test_site/markbind/js/markbind.min.js"></script>
<script src="index.page-vue-render.js"></script>
<script src="../../markbind/js/jquery.min.js"></script>
<script src="/test_site/markbind/js/jquery.min.js"></script>
<link rel="stylesheet" href="/test_site/plugins/testMarkbindPlugin/testMarkbindPluginStylesheet.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-anchors/markbind-plugin-anchors.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-tree/markbind-plugin-tree.css">
Expand Down Expand Up @@ -230,7 +230,7 @@ <h1 id="heading-in-footer-should-not-be-indexed"><span id="heading-in-footer-sho
</div>
</div>
</body>
<script src="../../markbind/js/bootstrap-utility.min.js"></script>
<script src="/test_site/markbind/js/bootstrap-utility.min.js"></script>
<script>
MarkBind.setupWithSearch()
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
<meta name="generator" content="MarkBind 4.0.2">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Hello World</title>
<link rel="stylesheet" href="../../markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="../../markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="../../markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="../../markbind/css/octicons.css">
<link rel="stylesheet" href="../../markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="../../markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="../../markbind/css/markbind.min.css">
<script src="../../markbind/js/polyfill.min.js"></script>
<script src="../../markbind/js/vue.min.js"></script>
<script src="../../markbind/js/markbind.min.js"></script>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/octicons.css">
<link rel="stylesheet" href="/test_site/markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="/test_site/markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/markbind.min.css">
<script src="/test_site/markbind/js/polyfill.min.js"></script>
<script src="/test_site/markbind/js/vue.min.js"></script>
<script src="/test_site/markbind/js/markbind.min.js"></script>
<script src="testNunjucksPathResolving.page-vue-render.js"></script>
<script src="../../markbind/js/jquery.min.js"></script>
<script src="/test_site/markbind/js/jquery.min.js"></script>
<link rel="stylesheet" href="/test_site/plugins/testMarkbindPlugin/testMarkbindPluginStylesheet.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-anchors/markbind-plugin-anchors.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-tree/markbind-plugin-tree.css">
Expand Down Expand Up @@ -235,7 +235,7 @@ <h1 id="heading-in-footer-should-not-be-indexed"><span id="heading-in-footer-sho
</div>
</div>
</body>
<script src="../../markbind/js/bootstrap-utility.min.js"></script>
<script src="/test_site/markbind/js/bootstrap-utility.min.js"></script>
<script>
MarkBind.setupWithSearch()
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
<meta name="generator" content="MarkBind 4.0.2">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Hello World</title>
<link rel="stylesheet" href="../markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="../markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="../markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="../markbind/css/octicons.css">
<link rel="stylesheet" href="../markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="../markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="../markbind/css/markbind.min.css">
<script src="../markbind/js/polyfill.min.js"></script>
<script src="../markbind/js/vue.min.js"></script>
<script src="../markbind/js/markbind.min.js"></script>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/octicons.css">
<link rel="stylesheet" href="/test_site/markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="/test_site/markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/markbind.min.css">
<script src="/test_site/markbind/js/polyfill.min.js"></script>
<script src="/test_site/markbind/js/vue.min.js"></script>
<script src="/test_site/markbind/js/markbind.min.js"></script>
<script src="testNunjucksPathResolving.page-vue-render.js"></script>
<script src="../markbind/js/jquery.min.js"></script>
<script src="/test_site/markbind/js/jquery.min.js"></script>
<link rel="stylesheet" href="/test_site/plugins/testMarkbindPlugin/testMarkbindPluginStylesheet.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-anchors/markbind-plugin-anchors.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-tree/markbind-plugin-tree.css">
Expand Down Expand Up @@ -235,7 +235,7 @@ <h1 id="heading-in-footer-should-not-be-indexed"><span id="heading-in-footer-sho
</div>
</div>
</body>
<script src="../markbind/js/bootstrap-utility.min.js"></script>
<script src="/test_site/markbind/js/bootstrap-utility.min.js"></script>
<script>
MarkBind.setupWithSearch()
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
<meta name="generator" content="MarkBind 4.0.2">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Anchor Generation Test</title>
<link rel="stylesheet" href="markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="markbind/css/octicons.css">
<link rel="stylesheet" href="markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="markbind/css/markbind.min.css">
<script src="markbind/js/polyfill.min.js"></script>
<script src="markbind/js/vue.min.js"></script>
<script src="markbind/js/markbind.min.js"></script>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/octicons.css">
<link rel="stylesheet" href="/test_site/markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="/test_site/markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/markbind.min.css">
<script src="/test_site/markbind/js/polyfill.min.js"></script>
<script src="/test_site/markbind/js/vue.min.js"></script>
<script src="/test_site/markbind/js/markbind.min.js"></script>
<script src="testAnchorGeneration.page-vue-render.js"></script>
<script src="markbind/js/jquery.min.js"></script>
<script src="/test_site/markbind/js/jquery.min.js"></script>
<link rel="stylesheet" href="/test_site/plugins/testMarkbindPlugin/testMarkbindPluginStylesheet.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-anchors/markbind-plugin-anchors.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-tree/markbind-plugin-tree.css">
Expand Down Expand Up @@ -297,7 +297,7 @@ <h1 id="heading-in-footer-should-not-be-indexed"><span id="heading-in-footer-sho
</div>
</div>
</body>
<script src="markbind/js/bootstrap-utility.min.js"></script>
<script src="/test_site/markbind/js/bootstrap-utility.min.js"></script>
<script>
MarkBind.setupWithSearch()
</script>
Expand Down
24 changes: 12 additions & 12 deletions packages/cli/test/functional/test_site/expected/testAnnotate.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
<meta name="generator" content="MarkBind 4.0.2">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Annotate Feature Test</title>
<link rel="stylesheet" href="markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="markbind/css/octicons.css">
<link rel="stylesheet" href="markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="markbind/css/markbind.min.css">
<script src="markbind/js/polyfill.min.js"></script>
<script src="markbind/js/vue.min.js"></script>
<script src="markbind/js/markbind.min.js"></script>
<link rel="stylesheet" href="/test_site/markbind/css/bootstrap.min.css">
<link rel="stylesheet" href="/test_site/markbind/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/test_site/markbind/glyphicons/css/bootstrap-glyphicons.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/octicons.css">
<link rel="stylesheet" href="/test_site/markbind/material-icons/material-icons.css">
<link rel="stylesheet" href="/test_site/markbind/css/codeblock-dark.min.css">
<link rel="stylesheet" href="/test_site/markbind/css/markbind.min.css">
<script src="/test_site/markbind/js/polyfill.min.js"></script>
<script src="/test_site/markbind/js/vue.min.js"></script>
<script src="/test_site/markbind/js/markbind.min.js"></script>
<script src="testAnnotate.page-vue-render.js"></script>
<script src="markbind/js/jquery.min.js"></script>
<script src="/test_site/markbind/js/jquery.min.js"></script>
<link rel="stylesheet" href="/test_site/plugins/testMarkbindPlugin/testMarkbindPluginStylesheet.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-anchors/markbind-plugin-anchors.css">
<link rel="stylesheet" href="/test_site/plugins/markbind-plugin-tree/markbind-plugin-tree.css">
Expand Down Expand Up @@ -284,7 +284,7 @@ <h1 id="heading-in-footer-should-not-be-indexed"><span id="heading-in-footer-sho
</div>
</div>
</body>
<script src="markbind/js/bootstrap-utility.min.js"></script>
<script src="/test_site/markbind/js/bootstrap-utility.min.js"></script>
<script>
MarkBind.setupWithSearch()
</script>
Expand Down
Loading