Skip to content
Permalink
Browse files
Merge pull request #1378 from daniel-beck/JENKINS-23963
[FIXED JENKINS-23963] Use absolute sidepanel links for computers
  • Loading branch information
daniel-beck committed Aug 22, 2014
2 parents 1b9cc8a + c45d6be commit e2d9fdc9894bed799893f85f2e884c3567805730
Showing with 9 additions and 9 deletions.
  1. +6 −6 core/src/main/resources/hudson/model/Computer/sidepanel.jelly
  2. +3 −3 core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2.jelly
@@ -30,13 +30,13 @@ THE SOFTWARE.
<l:header />
<l:side-panel>
<l:tasks>
<l:task contextMenu="false" href=".." icon="icon-up icon-md" title="${%Back to List}"/>
<l:task contextMenu="false" href="${rootURL}/computer" icon="icon-up icon-md" title="${%Back to List}"/>
<l:task contextMenu="false" href="${rootURL}/${it.url}" icon="icon-search icon-md" title="${%Status}"/>
<l:task href="delete" icon="icon-edit-delete icon-md" permission="${it.DELETE}" title="${%Delete Slave}"/>
<l:task href="configure" icon="icon-setting icon-md" permission="${it.CONFIGURE}" title="${%Configure}"/>
<l:task href="builds" icon="icon-notepad icon-md" title="${%Build History}"/>
<l:task href="load-statistics" icon="icon-monitor icon-md" title="${%Load Statistics}"/>
<l:task href="script" icon="icon-terminal icon-md" permission="${app.RUN_SCRIPTS}" title="${%Script Console}"/>
<l:task href="${rootURL}/${it.url}delete" icon="icon-edit-delete icon-md" permission="${it.DELETE}" title="${%Delete Slave}"/>
<l:task href="${rootURL}/${it.url}configure" icon="icon-setting icon-md" permission="${it.CONFIGURE}" title="${%Configure}"/>
<l:task href="${rootURL}/${it.url}builds" icon="icon-notepad icon-md" title="${%Build History}"/>
<l:task href="${rootURL}/${it.url}load-statistics" icon="icon-monitor icon-md" title="${%Load Statistics}"/>
<l:task href="${rootURL}/${it.url}script" icon="icon-terminal icon-md" permission="${app.RUN_SCRIPTS}" title="${%Script Console}"/>
<st:include page="sidepanel2.jelly" optional="true" /><!-- hook for derived class to add more items -->
<t:actions />
</l:tasks>
@@ -24,10 +24,10 @@ THE SOFTWARE.

<?jelly escape-by-default='true'?>
<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:task icon="icon-clipboard icon-md" href="log" title="${%Log}" permission="${it.CONNECT}" />
<l:task icon="icon-clipboard icon-md" href="${rootURL}/${it.url}log" title="${%Log}" permission="${it.CONNECT}" />
<j:if test="${it.channel!=null}">
<l:task icon="icon-computer icon-md" href="systemInfo" title="${%System Information}" permission="${it.CONNECT}"/>
<l:task icon="icon-edit-delete icon-md" href="disconnect" title="${%Disconnect}" permission="${it.DISCONNECT}"/>
<l:task icon="icon-computer icon-md" href="${rootURL}/${it.url}systemInfo" title="${%System Information}" permission="${it.CONNECT}"/>
<l:task icon="icon-edit-delete icon-md" href="${rootURL}/${it.url}disconnect" title="${%Disconnect}" permission="${it.DISCONNECT}"/>
</j:if>

</j:jelly>

0 comments on commit e2d9fdc

Please sign in to comment.