Skip to content
This repository was archived by the owner on Nov 5, 2024. It is now read-only.

Commit ede6967

Browse files
chloeredhatchloeredhat
committed
Fixes merge conflict
2 parents 719c4d5 + ea99821 commit ede6967

32 files changed

+374
-291
lines changed

‎antora-lunr-ui/css/main.css‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
.toc.sidebar .toc-menu {
2-
padding-left: 100px !important;
3-
width: 600px !important;
4-
}
5-
6-
.doc {
7-
min-width: 900px;
8-
}
9-
101
.toolbar .edit-this-page a {
112
color: white !important;
123
}

‎antora-lunr-ui/img/logo.png‎

886 Bytes
Loading

‎antora-lunr-ui/partials/header-content.hbs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<header class="header" role="banner">
22
<nav class="navbar">
3-
<div class="navbar-brand">
4-
<a class="navbar-item" href="{{or site.url (or siteRootUrl siteRootPath)}}">{{site.title}}</a>
5-
6-
<button class="navbar-burger" data-target="topbar-nav">
7-
<span></span>
8-
<span></span>
9-
<span></span>
10-
</button>
11-
</div>
3+
<div class="navbar-brand">
4+
<div class="navbar-item">
5+
<button class="navbar-burger" data-target="topbar-nav">
6+
<span></span>
7+
<span></span>
8+
<span></span>
9+
</button>
10+
<img src="{{uiRootPath}}/img/logo.png" class="navbar-logo" alt="App Studio logo">
11+
<a href="{{site.url}}/">{{site.title}}</a>
12+
</div>
13+
</div>
1214
<div id="topbar-nav" class="navbar-menu">
1315
<div class="navbar-end">
1416
<div class="button"><a href="https://redhat-appstudio.github.io/appstudio.docs.ui.io/" target="_blank">Home</a></div>

‎antora-playbook.yml‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -42,36 +42,9 @@ antora:
4242
- '@antora/collector-extension'
4343
- '@antora/lunr-extension'
4444

45-
asciidoc:
46-
attributes:
45+
urls:
46+
html_extension_style: indexify # For consistency with pages indexed by search engines, see https://docs.antora.org/antora/latest/playbook/urls-html-extension-style/
47+
redirect_facility: static # The least convenient, but only available redirect on our hosting platform, see https://docs.antora.org/antora/latest/playbook/urls-redirect-facility/
48+
latest_prerelease_version_segment: next # Override the version in the navigation https://docs.antora.org/antora/latest/playbook/urls-redirect-facility/
49+
latest_version_segment_strategy: replace # Consequence of static redirect, see https://docs.antora.org/antora/latest/playbook/urls-redirect-facility/
4750

48-
# Standard document attributes to be used in our documentation
49-
icons: font
50-
source-highlighter: highlightjs
51-
url-guide: https://red-hat-stone-soup.pages.redhat.com/stonesoup-documentation/
52-
idseparator: '-'
53-
page-pagination: '-'
54-
55-
# Product content attributes
56-
ProductName: App Studio
57-
ProductShortName: ''
58-
ProductRelease: ''
59-
ProductVersion: ''
60-
ProductPreviousVersion: ''
61-
ProductNextVersion: ''
62-
63-
# Repository URLs
64-
repoURL1: ''
65-
repoURL2: ''
66-
67-
# Name of APIs and their URLs
68-
APIName1: ''
69-
APIName2: ''
70-
71-
# Knowledge base article links
72-
# TBD
73-
74-
# Links to other projects
75-
Placeholder: ''
76-
Placeholder2: ''
77-
Placeholder3: ''

‎docs/antora.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,42 @@ nav:
1010
- modules/ROOT/nav-glossary.adoc
1111
- modules/ROOT/nav-contribute.adoc
1212
- modules/ROOT/nav-support.adoc
13+
14+
asciidoc:
15+
attributes:
16+
17+
# Standard document attributes to be used in our documentation
18+
icons: font
19+
source-language: asciidoc@
20+
source-highlighter: highlightjs
21+
url-guide: https://red-hat-stone-soup.pages.redhat.com/stonesoup-documentation/
22+
idseparator: '-'
23+
page-pagination: '-'
24+
idprefix: ''
25+
experimental: ""
26+
27+
# Product content attributes
28+
ProductName: App Studio
29+
context: app
30+
ProductShortName: ''
31+
ProductRelease: ''
32+
ProductVersion: ''
33+
ProductPreviousVersion: ''
34+
ProductNextVersion: ''
35+
36+
# Repository URLs
37+
repoURL1: ''
38+
repoURL2: ''
39+
40+
# Name of APIs and their URLs
41+
APIName1: ''
42+
APIName2: ''
43+
44+
# Knowledge base article links
45+
# TBD
46+
47+
# Links to other projects
48+
Placeholder: ''
49+
Placeholder2: ''
50+
Placeholder3: ''
51+

‎docs/modules/ROOT/images/Application_route.png‎

207 KB
Loading

