Skip to content

Commit

Permalink
Rename classes
Browse files Browse the repository at this point in the history
  • Loading branch information
@janfaracik
janfaracik committed Feb 18, 2024
1 parent 3ef46ab commit 2a19a04
Show file tree
Hide file tree
Showing 11 changed files with 183 additions and 184 deletions.
14 changes: 8 additions & 6 deletions core/src/main/resources/hudson/widgets/HistoryWidget/entries.jelly
View file
Expand Up @@ -26,17 +26,19 @@ THE SOFTWARE.
Render build histories.
-->
<?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">
<j:set target="${it}" property="nextBuildNumberToFetch" value="${it.nextBuildNumber}"/>
<j:invokeStatic className="java.time.LocalDate" method="now" var="now"/>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:i="jelly:fmt">
<j:set target="${it}" property="nextBuildNumberToFetch" value="${it.nextBuildNumber}" />
<j:invokeStatic className="java.time.LocalDate" method="now" var="now" />

<j:forEach var="pageEntry" items="${it.runs}">
<i:formatDate value="${pageEntry.entry.timestamp.time}" var="date" type="date" dateStyle="long" />
<i:formatDate value="${pageEntry.entry.timestamp.time}" var="simpleDate" type="date" pattern="YYYY-MM-dd" />
<i:formatDate value="${pageEntry.entry.timestamp.time}" var="date" type="date" dateStyle="long" />
<i:formatDate value="${pageEntry.entry.timestamp.time}" var="simpleDate" type="date" pattern="YYYY-MM-dd" />

<j:if test="${pastDate != date}">
<span class="willow">${simpleDate == now ? "%Today" : date}</span>
<span class="app-builds-container__heading">${simpleDate == now ? "%Today" : date}</span>
<j:set var="pastDate" value="${date}" />
</j:if>

<st:include page="/hudson/widgets/HistoryWidget/entry.jelly" />
</j:forEach>
</j:jelly>
16 changes: 8 additions & 8 deletions core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
View file
Expand Up @@ -35,14 +35,14 @@ THE SOFTWARE.
<i:setTimeZone value="${h.getUserTimeZone()}" />
</j:if>

<div class="ethan" page-entry-id="${pageEntry.entryId}" style="view-transition-name: item-${pageEntry.entryId}">
<div class="toprow">
<a class="toprow__icon"
<div class="app-builds-container__item" page-entry-id="${pageEntry.entryId}">
<div class="app-builds-container__item__inner">
<a class="app-builds-container__item__inner__icon"
href="${h.getConsoleUrl(build)}"
tooltip="${build.iconColor.description} > ${%Console Output}">
tooltip="${build.iconColor.description}">
<l:icon src="symbol-status-${build.iconColor.iconName}" />
</a>
<a href="${link}" class="toprow__link">
<a href="${link}" class="app-builds-container__item__inner__link">
${build.displayName}
<span class="timeman" time="${build.timestamp.time.time}">
<j:set var="linkTitleAttr" value="${null}" />
Expand All @@ -55,7 +55,7 @@ THE SOFTWARE.
</div>
</span>
</a>
<div class="toprow__controls">
<div class="app-builds-container__item__inner__controls">
<j:if test="${build.building}">
<j:if test="${build.building}">
<j:set target="${it.widget}" property="nextBuildNumberToFetch" value="${build.number}"/>
Expand All @@ -73,13 +73,13 @@ THE SOFTWARE.
<st:include it="${badge}" page="badge.jelly" />
</j:forEach>
</j:if>
<div class="letterman asda-link" data-href="${link}">
<div class="jenkins-card__reveal jenkins-jumplist-link" data-href="${link}">
<l:icon src="symbol-menu" />
</div>
</div>
</div>
<j:if test="${!empty build.truncatedDescription}">
<div class="ethan__description">
<div class="app-builds-container__item__description">
<j:out value="${app.markupFormatter.translate(build.truncatedDescription)}"/>
</div>
</j:if>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
View file
Expand Up @@ -27,7 +27,7 @@ THE SOFTWARE.
<j:set var="page" value="${it.historyPageFilter}" />

<j:set var="controls">
<l:overflowButton icon="symbol-menu" clazz="letterman">
<l:overflowButton icon="symbol-menu" clazz="jenkins-card__reveal">
<dd:item icon="symbol-rss"
text="Atom feed ${%for all}"
href="${it.baseUrl}/rssAll" />
Expand Down
17 changes: 8 additions & 9 deletions core/src/main/resources/jenkins/widgets/HistoryPageFilter/ajaxBuildHistory.jelly
View file
Expand Up @@ -22,17 +22,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->

<!--
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
<l:ajax>
<j:choose>
<j:when test="${it.size() > 0}">
<div class="itemsss" page-entry-newest="${it.newestOnPage}" page-entry-oldest="${it.oldestOnPage}" page-has-up="${it.hasUpPage}" page-has-down="${it.hasDownPage}">
<st:include page="entries.jelly" />
</div>
</j:when>
</j:choose>
<j:if test="${it.size() > 0}">
<div page-entry-newest="${it.newestOnPage}"
page-entry-oldest="${it.oldestOnPage}"
page-has-up="${it.hasUpPage}"
page-has-down="${it.hasDownPage}">
<st:include page="entries.jelly" />
</div>
</j:if>
</l:ajax>
</j:jelly>
10 changes: 5 additions & 5 deletions core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly
View file
Expand Up @@ -37,22 +37,22 @@ THE SOFTWARE.
<j:set var="id" value="${h.generateId()}"/>

