You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/06/02 16:48:24 UTC

[isis] 10/47: ISIS-2062: reorg pages for ugvw

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2062-antora
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 34445d8dc8556ca3d48d16322f9cb95a8cc2ac55
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jun 1 18:16:27 2019 +0100

    ISIS-2062: reorg pages for ugvw
---
 antora/components/ug/modules/vw/nav.adoc           | 64 +++++++++++++++++++++-
 .../vw/pages/_partials/_ugvw_customisation.adoc    | 17 ------
 ...operties.adoc => configuration-properties.adoc} |  0
 .../vw/pages/{ugvw.adoc => customisation.adoc}     | 15 +----
 .../about-page.adoc}                               |  0
 .../auto-refresh.adoc}                             |  0
 .../brand-logo.adoc}                               |  0
 .../cheap-n-cheerful-theme.adoc}                   |  0
 .../custom-javascript.adoc}                        |  0
 .../request-parameters.adoc}                       |  0
 .../top-level-index-page.adoc}                     |  0
 .../tweaking-css-classes.adoc}                     |  0
 .../using-different-css-file.adoc}                 |  0
 .../welcome-page.adoc}                             |  0
 .../_ugvw_extending.adoc => extending.adoc}        |  4 --
 .../custom-bootstrap-theme.adoc}                   |  0
 .../custom-pages.adoc}                             |  0
 .../login-via-query-args-prototyping.adoc}         |  0
 .../replacing-page-elements.adoc}                  |  0
 .../_ugvw_features.adoc => features.adoc}          |  8 ---
 .../blob-attachments.adoc}                         |  0
 .../bookmarked-pages.adoc}                         |  0
 .../hints-and-copy-url.adoc}                       |  0
 .../recent-pages.adoc}                             |  0
 .../sidebar-vs-modal-dialogs.adoc}                 |  0
 .../titles-in-tables.adoc}                         |  0
 .../user-registration.adoc}                        |  0
 .../where-am-i.adoc}                               |  0
 ...gvw_hints-and-tips.adoc => hints-and-tips.adoc} |  9 ---
 .../highlight-current-row.adoc}                    |  0
 .../i18n-label-in-wicket-viewer.adoc}              |  0
 .../per-user-themes.adoc}                          |  0
 .../svg-support.adoc}                              |  0
 ...w_incode-platform.adoc => incode-platform.adoc} |  0
 .../{_partials/_ugvw_layout.adoc => layout.adoc}   |  3 -
 .../annotation-based.adoc}                         |  0
 .../file-based.adoc}                               |  0
 .../table-columns.adoc}                            |  0
 ...w_menubars-layout.adoc => menubars-layout.adoc} |  2 -
 .../annotation-based.adoc}                         |  0
 .../file-based.adoc}                               |  0
 41 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/antora/components/ug/modules/vw/nav.adoc b/antora/components/ug/modules/vw/nav.adoc
index 142a281..b9a731b 100644
--- a/antora/components/ug/modules/vw/nav.adoc
+++ b/antora/components/ug/modules/vw/nav.adoc
@@ -1,5 +1,67 @@
 * Wicket Viewer
 
 ** xref:about.adoc[About]
