Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions core/src/main/resources/hudson/model/User/builds.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ THE SOFTWARE.
<st:include page="sidepanel.jelly" />
<l:breadcrumb title="${%Builds}" />
<l:main-panel>
<h1>
${%title(it)}
</h1>
<l:app-bar title="${%Builds}" />

<t:buildListTable builds="${it.builds}"/>
</l:main-panel>
Expand Down
7 changes: 1 addition & 6 deletions core/src/main/resources/hudson/model/User/index.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ THE SOFTWARE.
<!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
<l:main-panel>
<div class="jenkins-app-bar">
<div class="jenkins-app-bar__content jenkins-build-caption">
<l:icon src="${h.getUserAvatar(it, '96x96')}" class="jenkins-avatar" />
<h1>
${it.fullName}
</h1>
</div>
<div class="jenkins-app-bar__content" />
<div class="jenkins-app-bar__controls">
<t:editDescriptionButton permission="${app.ADMINISTER}"/>
</div>
Expand Down
10 changes: 9 additions & 1 deletion core/src/main/resources/hudson/model/User/sidepanel.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,16 @@ THE SOFTWARE.
<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" xmlns:i="jelly:fmt">
<l:header />
<l:side-panel>
<div class="jenkins-app-bar">
<div class="jenkins-app-bar__content jenkins-build-caption">
<l:icon src="${h.getUserAvatar(it, '96x96')}" class="jenkins-avatar" />
<h1>
${it.fullName}
</h1>
</div>
</div>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is there no Jelly tag for this?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, added support for icons in App bars.

<l:tasks>
<l:task contextMenu="false" href="${rootURL}/${it.url}/" icon="symbol-person-circle" title="${%Status}"/>
<l:task contextMenu="false" href="${rootURL}/${it.url}/" icon="symbol-person" title="${%Profile}"/>
<l:task href="${rootURL}/${it.url}/builds" icon="symbol-build-history" title="${%Builds}"/>
<t:actions actions="${it.propertyActions}"/>
<t:actions actions="${it.transientActions}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,14 @@ THE SOFTWARE.
<l:layout permission="${app.ADMINISTER}" title="${%title}">
<st:include page="sidepanel.jelly" it="${it.targetUser}" />
<l:main-panel>
<f:form method="post" action="configSubmit" name="config" class="jenkins-form">
<h1>
${%title}
</h1>
<l:app-bar title="${%title}" />

<f:form method="post" action="configSubmit" name="config" class="jenkins-form">
<j:set var="thisAction" value="${it}" />
<j:set var="it" value="${thisAction.targetUser}" />
<j:set var="instance" value="${it}"/>

<f:section>
<f:section title="${%General}">
<f:entry title="${%Full name}" description="${%Full name.Description}">
<f:textbox field="fullName" />
</f:entry>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ THE SOFTWARE.
<l:layout permission="${app.ADMINISTER}" title="${%title}">
<st:include page="sidepanel.jelly" it="${it.targetUser}" />
<l:main-panel>
<l:app-bar title="${%title}" />

<f:form method="post" action="configSubmit" name="config">
<h1>
${%title}
</h1>

<j:set var="instance" value="${it}"/>
<j:set var="descriptors" value="${it.myCategoryDescriptors}" />
<j:set var="instances" value="${it.targetUser.properties}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ THE SOFTWARE.
<l:layout permission="${app.ADMINISTER}" title="${%title}">
<st:include page="sidepanel.jelly" it="${it.targetUser}" />
<l:main-panel>
<l:app-bar title="${%title}" />

<f:form method="post" action="configSubmit" name="config">
<h1>
${%title}
</h1>

<j:set var="instance" value="${it}"/>
<j:set var="descriptors" value="${it.myCategoryDescriptors}" />
<j:set var="instances" value="${it.targetUser.properties}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ THE SOFTWARE.
<l:layout permission="${app.ADMINISTER}" title="${%title}">
<st:include page="sidepanel.jelly" it="${it.targetUser}" />
<l:main-panel>
<f:form method="post" action="configSubmit" name="config">
<h1>
${%title}
</h1>
<l:app-bar title="${%title}" />

<f:form method="post" action="configSubmit" name="config">
<j:set var="instance" value="${it}"/>
<j:set var="descriptors" value="${it.myCategoryDescriptors}" />
<j:set var="instances" value="${it.targetUser.properties}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ THE SOFTWARE.
<l:layout permission="${app.ADMINISTER}" title="${%title}">
<st:include page="sidepanel.jelly" it="${it.targetUser}" />
<l:main-panel>
<f:form method="post" action="configSubmit" name="config">
<h1>
${%title}
</h1>
<l:app-bar title="${%title}" />

<f:form method="post" action="configSubmit" name="config">
<j:set var="instance" value="${it}"/>
<j:set var="descriptors" value="${it.myCategoryDescriptors}" />
<j:set var="instances" value="${it.targetUser.properties}" />
Expand Down