<div class="ethan ethan--notinteractable" page-entry-id="${pageEntry.entryId}">
<div class="toprow">
<div class="toprow__icon">
<div class="app-builds-container__item__inner">
<div class="app-builds-container__item__inner__icon">
<l:icon src="symbol-status-nobuilt"/>
</div>
<div class="toprow__link">
<div class="app-builds-container__item__inner__link">
<!-- Don't use math unless needed, in case nextBuildNumber is not numeric -->
#${queuedItems.size() == 1 ? it.widget.owner.nextBuildNumber : it.widget.owner.nextBuildNumber+queuedItems.size()-i-1}
</div>
<j:if test="${build.building}">
<div class="toprow__controls">
<div class="app-builds-container__item__inner__controls">
<j:if test="${item.hasCancelPermission()}">
<l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" alt="${%cancel this build}"/>
</j:if>
</div>
</j:if>
<div class="toprow__badges">
<div class="app-builds-container__item__inner__badges">
<j:if test="${!item.params.isEmpty()}">
<div tooltip="Build Parameters: ${item.params}">
<l:icon class="icon-notepad icon-sm"/>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/layout/card.jelly
View file
Expand Up @@ -41,7 +41,7 @@ THE SOFTWARE.
<div class="jenkins-card__controls">
<j:out value="${controls}"/>
<j:if test="${attrs.expandable != null}">
<a href="${attrs.expandable}" class="letterman" tooltip="Expand">
<a href="${attrs.expandable}" class="jenkins-card__reveal" tooltip="Expand">
<l:icon src="symbol-expand" />
</a>
</j:if>
Expand Down
2 changes: 1 addition & 1 deletion war/src/main/js/components/dropdowns/jumplists.js
View file
Expand Up @@ -31,7 +31,7 @@ function generateJumplistAccessors() {
*/
function generateDropdowns() {
behaviorShim.specify(
"li.children, .asda-link, #menuSelector, .jenkins-menu-dropdown-chevron",
"li.children, .jenkins-jumplist-link, #menuSelector, .jenkins-menu-dropdown-chevron",
"-dropdown-",
1000,
(element) =>
Expand Down
151 changes: 0 additions & 151 deletions war/src/main/scss/components/_buttons.scss
View file
Expand Up @@ -306,157 +306,6 @@ $jenkins-split-button-border-radius: 0.2rem;
font-weight: 550;
}

#buildHistoryPage {
margin: 10px 0 10px 10px;

.jenkins-search {
margin-inline: -0.25rem;
margin-bottom: 5px;
}
}

.ethan {
@include mixins.item();

display: flex;
flex-direction: column;
padding: 0;
margin: 0 -0.5rem;
font-size: 0.8125rem !important;

.toprow {
display: flex;
align-items: center;
padding-right: 0.5rem;

&__icon {
display: inline-flex;
align-items: center;
justify-content: center;
padding: 0 0.25rem 0 0.5rem;

svg {
width: 1.25rem;
height: 1.25rem;
}
}

&__link {
display: flex;
align-items: center;
color: var(--text-color);
gap: 0.5rem;
text-decoration: none;
font-weight: 450;
flex-grow: 1;
padding: 0.4rem 0 0.4rem 0.25rem;

.timeman {
color: var(--text-color-secondary);
}
}

&__controls {
display: flex;
align-items: center;
justify-content: center;
gap: 0.5rem;
}

&__badges {
display: flex;
align-items: center;
justify-content: center;
gap: 0.5rem;
}
}

&--notinteractable {
cursor: default;

&::before, &::after {
display: none;
}

.ethan__description {
margin-bottom: 0;
}
}
}

.itemsss {
display: flex;
flex-direction: column;
}

.willow {
display: flex;
font-size: 0.75rem;
color: var(--text-color-secondary);
margin-top: 10px;
font-weight: 450;
margin-bottom: 4px;
}

.ethan__description {
position: relative;
color: var(--text-color-secondary);
padding-left: 36px;
margin-top: -2px;
margin-bottom: 4px;

&::before {
content: "";
position: absolute;
left: 17px;
top: 2px;
bottom: 2px;
width: 2px;
background: var(--text-color-secondary);
border-radius: 10px;
opacity: 0.3;
}
}

.asda-link {
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;

svg {
width: 1.25rem;
height: 1.25rem;
}
}

.app-builds-container {
transition: opacity var(--standard-transition);

&__items {
margin-bottom: -0.5rem;
}

&__placeholder {
display: flex;
align-items: center;
justify-content: center;
text-align: center;
padding: 3rem;
animation: timeonthefloor var(--standard-transition);

@keyframes timeonthefloor {
from {
opacity: 0;
}
}
}

&--loading {
opacity: 0.3;
}
}

.stop-button-link {
--item-background--hover: color-mix(in sRGB, var(--red) 20%, transparent);
--item-background--active: color-mix(in sRGB, var(--red) 25%, transparent);
Expand Down
4 changes: 2 additions & 2 deletions war/src/main/scss/components/_cards.scss
View file
Expand Up @@ -27,7 +27,7 @@ $card-padding: 1rem;
}

&:hover {
.letterman {
.jenkins-card__reveal {
color: var(--text-color) !important;
}
}
Expand All @@ -53,7 +53,7 @@ $card-padding: 1rem;
pointer-events: none;
}

.letterman {
.jenkins-card__reveal {
display: flex;
align-items: center;
justify-content: center;
Expand Down
12 changes: 12 additions & 0 deletions war/src/main/scss/components/_dropdowns.scss
View file
Expand Up @@ -264,3 +264,15 @@ $dropdown-padding: 0.4rem;
border-radius: 50%;
}
}

.jenkins-jumplist-link {
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;

svg {
width: 1.25rem;
height: 1.25rem;
}
}

0 comments on commit 2a19a04

Please sign in to comment.