Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Folder view matches look of job view #424

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Folder view matches look of job view #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
632f7fb
Folder view matches look of job view
strangelookingnerd Sep 11, 2024
c3e6e4b
Restore system message
strangelookingnerd Sep 12, 2024
cc39f66
Restore descriptions
strangelookingnerd Sep 12, 2024
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
35 changes: 23 additions & 12 deletions src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,34 @@ 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" xmlns:this="this">
<j:set var="iconClass" value="${it.iconColor.getIconClassName()}"/>
<j:if test="${iconClass != null}">
<j:set var="iconClass" value="${iconClass} icon-xlg"/>
</j:if>
<h1>
<div class="jenkins-app-bar">
<div class="jenkins-app-bar__content jenkins-build-caption">
<j:set var="iconClass" value="${it.iconColor.getIconClassName()}"/>
<j:if test="${iconClass != null}">
<j:set var="iconClass" value="${iconClass} icon-lg"/>
</j:if>
<j:choose>
<j:when test="${iconClass != null}">
<l:icon class="${iconClass}" alt="${it.iconColor.description}" tooltip="${it.iconColor.description}" />
</j:when>
<j:otherwise>
<l:icon src="${it.iconColor.getImageOf('32x32')}" alt="${it.iconColor.description}" tooltip="${it.iconColor.description}" />
</j:otherwise>
</j:choose>
<h1 class="job-index-headline page-headline">
<l:breakable value="${it.displayName}"/>
</h1>
</div>
</div>
<j:if test="${(it.fullName!=it.fullDisplayName)}">
<j:choose>
<j:when test="${iconClass != null}">
<l:icon class="${iconClass}" tooltip="${it.iconColor.description}" />
<j:when test="${it.parent!=app}">
${%Full folder name}: ${it.fullName}
</j:when>
<j:otherwise>
<l:icon src="${it.iconColor.getImageOf('48x48')}" height="48" width="48" alt="${it.iconColor.description}" tooltip="${it.iconColor.description}" />
${%Folder name}: ${it.fullName}
</j:otherwise>
</j:choose>
${it.displayName}
</h1>
<j:if test="${it.name != it.displayName}">
${%Folder name}: ${it.fullName}
</j:if>
<div id="view-message">
<div id="systemmessage">
Expand Down
2 changes: 2 additions & 0 deletions ...in/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
Folder\ name=Folder name
Full\ folder\ name=Full folder name
disable=Disable {0}
disabled=This {0} is currently disabled
3 changes: 2 additions & 1 deletion ...resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top_ja.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License
#
# Copyright (c) 2016- Seiji Sogabe
# Copyright (c) 2016- Seiji Sogabe
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand All @@ -21,3 +21,4 @@
# THE SOFTWARE.

Folder\ name=\u30d5\u30a9\u30eb\u30c0\u540d
Full\ folder\ name=\u5b8c\u5168\u306a\u30d5\u30a9\u30eb\u30c0\u540d
Loading