-** xref:ugvw.adoc[Guide]
+
+** xref:features.adoc[Features]
+*** xref:features/recent-pages.adoc[Recent Pages]
+*** xref:features/bookmarked-pages.adoc[Bookmarked Pages]
+*** xref:features/sidebar-vs-modal-dialogs.adoc[Sidebar vs Modal Dialogs]
+*** xref:features/hints-and-copy-url.adoc[Hints-and-copy URL]
+*** xref:features/where-am-i.adoc[Where am I]
+*** xref:features/titles-in-tables.adoc[Titles in Tables]
+*** xref:features/blob-attachments.adoc[Blob Attachments]
+*** xref:features/user-registration.adoc[User Registration]
+
+
+
+** xref:layout.adoc[Layout]
+*** xref:layout/annotation-based.adoc[Annotation based]
+*** xref:layout/file-based.adoc[File based]
+*** xref:layout/table-columns.adoc[Table Columns]
+
+
+
+** xref:menubars-layout.adoc[Menubars Layout]
+*** xref:menubars-layout/annotation-based.adoc[Annotation-based]
+*** xref:menubars-layout/file-based.adoc[File-based]
+
+
+
+** xref:configuration-properties.adoc[Configuration Properties]
+
+
+
+** xref:customisation.adoc[Customisation]
+*** xref:customisation/top-level-index-page.adoc[Top-level Index Page]
+*** xref:customisation/brand-logo.adoc[Brand Logo]
+*** xref:customisation/welcome-page.adoc[Welcome Page]
+*** xref:customisation/about-page.adoc[About Page]
+*** xref:customisation/tweaking-css-classes.adoc[Tweaking CSS Classes]
+*** xref:customisation/cheap-n-cheerful-theme.adoc[Cheap-n-Cheerful Theme]
+*** xref:customisation/using-different-css-file.adoc[Using Different CSS File]
+*** xref:customisation/custom-javascript.adoc[Custom Javascript]
+*** xref:customisation/auto-refresh.adoc[Auto Refresh]
+*** xref:customisation/request-parameters.adoc[Request Parameters]
+
+
+
+** xref:extending.adoc[Extending]
+*** xref:extending/custom-bootstrap-theme.adoc[Custom Bootstrap Theme]
+*** xref:extending/replacing-page-elements.adoc[Replacing Page Elements]
+*** xref:extending/custom-pages.adoc[Custom Pages]
+*** xref:extending/login-via-query-args-prototyping.adoc[Login via Query Args Prototyping]
+
+
+
+** xref:hints-and-tips.adoc[Hints-n-Tips]
+*** xref:hints-and-tips/per-user-themes.adoc[Per User Themes]
+*** xref:hints-and-tips/i18n-label-in-wicket-viewer.adoc[i18n Label in Wicket Viewer]
+*** xref:hints-and-tips/highlight-current-row.adoc[Highlight Current Row]
+*** xref:hints-and-tips/svg-support.adoc[SVG Support]
+
+
+
+** xref:incode-platform.adoc[Incode Platform]
+
+
 
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation.adoc b/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation.adoc
deleted file mode 100644
index f2a4fce..0000000
--- a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation.adoc
+++ /dev/null
@@ -1,17 +0,0 @@
-= Customisation
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-include::_attributes.adoc[]
-
-
-
-include::partial$_ugvw_customisation_top-level-index-page.adoc[leveloffset=+1]
-include::partial$_ugvw_customisation_brand-logo.adoc[leveloffset=+1]
-include::partial$_ugvw_customisation_welcome-page.adoc[leveloffset=+1]
-include::partial$_ugvw_customisation_about-page.adoc[leveloffset=+1]
-include::partial$_ugvw_customisation_tweaking-css-classes.adoc[leveloffset=+1]
-include::partial$_ugvw_customisation_cheap-n-cheerful-theme.adoc[leveloffset=+1]
-include::partial$_ugvw_customisation_using-different-css-file.adoc[leveloffset=+1]
-include::partial$_ugvw_customisation_custom-javascript.adoc[leveloffset=+1]
-include::partial$_ugvw_customisation_auto-refresh.adoc[leveloffset=+1]
-include::partial$_ugvw_customisation_request-parameters.adoc[leveloffset=+1]
-
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_configuration-properties.adoc b/antora/components/ug/modules/vw/pages/configuration-properties.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_configuration-properties.adoc
rename to antora/components/ug/modules/vw/pages/configuration-properties.adoc
diff --git a/antora/components/ug/modules/vw/pages/ugvw.adoc b/antora/components/ug/modules/vw/pages/customisation.adoc
similarity index 60%
rename from antora/components/ug/modules/vw/pages/ugvw.adoc
rename to antora/components/ug/modules/vw/pages/customisation.adoc
index 35be33d..40374a6 100644
--- a/antora/components/ug/modules/vw/pages/ugvw.adoc
+++ b/antora/components/ug/modules/vw/pages/customisation.adoc
@@ -1,20 +1,7 @@
-= Wicket Viewer
+= Customisation
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 include::_attributes.adoc[]
-:numbered:
-:generate_pdf:
 
 
 
 
-
-
-include::partial$_ugvw_features.adoc[leveloffset=+1]
-include::partial$_ugvw_layout.adoc[leveloffset=+1]
-include::partial$_ugvw_menubars-layout.adoc[leveloffset=+1]
-include::partial$_ugvw_configuration-properties.adoc[leveloffset=+1]
-include::partial$_ugvw_customisation.adoc[leveloffset=+1]
-include::partial$_ugvw_extending.adoc[leveloffset=+1]
-include::partial$_ugvw_hints-and-tips.adoc[leveloffset=+1]
-include::partial$_ugvw_incode-platform.adoc[leveloffset=+1]
-
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_about-page.adoc b/antora/components/ug/modules/vw/pages/customisation/about-page.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_about-page.adoc
rename to antora/components/ug/modules/vw/pages/customisation/about-page.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_auto-refresh.adoc b/antora/components/ug/modules/vw/pages/customisation/auto-refresh.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_auto-refresh.adoc
rename to antora/components/ug/modules/vw/pages/customisation/auto-refresh.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_brand-logo.adoc b/antora/components/ug/modules/vw/pages/customisation/brand-logo.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_brand-logo.adoc
rename to antora/components/ug/modules/vw/pages/customisation/brand-logo.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_cheap-n-cheerful-theme.adoc b/antora/components/ug/modules/vw/pages/customisation/cheap-n-cheerful-theme.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_cheap-n-cheerful-theme.adoc
rename to antora/components/ug/modules/vw/pages/customisation/cheap-n-cheerful-theme.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_custom-javascript.adoc b/antora/components/ug/modules/vw/pages/customisation/custom-javascript.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_custom-javascript.adoc
rename to antora/components/ug/modules/vw/pages/customisation/custom-javascript.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_request-parameters.adoc b/antora/components/ug/modules/vw/pages/customisation/request-parameters.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_request-parameters.adoc
rename to antora/components/ug/modules/vw/pages/customisation/request-parameters.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_top-level-index-page.adoc b/antora/components/ug/modules/vw/pages/customisation/top-level-index-page.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_top-level-index-page.adoc
rename to antora/components/ug/modules/vw/pages/customisation/top-level-index-page.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_tweaking-css-classes.adoc b/antora/components/ug/modules/vw/pages/customisation/tweaking-css-classes.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_tweaking-css-classes.adoc
rename to antora/components/ug/modules/vw/pages/customisation/tweaking-css-classes.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_using-different-css-file.adoc b/antora/components/ug/modules/vw/pages/customisation/using-different-css-file.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_using-different-css-file.adoc
rename to antora/components/ug/modules/vw/pages/customisation/using-different-css-file.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_welcome-page.adoc b/antora/components/ug/modules/vw/pages/customisation/welcome-page.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_customisation_welcome-page.adoc
rename to antora/components/ug/modules/vw/pages/customisation/welcome-page.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_extending.adoc b/antora/components/ug/modules/vw/pages/extending.adoc
similarity index 85%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_extending.adoc
rename to antora/components/ug/modules/vw/pages/extending.adoc
index 56e903e..8fd0f78 100644
--- a/antora/components/ug/modules/vw/pages/_partials/_ugvw_extending.adoc
+++ b/antora/components/ug/modules/vw/pages/extending.adoc
@@ -15,8 +15,4 @@ The first two of these options are discussed in the xref:ug:vw:ugvw.adoc#[Wicket
 
 The chapter wraps up with a technique for prototyping, allowing user/passwords to be specified as query arguments.
 
