projects / examples / template-development / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 985808a)
Added markup for the integration of the template in the Spring-Thymeleaf-App master 1.0.5
authorKai Moritz <kai@juplo.de>
Mon, 24 Aug 2015 16:22:56 +0000 (18:22 +0200)
committerKai Moritz <kai@juplo.de>
Mon, 24 Aug 2015 21:25:02 +0000 (23:25 +0200)
html/layout.html patch | blob | history
package.json patch | blob | history

diff --git a/html/layout.html b/html/layout.html
index fc5d9d1..d17d2f1 100644 (file)
--- a/html/layout.html
+++ b/html/layout.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
-<html lang="en" xmlns:xlink="http://www.w3.org/1999/xlink">
+<html lang="en" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.thymeleaf.org">
 
 <head>
 
 
 <head>
 
@@ -7,9 +7,9 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
 
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-  <title>Layout-Template</title>
+  <title layout:title-pattern="Maven/Grunt-Integration - $CONTENT_TITLE">Layout-Template</title>
 
 
-  <link rel="stylesheet" type="text/css" href="../../css/frontend.css" />
+  <link rel="stylesheet" type="text/css" href="../../css/frontend.css" th:hre="@{'/css/frontend.css'}" />
 
 </head>
 
 
 </head>
 
@@ -20,13 +20,13 @@
       <svg>
         <use xlink:href="../../img/sprite.svg#mo"></use>
       </svg>
       <svg>
         <use xlink:href="../../img/sprite.svg#mo"></use>
       </svg>
-      <span>Simple Example-Project for Template-Development</span>
+      <span th:text="'Maven/Grunt-Integration :: ' + ${title}">Simple Example-Project for Template-Development</span>
     </h2>
     <hr />
     <!-- Navigation -->
     <nav id="menu" class="navbar navbar-submenu navbar-fixed-top">
       <h3 class="sr-only">Navigation</h3>
     </h2>
     <hr />
     <!-- Navigation -->
     <nav id="menu" class="navbar navbar-submenu navbar-fixed-top">
       <h3 class="sr-only">Navigation</h3>
-      <ul>
+      <ul layout:fragment="menu">
         <li><strong>Home</strong></li>
         <li><a href="#a">A</a></li>
         <li><a href="#b">B</a></li>
         <li><strong>Home</strong></li>
         <li><a href="#a">A</a></li>
         <li><a href="#b">B</a></li>
@@ -39,7 +39,7 @@
 
   <main>
 
 
   <main>
 
-    <article id="top">
+    <article id="top" layout:fragment="content">
       <h1>Layout-Template</h1>
       <p>
         Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
       <h1>Layout-Template</h1>
       <p>
         Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
diff --git a/package.json b/package.json
index e77a4e1..99fb78e 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
 {
   "name": "frontend",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Simple Example-Project for Template-Development",
   "devDependencies": {
     "http-server": "~0.8.0",
   "description": "Simple Example-Project for Template-Development",
   "devDependencies": {
     "http-server": "~0.8.0",
Unnamed repository; edit this file 'description' to name the repository.