Skip to content

Commit

Permalink
Update docs after new Japanese translations for 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ultraq committed Oct 15, 2023
1 parent d4f6a5e commit c12f39e
Show file tree
Hide file tree
Showing 31 changed files with 5,132 additions and 272 deletions.
1 change: 0 additions & 1 deletion doc/articles/fromhtmltohtmlviahtml.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<li><a href="../../faq.html" class="toolbar-link">FAQ</a></li>
</ul>
<ul id="site-nav-links" class="toolbar-links">
<li><a href="http://forum.thymeleaf.org/" class="toolbar-link">Forum</a></li>
<li><a href="https://twitter.com/thymeleaf" class="toolbar-link">Twitter</a></li>
<li><a href="https://github.com/thymeleaf" class="toolbar-link">GitHub</a></li>
</ul>
Expand Down
13 changes: 8 additions & 5 deletions doc/articles/layouts.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<li><a href="../../faq.html" class="toolbar-link">FAQ</a></li>
</ul>
<ul id="site-nav-links" class="toolbar-links">
<li><a href="http://forum.thymeleaf.org/" class="toolbar-link">Forum</a></li>
<li><a href="https://twitter.com/thymeleaf" class="toolbar-link">Twitter</a></li>
<li><a href="https://github.com/thymeleaf" class="toolbar-link">GitHub</a></li>
</ul>
Expand Down Expand Up @@ -152,7 +151,8 @@ <h3>Basic inclusion with <code>th:insert</code> and <code>th:replace</code></h3>
&lt;/html&gt;</code></pre>
<p>You can open the file directly in a browser:</p>
<figure>
<img src="images/layouts/homeNotSignedIn.png" alt="Home page when not signed in" /><figcaption>Home page when not signed in</figcaption>
<img src="images/layouts/homeNotSignedIn.png" alt="Home page when not signed in" />
<figcaption aria-hidden="true">Home page when not signed in</figcaption>
</figure>
<p>In the above example, we are building a page that consists of page header and page footer. In Thymeleaf all fragments can be defined in a single file (e.g. <code>fragments.html</code>) or in a separate files, like in this particular case.</p>
<p>Let’s shortly analyze the inclusion statement:</p>
Expand Down Expand Up @@ -205,7 +205,8 @@ <h3>Basic inclusion with <code>th:insert</code> and <code>th:replace</code></h3>
&lt;/html&gt;</code></pre>
<p>…which we can open directly in a browser:</p>
<figure>
<img src="images/layouts/header.png" alt="Header page" /><figcaption>Header page</figcaption>
<img src="images/layouts/header.png" alt="Header page" />
<figcaption aria-hidden="true">Header page</figcaption>
</figure>
<p>And template <code>fragments/footer.html</code></p>
<pre class="xml"><code>&lt;!DOCTYPE html&gt;
Expand Down Expand Up @@ -461,7 +462,8 @@ <h3>Creating a layout</h3>
&lt;/html&gt;</code></pre>
<p>We can open the file directly in a browser:</p>
<figure>
<img src="images/layouts/layoutlayoutdialect.png" alt="Layout page" /><figcaption>Layout page</figcaption>
<img src="images/layouts/layoutlayoutdialect.png" alt="Layout page" />
<figcaption aria-hidden="true">Layout page</figcaption>
</figure>
<p>The above file is our decorator for content pages we will be creating in the application. The most important thing about the above example is <code>layout:fragment="content"</code>. This is the <em>heart</em> of the decorator page (layout). You can also notice, that header and footer are included using Standard Thymeleaf Layout System.</p>
<p>The content page looks as follows (<code>WEB-INF/views/task/list.html</code>):</p>
Expand Down Expand Up @@ -500,7 +502,8 @@ <h3>Creating a layout</h3>
&lt;/html&gt;</code></pre>
<p>And in the browser it looks like this:</p>
<figure>
<img src="images/layouts/layoutlayoutdialectlist.png" alt="Layout page" /><figcaption>Layout page</figcaption>
<img src="images/layouts/layoutlayoutdialectlist.png" alt="Layout page" />
<figcaption aria-hidden="true">Layout page</figcaption>
</figure>
<p>Content of this <code>task/list</code> view will be decorated by the elements of <code>task/layout</code> view. Please note <code>layout:decorate="~{task/layout}"</code> attribute in <code>&lt;html&gt;</code> element. This attribute signals to the Layout Dialect which layout should be used to decorate given view. And please note it is using Thymeleaf Fragment Expression syntax.</p>
<p>And what about <em>Natural Templates</em> using the Layout Dialect? Again, possible! You simply need to add some prototyping-only markup around the fragments being included in your templates and that’s it!</p>
Expand Down
19 changes: 11 additions & 8 deletions doc/articles/petclinic.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<li><a href="../../faq.html" class="toolbar-link">FAQ</a></li>
</ul>
<ul id="site-nav-links" class="toolbar-links">
<li><a href="http://forum.thymeleaf.org/" class="toolbar-link">Forum</a></li>
<li><a href="https://twitter.com/thymeleaf" class="toolbar-link">Twitter</a></li>
<li><a href="https://github.com/thymeleaf" class="toolbar-link">GitHub</a></li>
</ul>
Expand Down Expand Up @@ -74,7 +73,8 @@ <h1>Bringing Thymeleaf and Natural Templates to the Spring PetClinic</h1>
<h2>The Spring PetClinic application</h2>
<p><em>PetClinic</em> is one of the example applications created by SpringSource for the Spring Framework. It is designed to display and manage information related to pets and veterinarians in a pet clinic. The original SpringSource version lives in GitHub <a href="https://github.com/SpringSource/spring-petclinic">here</a>, and the thymeleaf-enabled version lives also in GitHub <a href="https://github.com/thymeleaf/thymeleafexamples-petclinic">here</a>.</p>
<figure>
<img src="images/petclinic/home.png" alt="PetClinic home page" /><figcaption>PetClinic home page</figcaption>
<img src="images/petclinic/home.png" alt="PetClinic home page" />
<figcaption aria-hidden="true">PetClinic home page</figcaption>
</figure>
<p><em>Pet Clinic</em> originally includes a view layer created with JSP, which we will replace using Thymeleaf:</p>
<ul>
Expand Down Expand Up @@ -154,7 +154,8 @@ <h2>From JSP to Thymeleaf</h2>
<p>Remember you can see all the templates at the source code, downloadable from <a href="/documentation.html">the documentation page</a>, and also that you can review the original JSP files at the <code>doc/old_viewlayer</code> folder.</p>
<p>The <em>owners/ownersList</em> page looks like this:</p>
<figure>
<img src="images/petclinic/owners.png" alt="Owners page" /><figcaption>Owners page</figcaption>
<img src="images/petclinic/owners.png" alt="Owners page" />
<figcaption aria-hidden="true">Owners page</figcaption>
</figure>
<p>In order to convert this page to Thymeleaf, we will:</p>
<ul>
Expand Down Expand Up @@ -194,7 +195,7 @@ <h2>From JSP to Thymeleaf</h2>