-include::partial$_ugvw_extending_custom-bootstrap-theme.adoc[leveloffset=+1]
-include::partial$_ugvw_extending_replacing-page-elements.adoc[leveloffset=+1]
-include::partial$_ugvw_extending_custom-pages.adoc[leveloffset=+1]
-include::partial$_ugvw_extending_login-via-query-args-prototyping.adoc[leveloffset=+1]
 
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_extending_custom-bootstrap-theme.adoc b/antora/components/ug/modules/vw/pages/extending/custom-bootstrap-theme.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_extending_custom-bootstrap-theme.adoc
rename to antora/components/ug/modules/vw/pages/extending/custom-bootstrap-theme.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_extending_custom-pages.adoc b/antora/components/ug/modules/vw/pages/extending/custom-pages.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_extending_custom-pages.adoc
rename to antora/components/ug/modules/vw/pages/extending/custom-pages.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_extending_login-via-query-args-prototyping.adoc b/antora/components/ug/modules/vw/pages/extending/login-via-query-args-prototyping.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_extending_login-via-query-args-prototyping.adoc
rename to antora/components/ug/modules/vw/pages/extending/login-via-query-args-prototyping.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_extending_replacing-page-elements.adoc b/antora/components/ug/modules/vw/pages/extending/replacing-page-elements.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_extending_replacing-page-elements.adoc
rename to antora/components/ug/modules/vw/pages/extending/replacing-page-elements.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_features.adoc b/antora/components/ug/modules/vw/pages/features.adoc
similarity index 63%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_features.adoc
rename to antora/components/ug/modules/vw/pages/features.adoc
index 8eb293e..c8b47bc 100644
--- a/antora/components/ug/modules/vw/pages/_partials/_ugvw_features.adoc
+++ b/antora/components/ug/modules/vw/pages/features.adoc
@@ -6,14 +6,6 @@ include::_attributes.adoc[]
 This section discusses features of the wicket viewer from the perspective of an end-user actually using your Apache Isis application.
 
 
