Minor changes to get rid out of red code in IntelliJ IDEA

cheptsov · cheptsov · commit 726108c9b98f · 2013-11-19T18:05:45.000+04:00
diff --git a/jsf/composite-component/src/main/webapp/WEB-INF/template.xhtml b/jsf/composite-component/src/main/webapp/WEB-INF/template.xhtml
@@ -40,15 +40,15 @@
  * holder.
  */
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
       xmlns:h="http://xmlns.jcp.org/jsf/html">
 
     <h:head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <h:outputStylesheet name="./css/default.css"/>
-        <h:outputStylesheet name="./css/cssLayout.css"/>
+        <h:outputStylesheet name="css/default.css"/>
+        <h:outputStylesheet name="css/cssLayout.css"/>
         <title>JSF Composite Component</title>
     </h:head>
 
diff --git a/jsf/composite-component/src/main/webapp/index.xhtml b/jsf/composite-component/src/main/webapp/index.xhtml
@@ -40,7 +40,7 @@
  * holder.
  */
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
       xmlns:mc="http://xmlns.jcp.org/jsf/composite/ezcomp">
diff --git a/jsf/composite-component/src/main/webapp/resources/ezcomp/login.xhtml b/jsf/composite-component/src/main/webapp/resources/ezcomp/login.xhtml
@@ -40,7 +40,7 @@
  * holder.
  */
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:cc="http://xmlns.jcp.org/jsf/composite"
       xmlns:h="http://xmlns.jcp.org/jsf/html">
diff --git a/jsf/composite-component/src/main/webapp/status.xhtml b/jsf/composite-component/src/main/webapp/status.xhtml
@@ -40,7 +40,7 @@
  * holder.
  */
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
diff --git a/jsf/contracts/src/main/webapp/contracts/blue/template.xhtml b/jsf/contracts/src/main/webapp/contracts/blue/template.xhtml
@@ -41,7 +41,7 @@
 */
 -->
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
       xmlns:h="http://xmlns.jcp.org/jsf/html">
diff --git a/jsf/contracts/src/main/webapp/contracts/red/template.xhtml b/jsf/contracts/src/main/webapp/contracts/red/template.xhtml
@@ -41,7 +41,7 @@
 */
 -->
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
       xmlns:h="http://xmlns.jcp.org/jsf/html">
diff --git a/jsf/contracts/src/main/webapp/index.xhtml b/jsf/contracts/src/main/webapp/index.xhtml
@@ -40,7 +40,7 @@
 * holder.
 */
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
       xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -62,7 +62,7 @@
                             <f:selectItem itemValue="red" itemLabel="red"/>
                             <f:selectItem itemValue="blue" itemLabel="blue"/>
                         </h:selectOneRadio>
-                        <h:commandButton value="Apply" action="index" />
+                        <h:commandButton value="Apply" action="/index" />
                     </h:form>
                 </ui:define>
 
diff --git a/jsf/contracts/src/main/webapp/user/index.xhtml b/jsf/contracts/src/main/webapp/user/index.xhtml
@@ -41,11 +41,9 @@
 */
 -->
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
-      xmlns:f="http://xmlns.jcp.org/jsf/core">
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
     <body>
 
diff --git a/jsf/flows-mixed/src/main/webapp/flow1/flow1.xhtml b/jsf/flows-mixed/src/main/webapp/flow1/flow1.xhtml
@@ -48,7 +48,7 @@
     <head>
         <title>First Page in Flow 1</title>
     </head>
-    <body bgcolor="red">
+    <body style="background-color: red;">
         <h:form prependId="false">
             <h1>First Page in Flow 1</h1>
             <p>Flow bean name: #{flow1Bean.name}</p>
diff --git a/jsf/flows-mixed/src/main/webapp/flow1/flow1a.xhtml b/jsf/flows-mixed/src/main/webapp/flow1/flow1a.xhtml
@@ -48,7 +48,7 @@
     <head>
         <title>Second Page in Flow 1</title>
     </head>