&lt;!-- ============================================================================ --&gt;
&lt;!-- This &lt;head&gt; is only used for static prototyping purposes (natural templates) --&gt;
&lt;!-- and is therefore entirely optionl, as this markup fragment will be included --&gt;
&lt;!-- and is therefore entirely optional, as this markup fragment will be included --&gt;
&lt;!-- from &quot;fragments.html&quot; at runtime. --&gt;
&lt;!-- ============================================================================ --&gt;

Expand Down Expand Up @@ -225,7 +226,7 @@ <h2>From JSP to Thymeleaf</h2>

&lt;!-- =========================================================================== --&gt;
&lt;!-- This div is only used for static prototyping purposes (natural templates) --&gt;
&lt;!-- and is therefore entirely optionl, as this markup fragment will be included --&gt;
&lt;!-- and is therefore entirely optional, as this markup fragment will be included --&gt;
&lt;!-- from &quot;fragments.html&quot; at runtime. --&gt;
&lt;!-- =========================================================================== --&gt;

Expand Down Expand Up @@ -275,7 +276,7 @@ <h2>From JSP to Thymeleaf</h2>

&lt;!-- =========================================================================== --&gt;
&lt;!-- This table section is only used for static prototyping purposes (natural --&gt;
&lt;!-- templates) and is therefore entirely optionl, as this markup fragment will --&gt;
&lt;!-- templates) and is therefore entirely optional, as this markup fragment will --&gt;
&lt;!-- be included from &quot;fragments.html&quot; at runtime. --&gt;
&lt;!-- =========================================================================== --&gt;