-include::partial$_ugvw_features_recent-pages.adoc[leveloffset=+1]
-include::partial$_ugvw_features_bookmarked-pages.adoc[leveloffset=+1]
-include::partial$_ugvw_features_sidebar-vs-modal-dialogs.adoc[leveloffset=+1]
-include::partial$_ugvw_features_hints-and-copy-url.adoc[leveloffset=+1]
-include::partial$_ugvw_features_where-am-i.adoc[leveloffset=+1]
-include::partial$_ugvw_features_titles-in-tables.adoc[leveloffset=+1]
-include::partial$_ugvw_features_blob-attachments.adoc[leveloffset=+1]
-include::partial$_ugvw_features_user-registration.adoc[leveloffset=+1]
 
 
 
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_features_blob-attachments.adoc b/antora/components/ug/modules/vw/pages/features/blob-attachments.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_features_blob-attachments.adoc
rename to antora/components/ug/modules/vw/pages/features/blob-attachments.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_features_bookmarked-pages.adoc b/antora/components/ug/modules/vw/pages/features/bookmarked-pages.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_features_bookmarked-pages.adoc
rename to antora/components/ug/modules/vw/pages/features/bookmarked-pages.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_features_hints-and-copy-url.adoc b/antora/components/ug/modules/vw/pages/features/hints-and-copy-url.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_features_hints-and-copy-url.adoc
rename to antora/components/ug/modules/vw/pages/features/hints-and-copy-url.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_features_recent-pages.adoc b/antora/components/ug/modules/vw/pages/features/recent-pages.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_features_recent-pages.adoc
rename to antora/components/ug/modules/vw/pages/features/recent-pages.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_features_sidebar-vs-modal-dialogs.adoc b/antora/components/ug/modules/vw/pages/features/sidebar-vs-modal-dialogs.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_features_sidebar-vs-modal-dialogs.adoc
rename to antora/components/ug/modules/vw/pages/features/sidebar-vs-modal-dialogs.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_features_titles-in-tables.adoc b/antora/components/ug/modules/vw/pages/features/titles-in-tables.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_features_titles-in-tables.adoc
rename to antora/components/ug/modules/vw/pages/features/titles-in-tables.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_features_user-registration.adoc b/antora/components/ug/modules/vw/pages/features/user-registration.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_features_user-registration.adoc
rename to antora/components/ug/modules/vw/pages/features/user-registration.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_features_where-am-i.adoc b/antora/components/ug/modules/vw/pages/features/where-am-i.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_features_where-am-i.adoc
rename to antora/components/ug/modules/vw/pages/features/where-am-i.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips.adoc b/antora/components/ug/modules/vw/pages/hints-and-tips.adoc
similarity index 78%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips.adoc
rename to antora/components/ug/modules/vw/pages/hints-and-tips.adoc
index d434c5c..516dbcc 100644
--- a/antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips.adoc
+++ b/antora/components/ug/modules/vw/pages/hints-and-tips.adoc
@@ -21,13 +21,4 @@ See also hints-n-tips chapters in the:
 * the xref:ug:btb:ugbtb.adoc#_ugbtb_hints-and-tips[Beyond the Basics] guide.
 
 
