Please cherry-pick:

- added overflow:auto for footer
- put copyright into h:outputText
- changed CSS class into id

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 8d11c2a27f8d513145b3c7a9c09fa1ee4f8d89c3..4d640291faa5842d58abac7d7c67d5da586df32c 100644 (file)
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -34,7 +34,7 @@
                                        <ui:insert name="basket" />
                                </div>
 
-                               <h:panelGroup styleClass="page-header-container" layout="block">
+                               <h:panelGroup id="page-header-container" layout="block">
                                        <div id="page-header">
                                                <h1>
                                                        <h:outputText value="Pizza-Service" />

diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
index 09ae7da11d52157ea8d5cd0f5dd34456fe1b19cc..d00a1dc63ff4df00753e4ccec81710d9f3d1e3ff 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_footer.tpl
+++ b/web/WEB-INF/templates/guest/guest_footer.tpl
@@ -35,7 +35,9 @@
                                </li>
                        </ui:fragment>
 
-                       <li class="footer_copyright">Copyright (c) 2016, 2017 Roland Häder</li>
+                       <li class="footer_copyright">
+                               <h:outputText value="Copyright (c) 2016, 2017 Roland Häder" />
+                       </li>
                </ul>
        </div>
 </ui:composition>

diff --git a/web/resources/css/layout.css b/web/resources/css/layout.css
index 03c3e9d6889e144e7fca65381ff20343f36babf1..aae766a490aa4ce73158e4c23843099773812695 100644 (file)
--- a/web/resources/css/layout.css
+++ b/web/resources/css/layout.css
@@ -9,8 +9,7 @@ div, table {
        line-height: 20px;
 }
 
-.page-header-container {
-       position: relative;
+#page-header-container {
        background-color: steelblue;
        color: white;
        padding: 5px;
@@ -18,10 +17,10 @@ div, table {
 }
 
 #page-footer {
-       position: relative;
        background-color: lightblue;
        padding: 5px;
        margin: 10px 0px 0px 0px;
+       overflow: auto;
 }
 
 #left-menu-container {