Skip to content
Permalink
Browse files

[FIXED JENKINS-41416] Fold the submenu into the main menu

  • Loading branch information...
stephenc committed Mar 1, 2017
1 parent 359ae1f commit 3ed06e3a5030c7f70e75745ed99c23c7ea5a3d61
@@ -27,13 +27,11 @@ THE SOFTWARE.

<j:set var="computation" value="${it.computation}"/>

<l:task icon="images/24x24/notepad.png" href="${rootURL}/${computation.url}" title="${computation.displayName}">
<j:if test="${h.hasPermission(it, it.BUILD) and it.buildable}">
<l:task icon="images/24x24/clock.png" href="${rootURL}/${it.url}build?delay=0" post="true" title="${%Run Now}"/>
</j:if>
<l:task icon="images/24x24/terminal.png" href="${rootURL}/${computation.url}console" title="${%Log}"/>
<j:if test="${it.hasEvents}">
<l:task icon="images/24x24/monitor.png" href="${rootURL}/${computation.url}events" title="${%Events}"/>
</j:if>
</l:task>
<j:if test="${h.hasPermission(it, it.BUILD) and it.buildable}">
<l:task icon="images/24x24/clock.png" href="${rootURL}/${it.url}build?delay=0" post="true" title="${%computeNow(computation.displayName)}"/>
</j:if>
<l:task icon="images/24x24/terminal.png" href="${rootURL}/${computation.url}console" title="${%computeLog(computation.displayName)}"/>
<j:if test="${it.hasEvents}">
<l:task icon="images/24x24/monitor.png" href="${rootURL}/${computation.url}events" title="${%events(it.pronoun)}"/>
</j:if>
</j:jelly>
@@ -0,0 +1,26 @@
#
# The MIT License
#
# Copyright (c) 2017, CloudBees, Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#
computeNow={0} Now
computeLog={0} Log
events={0} Events
@@ -29,7 +29,7 @@
<st:include page="sidepanel.jelly" it="${it.parent}" />
<l:main-panel>
<h1><l:icon class="icon-monitor icon-xlg"/>
${it.displayName} ${%Events}
${it.parent.pronoun} ${%Events}
</h1>
<j:set var="threshold" value="${h.getSystemProperty('hudson.consoleTailKB')?:'150'}" />
<!-- Show at most last 150KB (can override with system property) unless consoleFull is set -->

0 comments on commit 3ed06e3

Please sign in to comment.
You can’t perform that action at this time.