reapply jp UI over production UI

mojavelinux · mojavelinux · commit 6e49691ecc01 · 2019-09-25T20:03:13.000-06:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,6 +1,6 @@
 #!/bin/env groovy
 
-def gitBranch = 'master'
+def gitBranch = 'japn'
 def githubCredentialsId = 'mule-docs-agent-github-token'
 
 pipeline {
diff --git a/README.adoc b/README.adoc
@@ -1,4 +1,4 @@
-= MuleSoft Documentation Site UI
+= MuleSoft JP Documentation Site UI
 // Settings:
 :experimental:
 :hide-uri-scheme:
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mulesoft-docs-site-ui",
-  "description": "This project produces the UI for the MuleSoft documentation site.",
+  "description": "This project produces the UI for the MuleSoft JP documentation site.",
   "homepage": "",
   "repository": {
     "type": "git",
diff --git a/preview-site-src/ui-model.yml b/preview-site-src/ui-model.yml
@@ -109,7 +109,7 @@ page:
   version: '3.8'
   module: ROOT
   home: false
-  editUrl: https://github.com/mulesoft/docs-site-ui/edit/master/preview-site-src/index.adoc
+  editUrl: https://github.com/mulesoft/docs-site-ui/edit/japn/preview-site-src/index.adoc
   versions:
   - version: '3.9'
     url: '#'
@@ -124,3 +124,4 @@ page:
     urlType: internal
   origin:
     url: https://github.com/mulesoft/docs-site-ui
+    private: true
diff --git a/src/css/adoc/admonition-block.css b/src/css/adoc/admonition-block.css
@@ -83,3 +83,20 @@
     }
   }
 }
+html:lang(jp) .admonitionblock {
+  &.caution tbody::before {
+    content: '注意';
+  }
+  &.important tbody::before {
+    content: '重要';
+  }
+  &.note tbody::before {
+    content: 'メモ';
+  }
+  &.tip tbody::before {
+    content: 'ヒント';
+  }
+  &.warning tbody::before {
+    content: '警告';
+  }
+}
diff --git a/src/css/globals/vars.css b/src/css/globals/vars.css
@@ -60,7 +60,6 @@
   --screen-xl: 1350px;
 
   /* z-index */
-  --z-gdpr: 20;
   --z-modal-header: 16;
   --z-modal: 15;
   --z-nav-mobile: 14;
diff --git a/src/css/site.css b/src/css/site.css
@@ -19,7 +19,6 @@
 
 /* specific */
 @import "specific/header.css";
-@import "specific/gdpr.css";
 @import "specific/navigation.css";
 @import "specific/toc.css";
 @import "specific/toolbar.css";