‎docs/modules/ROOT/nav-concepts.adoc‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
* xref:concepts/index.adoc[Concepts]
2-
** xref:concepts/release-services/con_release-services-overview.adoc[Release services]
3-
** xref:concepts/enterprise-contract/con_enterprise-contract-overview.adoc[Enterprise contract]
4-
** xref:concepts/testing_applications/index.adoc[Testing applications]
5-
*** xref:concepts/testing_applications/con_test-overview.adoc[Overview of test components]
6-
*** xref:concepts/testing_applications/surface-level_tests.adoc[Surface-level tests]
7-
*** xref:concepts/testing_applications/adding_new_tests.adoc[Add a tew test]
8-
*** xref:concepts/testing_applications/configuring_tests.adoc[Configuring tests]
1+
* Concepts
92
** xref:concepts/RenovateBot/index.adoc[RenovateBot]
10-
** xref:concepts/environments/index.adoc[Environments]
113
** xref:concepts/java-build-service/java-build-service.adoc[Java build service]
124
** xref:concepts/java-build-service/java-build-service-components.adoc[Java build service components]
135
@@ -16,4 +8,7 @@ Adam Kaplan said that the index.adoc for Pipelines, and presumably the other doc
168
** xref:concepts/pipelines/index.adoc[Pipelines]
179
*** xref:concepts/pipelines/persister.adoc[Persister component]
1810
*** xref:concepts/pipelines/pipeline_concepts.adoc[Pipeline concepts]
11+
** xref:concepts/release-services/con_release-services-overview.adoc[Release services]
12+
** xref:concepts/enterprise-contract/con_enterprise-contract-overview.adoc[Enterprise contract]
13+
** xref:concepts/environments/index.adoc[Environments]
1914
////

‎docs/modules/ROOT/nav-getting-started.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
* xref:getting-started/why-product-name.adoc[Why {ProductName}]
2-
* xref:getting-started/index.adoc[Get started]
1+
* xref:index.adoc[Why {ProductName}]
2+
* xref:getting-started/get-started.adoc[Get started]
33
** xref:getting-started/getting_started_in_cli.adoc[Getting started in the CLI]
44
55

‎docs/modules/ROOT/nav-how-to-guides.adoc‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
* How-to guides
2-
** Secure your supply chain
3-
*** xref:how-to-guides/Secure-your-supply-chain/proc_upgrade_build_pipeline.adoc[Upgrading the build pipeline]
1+
* xref:how-to-guides/how-to-guide-landing-page.adoc[How-to guides]
2+
** xref:how-to-guides/proc_upgrade_build_pipeline.adoc[Upgrading the build pipeline]
3+
** Testing your application
4+
*** xref:how-to-guides/testing_applications/con_test-overview.adoc[Overview of {ProductName} Test components]
5+
*** xref:how-to-guides/testing_applications/surface-level_tests.adoc[Surface-level test]
6+
** Securing your supply chain
47
*** xref:how-to-guides/Secure-your-supply-chain/proc_inspect_sbom.adoc[Inspecting SBOMs]
5-
**** xref:how-to-guides/Secure-your-supply-chain/proc_inspect_sbom.adoc#_downloading_an_sbom_in_the_web_ui[In the web UI]
6-
**** xref:how-to-guides/Secure-your-supply-chain/proc_inspect_sbom.adoc#_downloading_an_sbom_in_the_cli[In the CLI]
78
*** xref:how-to-guides/Secure-your-supply-chain/proc_java_dependencies.adoc[Configuring dependencies rebuild for Java apps in the CLI]
8-
** xref:how-to-guides/proc_creating_your_own_environment.adoc[Web UI: Creating your own environment]
9-
** xref:how-to-guides/creating_a_custom_application_test_with_test_pipelines.adoc[CLI: Creating a custom application test with test pipelines]
10-
** xref:how-to-guides/proc_managed_services_onboarding.adoc[CLI: Managed services team onboarding]
11-
** xref:how-to-guides/delete_application.adoc[CLI: Deleting an application].
12-
** xref:how-to-guides/delete_application.adoc[Web UI: Deleting an application].
9+
** xref:how-to-guides/proc_creating_your_own_environment.adoc[Creating your own environment]
10+
** xref:how-to-guides/creating_a_custom_application_test_with_test_pipelines.adoc[Creating a custom application test with test pipelines]
11+
** xref:how-to-guides/proc_managing-compliance-with-the-enterprise-contract.adoc[Managing compliance with the Enterprise Contract]
12+
** xref:how-to-guides/proc_delete_application.adoc[Deleting an application].
13+
1314
1415
////
1516
Commenting these out per HACDOCS-425 and -414
@@ -20,4 +21,5 @@ Commenting these out per HACDOCS-425 and -414
2021
////
2122
I'm commenting out this xref for now because Burr said this page is currently unsupported. --Christian (csears@redhat.com), 2/16/2023
2223
** xref:cli/proc_release_application.adoc[Releasing an application]
24+
** xref:how-to-guides/proc_managed_services_onboarding.adoc[CLI: Managed services team onboarding]
2325
////

‎docs/modules/ROOT/nav-support.adoc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
* xref:support/index.adoc[Support]
1+
* xref:support/support.adoc[Support]
2+
* xref:support/data-privacy.adoc[Important notices about the privacy of your data ]

0 commit comments

Comments
 (0)