From cb058a1ff968d24521d731d4e366e28ea5fb2b6f Mon Sep 17 00:00:00 2001 From: Manuel Recena Date: Thu, 5 May 2016 13:23:01 +0200 Subject: [PATCH] [JENKINS-32936] Support for multiple layouts in Jelly Layout tag (#2253) * [JENKINS-32936] Initial source code modifications * [JENKINS-32936] Three views are using this approach * [JENKINS-32936] Conflicts were resolved in a wrong way --- .../resources/hudson/AboutJenkins/index.jelly | 71 ++++----- .../hudson/model/Job/configure.jelly | 68 +++++---- .../resources/hudson/model/View/newJob.jelly | 71 ++++----- .../main/resources/lib/layout/layout.jelly | 67 +++++---- .../resources/lib/layout/side-panel.jelly | 7 +- core/src/main/resources/lib/layout/taglib | 2 +- war/src/main/webapp/css/layout-common.css | 141 ++++++++++++++++++ war/src/main/webapp/css/style.css | 134 ----------------- 8 files changed, 297 insertions(+), 264 deletions(-) create mode 100644 war/src/main/webapp/css/layout-common.css diff --git a/core/src/main/resources/hudson/AboutJenkins/index.jelly b/core/src/main/resources/hudson/AboutJenkins/index.jelly index 259b52e9f1..f32a0316ba 100644 --- a/core/src/main/resources/hudson/AboutJenkins/index.jelly +++ b/core/src/main/resources/hudson/AboutJenkins/index.jelly @@ -25,44 +25,47 @@ THE SOFTWARE. - - -

${%about(app.VERSION)}

-

- ${%blurb} -

-

- ${%dependencies} -

- - - + + + +
+
+
+

${%about(app.VERSION)}

+

${%blurb}

+

${%dependencies}

+ + + - + - - + +

${%No information recorded}

-
-
-

${%plugin.dependencies}

- + + +

${%plugin.dependencies}

+ +
+
+
diff --git a/core/src/main/resources/hudson/model/Job/configure.jelly b/core/src/main/resources/hudson/model/Job/configure.jelly index 81c7e86031..ac39d60dbb 100644 --- a/core/src/main/resources/hudson/model/Job/configure.jelly +++ b/core/src/main/resources/hudson/model/Job/configure.jelly @@ -27,41 +27,51 @@ THE SOFTWARE. --> - + + + + + + - - +
+
+
-
${%LOADING}
- - - +
${%LOADING}
- - - - - - - - + + + - + + + + + + + + - - + - - - - - - - - - - - + + + + + + + + + + +
+ + + +
+
+
diff --git a/core/src/main/resources/hudson/model/View/newJob.jelly b/core/src/main/resources/hudson/model/View/newJob.jelly index bde4103da3..c1e380ad4a 100644 --- a/core/src/main/resources/hudson/model/View/newJob.jelly +++ b/core/src/main/resources/hudson/model/View/newJob.jelly @@ -26,50 +26,53 @@ THE SOFTWARE. - + -