From fe07641440b360c8bd50f4a34329a2f4f6f8ab05 Mon Sep 17 00:00:00 2001 From: Manuel Recena Date: Sun, 10 Jul 2016 21:15:04 +0200 Subject: [PATCH 1/7] [JENKINS-34670] Add support for a new full screen layout --- core/src/main/resources/lib/layout/layout.jelly | 14 ++++++++++++-- war/src/main/webapp/css/layout-common.css | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index dbab66d4f3c6..1d50a496d8af 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -53,7 +53,7 @@ THE SOFTWARE. (The permission will be checked against the "it" object.) - Available values: two-column (by default) or one-column (full-width size). + Available values: two-column (by default), one-column (full-width size) or full-screen. @@ -69,9 +69,14 @@ ${h.initPageVariables(context)} this also allows us to configure HttpSessionContextIntegrationFilter not to create sessions, which I suspect can end up creating sessions for wrong resource types (such as static resources.) --> + + + + + @@ -168,7 +173,9 @@ ${h.initPageVariables(context)} - - - + } + + +
+
+ + + +
+ + + + \ No newline at end of file diff --git a/core/src/main/resources/lib/layout/html.jelly b/core/src/main/resources/lib/layout/html.jelly deleted file mode 100644 index 5065b33f3481..000000000000 --- a/core/src/main/resources/lib/layout/html.jelly +++ /dev/null @@ -1,170 +0,0 @@ - - - - - Outer-most tag for a normal (non-AJAX) HTML rendering. - This is used with nested <header>, <side-panel>, and <main-panel> - to form Jenkins's basic HTML layout. - - - Title of the HTML page. Rendered into <title> tag. - - - If non-null and not "false", auto refresh is disabled on this page. - This is necessary for pages that include forms. - - - specify path that starts from "/" for loading additional CSS stylesheet. - path is interprted as relative to the context root. e.g., - - {noformat}<l:layout css="/plugin/mysuperplugin/css/myneatstyle.css">{noformat} - - This was originally added to allow plugins to load their stylesheets, but - *the use of thie attribute is discouraged now.* - plugins should now do so by inserting <style> elements and/or <script> elements - in <l:header/> tag. - - - If given, this page is only made available to users that has the specified permission. - (The permission will be checked against the "it" object.) - - - - - - - - -${h.initPageVariables(context)} - - - - - - - ${h.advertiseHeaders(response)} - - - - - - - - - - ${h.checkPermission(it,permission)} - - - - - - ${h.appendIfNotNull(title, ' [Jenkins]', 'Jenkins')} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +