Author: ppitonak(a)redhat.com
Date: 2011-10-05 05:47:50 -0400 (Wed, 05 Oct 2011)
New Revision: 22765
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml
Log:
browser detection fixed
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml 2011-10-04
13:45:17 UTC (rev 22764)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml 2011-10-05
09:47:50 UTC (rev 22765)
@@ -1,9 +1,9 @@
<?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">
-<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
-
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:c="http://java.sun.com/jsp/jstl/core">
- <!--
+<!--
JBoss, Home of Professional Open Source
Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
@@ -25,28 +25,26 @@
02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-->
- <ui:composition>
- <hr style="width: 1050px; margin-left: 0px;" />
+<ui:composition>
+ <hr style="width: 1050px; margin-left: 0px;" />
- <ul>
- <li><h:outputText id="richfacesVersion"
value="#{metamer.richFacesVersion}" /></li>
- <li><h:outputText id="metamerVersion"
value="#{metamer.shortVersion}" /></li>
- <li><h:outputText id="jsfVersion"
value="#{metamer.jsfVersion}" /></li>
- <li><h:outputText id="serverVersion"
value="#{metamer.serverVersion}" /></li>
- <li><h:outputText id="javaVersion"
value="#{metamer.javaVersion}" /> @ <h:outputText
id="osVersion"
-
value="#{metamer.osVersion}" /></li>
- <li><h:outputText id="browserVersion"
value="#{metamer.browserVersion}" /></li>
- </ul>
+ <ul>
+ <li><h:outputText id="richfacesVersion"
value="#{metamer.richFacesVersion}" /></li>
+ <li><h:outputText id="metamerVersion"
value="#{metamer.shortVersion}" /></li>
+ <li><h:outputText id="jsfVersion"
value="#{metamer.jsfVersion}" /></li>
+ <li><h:outputText id="serverVersion"
value="#{metamer.serverVersion}" /></li>
+ <li><h:outputText id="javaVersion"
value="#{metamer.javaVersion}" /> @ <h:outputText
id="osVersion"
+ value="#{metamer.osVersion}" /></li>
+ <li><h:outputText id="browserVersion"
value="#{metamer.browserVersion}" /></li>
+ </ul>
- <!-- human-readable browser detection -->
- <c:if test="#{metamer.projectStage != 'Production'}">
- <h:outputScript name="jquery.js" target="head"/>
- <h:outputScript library="script"
name="detect-browser.js" target="head"/>
- <script type="text/javascript">
+ <!-- human-readable browser detection -->
+
+ <h:outputScript name="jquery.js" target="head" />
+ <h:outputScript library="script" name="detect-browser.js"
target="head" />
+ <script type="text/javascript">
jQuery("span[id$=browserVersion]").text(jQuery.browser.name +
' ' + jQuery.browser.version + ' @ ' + jQuery.browser.os);
- </script>
+ </script>
- </c:if>
-
- </ui:composition>
+</ui:composition>
</html>
\ No newline at end of file