Commits

Anonymous committed 4252917

SPC-496 more IE-related fixes

Comments (0)

Files changed (3)

features/nrtg/web/src/main/resources/nrt/realtime.template

         <title>NRT graph window</title>
 
         <meta charset="utf-8" />
-        <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
+        <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=IE8" />
 
         <!-- jquery include -->
         <script type="text/javascript" src="/opennms/js/jquery/jquery-1.8.2.min.js"></script>
     </head>
        
     <body>
+
         <div id="main"></div>
         <center>
             <div class="rrdgraph" data-src="realtime=1"></div>
                 </tr>
             </table>
         </div>
+
+        <!-- chrome frame -->
+        <!--[if IE]>
+            <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
+            <div id="prompt"></div>
+            <script>
+                // The conditional ensures that this code will only execute in IE,
+                // Therefore we can use the IE-specific attachEvent without worry
+                window.attachEvent("onload", function() {
+                    CFInstall.check({
+                        mode: "inline", // the default
+                        node: "prompt"
+                    });
+                });
+            </script>
+        <![endif]-->
+
     </body>
 </html>

opennms-webapp/src/main/webapp/WEB-INF/jsp/graph/results.jsp

     <c:param name="breadcrumb" value="<a href='report/index.jsp'>Reports</a>" />
     <c:param name="breadcrumb" value="<a href='graph/index.jsp'>Resource Graphs</a>"/>
     <c:param name="breadcrumb" value="Results" />
+    <c:param name="meta"       value="<meta http-equiv='X-UA-Compatible' content='IE=Edge' />"/>
 </c:import>
 
 <div id="graph-results">

opennms-webapp/src/main/webapp/includes/header.jsp

 final String baseHref = Util.calculateUrlBase( request );
 %>
 <c:choose>
+<c:when test="${param.docType == 'html5'}">
+<!DOCTYPE html>
+</c:when>
 <c:when test="${param.docType == 'html'}">
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 </c:when>