Merge pull request #4020 from OpenLiberty/staging

Update prod

Author: navaneethsnair1

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,5 @@
+## Link to issue being addressed:
+
 ## What was changed and why?
 
 ## Tested using browser:

.github/workflows/rebase-check.yml

@@ -0,0 +1,29 @@
+name: Rebase Check
+
+on:
+  pull_request:
+    types: [opened]
+    branches:
+      - staging
+      - draft
+
+jobs:
+  rebase-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  
+          
+      - name: Post '..' comparison link to verify changes are identical to normal comparison
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const compareUrl = `https://github.com/OpenLiberty/openliberty.io/compare/${{ github.base_ref }}..${{ github.head_ref }}`;
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: 'openliberty.io',
+              issue_number: context.payload.pull_request.number,
+              body: `**Compare your changes here:** \n ${compareUrl} \n Ensure the changes are identical to the desired changes. If not, please resolve merge conflicts (if any) and rebase '${{ github.head_ref }}' onto '${{ github.base_ref }}'`
+            });

src/main/content/_assets/css/end-of-guide.scss

@@ -56,6 +56,9 @@
     color:#5d6a8e;
     letter-spacing:0;
     line-height:24px;
+    &:hover {
+        color: #313653;
+    }
 }
 
 .licensedClass {
@@ -214,3 +217,7 @@
 footer {
     padding-top: 0;
 }
+
+.license{
+    margin-top: 41px;
+}

src/main/content/_assets/css/guide-common.scss

@@ -118,7 +118,7 @@
 }
 
 #guide_content a,
-#end_of_guide a {
+#end_of_guide a:not(#guide_attribution) {
   font-weight: 500;
   color: #cc4d19;
   transition: color 0.2s;
@@ -127,7 +127,7 @@
 }
 
 #guide_content a:hover,
-#end_of_guide a:hover {
+#end_of_guide a:not(#guide_attribution):hover {
   color: #f4914d;
 }
 

src/main/content/_assets/js/guide-common.js

@@ -299,7 +299,6 @@ function createEndOfGuideContent() {
         .siblings()
         .find("p")
         .clone();
-    whatYouLearned.first().prepend("Nice work! "); // Start every what you learned statement with 'Nice work!'
     whatYouLearned.attr("tabindex", "-1");
     leftSide.prepend(whatYouLearned);
     $("#great-work-you-re-done, #great-work-youre-done").parent().remove(); // Remove section from the main guide column.
@@ -308,16 +307,6 @@ function createEndOfGuideContent() {
     )
         .parent()
         .remove(); // Remove from TOC.
-    // Concatenate the guide title and guide attribution license and append it to the end of guide.
-    var guideAttributionText = $("#guide-attribution")
-        .siblings()
-        .find("p")
-        .html();
-    if (guideAttributionText) {
-        $("#guide_attribution").html(guideAttributionText);
-        $("#guide-attribution").parent().remove();
-        $("#toc_container a[href='#guide-attribution']").parent().remove(); // Remove from TOC.
-    }
 
     var relatedLinks = $("#related-links").siblings().find("p").clone();
     rightSide.append(relatedLinks);

src/main/content/_i18n/en.yml

@@ -277,7 +277,6 @@ overview:
   open_issue: Open Issue
   edit_topic: Edit Topic
 endofguide:
-  nice_work: Nice work!
   where_to_next: Where to next?
   what_do_you_think_of_this_guide: What did you think of this guide?
   thanks_for_feedback: Thank you for your feedback!
@@ -296,5 +295,8 @@ endofguide:
   download_sample_app: Download the sample application for this guide bundled with Open Liberty on github
   keep_exploring: Keep exploring
   with_these_guides: with these guides.
+  great_work: Great work!
+  you_are_done: You're done!
+  guide_license: Guide license
 seo:
   blogs: Latest news and information about Open Liberty, a lightweight open framework for building cloud-native Java applications and microservices. Blogs include latest release and beta updates, technical articles on Jakarta EE, MicroProfile, Kubernetes and container-related Java technologies, and community content.

src/main/content/_i18n/ja.yml

@@ -276,7 +276,6 @@ overview:
   open_issue: Open Issue
   edit_topic: Edit Topic
 endofguide:
-  nice_work: Nice work!
   where_to_next: Where to next?
   what_do_you_think_of_this_guide: What did you think of this guide?
   thanks_for_feedback: Thank you for your feedback!
@@ -295,5 +294,8 @@ endofguide:
   download_sample_app: Download the sample application for this guide bundled with Open Liberty on github
   keep_exploring: Keep exploring
   with_these_guides: with these guides.
+  great_work: Great work!
+  you_are_done: You're done!
+  guide_license: Guide license
 seo:
   blogs: クラウド・ネイティブの Java アプリケーションとマイクロサービスを構築するための軽量のオープン・フレームワークである Open Liberty に関する最新ニュースと情報。 ブログには、最新のリリースとベータ版の更新、Jakarta EE、MicroProfile、Kubernetes、コンテナー関連の Java テクノロジーに関する技術記事、コミュニティー・コンテンツが含まれます。

src/main/content/_i18n/zh-Hans.yml

@@ -276,7 +276,6 @@ overview:
   open_issue: Open Issue
   edit_topic: Edit Topic
 endofguide:
-  nice_work: Nice work!
   where_to_next: Where to next?
   what_do_you_think_of_this_guide: What did you think of this guide?
   thanks_for_feedback: Thank you for your feedback!
@@ -295,5 +294,8 @@ endofguide:
   download_sample_app: Download the sample application for this guide bundled with Open Liberty on github
   keep_exploring: Keep exploring
   with_these_guides: with these guides.
+  great_work: Great work!
+  you_are_done: You're done!
+  guide_license: Guide license
 seo:
   blogs: 有关 Open Liberty 的最新新闻和信息，这是用于构建云本机 Java 应用程序和微服务的轻量级开放式框架。 博客包括最新发布和 beta 更新，有关 Jakarta EE ， MicroProfile， Kubernetes 和容器相关 Java 技术的技术文章以及社区内容。

src/main/content/_includes/end-of-guide.html

@@ -34,9 +34,8 @@
 {% endif %}
 
 <div id="end_of_guide">
-        <h2 tabindex="-1">{% t endofguide.nice_work %} {% t endofguide.where_to_next %}</h2>
+        <h2 tabindex="-1">{% t endofguide.great_work %} {% t endofguide.you_are_done %}</h2>
         <div id="end_of_guide_left_section">
-            <p id="guide_attribution"></p>
 
             <h3 id="feedback_rating_question">{% t endofguide.what_do_you_think_of_this_guide %}</h3>
             <div id="feedback_ratings">
@@ -80,6 +79,8 @@ <h3 id="need_help">{% t endofguide.need_help %}</h3>
 
             <h3>{% t endofguide.like_olio %}</h3>
             <a class="github-button" href="https://github.com/OpenLiberty/open-liberty" data-icon="octicon-star" aria-label="Star OpenLiberty/open-liberty on GitHub">{% t endofguide.star %}</a>
+
+            <p class="license"><a id="guide_attribution" target="_blank" rel="noopener noreferrer" href="https://github.com/OpenLiberty/guide-{{page.url | replace: '/guides/', ''}}/blob/prod/LICENSE">{% t endofguide.guide_license %}</a> </p>
         </div>
         <div id="end_of_guide_right_section">
             <h3 id="where_to_next">{% t endofguide.where_to_next %}</h3>