Expand Down Expand Up @@ -363,11 +364,13 @@ <h2>And what about the <em>Natural Templates</em> thing?</h2>
<p>Before we started this migration, we set a goal that our new Thymeleaf templates would be able to display correctly when open statically in a browser (without starting the application server) thanks to the <em>Natural Templating</em> capabilities of Thymeleaf.</p>
<p>Well, let’s have a look at how the original <code>owners/ownersList.jsp</code> template looks like when seen statically:</p>
<figure>
<img src="images/petclinic/ownerslist_jsp_static.png" alt="Owners list (JSP), statically opened" /><figcaption>Owners list (JSP), statically opened</figcaption>
<img src="images/petclinic/ownerslist_jsp_static.png" alt="Owners list (JSP), statically opened" />
<figcaption aria-hidden="true">Owners list (JSP), statically opened</figcaption>
</figure>
<p>…and now let’s have a look at our new Thymeleaf-powered <code>owners/ownersList.html</code>:</p>
<figure>
<img src="images/petclinic/ownerslist_thymeleaf_static.png" alt="Owners list (thymeleaf), statically opened" /><figcaption>Owners list (thymeleaf), statically opened</figcaption>
<img src="images/petclinic/ownerslist_thymeleaf_static.png" alt="Owners list (thymeleaf), statically opened" />
<figcaption aria-hidden="true">Owners list (thymeleaf), statically opened</figcaption>
</figure>
<p>There we are. Data is not valid, because it is a prototype. But it looks good!</p>
</section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<li><a href="../../faq.html" class="toolbar-link">FAQ</a></li>
</ul>
<ul id="site-nav-links" class="toolbar-links">
<li><a href="http://forum.thymeleaf.org/" class="toolbar-link">Forum</a></li>
<li><a href="https://twitter.com/thymeleaf" class="toolbar-link">Twitter</a></li>
<li><a href="https://github.com/thymeleaf" class="toolbar-link">GitHub</a></li>
</ul>
Expand Down
1 change: 0 additions & 1 deletion doc/articles/sayhelloextendingthymeleaf5minutes.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<li><a href="../../faq.html" class="toolbar-link">FAQ</a></li>
</ul>
<ul id="site-nav-links" class="toolbar-links">
<li><a href="http://forum.thymeleaf.org/" class="toolbar-link">Forum</a></li>
<li><a href="https://twitter.com/thymeleaf" class="toolbar-link">Twitter</a></li>
<li><a href="https://github.com/thymeleaf" class="toolbar-link">GitHub</a></li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions doc/articles/springmail.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<li><a href="../../faq.html" class="toolbar-link">FAQ</a></li>
</ul>
<ul id="site-nav-links" class="toolbar-links">
<li><a href="http://forum.thymeleaf.org/" class="toolbar-link">Forum</a></li>
<li><a href="https://twitter.com/thymeleaf" class="toolbar-link">Twitter</a></li>
<li><a href="https://github.com/thymeleaf" class="toolbar-link">GitHub</a></li>
</ul>
Expand Down Expand Up @@ -274,7 +273,8 @@ <h3>Executing the Template Engine</h3>
<li>The former template is fully WYSIWYG; you can check how it looks just by opening it with your browser. That’s much better than sending an email to see the result, isn’t it?</li>
</ul>
<figure>
<img src="images/springmail/inline.png" alt="Image inlined in email" /><figcaption>Image inlined in email</figcaption>
<img src="images/springmail/inline.png" alt="Image inlined in email" />
<figcaption aria-hidden="true">Image inlined in email</figcaption>
</figure>
<ul>
<li>We can use all Thymeleaf features. Here for example we have used i18n with a parameterized <code>#{...}</code> expression, <code>th:each</code> to iterate over a list, <code>#dates</code> to format a date…</li>
Expand Down
1 change: 0 additions & 1 deletion doc/articles/springmvcaccessdata.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<li><a href="../../faq.html" class="toolbar-link">FAQ</a></li>
</ul>
<ul id="site-nav-links" class="toolbar-links">
<li><a href="http://forum.thymeleaf.org/" class="toolbar-link">Forum</a></li>
<li><a href="https://twitter.com/thymeleaf" class="toolbar-link">Twitter</a></li>
<li><a href="https://github.com/thymeleaf" class="toolbar-link">GitHub</a></li>
</ul>
Expand Down
3 changes: 1 addition & 2 deletions doc/articles/springsecurity.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<li><a href="../../faq.html" class="toolbar-link">FAQ</a></li>
</ul>
<ul id="site-nav-links" class="toolbar-links">
<li><a href="http://forum.thymeleaf.org/" class="toolbar-link">Forum</a></li>
<li><a href="https://twitter.com/thymeleaf" class="toolbar-link">Twitter</a></li>
<li><a href="https://github.com/thymeleaf" class="toolbar-link">GitHub</a></li>
</ul>
Expand Down Expand Up @@ -74,7 +73,7 @@ <h1>Thymeleaf + Spring Security integration basics</h1>
<p><strong>Note</strong> that the Thymeleaf integration packages for Spring Security support both Spring MVC and Spring WebFlux applications since Spring Security 5, but this article will focus on a Spring MVC configuration.</p>
<section id="prerequisites" class="level2">
<h2>Prerequisites</h2>
<p>We asume you are familiar with Thymeleaf and Spring Security, and you have a working application using these technologies. If you don’t know Spring Security, you could be interested on reading the <a href="http://static.springsource.org/spring-security/site/reference.html">Spring Security Documentation</a>.</p>
<p>We assume you are familiar with Thymeleaf and Spring Security, and you have a working application using these technologies. If you don’t know Spring Security, you could be interested on reading the <a href="http://static.springsource.org/spring-security/site/reference.html">Spring Security Documentation</a>.</p>
</section>
<section id="login-pages" class="level2">
<h2>Login pages</h2>
Expand Down
1 change: 0 additions & 1 deletion doc/articles/standarddialect5minutes.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<li><a href="../../faq.html" class="toolbar-link">FAQ</a></li>
</ul>
<ul id="site-nav-links" class="toolbar-links">
<li><a href="http://forum.thymeleaf.org/" class="toolbar-link">Forum</a></li>
<li><a href="https://twitter.com/thymeleaf" class="toolbar-link">Twitter</a></li>
<li><a href="https://github.com/thymeleaf" class="toolbar-link">GitHub</a></li>
</ul>
Expand Down
1 change: 0 additions & 1 deletion doc/articles/standardurlsyntax.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<li><a href="../../faq.html" class="toolbar-link">FAQ</a></li>
</ul>
<ul id="site-nav-links" class="toolbar-links">
<li><a href="http://forum.thymeleaf.org/" class="toolbar-link">Forum</a></li>
<li><a href="https://twitter.com/thymeleaf" class="toolbar-link">Twitter</a></li>
<li><a href="https://github.com/thymeleaf" class="toolbar-link">GitHub</a></li>
</ul>
Expand Down
Loading

0 comments on commit c12f39e

Please sign in to comment.