Skip to content

Commit

Permalink
Merge pull request #3452 from OpenLiberty/staging
Browse files Browse the repository at this point in the history 
Update prod
  • Loading branch information
@natalie-bernhard
natalie-bernhard authored Oct 24, 2023
2 parents 320fc75 + 662af21 commit 4588c36
Show file tree
Hide file tree
Showing 7 changed files with 122 additions and 53 deletions.
2 changes: 1 addition & 1 deletion scripts/build/javadoc_modify.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ find target/jekyll-webapp/docs -name search.js -exec bash -c 'modifySearch {}'
find target/jekyll-webapp/docs -name script.js -exec bash -c 'modifyRedirect {}' \;

timer_end=$(date +%s)
echo "Total execution time for modifying the javadoc: '$(date -u --date @$(( $timer_end - $timer_start )) +%H:%M:%S)'"
echo "Total execution time for modifying the javadoc: '$(date -u --date @$(( $timer_end - $timer_start )) +%H:%M:%S)'"
1 change: 1 addition & 0 deletions src/main/content/_assets/css/home.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ body {
background: #ffffff;
margin-bottom: 18px;
}

.blog_post_title{
&:hover {
.blog_post_title_link{
Expand Down
7 changes: 5 additions & 2 deletions src/main/content/_assets/js/builds.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ function render_builds(builds, parent) {
var verification_column2 = $(
'<td headers="' + tableID + '_verification"' + 'rowspan="'+num_packages+'"' + '>' +
// Optional sig file download button
(sig_href ? '<a href="'+pem_href+'" class="'+analytics_class_name +'" rel="noopener">' + download_arrow +'PEM</a>' : '' ) +
(sig_href ? '<a href="'+pem_href+'" class="'+analytics_class_name +'" rel="noopener" target="_blank">' + download_arrow +'PEM</a>' : '' ) +
'</td>'
);

Expand Down Expand Up @@ -1091,7 +1091,10 @@ function validate_starter_inputs(event) {
}
}

function displayMessage(message,javaMsg = false) {
function displayMessage(message,javaMsg) {
if(!javaMsg){
javaMsg = false;
}
// Display a message when MP/Jakarta EE Version get changed.
var close_icon = $(
'<img src=\'/img/x_white.svg\' id=\'invalid_message_close_icon\' alt=\'Close\' tabindex=\'0\' />'
Expand Down
2 changes: 1 addition & 1 deletion src/main/content/_includes/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<a id="home_link" href="/" aria-label="Open Liberty Home">
<img id="ol_logo" src="/img/docs_openliberty_logo.png" alt="Open Liberty Logo">
</a>
<button id="hamburger_toggle_button" onclick="$('#nav_bar').toggleClass('responsive');">
<button id="hamburger_toggle_button" onclick="$('#nav_bar').toggleClass('responsive');" aria-label="Hamburger Menu">
<span id="hamburger_toggle_icon"></span>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/main/content/contribute.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ <h2 id="issues_title">{% t contribute.fix_a_bug %}</h2>
</div>
</div>
<div id="issues_arrows">
<a id="issues_up_arrow" class="issues_arrow functional_link" href="" aria-label="Move up"></a>
<a id="issues_down_arrow" class="issues_arrow functional_link" href="" aria-label="Move down"></a>
<a id="issues_up_arrow" class="issues_arrow functional_link" href="" aria-label="Move up" role="button"></a>
<a id="issues_down_arrow" class="issues_arrow functional_link" href="" aria-label="Move down" role="button"></a>
</div>
</div>
</div>
Expand Down
149 changes: 107 additions & 42 deletions src/main/content/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,57 +215,122 @@ <h3 id="logos_title">{% t home.openlibery_opensource_community_title %}</h3>
<h2 id="news_title">{% t home.openliberty_news %}</h2>
<p id="news_text">{% t home.openliberty_news_text %}</p>
<div class="row">
<div class="col-xs-12 col-lg-12">
<div id="blog_post">
{% for post in site.posts limit:1 %}
{% if post.redirect_link %}
<h2 class="blog_post_title"><a href="{{ post.redirect_link }}" target="_blank" rel="noopener" class="blog_post_title_link">{{ post.title | escape }}</a>
<a href="{{ post.redirect_link }}" target="_blank" rel="noopener" class="blog_post_title_link">
<span class="continued_text">
{% assign continue_text = ' [Continued on ' %}
{% assign domain_name = post.redirect_link | remove: "https://" | remove: "http://" | remove: "www." | append: "]" %}
{{ continue_text | append: domain_name }}
</span>
</a>
</h2>
<!-- Blog without release -->
<div class="col-xs-12 col-lg-6">
<div id="blog_post" class="without_release">
{% for post in site.posts %}
{% if post.tags contains "release" %}
{% continue %}
{% else %}
<h2 class="blog_post_title"><a href="{{ post.url | relative_url }}" class="blog_post_title_link">{{ post.title | escape }}</a></h2>
{% endif %}
{% if post.redirect_link %}
<h2 class="blog_post_title"><a href="{{ post.redirect_link }}" target="_blank" rel="noopener" class="blog_post_title_link">{{ post.title | escape }}</a>
<a href="{{ post.redirect_link }}" target="_blank" rel="noopener" class="blog_post_title_link">
<span class="continued_text">
{% assign continue_text = ' [Continued on ' %}
{% assign domain_name = post.redirect_link | remove: "https://" | remove: "http://" | remove: "www." | append: "]" %}
{{ continue_text | append: domain_name }}
</span>
</a>
</h2>
{% else %}
<h2 class="blog_post_title"><a href="{{ post.url | relative_url }}" class="blog_post_title_link">{{ post.title | escape }}</a></h2>
{% endif %}

{% assign additional_author_count = 0 %}
{% for author in post.additional_authors %}
{% assign additional_author_count = additional_author_count | plus: 1 %}
{% endfor %}
<div class="blog_post_author_data_container">
<div class="author_images_container">
<img class="blog_post_author_image" src="{{ post.author_picture }}" alt="Blog author picture">
{% assign additional_author_count = 0 %}
{% for author in post.additional_authors %}
{% assign additional_author_count = additional_author_count | plus: 1 %}
{% endfor %}
<div class="blog_post_author_data_container">
<div class="author_images_container">
<img class="blog_post_author_image" src="{{ post.author_picture }}" alt="Blog author picture">
{% for author in post.additional_authors %}
<img class="blog_post_author_image" src="{{ author.image }}" alt="Image of author">
{% endfor %}
</div>
<a class="blog_post_author_name" href="{{ post.author_github }}" target="_blank" rel="noopener">{{ post.author }}</a>
{% for author in post.additional_authors %}
<img class="blog_post_author_image" src="{{ author.image }}" alt="Image of author">
{% if additional_author_count == 1 %}
<span>and </span>
<a class="blog_post_author_name" href="{{ author.github }}" target="_blank" rel="noopener">{{ author.name }}</a>
{% else %}
<span>and {{ additional_author_count }} others</span>
{% break %}
{% endif %}
{% endfor %}
{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
<span class="blog_post_date" title="{{ post.date | date: date_format }}">on {{ post.date | date: date_format }}</span>
</div>
<a class="blog_post_author_name" href="{{ post.author_github }}" target="_blank" rel="noopener">{{ post.author }}</a>
{% for author in post.additional_authors %}
{% if additional_author_count == 1 %}
<span>and </span>
<a class="blog_post_author_name" href="{{ author.github }}" target="_blank" rel="noopener">{{ author.name }}</a>

<p class="blog_post_paragraph">
{% if post.blog_description %}
{{ post.blog_description }}
{% else %}
<span>and {{ additional_author_count }} others</span>
{% break %}
{{ post.content | strip_html | truncatewords: 60 }}
{% endif %}
{% endfor %}
{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
<span class="blog_post_date" title="{{ post.date | date: date_format }}">on {{ post.date | date: date_format }}</span>
</div>

<p class="blog_post_paragraph">
{% if post.blog_description %}
{{ post.blog_description }}
</p>
{% break %}
{% endif %}
{% endfor %}
<a id="blog_link" href="{{baseURL}}/blog/">View all blog posts</a>
</div>
</div>
<!-- Blog with release -->
<div class="col-xs-12 col-lg-6">
<div id="blog_post" class="with_release">
{% for post in site.posts %}
{% if post.tags contains "release" %}
{% if post.redirect_link %}
<h2 class="blog_post_title"><a href="{{ post.redirect_link }}" target="_blank" rel="noopener" class="blog_post_title_link">{{ post.title | escape }}</a>
<a href="{{ post.redirect_link }}" target="_blank" rel="noopener" class="blog_post_title_link">
<span class="continued_text">
{% assign continue_text = ' [Continued on ' %}
{% assign domain_name = post.redirect_link | remove: "https://" | remove: "http://" | remove: "www." | append: "]" %}
{{ continue_text | append: domain_name }}
</span>
</a>
</h2>
{% else %}
{{ post.content | strip_html | truncatewords: 60 }}
<h2 class="blog_post_title"><a href="{{ post.url | relative_url }}" class="blog_post_title_link">{{ post.title | escape }}</a></h2>
{% endif %}
</p>
{% endfor %}
<a id="blog_link" href="{{baseURL}}/blog/">{% t home.link_to_blog_post %}</a>

{% assign additional_author_count = 0 %}
{% for author in post.additional_authors %}
{% assign additional_author_count = additional_author_count | plus: 1 %}
{% endfor %}
<div class="blog_post_author_data_container">
<div class="author_images_container">
<img class="blog_post_author_image" src="{{ post.author_picture }}" alt="Blog author picture">
{% for author in post.additional_authors %}
<img class="blog_post_author_image" src="{{ author.image }}" alt="Image of author">
{% endfor %}
</div>
<a class="blog_post_author_name" href="{{ post.author_github }}" target="_blank" rel="noopener">{{ post.author }}</a>
{% for author in post.additional_authors %}
{% if additional_author_count == 1 %}
<span>and </span>
<a class="blog_post_author_name" href="{{ author.github }}" target="_blank" rel="noopener">{{ author.name }}</a>
{% else %}
<span>and {{ additional_author_count }} others</span>
{% break %}
{% endif %}
{% endfor %}
{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
<span class="blog_post_date" title="{{ post.date | date: date_format }}">on {{ post.date | date: date_format }}</span>
</div>

<p class="blog_post_paragraph">
{% if post.blog_description %}
{{ post.blog_description }}
{% else %}
{{ post.content | strip_html | truncatewords: 60 }}
{% endif %}
</p>
{% break %}
{% else %}
{% continue %}
{% endif %}
{% endfor %}
<a id="blog_link" href="{{baseURL}}/blog/?search=release">View all release blog posts</a>
</div>
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/main/content/start.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h2 id="_create_a_starter_application" class="section_title"><a class="anchor" h
<div class="row">
<div class="col">
<div id="starter_warnings"></div>
<a id="starter_submit" class="light_green_link_light_background disabled" tabindex="0" data-toggle="modal">{% t start.generate_project %}</a>
<a id="starter_submit" class="light_green_link_light_background disabled" tabindex="0" data-toggle="modal" role="button">{% t start.generate_project %}</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -162,7 +162,7 @@ <h2 id="getOL" class="section_title"><a class="anchor" href="#getOL"></a>{% t st
<div class="code_block_wrapper" title="Code block">
<div class="copied_confirmation">Copied to clipboard</div>
<input type="image" class="copy_to_clipboard" src="/img/guides_copy_button.svg" alt="Copy code block" title="Copy code block"/>
<pre class="code_container">&lt;plugin&gt;<br> &lt;groupId&gt;io.openliberty.tools&lt;/groupId&gt;<br> &lt;artifactId&gt;liberty-maven-plugin&lt;/artifactId&gt;<br> &lt;version&gt;<span class="latest_version">3.9</span>&lt;/version&gt;<br>&lt;/plugin&gt;</pre>
<pre class="code_container" tabindex="0">&lt;dependency&gt;<br> &lt;groupId&gt;io.openliberty&lt;/groupId&gt;<br> &lt;artifactId&gt;openliberty-runtime&lt;/artifactId&gt;<br> &lt;version&gt;[<span class="latest_version">19.0.0.9</span>,)&lt;/version&gt;<br> &lt;type&gt;zip&lt;/type&gt;<br>&lt;/dependency&gt;</pre>
</div>
<p>{% t start.find_out %}
<a href="{{baseURL}}/guides/maven-intro.html" class="blue_link_light_background_external">{% t start.how_to_use_maven %}</a>
Expand Down Expand Up @@ -218,15 +218,15 @@ <h2 id="_develop_with_liberty_tools" class="section_title"><a class="anchor" hre
<div class="column">
<a id="liberty_tools_for_eclipse_link" href="https://marketplace.eclipse.org/content/liberty-tools">
{% t start.ide_tools.eclipse_link %}
<img src="/img/launch_white.svg" class="launch_icon" >
<img src="/img/launch_white.svg" class="launch_icon" aria-label="Eclipse IDE" >
</a>
<a id="liberty_tools_for_intellij_link" href="https://plugins.jetbrains.com/plugin/14856-liberty-tools">
{% t start.ide_tools.intellij_link %}
<img src="/img/launch_white.svg" class="launch_icon" >
<img src="/img/launch_white.svg" class="launch_icon" aria-label="IntelliJ IDEA" >
</a>
<a id="liberty_tools_for_vs_code_link" href="https://marketplace.visualstudio.com/items?itemName=Open-Liberty.liberty-dev-vscode-ext">
{% t start.ide_tools.vscode_link %}
<img src="/img/launch_white.svg" class="launch_icon" >
<img src="/img/launch_white.svg" class="launch_icon" aria-label="Visual Studio Code" >
</a>
</div>
</div>
Expand Down

0 comments on commit 4588c36

Please sign in to comment.