-
-
Notifications
You must be signed in to change notification settings - Fork 8.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow for more flexible layouts in layout.jelly
#8794
base: master
Are you sure you want to change the base?
Changes from 2 commits
678ffb5
e6679d9
a98361d
3682c61
3f56e00
cedbca5
1462b1f
9b44aa7
e3c7fdc
99e5387
d5d1eb2
7326f43
36abe14
b57cfc9
3e0b49e
0e477be
d331b27
588f459
f1daa7e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,16 +34,14 @@ THE SOFTWARE. | |
Generates a row containing the page title and an optional set of controls | ||
</st:documentation> | ||
|
||
<j:if test="${mode=='main-panel' or mode=='side-panel'}"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This |
||
<div class="jenkins-app-bar"> | ||
<div class="jenkins-app-bar__content"> | ||
<x:element name="${headingLevel ?: 'h1'}"> | ||
${title} | ||
</x:element> | ||
</div> | ||
<div class="jenkins-app-bar__controls"> | ||
<d:invokeBody/> | ||
</div> | ||
<div class="jenkins-app-bar"> | ||
<div class="jenkins-app-bar__content"> | ||
<x:element name="${headingLevel ?: 'h1'}"> | ||
${title} | ||
</x:element> | ||
</div> | ||
</j:if> | ||
<div class="jenkins-app-bar__controls"> | ||
<d:invokeBody/> | ||
</div> | ||
</div> | ||
</j:jelly> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,7 +58,7 @@ THE SOFTWARE. | |
(The permissions will be checked against the "it" object.) | ||
</st:attribute> | ||
<st:attribute name="type" use="optional"> | ||
Available values: two-column (by default), one-column (full-width size) or full-screen (since 2.53). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
Set to 'full-screen' to hide the navigation bar, breadcrumb bar and footer | ||
</st:attribute> | ||
<st:attribute name="nogrid" use="optional"> | ||
Do not include Bootstrap 3 grid. When a plugin wants to use a more recent version of Bootstrap then | ||
|
@@ -191,14 +191,8 @@ THE SOFTWARE. | |
</j:if> | ||
|
||
<div id="page-body" class="app-page-body app-page-body--${layoutType} clear"> | ||
<j:if test="${layoutType=='two-column'}"> | ||
<j:set var="mode" value="side-panel" /> | ||
<d:invokeBody /> | ||
Comment on lines
-196
to
-197
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Breaks all context menus, see There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks! Fixed it and added a comment to |
||
</j:if> | ||
<div id="main-panel"> | ||
<j:set var="mode" value="main-panel" /> | ||
<d:invokeBody/> | ||
</div> | ||
<j:set var="mode" value="main" /> | ||
<d:invokeBody /> | ||
</div> | ||
|
||
<j:if test="${layoutType!='full-screen'}"> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,6 @@ | |
.jenkins-section { | ||
border-top: 2px solid var(--panel-border-color); | ||
padding: var(--section-padding) 0 0 0; | ||
max-width: 1800px; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Simplified the styling, let's just fill the available width and let the parent container control how wide that can be. |
||
|
||
&:first-of-type { | ||
border-top: none; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One issue with the current approach is that there can be a mismatch between the page type and it's contents - on the
Configure
page it includes a sidebar however it isn't displayed due to the type being set toone-column
. The inverse could be true as well where the page type istwo-column
but a side panel hasn't been provided.