Skip to content

Commit 61a0734

Browse files
authored
[JENKINS-75849] Makes scriptConsole layout configurable (#10800)
2 parents e38e35c + 3f45b6d commit 61a0734

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

core/src/main/resources/jenkins/model/Jenkins/_script.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ THE SOFTWARE.
2727
-->
2828
<?jelly escape-by-default='true'?>
2929
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
30-
<t:scriptConsole>
30+
<t:scriptConsole layout="one-column">
3131
<pre>println(Jenkins.instance.pluginManager.plugins)</pre>
3232
</t:scriptConsole>
3333
</j:jelly>

core/src/main/resources/lib/hudson/scriptConsole.jelly

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,19 @@ THE SOFTWARE.
2727
-->
2828
<?jelly escape-by-default='true'?>
2929
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:f="/lib/form">
30-
<l:layout permission="${app.ADMINISTER}" title="${%scriptConsole}" type="one-column">
30+
<st:documentation>
31+
<st:attribute name="layout" use="optional">
32+
Specify which layout to be use for the page.
33+
See the type in layout for more details.
34+
By default, it is `two-column`.
35+
</st:attribute>
36+
</st:documentation>
37+
38+
<j:set var="layout" value="${attrs.layout != null ? attrs.layout : 'two-column'}" />
39+
<l:layout permission="${app.ADMINISTER}" title="${%scriptConsole}" type="${layout}">
40+
<j:if test="${layout == 'two-column'}">
41+
<st:include page="sidepanel.jelly" />
42+
</j:if>
3143

3244
<l:breadcrumb title="${%scriptConsole}"/>
3345
<l:main-panel>

0 commit comments

Comments
 (0)