diff --git a/src/css/specific/gdpr.css b/src/css/specific/gdpr.css
diff --git a/src/helpers/ends-with.js b/src/helpers/ends-with.js
@@ -0,0 +1,3 @@
+'use strict'
+
+module.exports = (subject, value) => subject && subject.endsWith(value)
diff --git a/src/js/06-gdpr.js b/src/js/06-gdpr.js
diff --git a/src/layouts/404.hbs b/src/layouts/404.hbs
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1.0">
-<title>{{{detag (or page.title 'Page Not Found')}}}{{#if site.title}} | {{{site.title}}}{{/if}}</title>
+<title>{{{detag (or page.title 'ページが見つかりません')}}}{{#if site.title}} | {{{site.title}}}{{/if}}</title>
 {{> head}}
 </head>
 <body class="status-404 flex col">
diff --git a/src/layouts/default.hbs b/src/layouts/default.hbs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html{{#if (ends-with page.origin.url '-jp')}} lang="jp"{{/if}}>
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1.0">
diff --git a/src/partials/article.hbs b/src/partials/article.hbs
@@ -1,12 +1,11 @@
 <article class="doc">
 {{#if (eq page.layout '404')}}
-<h1 class="page">{{{or page.title 'Page Not Found'}}}</h1>
+<h1 class="page">{{{or page.title 'ページが見つかりません'}}}</h1>
 <div class="paragraph">
-<p>The page you're looking for does not exist. It may have been moved.</p>
+<p>お探しのページは存在しません。移動した可能性があります。</p>
 </div>
 <div class="paragraph">
-<p>If you arrived on this page by clicking on a link, please notify the owner of the site that the link is broken.
-If you typed the URL of this page manually, please double check that you entered the address correctly.</p>
+<p>リンクをクリックしてこのページにアクセスした場合は、サイトの所有者にリンクが切れていることをお知らせください。このページの URL を手入力した場合は、アドレスを正しく入力したことを再確認してください。</p>
 </div>
 {{else}}
 {{#if page.title}}
diff --git a/src/partials/footer-content.hbs b/src/partials/footer-content.hbs
@@ -1 +1,59 @@
-<div class="ms-com-content ms-com-content-footer"> <footer class="ms-com-footer"><section class="footer-top"><div class="footer-inside"> <div class="footer-links-marketo-form"> <div class="footer-tm"> <div> <nav role="navigation" aria-labelledby="block-footertmdefault" id="block-footertmdefault" class="block-footertmdefault"><ul class="menu"><li> <span target="_self">Related resources</span> <ul><li> <a href="https://www.mulesoft.com/resources/api/connected-business-strategy" target="_self" data-drupal-link-system-path="node/138761">The value of APIs for business</a> </li> <li> <a href="https://www.mulesoft.com/resources/api/what-is-rest-api-design" target="_self" data-drupal-link-system-path="node/140071">What is REST API design?</a> </li> <li> <a href="https://www.mulesoft.com/resources/api/development-best-practices" target="_self" data-drupal-link-system-path="node/140076">API development best practices</a> </li> </ul></li> <li> <span target="_self">Recommended for you</span> <ul><li> <a href="https://www.mulesoft.com/lp/reports/connectivity-benchmark" target="_self">Connectivity benchmark report</a> </li> <li> <a href="https://www.mulesoft.com/lp/whitepaper/api/application-network" data-drupal-link-system-path="node/185296">The application network</a> </li> <li> <a href="https://www.mulesoft.com/lp/whitepaper/api/design-apis" data-drupal-link-system-path="node/185266">How to design and manage APIs</a> </li> </ul></li> <li> <span target="_self">Watch now on demand</span> <ul><li> <a href="https://www.mulesoft.com/webinars/api/microservices-architecture" data-drupal-link-system-path="node/186041">Best practices for microservices</a> </li> <li> <a href="https://www.mulesoft.com/webinars/api/security-best-practices" data-drupal-link-system-path="node/186011">API security best practices</a> </li> <li> <a href="https://www.mulesoft.com/webinars/api/mule-101-anypoint-platform-overview" data-drupal-link-system-path="node/186416">Anypoint Platform overview</a> </li> </ul></li> </ul></nav></div> </div> <form id="mktoForm_1771"> <h4>Sign up for our newsletter</h4> </form> </div> <nav><a href="https://developer.mulesoft.com/" target="_blank">Developers</a> <a href="https://blogs.mulesoft.com" target="_blank">Blog</a> <a href="https://www.mulesoft.com/content/terms-service" target="_blank">Terms</a> <a href="https://www.mulesoft.com/privacy-policy" target="_blank">Privacy</a> <a href="https://www.salesforce.com/content/dam/web/en_us/www/documents/legal/Privacy/privacy-shield-notice.pdf" target="_blank">Privacy Shield</a> <a class="removable" href="https://www.mulesoft.com/contact" target="_blank">Contact</a> <a class="removable" href="https://www.mulesoft.com/contact" target="_blank"> 1-415-229-2009</a> </nav><p class="mulecopy">MuleSoft provides a widely used <a href="https://www.mulesoft.com/platform/enterprise-integration">integration platform</a> for connecting applications, data, and devices in the cloud and on-premises. MuleSoft's Anypoint Platform&trade; is a unified, single solution for <a href="https://www.mulesoft.com/lp/reports/gartner-magic-quadrant-ipaas">iPaaS</a> and full lifecycle <a href="https://www.mulesoft.com/platform/api-management">API management</a>. Anypoint Platform, including <a href="https://www.mulesoft.com/platform/saas/cloudhub-ipaas-cloud-based-integration">CloudHub&trade;</a> and <a href="https://www.mulesoft.com/platform/soa/mule-esb-open-source-esb">Mule ESB&trade;</a>, is built on proven open-source software for fast and reliable on-premises and cloud integration without vendor lock-in.</p> </div> </section><section class="footer-bottom"><div class="footer-inside"> <p class="footer-copyright"><span>&copy;2019</span> MuleSoft, LLC</p> <nav class="social-logos"><a href="https://twitter.com/MuleSoft" target="_blank" class="icon-muletheme-twitter"></a> <a href="https://www.linkedin.com/company/mulesoft" target="_blank" class="icon-muletheme-linkedin"></a> <a href="https://www.facebook.com/mulesoft" target="_blank" class="icon-muletheme-facebook"></a> <a href="https://www.instagram.com/mulesoft" target="_blank" class="icon-muletheme-instagram"></a> <a href="https://videos.mulesoft.com/" target="_blank" class="icon-muletheme-videos"></a> </nav><div class="language-selector-wrapper sl_opaque"> <ul class="language-selection"><li class="german"><a href="https://www.mulesoft.com/de">Deutsch</a></li> <li class="english"><a href="https://www.mulesoft.com/">English <sub>Full site</sub></a></li> <li class="french"><a href="https://www.mulesoft.com/fr">French</a></li> <li class="japanese"><a href="https://www.mulesoft.com/jp">Japanese</a></li> </ul><ul class="language-selected"><li class="german"><a href="https://www.mulesoft.com/de">Deutsch</a></li> <li class="french"><a href="https://www.mulesoft.com/fr">French</a></li> <li class="japanese"><a href="https://www.mulesoft.com/jp">Japanese</a></li> <li class="english"><a href="https://www.mulesoft.com/">English <sub>Full site</sub></a></li> </ul></div> </div> </section></footer></div>
+<div id="sl-ms-com-content-footer" class="ms-com-content ms-com-content-tr ms-com-content-footer">
+  <footer class="ms-com-footer">
+    <section class="footer-top">
+      <div class="footer-inside">
+        <div class="footer-links-marketo-form">
+          <div class="footer-tm">
+            <a href="{{siteRootPath}}" class="logo" onclick="ga('send', 'event', 'NAV', 'NavClick', 'Logo');"></a>
+            <div class="ms-com-content-tr-footer-description">
+              <p>MuleSoftは、SaaSとエンタープライズアプリケーションをクラウド、オンプレミス、またはその両方で接続するために広く使用されている統合プラットフォームを提供します。</p>
+              <nav class="social-logos">
+                <a href="https://twitter.com/MuleSoft" target="_blank" class="icon-muletheme-twitter"></a>
+                <a href="https://www.linkedin.com/company/mulesoft" target="_blank" class="icon-muletheme-linkedin"></a>
+                <a href="https://www.facebook.com/mulesoft" target="_blank" class="icon-muletheme-facebook"></a>
+                <a href="https://www.instagram.com/mulesoft" target="_blank" class="icon-muletheme-instagram"></a>
+                <a href="https://videos.mulesoft.com/" target="_blank" class="icon-muletheme-videos"></a>
+              </nav>
+            </div>
+            <div>
+              <nav role="navigation">
+                <ul class="menu">
+                  <li>
+                    <span>開発者リソース</span>
+                    <ul>
+                      <li>
+                        <a href="https://docs.mulesoft.com" class="sl_norewrite">ドキュメント（日本語は近日公開）</a>
+                      </li>
+                      <li>
+                        <a href="https://forums.mulesoft.com/" class="sl_norewrite">フォーラム</a>
+                      </li>
+                      <li>
+                        <a href="https://support.mulesoft.com/s/login/" class="sl_norewrite">サポートログイン</a>
+                      </li>
+                    </ul>
+
+                  </li>
+                </ul>
+              </nav>
+            </div>
+          </div>
+        </div>
+      </div>
+    </section>
+    <section class="footer-bottom">
+      <div class="footer-inside">
+        <p class="footer-copyright"><span>©2019</span> MuleSoft, LLC</p>
+        <div class="footer-bottom-links">
+          <a href="https://www.salesforce.com/jp/company/privacy" target="_blank">プライバシー</a>
+          <a href="https://www.mulesoft.com/content/terms-service" target="_blank">利用規約</a>
+        </div>
+        <div class="language-selector-wrapper">
+          <ul class="language-selection">
+            <li class="english"><a href="https://www.mulesoft.com/">英語<sub>完全版サイト</sub></a></li>
+            <li class="japanese"><a href="https://www.mulesoft.com/jp">日本語</a></li>
+          </ul>
+        </div>
+      </div>
+    </section>
+  </footer>
+</div>
diff --git a/src/partials/footer.hbs b/src/partials/footer.hbs
@@ -1,10 +1,3 @@
 {{> footer-content}}
 <div class="modal-backdrop"></div>
-<div class="gdpr js-gdpr">
-  <div class="gdpr-container">
-    <p class="gdpr-text">We use cookies to make interactions with our websites and services easy and meaningful, to better understand how they are used and to tailor advertising. You can read more and make your cookie choices <a class="link" href="//mulesoft.com/privacy-policy">here</a>. By continuing to use this site you are giving us your consent to do this.</p>
-    <button class="gdpr-close js-gdpr-close">+</button>
-  </div>
-</div>
-
 {{> footer-scripts}}
diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-= MuleSoft Documentation Site UI`
	`1`	`+= MuleSoft JP Documentation Site UI`
`2`	`2`	`// Settings:`
`3`	`3`	`:experimental:`
`4`	`4`	`:hide-uri-scheme:`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mulesoft-docs-site-ui",`
`3`		`- "description": "This project produces the UI for the MuleSoft documentation site.",`
	`3`	`+ "description": "This project produces the UI for the MuleSoft JP documentation site.",`
`4`	`4`	`"homepage": "",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+'use strict'`
	`2`	`+`
	`3`	`+module.exports = (subject, value) => subject && subject.endsWith(value)`