The Unified and Autonomous Development Platform
refactor(job-list): update job list structure and markup handling
Robin Shenefe22dd57586
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.htmlindex 28670211a9..ba03b768e3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html@@ -4,14 +4,16 @@<input wicket:id="search" class="form-control form-control-sm" t:placeholder="Search job"/><wicket:svg href="magnify" class="icon text-muted icon-magnify"/></div>- <div wicket:id="jobs" class="job">- <div class="head text-nowrap d-flex align-items-center px-3 py-2 bg-light border-top">- <a wicket:id="name" class="name d-flex align-items-center mr-auto"><b wicket:id="label"></b></a>- <a wicket:id="showInList" class="ml-2 d-flex align-items-center" t:data-tippy-content="Show in build list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>- <a wicket:id="run" class="run ml-2 d-flex align-items-center" t:data-tippy-content="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>- </div>- <div class="body">- <div wicket:id="detail"></div>+ <div wicket:id="jobs">+ <div wicket:id="job" class="job">+ <div class="head text-nowrap d-flex align-items-center px-3 py-2 bg-light border-top">+ <a wicket:id="name" class="name d-flex align-items-center mr-auto"><b wicket:id="label"></b></a>+ <a wicket:id="showInList" class="ml-2 d-flex align-items-center" t:data-tippy-content="Show in build list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>+ <a wicket:id="run" class="run ml-2 d-flex align-items-center" t:data-tippy-content="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>+ </div>+ <div class="body">+ <div wicket:id="detail"></div>+ </div></div></div><div wicket:id="noJobs" class="no-jobs mb-0 mt-2"><div class="alert alert-notice alert-light-warning">No jobs found</div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.javaindex cd0117c149..4d7dea8294 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java@@ -98,7 +98,7 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitA@Overrideprotected void onBeforeRender() {- RepeatingView jobsView = new RepeatingView("jobs");+ RepeatingView jobsView = new RepeatingView("job");for (Job job: getFilteredJobs()) {WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId());Status status = getProject().getCommitStatuses(commitId, getPullRequest(), refName).get(job.getName());@@ -173,7 +173,7 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitA}};- jobsContainer.setOutputMarkupId(true);+ jobsContainer.setOutputMarkupPlaceholderTag(true);add(jobsContainer);noJobsContainer = new WebMarkupContainer("noJobs") {