Skip to content

Commit 08b1678

Browse files
Folder view matches look of job view
1 parent 7ad11b2 commit 08b1678

File tree

3 files changed

+37
-26
lines changed

3 files changed

+37
-26
lines changed

src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.jelly

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,38 +24,46 @@ THE SOFTWARE.
2424
<?jelly escape-by-default='true'?>
2525
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
2626
xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:this="this">
27-
<j:set var="iconClass" value="${it.iconColor.getIconClassName()}"/>
28-
<j:if test="${iconClass != null}">
29-
<j:set var="iconClass" value="${iconClass} icon-xlg"/>
30-
</j:if>
31-
<h1>
27+
<div class="jenkins-app-bar">
28+
<div class="jenkins-app-bar__content jenkins-build-caption">
29+
<j:set var="iconClass" value="${it.iconColor.getIconClassName()}"/>
30+
<j:if test="${iconClass != null}">
31+
<j:set var="iconClass" value="${iconClass} icon-lg"/>
32+
</j:if>
33+
<j:choose>
34+
<j:when test="${iconClass != null}">
35+
<l:icon class="${iconClass}" alt="${it.iconColor.description}" tooltip="${it.iconColor.description}" />
36+
</j:when>
37+
<j:otherwise>
38+
<l:icon src="${it.iconColor.getImageOf('32x32')}" alt="${it.iconColor.description}" tooltip="${it.iconColor.description}" />
39+
</j:otherwise>
40+
</j:choose>
41+
<h1 class="job-index-headline page-headline">
42+
<l:breakable value="${it.displayName}"/>
43+
</h1>
44+
</div>
45+
<div class="jenkins-app-bar__controls">
46+
<t:editDescriptionButton description="${it.primaryView.description}" permission="${it.CONFIGURE}"/>
47+
</div>
48+
</div>
49+
<j:if test="${(it.fullName!=it.fullDisplayName)}">
3250
<j:choose>
33-
<j:when test="${iconClass != null}">
34-
<l:icon class="${iconClass}" tooltip="${it.iconColor.description}" />
51+
<j:when test="${it.parent!=app}">
52+
${%Full folder name}: ${it.fullName}
3553
</j:when>
3654
<j:otherwise>
37-
<l:icon src="${it.iconColor.getImageOf('48x48')}" height="48" width="48" alt="${it.iconColor.description}" tooltip="${it.iconColor.description}" />
55+
${%Folder name}: ${it.fullName}
3856
</j:otherwise>
3957
</j:choose>
40-
${it.displayName}
41-
</h1>
42-
<j:if test="${it.name != it.displayName}">
43-
${%Folder name}: ${it.fullName}
4458
</j:if>
45-
<div id="view-message">
46-
<div id="systemmessage">
47-
<j:out value="${app.systemMessage!=null ? app.markupFormatter.translate(app.systemMessage) : ''}"/>
48-
</div>
49-
<j:out value="${it.description!=null ? app.markupFormatter.translate(it.description) : ''}"/>
50-
</div>
51-
<this:description />
59+
<t:editableDescription description="${it.primaryView.description}" permission="${it.CONFIGURE}" hideButton="true"/>
5260
<j:choose>
53-
<j:when test="${!it.supportsMakeDisabled()}">
54-
<!-- for now, quietly omit the option -->
55-
</j:when>
56-
<j:when test="${it.disabled}">
57-
<div id="disabled-message" class="warning">${%disabled(it.pronoun)}</div>
58-
</j:when>
61+
<j:when test="${!it.supportsMakeDisabled()}">
62+
<!-- for now, quietly omit the option -->
63+
</j:when>
64+
<j:when test="${it.disabled}">
65+
<div id="disabled-message" class="warning">${%disabled(it.pronoun)}</div>
66+
</j:when>
5967
</j:choose>
6068
<!-- give actions a chance to contribute summary item -->
6169
<j:forEach var="a" items="${it.allActions}">
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
Folder\ name=Folder name
2+
Full\ folder\ name=Full folder name
13
disable=Disable {0}
24
disabled=This {0} is currently disabled

src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top_ja.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The MIT License
22
#
3-
# Copyright (c) 2016- Seiji Sogabe
3+
# Copyright (c) 2016- Seiji Sogabe
44
#
55
# Permission is hereby granted, free of charge, to any person obtaining a copy
66
# of this software and associated documentation files (the "Software"), to deal
@@ -21,3 +21,4 @@
2121
# THE SOFTWARE.
2222

2323
Folder\ name=\u30d5\u30a9\u30eb\u30c0\u540d
24+
Full\ folder\ name=\u5b8c\u5168\u306a\u30d5\u30a9\u30eb\u30c0\u540d

0 commit comments

Comments
 (0)