-// tag::inclusions[]
-
-include::partial$_ugvw_hints-and-tips_per-user-themes.adoc[leveloffset=+1,lines=3..-1]
-include::partial$_ugvw_hints-and-tips_i18n-label-in-wicket-viewer.adoc[leveloffset=+1,lines=3..-1]
-include::partial$_ugvw_hints-and-tips_highlight-current-row.adoc[leveloffset=+1,lines=3..-1]
-include::partial$_ugvw_hints-and-tips_svg-support.adoc[leveloffset=+1,lines=3..-1]
-
-
-// end::inclusions[]
 
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips_highlight-current-row.adoc b/antora/components/ug/modules/vw/pages/hints-and-tips/highlight-current-row.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips_highlight-current-row.adoc
rename to antora/components/ug/modules/vw/pages/hints-and-tips/highlight-current-row.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips_i18n-label-in-wicket-viewer.adoc b/antora/components/ug/modules/vw/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips_i18n-label-in-wicket-viewer.adoc
rename to antora/components/ug/modules/vw/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips_per-user-themes.adoc b/antora/components/ug/modules/vw/pages/hints-and-tips/per-user-themes.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips_per-user-themes.adoc
rename to antora/components/ug/modules/vw/pages/hints-and-tips/per-user-themes.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips_svg-support.adoc b/antora/components/ug/modules/vw/pages/hints-and-tips/svg-support.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_hints-and-tips_svg-support.adoc
rename to antora/components/ug/modules/vw/pages/hints-and-tips/svg-support.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_incode-platform.adoc b/antora/components/ug/modules/vw/pages/incode-platform.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_incode-platform.adoc
rename to antora/components/ug/modules/vw/pages/incode-platform.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_layout.adoc b/antora/components/ug/modules/vw/pages/layout.adoc
similarity index 87%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_layout.adoc
rename to antora/components/ug/modules/vw/pages/layout.adoc
index facff7d..6ca2e53 100644
--- a/antora/components/ug/modules/vw/pages/_partials/_ugvw_layout.adoc
+++ b/antora/components/ug/modules/vw/pages/layout.adoc
@@ -10,8 +10,5 @@ This chapter describes how this is done both for domain objects using either ann
 The chapter also describes how to customising which columns of associated objects appear in tables.
 The layout of application menu items is described in a xref:ugvw.adoc#_ugvw_menubars-layout[separate chapter].
 
-include::partial$_ugvw_layout_annotation-based.adoc[leveloffset=+1]
-include::partial$_ugvw_layout_file-based.adoc[leveloffset=+1]
-include::partial$_ugvw_layout_table-columns.adoc[leveloffset=+1]
 
 
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_layout_annotation-based.adoc b/antora/components/ug/modules/vw/pages/layout/annotation-based.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_layout_annotation-based.adoc
rename to antora/components/ug/modules/vw/pages/layout/annotation-based.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_layout_file-based.adoc b/antora/components/ug/modules/vw/pages/layout/file-based.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_layout_file-based.adoc
rename to antora/components/ug/modules/vw/pages/layout/file-based.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_layout_table-columns.adoc b/antora/components/ug/modules/vw/pages/layout/table-columns.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_layout_table-columns.adoc
rename to antora/components/ug/modules/vw/pages/layout/table-columns.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_menubars-layout.adoc b/antora/components/ug/modules/vw/pages/menubars-layout.adoc
similarity index 94%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_menubars-layout.adoc
rename to antora/components/ug/modules/vw/pages/menubars-layout.adoc
index 0210ca4..142fd39 100644
--- a/antora/components/ug/modules/vw/pages/_partials/_ugvw_menubars-layout.adoc
+++ b/antora/components/ug/modules/vw/pages/menubars-layout.adoc
@@ -33,5 +33,3 @@ image::application-menu/tertiary.png[width="300px",link="{imagesdir}application-
 
 The Apache Isis framework provides two mechanisms to control the arrangement of domain service actions across menubars and menus, either using annotations or using a file-based layout.
 
-include::partial$_ugvw_menubars-layout_annotation-based.adoc[leveloffset=+1]
-include::partial$_ugvw_menubars-layout_file-based.adoc[leveloffset=+1]
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_menubars-layout_annotation-based.adoc b/antora/components/ug/modules/vw/pages/menubars-layout/annotation-based.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_menubars-layout_annotation-based.adoc
rename to antora/components/ug/modules/vw/pages/menubars-layout/annotation-based.adoc
diff --git a/antora/components/ug/modules/vw/pages/_partials/_ugvw_menubars-layout_file-based.adoc b/antora/components/ug/modules/vw/pages/menubars-layout/file-based.adoc
similarity index 100%
rename from antora/components/ug/modules/vw/pages/_partials/_ugvw_menubars-layout_file-based.adoc
rename to antora/components/ug/modules/vw/pages/menubars-layout/file-based.adoc