+
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 92ecd48216..dbab66d4f3 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -37,17 +37,14 @@ THE SOFTWARE.
If non-null and not "false", auto refresh is disabled on this page.
This is necessary for pages that include forms.
-
- A css class name to include in the body element.
-
specify path that starts from "/" for loading additional CSS stylesheet.
- path is interprted as relative to the context root. e.g.,
+ path is interpreted 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.*
+ *the use of the attribute is discouraged now.*
plugins should now do so by inserting <style> elements and/or <script> elements
in <l:header/> tag.
@@ -55,6 +52,9 @@ THE SOFTWARE.
If given, this page is only made available to users that has the specified permission.
(The permission will be checked against the "it" object.)
+
+ Available values: two-column (by default) or one-column (full-width size).
+
@@ -69,18 +69,21 @@ ${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.)
-->
+
+
+
-
-
- ${h.advertiseHeaders(response)}
-
-
-
-
-
+
+
+ ${h.advertiseHeaders(response)}
+
+
+
+
+
@@ -91,6 +94,7 @@ ${h.initPageVariables(context)}
${h.appendIfNotNull(title, ' [Jenkins]', 'Jenkins')}
+
@@ -107,8 +111,7 @@ ${h.initPageVariables(context)}
-
+
@@ -165,7 +168,7 @@ ${h.initPageVariables(context)}
-
+
Skip to content
@@ -233,21 +236,23 @@ ${h.initPageVariables(context)}
-
+
+
+
diff --git a/core/src/main/resources/lib/layout/side-panel.jelly b/core/src/main/resources/lib/layout/side-panel.jelly
index fd203550fe..26b8afa3b6 100644
--- a/core/src/main/resources/lib/layout/side-panel.jelly
+++ b/core/src/main/resources/lib/layout/side-panel.jelly
@@ -23,8 +23,13 @@ THE SOFTWARE.
-->
-
+
+
+ Generates a left side content as part of a Jenkins page. Typically known as two-column or left-side + main-content layouts
+
+
+
\ No newline at end of file
diff --git a/core/src/main/resources/lib/layout/taglib b/core/src/main/resources/lib/layout/taglib
index 676b74139f..f4ed572558 100644
--- a/core/src/main/resources/lib/layout/taglib
+++ b/core/src/main/resources/lib/layout/taglib
@@ -1 +1 @@
-Tag library that defines the basic layout of Hudson pages.
\ No newline at end of file
+Tag library that defines the basic layouts of Jenkins pages.
\ No newline at end of file
diff --git a/war/src/main/webapp/css/layout-common.css b/war/src/main/webapp/css/layout-common.css
new file mode 100644
index 0000000000..9fbf983337
--- /dev/null
+++ b/war/src/main/webapp/css/layout-common.css
@@ -0,0 +1,141 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+html {
+ position: relative;
+ min-height: 100%;
+}
+
+body {
+ margin: 0;
+ padding: 0 0 40px 0;
+}
+
+/* --------------- header --------------- */
+
+#header {
+ background-color: #000000;
+ height: 40px;
+}
+
+#header div {
+ display: inline-block;
+ height: inherit;
+}
+
+#header .logo {
+ margin-left: 16px;
+}
+
+#jenkins-home-link {
+ position: absolute;
+ height: 40px;
+}
+
+#jenkins-head-icon {
+ position: absolute;
+ bottom: 0px;
+}
+
+#jenkins-name-icon {
+ position: absolute;
+ bottom: 3px;
+ left: 32px;
+}
+
+#header .searchbox, #header .login {
+ float: right;
+ padding: 6px 11px;
+}
+
+#breadcrumbBar, #footer-container, .top-sticker-inner {
+ background-color: #f6faf2;
+}
+
+/* -------------------------------------- */
+
+#page-body.clear:after {
+ clear: both;
+ content: "";
+ display: table;
+}
+
+#side-panel {
+ padding: 15px 15px 40px 15px;
+ float: left;
+ width: 320px;
+}
+
+#main-panel {
+ padding: 15px 15px 40px 15px;
+}
+
+body.two-column #main-panel {
+ margin-left: 320px;
+}
+
+@media (max-width: 970px) {
+ body.two-column #side-panel {
+ width: 100%;
+ float: none;
+ padding-bottom: 20px;
+ }
+
+ body.two-column #main-panel {
+ margin-left: 0;
+ }
+}
+
+@media (min-width: 1170px) {
+ body.two-column #side-panel {
+ width: 360px;
+ }
+
+ body.two-column #main-panel {
+ margin-left: 360px;
+ }
+}
+
+/* --------------- footer --------------- */
+
+footer {
+ padding: 11px 0;
+ background-color: #f6faf2;
+ border-top: 1px solid #d3d7cf;
+ border-bottom: 1px solid #f6faf2;
+ width: 100%;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ clear: both;
+ font-size: 12px;
+ text-align: right;
+}
+
+footer span {
+ margin-left: 15px;
+ line-height: 14px;
+}
+
+/* -------------------------------------- */
diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css
index 9e3626e51b..c63a99b2fb 100644
--- a/war/src/main/webapp/css/style.css
+++ b/war/src/main/webapp/css/style.css
@@ -22,100 +22,6 @@
* THE SOFTWARE.
*/
-/* General page layout */
-
-html {
- position: relative;
- min-height: 100%;
-}
-
-body {
- margin: 0;
- padding: 0 0 40px 0;
-}
-
-#header {
- background-color: #000000;
- height: 40px;
-}
-
-#header div {
- display: inline-block;
- height: inherit;
-}
-#header .logo {
- margin-left: 16px;
-}
-
-#jenkins-home-link {
- position: absolute;
- height: 40px;
-}
-
-#jenkins-head-icon {
- position: absolute;
- bottom: 0px;
-}
-#jenkins-name-icon {
- position: absolute;
- bottom: 3px;
- left: 32px;
-}
-
-#header .searchbox, #header .login {
- float: right;
- padding: 6px 11px;
-}
-
-#breadcrumbBar, #footer-container, .top-sticker-inner {
- background-color: #f6faf2;
-}
-
-#page-body.clear:after {
- clear: both;
- content: "";
- display: table;
-}
-
-#side-panel {
- padding: 15px 15px 40px 15px;
- float: left;
- width: 320px;
-}
-
-#main-panel {
- padding: 15px 15px 40px 15px;
- margin-left: 320px;
-}
-
-body#jenkins.j-hide-left #main-panel {
- max-width:70em;
- margin:0 auto;
-}
-
-@media (max-width: 750px) {
- #side-panel {
- width: 100%;
- float: none;
- padding-bottom: 20px;
- }
-
- #main-panel {
- margin-left: 0;
- width: 100%;
- }
-}
-
-@media (min-width: 1170px) {
- #side-panel {
- width: 360px;
- }
-
- #main-panel {
- margin-left: 360px;
- }
-}
-
/* task */
#tasks {
@@ -134,28 +40,6 @@ body#jenkins.j-hide-left #main-panel {
margin-bottom: 20px;
}
-/* footer */
-
-footer {
- padding: 11px 0;
- background-color: #f6faf2;
- border-top: 1px solid #d3d7cf;
- border-bottom: 1px solid #f6faf2;
- width: 100%;
- position: absolute;
- bottom: 0;
- left: 0;
- clear: both;
- font-size: 12px;
- text-align: right;
-}
-
-footer span {
- margin-left: 15px;
- line-height: 14px;
-}
-
-
/* Fonts etc */
body, table, form, input, td, th, p, textarea, select
@@ -1975,24 +1859,6 @@ table#legend-table td {
border-color: #faebcc;
}
-body.main-panel-only #side-panel {
- width: 0 !important;
- padding: 0 !important;
- overflow: hidden !important;
-}
-body.main-panel-only #main-panel {
- margin: 0 auto !important;
- min-width: 100%;
- padding: 2em 2em;
- display: inline-block;
- width: auto;
-}
-@media screen and (min-width: 1024px) {
- body.main-panel-only #main-panel {
- padding: 2em 10%;
- }
-}
-
/* see the Icon class for the definition of these CSS classes */
.icon-sm {
width: 16px;