Skip to content

Commit

Permalink
Merge pull request #3470 from OpenLiberty/staging
Browse files Browse the repository at this point in the history
Update prod
  • Loading branch information
steven1046 authored Nov 2, 2023
2 parents 4588c36 + 4a19f97 commit 5c1129a
Show file tree
Hide file tree
Showing 9 changed files with 131 additions and 52 deletions.
23 changes: 15 additions & 8 deletions src/main/content/_i18n/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,21 @@ start:
instruction: Unzip it and run this command, or refer to the included README.
guide_link: For more help, visit our
got_it: Got it!
get_OL_section_title: Add to an existing application
get_OL_section_text: Get Open Liberty using these commands for Maven, Gradle, or Docker.
container_section_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Want to customize your image resources?
container_section_link: Check out our docs.
find_out: Find out
how_to_use_maven: how to use Maven with Open Liberty.
how_to_use_gradle: how to use Gradle with Open Liberty.
how_to_use_docker: how to use Docker with Open Liberty.
add_to_existing_app:
title: Add to an existing application
sect_heading: Open Liberty provides build plugins for Maven and Gradle that simplify the installation and operational control of the Liberty runtime and servers.
container_section_text: Want to customize your image resources?
container_section_link: Check out our docs.
maven_guide_text: Ready to get started using Maven with Open Liberty?
gradle_guide_text: Ready to get started using Gradle with Open Liberty?
docker_guide_text: Ready to start using containers with Open Liberty?
try_guide_link: Try the guide.
maven_docs_text: Looking for information about Open Liberty Maven configuration, goals, and more? Check out the
gradle_docs_text: Looking for information about Open Liberty Gradle configuration, tasks, and more? Check out the
docker_docs_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Looking to customize your image resources?
maven_docs_link: Liberty Maven plugin documentation on GitHub.
gradle_docs_link: Liberty Gradle plugin documentation on GitHub.
docker_docs_link: Check out our docs.
ide_tools:
section_title: Develop with Liberty Tools
section_text1: 'Liberty Tools is a set of intuitive developer tools for the Eclipse IDE, Visual Studio Code, and IntelliJ IDEA development environments.
Expand Down
37 changes: 29 additions & 8 deletions src/main/content/_i18n/ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,35 @@ start:
instruction: Unzip it and run this command, or refer to the included README.
guide_link: For more help, visit our
got_it: Got it!
get_OL_section_title: Add to an existing application
get_OL_section_text: Get Open Liberty using these commands for Maven, Gradle, or Docker.
container_section_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Want to customize your image resources?
container_section_link: Check out our docs.
find_out: Find out
how_to_use_maven: how to use Maven with Open Liberty.
how_to_use_gradle: how to use Gradle with Open Liberty.
how_to_use_docker: how to use Docker with Open Liberty.
add_to_existing_app:
title: Add to an existing application
sect_heading: Open Liberty provides build plugins for Maven and Gradle that simplify the installation and operational control of the Liberty runtime and servers.
container_section_text: Want to customize your image resources?
container_section_link: Check out our docs.
maven_guide_text: Ready to get started using Maven with Open Liberty?
gradle_guide_text: Ready to get started using Gradle with Open Liberty?
docker_guide_text: Ready to start using containers with Open Liberty?
try_guide_link: Try the guide.
maven_docs_text: Looking for information about Open Liberty Maven configuration, goals, and more? Check out the
gradle_docs_text: Looking for information about Open Liberty Gradle configuration, tasks, and more? Check out the
docker_docs_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Looking to customize your image resources?
maven_docs_link: Liberty Maven plugin documentation on GitHub.
gradle_docs_link: Liberty Gradle plugin documentation on GitHub
docker_docs_link: Check out our docs.
ide_tools:
section_title: Develop with Liberty Tools
section_text1: 'Liberty Tools is a set of intuitive developer tools for the Eclipse IDE, Visual Studio Code, and IntelliJ IDEA development environments.
These tools adopt a Maven/Gradle-centric approach and enable fast, iterative cloud-native Java application development through Liberty dev mode. '
section_text2: 'Liberty Tools also provides helpful, time-saving features such as code completion, hover descriptions, and configuration diagnostics for Jakarta EE APIs, MicroProfile APIs, and Liberty configuration.
For more information, '
docs_link: check out the Liberty Tools overview.
eclipse_link: Eclipse IDE
intellij_link: IntelliJ IDEA
vscode_link: Visual Studio Code
section_text3: The classic Eclipse developer tools can be found in
public_dhe_link: 'this repository, '
section_text4: and you can find
github_link: instructions on how to install the classic tools here.
download_package: Download package
download_package_section:
para: We recommend using the latest release, but beta and development builds are also available for use. Once downloaded, you're ready for lift-off.
Expand Down
37 changes: 29 additions & 8 deletions src/main/content/_i18n/zh-Hans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,35 @@ start:
instruction: Unzip it and run this command, or refer to the included README.
guide_link: For more help, visit our
got_it: Got it!
get_OL_section_title: Add to an existing application
get_OL_section_text: Get Open Liberty using these commands for Maven, Gradle, or Docker.
container_section_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Want to customize your image resources?
container_section_link: Check out our docs.
find_out: Find out
how_to_use_maven: how to use Maven with Open Liberty.
how_to_use_gradle: how to use Gradle with Open Liberty.
how_to_use_docker: how to use Docker with Open Liberty.
add_to_existing_app:
title: Add to an existing application
sect_heading: Open Liberty provides build plugins for Maven and Gradle that simplify the installation and operational control of the Liberty runtime and servers.
container_section_text: Want to customize your image resources?
container_section_link: Check out our docs.
maven_guide_text: Ready to get started using Maven with Open Liberty?
gradle_guide_text: Ready to get started using Gradle with Open Liberty?
docker_guide_text: Ready to start using containers with Open Liberty?
try_guide_link: Try the guide.
maven_docs_text: Looking for information about Open Liberty Maven configuration, goals, and more? Check out the
gradle_docs_text: Looking for information about Open Liberty Gradle configuration, tasks, and more? Check out the
docker_docs_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Looking to customize your image resources?
maven_docs_link: Liberty Maven plugin documentation on GitHub.
gradle_docs_link: Liberty Gradle plugin documentation on GitHub
docker_docs_link: Check out our docs.
ide_tools:
section_title: Develop with Liberty Tools
section_text1: 'Liberty Tools is a set of intuitive developer tools for the Eclipse IDE, Visual Studio Code, and IntelliJ IDEA development environments.
These tools adopt a Maven/Gradle-centric approach and enable fast, iterative cloud-native Java application development through Liberty dev mode. '
section_text2: 'Liberty Tools also provides helpful, time-saving features such as code completion, hover descriptions, and configuration diagnostics for Jakarta EE APIs, MicroProfile APIs, and Liberty configuration.
For more information, '
docs_link: check out the Liberty Tools overview.
eclipse_link: Eclipse IDE
intellij_link: IntelliJ IDEA
vscode_link: Visual Studio Code
section_text3: The classic Eclipse developer tools can be found in
public_dhe_link: 'this repository, '
section_text4: and you can find
github_link: instructions on how to install the classic tools here.
download_package: Download package
download_package_section:
para: We recommend using the latest release, but beta and development builds are also available for use. Once downloaded, you're ready for lift-off.
Expand Down
2 changes: 1 addition & 1 deletion src/main/content/antora_ui/src/partials/article.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{#if (eq page.layout 'config')}}
<div class="contentStickyBreadcrumbHeader" style="display:none;"></div>
{{/if}}
<article class="doc" tabindex="0">
<article class="doc">
{{#if (eq page.layout '404')}}
<h1 class="page">{{{or page.title 'Page Not Found'}}}</h1>
<div class="paragraph">
Expand Down
2 changes: 1 addition & 1 deletion src/main/content/antora_ui/src/partials/nav-tree.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{{~#if (eq ./urlType 'internal')}}{{{relativize ./url}}}
{{~else}}{{{./url}}}{{~/if}}">{{{./content}}}</a>
{{else}}
<span class="nav-text" tabindex="0">{{{./content}}}</span>
<span class="nav-text" tabindex="0" role="button">{{{./content}}}</span>
{{/if}}
{{/if}}
{{> nav-tree navigation=./items level=(increment ../level)}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* appended to the end of the combined file.
*/

body {
body {
background-color:white;
font-family: Asap, 'DejaVu Sans', Arial, Helvetica, sans-serif;
}
Expand Down Expand Up @@ -121,11 +121,15 @@ ul.navList li{
}

/* doesn't seem to pick up this on focus */
.clickableNavListTab, ul.navList li:focus{
ul.navList li:focus{
background-color: #D6D9E4;
color: #253441;
}

.clickableNavListTab{
color:#bb7a2a;
}

.clickableNavListTab:hover{
cursor: pointer;
}
Expand Down Expand Up @@ -159,6 +163,10 @@ ul.blockList ul.blockList ul.blockList li.blockList h3 {
background-color:#C8CCD8;
}

ul.blockList ul.blockList li.blockList h3{
margin:0 0;
}

.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
padding:10px 0px;
}
Expand Down Expand Up @@ -209,17 +217,28 @@ ul.blockList ul.blockList ul.blockList li.blockList h3 {
.usesSummary caption span {
background-color:#D6D9E4;
font-family: BunueloLight, Arial Narrow, Helvetica, Arial;
font-size: 35px;
font-size: 20px;
margin-top: 10px;
height: auto;
}

.memberSummary caption span{
font-size: 16px;
}



.memberSummary caption span.activeTableTab span, .packagesSummary caption span.activeTableTab span {
background-color:#D6D9E4;
height: auto;
padding-left: 30px;
padding-right: 30px;
}

.memberSummary caption span.tableTab span, .packagesSummary caption span.tableTab span {
height: auto;
padding-left: 30px;
padding-right: 30px;
}

.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
Expand Down Expand Up @@ -399,4 +418,8 @@ label {

.header {
margin: 0;
}

div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4{
margin-top:-10px;
}
14 changes: 7 additions & 7 deletions src/main/content/blog.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,19 @@ <h2 class="blog_subtitle">
{% t blog.featured_tags %}
</h2>
<div id="featured_tags_list" role="list">
<p class="featured_tag" data-tag-id="announcements" role="listitem" tabindex="0">
<p class="featured_tag" data-tag-id="announcements" role="button" tabindex="0">
{% t blog.tags.announcements %}
</p>
<span>
,
</span>
<p class="featured_tag" data-tag-id="MicroProfile" role="listitem" tabindex="0">
<p class="featured_tag" data-tag-id="MicroProfile" role="button" tabindex="0">
{% t blog.tags.MicroProfile %}
</p>
<span>
,
</span>
<p class="featured_tag" data-tag-id="Jakarta_EE" role="listitem" tabindex="0">
<p class="featured_tag" data-tag-id="Jakarta_EE" role="button" tabindex="0">
{% t blog.tags.Jakarta_EE %}
</p>
<span>
Expand Down Expand Up @@ -103,7 +103,7 @@ <h2 class="blog_subtitle">
</div>
<div class="col-md-12 col-lg-8 offset-lg-4" id="right_column">
<div id="filter">
<img alt="Remove tag filter" id="x_button" onclick="blog.removeFilter(true);" onkeypress="blog.removeFilter(true);" src="/img/blog_x_button.svg" tabindex="0"/>
<img alt="Remove tag filter" role="button" id="x_button" onclick="blog.removeFilter(true);" onkeypress="blog.removeFilter(true);" src="/img/blog_x_button.svg" tabindex="0"/>
<span id="no_results_message">
{% t blog.no_results_found %} {% t blog.see %}
<a class="orange_link_light_background" href="{{baseURL}}/blog/">
Expand Down Expand Up @@ -243,7 +243,7 @@ <h2 class="blog_post_title">
<div class="blog_tags_container col-md-7" role="list">
{%- for tag in post.tags -%}
{%- assign tag_name = tag | replace: " ", "_" -%}
<p class="blog_tag" data-tag-id="{{tag_name}}" role="listitem" tabindex="0">
<p class="blog_tag" data-tag-id="{{tag_name}}" role="button" tabindex="0">
{%- t blog.tags.{{tag_name}} -%}
</p>
<span class="comma">
Expand Down Expand Up @@ -331,7 +331,7 @@ <h2 class="blog_post_title_condensed">
<div class="blog_tags_container col-md-7" role="list">
{%- for tag in post.tags -%}
{%- assign tag_name = tag | replace: " ", "_" -%}
<p class="blog_tag" data-tag-id="{{tag_name}}" role="listitem" tabindex="0">
<p class="blog_tag" data-tag-id="{{tag_name}}" role="button" tabindex="0">
{%- t blog.tags.{{tag_name}} -%}
</p>
<span class="comma">
Expand Down Expand Up @@ -383,4 +383,4 @@ <h2 class="blog_post_title_condensed">
<div id="ufo_images_mobile_container">
<img alt="ufo and clouds" class="d-block d-md-none img-fluid" id="ufo_images_mobile" src="/img/blog_images_mobile.svg"/>
</div>
</div>
</div>
10 changes: 5 additions & 5 deletions src/main/content/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,17 @@ <h2 class="develop_title">{% t home.cloud_native_develop_title %}</h2>
{% t home.cloud_native_develop_text2 %}
</p>
<div class="learn_more_container">
<a class="learn_more_link" href="{{baseURL}}/docs/ref/general/#microprofile.html">{% t global.learnmore %}</a>
<a class="learn_more_link" href="{{baseURL}}/docs/latest/cloud-native-microservices.html">{% t global.learnmore %}</a>
</div>
</div>
<div class="col-md-6">
<div id="develop_image">
<div class="green_box"><a href="{{baseURL}}/guides/microprofile-opentracing.html">OpenTracing</a></div>
<div class="green_box"><a href="{{baseURL}}/guides/microprofile-health.html">Health Check</a></div>
<div class="green_box"><a href="{{baseURL}}/guides/microprofile-telemetry-jaeger.html" class="long_title">Open Telemetry</a></div>
<div class="green_box"><a href="{{baseURL}}/guides/microprofile-health.html">Health</a></div>
<div class="green_box"><a href="{{baseURL}}/guides/microprofile-metrics.html">Metrics</a></div>
<div class="green_box space_holder"></div>
<div class="green_box space_holder"></div>
<div class="green_box"><a href="{{baseURL}}/guides/microprofile-openapi.html">OpenAPI</a></div>
<div class="green_box"><a href="{{baseURL}}/guides/microprofile-openapi.html">Open API</a></div>
<div class="green_box"><a href="{{baseURL}}/guides/retry-timeout.html" class="long_title">Fault Tolerance</a></div>
<div class="green_box"><a href="{{baseURL}}/guides/microprofile-jwt.html" class="long_title">JWT</a></div>
<div class="green_box"><a href="{{baseURL}}/guides/microprofile-config-intro.html">Config</a></div>
Expand Down Expand Up @@ -145,7 +145,7 @@ <h2 class="develop_title">{% t home.monitor_microservice_develop_title %}</h2>
{% t home.monitor_microservice_develop_text %}
</p>
<div class="learn_more_container">
<a class="learn_more_link" href="{{baseURL}}/blog/2018/10/05/microprofile-faulttolerance-1.1-metrics.html">{% t global.learnmore %}</a>
<a class="learn_more_link" href="{{baseURL}}/docs/latest/introduction-monitoring-metrics.html">{% t global.learnmore %}</a>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 5c1129a

Please sign in to comment.