Please cherry-pick:

- made CSS class name more common: foo-bar and not foo_bar
- put copyright in h:outputText

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

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

diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl
index ec6d264ce923f08f2339a89c9fae0728891f416c..60fb57dde72104bb17f4024901aa2142bf01c394 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_footer.tpl
+++ b/web/WEB-INF/templates/login/user/user_footer.tpl
@@ -29,7 +29,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 aae766a490aa4ce73158e4c23843099773812695..59ea6530fb2e4bacbeb832f4362fa5cf9c5c2ddb 100644 (file)
--- a/web/resources/css/layout.css
+++ b/web/resources/css/layout.css
@@ -160,7 +160,7 @@ ul.navbar-mini li.navlink-mini {
        padding: 1px;
 }
 
-ul.navbar-horizontal li.footer_copyright {
+ul.navbar-horizontal li.footer-copyright {
        float: right;
        width: 300px;
        margin-right: 10px;