Merge remote-tracking branch 'origin/master'

35b357f6 · Kohsuke Kawaguchi · 505661e4 · cf2a725c · 35b357f6
隐藏空白更改
内联并排

Showing with 4 addition and 2 deletion

core/src/main/resources/lib/layout/layout.jelly core/src/main/resources/lib/layout/layout.jelly +4 -2

未找到文件。
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:i="jelly:fmt">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:i="jelly:fmt" xmlns:x="jelly:xml">
  <st:documentation>
    Outer-most tag for a normal (non-AJAX) HTML rendering.
    This is used with nested &lt;header>, &lt;side-panel>, and &lt;main-panel>
@@ -82,11 +82,13 @@ THE SOFTWARE.
      <st:include it="${pd}" page="httpHeaders.jelly" optional="true"/>
    </j:forEach>
  </j:if>
-  <html>
+<x:doctype name="html" />
+<html>
  <head>
    ${h.checkPermission(it,permission)}

    <title>${h.appendIfNotNull(title, ' [Jenkins]', 'Jenkins')}</title>
+    <meta http-equiv="X-UA-Compatible" content="chrome=1" />
    <link rel="stylesheet" href="${resURL}/css/style.css" type="text/css" />
    <link rel="stylesheet" href="${resURL}/css/color.css" type="text/css" />
    <j:if test="${attrs.css!=null}">