-    <body bgcolor="red">
+    <body style="background-color: red;">
         <h:form prependId="false">
             <h1>Second Page in Flow 1</h1>
             <p>Flow bean name: #{flow1Bean.name}</p>
diff --git a/jsf/flows-mixed/src/main/webapp/flow1/flow1b.xhtml b/jsf/flows-mixed/src/main/webapp/flow1/flow1b.xhtml
@@ -48,7 +48,7 @@
     <head>
         <title>Last Page in Flow 1</title>
     </head>
-    <body bgcolor="red">
+    <body style="background-color: red;">
 
         <h1>Last Page in Flow 1</h1>
         <p>Flow bean name: #{flow1Bean.name}</p>
diff --git a/jsf/flows-mixed/src/main/webapp/flow2/flow2.xhtml b/jsf/flows-mixed/src/main/webapp/flow2/flow2.xhtml
@@ -48,7 +48,7 @@
     <head>
         <title>First Page in Flow 2</title>
     </head>
-    <body bgcolor="blue">
+    <body style="background-color: blue;">
         <h:form prependId="false">
             <h1>First Page in Flow 2</h1>
             <p>Flow bean name: #{flow2Bean.name}</p>
diff --git a/jsf/flows-mixed/src/main/webapp/flow2/flow2a.xhtml b/jsf/flows-mixed/src/main/webapp/flow2/flow2a.xhtml
@@ -48,7 +48,7 @@
     <head>
         <title>Second Page in Flow 2</title>
     </head>
-    <body bgcolor="blue">
+    <body style="background-color: blue;">
         <h:form prependId="false">
             <h1>Second Page in Flow 2</h1>
             <p>Flow bean name: #{flow2Bean.name}</p>
diff --git a/jsf/flows-mixed/src/main/webapp/flow2/flow2b.xhtml b/jsf/flows-mixed/src/main/webapp/flow2/flow2b.xhtml
@@ -48,7 +48,7 @@
     <head>
         <title>Last page in Flow 2</title>
     </head>
-    <body bgcolor="blue">
+    <body style="background-color: blue;">
 
         <h1>Last page in Flow 2</h1>
         <p>Flow bean name: #{flow2Bean.name}</p>
diff --git a/jsf/resource-handling/src/main/webapp/WEB-INF/template.xhtml b/jsf/resource-handling/src/main/webapp/WEB-INF/template.xhtml
@@ -1,18 +1,15 @@
 <?xml version='1.0' encoding='UTF-8' ?> 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
       xmlns:h="http://xmlns.jcp.org/jsf/html">
 
     <h:head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <h:outputStylesheet name="./css/default.css"/>
-        <h:outputStylesheet name="./css/cssLayout.css"/>
+        <h:outputStylesheet name="css/default.css"/>
+        <h:outputStylesheet name="css/cssLayout.css"/>
         <title>JSF Resource Handling</title>
-        <h:outputScript
-            name="myScript.js"
-            library="scripts"
-            target="head"/>
+        <h:outputScript name="myScript.js" library="scripts" target="head"/>
     </h:head>
 
     <h:body>
@@ -28,7 +25,7 @@
         </div>
 
         <div id="bottom">
-            <ui:insert name="bottom"><center>Powered by WildFly</center></ui:insert>
+            <ui:insert name="bottom">Powered by WildFly</ui:insert>
         </div>
 
     </h:body>
diff --git a/jsf/resource-handling/src/main/webapp/index.xhtml b/jsf/resource-handling/src/main/webapp/index.xhtml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
       xmlns:h="http://xmlns.jcp.org/jsf/html">
diff --git a/jsf/resource-handling/src/main/webapp/resources/css/cssLayout.css b/jsf/resource-handling/src/main/webapp/resources/css/cssLayout.css
@@ -12,6 +12,7 @@
     background-color: #c2dfef;
     padding: 5px;
     margin: 10px 0px 0px 0px;
+    text-align: center;
 }
 
 #left {
