Skip to content

The Unified and Autonomous Development Platform

fix issue #189 - UI redesign to make it professional and beautiful fix issue #188 - Upgrade to bootstrap4

Robin Shende278c1554cc
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 7400ddde84..f707e52e64 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -220,11 +220,11 @@ import io.onedev.server.search.code.SearchManager;
import io.onedev.server.security.BasicAuthenticationFilter;
import io.onedev.server.security.BearerAuthenticationFilter;
import io.onedev.server.security.CodePullAuthorizationSource;
-import io.onedev.server.security.FilterChainConfigurator;
import io.onedev.server.security.DefaultFilterChainResolver;
import io.onedev.server.security.DefaultPasswordService;
import io.onedev.server.security.DefaultRememberMeManager;
import io.onedev.server.security.DefaultWebSecurityManager;
+import io.onedev.server.security.FilterChainConfigurator;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.realm.AbstractAuthorizingRealm;
import io.onedev.server.ssh.DefaultKeyPairProvider;
@@ -266,8 +266,8 @@ import io.onedev.server.web.DefaultUrlManager;
import io.onedev.server.web.DefaultWicketFilter;
import io.onedev.server.web.DefaultWicketServlet;
import io.onedev.server.web.ExpectedExceptionContribution;
-import io.onedev.server.web.WebApplication;
import io.onedev.server.web.ResourcePackScopeContribution;
+import io.onedev.server.web.WebApplication;
import io.onedev.server.web.WebApplicationConfigurator;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.avatar.DefaultAvatarManager;
@@ -281,13 +281,7 @@ import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EditSupportLocator;
import io.onedev.server.web.editable.EditSupportRegistry;
import io.onedev.server.web.mapper.DynamicPathPageMapper;
-import io.onedev.server.web.page.DashboardPage;
-import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.layout.BuildListTab;
-import io.onedev.server.web.page.layout.IssueListTab;
-import io.onedev.server.web.page.layout.MainTab;
-import io.onedev.server.web.page.layout.ProjectListTab;
-import io.onedev.server.web.page.layout.PullRequestListTab;
+import io.onedev.server.web.page.layout.DefaultUICustomization;
import io.onedev.server.web.page.layout.UICustomization;
import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
import io.onedev.server.web.page.test.TestPage;
@@ -621,21 +615,7 @@ public class CoreModule extends AbstractPluginModule {
bind(TaskButton.TaskFutureManager.class);
- bind(UICustomization.class).toInstance(new UICustomization() {
-
- @Override
- public Class<? extends BasePage> getHomePage() {
- return DashboardPage.class;
- }
-
- @Override
- public List<MainTab> getMainTabs() {
- return Lists.newArrayList(
- new ProjectListTab(), new IssueListTab(),
- new PullRequestListTab(), new BuildListTab());
- }
-
- });
+ bind(UICustomization.class).toInstance(new DefaultUICustomization());
}
private void configureBuild() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
index da3c6d3b93..14df82bc6a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
@@ -95,7 +95,7 @@ import io.onedev.server.security.permission.AccessBuild;
import io.onedev.server.security.permission.JobPermission;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.util.CommitAware;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.MatrixRunner;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.script.identity.JobIdentity;
@@ -348,7 +348,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
JobExecutor executor = getJobExecutor(build);
if (executor != null) {
- JobLogger jobLogger = logManager.getLogger(build, jobSecretsToMask);
+ SimpleLogger jobLogger = logManager.getLogger(build, jobSecretsToMask);
ObjectId commitId = ObjectId.fromString(build.getCommitHash());
Long buildId = build.getId();
@@ -562,7 +562,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
- private void log(Throwable e, JobLogger logger) {
+ private void log(Throwable e, SimpleLogger logger) {
if (e instanceof GeneralException)
logger.log(e.getMessage());
else
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
index d8ae00e6ed..cfe1477771 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -46,7 +46,6 @@ import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Code;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.IssueQuery;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@@ -58,7 +57,6 @@ import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.WicketUtils;
@Editable
-@Horizontal
@ClassValidating
public class Job implements Serializable, Validatable {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java
index c288ef8ed9..b7dd01786f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java
@@ -10,7 +10,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.k8shelper.CloneInfo;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.patternset.PatternSet;
public abstract class JobContext {
@@ -49,7 +49,7 @@ public abstract class JobContext {
private final int retried;
- private final JobLogger logger;
+ private final SimpleLogger logger;
private final Collection<String> allocatedCaches = new HashSet<>();
@@ -60,7 +60,7 @@ public abstract class JobContext {
boolean retrieveSource, Integer cloneDepth, CloneInfo cloneInfo,
String cpuRequirement, String memoryRequirement, ObjectId commitId,
Collection<CacheSpec> caches, PatternSet collectFiles, int cacheTTL,
- int retried, List<JobService> services, JobLogger logger) {
+ int retried, List<JobService> services, SimpleLogger logger) {
this.projectName = projectName;
this.buildNumber = buildNumber;
this.projectGitDir = projectGitDir;
@@ -137,7 +137,7 @@ public abstract class JobContext {
return collectFiles;
}
- public JobLogger getLogger() {
+ public SimpleLogger getLogger() {
return logger;
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java
index 2b6590591a..61884f3406 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java
@@ -8,7 +8,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.model.Build;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -47,6 +47,6 @@ public abstract class JobReport implements Serializable {
return patternSet;
}
- public abstract void process(Build build, File workspace, JobLogger logger);
+ public abstract void process(Build build, File workspace, SimpleLogger logger);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java
index 04aa665e11..ee13395cd3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java
@@ -48,7 +48,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.support.inputspec.SecretInput;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.websocket.WebSocketManager;
@Singleton
@@ -88,13 +88,13 @@ public class DefaultLogManager implements LogManager {
}
@Override
- public JobLogger getLogger(Build build, Collection<String> jobSecretsToMask) {
+ public SimpleLogger getLogger(Build build, Collection<String> jobSecretsToMask) {
Long projectId = build.getProject().getId();
Long buildId = build.getId();
Long buildNumber = build.getNumber();
Collection<String> secretValuesToMask = build.getSecretValuesToMask();
secretValuesToMask.addAll(jobSecretsToMask);
- return new JobLogger() {
+ return new SimpleLogger() {
private void doLog(String message) {
for (String maskSecret: secretValuesToMask)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogManager.java
index 5d7ed9b87c..a12a6b5145 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogManager.java
@@ -6,11 +6,11 @@ import java.util.List;
import java.util.regex.Pattern;
import io.onedev.server.model.Build;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
public interface LogManager {
- JobLogger getLogger(Build build, Collection<String> jobSecrets);
+ SimpleLogger getLogger(Build build, Collection<String> jobSecrets);
/**
* Read specified number of log entries from specified build, starting from specified index
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
index 28129132ca..f2fb043ba3 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
@@ -88,6 +88,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
PullRequest request = review.getRequest();
User reviewer = review.getUser();
request.getReviews().remove(review);
+ request.setReviews(request.getReviews());
pullRequestManager.checkQuality(request, unpreferableReviewers);
@@ -117,6 +118,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
PullRequest request = review.getRequest();
request.getReviews().add(review);
+ request.setReviews(request.getReviews());
PullRequestChange change = new PullRequestChange();
change.setDate(new Date());
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
index 329cf7cc01..9bfe5df4ba 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
@@ -56,7 +56,8 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullR
update.setRequest(request);
update.setHeadCommitHash(request.getSource().getObjectName());
update.setTargetHeadCommitHash(request.getTarget().getObjectName());
- request.addUpdate(update);
+ request.getUpdates().add(update);
+ request.setUpdates(request.getUpdates());
save(update);
request.writeHeadRef();
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index b17b748811..447187ed9d 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -446,27 +446,15 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
return getTargetProject().getRevCommit(ObjectId.fromString(getBaseCommitHash()), true);
}
- /**
- * Get unmodifiable collection of updates of this pull request. To add update
- * to the pull request, call {@link this#addUpdate(PullRequestUpdate)} instead.
- *
- * @return
- * unmodifiable collection of updates
- */
public Collection<PullRequestUpdate> getUpdates() {
- return Collections.unmodifiableCollection(updates);
+ return updates;
}
public void setUpdates(Collection<PullRequestUpdate> updates) {
this.updates = updates;
sortedUpdates = null;
}
-
- public void addUpdate(PullRequestUpdate update) {
- updates.add(update);
- sortedUpdates = null;
- }
-
+
public Collection<PullRequestVerification> getVerifications() {
return verifications;
}
@@ -713,6 +701,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
public void setReviews(Collection<PullRequestReview> reviews) {
this.reviews = reviews;
+ sortedReviews = null;
}
public Collection<PullRequestAssignment> getAssignments() {
diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.java
index 2809a0f012..4d3b9d36c7 100644
--- a/server-core/src/main/java/io/onedev/server/model/Role.java
+++ b/server-core/src/main/java/io/onedev/server/model/Role.java
@@ -92,7 +92,7 @@ public class Role extends AbstractEntity implements Permission {
@OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)
private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();
- @Editable(order=100, description="Specify name of the role. <b class='red'>NOTE: </b> "
+ @Editable(order=100, description="Specify name of the role. <b class='text-danger'>NOTE: </b> "
+ "Permission to view issues will be granted implicitly even if no other permissions "
+ "are specified here")
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 92f79bafdf..5aa11724d3 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -74,27 +74,27 @@ public class GlobalIssueSetting implements Serializable {
List<Choice> choices = new ArrayList<>();
Choice newFeature = new Choice();
newFeature.setValue("New Feature");
- newFeature.setColor("#93c47d");
+ newFeature.setColor("#1bc5bd");
choices.add(newFeature);
Choice improvement = new Choice();
improvement.setValue("Improvement");
- improvement.setColor("#93c47d");
+ improvement.setColor("#1bc5bd");
choices.add(improvement);
Choice bug = new Choice();
bug.setValue("Bug");
- bug.setColor("#ea9999");
+ bug.setColor("#F64E60");
choices.add(bug);
Choice task = new Choice();
task.setValue("Task");
- task.setColor("#8e7cc3");
+ task.setColor("#8950FC");
choices.add(task);
Choice buildFailure = new Choice();
buildFailure.setValue("Build Failure");
- buildFailure.setColor("#cc0000");
+ buildFailure.setColor("#F64E60");
choices.add(buildFailure);
specifiedChoices.setChoices(choices);
@@ -114,22 +114,22 @@ public class GlobalIssueSetting implements Serializable {
Choice minor = new Choice();
minor.setValue("Minor");
- minor.setColor("#CCCCCC");
+ minor.setColor("#E4E6EF");
choices.add(minor);
Choice normal = new Choice();
normal.setValue("Normal");
- normal.setColor("#6fa8dc");
+ normal.setColor("#3699FF");
choices.add(normal);
Choice major = new Choice();
major.setValue("Major");
- major.setColor("#ff9900");
+ major.setColor("#FFA800");
choices.add(major);
Choice critical = new Choice();
critical.setValue("Critical");
- critical.setColor("#cc0000");
+ critical.setColor("#F64E60");
choices.add(critical);
specifiedChoices.setChoices(choices);
@@ -165,18 +165,18 @@ public class GlobalIssueSetting implements Serializable {
StateSpec open = new StateSpec();
open.setName("Open");
- open.setColor("#f0ad4e");
+ open.setColor("#FFA800");
stateSpecs.add(open);
StateSpec closed = new StateSpec();
- closed.setColor("#674EA7");
+ closed.setColor("#8950FC");
closed.setName("Closed");
stateSpecs.add(closed);
StateSpec released = new StateSpec();
- released.setColor("#3EB650");
+ released.setColor("#1BC5BD");
released.setName("Released");
stateSpecs.add(released);
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
index 53a190a03c..cda7f75869 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
@@ -47,7 +47,7 @@ public class SecuritySetting implements Serializable {
return (boolean) EditContext.get().getInputValue("enableAnonymousAccess");
}
- @Editable(order=200, description="User can self-register if this option is enabled")
+ @Editable(order=200, name="Enable Sign-Up", description="User can sign up if this option is enabled")
public boolean isEnableSelfRegister() {
return enableSelfRegister;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java
index 2d2f989ca5..4f2007975f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java
@@ -56,7 +56,7 @@ public abstract class SsoConnector implements Serializable {
return usage;
}
- public Component renderSubHeader(String componentId) {
+ public Component renderAdditionalInfo(String componentId) {
return new WebMarkupContainer(componentId).setVisible(false);
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
index 4f063b5165..ade60782ae 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
@@ -14,6 +14,7 @@ import javax.annotation.Nullable;
import javax.validation.constraints.Size;
import org.hibernate.validator.constraints.NotEmpty;
+import org.unbescape.html.HtmlEscape;
import com.google.common.collect.Lists;
@@ -126,6 +127,21 @@ public class BoardSpec implements Serializable {
public void setEditColumns(List<String> editColumns) {
this.editColumns = editColumns;
}
+
+ public List<String> getDisplayColumns() {
+ List<String> displayColumns = new ArrayList<>();
+ for (String column: getColumns()) {
+ if (column == null) {
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ FieldSpec field = issueSetting.getFieldSpec(getIdentifyField());
+ if (field != null)
+ displayColumns.add("<" + HtmlEscape.escapeHtml5(field.getNameOfEmptyValue()) + ">");
+ } else {
+ displayColumns.add(column);
+ }
+ }
+ return displayColumns;
+ }
@Editable(order=500, description="Specify fields to display in board card except issue number and title")
@ChoiceProvider("getDisplayFieldsChoices")
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java
index ee9ceee431..22e59da662 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java
@@ -22,22 +22,11 @@ public class IssueTemplate implements Serializable {
private static final long serialVersionUID = 1L;
- private String issueDescription;
-
private String issueQuery;
- @Editable(order=100)
- @Markdown
- @NotEmpty
- public String getIssueDescription() {
- return issueDescription;
- }
-
- public void setIssueDescription(String issueDescription) {
- this.issueDescription = issueDescription;
- }
-
- @Editable(order=200, name="Applicable Issues", description="Optionally specify issues applicable for this template. "
+ private String issueDescription;
+
+ @Editable(order=100, name="Applicable Issues", description="Optionally specify issues applicable for this template. "
+ "Leave empty for all")
@IssueQuery(withCurrentBuildCriteria = false, withCurrentCommitCriteria = false,
withCurrentPullRequestCriteria = false, withCurrentUserCriteria = false,
@@ -51,6 +40,17 @@ public class IssueTemplate implements Serializable {
this.issueQuery = issueQuery;
}
+ @Editable(order=200)
+ @Markdown
+ @NotEmpty
+ public String getIssueDescription() {
+ return issueDescription;
+ }
+
+ public void setIssueDescription(String issueDescription) {
+ this.issueDescription = issueDescription;
+ }
+
public Set<String> getUndefinedStates() {
Set<String> undefinedStates = new HashSet<>();
if (issueQuery != null) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/FieldSupply.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/FieldSupply.java
index a149782567..5a53f0ebdf 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/FieldSupply.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/FieldSupply.java
@@ -36,6 +36,7 @@ public class FieldSupply implements Serializable {
private ValueProvider valueProvider = new SpecifiedValue();
+ @Editable
@NotEmpty
public String getName() {
return name;
@@ -45,6 +46,7 @@ public class FieldSupply implements Serializable {
this.name = name;
}
+ @Editable
@NotNull
@Valid
public ValueProvider getValueProvider() {
@@ -55,6 +57,7 @@ public class FieldSupply implements Serializable {
this.valueProvider = valueProvider;
}
+ @Editable
public boolean isSecret() {
return secret;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
index 1a83e481af..686fedec1d 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
@@ -35,7 +35,7 @@ public class JobPrivilege implements Serializable {
private String accessibleReports;
@Editable(order=100, description="Specify space-separated jobs. Use '*' or '?' for wildcard match. "
- + "Prefix with '-' to exclude. <b class='red'>NOTE: </b> Permission to access build artifacts "
+ + "Prefix with '-' to exclude. <b class='text-danger'>NOTE: </b> Permission to access build artifacts "
+ "will be granted implicitly in matched jobs even if no other permissions are specified here")
@Patterns(suggester = "suggestJobNames")
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
index 1db1e1e897..61197af7a8 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
@@ -88,7 +88,7 @@ public class CommitQuery implements Serializable {
} else if (criteria.revisionCriteria() != null) {
String value;
Revision.Scope scope;
- if (criteria.revisionCriteria().DefaultBranch() != null)
+ if (criteria.revisionCriteria().DefaultBranch() != null)
value = project.getDefaultBranch();
else
value = getValue(criteria.revisionCriteria().Value());
@@ -112,7 +112,8 @@ public class CommitQuery implements Serializable {
scope = Revision.Scope.UNTIL;
else
scope = null;
- revisions.add(new Revision(value, scope, criteria.revisionCriteria().getText()));
+ if (value != null)
+ revisions.add(new Revision(value, scope, criteria.revisionCriteria().getText()));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index f7d9f801ba..10ead1d85c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -188,7 +188,10 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
builder.append("order by ");
builder.append(getSorts().stream().map(it->it.toString()).collect(Collectors.joining(" and ")));
}
- return builder.toString().trim();
+ String toStringValue = builder.toString().trim();
+ if (toStringValue.length() == 0)
+ toStringValue = null;
+ return toStringValue;
}
public static <T> Path<T> getPath(Path<?> root, String pathName) {
diff --git a/server-core/src/main/java/io/onedev/server/util/JobLogger.java b/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/util/JobLogger.java
rename to server-core/src/main/java/io/onedev/server/util/SimpleLogger.java
index 005fa41681..47063fb136 100644
--- a/server-core/src/main/java/io/onedev/server/util/JobLogger.java
+++ b/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java
@@ -5,7 +5,7 @@ import java.util.regex.Pattern;
import com.google.common.base.Splitter;
import com.google.common.base.Throwables;
-public abstract class JobLogger {
+public abstract class SimpleLogger {
private static final Pattern EOL_PATTERN = Pattern.compile("\r?\n");
diff --git a/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java b/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java
index cae668af54..52c5f60c56 100644
--- a/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java
+++ b/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java
@@ -10,7 +10,9 @@ import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;
import javax.servlet.DispatcherType;
+import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
@@ -81,11 +83,16 @@ public class DefaultJettyLauncher implements JettyLauncher, Provider<ServletCont
*/
servletContextHandler.addFilter(GuiceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
+ ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler();
+ errorHandler.addErrorPage(HttpServletResponse.SC_NOT_FOUND, "/errors/404");
+ servletContextHandler.setErrorHandler(errorHandler);
+
GzipHandler gzipHandler = new GzipHandler();
gzipHandler.setHandler(servletContextHandler);
+ gzipHandler.setIncludedMethods(HttpMethod.GET.name(), HttpMethod.POST.name(), HttpMethod.PUT.name());
jettyServer.setHandler(gzipHandler);
-
+
for (ServerConfigurator configurator: serverConfiguratorsProvider.get())
configurator.configure(jettyServer);
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java
index dec35431f8..866d1da9db 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java
@@ -12,7 +12,7 @@ import io.onedev.server.util.validation.annotation.DnsName;
public class DnsNameValidator implements ConstraintValidator<DnsName, String> {
- private static final Pattern PATTERN = Pattern.compile("[a-z0-9]([-a-z0-9]*[a-z0-9])?");
+ private static final Pattern PATTERN = Pattern.compile("[a-zA-Z0-9]([-a-zA-Z0-9]*[a-zA-Z0-9])?");
private boolean interpolative;
diff --git a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java
index 61aa63090f..aee9ed1585 100644
--- a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java
@@ -13,6 +13,7 @@ import io.onedev.server.web.mapper.DynamicPathPageMapper;
import io.onedev.server.web.mapper.DynamicPathResourceMapper;
import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
+import io.onedev.server.web.page.admin.generalsecuritysetting.GeneralSecuritySettingPage;
import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;
import io.onedev.server.web.page.admin.group.GroupListPage;
import io.onedev.server.web.page.admin.group.authorization.GroupAuthorizationsPage;
@@ -23,13 +24,12 @@ import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardLis
import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;
import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
-import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionsPage;
+import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;
import io.onedev.server.web.page.admin.jobexecutor.JobExecutorsPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.role.NewRolePage;
import io.onedev.server.web.page.admin.role.RoleDetailPage;
import io.onedev.server.web.page.admin.role.RoleListPage;
-import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
import io.onedev.server.web.page.admin.serverlog.ServerLogPage;
import io.onedev.server.web.page.admin.ssh.SshSettingPage;
@@ -46,7 +46,6 @@ import io.onedev.server.web.page.admin.user.password.UserPasswordPage;
import io.onedev.server.web.page.admin.user.profile.UserProfilePage;
import io.onedev.server.web.page.admin.user.ssh.UserSshKeysPage;
import io.onedev.server.web.page.builds.BuildListPage;
-import io.onedev.server.web.page.init.ServerInitPage;
import io.onedev.server.web.page.issues.IssueListPage;
import io.onedev.server.web.page.my.accesstoken.MyAccessTokenPage;
import io.onedev.server.web.page.my.avatar.MyAvatarPage;
@@ -94,17 +93,18 @@ import io.onedev.server.web.page.project.setting.branchprotection.BranchProtecti
import io.onedev.server.web.page.project.setting.build.ActionAuthorizationsPage;
import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;
import io.onedev.server.web.page.project.setting.build.JobSecretsPage;
-import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;
import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;
import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;
import io.onedev.server.web.page.project.stats.ProjectContribsPage;
import io.onedev.server.web.page.project.stats.SourceLinesPage;
import io.onedev.server.web.page.project.tags.ProjectTagsPage;
import io.onedev.server.web.page.pullrequests.PullRequestListPage;
-import io.onedev.server.web.page.security.ForgetPage;
-import io.onedev.server.web.page.security.LoginPage;
-import io.onedev.server.web.page.security.LogoutPage;
-import io.onedev.server.web.page.security.RegisterPage;
+import io.onedev.server.web.page.simple.error.PageNotFoundErrorPage;
+import io.onedev.server.web.page.simple.security.LoginPage;
+import io.onedev.server.web.page.simple.security.LogoutPage;
+import io.onedev.server.web.page.simple.security.PasswordResetPage;
+import io.onedev.server.web.page.simple.security.SignUpPage;
+import io.onedev.server.web.page.simple.serverinit.ServerInitPage;
import io.onedev.server.web.resource.ArchiveResourceReference;
import io.onedev.server.web.resource.ArtifactResourceReference;
import io.onedev.server.web.resource.AttachmentResourceReference;
@@ -134,6 +134,8 @@ public class BaseUrlMapper extends CompoundRequestMapper {
addSecurityPages();
addResources();
+
+ addErrorPages();
}
private void addMyPages() {
@@ -155,11 +157,15 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new BaseResourceMapper(SvgSpriteResourceReference.DEFAULT_MOUNT_PATH, new SvgSpriteResourceReference(IconScope.class)));
}
+ private void addErrorPages() {
+ add(new DynamicPathPageMapper("/errors/404", PageNotFoundErrorPage.class));
+ }
+
private void addSecurityPages() {
add(new DynamicPathPageMapper("login", LoginPage.class));
add(new DynamicPathPageMapper("logout", LogoutPage.class));
- add(new DynamicPathPageMapper("register", RegisterPage.class));
- add(new DynamicPathPageMapper("forget", ForgetPage.class));
+ add(new DynamicPathPageMapper("signup", SignUpPage.class));
+ add(new DynamicPathPageMapper("reset-password", PasswordResetPage.class));
add(new DynamicPathPageMapper(SsoProcessPage.MOUNT_PATH + "/${stage}/${connector}", SsoProcessPage.class));
}
@@ -167,7 +173,6 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("administration", UserListPage.class));
add(new DynamicPathPageMapper("administration/users", UserListPage.class));
add(new DynamicPathPageMapper("administration/users/new", NewUserPage.class));
- add(new DynamicPathPageMapper("administration/users/${user}", UserProfilePage.class));
add(new DynamicPathPageMapper("administration/users/${user}/profile", UserProfilePage.class));
add(new DynamicPathPageMapper("administration/users/${user}/groups", UserMembershipsPage.class));
add(new DynamicPathPageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));
@@ -182,16 +187,14 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("administration/groups", GroupListPage.class));
add(new DynamicPathPageMapper("administration/groups/new", NewGroupPage.class));
- add(new DynamicPathPageMapper("administration/groups/${group}", GroupProfilePage.class));
add(new DynamicPathPageMapper("administration/groups/${group}/profile", GroupProfilePage.class));
add(new DynamicPathPageMapper("administration/groups/${group}/members", GroupMembershipsPage.class));
add(new DynamicPathPageMapper("administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));
- add(new DynamicPathPageMapper("administration/settings", SystemSettingPage.class));
add(new DynamicPathPageMapper("administration/settings/system", SystemSettingPage.class));
add(new DynamicPathPageMapper("administration/settings/mail", MailSettingPage.class));
add(new DynamicPathPageMapper("administration/settings/backup", DatabaseBackupPage.class));
- add(new DynamicPathPageMapper("administration/settings/security", SecuritySettingPage.class));
+ add(new DynamicPathPageMapper("administration/settings/security", GeneralSecuritySettingPage.class));
add(new DynamicPathPageMapper("administration/settings/authenticator", AuthenticatorPage.class));
add(new DynamicPathPageMapper("administration/settings/sso-connectors", SsoConnectorListPage.class));
add(new DynamicPathPageMapper("administration/settings/ssh", SshSettingPage.class));
@@ -201,7 +204,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("administration/settings/issue-fields", IssueFieldListPage.class));
add(new DynamicPathPageMapper("administration/settings/issue-states", IssueStateListPage.class));
- add(new DynamicPathPageMapper("administration/settings/state-transitions", StateTransitionsPage.class));
+ add(new DynamicPathPageMapper("administration/settings/state-transitions", StateTransitionListPage.class));
add(new DynamicPathPageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));
add(new DynamicPathPageMapper("administration/settings/issue-templates", IssueTemplateListPage.class));
@@ -218,7 +221,6 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("projects/${project}/commits", ProjectCommitsPage.class));
add(new DynamicPathPageMapper("projects/${project}/commits/${revision}", CommitDetailPage.class));
add(new DynamicPathPageMapper("projects/${project}/compare", RevisionComparePage.class));
- add(new DynamicPathPageMapper("projects/${project}/stats", ProjectContribsPage.class));
add(new DynamicPathPageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class));
add(new DynamicPathPageMapper("projects/${project}/stats/lines", SourceLinesPage.class));
@@ -236,9 +238,9 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));
add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/invalid", InvalidPullRequestPage.class));
- add(new DynamicPathPageMapper("projects/${project}/boards", IssueBoardsPage.class));
- add(new DynamicPathPageMapper("projects/${project}/boards/${board}", IssueBoardsPage.class));
- add(new DynamicPathPageMapper("projects/${project}/issues", ProjectIssueListPage.class));
+ add(new DynamicPathPageMapper("projects/${project}/issues/boards", IssueBoardsPage.class));
+ add(new DynamicPathPageMapper("projects/${project}/issues/boards/${board}", IssueBoardsPage.class));
+ add(new DynamicPathPageMapper("projects/${project}/issues/list", ProjectIssueListPage.class));
add(new DynamicPathPageMapper("projects/${project}/issues/${issue}", IssueActivitiesPage.class));
add(new DynamicPathPageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));
add(new DynamicPathPageMapper("projects/${project}/issues/${issue}/commits", IssueCommitsPage.class));
@@ -258,8 +260,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("projects/${project}/builds/${build}/artifacts", BuildArtifactsPage.class));
add(new DynamicPathPageMapper("projects/${project}/builds/${build}/invalid", InvalidBuildPage.class));
- add(new DynamicPathPageMapper("projects/${project}/settings", GeneralSettingPage.class));
- add(new DynamicPathPageMapper("projects/${project}/settings/general", GeneralSettingPage.class));
+ add(new DynamicPathPageMapper("projects/${project}/settings/general", GeneralSecuritySettingPage.class));
add(new DynamicPathPageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));
add(new DynamicPathPageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));
add(new DynamicPathPageMapper("projects/${project}/settings/branch-protection", BranchProtectionsPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/WebApplication.java b/server-core/src/main/java/io/onedev/server/web/WebApplication.java
index a3ba20c7bc..2db9168807 100644
--- a/server-core/src/main/java/io/onedev/server/web/WebApplication.java
+++ b/server-core/src/main/java/io/onedev/server/web/WebApplication.java
@@ -65,9 +65,9 @@ import io.onedev.server.util.usage.InUseException;
import io.onedev.server.web.component.svg.SpriteImageResolver;
import io.onedev.server.web.mapper.BaseResourceMapper;
import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.error.GeneralErrorPage;
-import io.onedev.server.web.page.error.InUseErrorPage;
import io.onedev.server.web.page.layout.UICustomization;
+import io.onedev.server.web.page.simple.error.GeneralErrorPage;
+import io.onedev.server.web.page.simple.error.InUseErrorPage;
import io.onedev.server.web.resource.SvgSpriteResourceReference;
import io.onedev.server.web.resource.SvgSpriteResourceStream;
import io.onedev.server.web.resourcebundle.ResourceBundleReferences;
diff --git a/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AjaxLoadingOverlay.java b/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AjaxLoadingOverlay.java
deleted file mode 100644
index 547f6d5390..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AjaxLoadingOverlay.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.onedev.server.web.ajaxlistener;
-
-import java.io.Serializable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.attributes.IAjaxCallListener;
-
-/**
- * Ajax loading overlay is used to froze the page to prevent users from clicking anything to avoid
- * the wicket ComponentNotFoundException in case an ajax request has replaced part of the
- * page at server side, but the page at browser side has not been updated yet.
- * To use it, overwrite updateAjaxAttributes() method of various ajax components or
- * behaviors and add below statement:<br>
- * <code>attributes.getAjaxCallListeners().add(new AjaxLoadingOverlay());</code>
- *
- * @author robin
- *
- */
-@SuppressWarnings("serial")
-public class AjaxLoadingOverlay implements IAjaxCallListener, Serializable {
-
- @Override
- public CharSequence getBeforeHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getPrecondition(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getBeforeSendHandler(Component component) {
- return "$('#ajax-loading-overlay').show();";
- }
-
- @Override
- public CharSequence getAfterHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getSuccessHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getFailureHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getCompleteHandler(Component component) {
- return "$('#ajax-loading-overlay').hide();";
- }
-
- @Override
- public CharSequence getInitHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getDoneHandler(Component component) {
- return null;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
index 86d70a364c..3faa259ec0 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
@@ -15,6 +15,8 @@
$.fn.align = function(alignment) {
this.each(function() {
var $this = jQuery(this);
+ $this.addClass("autosuit");
+
var $parent = $this.parent();
if ($parent.css("position") != "relative") {
$parent.css("position", "relative");
@@ -23,19 +25,19 @@
$this.css("position", "absolute");
}
- var $autoSize = $this.find(".autosize");
- if ($autoSize.length == 0)
- $autoSize = $this;
+ var $autosuit = $this.find(".autosuit:visible:not(:has('.autosuit:visible'))");
+ if ($autosuit.length == 0)
+ $autosuit = $this;
- var scrollTop = $autoSize.scrollTop();
- var scrollLeft = $autoSize.scrollLeft();
+ var scrollTop = $autosuit.scrollTop();
+ var scrollLeft = $autosuit.scrollLeft();
// reset width and height as otherwise the dimension will not change
// even if enclosed content changes
- $autoSize.css("width", "auto");
- $autoSize.css("height", "auto");
- $autoSize.css("overflow", "auto");
-
+ $this.find(".autosuit").addBack(this).css("width", "auto").css("height", "auto").css("overflow", "hidden");
+
+ $autosuit.css("overflow", "auto");
+
var borderTop = jQuery(window).scrollTop() + pageMargin;
var borderBottom = borderTop + jQuery(window).height() - 2*pageMargin;
var borderLeft = jQuery(window).scrollLeft() + pageMargin;
@@ -43,6 +45,7 @@
var thisWidth = $this.outerWidth();
var thisHeight = $this.outerHeight();
+
var width = thisWidth;
var height = thisHeight;
@@ -193,17 +196,17 @@
$this.css({left:left-$parent.offset().left, top:top-$parent.offset().top});
if (height < thisHeight)
- $autoSize.outerHeight($autoSize.outerHeight()+height-thisHeight);
- $autoSize.outerHeight($autoSize.outerHeight()+2);
+ $autosuit.outerHeight($autosuit.outerHeight()+height-thisHeight);
+ $autosuit.outerHeight($autosuit.outerHeight()+2);
if (width < thisWidth)
- $autoSize.outerWidth($autoSize.outerWidth()+width-thisWidth);
+ $autosuit.outerWidth($autosuit.outerWidth()+width-thisWidth);
- if ($autoSize.height() < $autoSize[0].scrollHeight)
- $autoSize.outerWidth($autoSize.outerWidth()+scrollbarWidth);
+ if ($autosuit.height() < $autosuit[0].scrollHeight)
+ $autosuit.outerWidth($autosuit.outerWidth()+scrollbarWidth);
- $autoSize.scrollTop(scrollTop);
- $autoSize.scrollLeft(scrollLeft);
+ $autosuit.scrollTop(scrollTop);
+ $autosuit.scrollLeft(scrollLeft);
});
return this;
};
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.css b/server-core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.css
index a07390887f..86827fa6b0 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.css
@@ -5,9 +5,8 @@
display: none;
margin-top: 18px;
background: white;
- color: black;
- border: 1px solid #DDD;
- border-radius: 3px;
+ border: 1px solid var(--secondary);
+ border-radius: 0.42rem;
box-shadow: 0 0 5px rgba(0,0,0,0.1);
min-width: 120px;
max-height: 200px;
@@ -16,14 +15,14 @@
}
.atwho-view .cur {
- background: #3366FF;
+ background: #3699FF;
color: white;
}
.atwho-view .cur small {
color: white;
}
.atwho-view strong {
- color: #3366FF;
+ color: #3699FF;
}
.atwho-view .cur strong {
color: white;
@@ -38,12 +37,15 @@
.atwho-view ul li {
display: block;
padding: 5px 10px;
- border-bottom: 1px solid #DDD;
+ border-bottom: 1px solid var(--light-gray);
cursor: pointer;
/* border-top: 1px solid #C8C8C8; */
}
+.atwho-view ul li:last-child {
+ border-bottom: 0;
+}
.atwho-view small {
font-size: smaller;
- color: #777;
+ color: var(--gray);
font-weight: normal;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/BootstrapCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/BootstrapCssResourceReference.java
index 2702826328..354c340c93 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/BootstrapCssResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/BootstrapCssResourceReference.java
@@ -1,13 +1,28 @@
package io.onedev.server.web.asset.bootstrap;
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
+import io.onedev.server.web.asset.poppins.PoppinsCssResourceReference;
+
public class BootstrapCssResourceReference extends CssResourceReference {
private static final long serialVersionUID = 1L;
public BootstrapCssResourceReference() {
- super(BootstrapCssResourceReference.class, "css/bootstrap.min.css");
+ super(BootstrapCssResourceReference.class, "css/bootstrap-custom.css");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
+ BootstrapCssResourceReference.class, "css/bootstrap.min.css")));
+ dependencies.add(CssHeaderItem.forReference(new PoppinsCssResourceReference()));
+ return dependencies;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
new file mode 100644
index 0000000000..57c30ae94e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
@@ -0,0 +1,2868 @@
+:root {
+ --muted: #B5B5C3;
+ --gray: #7E8299;
+ --gray-dark: #3F4254;
+ --primary: #3699FF;
+ --light-primary: #E1F0FF;
+ --secondary: #E4E6EF;
+ --light-gray: #EBEDF3;
+ --success: #1BC5BD;
+ --light-success: #C9F7F5;
+ --info: #8950FC;
+ --light-info: #EEE5FF;
+ --warning: #FFA800;
+ --light-warning: #FFF4DE;
+ --danger: #F64E60;
+ --light-danger: #FFE2E5;
+ --light: #F3F6F9;
+ --dark: #181C32;
+ --light-dark: #D1D3E0;
+}
+
+html, body {
+ font-size: 13px;
+ font-weight: 400;
+ font-family: Poppins, Helvetica, "sans-serif";
+ -ms-text-size-adjust: 100%;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ background: #EEF0F8;
+ height: 100%;
+}
+a {
+ transition: color 0.15s ease, background-color 0.15s ease, border-color 0.15s ease, box-shadow 0.15s ease;
+}
+a, a:not([href]):not([class]) {
+ color: var(--gray-dark);
+}
+a:hover, a:focus, a:not([href]):not([class]):hover, a:not([href]):not([class]):focus {
+ text-decoration: none;
+ color: var(--primary);
+}
+
+a, button {
+ outline: 0 !important;
+}
+
+.dropdown-toggle:after {
+ display: none !important;
+}
+
+.font-weight-bold {
+ font-weight: 500 !important;
+}
+.font-weight-bolder {
+ font-weight: 600 !important;
+}
+.font-weight-boldest {
+ font-weight: 700;
+}
+
+.text-white, a.link-white {
+ color: white !important;
+}
+a.link-white:hover, a.link-white:focus {
+ color: var(--light-gray) !important;
+}
+.text-primary, a.link-primary {
+ color: var(--primary) !important;
+}
+a.link-primary:hover, a.link-primary:focus {
+ color: #0073e9 !important;
+}
+.text-danger, a.link-danger {
+ color: var(--danger) !important;
+}
+a.link-danger:hover, a.link-danger:focus {
+ color: #ec0c24 !important;
+}
+.text-success, a.link-success {
+ color: var(--success) !important;
+}
+a.link-success:hover, a.link-success:focus {
+ color: #12827c !important;
+}
+.text-warning, a.link-warning {
+ color: var(--warning) !important;
+}
+a.link-warning:hover, a.link-warning:focus {
+ color: #b37600 !important;
+}
+.text-info, a.link-info {
+ color: var(--info) !important;
+}
+a.link-info:hover, a.link-info:focus {
+ color: #5605fb !important;
+}
+.text-secondary, a.link-secondary {
+ color: var(--dark) !important;
+}
+a.link-secondary:hover, a.link-secondary:focus {
+ color: #b4bad3 !important;
+}
+.text-light, a.link-light {
+ color: var(--light) !important;
+}
+a.link-light:hover, a.link-light:focus {
+ color: #c0d0e0 !important;
+}
+.text-dark, a.link-dark {
+ color: var(--dark) !important;
+}
+a.link-dark:hover, a.link-dark:focus {
+ color: black !important;
+}
+.text-gray-dark, a.link-gray-dark {
+ color: var(--gray-dark) !important;
+}
+a.link-gray-dark:hover, a.link-gray-dark:focus {
+ color: var(--dark) !important;
+}
+.text-gray, a.link-gray {
+ color: var(--gray) !important;
+}
+a.link-gray:hover, a.link-gray:focus {
+ color: var(--gray-dark) !important;
+}
+
+.text-hover-primary:hover, .text-hover-primary:focus,
+a.link-hover-primary:hover, a.link-hover-primary:focus {
+ color: var(--primary) !important;
+}
+.text-hover-danger:hover, .text-hover-danger:focus,
+a.link-hover-danger:hover, a.link-hover-danger:focus {
+ color: var(--danger) !important;
+}
+.text-hover-success:hover, .text-hover-success:focus,
+a.link-hover-success:hover, a.link-hover-success:focus {
+ color: var(--success) !important;
+}
+.text-hover-warning:hover, .text-hover-warning:focus,
+a.link-hover-warning:hover, a.link-hover-warning:focus {
+ color: var(--warning) !important;
+}
+.text-hover-info:hover, .text-hover-info:focus,
+a.link-hover-info:hover, a.link-hover-info:focus {
+ color: var(--info) !important;
+}
+.text-hover-gray-dark:hover, .text-hover-gray-dark:focus,
+a.link-hover-gray-dark:hover, a.link-hover-gray-dark:focus {
+ color: var(--gray-dark) !important;
+}
+.text-hover-light:hover, .text-hover-light:focus,
+a.link-hover-light:hover, a.link-hover-light:focus {
+ color: var(--light) !important;
+}
+.text-hover-dark:hover, .text-hover-dark:focus,
+a.link-hover-dark:hover, a.link-hover-dark:focus {
+ color: var(--dark) !important;
+}
+.text-hover-gray:hover, .text-hover-gray:focus,
+a.link-hover-gray:hover, a.link-hover-gray:focus {
+ color: var(--gray) !important;
+}
+
+.bg-primary {
+ background-color: var(--primary) !important;
+}
+.bg-danger {
+ background-color: var(--danger) !important;
+}
+.bg-success {
+ background-color: var(--success) !important;
+}
+.bg-warning {
+ background-color: var(--warning) !important;
+}
+.bg-info {
+ background-color: var(--info) !important;
+}
+.bg-secondary {
+ background-color: var(--dark) !important;
+}
+.bg-light {
+ background-color: var(--light) !important;
+}
+.bg-dark {
+ background-color: var(--dark) !important;
+}
+
+.bg-hover-primary:hover, .bg-hover-primary:active {
+ background-color: var(--primary) !important;
+}
+.bg-hover-danger:hover, .bg-hover-danger:active {
+ background-color: var(--danger) !important;
+}
+.bg-hover-success:hover, .bg-hover-success:active {
+ background-color: var(--success) !important;
+}
+.bg-hover-warning:hover, .bg-hover-warning:active {
+ background-color: var(--warning) !important;
+}
+.bg-hover-info:hover, .bg-hover-info:active {
+ background-color: var(--info) !important;
+}
+.bg-hover-secondary:hover, .bg-hover-secondary:active {
+ background-color: var(--dark) !important;
+}
+.bg-hover-light:hover, .bg-hover-light:active {
+ background-color: var(--light) !important;
+}
+.bg-hover-dark:hover, .bg-hover-dark:active {
+ background-color: var(--dark) !important;
+}
+.bg-hover-gray-dark:hover, .bg-hover-gray-dark:active {
+ background-color: var(--gray-dark) !important;
+}
+
+/* FILE INPUT */
+.btn-file {
+ position: relative;
+ overflow: hidden;
+}
+.btn-file input[type=file] {
+ position: absolute;
+ top: 0;
+ right: 0;
+ min-width: 100%;
+ min-height: 100%;
+ font-size: 100px;
+ text-align: right;
+ filter: alpha(opacity=0);
+ opacity: 0;
+ outline: none;
+ background: white;
+ cursor: inherit;
+ display: block;
+}
+
+kbd {
+ padding: 0.2rem 0.4rem;
+ font-size: 87.5%;
+ color: white;
+ background-color: var(--dark);
+ border-radius: 0.28rem;
+ box-shadow: inset 0 -0.1rem 0 rgba(0, 0, 0, 0.25);
+}
+
+code {
+ background-color: var(--light);
+ padding: 0.15rem 0.5rem;
+ font-weight: 400;
+ border-radius: 0.42rem;
+}
+pre {
+ display: block;
+ font-size: 87.5%;
+ color: var(--dark);
+}
+
+.card {
+ box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);
+ border: none;
+ border-radius: 0.42rem;
+}
+.card-header:first-child {
+ border-radius: calc(0.42rem - 1px) calc(0.42rem - 1px) 0 0;
+}
+.card>.card-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: stretch;
+ flex-wrap: wrap;
+ min-height: 70px;
+ padding: 0 2.25rem;
+ background-color: transparent;
+ border-bottom: 1px solid var(--light-gray);
+}
+.card>.card-header .card-title {
+ display: flex;
+ align-items: center;
+ margin: 0.5rem;
+ margin-left: 0;
+}
+.card>.card-header .card-title .card-label {
+ margin: 0 0.75rem 0 0;
+ flex-wrap: wrap;
+}
+.card>.card-header .card-title, .card>.card-header .card-title .card-label {
+ font-weight: 500;
+ font-size: 1.275rem;
+ color: var(--dark);
+}
+
+.card>.card-header .card-title small {
+ color: #B5B5C3;
+ font-size: 1rem;
+}
+.card>.card-header .card-toolbar {
+ display: flex;
+ align-items: center;
+ margin: 0.5rem 0;
+ flex-wrap: wrap;
+}
+.card.card-fit > .card-header {
+ border-bottom: 0;
+}
+
+.nav .show > .nav-link .icon,
+.nav .nav-link:hover:not(.disabled) .icon,
+.nav .nav-link.active .icon {
+ color: var(--primary);
+}
+
+.card>.card-body {
+ padding: 2rem 2.25rem;
+}
+
+.card>.list-group:first-child {
+ border-top-width: 0;
+ border-top-left-radius: calc(.42rem - 1px);
+ border-top-right-radius: calc(.42rem - 1px);
+}
+.card>.list-group:last-child {
+ border-bottom-right-radius: calc(0.42rem - 1px);
+ border-bottom-left-radius: calc(0.42rem - 1px);
+}
+
+.list-group-item {
+ padding: 0.75rem 1.25rem;
+ background-color: white;
+ border: 1px solid var(--light-gray);
+}
+
+.text-muted {
+ color: var(--muted) !important;
+}
+.form-group .form-text {
+ font-size: 0.9rem;
+ font-weight: 400;
+}
+
+.form-control {
+ border-radius: 0.42rem;
+ border-color: var(--secondary);
+ height: calc(1.5em + 1.3rem + 2px);
+ padding: 0.65rem 1rem;
+ box-shadow: none !important;
+}
+.form-control::placeholder {
+ color: #B5B5C3;
+ opacity: 1;
+}
+.form-control:disabled, .form-control[readonly] {
+ background-color: var(--light);
+ opacity: 1;
+}
+.form-control-sm {
+ height: calc(1.35em + 1.1rem + 2px);
+ padding: 0.55rem 0.75rem;
+ font-size: 0.925rem;
+ line-height: 1.35;
+ border-radius: 0.28rem;
+}
+.form-control-lg {
+ height: calc(1.5em + 1.65rem + 2px);
+ padding: 0.825rem 1.42rem;
+ font-size: 1.08rem;
+ line-height: 1.5;
+}
+
+.form-control:focus {
+ border-color: #69b3ff;
+ outline: 0;
+}
+.form-control.form-control-solid {
+ background-color: var(--light);
+ border-color: var(--light);
+ color: var(--gray-dark);
+}
+.form-control.form-control-solid:focus {
+ background-color: var(--light-gray);
+ border-color: var(--light-gray);
+}
+.input-group-text {
+ background-color: var(--light);
+ border: 1px solid var(--secondary);
+ border-radius: 0.42rem;
+ padding: 0.65rem 1rem;
+ color: var(--gray-dark);
+}
+.input-group .checkbox {
+ margin-bottom: 0 !important;
+ padding-left: 0;
+}
+
+.checkbox-list {
+ display: flex;
+ flex-direction: column;
+}
+.checkbox-list .checkbox {
+ margin-bottom: 1rem;
+}
+.checkbox>input {
+ position: absolute;
+ z-index: -1;
+ opacity: 0;
+}
+input[type="radio"], input[type="checkbox"] {
+ box-sizing: border-box;
+ padding: 0;
+}
+.checkbox>span {
+ margin-right: 0.75rem;
+ background-color: var(--light-gray);
+ border: 1px solid transparent;
+ height: 18px;
+ width: 18px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
+ border-radius: 0.42rem;
+ transition: all 0.3s ease;
+}
+.checkbox>span:after {
+ width: 5px;
+ height: 10px;
+ content: '';
+ border-color: transparent;
+ border-style: solid;
+ border-width: 0 2px 2px 0/*rtl:ignore*/ !important;
+ transform: rotate(45deg)/*rtl:ignore*/;
+ margin-top: -2px;
+}
+.checkbox {
+ display: flex;
+ align-items: center;
+ position: relative;
+ text-align: left;
+ cursor: pointer;
+ font-size: 1rem;
+ transition: all 0.3s ease;
+ margin: 0;
+}
+.checkbox>input:checked ~ span {
+ background-color: var(--primary);
+ transition: all 0.3s ease;
+ background-color: none;
+}
+.checkbox>input:checked ~ span:after {
+ border-color: white;
+ display: block;
+}
+.checkbox.checkbox-disabled {
+ opacity: 0.6;
+ cursor: not-allowed;
+}
+.checkbox-inline {
+ display: flex;
+ flex-wrap: wrap;
+}
+.checkbox-inline .checkbox {
+ margin-right: 1rem;
+ margin-bottom: 0.35rem;
+}
+.checkbox-inline .checkbox span {
+ margin-right: 0.75rem;
+}
+.checkbox.checkbox-lg>span {
+ height: 24px;
+ width: 24px;
+}
+.checkbox.checkbox-lg>span:after {
+ width: 6px;
+ height: 12px;
+}
+.checkbox.checkbox-square>span {
+ border-radius: 0;
+}
+.checkbox.checkbox-success>input:checked ~ span {
+ background-color: var(--success);
+}
+.checkbox.checkbox-danger>input:checked ~ span {
+ background-color: var(--danger);
+}
+.checkbox.checkbox-primary>input:checked ~ span {
+ background-color: var(--primary);
+}
+.checkbox.checkbox-warning>input:checked ~ span {
+ background-color: var(--warning);
+}
+.checkbox.checkbox-info>input:checked ~ span {
+ background-color: var(--info);
+}
+.checkbox.checkbox-dark>input:checked ~ span {
+ background-color: var(--dark);
+}
+.checkbox.checkbox-outline>span {
+ background-color: transparent;
+ border-color: var(--light-dark);
+}
+.checkbox.checkbox-outline.checkbox-success>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--success);
+}
+.checkbox.checkbox-outline.checkbox-success>input:checked ~ span:after {
+ border-color: var(--success);
+}
+.checkbox.checkbox-outline.checkbox-danger>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--danger);
+}
+.checkbox.checkbox-outline.checkbox-danger>input:checked ~ span:after {
+ border-color: var(--danger);
+}
+.checkbox.checkbox-outline.checkbox-primary>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--primary);
+}
+.checkbox.checkbox-outline.checkbox-primary>input:checked ~ span:after {
+ border-color: var(--primary);
+}
+.checkbox.checkbox-outline.checkbox-info>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--info);
+}
+.checkbox.checkbox-outline.checkbox-info>input:checked ~ span:after {
+ border-color: var(--info);
+}
+.checkbox.checkbox-outline.checkbox-warning>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--warning);
+}
+.checkbox.checkbox-outline.checkbox-warning>input:checked ~ span:after {
+ border-color: var(--warning);
+}
+.checkbox.checkbox-outline.checkbox-dark>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--dark);
+}
+.checkbox.checkbox-outline.checkbox-dark>input:checked ~ span:after {
+ border-color: var(--dark);
+}
+.checkbox.checkbox-outline-2x>span {
+ border-width: 2px !important;
+}
+
+.radio-list {
+ display: flex;
+ flex-direction: column;
+}
+.radio-list .radio {
+ margin-bottom: 1rem;
+}
+.radio {
+ display: flex;
+ align-items: center;
+ position: relative;
+ text-align: left;
+ cursor: pointer;
+ font-size: 1rem;
+ transition: all 0.3s ease;
+ margin: 0;
+}
+.radio>input {
+ position: absolute;
+ z-index: -1;
+ opacity: 0;
+}
+.radio>input:checked ~ span {
+ background-color: var(--primary);
+ transition: all 0.3s ease;
+ background-color: none;
+}
+.radio>span {
+ margin-right: 0.75rem;
+ background-color: var(--light-gray);
+ border: 1px solid transparent;
+ height: 18px;
+ width: 18px;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
+}
+.radio>input:checked ~ span:after {
+ background-color: white;
+ border-color: white;
+ display: block;
+}
+.radio>span:after {
+ width: 6px;
+ height: 6px;
+ content: '';
+ display: none;
+ border-radius: 100% !important;
+}
+.radio.radio-disabled {
+ opacity: 0.6;
+ cursor: not-allowed;
+}
+.radio-inline .radio {
+ margin-right: 1rem;
+ margin-bottom: 0.35rem;
+}
+.radio-inline .radio span {
+ margin-right: 0.75rem;
+}
+.radio.radio-lg>span {
+ height: 24px;
+ width: 24px;
+}
+.radio.radio-lg>span:after {
+ width: 8px;
+ height: 8px;
+}
+.radio.radio-success>input:checked ~ span {
+ background-color: var(--success);
+}
+.radio.radio-danger>input:checked ~ span {
+ background-color: var(--danger);
+}
+.radio.radio-warning>input:checked ~ span {
+ background-color: var(--warning);
+}
+.radio.radio-primary>input:checked ~ span {
+ background-color: var(--primary);
+}
+.radio.radio-info>input:checked ~ span {
+ background-color: var(--info);
+}
+.radio.radio-dark>input:checked ~ span {
+ background-color: var(--dark);
+}
+.radio.radio-outline>span {
+ background-color: transparent;
+ border-color: var(--light-dark);
+}
+.radio.radio-outline.radio-success>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--success);
+}
+.radio.radio-outline.radio-success>input:checked ~ span:after {
+ background-color: var(--success);
+ border-color: var(--success);
+}
+.radio.radio-outline.radio-danger>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--danger);
+}
+.radio.radio-outline.radio-danger>input:checked ~ span:after {
+ background-color: var(--danger);
+ border-color: var(--danger);
+}
+.radio.radio-outline.radio-warning>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--warning);
+}
+.radio.radio-outline.radio-warning>input:checked ~ span:after {
+ background-color: var(--warning);
+ border-color: var(--warning);
+}
+.radio.radio-outline.radio-info>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--info);
+}
+.radio.radio-outline.radio-info>input:checked ~ span:after {
+ background-color: var(--info);
+ border-color: var(--info);
+}
+.radio.radio-outline.radio-primary>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--primary);
+}
+.radio.radio-outline.radio-primary>input:checked ~ span:after {
+ background-color: var(--primary);
+ border-color: var(--primary);
+}
+.radio.radio-outline.radio-dark>input:checked ~ span {
+ background-color: transparent;
+ border-color: var(--dark);
+}
+.radio.radio-outline.radio-dark>input:checked ~ span:after {
+ background-color: var(--dark);
+ border-color: var(--dark);
+}
+.radio.radio-outline-2x>span {
+ border-width: 2px !important;
+}
+.radio.radio-accent>span {
+ height: 24px;
+ width: 24px;
+ border-width: 3px !important;
+ border-style: solid !important;
+ background-color: transparent !important;
+}
+.radio.radio-accent>span:after {
+ width: 14px;
+ height: 14px;
+ display: block;
+}
+.radio.radio-accent.radio-success>span:after {
+ background-color: var(--success);
+}
+.radio.radio-accent.radio-success>input:checked ~ span {
+ border-color: var(--light-success);
+}
+.radio.radio-accent.radio-success>input:checked ~ span:after {
+ background-color: var(--success);
+}
+.radio.radio-accent.radio-danger>span:after {
+ background-color: var(--danger);
+}
+.radio.radio-accent.radio-danger>input:checked ~ span {
+ border-color: var(--light-danger);
+}
+.radio.radio-accent.radio-danger>input:checked ~ span:after {
+ background-color: var(--danger);
+}
+.radio.radio-accent.radio-primary>span:after {
+ background-color: var(--primary);
+}
+.radio.radio-accent.radio-primary>input:checked ~ span {
+ border-color: var(--light-primary);
+}
+.radio.radio-accent.radio-primary>input:checked ~ span:after {
+ background-color: var(--primary);
+}
+.radio.radio-accent.radio-warning>span:after {
+ background-color: var(--warning);
+}
+.radio.radio-accent.radio-warning>input:checked ~ span {
+ border-color: var(--light-warning);
+}
+.radio.radio-accent.radio-warning>input:checked ~ span:after {
+ background-color: var(--warning);
+}
+.radio.radio-accent.radio-info>span:after {
+ background-color: var(--info);
+}
+.radio.radio-accent.radio-info>input:checked ~ span {
+ border-color: var(--light-info);
+}
+.radio.radio-accent.radio-info>input:checked ~ span:after {
+ background-color: var(--info);
+}
+.radio.radio-accent.radio-dark>span:after {
+ background-color: var(--dark);
+}
+.radio.radio-accent.radio-dark>input:checked ~ span {
+ border-color: var(--light-dark);
+}
+.radio.radio-accent.radio-dark>input:checked ~ span:after {
+ background-color: var(--dark);
+}
+
+.form-group label {
+ font-size: 1rem;
+ font-weight: 400;
+ color: var(--gray-dark);
+}
+.col-form-label {
+ padding-top: calc(0.65rem + 1px);
+ padding-bottom: calc(0.65rem + 1px);
+ margin-bottom: 0;
+ font-size: inherit;
+ line-height: 1.5;
+}
+
+.custom-range {
+ width: 100%;
+ height: 1.4rem;
+ padding: 0;
+ background-color: transparent;
+ appearance: none;
+ outline: 0 !important;
+}
+.custom-select {
+ height: calc(1.5em + 1.3rem + 2px);
+ padding: 0.65rem 2rem 0.65rem 1rem;
+ color: var(--gray-dark);
+ border: 1px solid var(--secondary);
+ border-radius: 0.42rem;
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
+ appearance: none;
+}
+.custom-select:focus {
+ border-color: #69b3ff;
+ outline: 0;
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 0 0.2rem rgba(54, 153, 255, 0.25);
+}
+.custom-file {
+ height: calc(1.5em + 1.3rem + 2px);
+}
+.custom-file-input {
+ height: calc(1.5em + 1.3rem + 2px);
+}
+.custom-file-input:focus~.custom-file-label {
+ box-shadow: none;
+}
+.custom-file-label {
+ height: calc(1.5em + 1.3rem + 2px);
+ padding: 0.65rem 1rem;
+ color: var(--gray-dark);
+ background-color: white;
+ border: 1px solid var(--secondary);
+ border-radius: 0.42rem;
+ box-shadow: none;
+}
+.custom-file-label::after {
+ height: calc(1.5em + 1.3rem);
+ padding: 0.65rem 1rem;
+ color: var(--gray-dark);
+ content: "Browse";
+ background-color: var(--light);
+ border-radius: 0 0.42rem 0.42rem 0;
+}
+.switch {
+ display: flex;
+ align-items: center;
+ font-size: 1rem;
+}
+.switch label {
+ margin: 0;
+}
+.switch input:empty {
+ margin-left: -999px;
+ height: 0;
+ width: 0;
+ overflow: hidden;
+ position: absolute;
+ opacity: 0;
+}
+.switch input:empty ~ span {
+ margin: 2px 0;
+ height: 30px;
+ width: 57px;
+ border-radius: 15px;
+}
+.switch input:empty ~ span {
+ display: inline-block;
+ position: relative;
+ width: 1px;
+ text-indent: 0;
+ cursor: pointer;
+ user-select: none;
+}
+.switch input:checked ~ span:before, .switch input:empty ~ span:before {
+ background-color: var(--light-gray);
+}
+.switch input:empty ~ span:before, .switch input:empty ~ span:after {
+ width: 54px;
+ border-radius: 15px;
+ position: absolute;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ content: ' ';
+ transition: all 100ms ease-in;
+}
+.switch input:empty ~ span:after {
+ background-color: white;
+ opacity: 0.7;
+ height: 24px;
+ width: 24px;
+ top: 3px;
+ bottom: 3px;
+ margin-left: 3px;
+ font-size: 0.65em;
+ text-align: center;
+ vertical-align: middle;
+}
+.switch input:checked ~ span:after {
+ opacity: 1;
+ color: white;
+ background-color: var(--primary);
+ margin-left: 26px;
+}
+.switch input[disabled] ~ span:after, .switch input[disabled] ~ span:before {
+ cursor: not-allowed;
+ opacity: 0.5;
+}
+.switch.switch-lg input:empty ~ span {
+ margin: 2px 0;
+ height: 40px;
+ width: 75px;
+ border-radius: 20px;
+}
+.switch.switch-lg input:empty ~ span:before, .switch.switch-lg input:empty ~ span:after {
+ width: 72px;
+ border-radius: 20px;
+}
+.switch.switch-lg input:checked ~ span:after {
+ margin-left: 34px;
+}
+.switch.switch-lg input:empty ~ span:after {
+ height: 34px;
+ width: 34px;
+ top: 3px;
+ bottom: 3px;
+ margin-left: 3px;
+ font-size: 0.75em;
+ text-align: center;
+ vertical-align: middle;
+}
+.switch.switch-lg input:checked ~ span:after {
+ margin-left: 34px;
+}
+.switch.switch-sm input:empty ~ span {
+ margin: 2px 0;
+ height: 24px;
+ width: 40px;
+ border-radius: 12px;
+}
+.switch.switch-sm input:empty ~ span:before, .switch.switch-sm input:empty ~ span:after {
+ width: 38px;
+ border-radius: 12px;
+}
+.switch.switch-sm input:empty ~ span:after {
+ height: 20px;
+ width: 20px;
+ top: 2px;
+ bottom: 2px;
+ margin-left: 2px;
+ font-size: 0.55em;
+ text-align: center;
+ vertical-align: middle;
+}
+.switch.switch-sm input:checked ~ span:after {
+ margin-left: 16px;
+}
+.switch.switch-dark:not(.switch-outline) input:checked ~ span:after,
+.switch.switch-primary:not(.switch-outline) input:checked ~ span:after,
+.switch.switch-warning:not(.switch-outline) input:checked ~ span:after,
+.switch.switch-info:not(.switch-outline) input:checked ~ span:after,
+.switch.switch-success:not(.switch-outline) input:checked ~ span:after,
+.switch.switch-danger:not(.switch-outline) input:checked ~ span:after {
+ opacity: 1;
+ background-color: white;
+}
+.switch.switch-success:not(.switch-outline) input:checked ~ span:before {
+ background-color: var(--success);
+}
+.switch.switch-danger:not(.switch-outline) input:checked ~ span:before {
+ background-color: var(--danger);
+}
+.switch.switch-warning:not(.switch-outline) input:checked ~ span:before {
+ background-color: var(--warning);
+}
+.switch.switch-info:not(.switch-outline) input:checked ~ span:before {
+ background-color: var(--info);
+}
+.switch.switch-primary:not(.switch-outline) input:checked ~ span:before {
+ background-color: var(--primary);
+}
+.switch.switch-dark:not(.switch-outline) input:checked ~ span:before {
+ background-color: var(--dark);
+}
+
+.switch.switch-outline input:empty ~ span:before {
+ border: 2px solid var(--light-gray);
+ background-color: transparent;
+}
+.switch.switch-outline input:empty ~ span:after {
+ background-color: var(--light-gray);
+}
+.switch.switch-outline.switch-success input:checked ~ span:before {
+ border: 2px solid var(--success);
+ background-color: transparent;
+}
+.switch.switch-outline.switch-success input:checked ~ span:after {
+ color: white;
+ background-color: var(--success);
+}
+.switch.switch-outline.switch-danger input:checked ~ span:before {
+ border: 2px solid var(--danger);
+ background-color: transparent;
+}
+.switch.switch-outline.switch-danger input:checked ~ span:after {
+ color: white;
+ background-color: var(--danger);
+}
+.switch.switch-outline.switch-primary input:checked ~ span:before {
+ border: 2px solid var(--primary);
+ background-color: transparent;
+}
+.switch.switch-outline.switch-primary input:checked ~ span:after {
+ color: white;
+ background-color: var(--primary);
+}
+.switch.switch-outline.switch-info input:checked ~ span:before {
+ border: 2px solid var(--info);
+ background-color: transparent;
+}
+.switch.switch-outline.switch-info input:checked ~ span:after {
+ color: white;
+ background-color: var(--info);
+}
+.switch.switch-outline.switch-warning input:checked ~ span:before {
+ border: 2px solid var(--warning);
+ background-color: transparent;
+}
+.switch.switch-outline.switch-warning input:checked ~ span:after {
+ color: white;
+ background-color: var(--warning);
+}
+.switch.switch-outline.switch-dark input:checked ~ span:before {
+ border: 2px solid var(--dark);
+ background-color: transparent;
+}
+.switch.switch-outline.switch-dark input:checked ~ span:after {
+ color: white;
+ background-color: var(--dark);
+}
+.btn {
+ padding: 0.65rem 1rem;
+ border-radius: 0.42rem;
+ font-size: 1rem;
+ line-height: 1.5;
+ box-shadow: none !important;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+}
+.btn.btn-sm {
+ padding: 0.55rem 0.75rem;
+ font-size: 0.925rem;
+ line-height: 1.35;
+}
+.btn.btn-large {
+ padding: 0.825rem 1.42rem;
+ font-size: 1.08rem;
+}
+
+.btn:focus {
+ box-shadow: none;
+}
+
+.btn.btn-icon {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ padding: 0;
+ height: calc(1.5em + 1.3rem + 2px);
+ width: calc(1.5em + 1.3rem + 2px);
+}
+
+.btn.btn-icon.btn-sm, .btn-group-sm>.btn.btn-icon {
+ height: calc(1.35em + 1.1rem + 2px);
+ width: calc(1.35em + 1.1rem + 2px);
+}
+
+.btn.btn-icon.btn-xs {
+ height: 24px;
+ width: 24px;
+}
+
+.btn-icon .icon {
+ margin-right: 0 !important;
+}
+
+.btn.btn-primary {
+ color: white;
+ background-color: var(--primary);
+ border-color: var(--primary);
+}
+.btn.btn-primary:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-primary:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-primary:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-primary.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-primary.dropdown-toggle, .show .btn.btn-primary.btn-dropdown {
+ background-color: #187DE4;
+ border-color: #187DE4;
+}
+
+.btn.btn-secondary {
+ color: var(--gray-dark);
+ background-color: var(--secondary);
+ border-color: var(--secondary);
+}
+.btn.btn-secondary:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-secondary:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-secondary:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-secondary.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-secondary.dropdown-toggle, .show .btn.btn-secondary.btn-dropdown {
+ background-color: #D7DAE7;
+ border-color: #D7DAE7;
+}
+
+.btn.btn-success {
+ color: white;
+ background-color: var(--success);
+ border-color: var(--success);
+}
+.btn.btn-success:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-success:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-success:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-secondary.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-success.dropdown-toggle, .show .btn.btn-success.btn-dropdown {
+ background-color: #0BB7AF;
+ border-color: #0BB7AF;
+}
+
+.btn.btn-danger {
+ color: white;
+ background-color: var(--danger);
+ border-color: var(--danger);
+}
+.btn.btn-danger:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-danger:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-danger:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-danger.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-danger.dropdown-toggle, .show .btn.btn-danger.btn-dropdown {
+ background-color: #EE2D41;
+ border-color: #EE2D41;
+}
+
+.btn.btn-warning {
+ color: white;
+ background-color: var(--warning);
+ border-color: var(--warning);
+}
+.btn.btn-warning:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-warning:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-warning:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-warning.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-warning.dropdown-toggle, .show .btn.btn-warning.btn-dropdown {
+ background-color: #EE9D01;
+ border-color: #EE9D01;
+}
+
+.btn.btn-info {
+ color: white;
+ background-color: var(--info);
+ border-color: var(--info);
+}
+.btn.btn-info:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-info:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-info:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-info.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-info.dropdown-toggle, .show .btn.btn-info.btn-dropdown {
+ background-color: #7337EE;
+ border-color: #7337EE;
+}
+
+.btn.btn-light {
+ color: var(--gray);
+ background-color: var(--light);
+ border-color: var(--light);
+}
+.btn.btn-light:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-light.dropdown-toggle, .show .btn.btn-light.btn-dropdown {
+ background-color: var(--secondary);
+ border-color: var(--secondary);
+}
+
+.btn.btn-dark {
+ color: white;
+ background-color: var(--dark);
+ border-color: var(--dark);
+}
+.btn.btn-dark:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-dark:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-dark:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-dark.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-dark.dropdown-toggle, .show .btn.btn-dark.btn-dropdown {
+ background-color: #131628;
+ border-color: #131628;
+}
+
+.btn.btn-light-success {
+ color: var(--success);
+ background-color: var(--light-success);
+ border-color: transparent;
+}
+.btn.btn-light-success:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-success:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-success:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-success.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-light-success.dropdown-toggle, .show .btn.btn-light-success.btn-dropdown {
+ color: white;
+ background-color: var(--success);
+}
+
+.btn.btn-light-primary {
+ color: var(--primary);
+ background-color: var(--light-primary);
+ border-color: transparent;
+}
+.btn.btn-light-primary:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-primary:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-primary:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-primary.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-light-primary.dropdown-toggle, .show .btn.btn-light-primary.btn-dropdown {
+ color: white;
+ background-color: var(--primary);
+}
+
+.btn.btn-light-danger {
+ color: var(--danger);
+ background-color: var(--light-danger);
+ border-color: transparent;
+}
+.btn.btn-light-danger:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-danger:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-danger:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-danger.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-light-danger.dropdown-toggle, .show .btn.btn-light-danger.btn-dropdown {
+ color: white;
+ background-color: var(--danger);
+}
+
+.btn.btn-light-warning {
+ color: var(--warning);
+ background-color: var(--light-warning);
+ border-color: transparent;
+}
+.btn.btn-light-warning:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-warning:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-warning:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-warning.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-light-warning.dropdown-toggle, .show .btn.btn-light-warning.btn-dropdown {
+ color: white;
+ background-color: var(--warning);
+}
+
+.btn.btn-light-info {
+ color: var(--info);
+ background-color: var(--light-info);
+ border-color: transparent;
+}
+.btn.btn-light-info:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-info:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-info:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-info.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-light-info.dropdown-toggle, .show .btn.btn-light-info.btn-dropdown {
+ color: white;
+ background-color: var(--info);
+}
+
+.btn.btn-light-dark {
+ color: var(--dark);
+ background-color: var(--light-dark);
+ border-color: transparent;
+}
+.btn.btn-light-dark:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-dark:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-dark:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-light-dark.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-light-dark.dropdown-toggle, .show .btn.btn-light-dark.btn-dropdown {
+ color: white;
+ background-color: var(--dark);
+}
+
+.btn.btn-outline-primary {
+ color: var(--primary);
+ background-color: transparent;
+ border-color: var(--primary);
+}
+.btn.btn-outline-primary:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-primary:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-primary:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-primary.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-outline-primary.dropdown-toggle, .show .btn.btn-outline-primary.btn-dropdown {
+ color: white;
+ background-color: var(--primary);
+ border-color: var(--primary);
+}
+.btn.btn-outline-secondary {
+ color: var(--gray-dark);
+ background-color: transparent;
+ border-color: var(--secondary);
+}
+.btn.btn-outline-secondary:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-secondary:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-secondary:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-secondary.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-outline-secondary.dropdown-toggle, .show .btn.btn-outline-secondary.btn-dropdown {
+ color: var(--gray-dark);
+ background-color: var(--secondary);
+ border-color: var(--secondary);
+}
+.btn.btn-outline-success {
+ color: var(--success);
+ background-color: transparent;
+ border-color: var(--success);
+}
+.btn.btn-outline-success:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-success:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-success:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-success.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-outline-success.dropdown-toggle, .show .btn.btn-outline-success.btn-dropdown {
+ color: white;
+ background-color: var(--success);
+ border-color: var(--success);
+}
+.btn.btn-outline-danger {
+ color: var(--danger);
+ background-color: transparent;
+ border-color: var(--danger);
+}
+.btn.btn-outline-danger:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-danger:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-danger:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-danger.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-outline-danger.dropdown-toggle, .show .btn.btn-outline-danger.btn-dropdown {
+ color: white;
+ background-color: var(--danger);
+ border-color: var(--danger);
+}
+.btn.btn-outline-warning {
+ color: var(--warning);
+ background-color: transparent;
+ border-color: var(--warning);
+}
+.btn.btn-outline-warning:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-warning:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-warning:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-warning.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-outline-warning.dropdown-toggle, .show .btn.btn-outline-warning.btn-dropdown {
+ color: white;
+ background-color: var(--warning);
+ border-color: var(--warning);
+}
+.btn.btn-outline-info {
+ color: var(--info);
+ background-color: transparent;
+ border-color: var(--info);
+}
+.btn.btn-outline-info:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-info:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-info:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-info.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-outline-info.dropdown-toggle, .show .btn.btn-outline-info.btn-dropdown {
+ color: white;
+ background-color: var(--info);
+ border-color: var(--info);
+}
+.btn.btn-outline-dark {
+ color: var(--dark);
+ background-color: transparent;
+ border-color: var(--dark);
+}
+.btn.btn-outline-dark:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-dark:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-dark:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.btn.btn-outline-dark.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),
+.show>.btn.btn-outline-dark.dropdown-toggle, .show .btn.btn-outline-dark.btn-dropdown {
+ color: white;
+ background-color: var(--dark);
+ border-color: var(--dark);
+}
+
+.btn.btn-text-success {
+ color: var(--success);
+}
+.btn.btn-text-primary {
+ color: var(--primary);
+}
+.btn.btn-text-secondary {
+ color: var(--gray-dark);
+}
+.btn.btn-text-danger {
+ color: var(--danger);
+}
+.btn.btn-text-warning {
+ color: var(--warning);
+}
+.btn.btn-text-dark {
+ color: var(--dark);
+}
+.btn.btn-text-gray {
+ color: var(--gray);
+}
+
+.btn.btn-hover-primary:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-primary:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-primary.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--primary) !important;
+ border-color: var(--primary) !important;
+}
+.btn.btn-hover-secondary:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-secondary.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-secondary:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--gray-dark) !important;
+ background-color: var(--secondary) !important;
+ border-color: var(--secondary) !important;
+}
+.btn.btn-hover-success.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-success:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-success:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--success) !important;
+ border-color: var(--success) !important;
+}
+.btn.btn-hover-success.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-danger:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-danger:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--danger) !important;
+ border-color: var(--danger) !important;
+}
+.btn.btn-hover-success.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-warning:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-warning:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--warning) !important;
+ border-color: var(--warning) !important;
+}
+.btn.btn-hover-info.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-info:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-info:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--info) !important;
+ border-color: var(--info) !important;
+}
+.btn.btn-hover-dark.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-dark:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-dark:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--dark) !important;
+ border-color: var(--dark) !important;
+}
+
+.btn.btn-hover-light-success.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-light-success:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-light-success:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--success) !important;
+ background-color: var(--light-success);
+ border-color: transparent;
+}
+.btn.btn-hover-light-primary.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-light-primary:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-light-primary:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--primary) !important;
+ background-color: var(--light-primary) !important;
+ border-color: transparent !important;
+}
+.btn.btn-hover-light-danger.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-light-danger:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-light-danger:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--danger) !important;
+ background-color: var(--light-danger) !important;
+ border-color: transparent !important;
+}
+.btn.btn-hover-light-warning.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-light-warning:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-light-warning:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--warning) !important;
+ background-color: var(--light-warning) !important;
+ border-color: transparent !important;
+}
+.btn.btn-hover-light-dark.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-light-dark:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-light-dark:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--dark) !important;
+ background-color: var(--light-dark) !important;
+ border-color: transparent !important;
+}
+
+.btn.btn-active-primary.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--primary) !important;
+ border-color: var(--primary) !important;
+}
+.btn.btn-active-secondary.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--gray-dark) !important;
+ background-color: var(--secondary) !important;
+ border-color: var(--secondary) !important;
+}
+.btn.btn-active-success.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--success) !important;
+ border-color: var(--success) !important;
+}
+.btn.btn-active-danger.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--danger) !important;
+ border-color: var(--danger) !important;
+}
+.btn.btn-active-warning.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--warning) !important;
+ border-color: var(--warning) !important;
+}
+.btn.btn-active-info.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--info) !important;
+ border-color: var(--info) !important;
+}
+.btn.btn-active-dark.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: white !important;
+ background-color: var(--dark) !important;
+ border-color: var(--dark) !important;
+}
+
+.btn.btn-active-light-success.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--success) !important;
+ background-color: var(--light-success) !important;
+ border-color: transparent !important;
+}
+.btn.btn-active-light-primary.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--primary) !important;
+ background-color: var(--light-primary) !important;
+ border-color: transparent !important;
+}
+.btn.btn-active-light-info.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--info) !important;
+ background-color: var(--light-info) !important;
+ border-color: transparent !important;
+}
+.btn.btn-active-light-danger.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--danger) !important;
+ background-color: var(--light-danger) !important;
+ border-color: transparent !important;
+}
+.btn.btn-active-light-warning.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--warning) !important;
+ background-color: var(--light-warning) !important;
+ border-color: transparent !important;
+}
+.btn.btn-active-light-dark.active:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ color: var(--dark) !important;
+ background-color: var(--light-dark) !important;
+ border-color: transparent !important;
+}
+
+.btn.btn-hover-bg-success:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-bg-success:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ background-color: var(--success) !important;
+ border-color: var(--success) !important;
+}
+.btn.btn-hover-bg-primary:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-bg-primary:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ background-color: var(--primary) !important;
+ border-color: var(--primary) !important;
+}
+.btn.btn-hover-bg-danger:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-bg-danger:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ background-color: var(--danger) !important;
+ border-color: var(--danger) !important;
+}
+.btn.btn-hover-bg-warning:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-bg-warning:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ background-color: var(--warning) !important;
+ border-color: var(--warning) !important;
+}
+.btn.btn-hover-bg-dark:hover:not(.btn-text):not(:disabled):not(.disabled):not([disabled]),
+.btn.btn-hover-bg-dark:focus:not(.btn-text):not(:disabled):not(.disabled):not([disabled]) {
+ background-color: var(--dark) !important;
+ border-color: var(--dark) !important;
+}
+
+.btn.disabled, .btn:disabled, .btn[disabled] {
+ opacity: 0.5;
+}
+
+.modal-content {
+ border: 0 solid rgba(0, 0, 0, 0.2);
+ border-radius: 0.42rem;
+}
+.modal-content .modal-header {
+ border-bottom: 1px solid var(--light-gray);
+ padding: 1.5rem 1.75rem;
+}
+.modal-content .modal-header .close {
+ color: var(--gray-dark);
+ padding: 0;
+ margin: 0;
+}
+.modal-content .modal-header .close:hover {
+ color: var(--primary);
+}
+.modal-content .modal-body {
+ padding: 1.75rem;
+}
+.modal-content .modal-footer {
+ border-top: 1px solid var(--light-gray);
+ padding: 1.5rem;
+}
+.table {
+ color: var(--gray-dark);
+}
+.table thead th, .table thead td {
+ font-weight: 600;
+ font-size: 1rem;
+ border-bottom: 1px solid var(--light-gray);
+ padding-top: 1rem;
+ padding-bottom: 1rem;
+ vertical-align: bottom;
+}
+.table th, .table td {
+ padding: 0.75rem;
+ vertical-align: top;
+ border-top: 1px solid var(--light-gray);
+}
+.table-sm th, .table-sm td {
+ padding: 0.3rem;
+}
+.table-hover tbody tr:hover {
+ color: var(--gray-dark);
+ background-color: var(--secondary);
+}
+.table-borderless tbody+tbody, .table-borderless td, .table-borderless th, .table-borderless thead th {
+ border: 0;
+}
+.table-striped tbody tr:nth-of-type(odd) {
+ background-color: var(--light-gray);
+}
+.table-dark {
+ color: white;
+ background-color: var(--dark);
+}
+.table-dark th, .table-dark td, .table-dark thead th {
+ border-color: #242a4c;
+}
+.table-dark.table-hover tbody tr:hover {
+ color: white;
+ background-color: rgba(255, 255, 255, 0.075);
+}
+.table-dark.table-striped tbody tr:nth-of-type(odd) {
+ background-color: rgba(255, 255, 255, 0.05);
+}
+
+.nav .nav-link {
+ padding: 0.75rem 1.5rem;
+ color: #7E8299;
+}
+.nav .nav-link .nav-icon {
+ margin-right: 0.5rem;
+}
+.nav .show>.nav-link,
+.nav .nav-link:hover:not(.disabled),
+.nav .nav-link.active {
+ color: var(--primary);
+}
+.nav.nav-bold .nav-item .nav-link {
+ font-weight: 500;
+}
+.nav.nav-bolder .nav-item .nav-link {
+ font-weight: 600;
+}
+.nav.nav-boldest .nav-item .nav-link {
+ font-weight: 700;
+}
+
+.nav-tabs {
+ border-bottom: 1px solid var(--secondary);
+}
+.nav.nav-tabs .nav-item {
+ margin-right: 0.25rem;
+}
+.nav-tabs .nav-link {
+ border: 1px solid transparent;
+ border-top-left-radius: 0.42rem;
+ border-top-right-radius: 0.42rem;
+}
+.nav .show>.nav-link, .nav .nav-link:hover:not(.disabled),
+.nav .nav-link.active, .nav .active .nav-link {
+ color: var(--primary);
+}
+.nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link,
+.nav-tabs .active .nav-link {
+ background-color: white;
+ border-color: var(--secondary) var(--secondary) white;
+}
+
+.nav.nav-pills .nav-item {
+ margin-right: 0.25rem;
+}
+.nav.nav-pills .show > .nav-link, .nav.nav-pills .nav-link.active,
+.nav.nav-pills .active .nav-link {
+ color: white;
+ background-color: var(--primary);
+}
+.nav.nav-pills .nav-link {
+ color: #B5B5C3;
+}
+.nav.nav-pills.nav-light .nav-link.active,
+.nav.nav-pills.nav-light .active .nav-link {
+ color: var(--primary);
+ background-color: rgba(54, 153, 255, 0.1);
+}
+
+.nav.nav-tabs.nav-tabs-line .nav-item {
+ margin: 0 0 -1px 0;
+}
+.nav.nav-tabs.nav-tabs-line .nav-item:first-child .nav-link {
+ margin-left: 0;
+}
+.nav.nav-tabs.nav-tabs-line .nav-link:hover:not(.disabled),
+.nav.nav-tabs.nav-tabs-line .active .nav-link,
+.nav.nav-tabs.nav-tabs-line .nav-link.active,
+.nav.nav-tabs.nav-tabs-line .show>.nav-link {
+ background-color: transparent;
+ border: 0;
+ border-bottom: 1px solid var(--primary);
+}
+.nav.nav-tabs.nav-tabs-line .nav-link {
+ border: 0;
+ border-bottom: 1px solid transparent;
+ padding: 0.85rem 0;
+ margin: 0 1rem;
+}
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-2x {
+ border-bottom-width: 2px;
+}
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-2x .nav-item {
+ margin-bottom: -2px;
+}
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-2x .nav-link:hover:not(.disabled),
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-2x .active .nav-link,
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-2x .nav-link.active,
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-2x .show > .nav-link {
+ border-bottom: 2px solid var(--primary);
+}
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-3x {
+ border-bottom-width: 3px;
+}
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-3x .nav-item {
+ margin-bottom: -3px;
+}
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-3x .nav-link:hover:not(.disabled),
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-3x .active .nav-link,
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-3x .nav-link.active,
+.nav.nav-tabs.nav-tabs-line.nav-tabs-line-3x .show > .nav-link {
+ border-bottom: 3px solid var(--primary);
+}
+.card>.card-header.card-header-tabs-line {
+ padding-top: 0 !important;
+ padding-bottom: 0 !important;
+ align-items: stretch;
+}
+.card>.card-header.card-header-tabs-line .card-toolbar {
+ margin: 0;
+}
+.card>.card-header.card-header-tabs-line .nav {
+ border-bottom-color: transparent;
+}
+.card>.card-header.card-header-tabs-line .nav .nav-item {
+ align-items: stretch;
+}
+.card>.card-header.card-header-tabs-line .nav .nav-link {
+ padding-top: 2rem;
+ padding-bottom: 2rem;
+}
+.card>.card-footer {
+ background-color: transparent;
+ padding: 2rem 2.25rem;
+ background-color: white;
+ border-top: 1px solid var(--light-gray);
+}
+.card-footer:last-child {
+ border-radius: 0 0 calc(0.42rem - 1px) calc(0.42rem - 1px);
+}
+
+.border {
+ border: 1px solid var(--light-gray) !important;
+}
+.border-top {
+ border-top: 1px solid var(--light-gray) !important;
+}
+.border-right {
+ border-right: 1px solid var(--light-gray) !important;
+}
+.border-left {
+ border-left: 1px solid var(--light-gray) !important;
+}
+.border-bottom {
+ border-bottom: 1px solid var(--light-gray) !important;
+}
+.border-primary {
+ border-color: var(--primary) !important;
+}
+.border-secondary {
+ border-color: var(--secondary) !important;
+}
+.border-danger {
+ border-color: var(--danger) !important;
+}
+.border-warning {
+ border-color: var(--warning) !important;
+}
+.border-info {
+ border-color: var(--info) !important;
+}
+.border-dark {
+ border-color: var(--dark) !important;
+}
+.border-white {
+ border-color: white !important;
+}
+.border-light {
+ border-color: var(--light) !important;
+}
+.border-0 {
+ border: 0 !important;
+}
+.border-top-0 {
+ border-top: 0 !important;
+}
+.border-right-0 {
+ border-right: 0 !important;
+}
+.border-left-0 {
+ border-left: 0 !important;
+}
+.border-bottom-0 {
+ border-bottom: 0 !important;
+}
+.rounded {
+ border-radius: 0.42rem !important;
+}
+.rounded-top {
+ border-top-left-radius: 0.42rem !important;
+ border-top-right-radius: 0.42rem !important;
+}
+.rounded-bottom {
+ border-bottom-left-radius: 0.42rem !important;
+ border-bottom-right-radius: 0.42rem !important;
+}
+.rounded-left {
+ border-top-left-radius: 0.42rem !important;
+ border-bottom-left-radius: 0.42rem !important;
+}
+.rounded-right {
+ border-top-right-radius: 0.42rem !important;
+ border-bottom-right-radius: 0.42rem !important;
+}
+.rounded-circle {
+ border-radius: 50% !important;
+}
+.rounded-pill {
+ border-radius: 50rem !important;
+}
+.rounded-lg {
+ border-radius: 0.85rem !important;
+}
+.rounded-sm {
+ border-radius: 0.28rem !important;
+}
+.rounded-0 {
+ border-radius: 0 !important;
+}
+
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+ margin-bottom: 0.5rem;
+ font-weight: 500;
+ line-height: 1.2;
+}
+h1, h2, h3, h4, h5, h6 {
+ margin-top: 0;
+ margin-bottom: 0.5rem;
+}
+h1, .h1 {
+ font-size: 2rem;
+}
+h2, .h2 {
+ font-size: 1.75rem;
+}
+h3, .h3 {
+ font-size: 1.5rem;
+}
+h4, .h4 {
+ font-size: 1.35rem;
+}
+h5, .h5 {
+ font-size: 1.25rem;
+}
+h6, .h6 {
+ font-size: 1.175rem;
+}
+.display-1 {
+ font-size: 5.5rem !important;
+}
+.display-2 {
+ font-size: 4.5rem !important;
+}
+.display-3 {
+ font-size: 3.5rem !important;
+}
+.display-4 {
+ font-size: 2.5rem !important;
+}
+.font-size-xs {
+ font-size: 0.8rem;
+}
+.font-size-sm {
+ font-size: 0.925rem;
+}
+.font-size-lg {
+ font-size: 1.08rem;
+}
+.font-size-h6 {
+ font-size: 1.175rem !important;
+}
+.font-size-h5 {
+ font-size: 1.25rem !important;
+}
+.font-size-h4 {
+ font-size: 1.35rem !important;
+}
+.font-size-h3 {
+ font-size: 1.5rem !important;
+}
+.font-size-h2 {
+ font-size: 1.75rem !important;
+}
+.font-size-h1 {
+ font-size: 2rem !important;
+}
+
+.separator.separator-solid {
+ border-bottom: 1px solid var(--light-gray);
+}
+.separator.separator-dashed {
+ border-bottom: 1px dashed var(--light-gray);
+}
+.separator {
+ height: 0;
+}
+.separator.separator-border-2 {
+ border-bottom-width: 2px;
+}
+.separator.separator-border-3 {
+ border-bottom-width: 3px;
+}
+.separator.separator-border-4 {
+ border-bottom-width: 4px;
+}
+.separator.separator-primary {
+ border-bottom-color: var(--primary);
+}
+.separator.separator-secondary {
+ border-bottom-color: var(--secondary);
+}
+.separator.separator-success {
+ border-bottom-color: var(--success);
+}
+.separator.separator-danger {
+ border-bottom-color: var(--danger);
+}
+.separator.separator-warning {
+ border-bottom-color: var(--warning);
+}
+.separator.separator-info {
+ border-bottom-color: var(--info);
+}
+.separator.separator-dark {
+ border-bottom-color: var(--dark);
+}
+
+.dropdown-menu {
+ min-width: 10rem;
+ padding: 0.5rem 0;
+ margin: 0.125rem 0 0;
+ color: var(--gray-dark);
+ border: 0 solid rgba(0, 0, 0, 0.15);
+ border-radius: 0.42rem;
+ box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.2);
+}
+.dropdown-item {
+ padding: 0.75rem 1.25rem;
+ color: var(--dark);
+}
+.dropdown-item:hover, .dropdown-item:focus {
+ color: #101221;
+ background-color: var(--light);
+}
+.dropdown-item.active, .dropdown-item:active {
+ color: #ffffff;
+ text-decoration: none;
+ background-color: var(--primary);
+}
+.dropdown-divider {
+ border-top: 1px solid var(--light-gray);
+}
+
+.progress {
+ font-size: 0.75rem;
+ background-color: var(--light-gray);
+ border-radius: 0.42rem;
+ box-shadow: none;
+}
+.progress-bar {
+ background-color: var(--primary);
+}
+.alert {
+ padding: 0.75rem 1.25rem;
+ border: 1px solid transparent;
+ border-radius: 0.42rem;
+}
+.alert.alert-primary {
+ background-color: var(--primary);
+ border-color: var(--primary);
+ color: white;
+}
+.alert.alert-secondary {
+ background-color: var(--secondary);
+ border-color: var(--secondary);
+ color: var(--gray-dark);
+}
+.alert.alert-success {
+ background-color: var(--success);
+ border-color: var(--success);
+ color: white;
+}
+.alert.alert-danger {
+ background-color: var(--danger);
+ border-color: var(--danger);
+ color: white;
+}
+.alert.alert-info {
+ background-color: var(--info);
+ border-color: var(--info);
+ color: white;
+}
+.alert.alert-warning {
+ background-color: var(--warning);
+ border-color: var(--warning);
+ color: white;
+}
+.alert.alert-dark {
+ background-color: var(--dark);
+ border-color: var(--dark);
+ color: white;
+}
+.alert.alert-light {
+ background-color: var(--light);
+ border-color: var(--light);
+ color: var(--gray);
+}
+.alert.alert-light-primary {
+ background-color: var(--light-primary);
+ color: var(--primary);
+ border-color: transparent;
+}
+.alert.alert-light-success {
+ background-color: var(--light-success);
+ color: var(--success);
+ border-color: transparent;
+}
+.alert.alert-light-danger {
+ background-color: var(--light-danger);
+ color: var(--danger);
+ border-color: transparent;
+}
+.alert.alert-light-warning {
+ background-color: var(--light-warning);
+ color: var(--warning);
+ border-color: transparent;
+}
+.alert.alert-light-dark {
+ background-color: var(--light-dark);
+ color: var(--dark);
+ border-color: transparent;
+}
+.alert.alert-light-info {
+ background-color: var(--light-info);
+ color: var(--info);
+ border-color: transparent;
+}
+
+.alert-link {
+ font-weight: 500;
+}
+.alert-primary .alert-link {
+ color: #13375b;
+}
+.alert-secondary .alert-link {
+ color: #5e5f62;
+}
+.alert-success .alert-link {
+ color: #083937;
+}
+.alert-danger .alert-link {
+ color: #591d23;
+}
+.alert-warning .alert-link {
+ color: #523600;
+}
+.alert-info .alert-link {
+ color: #321e5c;
+}
+.alert-light .alert-link {
+ color: #656667;
+}
+.alert-dark .alert-link {
+ color: var(--gray);
+}
+
+.alert.alert-custom {
+ display: flex;
+ align-items: stretch;
+ padding: 1.5rem 2rem;
+}
+.alert.alert-custom .alert-icon {
+ display: flex;
+ align-items: center;
+ margin: 0 1.25rem 0 0;
+ width: 24px;
+ height: 24px;
+}
+.alert.alert-custom .alert-text {
+ align-self: center;
+ flex-grow: 1;
+}
+.alert.alert-custom .alert-close {
+ padding: 0 0 0 1rem;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ line-height: 0;
+}
+.alert.alert-custom .alert-close .close {
+ text-shadow: none !important;
+ cursor: pointer;
+ line-height: 0;
+ color: inherit;
+}
+
+.alert.alert-custom.alert-outline-primary {
+ border-color: var(--primary);
+ color: var(--primary);
+}
+.alert.alert-custom.alert-outline-secondary {
+ border-color: var(--secondary);
+ color: var(--secondary);
+}
+.alert.alert-custom.alert-outline-success {
+ border-color: var(--success);
+ color: var(--success);
+}
+.alert.alert-custom.alert-outline-warning {
+ border-color: var(--warning);
+ color: var(--warning);
+}
+.alert.alert-custom.alert-outline-danger {
+ border-color: var(--danger);
+ color: var(--danger);
+}
+.alert.alert-custom.alert-outline-info {
+ border-color: var(--info);
+ color: var(--info);
+}
+.alert.alert-custom.alert-outline-dark {
+ border-color: var(--dark);
+ color: var(--dark);
+}
+.alert.alert-custom.alert-outline-2x {
+ border-width: 2px;
+}
+.alert.alert-custom.alert-outline-2x .close .icon {
+ stroke: currentColor;
+ stroke-width: 20px;
+}
+.alert.alert-custom.alert-notice {
+ border: 0;
+ border-left: 4px solid;
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+}
+.alert.alert-custom.alert-white {
+ background-color: white;
+ border-color: white;
+}
+.alert.alert-custom.alert-shadow {
+ box-shadow: 0px 0px 30px 0px rgba(82, 63, 105, 0.05);
+}
+
+.shadow {
+ box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.2) !important;
+}
+
+.popover {
+ font-family: Poppins, Helvetica, "sans-serif";
+ font-size: 0.9rem;
+ background-color: white;
+ border: 1px solid white;
+ border-radius: 0.42rem;
+ box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.2);
+}
+.bs-popover-auto[x-placement^=right]>.arrow::before, .bs-popover-right>.arrow::before {
+ border-right-color: white;
+}
+.bs-popover-auto[x-placement^=left]>.arrow::before, .bs-popover-left>.arrow::before {
+ border-left-color: white;
+}
+.bs-popover-auto[x-placement^=top]>.arrow::before, .bs-popover-top>.arrow::before {
+ border-top-color: white;
+}
+.bs-popover-auto[x-placement^=bottom]>.arrow::before, .bs-popover-bottom>.arrow::before {
+ border-bottom-color: white;
+}
+.popover-header {
+ padding: 1rem 1.25rem;
+ color: var(--dark);
+ background-color: white;
+ border-bottom: 1px solid var(--light-gray);
+ border-top-left-radius: calc(0.42rem - 1px);
+ border-top-right-radius: calc(0.42rem - 1px);
+}
+.popover-body {
+ padding: 1rem 1.25rem;
+ color: var(--gray-dark);
+}
+.tooltip {
+ font-family: Poppins, Helvetica, "sans-serif";
+ font-size: 0.9rem;
+}
+.tooltip-inner {
+ box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.15);
+ padding: 0.75rem 1rem;
+ color: var(--gray-dark);
+ border-radius: 3px;
+ background-color: white;
+}
+.bs-tooltip-top .arrow::before, .bs-tooltip-auto[x-placement^="top"] .arrow::before {
+ border-top-color: white;
+}
+.bs-tooltip-bottom .arrow::before, .bs-tooltip-auto[x-placement^="bottom"] .arrow::before {
+ border-bottom-color: white;
+}
+.bs-tooltip-left .arrow::before, .bs-tooltip-auto[x-placement^="left"] .arrow::before {
+ border-left-color: white;
+}
+.bs-tooltip-right .arrow::before, .bs-tooltip-auto[x-placement^="right"] .arrow::before {
+ border-right-color: white;
+}
+.badge {
+ padding: 0.5em 0.75em;
+ font-size: 85%;
+ font-weight: 500;
+ border-radius: 0.42rem;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+}
+.badge-primary {
+ color: white;
+ background-color: var(--primary);
+}
+.badge-secondary {
+ color: var(--dark);
+ background-color: var(--secondary);
+}
+.badge-success {
+ color: white;
+ background-color: var(--success);
+}
+.badge-danger {
+ color: white;
+ background-color: var(--danger);
+}
+.badge-warning {
+ color: white;
+ background-color: var(--warning);
+}
+.badge-info {
+ color: white;
+ background-color: var(--info);
+}
+.badge-dark {
+ color: white;
+ background-color: var(--dark);
+}
+.badge-light {
+ color: var(dark);
+ background-color: var(--light);
+}
+.badge-pill {
+ padding-right: 0.6em;
+ padding-left: 0.6em;
+ border-radius: 10rem;
+}
+a.badge-primary:hover, a.badge-primary:focus {
+ background-color: #037fff;
+}
+a.badge-secondary:hover, a.badge-secondary:focus {
+ color: var(--dark);
+ background-color: #c4c8dc;
+}
+a.badge-success:hover, a.badge-success:focus {
+ background-color: #159892;
+}
+a.badge-danger:hover, a.badge-danger:focus {
+ background-color: #f41d34;
+}
+a.badge-warning:hover, a.badge-warning:focus {
+ color: white;
+ background-color: #cc8600;
+}
+a.badge-info:hover, a.badge-info:focus {
+ background-color: #671efb;
+}
+a.badge-info:hover, a.badge-info:focus {
+ background-color: #d1dde8;
+}
+a.badge-dark:hover, a.badge-dark:focus {
+ background-color: #070910;
+}
+.badge.badge-outline-success {
+ background-color: transparent;
+ color: var(--success);
+ border: 1px solid var(--success);
+}
+a.badge.badge-outline-success:hover, a.badge.badge-outline-success:focus {
+ background: var(--success);
+ color: white;
+}
+.badge.badge-outline-danger {
+ background-color: transparent;
+ color: var(--danger);
+ border: 1px solid var(--danger);
+}
+a.badge.badge-outline-danger:hover, a.badge.badge-outline-danger:focus {
+ background: var(--danger);
+ color: white;
+}
+.badge.badge-outline-warning {
+ background-color: transparent;
+ color: var(--warning);
+ border: 1px solid var(--warning);
+}
+a.badge.badge-outline-warning:hover, a.badge.badge-outline-warning:focus {
+ background: var(--warning);
+ color: white;
+}
+.badge.badge-outline-info {
+ background-color: transparent;
+ color: var(--info);
+ border: 1px solid var(--info);
+}
+a.badge.badge-outline-info:hover, a.badge.badge-outline-info:focus {
+ background: var(--info);
+ color: white;
+}
+.badge.badge-outline-primary {
+ background-color: transparent;
+ color: var(--primary);
+ border: 1px solid var(--primary);
+}
+a.badge.badge-outline-primary:hover, a.badge.badge-outline-primary:focus {
+ background: var(--primary);
+ color: white;
+}
+.badge.badge-outline-secondary {
+ background-color: transparent;
+ color: var(--secondary);
+ border: 1px solid var(--secondary);
+}
+a.badge.badge-outline-secondary:hover, a.badge.badge-outline-secondary:focus {
+ background: var(--secondary);
+ color: white;
+}
+.badge.badge-outline-dark {
+ background-color: transparent;
+ color: var(--dark);
+ border: 1px solid var(--dark);
+}
+a.badge.badge-outline-dark:hover, a.badge.badge-outline-dark:focus {
+ background: var(--dark);
+ color: white;
+}
+.badge.badge-outline-light {
+ background-color: transparent;
+ color: var(--gray-dark);
+ border: 1px solid var(--light);
+}
+a.badge.badge-outline-light:hover, a.badge.badge-outline-light:focus {
+ background: var(--light);
+}
+.badge.badge-light-success {
+ color: var(--success);
+ background-color: var(--light-success);
+}
+a.badge.badge-light-success:hover, a.badge.badge-light-success:focus {
+ background: var(--success);
+ color: white;
+}
+.badge.badge-light-danger {
+ color: var(--danger);
+ background-color: var(--light-danger);
+}
+a.badge.badge-light-danger:hover, a.badge.badge-light-danger:focus {
+ background: var(--danger);
+ color: white;
+}
+.badge.badge-light-warning {
+ color: var(--warning);
+ background-color: var(--light-warning);
+}
+a.badge.badge-light-warning:hover, a.badge.badge-light-warning:focus {
+ background: var(--warning);
+ color: white;
+}
+.badge.badge-light-info {
+ color: var(--info);
+ background-color: var(--light-info);
+}
+a.badge.badge-light-info:hover, a.badge.badge-light-info:focus {
+ background: var(--info);
+ color: white;
+}
+.badge.badge-light-primary {
+ color: var(--primary);
+ background-color: var(--light-primary);
+}
+a.badge.badge-light-primary:hover, a.badge.badge-light-primary:focus {
+ background: var(--primary);
+ color: white;
+}
+.badge.badge-light-dark {
+ color: var(--dark);
+ background-color: var(--light-dark);
+}
+a.badge.badge-light-dark:hover, a.badge.badge-light-dark:focus {
+ background: var(--dark);
+ color: white;
+}
+.badge.badge-sm {
+ height: 16px;
+ font-size: 0.75rem;
+}
+.badge.badge-lg {
+ height: 24px;
+ font-size: 0.9rem;
+}
+.badge.badge-xl {
+ height: 28px;
+ font-size: 1rem;
+}
+
+.pagination {
+ border-radius: 0.42rem;
+}
+.page-item:first-child .page-link {
+ border-top-left-radius: 0.42rem;
+ border-bottom-left-radius: 0.42rem;
+}
+.page-link {
+ padding: 0.5rem 0.75rem;
+ color: var(--primary);
+ border: 1px solid var(--secondary);
+}
+.page-link:hover {
+ color: #0073e9;
+ background-color: var(--light-gray);
+ border-color: var(--secondary);
+}
+.page-link:focus {
+ box-shadow: none;
+}
+.page-item:first-child .page-link {
+ border-top-left-radius: 0.42rem;
+ border-bottom-left-radius: 0.42rem;
+}
+.page-item:last-child .page-link {
+ border-top-right-radius: 0.42rem;
+ border-bottom-right-radius: 0.42rem;
+}
+.page-item.active .page-link {
+ color: white;
+ background-color: var(--primary);
+ border-color: var(--primary);
+}
+
+.breadcrumb {
+ padding: 0.75rem 1rem;
+ background-color: var(--light-gray);
+ border-radius: 0.42rem;
+}
+.breadcrumb.breadcrumb-transparent {
+ background-color: transparent;
+ border-radius: 0;
+}
+.breadcrumb-item + .breadcrumb-item:before {
+ color: #7E8299;
+}
+.breadcrumb.breadcrumb-dot .breadcrumb-item + .breadcrumb-item:before {
+ content: "\2022";
+}
+
+.p-5 {
+ padding: 2rem !important;
+}
+.pt-5, .py-5 {
+ padding-top: 2rem !important;
+}
+.pr-5, .px-5 {
+ padding-right: 2rem !important;
+}
+.pb-5, .py-5 {
+ padding-bottom: 2rem !important;
+}
+.pl-5, .px-5 {
+ padding-left: 2rem !important;
+}
+
+.m-5 {
+ margin: 2rem !important;
+}
+.mt-5, .my-5 {
+ margin-top: 2rem !important;
+}
+.mr-5, .mx-5 {
+ margin-right: 2rem !important;
+}
+.mb-5, .my-5 {
+ margin-bottom: 2rem !important;
+}
+.ml-5, .mx-5 {
+ margin-left: 2rem !important;
+}
+.m-n5 {
+ margin: -2rem !important;
+}
+.mt-n5, .my-n5 {
+ margin-top: -2rem !important;
+}
+.mr-n5, .mx-n5 {
+ margin-right: -2rem !important;
+}
+.mb-n5, .my-n5 {
+ margin-bottom: -2rem !important;
+}
+.ml-n5, .mx-n5 {
+ margin-left: -2rem !important;
+}
+
+@media(min-width: 576px) {
+ .p-sm-0 {
+ padding: 0 !important;
+ }
+ .pt-sm-0, .py-sm-0 {
+ padding-top: 0 !important;
+ }
+ .pr-sm-0, .px-sm-0 {
+ padding-right: 0 !important;
+ }
+ .pb-sm-0, .py-sm-0 {
+ padding-bottom: 0 !important;
+ }
+ .pl-sm-0, .px-sm-0 {
+ padding-left: 0 !important;
+ }
+ .p-sm-5 {
+ padding: 2rem !important;
+ }
+ .pt-sm-5, .py-sm-5 {
+ padding-top: 2rem !important;
+ }
+ .pr-sm-5, .px-sm-5 {
+ padding-right: 2rem !important;
+ }
+ .pb-sm-5, .py-sm-5 {
+ padding-bottom: 2rem !important;
+ }
+ .pl-sm-5, .px-sm-5 {
+ padding-left: 2rem !important;
+ }
+ .m-sm-5 {
+ margin: 2rem !important;
+ }
+ .mt-sm-5, .my-sm-5 {
+ margin-top: 2rem !important;
+ }
+ .mr-sm-5, .mx-sm-5 {
+ margin-right: 2rem !important;
+ }
+ .mb-sm-5, .my-sm-5 {
+ margin-bottom: 2rem !important;
+ }
+ .ml-sm-5, .mx-sm-5 {
+ margin-left: 2rem !important;
+ }
+ .m-sm-n5 {
+ margin: -2rem !important;
+ }
+ .mt-sm-n5, .my-sm-n5 {
+ margin-top: -2rem !important;
+ }
+ .mr-sm-n5, .mx-sm-n5 {
+ margin-right: -2rem !important;
+ }
+ .mb-sm-n5, .my-sm-n5 {
+ margin-bottom: -2rem !important;
+ }
+ .ml-sm-n5, .mx-sm-n5 {
+ margin-left: -2rem !important;
+ }
+ .m-sm-0 {
+ margin: 0 !important;
+ }
+ .mt-sm-0, .my-sm-0 {
+ margin-top: 0 !important;
+ }
+ .mr-sm-0, .mx-sm-0 {
+ margin-right: 0 !important;
+ }
+ .mb-sm-0, .my-sm-0 {
+ margin-bottom: 0 !important;
+ }
+ .ml-sm-0, .mx-sm-0 {
+ margin-left: 0 !important;
+ }
+}
+
+@media (min-width: 768px) {
+ .p-md-0 {
+ padding: 0 !important;
+ }
+ .pt-md-0, .py-md-0 {
+ padding-top: 0 !important;
+ }
+ .pr-md-0, .px-md-0 {
+ padding-right: 0 !important;
+ }
+ .pb-md-0, .py-md-0 {
+ padding-bottom: 0 !important;
+ }
+ .pl-md-0, .px-md-0 {
+ padding-left: 0 !important;
+ }
+ .p-md-5 {
+ padding: 2rem !important;
+ }
+ .pt-md-5, .py-md-5 {
+ padding-top: 2rem !important;
+ }
+ .pr-md-5, .px-md-5 {
+ padding-right: 2rem !important;
+ }
+ .pb-md-5, .py-md-5 {
+ padding-bottom: 2rem !important;
+ }
+ .pl-md-5, .px-md-5 {
+ padding-left: 2rem !important;
+ }
+ .m-md-5 {
+ margin: 2rem !important;
+ }
+ .mt-md-5, .my-md-5 {
+ margin-top: 2rem !important;
+ }
+ .mr-md-5, .mx-md-5 {
+ margin-right: 2rem !important;
+ }
+ .mb-md-5, .my-md-5 {
+ margin-bottom: 2rem !important;
+ }
+ .ml-md-5, .mx-md-5 {
+ margin-left: 2rem !important;
+ }
+ .m-md-n5 {
+ margin: -2rem !important;
+ }
+ .mt-md-n5, .my-md-n5 {
+ margin-top: -2rem !important;
+ }
+ .mr-md-n5, .mx-md-n5 {
+ margin-right: -2rem !important;
+ }
+ .mb-md-n5, .my-md-n5 {
+ margin-bottom: -2rem !important;
+ }
+ .ml-md-n5, .mx-md-n5 {
+ margin-left: -2rem !important;
+ }
+ .m-md-0 {
+ margin: 0 !important;
+ }
+ .mt-md-0, .my-md-0 {
+ margin-top: 0 !important;
+ }
+ .mr-md-0, .mx-md-0 {
+ margin-right: 0 !important;
+ }
+ .mb-md-0, .my-md-0 {
+ margin-bottom: 0 !important;
+ }
+ .ml-md-0, .mx-md-0 {
+ margin-left: 0 !important;
+ }
+}
+
+@media (min-width: 992px) {
+ .p-lg-0 {
+ padding: 0 !important;
+ }
+ .pt-lg-0, .py-lg-0 {
+ padding-top: 0 !important;
+ }
+ .pr-lg-0, .px-lg-0 {
+ padding-right: 0 !important;
+ }
+ .pb-lg-0, .py-lg-0 {
+ padding-bottom: 0 !important;
+ }
+ .pl-lg-0, .px-lg-0 {
+ padding-left: 0 !important;
+ }
+ .p-lg-5 {
+ padding: 2rem !important;
+ }
+ .pt-lg-5, .py-lg-5 {
+ padding-top: 2rem !important;
+ }
+ .pr-lg-5, .px-lg-5 {
+ padding-right: 2rem !important;
+ }
+ .pb-lg-5, .py-lg-5 {
+ padding-bottom: 2rem !important;
+ }
+ .pl-lg-5, .px-lg-5 {
+ padding-left: 2rem !important;
+ }
+ .m-lg-5 {
+ margin: 2rem !important;
+ }
+ .mt-lg-5, .my-lg-5 {
+ margin-top: 2rem !important;
+ }
+ .mr-lg-5, .mx-lg-5 {
+ margin-right: 2rem !important;
+ }
+ .mb-lg-5, .my-lg-5 {
+ margin-bottom: 2rem !important;
+ }
+ .ml-lg-5, .mx-lg-5 {
+ margin-left: 2rem !important;
+ }
+ .m-lg-n5 {
+ margin: -2rem !important;
+ }
+ .mt-lg-n5, .my-lg-n5 {
+ margin-top: -2rem !important;
+ }
+ .mr-lg-n5, .mx-lg-n5 {
+ margin-right: -2rem !important;
+ }
+ .mb-lg-n5, .my-lg-n5 {
+ margin-bottom: -2rem !important;
+ }
+ .ml-lg-n5, .mx-lg-n5 {
+ margin-left: -2rem !important;
+ }
+ .m-lg-0 {
+ margin: 0 !important;
+ }
+ .mt-lg-0, .my-lg-0 {
+ margin-top: 0 !important;
+ }
+ .mr-lg-0, .mx-lg-0 {
+ margin-right: 0 !important;
+ }
+ .mb-lg-0, .my-lg-0 {
+ margin-bottom: 0 !important;
+ }
+ .ml-lg-0, .mx-lg-0 {
+ margin-left: 0 !important;
+ }
+}
+
+@media (min-width: 1200px) {
+ .p-xl-0 {
+ padding: 0 !important;
+ }
+ .pt-xl-0, .py-xl-0 {
+ padding-top: 0 !important;
+ }
+ .pr-xl-0, .px-xl-0 {
+ padding-right: 0 !important;
+ }
+ .pb-xl-0, .py-xl-0 {
+ padding-bottom: 0 !important;
+ }
+ .pl-xl-0, .px-xl-0 {
+ padding-left: 0 !important;
+ }
+ .p-xl-5 {
+ padding: 2rem !important;
+ }
+ .pt-xl-5, .py-xl-5 {
+ padding-top: 2rem !important;
+ }
+ .pr-xl-5, .px-xl-5 {
+ padding-right: 2rem !important;
+ }
+ .pb-xl-5, .py-xl-5 {
+ padding-bottom: 2rem !important;
+ }
+ .pl-xl-5, .px-xl-5 {
+ padding-left: 2rem !important;
+ }
+ .m-xl-5 {
+ margin: 2rem !important;
+ }
+ .mt-xl-5, .my-xl-5 {
+ margin-top: 2rem !important;
+ }
+ .mr-xl-5, .mx-xl-5 {
+ margin-right: 2rem !important;
+ }
+ .mb-xl-5, .my-xl-5 {
+ margin-bottom: 2rem !important;
+ }
+ .ml-xl-5, .mx-xl-5 {
+ margin-left: 2rem !important;
+ }
+ .m-xl-n5 {
+ margin: -2rem !important;
+ }
+ .mt-xl-n5, .my-xl-n5 {
+ margin-top: -2rem !important;
+ }
+ .mr-xl-n5, .mx-xl-n5 {
+ margin-right: -2rem !important;
+ }
+ .mb-xl-n5, .my-xl-n5 {
+ margin-bottom: -2rem !important;
+ }
+ .ml-xl-n5, .mx-xl-n5 {
+ margin-left: -2rem !important;
+ }
+ .m-xl-0 {
+ margin: 0 !important;
+ }
+ .mt-xl-0, .my-xl-0 {
+ margin-top: 0 !important;
+ }
+ .mr-xl-0, .mx-xl-0 {
+ margin-right: 0 !important;
+ }
+ .mb-xl-0, .my-xl-0 {
+ margin-bottom: 0 !important;
+ }
+ .ml-xl-0, .mx-xl-0 {
+ margin-left: 0 !important;
+ }
+}
+
+.opacity-25 {
+ opacity: 0.25 !important;
+}
+.opacity-50 {
+ opacity: 0.5 !important;
+}
+.opacity-75 {
+ opacity: 0.75 !important;
+}
+
+.bg-black {
+ background-color: black;
+}
+
+.form-text {
+ margin-top: 0.3rem;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java
index d4f0733693..8fc46686bf 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java
@@ -19,7 +19,7 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReference
private static final long serialVersionUID = 1L;
public CodeMirrorResourceReference() {
- super(CodeMirrorResourceReference.class, "codemirror-int.js");
+ super(CodeMirrorResourceReference.class, "codemirror-integration.js");
}
@Override
@@ -57,7 +57,7 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReference
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "lib/codemirror.css")));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "theme/eclipse.css")));
+ dependencies.add(CssHeaderItem.forReference(new CodeThemeCssResourceReference()));
dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "addon/dialog/dialog.css")));
dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "addon/fold/foldgutter.css")));
dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "addon/scroll/simplescrollbars.css")));
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/scroll/simplescrollbars.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/scroll/simplescrollbars.css
index 5eea7aa1b3..a86097e4b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/scroll/simplescrollbars.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/scroll/simplescrollbars.css
@@ -3,19 +3,20 @@
background: #ccc;
-moz-box-sizing: border-box;
box-sizing: border-box;
- border: 1px solid #bbb;
+ border: 1px solid var(--secondary);
border-radius: 2px;
}
.CodeMirror-simplescroll-horizontal, .CodeMirror-simplescroll-vertical {
position: absolute;
z-index: 6;
- background: #eee;
+ background: var(--light);
}
.CodeMirror-simplescroll-horizontal {
- bottom: 0; left: 0;
- height: 8px;
+ bottom: 0;
+ left: 0;
+ height: 6px;
}
.CodeMirror-simplescroll-horizontal div {
bottom: 0;
@@ -23,8 +24,9 @@
}
.CodeMirror-simplescroll-vertical {
- right: 0; top: 0;
- width: 8px;
+ right: 0;
+ top: 0;
+ width: 6px;
}
.CodeMirror-simplescroll-vertical div {
right: 0;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css
index 41565df0ba..1892c161ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css
@@ -11,7 +11,7 @@
}
.CodeMirror-gutters {
background: white;
- border-right-color: #E0E0E0;
+ border-right-color: var(--secondary);
}
.CodeMirror-selected {
background-color: #3399FF !important;
@@ -19,15 +19,9 @@
.CodeMirror-selectedtext {
color: white !important;
}
-.CodeMirror-simplescroll-horizontal {
- height: 12px;
-}
-.CodeMirror-simplescroll-vertical {
- width: 12px;
-}
.CodeMirror-simplescroll-horizontal div, .CodeMirror-simplescroll-vertical div {
- background: none repeat scroll 0 0 #bbb;
- border: 1px solid #aaa;
+ background: none repeat scroll 0 0 var(--light-dark);
+ border: 1px solid var(--light-dark);
}
.CodeMirror-search-match {
background: gold;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-int.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-int.js
rename to server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow.svg
index ca6cdfbaa3..475acbd24a 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow.svg
@@ -7,16 +7,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- class="icon"
- width="200px"
- height="200.00px"
- viewBox="0 0 1024 1024"
+ inkscape:version="1.0 (4035a4f, 2020-05-01)"
+ sodipodi:docname="arrow2.svg"
+ id="svg74"
version="1.1"
- id="svg12"
- sodipodi:docname="arrow.svg"
- inkscape:version="1.0 (4035a4f, 2020-05-01)">
+ viewBox="100 100 924 924"
+ height="200.00px"
+ width="200px"
+ class="icon">
+
<metadata
- id="metadata18">
+ id="metadata80">
<rdf:RDF>
<cc:Work
rdf:about="">
@@ -27,30 +28,28 @@
</rdf:RDF>
</metadata>
<defs
- id="defs16" />
+ id="defs78" />
<sodipodi:namedview
- inkscape:document-rotation="0"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="971"
- id="namedview14"
- showgrid="false"
- inkscape:zoom="4.135"
- inkscape:cx="100"
- inkscape:cy="101.37884"
- inkscape:window-x="0"
- inkscape:window-y="23"
+ inkscape:current-layer="svg74"
inkscape:window-maximized="1"
- inkscape:current-layer="svg12" />
+ inkscape:window-y="23"
+ inkscape:window-x="0"
+ inkscape:cy="112.36476"
+ inkscape:cx="100"
+ inkscape:zoom="3.235"
+ showgrid="false"
+ id="namedview76"
+ inkscape:window-height="791"
+ inkscape:window-width="1440"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#ffffff" />
<path
- style="stroke-width:0.838545"
- d="M 410.68781,820.33877 716.54798,505.18984 410.68781,190.04092 Z"
- id="path10" />
+ id="path72"
+ d="m 439.69706,384.14179 166.4,166.4 -166.4,166.4 a 41.258667,41.258667 0 0 0 0,59.73333 41.258667,41.258667 0 0 0 59.73333,0 L 695.69706,580.40845 a 41.258667,41.258667 0 0 0 0,-59.73333 L 499.43039,324.40845 a 42.24,42.24 0 1 0 -59.73333,59.73334 z" />
</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow2.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow2.svg
index 6e539234d4..0dc8f9bc23 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow2.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow2.svg
@@ -8,15 +8,15 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:version="1.0 (4035a4f, 2020-05-01)"
- sodipodi:docname="arrow2.svg"
- id="svg74"
+ sodipodi:docname="arrow3.svg"
+ id="svg12"
version="1.1"
- viewBox="100 100 924 924"
+ viewBox="0 0 1024 1024"
height="200.00px"
width="200px"
class="icon">
<metadata
- id="metadata80">
+ id="metadata18">
<rdf:RDF>
<cc:Work
rdf:about="">
@@ -27,19 +27,19 @@
</rdf:RDF>
</metadata>
<defs
- id="defs78" />
+ id="defs16" />
<sodipodi:namedview
- inkscape:current-layer="svg74"
+ inkscape:current-layer="svg12"
inkscape:window-maximized="1"
inkscape:window-y="23"
inkscape:window-x="0"
- inkscape:cy="112.36476"
+ inkscape:cy="100"
inkscape:cx="100"
- inkscape:zoom="3.235"
+ inkscape:zoom="3.52"
showgrid="false"
- id="namedview76"
- inkscape:window-height="791"
- inkscape:window-width="1440"
+ id="namedview14"
+ inkscape:window-height="971"
+ inkscape:window-width="1920"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
@@ -49,6 +49,6 @@
bordercolor="#666666"
pagecolor="#ffffff" />
<path
- id="path72"
- d="m 439.69706,384.14179 166.4,166.4 -166.4,166.4 a 41.258667,41.258667 0 0 0 0,59.73333 41.258667,41.258667 0 0 0 59.73333,0 L 695.69706,580.40845 a 41.258667,41.258667 0 0 0 0,-59.73333 L 499.43039,324.40845 a 42.24,42.24 0 1 0 -59.73333,59.73334 z" />
+ id="path10"
+ d="m 569.7,825.3 276.2,-268 c 12,-11.6 18,-27.4 18,-44.8 v -0.8 c 0,-17.4 -6,-33.2 -18,-44.8 l -276.2,-268 c -24,-25 -62.6,-25 -86.4,0 -23.8,25 -23.8,65.4 0,90.4 l 166,158.8 h -428 c -33.8,0 -61.2,28.6 -61.2,64 0,36 27.4,64 61.2,64 h 428 l -166,158.8 c -23.8,25 -23.8,65.4 0,90.4 23.8,25 62.4,25 86.4,0 z" />
</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow3.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow3.svg
deleted file mode 100644
index 0dc8f9bc23..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow3.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0 (4035a4f, 2020-05-01)"
- sodipodi:docname="arrow3.svg"
- id="svg12"
- version="1.1"
- viewBox="0 0 1024 1024"
- height="200.00px"
- width="200px"
- class="icon">
- <metadata
- id="metadata18">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs16" />
- <sodipodi:namedview
- inkscape:current-layer="svg12"
- inkscape:window-maximized="1"
- inkscape:window-y="23"
- inkscape:window-x="0"
- inkscape:cy="100"
- inkscape:cx="100"
- inkscape:zoom="3.52"
- showgrid="false"
- id="namedview14"
- inkscape:window-height="971"
- inkscape:window-width="1920"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
- <path
- id="path10"
- d="m 569.7,825.3 276.2,-268 c 12,-11.6 18,-27.4 18,-44.8 v -0.8 c 0,-17.4 -6,-33.2 -18,-44.8 l -276.2,-268 c -24,-25 -62.6,-25 -86.4,0 -23.8,25 -23.8,65.4 0,90.4 l 166,158.8 h -428 c -33.8,0 -61.2,28.6 -61.2,64 0,36 27.4,64 61.2,64 h 428 l -166,158.8 c -23.8,25 -23.8,65.4 0,90.4 23.8,25 62.4,25 86.4,0 z" />
-</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/bell-off.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/bell-off.svg
index 9bae06ac92..efcf07a48a 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/bell-off.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/bell-off.svg
@@ -1,54 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0 (4035a4f, 2020-05-01)"
- sodipodi:docname="bell-off.svg"
- id="svg3221"
- version="1.1"
- viewBox="50 50 974 974"
- height="200.00px"
- width="200px"
- class="icon">
- <metadata
- id="metadata3227">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs3225" />
- <sodipodi:namedview
- inkscape:current-layer="svg3221"
- inkscape:window-maximized="1"
- inkscape:window-y="23"
- inkscape:window-x="0"
- inkscape:cy="124.66747"
- inkscape:cx="100"
- inkscape:zoom="4.135"
- showgrid="false"
- id="namedview3223"
- inkscape:window-height="971"
- inkscape:window-width="1920"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
- <path
- id="path3219"
- d="m 985.22129,928.95526 -842.016,-842.016 -54.016009,54.016 200.000009,202.016 q -34.016,66.016 -34.016,140 v 256 l -86.016,84 v 44 h 644 l 118.016,116 54.016,-54.016 z m -645.984,-148 v -298.016 q 0,-40 16,-76 l 374.016,374.016 z m 128,128 h 172 q 0,36 -24.992,60.992 -24.992,24.992 -60.992,24.992 -36,0 -60.992,-24.992 -24.992,-24.992 -24.992,-60.992 z m -72,-677.984 q 30.016,-20 72,-34.016 v -14.016 q 0,-34.016 24.992,-59.008 24.992,-24.992 60.992,-24.992 36,0 60.992,24.992 24.992,24.992 24.992,59.008 v 14.016 q 94.016,28 152.992,107.008 58.976,79.008 59.008,179.008 v 204 l -84,-86.016 v -118.016 q 0,-58.016 -28.992,-107.008 -28.992,-48.992 -78.016,-78.016 -49.024,-29.024 -107.008,-28.992 -50.016,0 -96,24 l -62.016,-62.016 z" />
-</svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M746.666667 554.666667a192 192 0 0 0-192 192 192 192 0 0 0 192 192 192 192 0 0 0 192-192 192 192 0 0 0-192-192m0 64a128 128 0 0 1 128 128 128 128 0 0 1-17.92 64L682.666667 636.586667a128 128 0 0 1 64-17.92M636.586667 682.666667L810.666667 856.746667a128 128 0 0 1-64 17.92 128 128 0 0 1-128-128 128 128 0 0 1 17.92-64M512 85.333333c-46.933333 0-85.333333 38.4-85.333333 85.333334v12.373333C303.786667 219.306667 213.333333 333.653333 213.333333 469.333333v256l-85.333333 85.333334v42.666666h362.666667a277.333333 277.333333 0 0 1-20.053334-85.333333H298.666667v-298.666667a213.333333 213.333333 0 0 1 213.333333-213.333333 213.333333 213.333333 0 0 1 213.333333 213.333333 277.333333 277.333333 0 0 1 21.333334 0 277.333333 277.333333 0 0 1 64 7.68V469.333333c0-135.68-90.453333-250.026667-213.333334-286.293333V170.666667a85.333333 85.333333 0 0 0-85.333333-85.333334m-85.333333 810.666667a85.333333 85.333333 0 0 0 85.333333 85.333333c21.333333 0 41.386667-8.106667 56.746667-21.333333a277.333333 277.333333 0 0 1-55.466667-64z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/clock.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/clock.svg
index dc5ad6778c..33348cac4e 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/clock.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/clock.svg
@@ -1 +1,55 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M512 16C238 16 16 238 16 512s222 496 496 496 496-222 496-496S786 16 512 16z m0 896c-221 0-400-179-400-400S291 112 512 112s400 179 400 400-179 400-400 400z m123.6-208.8l-169.8-123.4c-6.2-4.6-9.8-11.8-9.8-19.4V232c0-13.2 10.8-24 24-24h64c13.2 0 24 10.8 24 24v283.4l133.6 97.2c10.8 7.8 13 22.8 5.2 33.6L669.2 698c-7.8 10.6-22.8 13-33.6 5.2z" /></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:version="1.0 (4035a4f, 2020-05-01)"
+ sodipodi:docname="clock.svg"
+ id="svg12"
+ version="1.1"
+ viewBox="0 0 1024 1024"
+ height="200.00px"
+ width="200px"
+ class="icon">
+ <metadata
+ id="metadata18">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs16" />
+ <sodipodi:namedview
+ inkscape:current-layer="svg12"
+ inkscape:window-maximized="1"
+ inkscape:window-y="23"
+ inkscape:window-x="47"
+ inkscape:cy="100"
+ inkscape:cx="100"
+ inkscape:zoom="3.49"
+ showgrid="false"
+ id="namedview14"
+ inkscape:window-height="1035"
+ inkscape:window-width="1873"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#ffffff" />
+ <path
+ style="stroke-width:0.948238"
+ id="path10"
+ d="m 512,43.873926 c -260.22275,0 -471.060172,210.180794 -471.060172,469.593124 0,259.41232 210.837422,469.59312 471.060172,469.59312 260.22275,0 471.06017,-210.1808 471.06017,-469.59312 C 983.06017,254.05472 772.22275,43.873926 512,43.873926 Z m 0,848.297254 c -209.88769,0 -379.88723,-169.4701 -379.88723,-378.70413 0,-209.23403 169.99954,-378.70413 379.88723,-378.70413 209.88769,0 379.88723,169.4701 379.88723,378.70413 0,209.23403 -169.99954,378.70413 -379.88723,378.70413 z M 629.38515,694.48763 468.12303,577.6574 c -5.88826,-4.3551 -9.30724,-11.17178 -9.30724,-18.36715 v -310.9161 c 0,-12.49723 10.25696,-22.72224 22.79323,-22.72224 h 60.78196 c 12.53627,0 22.79323,10.22501 22.79323,22.72224 v 268.31189 l 126.88234,92.0251 c 10.25696,7.38473 12.34634,21.58613 4.93854,31.81115 l -35.7094,49.04218 c -7.4078,10.03566 -21.65358,12.30789 -31.91054,4.92316 z" />
+</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/detail.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/detail.svg
deleted file mode 100644
index 0fba61fe74..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/detail.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0 (4035a4f, 2020-05-01)"
- sodipodi:docname="detail-2.svg"
- id="svg54"
- version="1.1"
- viewBox="0 0 1024 1024"
- height="200.00px"
- width="200px"
- class="icon">
- <metadata
- id="metadata60">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs58" />
- <sodipodi:namedview
- inkscape:current-layer="svg54"
- inkscape:window-maximized="1"
- inkscape:window-y="23"
- inkscape:window-x="0"
- inkscape:cy="114.51028"
- inkscape:cx="100"
- inkscape:zoom="4.135"
- showgrid="false"
- id="namedview56"
- inkscape:window-height="971"
- inkscape:window-width="1920"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
- <path
- style="stroke-width:0.859248"
- id="path50"
- fill="#434343"
- d="M 611.71588,890.81738 H 223.9577 c -23.07028,0 -44.80958,-9.16108 -60.33765,-24.42954 -15.52807,-15.26846 -24.84491,-37.51681 -24.84491,-59.3289 V 229.91092 c 0,-22.68458 9.31684,-44.06044 24.84491,-59.3289 16.41539,-16.14094 37.71104,-24.42954 60.33765,-24.42954 h 586.96117 c 23.07028,0 44.80958,9.16108 60.33766,24.42954 16.41539,16.14096 24.84492,37.08056 24.84492,59.3289 l -1.33098,381.71165 c 0,17.01344 14.1971,30.97318 31.4998,30.97318 17.30272,0 31.49981,-13.5235 31.49981,-30.53693 l 1.33098,-381.71166 c 0,-38.82553 -15.97176,-75.90608 -43.92226,-103.38933 C 887.22826,99.474598 849.51723,83.769886 810.03156,83.769886 H 223.9577 c -39.48567,0 -77.1967,15.704712 -105.14723,43.187944 -27.950535,27.48325 -43.922267,64.12756 -43.922267,103.38933 v 576.71178 c 0,38.82553 15.971732,75.90609 43.922267,103.38933 27.95053,27.48322 65.66156,43.18795 105.14723,43.18795 h 388.20184 c 17.30271,0 31.4998,-13.95973 31.4998,-30.97317 -0.44365,-17.44968 -14.19709,-31.84567 -31.94346,-31.84567 z" />
- <path
- style="stroke-width:0.916344"
- id="path52"
- fill="#434343"
- d="M 948.4642,897.45959 820.09766,770.59427 c 60.40778,-84.4214 45.77777,-201.02556 -33.97938,-267.72313 -79.75715,-66.69758 -198.68497,-62.03341 -273.25083,11.194 -74.56586,73.22741 -78.81328,190.29797 -11.32646,270.05522 67.48682,79.29082 185.47077,94.21615 270.89115,33.58199 l 128.36654,126.86532 a 33.6116,33.218519 0 0 0 47.66552,0 c 13.2142,-13.52608 13.2142,-34.51483 0,-47.10808 z M 656.33593,788.31811 c -64.18327,0 -119.39976,-44.776 -132.14202,-106.80941 -12.27033,-62.03341 21.23711,-124.53323 80.70102,-148.7869 59.46391,-24.25366 127.8946,-3.73133 163.28979,48.97375 35.39518,52.70507 28.78808,123.13398 -16.98969,167.90998 -25.48453,24.72008 -59.46391,38.71258 -94.8591,38.71258 z M 756.85826,323.76716 c 18.4055,0 33.50744,-14.92533 33.50744,-33.11558 0,-18.19025 -15.10194,-33.11558 -33.50744,-33.11558 H 218.85144 c -18.40549,0 -33.50744,14.92533 -33.50744,33.11558 0,18.19025 15.10195,33.11558 33.50744,33.11558 z M 420.83997,522.46064 c 11.79839,0 23.12485,-6.52984 29.26002,-16.791 6.13516,-10.26117 6.13516,-22.85442 0,-33.11558 -6.13517,-10.26117 -17.46163,-16.791 -29.26002,-16.791 H 218.85144 c -18.40549,0 -33.50744,14.92533 -33.50744,33.11558 0,18.19025 15.10195,33.11558 33.50744,33.11558 0,0.46642 201.98853,0.46642 201.98853,0.46642 z M 219.32338,654.92295 c -18.4055,0 -33.50744,14.92534 -33.50744,33.11558 0,18.19025 15.10194,33.11558 33.50744,33.11558 h 134.02977 c 11.79839,0 23.12485,-6.52983 29.26002,-16.791 6.13516,-10.26116 6.13516,-22.85441 0,-33.11557 -6.13517,-10.26117 -17.46163,-16.791 -29.26002,-16.791 H 219.32338 Z" />
-</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/double-arrow.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/double-arrow.svg
new file mode 100644
index 0000000000..0cb9f6a9c9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/double-arrow.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M734.7712 510.7712L537.2928 313.344a34.9184 34.9184 0 0 1 49.3568-49.3568l222.208 222.208a34.816 34.816 0 0 1 0 49.3056l-222.208 222.208a34.9184 34.9184 0 1 1-49.3568-49.408l197.4784-197.4784z m-320 0L217.2928 313.344a34.9184 34.9184 0 1 1 49.3568-49.3568l222.208 222.208a34.816 34.816 0 0 1 0 49.3056l-222.208 222.208a34.9184 34.9184 0 0 1-49.3568-49.408l197.4784-197.4784z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/download2.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/download2.svg
new file mode 100644
index 0000000000..85703a8a83
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/download2.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M819.2 768a51.2 51.2 0 0 1 0 102.4H204.8a51.2 51.2 0 0 1 0-102.4h614.4zM506.0096 153.9584L512 153.6a51.2 51.2 0 0 1 50.8416 45.2096L563.2 204.8v337.152l168.6016-168.5504a51.2 51.2 0 0 1 67.584-4.2496l4.8128 4.2496a51.2 51.2 0 0 1 4.2496 67.584l-4.2496 4.8128-256 256a51.2 51.2 0 0 1-67.584 4.2496l-4.8128-4.2496-256-256a51.2 51.2 0 0 1 67.584-76.6464l4.8128 4.2496L460.8 541.952V204.8a51.2 51.2 0 0 1 45.2096-50.8416L512 153.6l-5.9904 0.3584z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/edit-all.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/edit-all.svg
deleted file mode 100644
index 88c0732dfe..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/edit-all.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path stroke='currentColor' stroke-width="10" d='m 939.23982,149.91597 a 64.270168,65.07941 0 0 1 0,91.83679 L 573.32534,612.16118 a 61.023069,61.791426 0 0 1 -28.60807,16.43993 l -149.53451,37.81181 a 33.702649,34.127008 0 0 1 -40.75668,-41.26987 l 37.39761,-151.53071 c 2.74325,-10.88437 8.28571,-20.80501 16.06755,-28.79821 L 773.8617,74.235645 c 24.18529,-24.546501 66.45356,-24.489811 90.63885,0 z m -84.14466,80.89575 36.61385,-37.18824 -72.44391,-69.10435 -34.59839,34.97734 z M 528.53777,562.50129 807.67632,279.05438 737.1359,207.62576 455.47804,492.83004 432.86031,586.76435 Z M 836.84423,452.35382 c 18.47488,0 33.59068,15.30613 33.59068,34.01363 V 849.633 c 0,62.35832 -50.38603,113.37876 -111.96894,113.37876 H 174.21208 c -61.58292,0 -111.968943,-51.02044 -111.968943,-113.37876 V 258.02262 c 0,-62.35832 50.386023,-113.37876 111.968943,-113.37876 H 516.1652 c 18.47487,0 33.59068,15.30614 33.59068,34.01363 0,18.70749 -15.11581,34.01363 -33.59068,34.01363 H 174.21208 a 45.347419,45.918399 0 0 0 -44.78758,45.3515 V 849.633 c 0,24.5465 20.5463,45.35151 44.78758,45.35151 H 758.46597 A 45.347419,45.918399 0 0 0 803.25355,849.633 V 486.36745 c 0,-18.7075 15.11581,-34.01363 33.59068,-34.01363 z' />
-</svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/edit-selected.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/edit-selected.svg
index 40590eca27..88c0732dfe 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/edit-selected.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/edit-selected.svg
@@ -1,58 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0 (4035a4f, 2020-05-01)"
- sodipodi:docname="edit-selected.svg"
- id="svg24"
- version="1.1"
- viewBox="0 0 1024 1024"
- height="200.00px"
- width="200px"
- class="icon">
- <metadata
- id="metadata30">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs28" />
- <sodipodi:namedview
- inkscape:current-layer="svg24"
- inkscape:window-maximized="1"
- inkscape:window-y="23"
- inkscape:window-x="0"
- inkscape:cy="100"
- inkscape:cx="100"
- inkscape:zoom="4.135"
- showgrid="false"
- id="namedview26"
- inkscape:window-height="971"
- inkscape:window-width="1920"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
- <path
- stroke='currentColor' stroke-width="10"
- d="M 155.86126,648.31311 617.99114,192.28024 a 27.685452,27.31698 0 0 1 0.86857,-0.85699 l 73.93646,-72.95239 c 37.99963,-37.493901 99.61333,-37.493901 137.5587,0 l 74.42501,73.40767 a 97.360504,96.06471 0 0 1 -0.0272,135.72791 l -73.28503,72.30965 a 27.522596,27.156292 0 0 1 -3.03997,2.99949 l -461.0442,454.80094 a 27.604023,27.236636 0 0 1 -1.62854,1.60687 l -8.00709,7.90048 a 27.142601,26.781353 0 0 1 -12.97415,7.12384 L 118.07876,926.83916 A 27.142601,26.781353 0 0 1 85.453361,894.648 L 138.65285,671.02372 a 27.142601,26.781353 0 0 1 7.21993,-12.85507 l 7.68137,-7.55234 a 27.57688,27.209853 0 0 1 2.30711,-2.3032 z M 212.29073,668.39912 347.37944,801.71671 772.43253,382.42787 637.58812,248.70857 212.26358,668.39912 Z m -28.58115,47.56367 -35.39396,148.85077 150.85856,-34.92289 z m 492.25817,-505.12306 134.84444,133.71928 55.53374,-54.79462 a 43.075304,42.502005 0 0 0 0,-59.99024 l -74.37071,-73.43448 a 42.993878,42.42166 0 0 0 -60.79943,0 z" />
- <path
- style="stroke-width:0.399138"
- d="M 758.99787,570.59388 A 173.5454,178.49749 0 0 0 585.45245,749.09144 173.5454,178.49749 0 0 0 758.99787,927.6407 173.5454,178.49749 0 0 0 932.59357,749.11727 173.5454,178.49749 0 0 0 758.99787,570.59388 Z M 864.00658,706.70791 747.53734,826.50075 a 15.566191,16.010371 0 0 1 -22.0901,0 l -57.12625,-58.75652 a 15.566191,16.010371 0 0 1 0,-22.6943 15.566191,16.010371 0 0 1 22.06469,0 l 46.06877,47.40938 105.38674,-108.41976 a 15.566191,16.010371 0 0 1 22.06468,0 c 6.17108,6.21758 6.17108,16.39895 0.1016,22.66836 z"
- id="path74" />
-</svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path stroke='currentColor' stroke-width="10" d='m 939.23982,149.91597 a 64.270168,65.07941 0 0 1 0,91.83679 L 573.32534,612.16118 a 61.023069,61.791426 0 0 1 -28.60807,16.43993 l -149.53451,37.81181 a 33.702649,34.127008 0 0 1 -40.75668,-41.26987 l 37.39761,-151.53071 c 2.74325,-10.88437 8.28571,-20.80501 16.06755,-28.79821 L 773.8617,74.235645 c 24.18529,-24.546501 66.45356,-24.489811 90.63885,0 z m -84.14466,80.89575 36.61385,-37.18824 -72.44391,-69.10435 -34.59839,34.97734 z M 528.53777,562.50129 807.67632,279.05438 737.1359,207.62576 455.47804,492.83004 432.86031,586.76435 Z M 836.84423,452.35382 c 18.47488,0 33.59068,15.30613 33.59068,34.01363 V 849.633 c 0,62.35832 -50.38603,113.37876 -111.96894,113.37876 H 174.21208 c -61.58292,0 -111.968943,-51.02044 -111.968943,-113.37876 V 258.02262 c 0,-62.35832 50.386023,-113.37876 111.968943,-113.37876 H 516.1652 c 18.47487,0 33.59068,15.30614 33.59068,34.01363 0,18.70749 -15.11581,34.01363 -33.59068,34.01363 H 174.21208 a 45.347419,45.918399 0 0 0 -44.78758,45.3515 V 849.633 c 0,24.5465 20.5463,45.35151 44.78758,45.35151 H 758.46597 A 45.347419,45.918399 0 0 0 803.25355,849.633 V 486.36745 c 0,-18.7075 15.11581,-34.01363 33.59068,-34.01363 z' />
+</svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/empty.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/empty.svg
new file mode 100644
index 0000000000..18b48d682d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/empty.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="640px" height="640px" viewBox="0 0 640 640" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+ <linearGradient x1="50%" y1="0%" x2="50%" y2="65.785099%" id="linearGradient-1">
+ <stop stop-color="#FCFDFE" offset="0%"></stop>
+ <stop stop-color="#E6F1FD" stop-opacity="0" offset="100%"></stop>
+ </linearGradient>
+ <linearGradient x1="23.7450116%" y1="50.0060613%" x2="76.2549884%" y2="50%" id="linearGradient-2">
+ <stop stop-color="#E0EDFF" offset="0%"></stop>
+ <stop stop-color="#E1EBFB" offset="100%"></stop>
+ </linearGradient>
+ <linearGradient x1="0%" y1="50.0060613%" x2="166.185627%" y2="50.0060613%" id="linearGradient-3">
+ <stop stop-color="#DFEDF8" offset="0%"></stop>
+ <stop stop-color="#D1E1FC" offset="100%"></stop>
+ </linearGradient>
+ <linearGradient x1="53.6993828%" y1="79.9792893%" x2="61.1432642%" y2="9.62868645%" id="linearGradient-4">
+ <stop stop-color="#D4E4FF" offset="0%"></stop>
+ <stop stop-color="#D0E2FF" offset="100%"></stop>
+ </linearGradient>
+ <linearGradient x1="121.886927%" y1="50%" x2="29.1475836%" y2="50%" id="linearGradient-5">
+ <stop stop-color="#FFFFFF" offset="0%"></stop>
+ <stop stop-color="#E0ECFB" offset="100%"></stop>
+ </linearGradient>
+ <linearGradient x1="50%" y1="14.707682%" x2="50%" y2="99.2637573%" id="linearGradient-6">
+ <stop stop-color="#CCDCFA" offset="0%"></stop>
+ <stop stop-color="#C0DBFF" offset="100%"></stop>
+ </linearGradient>
+ <linearGradient x1="15.24962%" y1="51.3855989%" x2="93.283446%" y2="50%" id="linearGradient-7">
+ <stop stop-color="#DBE8FE" offset="0%"></stop>
+ <stop stop-color="#F6FAFF" offset="100%"></stop>
+ </linearGradient>
+ <linearGradient x1="15.24962%" y1="50.8695695%" x2="93.283446%" y2="50%" id="linearGradient-8">
+ <stop stop-color="#D5E5FF" offset="0%"></stop>
+ <stop stop-color="#F6FAFF" offset="100%"></stop>
+ </linearGradient>
+ <linearGradient x1="50%" y1="14.707682%" x2="50%" y2="100%" id="linearGradient-9">
+ <stop stop-color="#CCDDFC" offset="0%"></stop>
+ <stop stop-color="#BDD8FB" offset="100%"></stop>
+ </linearGradient>
+ <linearGradient x1="15.24962%" y1="53.9920444%" x2="169.103538%" y2="-20.9583738%" id="linearGradient-10">
+ <stop stop-color="#A7C5F6" offset="0%"></stop>
+ <stop stop-color="#E9F1FB" offset="100%"></stop>
+ </linearGradient>
+ <linearGradient x1="15.24962%" y1="54.2083665%" x2="93.283446%" y2="50%" id="linearGradient-11">
+ <stop stop-color="#D4E4FD" offset="0%"></stop>
+ <stop stop-color="#F6FAFF" offset="100%"></stop>
+ </linearGradient>
+ </defs>
+ <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g transform="translate(-122.000000, -7705.000000)">
+ <g transform="translate(122.000000, 7705.000000)">
+ <rect fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="640" height="640"></rect>
+ <circle fill="url(#linearGradient-1)" cx="320" cy="320" r="240"></circle>
+ <path d="M320,547 C419.411255,547 500,530.454413 500,518.551724 C500,506.649036 419.411255,497 320,497 C220.588745,497 140,506.649036 140,518.551724 C140,530.454413 220.588745,547 320,547 Z" id="椭圆形" fill="#F7FAFE"></path>
+ <g transform="translate(320.000000, 416.000000) rotate(-360.000000) translate(-320.000000, -416.000000) translate(140.000000, 297.000000)">
+ <polygon fill="url(#linearGradient-2)" fill-rule="nonzero" points="320 207 170 182.656179 170 -2.27373675e-13 319.142857 26.8642099"></polygon>
+ <polygon fill="url(#linearGradient-3)" fill-rule="nonzero" points="40 211 170 182.78652 170 -2.27373675e-13 40 28.2390593"></polygon>
+ <polygon fill="url(#linearGradient-4)" fill-rule="nonzero" points="189 238 40 211.07101 40 28 189 54.9033675"></polygon>
+ <path d="M62.4635625,162.768605 L163.536437,180.172887 C166.115477,180.616985 168,182.85375 168,185.470746 C168,187.578262 166.29152,189.286742 164.184004,189.286742 C163.966967,189.286742 163.750326,189.268226 163.536437,189.231395 L62.4635625,171.827113 C59.884523,171.383015 58,169.14625 58,166.529254 C58,164.421738 59.7084796,162.713258 61.8159961,162.713258 C62.0330327,162.713258 62.2496738,162.731774 62.4635625,162.768605 Z" id="矩形备份-7" fill="#C2D9FF" fill-rule="nonzero"></path>
+ <path d="M62.6431253,100.756368 L163.803907,117.235524 C166.223148,117.62962 168,119.719344 168,122.170475 L168,164.295672 C168,166.504811 166.209139,168.295672 164,168.295672 C163.784573,168.295672 163.569499,168.278268 163.356875,168.243632 L62.1960934,151.764476 C59.7768522,151.37038 58,149.280656 58,146.829525 L58,104.704328 C58,102.495189 59.790861,100.704328 62,100.704328 C62.2154267,100.704328 62.4305013,100.721732 62.6431253,100.756368 Z" id="矩形" fill="#C2D9FF"></path>
+ <path d="M62.4635625,185.768605 L163.536437,203.172887 C166.115477,203.616985 168,205.85375 168,208.470746 C168,210.578262 166.29152,212.286742 164.184004,212.286742 C163.966967,212.286742 163.750326,212.268226 163.536437,212.231395 L62.4635625,194.827113 C59.884523,194.383015 58,192.14625 58,189.529254 C58,187.421738 59.7084796,185.713258 61.8159961,185.713258 C62.0330327,185.713258 62.2496738,185.731774 62.4635625,185.768605 Z" id="矩形备份-8" fill="#C2D9FF" fill-rule="nonzero"></path>
+ <polygon fill="url(#linearGradient-5)" fill-rule="nonzero" points="149.578216 99 0 72.1964799 40.4217845 28 190 54.7780172"></polygon>
+ <polygon fill="url(#linearGradient-6)" points="189 55.444605 320 26 320 207.179726 189.405669 238"></polygon>
+ <polygon fill="url(#linearGradient-7)" fill-rule="nonzero" points="360 70.6182587 319.767981 26 190 54.3817413 230.232019 99"></polygon>
+ </g>
+ <g id="paperplane_4_" transform="translate(190.000000, 117.000000)">
+ <path d="M48.4266365,122.822086 C46.5066901,122.822086 44.5378367,122.780374 42.5745726,122.696949 C42.1889065,122.680264 41.8898756,122.356299 41.9052463,121.972545 C41.9206171,121.588792 42.2797337,121.280121 42.6332609,121.306539 C44.5783595,121.388573 46.5276502,121.430286 48.4266365,121.430286 L49.5822375,121.424724 C49.5836348,121.424724 49.5864295,121.424724 49.5878269,121.424724 C49.9706983,121.424724 50.2837027,121.732004 50.2865162,122.114367 C50.289292,122.49812 49.9804797,122.812353 49.5934162,122.815134 L48.4266365,122.822086 Z M56.5661476,122.56347 C56.2000443,122.56347 55.8940266,122.281216 55.8688744,121.912758 C55.8437223,121.529005 56.1357666,121.198087 56.5214327,121.17445 C58.8452107,121.025676 61.1689887,120.805991 63.4298863,120.523738 C63.8169498,120.479245 64.162093,120.746204 64.2109999,121.127176 C64.2599069,121.508148 63.9874254,121.855751 63.604554,121.904415 C61.3157095,122.19084 58.9625873,122.413305 56.6108625,122.56347 C56.5954917,122.56347 56.5815183,122.56347 56.5661476,122.56347 Z M35.6339801,122.236723 C35.61302,122.236723 35.5920599,122.236723 35.5710998,122.233942 C33.2766659,122.028162 30.9319278,121.766765 28.5997657,121.455313 C28.2168943,121.403868 27.9486049,121.053484 28.0003065,120.673902 C28.0520081,120.294321 28.4027407,120.024581 28.7856121,120.077417 C31.0982114,120.386088 33.4233867,120.646094 35.6968604,120.849094 C36.0811292,120.883854 36.3647894,121.221724 36.3298559,121.604087 C36.2963197,121.964203 35.9916994,122.236723 35.6339801,122.236723 Z M70.4123991,120.815724 C70.084024,120.815724 69.7919797,120.584916 69.727702,120.252608 C69.653643,119.875807 69.9023696,119.51152 70.281049,119.437828 C72.5754829,118.994287 74.8475593,118.471493 77.0343979,117.88335 C77.4046932,117.784631 77.7917567,118.001535 77.8909679,118.374164 C77.9915764,118.745404 77.7707966,119.126376 77.3977065,119.226486 C75.1787291,119.822972 72.8731165,120.354108 70.5465438,120.803211 C70.5018289,120.811553 70.457114,120.815724 70.4123991,120.815724 Z M21.7877286,120.397211 C21.7472057,120.397211 21.7066828,120.39443 21.6661599,120.387478 C19.4038649,119.992602 17.088471,119.54489 14.7842557,119.054075 C14.4069737,118.973431 14.166631,118.604972 14.2476768,118.229562 C14.3287226,117.854151 14.7004153,117.610829 15.0763,117.695644 C17.3651445,118.182288 19.6637703,118.627219 21.9078999,119.017924 C22.2879767,119.084664 22.5422927,119.44478 22.4752203,119.822972 C22.4151347,120.159451 22.1216931,120.397211 21.7877286,120.397211 Z M8.12592609,117.496816 C8.06863511,117.496816 8.01274148,117.489864 7.9554505,117.47596 C6.76910803,117.181193 5.57298417,116.872522 4.36707893,116.549947 C3.99398889,116.449837 3.77320902,116.068865 3.87242023,115.699016 C3.97302878,115.327776 4.35729754,115.109482 4.72759289,115.20681 C5.92651143,115.526605 7.11425124,115.833885 8.29360701,116.127262 C8.66809438,116.220419 8.89586096,116.59722 8.80084177,116.96985 C8.72398802,117.286864 8.43893047,117.496816 8.12592609,117.496816 Z M83.8799712,117.177021 C83.592119,117.177021 83.3238295,117.000439 83.2218236,116.715405 C83.0918709,116.353899 83.2805119,115.956241 83.6452179,115.826933 C85.8404406,115.046913 87.997935,114.175126 90.0590129,113.2366 C90.4083481,113.073922 90.8233584,113.231038 90.9854499,113.580031 C91.1461442,113.929024 90.9924367,114.340585 90.6403067,114.501873 C88.5442953,115.458475 86.3476753,116.344166 84.1147245,117.1367 C84.0364734,117.164508 83.956825,117.177021 83.8799712,117.177021 Z M96.555251,111.379012 C96.313511,111.379012 96.0787577,111.255265 95.9502024,111.031409 C95.755972,110.699101 95.8705539,110.273636 96.2045184,110.081759 C98.2236761,108.919377 100.172967,107.659665 101.997894,106.337385 C102.310898,106.112139 102.746869,106.180269 102.974635,106.49033 C103.202402,106.800392 103.132535,107.23559 102.820928,107.462227 C100.956875,108.812315 98.9670615,110.098444 96.9045862,111.285854 C96.7941963,111.349813 96.674025,111.379012 96.555251,111.379012 Z M107.80664,103.189497 C107.619397,103.189497 107.430756,103.114415 107.293816,102.967032 C107.155479,102.818258 107.093996,102.624991 107.109367,102.438676 C106.324062,102.35108 105.556921,102.241238 104.809344,102.109149 C104.429267,102.042409 104.174951,101.682293 104.243421,101.304101 C104.309096,100.92591 104.673802,100.671465 105.052481,100.740985 C106.071143,100.918958 107.127533,101.056608 108.216061,101.152546 C109.603621,99.8163625 110.894764,98.427343 112.069928,97.0105152 C112.31586,96.7157483 112.754625,96.6726456 113.053656,96.9173577 C113.351289,97.1620699 113.393209,97.600049 113.147277,97.8962063 C112.194291,99.044685 111.167245,100.175088 110.075922,101.276293 C110.671189,101.302711 111.273443,101.316615 111.882684,101.319396 C112.26835,101.320786 112.579957,101.633628 112.57856,102.017382 C112.577162,102.399744 112.264158,102.709806 111.879889,102.709806 C111.878492,102.709806 111.878492,102.709806 111.877095,102.709806 C110.806731,102.705634 109.754534,102.663922 108.728885,102.58884 C108.580767,102.729271 108.431252,102.866922 108.281736,103.004573 C108.146194,103.128319 107.975719,103.189497 107.80664,103.189497 Z M118.848429,102.28295 C118.499093,102.28295 118.198665,102.024334 118.155347,101.671169 C118.109235,101.290197 118.381717,100.943985 118.765985,100.896711 C120.945837,100.633924 123.238874,100.239047 125.580817,99.7259859 C125.959497,99.6411709 126.331189,99.878931 126.413632,100.254342 C126.496076,100.629752 126.258528,101.000992 125.882643,101.083026 C123.495985,101.60582 121.15963,102.009039 118.933666,102.277388 C118.90572,102.281559 118.876375,102.28295 118.848429,102.28295 Z M98.2446362,100.173698 C98.1524117,100.173698 98.0573925,100.155623 97.9679627,100.116691 C95.6679395,99.1295 93.620835,97.8614461 91.8797482,96.3486801 C91.5891012,96.0956254 91.5597571,95.6562559 91.8140731,95.3670506 C92.0669918,95.0764549 92.5099489,95.0486467 92.8005958,95.3017013 C94.4312927,96.7199195 96.3568286,97.9101104 98.5227071,98.8402947 C98.8762343,98.9918494 99.0397232,99.4020203 98.887413,99.7537941 C98.7714337,100.016582 98.514323,100.173698 98.2446362,100.173698 Z M132.487874,99.3408423 C132.186048,99.3408423 131.907977,99.1447945 131.818547,98.8430755 C131.709555,98.4746169 131.920553,98.0880829 132.289451,97.9782405 C134.543362,97.3136246 136.772121,96.6448374 138.97433,95.9718789 C139.343228,95.8564749 139.734484,96.0650364 139.847668,96.4321047 C139.960853,96.7991729 139.754047,97.1884877 139.385149,97.3011109 C137.178747,97.9754597 134.944399,98.6470277 132.687693,99.3116437 C132.620621,99.3324998 132.553549,99.3408423 132.487874,99.3408423 Z M145.850645,95.2572082 C145.554409,95.2572082 145.279133,95.0681125 145.184114,94.7719551 C145.068134,94.4062773 145.270749,94.0155721 145.638249,93.8987777 C147.89216,93.1854974 150.108343,92.4736075 152.284003,91.763108 C152.652901,91.6449231 153.044156,91.8409709 153.165725,92.2066487 C153.285896,92.5709362 153.086077,92.9644222 152.719973,93.0839974 C150.540121,93.7958873 148.319747,94.5091677 146.061644,95.2238384 C145.991777,95.2474754 145.920512,95.2572082 145.850645,95.2572082 Z M116.621067,92.4666554 C116.500896,92.4666554 116.379327,92.4360664 116.268937,92.3707171 C115.93637,92.1760597 115.824583,91.7505943 116.02021,91.4196767 C117.227513,89.3702124 118.19587,87.2943303 118.894541,85.2518181 C119.018904,84.8889211 119.417146,84.6914829 119.780455,84.8180102 C120.146558,84.9417567 120.340789,85.3366331 120.216425,85.6995301 C119.487013,87.8310286 118.479531,89.9917257 117.224718,92.1232242 C117.094766,92.3442993 116.860012,92.4666554 116.621067,92.4666554 Z M88.0300738,91.1040536 C87.7771551,91.1040536 87.5354151,90.9677935 87.4096544,90.7300334 C86.2833976,88.5832404 85.6000979,86.2668174 85.3737287,83.8461136 C85.3387952,83.4637509 85.621058,83.1258812 86.0053268,83.0897306 C86.3937876,83.0549703 86.7291494,83.3358331 86.7654803,83.7181959 C86.9736841,85.9567559 87.6080769,88.1007681 88.6490959,90.087664 C88.8265582,90.4283144 88.6952081,90.8482182 88.3528596,91.0248003 C88.248059,91.0790263 88.1376691,91.1040536 88.0300738,91.1040536 Z M159.135166,90.9205195 C158.844519,90.9205195 158.572037,90.7383758 158.472826,90.4477801 C158.34986,90.0834927 158.545488,89.6900067 158.910194,89.5662602 C161.169694,88.8070964 163.374698,88.0534942 165.516822,87.3124057 C165.878733,87.1858783 166.27977,87.3777549 166.405531,87.7406519 C166.532689,88.1035489 166.339856,88.4984254 165.97515,88.6249527 C163.830231,89.3674316 161.621035,90.1224242 159.357343,90.8829785 C159.284681,90.9093962 159.209225,90.9205195 159.135166,90.9205195 Z M172.340038,86.3530228 C172.052185,86.3530228 171.783896,86.1764407 171.68189,85.8914067 C171.551937,85.5299001 171.740578,85.1322428 172.105284,85.0029347 C174.388539,84.1923257 176.580967,83.4011824 178.672787,82.6364569 C179.037493,82.5029776 179.435735,82.6892925 179.56988,83.0494087 C179.702627,83.4095249 179.516781,83.8099629 179.154869,83.9420519 C177.058858,84.7067774 174.862238,85.4993111 172.576188,86.3127009 C172.497937,86.3405091 172.418289,86.3530228 172.340038,86.3530228 Z M185.465261,81.56167 C185.182998,81.56167 184.916106,81.3892592 184.811306,81.1111772 C184.674366,80.7524514 184.857418,80.3506229 185.219329,80.2157532 C187.579438,79.330062 189.762085,78.4999873 191.744911,77.7366522 C192.105425,77.5976112 192.509257,77.7755837 192.648991,78.1343094 C192.788725,78.4930352 192.609865,78.8948637 192.249352,79.0339047 C190.262333,79.7986302 188.075494,80.6300953 185.711193,81.5171769 C185.630147,81.5477659 185.547704,81.56167 185.465261,81.56167 Z M120.913698,79.3787264 C120.90252,79.3787264 120.892738,79.3787264 120.88156,79.3787264 C120.495894,79.360651 120.19826,79.0366855 120.215028,78.6529324 C120.227604,78.3623367 120.234591,78.0759122 120.234591,77.7908782 C120.234591,75.7177769 119.882461,73.8170865 119.186585,72.1402521 C119.039864,71.7856975 119.208943,71.3783074 119.565264,71.2323143 C119.920189,71.0877117 120.331007,71.2545609 120.477728,71.6091154 C121.244868,73.4555799 121.633329,75.5356332 121.633329,77.7908782 C121.633329,78.095378 121.626342,78.404049 121.612369,78.7155008 C121.594204,79.0867403 121.283994,79.3787264 120.913698,79.3787264 Z M86.7570962,77.6017824 C86.6914212,77.6017824 86.6229515,77.5920496 86.5558791,77.5725838 C86.1869811,77.4627414 85.9759826,77.074817 86.0877699,76.7063584 C86.7920297,74.3621272 87.9266706,72.2278479 89.4567589,70.3605273 C89.6998963,70.0629796 90.1400587,70.017096 90.440487,70.2618082 C90.7395179,70.5037395 90.7842329,70.9417187 90.5410955,71.2392664 C89.1269865,72.9647652 88.0789808,74.9377569 87.4264225,77.1054061 C87.3355954,77.407125 87.0589219,77.6017824 86.7570962,77.6017824 Z M198.508042,76.5367284 C198.231368,76.5367284 197.968668,76.3712696 197.859675,76.0987492 C197.715749,75.7428043 197.890417,75.338195 198.249534,75.1963732 C202.402431,73.5473469 204.716427,72.5754504 204.72062,72.57406 C205.075544,72.4238957 205.484965,72.5893545 205.635878,72.943909 C205.785393,73.2970732 205.61911,73.7058537 205.264185,73.8546275 C205.264185,73.8546275 202.93901,74.8306953 198.76655,76.488064 C198.681312,76.5214339 198.594677,76.5367284 198.508042,76.5367284 Z M115.496208,67.2515706 C115.362063,67.2515706 115.226521,67.2126391 115.106349,67.1333858 C113.394607,65.9849071 111.302787,65.2479898 108.88958,64.9420996 C108.506708,64.8934353 108.237021,64.5444424 108.284531,64.1634701 C108.333438,63.7838881 108.688362,63.5266623 109.067042,63.5614225 C111.699632,63.8951209 113.994066,64.7099012 115.887463,65.9793455 C116.207454,66.1934686 116.291295,66.6258861 116.076104,66.94429 C115.941959,67.144509 115.72118,67.2515706 115.496208,67.2515706 Z M95.3744979,67.1319953 C95.1229765,67.1319953 94.8798392,66.9971256 94.7554758,66.7593655 C94.5766162,66.418715 94.7079662,65.9988112 95.0489174,65.8208387 C96.6949851,64.9615654 98.4961576,64.3414425 100.403528,63.9757647 C100.916352,63.878436 101.420792,63.7922306 101.914054,63.7199293 C102.292733,63.6657033 102.650452,63.92571 102.707743,64.3052919 C102.765034,64.6848738 102.500937,65.0380379 102.119463,65.0950447 C101.644367,65.1645652 101.160887,65.2465994 100.667625,65.3411473 C98.8943997,65.6804073 97.22318,66.2560371 95.698681,67.0513516 C95.5952778,67.106968 95.4834905,67.1319953 95.3744979,67.1319953 Z" id="Shape" fill="#D1DDF3" fill-rule="nonzero" transform="translate(104.769737, 93.190184) rotate(-10.000000) translate(-104.769737, -93.190184) "></path>
+ <g id="Group" transform="translate(214.243421, 30.920245) rotate(-10.000000) translate(-214.243421, -30.920245) translate(172.335526, 7.730061)">
+ <polygon id="Path" fill="url(#linearGradient-8)" fill-rule="nonzero" points="0.835269412 17.6715662 21.4283557 28.179387 83.2076145 0.158057212"></polygon>
+ <polygon id="Path" fill="url(#linearGradient-9)" points="24.8600719 45.6914729 21.4283557 28.179387 83.2076145 0.158057212"></polygon>
+ <polygon id="Path" fill="url(#linearGradient-10)" fill-rule="nonzero" points="24.8600719 45.6914729 31.7248988 31.6815195 48.8862689 28.179387"></polygon>
+ <polygon id="Path" fill="url(#linearGradient-11)" fill-rule="nonzero" points="31.7248988 31.6815195 48.8862689 38.6857847 83.2076145 0.158057212"></polygon>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/expand3.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/expand3.svg
new file mode 100644
index 0000000000..3a44d86076
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/expand3.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:version="1.0 (4035a4f, 2020-05-01)"
+ sodipodi:docname="expand.svg"
+ id="svg26"
+ version="1.1"
+ viewBox="0 0 1024 1024"
+ height="200.00px"
+ width="200px"
+ class="icon">
+ <path
+ id="path24"
+ d="M 896,512 469.00224,102.99904 V 256 L 736,512 469.00224,768 V 921.00096 Z M 128,0 V 1024 H 298.99776 V 0 Z" />
+</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/fork.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/fork.svg
new file mode 100644
index 0000000000..95b5f7f5be
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/fork.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M236.544 98.816c76.288 0 137.728 61.44 137.728 136.704 0 58.368-37.376 108.544-89.088 128 4.096 20.992 15.36 46.592 43.008 82.944 46.08 58.88 137.728 99.84 183.808 160.768 46.08-60.928 137.728-101.888 183.808-160.768 28.16-36.352 38.912-61.952 43.008-82.944-53.76-20.48-89.088-71.168-89.088-128 0-75.264 61.952-136.704 137.728-136.704s137.728 61.44 137.728 136.704c0 59.904-39.424 111.616-94.208 130.048-3.584 23.552-19.456 67.584-48.64 105.472-46.08 60.928-108.544 93.696-163.328 145.92-34.304 28.672-54.272 66.56-58.368 87.552 51.712 19.456 89.088 69.632 89.088 128 0 75.264-61.952 136.704-137.728 136.704s-137.728-61.44-137.728-136.704c0-58.368 37.376-108.544 89.088-128-4.096-20.992-26.624-57.856-63.488-87.552-54.784-53.76-112.64-84.992-158.208-146.432-29.184-37.888-45.056-81.92-48.64-105.472-56.32-18.944-94.208-71.168-94.208-130.048-0.512-75.264 61.44-136.192 137.728-136.192m1.024 89.6c-26.112 0-47.616 21.504-47.616 47.616s21.504 47.616 47.616 47.616c26.112 0 47.616-21.504 47.616-47.616s-21.504-47.616-47.616-47.616m548.864 0c-26.112 0-47.616 21.504-47.616 47.616 0 26.112 21.504 47.616 47.616 47.616 26.112 0 47.616-21.504 47.616-47.616 0-26.112-20.992-47.616-47.616-47.616M512 786.432c-26.112 0-47.616 21.504-47.616 47.616 0 26.112 21.504 47.616 47.616 47.616 26.112 0 47.616-21.504 47.616-47.616 0-26.112-21.504-47.616-47.616-47.616z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/github-o.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/github-o.svg
deleted file mode 100644
index c3caf63beb..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/github-o.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d='M512 0c-282.76736 0-512 229.23264-512 512s229.23264 512 512 512 512-229.23264 512-512-229.23264-512-512-512zM816.04608 816.04608c-39.5264 39.50592-85.504 70.53312-136.704 92.18048-13.0048 5.50912-26.2144 10.32192-39.60832 14.49984l0-76.73856c0-40.32512-13.824-70.00064-41.49248-89.00608 17.32608-1.65888 33.25952-3.9936 47.75936-7.00416s29.83936-7.33184 45.99808-13.0048 30.65856-12.41088 43.49952-20.25472 25.16992-18.00192 37.00736-30.49472 21.74976-26.66496 29.75744-42.496 14.336-34.83648 19.00544-56.99584 7.00416-46.592 7.00416-73.25696c0-51.67104-16.83456-95.66208-50.50368-131.9936 15.33952-39.99744 13.66016-83.49696-4.99712-130.49856l-12.4928-1.49504c-8.66304-1.00352-24.24832 2.6624-46.75584 10.99776s-47.75936 21.99552-75.75552 41.00096c-39.66976-10.99776-80.83456-16.50688-123.4944-16.50688-43.008 0-84.00896 5.50912-123.00288 16.50688-17.67424-12.00128-34.4064-21.9136-50.25792-29.75744s-28.50816-13.16864-37.9904-15.99488-18.3296-4.58752-26.50112-5.24288-13.4144-0.83968-15.74912-0.49152-3.9936 0.67584-4.99712 1.00352c-18.65728 47.32928-20.33664 90.8288-4.99712 130.49856-33.66912 36.33152-50.50368 80.34304-50.50368 131.9936 0 26.66496 2.33472 51.07712 7.00416 73.25696s10.99776 41.1648 19.00544 56.99584 17.92 30.0032 29.75744 42.496 24.1664 22.67136 37.00736 30.49472 27.3408 14.58176 43.49952 20.25472 31.49824 9.99424 45.99808 13.0048 30.4128 5.3248 47.75936 7.00416c-27.3408 18.65728-41.00096 48.3328-41.00096 89.00608l0 78.2336c-15.09376-4.48512-29.98272-9.80992-44.60544-15.99488-51.2-21.64736-97.19808-52.67456-136.704-92.18048s-70.53312-85.504-92.18048-136.704c-22.40512-52.96128-33.75104-109.2608-33.75104-167.34208s11.3664-114.3808 33.75104-167.34208c21.64736-51.2 52.67456-97.19808 92.18048-136.704s85.504-70.53312 136.704-92.18048c52.96128-22.40512 109.2608-33.75104 167.34208-33.75104s114.3808 11.3664 167.34208 33.75104c51.2 21.64736 97.19808 52.67456 136.704 92.18048s70.53312 85.504 92.18048 136.704c22.40512 52.96128 33.75104 109.2608 33.75104 167.34208s-11.3664 114.3808-33.75104 167.34208c-21.64736 51.2-52.67456 97.19808-92.18048 136.704z' />
-</svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/github.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/github.svg
new file mode 100644
index 0000000000..6626f8bc1d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/github.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M951.466667 362.666667c0-59.733333-21.333333-119.466667-59.733334-166.4 17.066667-55.466667 12.8-115.2-12.8-166.4-4.266667-8.533333-12.8-17.066667-21.333333-21.333334-12.8-4.266667-68.266667-12.8-183.466667 59.733334-93.866667-25.6-187.733333-25.6-281.6 0C277.333333-8.533333 217.6 4.266667 204.8 8.533333c-8.533333 4.266667-17.066667 8.533333-21.333333 21.333334-21.333333 51.2-25.6 110.933333-12.8 166.4-38.4 46.933333-59.733333 106.666667-59.733334 170.666666 0 230.4 128 298.666667 251.733334 324.266667-12.8 25.6-17.066667 55.466667-17.066667 85.333333v8.533334c-98.133333 21.333333-128-17.066667-166.4-64-21.333333-29.866667-46.933333-59.733333-89.6-72.533334-21.333333-4.266667-38.4 8.533333-42.666667 25.6s8.533333 38.4 25.6 42.666667c17.066667 4.266667 29.866667 21.333333 46.933334 46.933333 38.4 46.933333 89.6 115.2 221.866666 93.866667V938.666667c0 21.333333 17.066667 34.133333 38.4 34.133333s38.4-17.066667 38.4-34.133333v-123.733334-42.666666c-4.266667-29.866667 8.533333-59.733333 29.866667-81.066667 8.533333-8.533333 12.8-25.6 8.533333-38.4-4.266667-12.8-17.066667-21.333333-29.866666-25.6-128-17.066667-243.2-59.733333-243.2-264.533333 0-51.2 17.066667-98.133333 55.466666-136.533334 8.533333-8.533333 12.8-25.6 8.533334-38.4-12.8-34.133333-17.066667-72.533333-4.266667-106.666666 21.333333 4.266667 59.733333 17.066667 119.466667 55.466666 8.533333 4.266667 21.333333 8.533333 29.866666 4.266667 89.6-25.6 187.733333-25.6 281.6 0 8.533333 4.266667 21.333333 0 29.866667-4.266667 59.733333-42.666667 102.4-55.466667 119.466667-55.466666 8.533333 38.4 8.533333 76.8-4.266667 110.933333-4.266667 12.8 0 25.6 8.533333 38.4 34.133333 38.4 55.466667 85.333333 55.466667 136.533333 0 209.066667-115.2 247.466667-243.2 264.533334-12.8 0-25.6 12.8-29.866667 25.6-4.266667 12.8 0 25.6 8.533334 38.4 21.333333 21.333333 34.133333 51.2 29.866666 85.333333V938.666667c0 21.333333 17.066667 34.133333 34.133334 34.133333s34.133333-17.066667 34.133333-34.133333v-162.133334c4.266667-29.866667-4.266667-59.733333-12.8-85.333333 119.466667-25.6 247.466667-98.133333 247.466667-328.533333z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/grabber-white.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/grabber-white.svg
new file mode 100644
index 0000000000..71442828cb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/grabber-white.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:version="1.0 (4035a4f, 2020-05-01)"
+ sodipodi:docname="miscRowGrabber.svg"
+ id="svg22"
+ version="1.1"
+ viewBox="0 0 1024 1024"
+ height="200.00px"
+ width="200px"
+ class="icon">
+ <metadata
+ id="metadata28">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <path
+ id="path20"
+ fill="white"
+ d="M 910.22222,457.40965 V 571.18743 H 796.44444 V 457.40965 Z m -227.55555,0 V 571.18743 H 568.88889 V 457.40965 Z m -227.55556,0 V 571.18743 H 341.33333 V 457.40965 Z m -227.55555,0 V 571.18743 H 113.77778 V 457.40965 Z" />
+</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/grip2.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/grip2.svg
new file mode 100644
index 0000000000..af9418109f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/grip2.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:version="1.0 (4035a4f, 2020-05-01)"
+ sodipodi:docname="miscRowGrabber.svg"
+ id="svg22"
+ version="1.1"
+ viewBox="0 0 1024 1024"
+ height="200.00px"
+ width="200px"
+ fill="#B5B5C3"
+ class="icon">
+ <metadata
+ id="metadata28">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <path
+ id="path20"
+ d="M 910.22222,457.40965 V 571.18743 H 796.44444 V 457.40965 Z m -227.55555,0 V 571.18743 H 568.88889 V 457.40965 Z m -227.55556,0 V 571.18743 H 341.33333 V 457.40965 Z m -227.55555,0 V 571.18743 H 113.77778 V 457.40965 Z" />
+</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/grip3.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/grip3.svg
new file mode 100644
index 0000000000..f8f1571ae0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/grip3.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ class="icon"
+ width="200px"
+ height="200.00px"
+ viewBox="0 0 1024 1024"
+ fill="#B5B5C3"
+ version="1.1"
+ id="svg22"
+ sodipodi:docname="grip4.svg"
+ inkscape:version="1.0 (4035a4f, 2020-05-01)">
+ <path
+ d="M 568.88889,912.52076 H 455.11111 V 798.74298 h 113.77778 z m 0,-227.55555 H 455.11111 V 571.18743 h 113.77778 z m 0,-227.55556 H 455.11111 V 343.63187 h 113.77778 z m 0,-227.55555 H 455.11111 V 116.07632 h 113.77778 z"
+ id="path20" />
+</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/loading.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/loading.svg
new file mode 100644
index 0000000000..cd4c946faa
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/loading.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="188.24px" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M560 928a432 432 0 1 0 0-864 432 432 0 0 0 0 864z m0-96a336 336 0 1 1 0-672 336 336 0 0 1 0 672z" fill="#0A1938" fill-opacity=".08" /><path d="M992 496A432 432 0 0 0 560 64a48 48 0 0 0 0 96c185.6 0 336 150.4 336 336a48 48 0 1 0 96 0z" fill="#3699ff" /></svg>
+
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/members.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/members.svg
index d0f6f10c4d..08d7ad0ebe 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/members.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/members.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d='M608 618.667C678.4 584.533 725.333 512 725.333 428.8c0-117.333-96-213.333-213.333-213.333s-213.333 96-213.333 213.333c0 83.2 49.066 155.733 117.333 189.867-89.6 32-162.133 110.933-181.333 209.066-2.134 10.667 4.266 23.467 17.066 25.6H256c10.667 0 19.2-6.4 21.333-17.066 23.467-110.934 121.6-192 234.667-192s211.2 81.066 234.667 192c2.133 10.666 12.8 19.2 25.6 17.066 10.666-2.133 19.2-12.8 17.066-25.6C770.133 729.6 699.733 652.8 608 618.667zM343.467 428.8c0-93.867 76.8-170.667 170.666-170.667S684.8 334.933 684.8 428.8 608 599.467 514.133 599.467c-96 0-170.666-76.8-170.666-170.667z m-85.334 64c0-10.667-6.4-19.2-17.066-21.333-61.867-14.934-72.534-78.934-72.534-115.2 0-68.267 46.934-119.467 108.8-119.467 12.8 0 21.334-8.533 21.334-21.333s-8.534-21.334-21.334-21.334c-87.466 0-151.466 70.4-151.466 162.134 0 61.866 21.333 106.666 57.6 134.4-59.734 25.6-104.534 76.8-117.334 147.2C64 648.533 70.4 661.333 83.2 663.467h4.267c10.666 0 19.2-6.4 21.333-17.067 14.933-70.4 61.867-117.333 132.267-128 10.666-2.133 19.2-12.8 17.066-25.6z m704 145.067c-14.933-70.4-57.6-121.6-117.333-147.2 36.267-27.734 57.6-74.667 57.6-134.4 0-91.734-66.133-162.134-151.467-162.134-12.8 0-21.333 8.534-21.333 21.334s8.533 21.333 21.333 21.333c64 0 108.8 51.2 108.8 119.467 0 36.266-8.533 100.266-72.533 115.2-10.667 2.133-14.933 10.666-14.933 21.333v2.133c-2.134 10.667 6.4 23.467 17.066 23.467 70.4 10.667 117.334 57.6 132.267 128 2.133 10.667 10.667 17.067 21.333 17.067h4.267c8.533-2.134 17.067-14.934 14.933-25.6z' stroke='black' stroke-width='30'/>
+ <path d='M608 618.667C678.4 584.533 725.333 512 725.333 428.8c0-117.333-96-213.333-213.333-213.333s-213.333 96-213.333 213.333c0 83.2 49.066 155.733 117.333 189.867-89.6 32-162.133 110.933-181.333 209.066-2.134 10.667 4.266 23.467 17.066 25.6H256c10.667 0 19.2-6.4 21.333-17.066 23.467-110.934 121.6-192 234.667-192s211.2 81.066 234.667 192c2.133 10.666 12.8 19.2 25.6 17.066 10.666-2.133 19.2-12.8 17.066-25.6C770.133 729.6 699.733 652.8 608 618.667zM343.467 428.8c0-93.867 76.8-170.667 170.666-170.667S684.8 334.933 684.8 428.8 608 599.467 514.133 599.467c-96 0-170.666-76.8-170.666-170.667z m-85.334 64c0-10.667-6.4-19.2-17.066-21.333-61.867-14.934-72.534-78.934-72.534-115.2 0-68.267 46.934-119.467 108.8-119.467 12.8 0 21.334-8.533 21.334-21.333s-8.534-21.334-21.334-21.334c-87.466 0-151.466 70.4-151.466 162.134 0 61.866 21.333 106.666 57.6 134.4-59.734 25.6-104.534 76.8-117.334 147.2C64 648.533 70.4 661.333 83.2 663.467h4.267c10.666 0 19.2-6.4 21.333-17.067 14.933-70.4 61.867-117.333 132.267-128 10.666-2.133 19.2-12.8 17.066-25.6z m704 145.067c-14.933-70.4-57.6-121.6-117.333-147.2 36.267-27.734 57.6-74.667 57.6-134.4 0-91.734-66.133-162.134-151.467-162.134-12.8 0-21.333 8.534-21.333 21.334s8.533 21.333 21.333 21.333c64 0 108.8 51.2 108.8 119.467 0 36.266-8.533 100.266-72.533 115.2-10.667 2.133-14.933 10.666-14.933 21.333v2.133c-2.134 10.667 6.4 23.467 17.066 23.467 70.4 10.667 117.334 57.6 132.267 128 2.133 10.667 10.667 17.067 21.333 17.067h4.267c8.533-2.134 17.067-14.934 14.933-25.6z' stroke='currentColor' stroke-width='30'/>
</svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/next.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/next.svg
new file mode 100644
index 0000000000..8fecb5e4f3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/next.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="130.78px" viewBox="0 0 1566 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M1067.309176 260.818824V0L1566.117647 512 1067.309176 1024v-251.181176h-320.030117v-512h320.030117z m-502.603294 0H442.368v512h122.337882v-512z m-254.132706 0H188.235294v512h122.337882v-512z m-244.675764 0H0v512h65.897412v-512z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/play.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/play.svg
index b924e8b630..00ec243394 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/play.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/play.svg
@@ -46,8 +46,7 @@
gridtolerance="10"
objecttolerance="10"
borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
+ />
<path
style="stroke-width:0.868552"
id="path84"
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/question-circle.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/question-circle.svg
deleted file mode 100644
index d9083eca9c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/question-circle.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d='M651.404178 284.362899c-14.446648-23.403621-34.321919-43.716438-58.832125-56.968738a164.376096 164.376096 0 0 0-80.572053-21.065803 157.78238 157.78238 0 0 0-63.863903 12.892343 163.755391 163.755391 0 0 0-52.219329 35.105431c-14.770992 14.404674-26.456267 32.337699-35.040563 51.894986a164.007234 164.007234 0 0 0-12.828746 63.958026c0 15.232705 6.614067 28.880577 15.992051 39.035714 10.063557 9.36272 23.720333 15.988235 38.921239 15.988234a56.728342 56.728342 0 0 0 38.526939-15.988234c10.134785-10.155136 16.74758-23.803009 16.74758-39.035714a54.839517 54.839517 0 0 1 3.917563-21.065803c3.126419-6.232486 6.614067-12.495499 11.643302-17.171135a60.366079 60.366079 0 0 1 17.143152-11.70181c6.614067-2.304748 14.052348-4.646382 21.060715-4.646382a53.950434 53.950434 0 0 1 38.166981 16.349464c18.651668 18.364211 21.383787 49.94638 7.758809 71.803327-5.469324 7.77916-12.830018 13.684759-19.442812 19.914701-19.873999 16.780651-39.747998 33.960689-55.310134 62.045035-15.59775 27.258859-25.732536 65.537771-25.732536 122.469622a55.764215 55.764215 0 0 0 16.352009 39.035714c9.380527 9.758292 23.360375 15.591391 38.203867 15.59139 15.166564 0 29.577598-5.833098 38.92124-15.59139a55.607767 55.607767 0 0 0 16.35328-39.035714c0-32.768885 5.067393-53.80289 13.228133-68.634934 8.589383-14.872747 18.687283-24.198581 28.822068-32.805772 9.739213-8.570304 19.048512-16.383807 27.637896-25.350955 8.158197-8.965876 15.99205-18.688555 22.209273-30.824095 5.462965-9.327106 9.344913-21.030189 12.435718-34.318103 7.008367-29.276149 7.008367-63.197408-2.29966-92.469742-4.313135-13.647872-10.136057-27.691317-17.898683-39.3944z m-139.404178 422.145359a53.51416 53.51416 0 0 0-38.203867 15.988234 54.725043 54.725043 0 0 0 0 78.034541 53.51416 53.51416 0 0 0 38.203867 15.988235c15.166564 0 29.577598-6.232486 38.921239-15.988235a54.722499 54.722499 0 0 0 0-78.034541c-9.343641-9.758292-23.754675-15.988235-38.921239-15.988234z m350.04567-543.103921C773.63722 74.454041 650.582507 19.040881 514.302204 18.284079c-137.825705-0.792416-260.886778 54.627104-351.194229 144.364728-89.597711 89.700737-144.835344 212.999662-144.835343 348.757199a528.630562 528.630562 0 0 0 10.099171 100.288332c7.008367 31.580897 16.352008 63.596796 28.787726 92.469742 37.808295 90.493153 102.030884 165.393644 180.305821 218.112844a493.109208 493.109208 0 0 0 623.434306-61.289504c90.315082-89.340779 144.798458-213.035276 144.798458-349.58523 0-135.361965-54.483375-258.228432-143.648628-348.001669zM724.186895 832.146273a383.537015 383.537015 0 0 1-565.785082-170.902399c-10.134785-22.613749-17.106266-46.813602-22.569232-71.767713-4.636206-25.387841-7.758809-51.131824-7.758809-78.070155a381.149592 381.149592 0 0 1 112.919928-271.516346c69.289982-69.462965 165.860445-112.386987 272.561878-112.386987a385.853211 385.853211 0 0 1 352.768885 234.101079 397.988751 397.988751 0 0 1 29.57887 149.802254 393.664169 393.664169 0 0 1-29.57887 149.834052 387.248524 387.248524 0 0 1-142.137568 170.906215z' />
-</svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/question-o.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/question-o.svg
new file mode 100644
index 0000000000..d7bf6dce2c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/question-o.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M518.859241 1024C236.093457 1027.768026 3.786457 801.56359-0.002048 518.879719-3.749596 236.113935 222.393405 3.765978 505.15919-0.002048 787.924974-3.749596 1020.231974 222.434362 1024.040957 505.118233 1027.768026 787.884017 801.584068 1020.231974 518.859241 1024ZM511.896584 813.23628C545.15351 813.23628 572.103088 786.225266 572.103088 752.988819 572.103088 719.711415 545.15351 692.761837 511.896584 692.761837 478.61918 692.761837 451.628645 719.711415 451.628645 752.988819 451.628645 786.225266 478.61918 813.23628 511.896584 813.23628ZM511.896584 180.760813C399.797808 180.760813 309.037527 240.823968 302.341089 349.113761 301.501475 353.127528 301.071428 357.243687 301.071428 361.462238 301.071428 394.698686 328.041485 421.709699 361.298411 421.709699 394.575815 421.709699 421.504915 394.698686 421.504915 361.462238 421.504915 311.556371 461.970238 271.111525 511.896584 271.111525 561.761495 271.111525 602.20634 311.556371 602.20634 361.462238 605.073316 424.535718 542.266055 452.734479 511.896584 481.936681 441.102746 541.057829 451.628645 572.410264 451.628645 572.287394 451.628645 605.523841 478.61918 632.534854 511.896584 632.534854 544.928248 632.534854 571.69352 605.871974 572.041653 572.942702 606.793502 525.41233 661.921362 483.411126 662.474279 481.936681 719.89572 433.935305 722.701261 361.482716 722.701261 361.482716 722.701261 245.001562 628.336782 180.760813 511.896584 180.760813Z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/re-run.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/re-run.svg
new file mode 100644
index 0000000000..fa951a64d4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/re-run.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M370.9 714.4l268.3-201.1-268.3-201.2z" /><path d="M923.7 420.1l-25.1 10.2c-39-207-220-364.1-438.3-364.1-246.8 0-447 200.3-447 447 0 246.8 200.3 447 447 447 118.1 0 225.2-46.1 305.1-121L701 777c-63.6 58.2-147.9 93.9-240.6 93.9-197.1 0-357.6-160.5-357.6-357.6 0-197.1 160.5-357.6 357.6-357.6 180.6 0 328.4 135.3 352.3 309.5l-11.2 4.5-85.6 34.5 201.7 112c10.3 4.3 22.5-0.6 26.9-10.9l64.9-219.7-85.7 34.5z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/sad-panda.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/sad-panda.svg
new file mode 100644
index 0000000000..65aa4be7e9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/sad-panda.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ id="svg2"
+ xml:space="preserve"
+ width="2429.4399"
+ height="3454.1333"
+ viewBox="0 0 2429.4399 3454.1333"
+ sodipodi:docname="iStock-1156485055.eps"><metadata
+ id="metadata8"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs6" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="640"
+ inkscape:window-height="480"
+ id="namedview4" /><g
+ id="g10"
+ inkscape:groupmode="layer"
+ inkscape:label="ink_ext_XXXXXX"
+ transform="matrix(1.3333333,0,0,-1.3333333,0,3454.1333)"><g
+ id="g12"
+ transform="scale(0.1)"><path
+ d="m 13541.6,25806 c 211.3,-0.1 452.1,-133.5 730.8,-482.7 772.3,-968 459.5,-2381.8 -749.7,-2381.8 -36.9,0 -74.7,1.3 -113.2,4 928.6,-2239.6 1708.1,-4240.2 616.2,-5248.2 18.3,-42.7 38,-88.8 58.8,-137.9 830.3,-900.5 4976.1,-5606.8 3840.9,-8627.12 -245.5,-653.05 -855.6,-1036.21 -1483.7,-1036.21 -12.5,0 -25,0.16 -37.6,0.46 -31.9,-430.24 -100.7,-833.99 -213.9,-1200.74 -0.8,-2.75 -1.7,-5.54 -2.5,-8.29 -27.8,-89.5 -58.4,-176.73 -91.6,-261.63 -2.1,-5.31 -4.2,-10.65 -6.3,-15.94 -16.6,-41.9 -33.8,-83.32 -51.8,-124.03 -0.5,-1.08 -1,-2.13 -1.5,-3.22 -16.8,-37.89 -34.4,-75.15 -52.4,-111.98 -3.7,-7.6 -7.4,-15.2 -11.2,-22.75 -18.9,-37.88 -38.3,-75.33 -58.6,-112.02 -0.9,-1.59 -1.8,-3.12 -2.7,-4.7 -19,-34.31 -38.7,-67.94 -58.9,-101.17 -5.3,-8.68 -10.6,-17.34 -16,-25.94 -21.5,-34.5 -43.4,-68.63 -66.2,-101.92 -96.9,-141.49 -202,-274.65 -313.2,-400.84 1.5,-1502.08 -306.9,-3860.18 -2097.8,-4978.059 C 13006.2,202.758 12617.2,100 12234.2,100 c -885.4,0 -1738.1,549.645 -2039.7,1464.11 -159.6,484.21 -247.32,1060.1 -275.4,1711.69 -207.78,-10.03 -370.53,-12.26 -474.32,-12.26 -83.41,0 -128.74,1.44 -128.74,1.44 0,0 -251.72,0.53 -661.44,34.26 C 8627.64,2638.01 8539.79,2054.12 8378.19,1564.11 8076.59,649.563 7223.98,100 6338.5,100 5955.61,100 5566.49,202.805 5213.24,423.301 3383.59,1565.36 3101.29,4001.78 3116.02,5497.51 c -88.97,97.38 -174.22,198.63 -254.47,304.69 -277.62,366.95 -463.91,816.5 -576.46,1324.26 -7.5,33.85 -14.68,67.95 -21.53,102.31 -20.56,103.09 -38.22,208.43 -53.11,315.84 -4.97,35.81 -9.63,71.84 -13.98,108.1 -8.71,72.51 -16.22,145.92 -22.56,220.15 -0.67,7.87 -1.18,15.85 -1.83,23.74 -13.72,-0.37 -27.38,-0.55 -41.09,-0.55 -628.07,0 -1238.193,383.22 -1483.642,1036.23 -224.168,596.41 -242.27,1258.62 -120.766,1944.22 -272.414,63.4 -420.496,78.8 -426.578,79.4 l 67.726,784.5 c 28.403,-2.4 217.723,-20.6 547.395,-96.4 850.065,2747.2 3489.925,5616.1 3869.735,6019.1 -1147.63,996.6 -360.75,3017.3 578.38,5282.4 -38.63,-2.7 -76.23,-4 -113.19,-4 -1209.07,0 -1521.95,1413.9 -749.69,2381.8 278.72,349.3 519.43,482.7 730.8,482.7 427.69,-0.1 735.01,-546.4 992.42,-955.2 82.78,-131.4 150.91,-237.2 207.01,-322.6 1077.04,926.2 2480.29,1006.2 2932.61,1006.2 56.98,0 98.93,-1.3 123.17,-2.3 24.26,1 66.14,2.3 123.17,2.3 452.41,0 1855.66,-80.1 2932.56,-1006.2 56.1,85.4 124.3,191.2 207.1,322.6 257.4,408.8 564.6,955.2 992.4,955.2 m 0,100 c -206.3,0 -401.9,-103.6 -598.1,-316.7 -160,-173.7 -299.5,-397.5 -422.6,-595 -19,-30.6 -37.8,-60.8 -56.4,-90.2 -51.5,-81.8 -100,-157.8 -144.7,-227.1 -457.9,369.8 -1013.7,638.2 -1653.9,798.6 -551.4,138.1 -1023.85,158.8 -1256.36,158.8 -55.16,0 -96.85,-1.2 -123.17,-2.2 -26.3,1 -67.98,2.2 -123.17,2.2 -232.5,0 -704.88,-20.7 -1256.33,-158.8 -640.17,-160.4 -1195.98,-428.8 -1653.91,-798.6 -44.8,69.3 -93.25,145.3 -144.76,227.1 -18.49,29.4 -37.24,59.4 -56.27,90 -123.11,197.5 -262.64,421.3 -422.63,595.1 -196.21,213.1 -391.86,316.7 -598.13,316.8 -264.98,0 -529.6,-170.2 -808.98,-520.4 -224.78,-281.7 -370.89,-610.5 -422.53,-950.8 -50.3,-331.5 -8.59,-648.6 120.64,-917 98.36,-204.3 247.33,-373.2 430.78,-488.4 189.06,-118.7 411.3,-181.7 661.06,-187.5 -464.05,-1123 -856.47,-2125.9 -1018.92,-2994.9 -93.44,-499.8 -104,-917.3 -32.27,-1276.2 39.14,-195.9 104.22,-376.3 193.41,-536.2 76.93,-137.9 173.8,-264.2 288.72,-376.7 -275.12,-296.6 -960.32,-1059.8 -1697.42,-2066.2 -465.61,-635.7 -871.97,-1260.1 -1207.79,-1855.8 -393.16,-697.4 -692.472,-1361.2 -890.46,-1974.4 -278.988,60.2 -439.5,75.8 -471.262,78.5 -2.863,0.2 -5.71,0.4 -8.531,0.4 -51.351,0 -95.0193,-39.3 -99.5154,-91.4 L 0.375,10964.5 c -4.73047,-54.9 35.7109,-103.2 90.5078,-108.2 1.0391,-0.1 111.1132,-11.1 321.3902,-56.6 -113.144,-711.9 -65.648,-1351.56 141.469,-1902.6 125.238,-333.2 345.106,-613.49 635.828,-810.58 266.18,-180.46 573.17,-280.13 890.82,-289.71 5.03,-52.66 10.65,-104.91 16.79,-156.03 4.4,-36.62 9.18,-73.6 14.21,-109.9 15.24,-109.85 33.44,-218.08 54.11,-321.67 7,-35.1 14.39,-70.24 21.96,-104.4 120.11,-541.87 320.08,-1000.43 594.35,-1362.95 70.92,-93.74 149.5,-188.66 233.9,-282.57 -2.67,-424.89 19.23,-840.72 65.16,-1236.56 59.33,-511.35 159.19,-990.84 296.79,-1425.15 C 3730.48,1683.95 4330.24,856.582 5160.29,338.469 5515.04,117.039 5922.45,0 6338.5,0 c 230.17,0 458.91,35.25 679.87,104.77 220.25,69.3 427.53,170.996 616.07,302.261 396.96,276.371 686.98,665.659 838.72,1125.769 150.61,456.71 243.56,1014.28 276.59,1658.69 336.65,-24.94 543.41,-26.42 564.62,-26.51 8.72,-0.25 53.71,-1.44 130.41,-1.44 85.02,0 214.88,1.5 379.22,7.99 33.9,-635.79 126.51,-1186.72 275.6,-1638.73 151.7,-460.07 441.7,-849.347 838.7,-1125.737 188.6,-131.274 395.8,-232.973 616.1,-302.278 C 11775.4,35.2539 12004.1,0 12234.2,0 c 416.1,0 823.5,117.039 1178.2,338.469 814.7,508.527 1407.9,1315.541 1763.2,2398.621 139.5,425.55 242.4,895.72 305.6,1397.46 49.4,392.43 75,805.81 76,1229.23 108,124.53 207.4,252.86 295.8,381.9 21.3,31.06 43.1,64.61 68.6,105.59 5.5,8.89 11,17.86 16.5,26.87 22.9,37.65 42.9,71.87 61,104.6 l 0.4,0.69 c 0.8,1.36 1.6,2.72 2.3,4.1 19.2,34.76 39,72.59 60.6,115.73 3.5,7.2 7.1,14.4 10.6,21.61 l 0.9,1.86 c 20.2,41.16 37.8,78.89 54,115.32 0.7,1.43 1.1,2.48 1.6,3.54 17.5,39.5 34.9,81.23 53.3,127.43 1.3,3.44 2.6,6.76 3.9,10.07 l 2.5,6.28 c 33.9,86.77 65.6,177.08 94,268.45 l 1.7,5.81 0.9,2.93 c 103.6,335.76 174.4,715.73 210.6,1130.4 316.2,10.31 621.7,109.88 886.8,289.55 290.7,197.08 510.6,477.38 635.8,810.58 140.4,373.44 208.1,789.83 201.3,1237.61 -6.1,408.3 -74.4,852.3 -203,1319.6 -219.9,799.8 -620.1,1687.3 -1189.5,2637.9 -431.2,719.7 -954.3,1468.8 -1554.9,2226.2 -481.8,607.6 -893.6,1068.2 -1103.1,1296 -8.4,19.8 -16.7,39.4 -25,58.7 118.7,119.1 217.6,253.6 294.6,400.9 83.9,160.3 144.3,340.5 179.7,535.8 64.7,357.9 49.8,772.9 -45.6,1268.7 -166.1,862.5 -554.4,1853.9 -1012.9,2963.4 249.8,5.8 472.1,68.8 661.1,187.5 183.5,115.2 332.5,284 430.8,488.4 129.3,268.4 171,585.5 120.6,916.9 -51.6,340.4 -197.8,669.2 -422.6,950.9 -279.3,350.1 -543.9,520.3 -808.9,520.4 v 0"
+ style="fill:#131212;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path14" /><path
+ d="m 13942.6,17711.3 c 0,0 5243,-5427.6 3983.3,-8779.02 -370.6,-985.89 -1572.2,-1358.04 -2412.2,-722.6 -859.9,650.53 -1364.2,1932.52 -1659.8,3239.52 -440.7,1948.4 -423.8,3972.4 12.6,5921.8 l 76.1,340.3"
+ style="fill:#332f3b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path16" /><path
+ d="m 3205.09,6756.2 c 0,0 -733.95,-4620.98 2008.66,-6332.899 1170.16,-730.41 2732.93,-169.203 3164.95,1140.809 245.71,745.07 321.89,1705.99 270.78,2828.27 C 8534.98,6906.29 3205.09,6756.2 3205.09,6756.2"
+ style="fill:#332f3b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path18" /><path
+ d="m 15368.7,6756.2 c 0,0 733.9,-4620.98 -2008.7,-6332.899 -1170.2,-730.41 -2732.9,-169.203 -3164.9,1140.809 -245.76,745.07 -321.95,1705.99 -270.83,2828.27 114.53,2513.91 5444.43,2363.82 5444.43,2363.82"
+ style="fill:#332f3b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path20" /><path
+ d="m 13858.2,18079.8 -4541.65,-678.2 -4541.69,678.2 c 0,0 -4281.891,-9146.31 -1912.8,-12277.6 1912.8,-2528.2 6454.49,-2537.22 6454.49,-2537.22 0,0 4614.15,-148.46 6454.45,2537.22 2219.6,3239.03 -1912.8,12277.6 -1912.8,12277.6"
+ style="fill:#f5f4f1;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path22" /><path
+ d="m 9803.07,4333.71 c 0,0 -4541.68,9.01 -6454.48,2537.21 -1871.08,2473.05 406.45,8697.98 1446.68,11205.78 l -20.41,3.1 c 0,0 -4281.895,-9146.31 -1912.8,-12277.6 1912.8,-2528.2 6454.49,-2537.22 6454.49,-2537.22 0,0 4614.15,-148.46 6454.45,2537.22 204.4,298.29 354.8,645.9 459.7,1030.97 C 14372.9,4187.09 9803.07,4333.71 9803.07,4333.71"
+ style="fill:#e4e0dc;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path24" /><path
+ d="m 13394.4,17550.6 c 184.9,151.1 352.4,297.7 503.9,440 -25.9,58.2 -40.1,89.2 -40.1,89.2 l -4541.65,-678.2 -4541.69,678.2 c 0,0 -492.42,-1052 -1050.89,-2564.4 1463.38,-214.1 6352.33,-676.8 9670.43,2035.2"
+ style="fill:#e4e0dc;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path26" /><path
+ d="m 5230.72,7482.85 c 273.91,-528.68 659.55,-931.67 1051.6,-1145.34 51.56,443.51 -55.23,990.97 -329.14,1519.65 -273.91,528.68 -659.55,931.67 -1051.61,1145.34 -51.55,-443.51 55.24,-990.97 329.15,-1519.65"
+ style="fill:#55bf35;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path28" /><path
+ d="M 6578.73,7542.06 C 2743.62,10681.1 126.5,10953.5 100.508,10955.9 l 67.726,784.5 c 114.942,-9.8 2861.626,-276.1 6909.246,-3589.01 l -498.75,-609.33"
+ style="fill:#66c430;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path30" /><path
+ d="m 5827.4,10764.4 c -529,-273.3 -932.44,-658.4 -1146.58,-1050.22 443.45,-52.08 991.04,54.07 1520.04,327.32 529,273.3 932.44,658.5 1146.58,1050.3 -443.45,52.1 -991.04,-54.1 -1520.04,-327.4"
+ style="fill:#55bf35;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path32" /><path
+ d="m 5339.22,10725.1 c -356.7,-369.9 -579.79,-796.41 -646.31,-1175.96 376.88,80.24 795.06,318.66 1151.77,688.56 356.7,369.9 579.79,796.4 646.31,1176 -376.88,-80.3 -795.07,-318.7 -1151.77,-688.6"
+ style="fill:#66c430;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path34" /><path
+ d="m 4631.1,17711.3 c 0,0 -5242.916,-5427.6 -3983.245,-8779.02 370.565,-985.89 1572.215,-1358.04 2412.155,-722.6 859.9,650.53 1364.24,1932.52 1659.84,3239.52 440.66,1948.4 423.83,3972.4 -12.56,5921.8 l -76.19,340.3"
+ style="fill:#332f3b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path36" /><path
+ d="m 6479.07,24179.8 c 0,0 -70.36,60.2 -454.98,671 -384.62,610.8 -880.53,1528.7 -1723.23,472.5 -842.7,-1056.2 -393.7,-2643.6 1102.38,-2345.4 l 1075.83,1201.9"
+ style="fill:#332f3b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path38" /><path
+ d="m 12094.7,24179.8 c 0,0 70.3,60.2 455,671 384.6,610.8 880.5,1528.7 1723.2,472.5 842.7,-1056.2 393.7,-2643.6 -1102.4,-2345.4 l -1075.8,1201.9"
+ style="fill:#332f3b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path40" /><path
+ d="m 13317.4,23168.6 c -1007,2424.3 -3744.74,2375.4 -4030.52,2363.5 -285.8,11.9 -3023.53,60.8 -4030.52,-2363.5 -1063.01,-2559.1 -2007.91,-4842.6 -314.97,-5748.1 324.58,-173.6 701.84,-324.4 1095.87,-454.4 2108.53,-695.3 4390.74,-695.3 6499.24,0 394,130 771.3,280.8 1095.9,454.4 1692.9,905.5 748,3189 -315,5748.1"
+ style="fill:#f5f4f1;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path42" /><path
+ d="m 8299.23,20399.7 c 434.46,154 1153.92,292.2 1978.57,-17.8 189.5,-71.2 210.6,-331.3 35.7,-433.2 -305.5,-177.9 -722.22,-402.3 -923.71,-509.9 -73.7,-39.3 -162.47,-37.5 -234.62,4.5 l -894.87,522.2 c -176.18,102.8 -153.32,366 38.93,434.2"
+ style="fill:#2e2a35;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path44" /><path
+ d="m 7952.7,20404.8 c 216.39,367.9 307.14,799.8 230.94,1219.7 -38.32,211.2 -118.2,411 -275.71,510 -420.03,264.1 -804.62,312.1 -1356.38,-360 -551.75,-672 -1082.29,-627.5 -1188.52,-1224.1 -116.6,-654.8 654.18,-1201.4 1476.54,-1104 491.56,58.1 880.09,562.3 1113.13,958.4"
+ style="fill:#332f3b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path46" /><path
+ d="m 7312.66,20736.6 c 259.9,0 474.55,193.7 507.45,444.6 4.7,35.8 -24.64,67.2 -60.77,67.2 h -893.35 c -36.13,0 -65.47,-31.4 -60.78,-67.2 32.91,-250.9 247.56,-444.6 507.45,-444.6"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path48" /><path
+ d="m 7312.66,20882.3 c 202.21,0 366.13,163.9 366.13,366.1 h -732.25 c 0,-202.2 163.92,-366.1 366.12,-366.1"
+ style="fill:#573025;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path50" /><path
+ d="m 10621,20404.8 c -216.3,367.9 -307.1,799.8 -230.9,1219.7 38.3,211.2 118.2,411 275.7,510 420,264.1 804.6,312.1 1356.4,-360 551.7,-672 1082.3,-627.5 1188.5,-1224.1 116.6,-654.8 -654.2,-1201.4 -1476.5,-1104 -491.6,58.1 -880.1,562.3 -1113.2,958.4"
+ style="fill:#332f3b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path52" /><path
+ d="m 11261.1,20751.5 c -259.9,0 -474.6,193.7 -507.5,444.6 -4.7,35.8 24.7,67.2 60.8,67.2 h 893.4 c 36.1,0 65.4,-31.4 60.7,-67.2 -32.9,-250.9 -247.5,-444.6 -507.4,-444.6"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path54" /><path
+ d="m 11202.4,20897.2 c 202.2,0 366.1,163.9 366.1,366.1 h -732.2 c 0,-202.2 163.9,-366.1 366.1,-366.1"
+ style="fill:#573025;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path56" /><path
+ d="m 7419.14,17529.9 c -349.32,-623.2 -498.98,-1275.5 -454.63,-1809.4 478.58,240.8 956.94,708.8 1306.26,1332 297.63,531 450.32,1083.1 461.57,1565.1 2.65,113.7 -123.38,184.4 -218.97,122.8 -405.3,-261.1 -796.59,-679.5 -1094.23,-1210.5"
+ style="fill:#55bf35;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path58" /><path
+ d="m 7934.96,17444.8 c -112.94,-606.1 -54.6,-1180.7 129.51,-1604.8 324.49,329.3 585.85,844.4 698.78,1450.5 94.97,509.7 68.83,997.1 -51.36,1391.5 -30.98,101.7 -162.37,126.2 -227.9,42.4 -254.15,-324.6 -454.07,-769.9 -549.03,-1279.6"
+ style="fill:#66c430;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path60" /><path
+ d="m 10717,18189 c -51.4,0 -93.6,39.5 -98,89.8 -4.2,12.9 -55.8,143.4 -476.9,248.3 -439.24,109.4 -721.25,217.6 -868.66,431.8 -147.41,-214.2 -429.43,-322.4 -868.64,-431.8 -421.1,-104.9 -472.8,-235.4 -476.93,-248.3 -4.4,-50.3 -46.62,-89.8 -98.04,-89.8 -54.37,0 -98.43,44.1 -98.43,98.4 0,45.9 30.18,282.4 625.84,430.7 575.08,143.3 759.15,256.9 820.62,506.6 10.84,44 50.28,74.9 95.58,74.9 45.29,0 84.74,-30.9 95.58,-74.9 61.46,-249.7 245.53,-363.3 820.58,-506.6 595.7,-148.3 625.8,-384.8 625.8,-430.7 0,-54.3 -44,-98.4 -98.4,-98.4 z m -97.7,88.7 v 0 z m -0.7,9.6 c 0,-0.1 0,-0.1 0,-0.2 0,0.1 0,0.1 0,0.2 z m -2690.35,0 c 0,-0.1 0,-0.1 0,-0.1 0,0 0,0 0,0.1 z m 2690.35,0.1 c 0,0 0,-0.1 0,-0.1 0,0 0,0.1 0,0.1 z m -2690.35,0 c 0,0 0,-0.1 0,-0.1 0,0 0,0.1 0,0.1"
+ style="fill:#2e2a35;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path62" /></g></g></svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/smile.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/smile.svg
index 852278c315..a87c742195 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/smile.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/smile.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M661.333333 405.333333m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" fill="#000000" /><path d="M362.666667 405.333333m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" fill="#000000" /><path d="M511.573333 85.333333C276.053333 85.333333 85.333333 276.48 85.333333 512s190.72 426.666667 426.24 426.666667C747.52 938.666667 938.666667 747.52 938.666667 512S747.52 85.333333 511.573333 85.333333zM512 853.333333c-188.586667 0-341.333333-152.746667-341.333333-341.333333s152.746667-341.333333 341.333333-341.333333 341.333333 152.746667 341.333333 341.333333-152.746667 341.333333-341.333333 341.333333z m188.16-260.693333a31.786667 31.786667 0 0 0-43.946667 10.24A169.813333 169.813333 0 0 1 512 682.666667c-58.88 0-112.64-29.866667-144.213333-80.213334a31.872 31.872 0 1 0-54.186667 33.706667A232.362667 232.362667 0 0 0 512 746.666667c81.066667 0 154.88-41.386667 198.4-110.08 9.386667-14.933333 4.693333-34.56-10.24-43.946667z" /></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M661.333333 405.333333m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" /><path d="M362.666667 405.333333m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" /><path d="M511.573333 85.333333C276.053333 85.333333 85.333333 276.48 85.333333 512s190.72 426.666667 426.24 426.666667C747.52 938.666667 938.666667 747.52 938.666667 512S747.52 85.333333 511.573333 85.333333zM512 853.333333c-188.586667 0-341.333333-152.746667-341.333333-341.333333s152.746667-341.333333 341.333333-341.333333 341.333333 152.746667 341.333333 341.333333-152.746667 341.333333-341.333333 341.333333z m188.16-260.693333a31.786667 31.786667 0 0 0-43.946667 10.24A169.813333 169.813333 0 0 1 512 682.666667c-58.88 0-112.64-29.866667-144.213333-80.213334a31.872 31.872 0 1 0-54.186667 33.706667A232.362667 232.362667 0 0 0 512 746.666667c81.066667 0 154.88-41.386667 198.4-110.08 9.386667-14.933333 4.693333-34.56-10.24-43.946667z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow-double.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/square.svg
similarity index 53%
rename from server-core/src/main/java/io/onedev/server/web/asset/icon/arrow-double.svg
rename to server-core/src/main/java/io/onedev/server/web/asset/icon/square.svg
index eb27da5793..267c929601 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow-double.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/square.svg
@@ -7,49 +7,50 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0 (4035a4f, 2020-05-01)"
- sodipodi:docname="arrow-double.svg"
- id="svg64"
- version="1.1"
- viewBox="0 0 1024 1024"
- height="200.00px"
+ class="icon"
width="200px"
- class="icon">
+ height="200.00px"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ id="svg308"
+ sodipodi:docname="square.svg"
+ inkscape:version="1.0 (4035a4f, 2020-05-01)">
<metadata
- id="metadata70">
+ id="metadata314">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
- id="defs68" />
+ id="defs312" />
<sodipodi:namedview
- inkscape:current-layer="svg64"
- inkscape:window-maximized="1"
- inkscape:window-y="23"
- inkscape:window-x="0"
- inkscape:cy="67.351874"
- inkscape:cx="100"
- inkscape:zoom="4.135"
- showgrid="false"
- id="namedview66"
- inkscape:window-height="971"
- inkscape:window-width="1920"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
+ inkscape:document-rotation="0"
+ pagecolor="#ffffff"
bordercolor="#666666"
- pagecolor="#ffffff" />
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1869"
+ inkscape:window-height="1035"
+ id="namedview310"
+ showgrid="false"
+ inkscape:zoom="4.135"
+ inkscape:cx="68.681983"
+ inkscape:cy="100"
+ inkscape:window-x="51"
+ inkscape:window-y="23"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg308" />
<path
- style="stroke-width:1.26493"
- id="path62"
- d="m 776.74931,513.99926 -232.69493,268.2243 a 41.156365,47.452687 0 0 0 58.2039,67.10822 L 863.96467,547.51861 a 41.014139,47.288701 0 0 0 0,-67.03869 L 602.19795,178.73627 a 41.134769,47.427786 0 1 0 -58.14357,67.03868 z m -376.9682,0 -232.69492,268.2243 a 41.156364,47.452686 0 1 0 58.20389,67.10822 L 486.99647,547.51861 a 41.014139,47.288701 0 0 0 0,-67.03869 L 225.22976,178.73627 a 41.134769,47.427786 0 0 0 -58.14357,67.03868 z" />
+ d="M810.666667 85.333333H213.333333C140.8 85.333333 85.333333 140.8 85.333333 213.333333v597.333334c0 72.533333 55.466667 128 128 128h597.333334c72.533333 0 128-55.466667 128-128V213.333333c0-72.533333-55.466667-128-128-128z m42.666666 725.333334c0 25.6-17.066667 42.666667-42.666666 42.666666H213.333333c-25.6 0-42.666667-17.066667-42.666666-42.666666V213.333333c0-25.6 17.066667-42.666667 42.666666-42.666666h597.333334c25.6 0 42.666667 17.066667 42.666666 42.666666v597.333334z"
+ id="path306" />
</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/support.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/support.svg
new file mode 100644
index 0000000000..7122f869d4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/support.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:version="1.0 (4035a4f, 2020-05-01)"
+ sodipodi:docname="support.svg"
+ id="svg32"
+ version="1.1"
+ viewBox="0 0 1024 1024"
+ height="200.00px"
+ width="200px"
+ class="icon">
+ <metadata
+ id="metadata38">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs36" />
+ <sodipodi:namedview
+ inkscape:current-layer="svg32"
+ inkscape:window-maximized="1"
+ inkscape:window-y="23"
+ inkscape:window-x="41"
+ inkscape:cy="62.273517"
+ inkscape:cx="100"
+ inkscape:zoom="3.555"
+ showgrid="false"
+ id="namedview34"
+ inkscape:window-height="855"
+ inkscape:window-width="1399"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#ffffff" />
+ <path
+ style="stroke-width:0.942331"
+ id="path30"
+ d="m 515.59922,31.684951 a 483.91561,481.03516 0 1 0 0,962.070319 483.91561,481.03516 0 0 0 0,-962.070319 z m 105.19116,164.273509 8.16607,-29.34315 a 47.726177,47.442093 0 0 1 65.9335,-30.72612 421.79294,419.28227 0 0 1 200.46204,199.20869 47.726177,47.442093 0 0 1 -32.48283,65.72143 l -30.24473,7.15541 A 44.762194,44.495753 0 0 1 781.69231,385.00527 298.39446,296.6183 0 0 0 643.65539,248.09064 44.822684,44.555882 0 0 1 620.54842,195.95846 Z M 136.02791,334.25607 a 421.67196,419.16202 0 0 1 200.40155,-199.26882 47.665688,47.381964 0 0 1 66.11497,32.28948 l 7.25874,30.0647 a 44.822684,44.555882 0 0 1 -23.10698,50.62895 297.85006,296.07714 0 0 0 -137.73447,137.15515 44.883173,44.616012 0 0 1 -52.50485,22.96945 l -29.51885,-8.05735 A 47.726177,47.442093 0 0 1 136.0884,334.49658 Z m 273.83575,495.46622 -8.10559,29.34314 a 47.726177,47.442093 0 0 1 -65.93351,30.72612 422.0349,419.52279 0 0 1 -200.46203,-199.20868 47.665688,47.381964 0 0 1 32.48283,-65.72144 l 30.24473,-7.21552 a 44.822684,44.555882 0 0 1 50.93212,22.96942 297.6081,295.83662 0 0 0 138.03692,136.91464 c 19.35662,9.6207 29.03494,31.56793 23.04649,52.19232 z M 284.46903,513.20114 a 231.85607,230.47599 0 1 1 463.71213,0 231.85607,230.47599 0 0 1 -463.71213,0 z M 894.62612,691.0639 A 421.73245,419.22215 0 0 1 694.28506,890.33271 47.605198,47.321835 0 0 1 628.17009,858.04323 l -7.19824,-30.0647 A 44.701704,44.435624 0 0 1 644.07881,777.34958 298.21299,296.43791 0 0 0 781.81329,640.1343 c 9.67831,-19.2414 31.75696,-28.86211 52.50485,-22.9093 l 29.45836,8.05734 a 47.665688,47.381964 0 0 1 30.91011,65.48092 z" />
+</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/times.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/times.svg
index be43174877..67e71234f1 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/times.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/times.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M607.1975 512l215.44-215.44c12.46-12.46 12.46-32.68 0-45.16l-50.06-50.06c-12.46-12.46-32.68-12.46-45.16 0L511.9975 416.8 296.5575 201.36c-12.46-12.46-32.68-12.46-45.16 0L201.3575 251.4c-12.46 12.46-12.46 32.68 0 45.16L416.7975 512 201.3575 727.44c-12.46 12.46-12.46 32.68 0 45.16l50.06 50.06c12.46 12.46 32.68 12.46 45.16 0L511.9975 607.2l215.44 215.44c12.46 12.46 32.68 12.46 45.16 0l50.06-50.06c12.46-12.46 12.46-32.68 0-45.16L607.1975 512z" /></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M575.146667 512l236.657777-236.657778a44.657778 44.657778 0 0 0-63.146666-63.146666L512 448.853333 275.342222 212.195556a44.657778 44.657778 0 0 0-63.146666 63.146666L448.853333 512l-236.657777 236.657778a44.942222 44.942222 0 0 0 0 63.146666 44.373333 44.373333 0 0 0 31.573333 13.084445 43.804444 43.804444 0 0 0 31.573333-13.084445L512 575.146667l236.657778 236.657777a43.804444 43.804444 0 0 0 31.573333 13.084445 44.373333 44.373333 0 0 0 31.573333-13.084445 44.942222 44.942222 0 0 0 0-63.146666z" /></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/user-tick.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/user-tick.svg
index 3f8cac8f1a..5bfde9f604 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/user-tick.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/user-tick.svg
@@ -15,42 +15,7 @@
height="200.00px"
width="200px"
class="icon">
- <metadata
- id="metadata18">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs16" />
- <sodipodi:namedview
- inkscape:current-layer="svg12"
- inkscape:window-maximized="1"
- inkscape:window-y="23"
- inkscape:window-x="0"
- inkscape:cy="100"
- inkscape:cx="100"
- inkscape:zoom="3.52"
- showgrid="false"
- id="namedview14"
- inkscape:window-height="971"
- inkscape:window-width="1920"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
<path
style="stroke-width:0.933004"
- id="path10"
- fill="#333333"
d="M 812.45354,650.8864 A 448.02895,464.77796 0 0 0 668.68933,564.84486 C 781.94313,496.83107 835.41041,363.2106 799.71619,237.68215 763.92325,112.15369 647.65789,25.139055 514.95245,24.729333 382.29638,24.268395 265.38921,110.46358 228.75699,235.73596 192.17412,361.05956 244.70335,495.03854 357.46348,563.76934 185.55861,621.43765 70.132522,780.20478 70.379369,958.63855 a 34.706816,36.004287 0 0 0 17.72368,33.80207 c 11.8487,7.17005 26.807671,7.17005 38.705751,0 11.89807,-7.11893 18.76045,-20.17882 17.77305,-33.80207 0,-195.28356 162.22845,-348.26338 369.43258,-348.26338 91.97553,-0.0512 180.69266,33.6996 248.57583,94.6457 15.30458,12.70138 38.11332,11.26734 51.59122,-3.38021 a 33.867533,35.133629 0 0 0 -1.72794,-50.70304 z M 291.45635,315.93897 C 291.75257,195.22474 391.5285,97.659786 514.36001,97.813424 637.19153,98.018289 736.67124,195.94176 736.52312,316.60477 736.42436,437.26779 636.79658,535.03761 513.96506,535.03761 391.0348,534.73032 291.45635,436.70443 291.45635,315.93897 Z m 656.81292,348.46824 a 38.656382,40.101504 0 0 0 -52.47987,0 l -248.82269,245.01354 -96.12258,-94.6457 a 38.508272,39.947857 0 0 0 -36.53348,-10.75519 36.237272,37.591959 0 0 0 -27.00516,26.52947 34.06501,35.338489 0 0 0 11.10815,35.85064 l 122.18971,120.35572 v 0.15368 a 38.656382,40.101504 0 0 0 52.52923,-0.15368 l 274.9392,-270.67234 a 34.11438,35.389705 0 0 0 0.24685,-51.67614 z" />
</svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/PoppinsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/poppins/PoppinsCssResourceReference.java
new file mode 100644
index 0000000000..1e8110e6c8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/poppins/PoppinsCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.asset.poppins;
+
+import org.apache.wicket.request.resource.CssResourceReference;
+
+public class PoppinsCssResourceReference extends CssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public PoppinsCssResourceReference() {
+ super(PoppinsCssResourceReference.class, "poppins.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/poppins.css b/server-core/src/main/java/io/onedev/server/web/asset/poppins/poppins.css
new file mode 100644
index 0000000000..f7cca01140
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/poppins/poppins.css
@@ -0,0 +1,120 @@
+/* devanagari */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 300;
+ src: local('Poppins Light'), local('Poppins-Light'), url(v12/pxiByp8kv8JHgFVrLDz8Z11lFd2JQEl8qw.woff2) format('woff2');
+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 300;
+ src: local('Poppins Light'), local('Poppins-Light'), url(v12/pxiByp8kv8JHgFVrLDz8Z1JlFd2JQEl8qw.woff2) format('woff2');
+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 300;
+ src: local('Poppins Light'), local('Poppins-Light'), url(v12/pxiByp8kv8JHgFVrLDz8Z1xlFd2JQEk.woff2) format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* devanagari */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Poppins Regular'), local('Poppins-Regular'), url(v12/pxiEyp8kv8JHgFVrJJbecnFHGPezSQ.woff2) format('woff2');
+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Poppins Regular'), local('Poppins-Regular'), url(v12/pxiEyp8kv8JHgFVrJJnecnFHGPezSQ.woff2) format('woff2');
+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Poppins Regular'), local('Poppins-Regular'), url(v12/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2) format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* devanagari */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 500;
+ src: local('Poppins Medium'), local('Poppins-Medium'), url(v12/pxiByp8kv8JHgFVrLGT9Z11lFd2JQEl8qw.woff2) format('woff2');
+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 500;
+ src: local('Poppins Medium'), local('Poppins-Medium'), url(v12/pxiByp8kv8JHgFVrLGT9Z1JlFd2JQEl8qw.woff2) format('woff2');
+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 500;
+ src: local('Poppins Medium'), local('Poppins-Medium'), url(v12/pxiByp8kv8JHgFVrLGT9Z1xlFd2JQEk.woff2) format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* devanagari */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 600;
+ src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(v12/pxiByp8kv8JHgFVrLEj6Z11lFd2JQEl8qw.woff2) format('woff2');
+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 600;
+ src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(v12/pxiByp8kv8JHgFVrLEj6Z1JlFd2JQEl8qw.woff2) format('woff2');
+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 600;
+ src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(v12/pxiByp8kv8JHgFVrLEj6Z1xlFd2JQEk.woff2) format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* devanagari */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 700;
+ src: local('Poppins Bold'), local('Poppins-Bold'), url(v12/pxiByp8kv8JHgFVrLCz7Z11lFd2JQEl8qw.woff2) format('woff2');
+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 700;
+ src: local('Poppins Bold'), local('Poppins-Bold'), url(v12/pxiByp8kv8JHgFVrLCz7Z1JlFd2JQEl8qw.woff2) format('woff2');
+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ font-weight: 700;
+ src: local('Poppins Bold'), local('Poppins-Bold'), url(v12/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2) format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z11lFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z11lFd2JQEl8qw.woff2
new file mode 100644
index 0000000000..b97a3314fc
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z11lFd2JQEl8qw.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1JlFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1JlFd2JQEl8qw.woff2
new file mode 100644
index 0000000000..d65ff93389
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1JlFd2JQEl8qw.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2
new file mode 100644
index 0000000000..52cbd3adca
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z11lFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z11lFd2JQEl8qw.woff2
new file mode 100644
index 0000000000..5fbd3aa001
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z11lFd2JQEl8qw.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1JlFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1JlFd2JQEl8qw.woff2
new file mode 100644
index 0000000000..1d33e14316
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1JlFd2JQEl8qw.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1xlFd2JQEk.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1xlFd2JQEk.woff2
new file mode 100644
index 0000000000..025dca3744
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLDz8Z1xlFd2JQEk.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z11lFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z11lFd2JQEl8qw.woff2
new file mode 100644
index 0000000000..92eb63a85a
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z11lFd2JQEl8qw.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1JlFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1JlFd2JQEl8qw.woff2
new file mode 100644
index 0000000000..b35b9f7347
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1JlFd2JQEl8qw.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1xlFd2JQEk.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1xlFd2JQEk.woff2
new file mode 100644
index 0000000000..53e8d4dd94
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLEj6Z1xlFd2JQEk.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z11lFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z11lFd2JQEl8qw.woff2
new file mode 100644
index 0000000000..f8ab8734a1
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z11lFd2JQEl8qw.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1JlFd2JQEl8qw.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1JlFd2JQEl8qw.woff2
new file mode 100644
index 0000000000..4130d6dcd1
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1JlFd2JQEl8qw.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1xlFd2JQEk.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1xlFd2JQEk.woff2
new file mode 100644
index 0000000000..bb0923bff9
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiByp8kv8JHgFVrLGT9Z1xlFd2JQEk.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJbecnFHGPezSQ.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJbecnFHGPezSQ.woff2
new file mode 100644
index 0000000000..bb8c300ca5
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJbecnFHGPezSQ.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2
new file mode 100644
index 0000000000..36195bdd04
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJnecnFHGPezSQ.woff2 b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJnecnFHGPezSQ.woff2
new file mode 100644
index 0000000000..25e6e4e364
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/poppins/v12/pxiEyp8kv8JHgFVrJJnecnFHGPezSQ.woff2 differ
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/revisioncompare/revision-compare.css b/server-core/src/main/java/io/onedev/server/web/asset/revisioncompare/revision-compare.css
index 832ebaa0f8..3456454748 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/revisioncompare/revision-compare.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/revisioncompare/revision-compare.css
@@ -1,38 +1,64 @@
-table.revision-compare {
- width: auto;
-}
-table.revision-compare td {
- vertical-align: top;
- background: #FAFAFA;
- border: 2px solid #E0E0E0;
- padding: 20px;
-}
-table.revision-compare td.action {
- text-align: center;
- background: white;
- padding-top: 50px;
- border-top: none;
- border-bottom: none;
-}
-table.revision-compare .revision .title .checkbox {
- margin: 0 0 0 16px;
-}
-table.revision-compare .revision .title label {
- font-size: 16px;
- font-weight: normal;
-}
-table.revision-compare .revision .title span {
- color: #888;
- margin-left: 4px;
-}
-table.revision-compare .revision .title a {
- color: #666;
- margin-left: 4px;
-}
-table.revision-compare .revision .message {
- margin-top: 8px;
-}
-table.revision-compare .revision .message a {
- font-size: 13px;
- color: #888;
+.revision-compare {
+ display: flex;
+ min-height: fit-content;
+}
+.revision-compare>.revision {
+ flex: 1;
+}
+.revision-compare>.base {
+ margin-right: 2rem;
+}
+.revision-compare>.swap {
+ display: flex;
+ align-items: center;
+ margin-right: 2rem;
+ justify-content: center;
+}
+@media(max-width: 767px) {
+ .revision-compare {
+ flex-wrap: wrap;
+ }
+ .revision-compare>* {
+ flex: 0 0 100%;
+ }
+ .revision-compare>.base {
+ margin-right: 0;
+ margin-bottom: 2rem;
+ }
+ .revision-compare>.compare {
+ margin-top: 2rem;
+ }
+ .revision-compare>.swap .icon {
+ transform: rotate(90deg);
+ }
+}
+
+.revision-compare .head {
+ display: flex;
+ align-items: center;
+ margin-bottom: 1rem;
+}
+.revision-compare .title {
+ font-weight: 600;
+ font-size: 1.1rem;
+ margin-bottom: 1rem;
+}
+.revision-compare .head .title {
+ margin-bottom: 0;
+}
+.revision-compare .checkbox {
+ margin-left: 1.5rem;
+}
+.revision-compare .help {
+ margin-left: 0.5rem;
+ color: var(--gray);
+}
+.revision-compare .selector {
+ margin-bottom: 1rem;
+}
+.revision-compare .message {
+ color: var(--muted);
+}
+.revision-compare .message:hover, .revision-compare .message:focus {
+ color: var(--primary);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java
index 4701531615..4107973efe 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.asset.scrollintoview;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.Application;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
@@ -21,7 +20,6 @@ public class ScrollIntoViewResourceReference extends JavaScriptResourceReference
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = new ArrayList<>();
- dependencies.add(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
index ec66c54297..4e428687ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
@@ -3,34 +3,50 @@
*/
(function ( $ ) {
- var defaultMargin = 8;
-
- $.fn.scrollIntoView = function(margin) {
- if (margin == undefined)
- margin = defaultMargin;
-
+ $.fn.scrollIntoView = function(scrollParent, animation) {
var $this = jQuery(this);
- var $scrollParent = $this.scrollParent();
-
+
+ var $scrollParent = scrollParent? $(scrollParent): $(this).scrollParent(true);
+
if ($this.length != 0) {
var scrollParentTop, scrollParentBottom, thisTop, thisBottom;
if ($scrollParent[0] == document) {
scrollParentTop = 0;
scrollParentBottom = $(window).height();
thisTop = $this.offset().top - $(window).scrollTop();
- thisBottom = thisTop + $this.height();
} else {
scrollParentTop = $scrollParent.offset().top;
scrollParentBottom = scrollParentTop + $scrollParent.height();
thisTop = $this.offset().top;
- thisBottom = $this.offset().top + $this.height();
}
-
- if (thisBottom + margin > scrollParentBottom)
- $scrollParent.scrollTop($scrollParent.scrollTop() + (thisBottom + margin - scrollParentBottom));
+ var thisHeight = $this.outerHeight();
+ thisBottom = thisTop + thisHeight;
- if (thisTop - margin < scrollParentTop)
- $scrollParent.scrollTop($scrollParent.scrollTop() - (scrollParentTop - thisTop + margin));
+ if (thisHeight > scrollParentBottom - scrollParentTop) {
+ var scrollOffset = Math.floor(thisTop - scrollParentTop);
+ if (animation)
+ $scrollParent.animate({scrollTop: $scrollParent.scrollTop() + scrollOffset});
+ else
+ $scrollParent.scrollTop($scrollParent.scrollTop() + scrollOffset);
+ } else {
+ var beyondTop = scrollParentTop - thisTop;
+ if (beyondTop > 0) {
+ beyondTop = Math.ceil(beyondTop);
+ if (animation)
+ $scrollParent.animate({scrollTop: $scrollParent.scrollTop() - beyondTop});
+ else
+ $scrollParent.scrollTop($scrollParent.scrollTop() - beyondTop);
+ } else {
+ var beyondBottom = thisBottom - scrollParentBottom;
+ if (beyondBottom > 0) {
+ beyondBottom = Math.ceil(beyondBottom);
+ if (animation)
+ $scrollParent.animate({scrollTop: $scrollParent.scrollTop() + beyondBottom});
+ else
+ $scrollParent.scrollTop($scrollParent.scrollTop() + beyondBottom);
+ }
+ }
+ }
}
return this;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.css b/server-core/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.css
index fa4b492a22..300e58af9c 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.css
@@ -1,23 +1,22 @@
.selection-popover {
z-index: 10000;
- position: absolute;
+ position: fixed;
}
.selection-popover>.content {
- background: #333;
- border-radius: 6px;
- padding: 12px;
+ background: var(--dark);
+ border-radius: 0.42rem;
+ padding: 1rem 0;
}
.selection-popover>.content a, .selection-popover>.content span {
color: white;
display: block;
white-space: nowrap;
+ padding: 0.3rem 1rem;
}
-.selection-popover>.content a+a,
-.selection-popover>.content a+span,
-.selection-popover>.content span+span,
-.selection-popover>.content span+a {
- margin-top: 8px;
+.selection-popover>.content a:hover, .selection-popover>.content a:focus {
+ background-color: var(--gray-dark);
}
+
.selection-popover>.triangle {
position: relative;
left: 50%;
@@ -25,5 +24,5 @@
height: 0;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
- border-top: 6px solid #333;
+ border-top: 6px solid var(--dark);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.js b/server-core/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.js
index 6bc54269eb..46ec472084 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.js
@@ -2,7 +2,6 @@
$.fn.selectionPopover = function(action, options) {
var $container = jQuery(this);
- $container.css("position", "relative");
function popover(options) {
var $popover = $container.children(".selection-popover");
if (options === "close") {
@@ -21,20 +20,17 @@
$content.append(options.content);
var left = options.position.left - $popover.outerWidth()/2;
var top = options.position.top - $popover.outerHeight();
- if (left < $(window).scrollLeft())
- left = $(window).scrollLeft();
- if (left + $popover.outerWidth() > $(window).width() + $(window).scrollLeft())
- left = $(window).width() + $(window).scrollLeft() - $popover.outerWidth();
- if (top < $(window).scrollTop())
- top = $(window).scrollTop();
- if (top + $popover.outerHeight() > $(window).height() + $(window).scrollTop())
- top = $(window).height() + $(window).scrollTop() - $popover.outerHeight();
+ if (left < 0)
+ left = 0;
+ if (left + $popover.outerWidth() > $(window).width())
+ left = $(window).width() - $popover.outerWidth();
+ if (top < 0)
+ top = 0;
+ if (top + $popover.outerHeight() > $(window).height())
+ top = $(window).height() - $popover.outerHeight();
if (top + $popover.outerHeight() > options.position.top+10)
$popover.children(".triangle").hide();
- $popover.css({
- left: left-$container.offset().left,
- top: top-$container.offset().top
- });
+ $popover.css({left: left, top});
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/NoRecordsBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/NoRecordsBehavior.java
new file mode 100644
index 0000000000..f6d52a5f6f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/NoRecordsBehavior.java
@@ -0,0 +1,40 @@
+package io.onedev.server.web.behavior;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.markup.ComponentTag;
+
+public class NoRecordsBehavior extends Behavior {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String CSS_CLASS = "norecords";
+
+ @Override
+ public void bind(Component component) {
+ super.bind(component);
+
+ if (!(component instanceof DataTable))
+ throw new RuntimeException("NoRecordsBehavior can only be applied to DataTable");
+ }
+
+ @Override
+ public void onComponentTag(Component component, ComponentTag tag) {
+ super.onComponentTag(component, tag);
+ DataTable<?, ?> dataTable = (DataTable<?, ?>) component;
+
+ if (dataTable.getRowCount() == 0)
+ decorate(tag);
+ }
+
+ public static void decorate(ComponentTag tag) {
+ String classes = tag.getAttribute("class");
+ if (StringUtils.isNotBlank(classes))
+ tag.put("class", classes + " " + CSS_CLASS);
+ else
+ tag.put("class", CSS_CLASS);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/RunTaskBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/RunTaskBehavior.java
index c556b1aef9..fdde18f78f 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/RunTaskBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/RunTaskBehavior.java
@@ -10,7 +10,7 @@ public abstract class RunTaskBehavior extends AbstractPostAjaxBehavior {
target.prependJavaScript(String.format(""
+ "var $button = $('#%s');"
+ "if ($button.length != 0) {"
- + "$button.removeAttr('disabled');"
+ + "$button.removeClass('disabled');"
+ "$button.val($button[0].prevValue);"
+ "$button.html($button[0].prevHtml);"
+ "}",
@@ -22,7 +22,7 @@ public abstract class RunTaskBehavior extends AbstractPostAjaxBehavior {
target.appendJavaScript(String.format(""
+ "var $button = $('#%s');"
+ "if ($button.length != 0) {"
- + "$button.attr('disabled', 'disabled');"
+ + "$button.addClass('disabled');"
+ "$button[0].prevValue = $button.val();"
+ "$button[0].prevHtml = $button.html();"
+ "$button.val($button.val() + ' in progress...');"
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/blame-message.css b/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/blame-message.css
index fedfcb7de8..0254515919 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/blame-message.css
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/blame-message.css
@@ -1,16 +1,18 @@
.blame-message {
- white-space: pre-wrap;
- word-wrap: break-word;
+ background-color: var(--light-info);
+ border-radius: 0.42rem;
+ color: var(--info);
position: absolute;
z-index: 10000;
- font-size: 13px;
- background-color: #FBFCC5;
- border: 1px solid black;
- border-radius: 4px;
- color: black;
- padding: 8px;
+ font-size: 12px;
+ padding: 1rem;
+ z-index: 10000;
+ box-shadow: 0px 10px 30px 0px rgba(82, 63, 105, 0.08);
+ max-width: 720px;
+ white-space: pre-wrap;
+ word-wrap: break-word;
}
.blame-message>.authoring {
- margin-bottom: 12px;
+ margin-bottom: 1rem;
font-weight: bold;
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/BootstrapSwitchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/BootstrapSwitchBehavior.java
new file mode 100644
index 0000000000..e751ca5d12
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/BootstrapSwitchBehavior.java
@@ -0,0 +1,21 @@
+package io.onedev.server.web.behavior.bootstrapswitch;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+
+@SuppressWarnings("serial")
+public class BootstrapSwitchBehavior extends Behavior {
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+ response.render(JavaScriptHeaderItem.forReference(new BootstrapSwitchResourceReference()));
+
+ String script = String.format("onedev.server.bootstrapSwitch.onDomReady('%s');", component.getMarkupId(true));
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/BootstrapSwitchResourceReference.java b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/BootstrapSwitchResourceReference.java
new file mode 100644
index 0000000000..6b02f16739
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/BootstrapSwitchResourceReference.java
@@ -0,0 +1,33 @@
+package io.onedev.server.web.behavior.bootstrapswitch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+
+public class BootstrapSwitchResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public BootstrapSwitchResourceReference() {
+ super(BootstrapSwitchResourceReference.class, "bootstrap-switch-integration.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = new ArrayList<>();
+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(
+ BootstrapSwitchResourceReference.class, "bootstrap-switch.min.js")));
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ BootstrapSwitchResourceReference.class, "bootstrap-switch.min.css")));
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ BootstrapSwitchResourceReference.class, "bootstrap-switch-custom.css")));
+ return dependencies;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch-custom.css b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch-custom.css
new file mode 100644
index 0000000000..c491cbc4ac
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch-custom.css
@@ -0,0 +1,79 @@
+.bootstrap-switch {
+ border-color: var(--secondary);
+ display: inline-block;
+}
+.bootstrap-switch .bootstrap-switch-label {
+ color: var(--gray-dark);
+ background: white;
+}
+.bootstrap-switch.bootstrap-switch-focused {
+ box-shadow: none;
+ border-color: var(--secondary);
+}
+.bootstrap-switch .bootstrap-switch-handle-on,
+.bootstrap-switch .bootstrap-switch-handle-off,
+.bootstrap-switch .bootstrap-switch-label {
+ padding-top: 0.65rem;
+ padding-bottom: 0.65rem;
+ padding-left: 1rem;
+ padding-right: 1rem;
+ line-height: 1.5;
+ letter-spacing: 0.1rem;
+ font-size: 0.9rem;
+ font-weight: 400;
+}
+.bootstrap-switch.bootstrap-switch-extra-small .bootstrap-switch-handle-off,
+.bootstrap-switch.bootstrap-switch-extra-small .bootstrap-switch-handle-on,
+.bootstrap-switch.bootstrap-switch-extra-small .bootstrap-switch-label {
+ padding: 4px 6px;
+ font-size: 11px;
+ line-height: 1.2;
+}
+.bootstrap-switch.bootstrap-switch-disabled,
+.bootstrap-switch.bootstrap-switch-readonly,
+.bootstrap-switch.bootstrap-switch-indeterminate {
+ cursor: default !important;
+}
+
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-secondary,
+.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-secondary {
+ background-color: var(--secondary);
+ border-color: var(--secondary);
+ color: var(--gray-dark);
+}
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary,
+.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary {
+ background-color: var(--primary);
+ border-color: var(--primary);
+ color: white;
+}
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success,
+.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success {
+ background-color: var(--success);
+ border-color: var(--success);
+ color: white;
+}
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning,
+.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning {
+ background-color: var(--warning);
+ border-color: var(--warning);
+ color: white;
+}
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger,
+.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger {
+ background-color: var(--danger);
+ border-color: var(--danger);
+ color: white;
+}
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info,
+.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info {
+ background-color: var(--info);
+ border-color: var(--info);
+ color: white;
+}
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-dark,
+.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-dark {
+ background-color: var(--dark);
+ border-color: var(--dark);
+ color: white;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch-integration.js b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch-integration.js
new file mode 100644
index 0000000000..495ac7ecdf
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch-integration.js
@@ -0,0 +1,12 @@
+onedev.server.bootstrapSwitch = {
+ onDomReady: function(elementId) {
+ var $switch = $("#" + elementId);
+ var $clone = $switch.clone();
+ $clone.insertAfter($switch);
+ $switch.hide();
+ $clone.bootstrapSwitch();
+ $clone.on("switchChange.bootstrapSwitch", function(e) {
+ $switch.trigger("click");
+ });
+ }
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch.min.css b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch.min.css
new file mode 100644
index 0000000000..77006595e8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch.min.css
@@ -0,0 +1,10 @@
+/**
+ * bootstrap-switch - Turn checkboxes and radio buttons into toggle switches.
+ *
+ * @version v3.3.4
+ * @homepage https://bttstrp.github.io/bootstrap-switch
+ * @author Mattia Larentis <[email protected]> (http://larentis.eu)
+ * @license Apache-2.0
+ */
+
+.bootstrap-switch{display:inline-block;direction:ltr;cursor:pointer;border-radius:4px;border:1px solid #ccc;position:relative;text-align:left;overflow:hidden;line-height:8px;z-index:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.bootstrap-switch .bootstrap-switch-container{display:inline-block;top:0;border-radius:4px;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.bootstrap-switch .bootstrap-switch-handle-off,.bootstrap-switch .bootstrap-switch-handle-on,.bootstrap-switch .bootstrap-switch-label{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;cursor:pointer;display:table-cell;vertical-align:middle;padding:6px 12px;font-size:14px;line-height:20px}.bootstrap-switch .bootstrap-switch-handle-off,.bootstrap-switch .bootstrap-switch-handle-on{text-align:center;z-index:1}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary{color:#fff;background:#337ab7}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info{color:#fff;background:#5bc0de}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success{color:#fff;background:#5cb85c}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning{background:#f0ad4e;color:#fff}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger{color:#fff;background:#d9534f}.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default,.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default{color:#000;background:#eee}.bootstrap-switch .bootstrap-switch-label{text-align:center;margin-top:-1px;margin-bottom:-1px;z-index:100;color:#333;background:#fff}.bootstrap-switch span::before{content:"\200b"}.bootstrap-switch .bootstrap-switch-handle-on{border-bottom-left-radius:3px;border-top-left-radius:3px}.bootstrap-switch .bootstrap-switch-handle-off{border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch input[type=radio],.bootstrap-switch input[type=checkbox]{position:absolute!important;top:0;left:0;margin:0;z-index:-1;opacity:0;filter:alpha(opacity=0);visibility:hidden}.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-label{padding:1px 5px;font-size:12px;line-height:1.5}.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-label{padding:5px 10px;font-size:12px;line-height:1.5}.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-label{padding:6px 16px;font-size:18px;line-height:1.3333333}.bootstrap-switch.bootstrap-switch-disabled,.bootstrap-switch.bootstrap-switch-indeterminate,.bootstrap-switch.bootstrap-switch-readonly{cursor:default!important}.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-label{opacity:.5;filter:alpha(opacity=50);cursor:default!important}.bootstrap-switch.bootstrap-switch-animate .bootstrap-switch-container{-webkit-transition:margin-left .5s;-o-transition:margin-left .5s;transition:margin-left .5s}.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-on{border-radius:0 3px 3px 0}.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-off{border-radius:3px 0 0 3px}.bootstrap-switch.bootstrap-switch-focused{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-off .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-on .bootstrap-switch-label{border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-on .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-off .bootstrap-switch-label{border-bottom-left-radius:3px;border-top-left-radius:3px}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch.min.js b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch.min.js
new file mode 100644
index 0000000000..1381dc1107
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/bootstrapswitch/bootstrap-switch.min.js
@@ -0,0 +1,10 @@
+/**
+ * bootstrap-switch - Turn checkboxes and radio buttons into toggle switches.
+ *
+ * @version v3.3.4
+ * @homepage https://bttstrp.github.io/bootstrap-switch
+ * @author Mattia Larentis <[email protected]> (http://larentis.eu)
+ * @license Apache-2.0
+ */
+
+(function(a,b){if('function'==typeof define&&define.amd)define(['jquery'],b);else if('undefined'!=typeof exports)b(require('jquery'));else{b(a.jquery),a.bootstrapSwitch={exports:{}}.exports}})(this,function(a){'use strict';function c(j,k){if(!(j instanceof k))throw new TypeError('Cannot call a class as a function')}var d=function(j){return j&&j.__esModule?j:{default:j}}(a),e=Object.assign||function(j){for(var l,k=1;k<arguments.length;k++)for(var m in l=arguments[k],l)Object.prototype.hasOwnProperty.call(l,m)&&(j[m]=l[m]);return j},f=function(){function j(k,l){for(var n,m=0;m<l.length;m++)n=l[m],n.enumerable=n.enumerable||!1,n.configurable=!0,'value'in n&&(n.writable=!0),Object.defineProperty(k,n.key,n)}return function(k,l,m){return l&&j(k.prototype,l),m&&j(k,m),k}}(),g=d.default||window.jQuery||window.$,h=function(){function j(k){var l=this,m=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{};c(this,j),this.$element=g(k),this.options=g.extend({},g.fn.bootstrapSwitch.defaults,this._getElementOptions(),m),this.prevOptions={},this.$wrapper=g('<div>',{class:function(){var o=[];return o.push(l.options.state?'on':'off'),l.options.size&&o.push(l.options.size),l.options.disabled&&o.push('disabled'),l.options.readonly&&o.push('readonly'),l.options.indeterminate&&o.push('indeterminate'),l.options.inverse&&o.push('inverse'),l.$element.attr('id')&&o.push('id-'+l.$element.attr('id')),o.map(l._getClass.bind(l)).concat([l.options.baseClass],l._getClasses(l.options.wrapperClass)).join(' ')}}),this.$container=g('<div>',{class:this._getClass('container')}),this.$on=g('<span>',{html:this.options.onText,class:this._getClass('handle-on')+' '+this._getClass(this.options.onColor)}),this.$off=g('<span>',{html:this.options.offText,class:this._getClass('handle-off')+' '+this._getClass(this.options.offColor)}),this.$label=g('<span>',{html:this.options.labelText,class:this._getClass('label')}),this.$element.on('init.bootstrapSwitch',this.options.onInit.bind(this,k)),this.$element.on('switchChange.bootstrapSwitch',function(){for(var n=arguments.length,o=Array(n),p=0;p<n;p++)o[p]=arguments[p];!1===l.options.onSwitchChange.apply(k,o)&&(l.$element.is(':radio')?g('[name="'+l.$element.attr('name')+'"]').trigger('previousState.bootstrapSwitch',!0):l.$element.trigger('previousState.bootstrapSwitch',!0))}),this.$container=this.$element.wrap(this.$container).parent(),this.$wrapper=this.$container.wrap(this.$wrapper).parent(),this.$element.before(this.options.inverse?this.$off:this.$on).before(this.$label).before(this.options.inverse?this.$on:this.$off),this.options.indeterminate&&this.$element.prop('indeterminate',!0),this._init(),this._elementHandlers(),this._handleHandlers(),this._labelHandlers(),this._formHandler(),this._externalLabelHandler(),this.$element.trigger('init.bootstrapSwitch',this.options.state)}return f(j,[{key:'setPrevOptions',value:function(){this.prevOptions=e({},this.options)}},{key:'state',value:function(l,m){return'undefined'==typeof l?this.options.state:this.options.disabled||this.options.readonly||this.options.state&&!this.options.radioAllOff&&this.$element.is(':radio')?this.$element:(this.$element.is(':radio')?g('[name="'+this.$element.attr('name')+'"]').trigger('setPreviousOptions.bootstrapSwitch'):this.$element.trigger('setPreviousOptions.bootstrapSwitch'),this.options.indeterminate&&this.indeterminate(!1),this.$element.prop('checked',!!l).trigger('change.bootstrapSwitch',m),this.$element)}},{key:'toggleState',value:function(l){return this.options.disabled||this.options.readonly?this.$element:this.options.indeterminate?(this.indeterminate(!1),this.state(!0)):this.$element.prop('checked',!this.options.state).trigger('change.bootstrapSwitch',l)}},{key:'size',value:function(l){return'undefined'==typeof l?this.options.size:(null!=this.options.size&&this.$wrapper.removeClass(this._getClass(this.options.size)),l&&this.$wrapper.addClass(this._getClass(l)),this._width(),this._containerPosition(),this.options.size=l,this.$element)}},{key:'animate',value:function(l){return'undefined'==typeof l?this.options.animate:this.options.animate===!!l?this.$element:this.toggleAnimate()}},{key:'toggleAnimate',value:function(){return this.options.animate=!this.options.animate,this.$wrapper.toggleClass(this._getClass('animate')),this.$element}},{key:'disabled',value:function(l){return'undefined'==typeof l?this.options.disabled:this.options.disabled===!!l?this.$element:this.toggleDisabled()}},{key:'toggleDisabled',value:function(){return this.options.disabled=!this.options.disabled,this.$element.prop('disabled',this.options.disabled),this.$wrapper.toggleClass(this._getClass('disabled')),this.$element}},{key:'readonly',value:function(l){return'undefined'==typeof l?this.options.readonly:this.options.readonly===!!l?this.$element:this.toggleReadonly()}},{key:'toggleReadonly',value:function(){return this.options.readonly=!this.options.readonly,this.$element.prop('readonly',this.options.readonly),this.$wrapper.toggleClass(this._getClass('readonly')),this.$element}},{key:'indeterminate',value:function(l){return'undefined'==typeof l?this.options.indeterminate:this.options.indeterminate===!!l?this.$element:this.toggleIndeterminate()}},{key:'toggleIndeterminate',value:function(){return this.options.indeterminate=!this.options.indeterminate,this.$element.prop('indeterminate',this.options.indeterminate),this.$wrapper.toggleClass(this._getClass('indeterminate')),this._containerPosition(),this.$element}},{key:'inverse',value:function(l){return'undefined'==typeof l?this.options.inverse:this.options.inverse===!!l?this.$element:this.toggleInverse()}},{key:'toggleInverse',value:function(){this.$wrapper.toggleClass(this._getClass('inverse'));var l=this.$on.clone(!0),m=this.$off.clone(!0);return this.$on.replaceWith(m),this.$off.replaceWith(l),this.$on=m,this.$off=l,this.options.inverse=!this.options.inverse,this.$element}},{key:'onColor',value:function(l){return'undefined'==typeof l?this.options.onColor:(this.options.onColor&&this.$on.removeClass(this._getClass(this.options.onColor)),this.$on.addClass(this._getClass(l)),this.options.onColor=l,this.$element)}},{key:'offColor',value:function(l){return'undefined'==typeof l?this.options.offColor:(this.options.offColor&&this.$off.removeClass(this._getClass(this.options.offColor)),this.$off.addClass(this._getClass(l)),this.options.offColor=l,this.$element)}},{key:'onText',value:function(l){return'undefined'==typeof l?this.options.onText:(this.$on.html(l),this._width(),this._containerPosition(),this.options.onText=l,this.$element)}},{key:'offText',value:function(l){return'undefined'==typeof l?this.options.offText:(this.$off.html(l),this._width(),this._containerPosition(),this.options.offText=l,this.$element)}},{key:'labelText',value:function(l){return'undefined'==typeof l?this.options.labelText:(this.$label.html(l),this._width(),this.options.labelText=l,this.$element)}},{key:'handleWidth',value:function(l){return'undefined'==typeof l?this.options.handleWidth:(this.options.handleWidth=l,this._width(),this._containerPosition(),this.$element)}},{key:'labelWidth',value:function(l){return'undefined'==typeof l?this.options.labelWidth:(this.options.labelWidth=l,this._width(),this._containerPosition(),this.$element)}},{key:'baseClass',value:function(){return this.options.baseClass}},{key:'wrapperClass',value:function(l){return'undefined'==typeof l?this.options.wrapperClass:(l||(l=g.fn.bootstrapSwitch.defaults.wrapperClass),this.$wrapper.removeClass(this._getClasses(this.options.wrapperClass).join(' ')),this.$wrapper.addClass(this._getClasses(l).join(' ')),this.options.wrapperClass=l,this.$element)}},{key:'radioAllOff',value:function(l){if('undefined'==typeof l)return this.options.radioAllOff;var m=!!l;return this.options.radioAllOff===m?this.$element:(this.options.radioAllOff=m,this.$element)}},{key:'onInit',value:function(l){return'undefined'==typeof l?this.options.onInit:(l||(l=g.fn.bootstrapSwitch.defaults.onInit),this.options.onInit=l,this.$element)}},{key:'onSwitchChange',value:function(l){return'undefined'==typeof l?this.options.onSwitchChange:(l||(l=g.fn.bootstrapSwitch.defaults.onSwitchChange),this.options.onSwitchChange=l,this.$element)}},{key:'destroy',value:function(){var l=this.$element.closest('form');return l.length&&l.off('reset.bootstrapSwitch').removeData('bootstrap-switch'),this.$container.children().not(this.$element).remove(),this.$element.unwrap().unwrap().off('.bootstrapSwitch').removeData('bootstrap-switch'),this.$element}},{key:'_getElementOptions',value:function(){return{state:this.$element.is(':checked'),size:this.$element.data('size'),animate:this.$element.data('animate'),disabled:this.$element.is(':disabled'),readonly:this.$element.is('[readonly]'),indeterminate:this.$element.data('indeterminate'),inverse:this.$element.data('inverse'),radioAllOff:this.$element.data('radio-all-off'),onColor:this.$element.data('on-color'),offColor:this.$element.data('off-color'),onText:this.$element.data('on-text'),offText:this.$element.data('off-text'),labelText:this.$element.data('label-text'),handleWidth:this.$element.data('handle-width'),labelWidth:this.$element.data('label-width'),baseClass:this.$element.data('base-class'),wrapperClass:this.$element.data('wrapper-class')}}},{key:'_width',value:function(){var l=this,m=this.$on.add(this.$off).add(this.$label).css('width',''),n='auto'===this.options.handleWidth?Math.round(Math.max(this.$on.width(),this.$off.width())):this.options.handleWidth;return m.width(n),this.$label.width(function(o,p){return'auto'===l.options.labelWidth?p<n?n:p:l.options.labelWidth}),this._handleWidth=this.$on.outerWidth(),this._labelWidth=this.$label.outerWidth(),this.$container.width(2*this._handleWidth+this._labelWidth),this.$wrapper.width(this._handleWidth+this._labelWidth)}},{key:'_containerPosition',value:function(){var l=this,m=0<arguments.length&&void 0!==arguments[0]?arguments[0]:this.options.state,n=arguments[1];this.$container.css('margin-left',function(){var o=[0,'-'+l._handleWidth+'px'];return l.options.indeterminate?'-'+l._handleWidth/2+'px':m?l.options.inverse?o[1]:o[0]:l.options.inverse?o[0]:o[1]})}},{key:'_init',value:function(){var l=this,m=function(){l.setPrevOptions(),l._width(),l._containerPosition(),setTimeout(function(){if(l.options.animate)return l.$wrapper.addClass(l._getClass('animate'))},50)};if(this.$wrapper.is(':visible'))return void m();var n=window.setInterval(function(){if(l.$wrapper.is(':visible'))return m(),window.clearInterval(n)},50)}},{key:'_elementHandlers',value:function(){var l=this;return this.$element.on({'setPreviousOptions.bootstrapSwitch':this.setPrevOptions.bind(this),'previousState.bootstrapSwitch':function(){l.options=l.prevOptions,l.options.indeterminate&&l.$wrapper.addClass(l._getClass('indeterminate')),l.$element.prop('checked',l.options.state).trigger('change.bootstrapSwitch',!0)},'change.bootstrapSwitch':function(n,o){n.preventDefault(),n.stopImmediatePropagation();var p=l.$element.is(':checked');l._containerPosition(p),p===l.options.state||(l.options.state=p,l.$wrapper.toggleClass(l._getClass('off')).toggleClass(l._getClass('on')),!o&&(l.$element.is(':radio')&&g('[name="'+l.$element.attr('name')+'"]').not(l.$element).prop('checked',!1).trigger('change.bootstrapSwitch',!0),l.$element.trigger('switchChange.bootstrapSwitch',[p])))},'focus.bootstrapSwitch':function(n){n.preventDefault(),l.$wrapper.addClass(l._getClass('focused'))},'blur.bootstrapSwitch':function(n){n.preventDefault(),l.$wrapper.removeClass(l._getClass('focused'))},'keydown.bootstrapSwitch':function(n){!n.which||l.options.disabled||l.options.readonly||(37===n.which||39===n.which)&&(n.preventDefault(),n.stopImmediatePropagation(),l.state(39===n.which))}})}},{key:'_handleHandlers',value:function(){var l=this;return this.$on.on('click.bootstrapSwitch',function(m){return m.preventDefault(),m.stopPropagation(),l.state(!1),l.$element.trigger('focus.bootstrapSwitch')}),this.$off.on('click.bootstrapSwitch',function(m){return m.preventDefault(),m.stopPropagation(),l.state(!0),l.$element.trigger('focus.bootstrapSwitch')})}},{key:'_labelHandlers',value:function(){var l=this;this.$label.on({click:function(o){o.stopPropagation()},'mousedown.bootstrapSwitch touchstart.bootstrapSwitch':function(o){l._dragStart||l.options.disabled||l.options.readonly||(o.preventDefault(),o.stopPropagation(),l._dragStart=(o.pageX||o.originalEvent.touches[0].pageX)-parseInt(l.$container.css('margin-left'),10),l.options.animate&&l.$wrapper.removeClass(l._getClass('animate')),l.$element.trigger('focus.bootstrapSwitch'))},'mousemove.bootstrapSwitch touchmove.bootstrapSwitch':function(o){if(null!=l._dragStart){var p=(o.pageX||o.originalEvent.touches[0].pageX)-l._dragStart;o.preventDefault(),p<-l._handleWidth||0<p||(l._dragEnd=p,l.$container.css('margin-left',l._dragEnd+'px'))}},'mouseup.bootstrapSwitch touchend.bootstrapSwitch':function(o){if(l._dragStart){if(o.preventDefault(),l.options.animate&&l.$wrapper.addClass(l._getClass('animate')),l._dragEnd){var p=l._dragEnd>-(l._handleWidth/2);l._dragEnd=!1,l.state(l.options.inverse?!p:p)}else l.state(!l.options.state);l._dragStart=!1}},'mouseleave.bootstrapSwitch':function(){l.$label.trigger('mouseup.bootstrapSwitch')}})}},{key:'_externalLabelHandler',value:function(){var l=this,m=this.$element.closest('label');m.on('click',function(n){n.preventDefault(),n.stopImmediatePropagation(),n.target===m[0]&&l.toggleState()})}},{key:'_formHandler',value:function(){var l=this.$element.closest('form');l.data('bootstrap-switch')||l.on('reset.bootstrapSwitch',function(){window.setTimeout(function(){l.find('input').filter(function(){return g(this).data('bootstrap-switch')}).each(function(){return g(this).bootstrapSwitch('state',this.checked)})},1)}).data('bootstrap-switch',!0)}},{key:'_getClass',value:function(l){return this.options.baseClass+'-'+l}},{key:'_getClasses',value:function(l){return g.isArray(l)?l.map(this._getClass.bind(this)):[this._getClass(l)]}}]),j}();g.fn.bootstrapSwitch=function(j){for(var l=arguments.length,m=Array(1<l?l-1:0),n=1;n<l;n++)m[n-1]=arguments[n];return Array.prototype.reduce.call(this,function(o,p){var q=g(p),r=q.data('bootstrap-switch'),s=r||new h(p,j);return r||q.data('bootstrap-switch',s),'string'==typeof j?s[j].apply(s,m):o},this)},g.fn.bootstrapSwitch.Constructor=h,g.fn.bootstrapSwitch.defaults={state:!0,size:null,animate:!0,disabled:!1,readonly:!1,indeterminate:!1,inverse:!1,radioAllOff:!1,onColor:'primary',offColor:'default',onText:'ON',offText:'OFF',labelText:'&nbsp',handleWidth:'auto',labelWidth:'auto',baseClass:'bootstrap-switch',wrapperClass:'wrapper',onInit:function(){},onSwitchChange:function(){}}});
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js b/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js
index d0e4efc69b..7d295d0e83 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js
@@ -5,7 +5,7 @@ onedev.server.dropdownHover = {
$trigger.data("hide", function() {
if ($trigger.data("dropdown"))
- onedev.server.floating.close($trigger.data("dropdown"), true);
+ $trigger.data("dropdown").data("closeCallback")();
$trigger.data("hideTimer", null);
});
$trigger.data("prepareToHide", function() {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
index c9c4daaf7e..0fcdb7e1b0 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
@@ -1,14 +1,14 @@
<wicket:panel>
<div class="input-assist">
- <div wicket:id="suggestions" class="suggestions autosize">
- <table>
- <tr wicket:id="suggestions" class="suggestion">
- <td wicket:id="content" class="content"></td>
- <td wicket:id="description" class="description"></td>
- </tr>
- </table>
- </div>
- <ul class="help list-unstyled">
+ <ul wicket:id="suggestions" class="suggestions overflow-auto list-unstyled">
+ <li wicket:id="suggestions" class="suggestion selectable">
+ <a class="d-flex align-items-center">
+ <span wicket:id="content" class="content text-nowrap font-size-sm mr-auto"></span>
+ <span wicket:id="description" class="ml-4 description text-muted"></span>
+ </a>
+ </li>
+ </ul>
+ <ul class="help list-unstyled rounded mt-3 mb-0 text-muted bg-light px-3 py-2">
<li wicket:id="hints"></li>
<li><span class='complete'></span> &uarr;&darr; to select item. Esc to <a wicket:id="close">close</a></li>
</ul>
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
index a93214a61e..ff35436ebe 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
@@ -56,7 +56,7 @@ abstract class AssistPanel extends Panel {
@Override
protected String getItemSelector() {
- return ">table>tbody>tr";
+ return ">li";
}
@Override
@@ -66,7 +66,7 @@ abstract class AssistPanel extends Panel {
InputCompletion suggestion = suggestions.get(i);
Component suggestionItem = newSuggestionItem(suggestionsView.newChildId(), suggestion);
suggestionsView.add(suggestionItem);
- String script = String.format("$('#%s .suggestions>table>tbody').append('<tr id=\"%s\"></tr>');",
+ String script = String.format("$('#%s .suggestions').append('<li id=\"%s\"></li>');",
AssistPanel.this.getMarkupId(), suggestionItem.getMarkupId());
target.prependJavaScript(script);
target.add(suggestionItem);
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/bullet.gif b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/bullet.gif
deleted file mode 100644
index 7b1efa5498..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/bullet.gif and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css
index 453aa421f7..b8bb8cad0e 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css
@@ -1,43 +1,18 @@
.floating>.content>.input-assist {
- padding: 8px;
+ padding: 1rem;
}
.input-assist .suggestions {
max-height: 400px;
}
-.input-assist td {
- color: #333;
- padding: 4px 8px;
- cursor: pointer;
-}
-.input-assist tr:hover td {
- background-color: #E0F0FC;
-}
-.input-assist tr.active td {
- background-color: #CBE8FB;
- border-color: #8BC8F9;
-}
-.input-assist tr.suggestion td.content {
- padding-right: 12px;
+.input-assist li.suggestion .content {
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
- font-size: 12px;
- white-space: nowrap;
-}
-.input-assist td.description {
- text-align: right;
- font-size: 12px;
- color: #999;
}
.input-assist .help {
- margin-top: 8px;
- margin-bottom: 0;
- background: #F0F0F0;
- padding: 2px 4px;
- border: 1px dashed #CCC;
- color: #666;
+ border: 1px dashed var(--secondary);
}
.input-assist .help li {
list-style: disc;
- margin-left: 18px;
+ margin-left: 1.5rem;
}
.input-error-mark {
background: url(wave.png) repeat-x bottom;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
index 8b2e05347b..42bc368a79 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
@@ -44,17 +44,17 @@ onedev.server.inputassist = {
$input.bind("keydown", "up", function() {
var $dropdown = $input.data("dropdown");
if ($dropdown) {
- var $active = $dropdown.find("tr.active");
+ var $active = $dropdown.find("li.active");
if ($active.length != 0) {
- var $prev = $active.prev("tr:not(.loading-indicator)");
+ var $prev = $active.prev("li:not(.loading-indicator)");
if ($prev.length != 0) {
$prev.addClass("active");
$active.removeClass("active");
}
} else {
- $dropdown.find("tr:not(.loading-indicator)").last().addClass("active");
+ $dropdown.find("li:not(.loading-indicator)").last().addClass("active");
}
- $dropdown.find(".suggestions tr.active").scrollIntoView();
+ $dropdown.find(".suggestions li.active").scrollIntoView();
onedev.server.inputassist.updateHelp($dropdown);
$dropdown.align($dropdown.data("alignment"));
return false;
@@ -64,17 +64,17 @@ onedev.server.inputassist = {
$input.bind("keydown", "down", function() {
var $dropdown = $input.data("dropdown");
if ($dropdown) {
- var $active = $dropdown.find("tr.active");
+ var $active = $dropdown.find("li.active");
if ($active.length != 0) {
- var $next = $active.next("tr:not(.loading-indicator)");
+ var $next = $active.next("li:not(.loading-indicator)");
if ($next.length != 0) {
$next.addClass("active");
$active.removeClass("active");
}
} else {
- $dropdown.find("tr:not(.loading-indicator)").first().addClass("active");
+ $dropdown.find("li:not(.loading-indicator)").first().addClass("active");
}
- $dropdown.find(".suggestions tr.active").scrollIntoView();
+ $dropdown.find(".suggestions li.active").scrollIntoView();
onedev.server.inputassist.updateHelp($dropdown);
$dropdown.align($dropdown.data("alignment"));
return false;
@@ -84,7 +84,7 @@ onedev.server.inputassist = {
$input.bind("keydown", "return", function() {
var $dropdown = $input.data("dropdown");
if ($dropdown) {
- var $active = $dropdown.find("tr.active");
+ var $active = $dropdown.find("li.active");
if ($active.length != 0) {
$input.data("update")($active);
return false;
@@ -103,11 +103,11 @@ onedev.server.inputassist = {
setTimeout(tab, 10);
} else {
tabbing = false;
- var $active = $dropdown.find("tr.active");
+ var $active = $dropdown.find("li.active");
if ($active.length != 0)
$input.data("update")($active);
- else if ($dropdown.find("tr").length != 0)
- $input.data("update")($dropdown.find("tr").first());
+ else if ($dropdown.find("li").length != 0)
+ $input.data("update")($dropdown.find("li").first());
}
return false;
} else {
@@ -173,7 +173,7 @@ onedev.server.inputassist = {
$dropdown.click(function() {
$input.focus();
});
- var $item = $dropdown.find("tr");
+ var $item = $dropdown.find("li");
$item.click(function() {
var $this = $(this);
$input.data("update")($this);
@@ -195,7 +195,7 @@ onedev.server.inputassist = {
},
updateHelp: function($dropdown) {
- if ($dropdown.find("tr.active").length != 0) {
+ if ($dropdown.find("li.active").length != 0) {
$dropdown.find(".help .complete").empty().append("Tab or &crarr; to use selected item.");
} else {
$dropdown.find(".help .complete").empty().append("Tab to use first item.");
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/sortable/sortable.css b/server-core/src/main/java/io/onedev/server/web/behavior/sortable/sortable.css
index e7734523c6..c4866e01b4 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/sortable/sortable.css
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/sortable/sortable.css
@@ -1,6 +1,6 @@
tr.ui-sortable-helper {
display: table;
background: #F5F5F5;
- border-top: 1px solid #E0E0E0;
- border-bottom: 1px solid #E0E0E0;
+ border-top: 1px solid var(--secondary);
+ border-bottom: 1px solid var(--secondary);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html
index 15bcc81e87..b28b2e71c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="bean-edit">
<div class="modal-header">
<h5 wicket:id="title" class="modal-title"></h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java
index 4d681d7b2b..ed7e8f9472 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java
@@ -36,7 +36,7 @@ public abstract class CreateBranchLink extends ModalLink {
@Override
protected void onCreate(AjaxRequestTarget target, String branch) {
modal.close();
- CreateBranchLink.this.onCreate(target, branch);
+ CreateBranchLink.this.onCreated(target, branch);
}
@Override
@@ -54,5 +54,5 @@ public abstract class CreateBranchLink extends ModalLink {
super.onDetach();
}
- protected abstract void onCreate(AjaxRequestTarget target, String branch);
+ protected abstract void onCreated(AjaxRequestTarget target, String branch);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.html b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.html
index 5ae924d9cf..d97d609c12 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="create-branch">
<div class="modal-header">
<h5 class="modal-title">Create Branch</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.html b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.html
index 437d1c4e91..cd07342269 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.html
@@ -1,6 +1,6 @@
<wicket:panel>
<span class="text-nowrap">
- <a wicket:id="projectPicker" class="project btn btn-sm btn-outline-secondary"></a>
+ <a wicket:id="projectPicker" class="project btn btn-sm btn-outline-secondary mr-2"></a>
<a wicket:id="branchPicker" class="branch btn btn-sm btn-outline-secondary"></a>
</span>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java
index 7caf2e6147..a7845e6721 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java
@@ -55,7 +55,7 @@ public abstract class BranchPicker extends DropdownLink {
+ "<span class='branch-picker'>"
+ " <svg class='icon'><use xlink:href='%s'/></svg>"
+ " <span>%s</span> "
- + " <svg class='icon icon-sm rotate-90'><use xlink:href='%s'/></svg>"
+ + " <svg class='icon rotate-90'><use xlink:href='%s'/></svg>"
+ "</span>",
SpriteImage.getVersionedHref(IconScope.class, "branch"),
branch!=null?HtmlEscape.escapeHtml5(branch):"<i>choose</i>",
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html
index a78954b234..a7b4421bfe 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html
@@ -1,10 +1,14 @@
<wicket:panel>
- <div class="branch-selector">
- <input wicket:id="branch" class="form-control input-sm branch" placeholder="Search branch"></input>
- <ul wicket:id="branches" class="branches autosize list-unstyled">
+ <div class="branch-selector p-4">
+ <div class="d-flex align-items-center">
+ <input wicket:id="branch" class="form-control form-control-sm branch" placeholder="Search branch"></input>
+ <wicket:svg href="magnify" class="icon text-muted icon-magnify"></wicket:svg>
+ </div>
+ <ul wicket:id="branches" class="branches list-unstyled mb-0 mt-3">
<li wicket:id="branches" class="selectable">
- <a wicket:id="link"><wicket:svg href="tick" class="icon"/> <span wicket:id="label"></span></a>
+ <a wicket:id="link"><wicket:svg href="tick" class="icon mr-2"/> <span wicket:id="label"></span></a>
</li>
</ul>
+ <div wicket:id="noBranches" class="no-branches alert alert-light-warning mb-0 mt-4">No branches Found</div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java
index e7a6c4aef2..4dadf609fc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java
@@ -100,6 +100,28 @@ public abstract class BranchSelector extends Panel {
};
add(keyBehavior);
+ WebMarkupContainer noBranchesContainer = new WebMarkupContainer("noBranches") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(filteredBranches.isEmpty());
+ }
+
+ };
+ noBranchesContainer.setOutputMarkupPlaceholderTag(true);
+ add(noBranchesContainer);
+
+ WebMarkupContainer branchesContainer = new WebMarkupContainer("branches") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!filteredBranches.isEmpty());
+ }
+
+ };
+
branchField.add(new InputChangeBehavior() {
@Override
@@ -119,12 +141,12 @@ public abstract class BranchSelector extends Panel {
if (activeBranchIndex >= filteredBranches.size())
activeBranchIndex = 0;
- target.add(get("branches"));
+ target.add(branchesContainer);
+ target.add(noBranchesContainer);
}
});
- WebMarkupContainer branchesContainer = new WebMarkupContainer("branches");
branchesContainer.add(new ListView<String>("branches", filteredBranches) {
@Override
@@ -153,7 +175,8 @@ public abstract class BranchSelector extends Panel {
}
});
- branchesContainer.setOutputMarkupId(true);
+
+ branchesContainer.setOutputMarkupPlaceholderTag(true);
add(branchesContainer);
setOutputMarkupId(true);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-selector.css b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-selector.css
index 7ad81aacd2..a8e661f0fb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-selector.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-selector.css
@@ -1,44 +1,14 @@
-div.branch-selector input.branch {
- margin-bottom: 12px;
- background: url(search.gif) no-repeat right 6px center;
- padding-right: 26px;
+.branch-selector input {
+ padding-right: 2rem;
}
-div.branch-selector .nav-tabs {
- margin-bottom: 8px;
+.branch-selector input+.icon {
+ margin-left: -1.8rem;
}
-div.branch-selector .nav-tabs>li>a {
- padding: 2px 4px;
- color: #666;
- font-size: 12px;
-}
-div.branch-selector .nav-tabs>li.active>a {
- color: #333;
- font-weight: bold;
-}
-div.branch-selector {
- padding: 12px;
-}
-div.branch-selector ul.branches {
- margin-bottom: 0;
-}
-div.branch-selector ul.branches>li {
- position: relative;
-}
-div.branch-selector ul.branches>li>a {
- padding-left: 20px;
-}
-div.branch-selector .feedback {
- color: #F94949;
- margin-bottom: 12px;
-}
-div.branch-selector a svg {
- display: none;
- position: absolute;
- left: 4px;
- top: 14px;
+.branch-selector a svg {
+ visibility: hidden;
width: 12px;
height: 12px;
}
-div.branch-selector a.current svg {
- display: inline-block;
+.branch-selector a.current svg {
+ visibility: visible;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/search.gif b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/search.gif
deleted file mode 100644
index e79f54dbe9..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/search.gif and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
index ec03593ff3..554e63554d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
@@ -1,36 +1,32 @@
<wicket:panel>
- <div class="build-list">
- <div class="head">
- <form wicket:id="query" class="clearable-wrapper">
+ <div class="build-list card">
+ <div class="card-body">
+ <form wicket:id="query" class="clearable-wrapper mb-4">
<div class="input-group">
<input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order builds here">
<span class="input-group-append">
- <button wicket:id="submit" type="submit" class="btn btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ <button wicket:id="submit" type="submit" class="btn btn-icon btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
</span>
</div>
</form>
- <div class="operations">
- <a wicket:id="showSavedQueries" class="show-saved-queries">
- <wicket:svg href="eye" class="icon"></wicket:svg>
- Show Saved Queries
+ <div class="mb-4">
+ <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4">
+ <wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
</a>
- <a wicket:id="saveQuery" class="save-query">
- <wicket:svg href="save" class="icon"></wicket:svg>
- Save Query
+ <a wicket:id="saveQuery" class="save-query text-gray mr-4">
+ <wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <a wicket:id="listParams" class="list-params">
- <wicket:svg href="select" class="icon"></wicket:svg>
- Display Params
+ <a wicket:id="listParams" class="list-params text-gray mr-4 d-none d-xl-inline">
+ <wicket:svg href="select" class="icon"></wicket:svg> Display Params
</a>
- <a wicket:id="orderBy" class="order-by">
- <wicket:svg href="sort" class="icon"></wicket:svg>
- Order By
+ <a wicket:id="orderBy" class="order-by text-gray">
+ <wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
</div>
- </div>
- <div wicket:id="body" class="body">
- <div wicket:id="feedback"></div>
- <table wicket:id="builds" class="table"></table>
+ <div wicket:id="body">
+ <div wicket:id="feedback"></div>
+ <table wicket:id="builds" class="table"></table>
+ </div>
</div>
</div>
<wicket:fragment wicket:id="buildFrag">
@@ -57,7 +53,7 @@
<form wicket:id="form">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Params to Display</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<input wicket:id="params" type="hidden" class="form-control">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 5407068584..743297acd3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -25,8 +25,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -45,8 +43,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.collect.Sets;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildParamManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -230,7 +228,7 @@ public abstract class BuildListPanel extends Panel {
super.onComponentTag(tag);
configure();
if (!isEnabled())
- tag.put("disabled", "disabled");
+ tag.append("class", "disabled", " ");
if (!querySubmitted)
tag.put("title", "Query not submitted");
else if (queryModel.getObject() == null)
@@ -375,11 +373,7 @@ public abstract class BuildListPanel extends Panel {
query = new BuildQuery();
query.getSorts().clear();
query.getSorts().addAll(object);
- String queryString = query.toString();
- if (queryString.length() != 0)
- queryStringModel.setObject(queryString);
- else
- queryStringModel.setObject(null);
+ queryStringModel.setObject(query.toString());
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
doQuery(target);
@@ -577,7 +571,7 @@ public abstract class BuildListPanel extends Panel {
@Override
public String getCssClass() {
- return "commit expanded";
+ return "commit d-none d-lg-table-cell";
}
@Override
@@ -605,7 +599,7 @@ public abstract class BuildListPanel extends Panel {
@Override
public String getCssClass() {
- return "param expanded";
+ return "param d-none d-xl-table-cell";
}
@Override
@@ -625,7 +619,7 @@ public abstract class BuildListPanel extends Panel {
@Override
public String getCssClass() {
- return "date expanded";
+ return "date d-none d-xl-table-cell";
}
@Override
@@ -694,10 +688,4 @@ public abstract class BuildListPanel extends Panel {
};
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new BuildListResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListResourceReference.java
deleted file mode 100644
index 862fe65705..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.build.list;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class BuildListResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public BuildListResourceReference() {
- super(BuildListResourceReference.class, "build-list.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.css b/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.css
deleted file mode 100644
index 46297e6f0c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.css
+++ /dev/null
@@ -1,19 +0,0 @@
-@media(max-width: 767px) {
- .build-list .expanded {
- display: none;
- }
-}
-.build-list>.head {
- position: relative;
-}
-.build-list>.head>* {
- margin-bottom: 20px;
-}
-.build-list>.head>.operations>* {
- margin-right: 16px;
- color: #444;
- white-space: nowrap;
-}
-.build-list>.head>.operations>*:last-child {
- margin-right: 0;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.html
index 63b0b4ce02..5bd2c0d6c0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <pre class="build-log"></pre>
+ <pre class="build-log autofit flex-grow-1 rounded bg-black text-break text-white ps ps-scroll p-3 mb-0"></pre>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
index cbb0ebbd32..7003231b9a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
@@ -87,7 +87,7 @@ public class BuildLogPanel extends GenericPanel<Build> {
nextOffset = snippet.offset + snippet.entries.size();
- String script = String.format("onedev.server.buildLog.onDomReady('%s', %s, %d);",
+ String script = String.format("onedev.server.buildLog.appendLogEntries('%s', %s, %d);",
getMarkupId(), asJSON(snippet.entries), MAX_LOG_ENTRIES);
response.render(OnDomReadyHeaderItem.forScript(script));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java
index b74f1b97b2..6aecd04106 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java
@@ -7,7 +7,6 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import io.onedev.server.web.asset.moment.MomentResourceReference;
-import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -22,7 +21,6 @@ public class BuildLogResourceReference extends BaseDependentResourceReference {
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new MomentResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
BuildLogResourceReference.class, "build-log.css")));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
index 6b8629e336..6843fe4a99 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
@@ -1,16 +1,4 @@
-.build-log {
- background: black;
- color: white;
- position: relative;
- white-space: pre-wrap;
- word-break: normal;
- padding: 8px;
-}
-.build-log>.log-entry>.date {
- padding-right: 8px;
-}
-.build-log>.too-many-entries, .build-log>.no-entries {
- color: yellow;
- font-size: 16px;
- font-weight: bold;
-}
\ No newline at end of file
+.build-log.ps.ps-scroll>.ps__rail-x>.ps__thumb-x,
+.build-log.ps.ps-scroll>.ps__rail-y>.ps__thumb-y {
+ background: var(--muted);
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js
index af1bb0e420..e9b13ced7e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js
@@ -1,16 +1,7 @@
onedev.server.buildLog = {
- onDomReady: function(containerId, logEntries, maxNumOfLogEntries) {
- var $buildLog = $("#" + containerId + ">.build-log");
- var ps = new PerfectScrollbar($buildLog[0]);
- $buildLog.data("ps", ps);
- $(window).resize(function() {
- ps.update();
- });
- onedev.server.buildLog.appendLogEntries(containerId, logEntries, maxNumOfLogEntries);
- },
renderLogEntry: function(logEntry) {
var $logEntry = $("<div class='log-entry'></div>");
- $logEntry.append("<span class='date'>" + moment(logEntry.date).format("HH:mm:ss") + "</span>");
+ $logEntry.append("<span class='date mr-3'>" + moment(logEntry.date).format("HH:mm:ss") + "</span>");
var $message = $("<span class='message'></span>");
$message.text(logEntry.message);
$logEntry.append($message);
@@ -28,15 +19,15 @@ onedev.server.buildLog = {
if (numOfEntriesToRemove > 0) {
$logEntries.slice(0, numOfEntriesToRemove).remove();
if ($buildLog.children(".too-many-entries").length == 0)
- $buildLog.prepend("<div class='too-many-entries'>Too many log entries, displaying recent " + maxNumOfLogEntries + "</div>")
+ $buildLog.prepend("<h6 class='too-many-entries text-warning'>Too many log entries, displaying recent " + maxNumOfLogEntries + "</h6>")
}
if ($logEntries.length == 0) {
if ($buildLog.children(".no-entries").length == 0)
- $buildLog.prepend("<div class='no-entries'>No log entries</div>");
+ $buildLog.prepend("<h6 class='no-entries text-warning'>No log entries</h6>");
} else {
$buildLog.children(".no-entries").remove();
}
- $buildLog.data("ps").update();
+ $buildLog.trigger("resized");
$buildLog.scrollTop($buildLog[0].scrollHeight);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
index 64944f3756..c2c2376f57 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
@@ -1,6 +1,5 @@
<wicket:panel>
<div class="build-side">
- <div wicket:id="buildNav" class="nav"></div>
<div wicket:id="general" class="general properties">
<div>
<div class="name">Commit</div>
@@ -26,7 +25,7 @@
</div>
<wicket:enclosure>
<div>
- <div class="reason">Submit Reason</div>
+ <div class="name">Submit Reason</div>
<div class="value"><span wicket:id="submitReason"></span></div>
</div>
</wicket:enclosure>
@@ -59,11 +58,11 @@
</div>
<wicket:enclosure child="pullRequests">
<div class="pull-requests">
- <div class="head">Verifying Pull Requests</div>
+ <div class="font-weight-bolder mb-3">Verifying Pull Requests</div>
<div class="body">
- <div wicket:id="pullRequests" class="pull-request">
- <a wicket:id="title" class="title"><span wicket:id="label"></span></a>
- <div wicket:id="status" class="status"></div>
+ <div wicket:id="pullRequests" class="pull-request d-flex align-items-center mb-3">
+ <a wicket:id="title" class="title mr-4"><span wicket:id="label"></span></a>
+ <div wicket:id="status" class="ml-auto status"></div>
</div>
</div>
</div>
@@ -87,7 +86,7 @@
</div>
<wicket:enclosure child="delete">
<div class="actions">
- <a wicket:id="delete" class="delete btn btn-danger btn-sm"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
+ <a wicket:id="delete" class="delete btn btn-light-danger">Delete</a>
</div>
</wicket:enclosure>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index c55b6c8af9..90e44c5034 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -6,8 +6,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
import org.apache.wicket.Component;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.ComponentTag;
@@ -25,22 +23,17 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.collect.Sets;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.build.ParamValuesLabel;
-import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.job.JobDefLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
@@ -49,7 +42,6 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.builds.BuildListPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
-import io.onedev.server.web.util.CursorSupport;
@SuppressWarnings("serial")
public abstract class BuildSidePanel extends Panel {
@@ -62,30 +54,6 @@ public abstract class BuildSidePanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new EntityNavPanel<Build>("buildNav") {
-
- @Override
- protected EntityQuery<Build> parse(String queryString, boolean inProject) {
- return BuildQuery.parse(inProject?getProject():null, queryString, true, true);
- }
-
- @Override
- protected Build getEntity() {
- return getBuild();
- }
-
- @Override
- protected List<Build> query(EntityQuery<Build> query, int offset, int count, boolean inProject) {
- return getBuildManager().query(inProject?getProject():null, query, offset, count);
- }
-
- @Override
- protected CursorSupport<Build> getCursorSupport() {
- return BuildSidePanel.this.getCursorSupport();
- }
-
- });
-
WebMarkupContainer general = new WebMarkupContainer("general") {
@Override
@@ -307,7 +275,10 @@ public abstract class BuildSidePanel extends Panel {
});
- add(newDeleteLink("delete"));
+ if (SecurityUtils.canManage(getBuild()))
+ add(newDeleteLink("delete"));
+ else
+ add(new WebMarkupContainer("delete").setVisible(false));
setOutputMarkupId(true);
}
@@ -316,10 +287,6 @@ public abstract class BuildSidePanel extends Panel {
return getBuild().getProject();
}
- private BuildManager getBuildManager() {
- return OneDev.getInstance(BuildManager.class);
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -328,9 +295,6 @@ public abstract class BuildSidePanel extends Panel {
protected abstract Build getBuild();
- @Nullable
- protected abstract CursorSupport<Build> getCursorSupport();
-
protected abstract Component newDeleteLink(String componentId);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.css b/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.css
index e1ac2234ac..073b509653 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.css
@@ -1,7 +1,7 @@
.build-side>* {
- margin-bottom: 20px;
- border-top: 1px solid #E8E8E8;
- padding-top: 20px;
+ margin-bottom: 1.5rem;
+ border-top: 1px dashed var(--secondary);
+ padding-top: 1.5rem;
}
.build-side>div:first-child {
border-top: none;
@@ -14,28 +14,16 @@
.build-side>.properties>div {
display: table-row;
}
-.build-side>.properties>div>div {
- display: table-cell;
- padding: 8px 0;
-}
.build-side>.properties>div>div.name {
- padding-right: 12px;
- width: 50%;
-}
-.build-side>.pull-requests>.head {
- font-weight: bold;
- margin-bottom: 8px;
+ display: table-cell;
+ padding: 0 1rem 1.5rem 0;
+ width: 40%;
+ font-weight: 500;
}
-.build-side>.pull-requests>.body .pull-request {
- margin-bottom: 8px;
- position: relative;
- padding-right: 55px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+.build-side>.properties>div>div.value {
+ display: table-cell;
+ padding: 0 0 1.5rem 1rem;
}
-.build-side>.pull-requests>.body .pull-request>.status {
- position: absolute;
- right: 0;
- top: 3px;
+.build-side>.properties>div:last-child>div {
+ padding-bottom: 0;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListCssResourceReference.java
deleted file mode 100644
index 188d31a714..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.build.simplelist;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class SimpleBuildListCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public SimpleBuildListCssResourceReference() {
- super(SimpleBuildListCssResourceReference.class, "simple-build-list.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html
index a477c069f9..84a6427112 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html
@@ -3,22 +3,19 @@
<wicket:fragment wicket:id="hasBuildsFrag">
<div class="has-builds">
<wicket:enclosure child="showInList">
- <div class="head">
- <span>Builds</span>
+ <div class="head d-flex align-items-center py-3 px-3 border-bottom">
+ <h6 class="mb-0 mr-4">Builds</h6>
<a wicket:id="showInList" class="show-in-list" title="Show in build list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
</div>
</wicket:enclosure>
- <div class="body">
+ <div class="body py-2">
<div wicket:id="builds">
- <a wicket:id="build" class="build">
- <span wicket:id="status" class="status"></span>
+ <a wicket:id="build" class="build d-flex align-items-center bg-hover-light text-hover-gray-dark px-3 py-2">
+ <svg wicket:id="status" class="status mr-2"></svg>
<span wicket:id="title" class="title"></span>
</a>
</div>
</div>
</div>
</wicket:fragment>
- <wicket:fragment wicket:id="noBuildsFrag">
- <div class="no-builds">No builds</div>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java
index a32c6a50df..d6a85f0d32 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java
@@ -3,8 +3,7 @@ package io.onedev.server.web.component.build.simplelist;
import java.util.List;
import org.apache.wicket.Component;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -38,9 +37,8 @@ public class SimpleBuildListPanel extends GenericPanel<List<Build>> {
protected void onInitialize() {
super.onInitialize();
- Fragment fragment;
if (!getBuilds().isEmpty()) {
- fragment = new Fragment("content", "hasBuildsFrag", this);
+ Fragment fragment = new Fragment("content", "hasBuildsFrag", this);
fragment.add(newListLink("showInList"));
fragment.add(new ListView<Build>("builds", getModel()) {
@@ -70,20 +68,14 @@ public class SimpleBuildListPanel extends GenericPanel<List<Build>> {
}
});
+ add(fragment);
} else {
- fragment = new Fragment("content", "noBuildsFrag", this);
+ add(new Label("content", "No builds").add(AttributeAppender.append("class", "no-builds font-italic mx-5 my-4")));
}
- add(fragment);
}
protected Component newListLink(String componentId) {
return new WebMarkupContainer(componentId).setVisible(false);
}
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new SimpleBuildListCssResourceReference()));
- }
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/simple-build-list.css b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/simple-build-list.css
deleted file mode 100644
index c7e66f2d10..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/simple-build-list.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.simple-build-list {
- padding: 12px;
-}
-.simple-build-list>.has-builds>.head {
- padding: 4px 0;
- border-bottom: 1px solid #DDD;
- margin-bottom: 4px;
- min-width: 100px;
- white-space: nowrap;
-}
-.simple-build-list>.has-builds>.head>span {
- font-weight: bold;
- font-size: 15px;
- display: inline-block;
- margin-right: 8px;
-}
-.simple-build-list>.has-builds>.head>a {
- color: #666;
-}
-.simple-build-list>.has-builds>.body>div>.build {
- padding: 4px 6px;
- display: block;
- text-decoration: none;
- white-space: nowrap;
-}
-.simple-build-list>.has-builds>.body>div>.build>.status {
- margin-right: 8px;
-}
-.simple-build-list>.has-builds>.body>div>.build:hover {
- background: #F0F0F0;
-}
-.simple-build-list>.no-builds {
- font-style: italic;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.html b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.html
deleted file mode 100644
index 7ef1a34c29..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<wicket:panel>
- <svg wicket:id="status" class="icon build-status"></svg>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
index fcd296cc85..257fd1fe6e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
@@ -2,72 +2,52 @@ package io.onedev.server.web.component.build.status;
import java.util.Collection;
+import javax.annotation.Nullable;
+
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import com.google.common.collect.Sets;
+import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.svg.SpriteImage;
@SuppressWarnings("serial")
-public class BuildStatusIcon extends GenericPanel<Status> {
+public class BuildStatusIcon extends SpriteImage {
+ private final IModel<Status> model;
+
public BuildStatusIcon(String id, IModel<Status> model) {
- super(id, model);
+ super(id, new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return getIconHref(model.getObject());
+ }
+
+ });
+ this.model = model;
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(new SpriteImage("status", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- Status status = BuildStatusIcon.this.getModelObject();
- if (status != null) {
- switch (status ) {
- case SUCCESSFUL:
- return "tick-circle-o";
- case FAILED:
- return "times-circle-o";
- case CANCELLED:
- return "cancel";
- case PENDING:
- return "target";
- case RUNNING:
- return "spin";
- case TIMED_OUT:
- return "clock";
- case WAITING:
- return "pause-circle";
- default:
- throw new RuntimeException("Unexpected build status: " + status);
- }
- } else {
- return "dot";
- }
- }
-
- }).add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
- if (getModelObject() != null)
- return "build-status-" + getModelObject().name().toLowerCase();
- else
- return "build-status-none";
+ return getIconClass(model.getObject());
}
- })));
+ }));
add(new WebSocketObserver() {
@@ -86,6 +66,12 @@ public class BuildStatusIcon extends GenericPanel<Status> {
setOutputMarkupId(true);
}
+ @Override
+ protected void onDetach() {
+ model.detach();
+ super.onDetach();
+ }
+
protected Collection<String> getWebSocketObservables() {
return Sets.newHashSet();
}
@@ -96,4 +82,38 @@ public class BuildStatusIcon extends GenericPanel<Status> {
response.render(CssHeaderItem.forReference(new BuildStatusCssResourceReference()));
}
+ public static String getIconHref(@Nullable Status status) {
+ if (status != null) {
+ switch (status ) {
+ case SUCCESSFUL:
+ return "tick-circle-o";
+ case FAILED:
+ return "times-circle-o";
+ case CANCELLED:
+ return "cancel";
+ case PENDING:
+ return "target";
+ case RUNNING:
+ return "spin";
+ case TIMED_OUT:
+ return "clock";
+ case WAITING:
+ return "pause-circle";
+ default:
+ throw new RuntimeException("Unexpected build status: " + status);
+ }
+ } else {
+ return "dot";
+ }
+ }
+
+ public static String getIconClass(@Nullable Status status) {
+ if (status == Build.Status.RUNNING)
+ return "icon build-status-running spin";
+ else if (status != null)
+ return "icon build-status-" + status.name().toLowerCase();
+ else
+ return "icon build-status-none";
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/status/build-status.css b/server-core/src/main/java/io/onedev/server/web/component/build/status/build-status.css
index 10bef12793..a992880cc7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/status/build-status.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/status/build-status.css
@@ -1,19 +1,13 @@
.build-status-successful {
- color: #06BC06 !important;
+ color: var(--success) !important;
}
.build-status-failed, .build-status-in_error, .build-status-cancelled, .build-status-timed_out {
- color: red !important;
+ color: var(--danger) !important;
}
.build-status-running, .build-status-waiting, .build-status-pending {
- color: #D2A906 !important;
+ color: var(--warning) !important;
}
.build-status-none {
color: #CCC !important;
}
-.build-status-running {
- animation-name: spin;
- animation-duration: 2000ms;
- animation-iteration-count: infinite;
- animation-timing-function: linear;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
index 169605306a..c05f9689bf 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
@@ -1,32 +1,29 @@
<wicket:panel>
- <div class="code-comments">
- <div class="head">
- <form wicket:id="query" class="clearable-wrapper">
+ <div class="code-comment-list card">
+ <div class="card-body">
+ <form wicket:id="query" class="clearable-wrapper mb-4">
<div class="input-group">
<input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order comments here">
<span class="input-group-append">
- <button wicket:id="submit" type="submit" class="btn btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ <button wicket:id="submit" type="submit" class="btn btn-icon btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
</span>
</div>
</form>
- <div class="operations">
- <a wicket:id="showSavedQueries" class="show-saved-queries">
- <wicket:svg href="eye" class="icon"></wicket:svg>
- Show Saved Queries
+ <div class="mb-4">
+ <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4">
+ <wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
</a>
- <a wicket:id="saveQuery" class="save-query">
- <wicket:svg href="save" class="icon"></wicket:svg>
- Save Query
+ <a wicket:id="saveQuery" class="save-query text-gray mr-4">
+ <wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <a wicket:id="orderBy" class="order-by">
- <wicket:svg href="sort" class="icon"></wicket:svg>
- Order By
+ <a wicket:id="orderBy" class="order-by text-gray">
+ <wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
</div>
- </div>
- <div wicket:id="body" class="body">
- <div wicket:id="feedback"></div>
- <table wicket:id="comments" class="table"></table>
+ <div wicket:id="body" class="body">
+ <div wicket:id="feedback"></div>
+ <table wicket:id="comments" class="table"></table>
+ </div>
</div>
</div>
<wicket:fragment wicket:id="fileFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index be772c392a..76932acf76 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -171,7 +171,7 @@ public abstract class CodeCommentListPanel extends Panel {
super.onComponentTag(tag);
configure();
if (!isEnabled())
- tag.put("disabled", "disabled");
+ tag.append("class", "disabled", " ");
if (!querySubmitted)
tag.put("title", "Query not submitted");
else if (queryModel.getObject() == null)
@@ -216,11 +216,7 @@ public abstract class CodeCommentListPanel extends Panel {
query.getSorts().clear();
query.getSorts().addAll(object);
queryModel.setObject(query);
- String queryString = query.toString();
- if (queryString.length() != 0)
- queryStringModel.setObject(queryString);
- else
- queryStringModel.setObject(null);
+ queryStringModel.setObject(query.toString());
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
doQuery(target);
@@ -379,6 +375,11 @@ public abstract class CodeCommentListPanel extends Panel {
cellItem.add(fragment);
}
+ @Override
+ public String getCssClass() {
+ return "text-break";
+ }
+
});
columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Last Update")) {
@@ -404,7 +405,7 @@ public abstract class CodeCommentListPanel extends Panel {
@Override
public String getCssClass() {
- return "last-update expanded";
+ return "text-gray d-none d-md-table-cell";
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
index 4bdb4043ed..72cc4744a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
@@ -1,8 +1,9 @@
<wicket:panel>
<div class="code-comment">
- <a wicket:id="outdatedContext" class="outdated-context">
- <wicket:svg href="warning" class="icon"></wicket:svg> comment context outdated, click to update
- </a>
+ <div wicket:id="outdatedContext" class="outdated-context alert alert-light-warning my-2">
+ <wicket:svg href="warning" class="icon mr-1"></wicket:svg> Comment context outdated,
+ <a wicket:id="link">click to update</a>
+ </div>
<div wicket:id="comment" class="comment section"></div>
<div wicket:id="replies" class="reply section"></div>
<div wicket:id="addReply" class="add-reply"></div>
@@ -10,9 +11,9 @@
<wicket:fragment wicket:id="viewFrag">
<div class="user-avatar"><a wicket:id="userAvatar"></a></div>
<div class="detail">
- <div class="head clearfix">
- <span wicket:id="userName" class="user-name float-left"></span>
- <span class="reply float-right">
+ <div class="head d-flex align-items-center flex-wrap justify-content-between text-muted mb-1">
+ <span wicket:id="userName" class="user-name mr-3"></span>
+ <span>
<span wicket:id="action" class="action"></span>
<span wicket:id="date" class="date"></span>
</span>
@@ -20,11 +21,11 @@
<div class="body">
<div wicket:id="content"></div>
</div>
- <div wicket:id="foot" class="foot">
- <a wicket:id="edit">Edit</a>
+ <div wicket:id="foot" class="foot d-flex align-items-center mt-3">
+ <a wicket:id="edit" class="mr-2 text-muted text-hover-primary">Edit</a>
<wicket:enclosure child="delete">
- <span class="middot"></span>
- <a wicket:id="delete">Delete</a>
+ <span class="dot mr-2"></span>
+ <a wicket:id="delete" class="text-muted text-hover-primary">Delete</a>
</wicket:enclosure>
</div>
</div>
@@ -32,26 +33,22 @@
<wicket:fragment wicket:id="commentEditFrag">
<form wicket:id="form" class="leave-confirm">
<div wicket:id="feedback" class="feedback"></div>
- <div class="form-group">
+ <div class="form-group mb-3">
<div wicket:id="content"></div>
</div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware">Save</button>
- <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>
- </div>
+ <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware mr-1">Save</button>
+ <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>
</form>
</wicket:fragment>
<wicket:fragment wicket:id="replyEditFrag">
<form wicket:id="form" class="leave-confirm">
<div wicket:id="feedback" class="feedback"></div>
- <div wicket:id="content"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-sm btn-primary"><span wicket:id="label"></span></button>
- <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>
- </div>
+ <div wicket:id="content" class="mb-3"></div>
+ <button wicket:id="save" class="btn btn-sm btn-primary mr-1"><span wicket:id="label"></span></button>
+ <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>
</form>
</wicket:fragment>
<wicket:fragment wicket:id="addReplyFrag">
- <a wicket:id="reply" class="btn btn-sm btn-outline-secondary"><wicket:svg href="reply" class="icon"></wicket:svg> Reply</a>
+ <a wicket:id="reply" class="btn btn-sm btn-outline-secondary"><wicket:svg href="reply" class="icon mr-2"></wicket:svg> Reply</a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 53af610650..22762c38d7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -385,7 +385,10 @@ public abstract class CodeCommentPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
replyContainer.remove();
OneDev.getInstance(CodeCommentReplyManager.class).delete(getReply(replyId));
- String script = String.format("$('#%s').remove();", replyContainer.getMarkupId());
+ String script = String.format(""
+ + "$('#%s').remove();"
+ + "$('#%s').closest('.ps-scroll').trigger('resized');",
+ replyContainer.getMarkupId(), CodeCommentPanel.this.getMarkupId());
target.appendJavaScript(script);
}
@@ -421,16 +424,13 @@ public abstract class CodeCommentPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- Component outdatedLink;
- if (getPullRequest() != null) {
- PageParameters params = PullRequestChangesPage.paramsOf(getPullRequest(), getComment());
-
- add(outdatedLink = new BookmarkablePageLink<Void>("outdatedContext", PullRequestChangesPage.class, params) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
+ WebMarkupContainer outdatedContext = new WebMarkupContainer("outdatedContext") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ if (getPullRequest() != null) {
CodeComment comment = getComment();
if (getPage() instanceof ProjectBlobPage) {
setVisible(comment.isContextChanged(getPullRequest()));
@@ -445,12 +445,19 @@ public abstract class CodeCommentPanel extends Panel {
} else {
setVisible(false);
}
+ } else {
+ setVisible(false);
}
-
- }.setOutputMarkupPlaceholderTag(true));
+ }
+
+ };
+ add(outdatedContext.setOutputMarkupPlaceholderTag(true));
+
+ if (getPullRequest() != null) {
+ PageParameters params = PullRequestChangesPage.paramsOf(getPullRequest(), getComment());
+ outdatedContext.add(new BookmarkablePageLink<Void>("link", PullRequestChangesPage.class, params));
} else {
- add(new WebMarkupContainer("outdatedContext").setVisible(false));
- outdatedLink = null;
+ outdatedContext.add(new WebMarkupContainer("link"));
}
add(newCommentContainer());
@@ -509,8 +516,7 @@ public abstract class CodeCommentPanel extends Panel {
prevReplyMarkupId = newReplyContainer.getMarkupId();
}
- if (outdatedLink != null)
- handler.add(outdatedLink);
+ handler.add(outdatedContext);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css b/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
index db5fd9445a..046a224e69 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
@@ -1,124 +1,51 @@
-.code-comments>.head>* {
- margin-bottom: 20px;
-}
-.code-comments>.head>.operations>* {
- margin-right: 16px;
- color: #444;
- white-space: nowrap;
-}
-.code-comments>.head>.operations>*:last-child {
- margin-right: 0;
-}
-.code-comments .new-indicator {
+.code-comment-list .new-indicator {
width: 4px;
padding: 0;
}
-.code-comments tr.comment.new td.new-indicator {
- background: #4667EE;
+.code-comment-list tr.comment.new td.new-indicator {
+ background: var(--primary);
}
-.code-comments td.last-update {
- color: #888;
-}
-
-.code-comment>.outdated-context {
- color: #8a6d3b;
- display: block;
- font-weight: bold;
- margin: 0 0 12px 8px;
- padding: 8px;
- border-radius: 4px;
- background: #fcf8e3;
- border: 1px solid #faebcc;
+@media(max-width: 767px) {
+ .code-comment-list table>thead {
+ display: none;
+ }
}
.code-comment>.section {
position: relative;
- margin-left: -12px;
- padding-left: 12px;
+ margin-left: -1rem;
+ padding-left: 1rem;
border-left: 4px solid white;
}
.code-comment>.section>.detail, .code-comment>.section>form {
- padding-bottom: 8px;
- margin-bottom: 8px;
- border-bottom: 1px solid #EEE;
+ padding-bottom: 1rem;
+ padding-top: 1rem;
+ border-bottom: 1px solid var(--light);
}
.code-comment>.section.new {
- border-left: 4px solid #4667EE;
+ border-left: 4px solid var(--primary);
}
.code-comment>.section>.user-avatar {
position: absolute;
- left: 12px;
- top: 0;
+ left: 1rem;
+ top: 1rem;
}
.code-comment>.section>.user-avatar img {
width: 32px;
height: 32px;
}
.code-comment>.section>.detail {
- padding-left: 40px;
-}
-.code-comment>.section>.detail>.head .user-name {
- color: #666;
-}
-.code-comment>.section>.detail>.head .reply {
- font-size: 12px;
- margin-top: 2px;
- color: #999;
-}
-.code-comment>.section>.detail>.head .compare-context {
- color: #666;
- font-size: 14px;
- line-height: 12px;
- margin: 4px 8px 0 0;
+ padding-left: 3rem;
}
.code-comment>.section>.detail>.body {
- padding-top: 8px;
+ padding-top: 0.5rem;
}
.code-comment>.section>.detail>.body>.feedback .alert {
margin-bottom: 0;
}
-.code-comment>.section>.detail>.body .no-note {
- font-style: italic;
- margin-bottom: 10px;
-}
-.code-comment>.section>.detail>.foot {
- margin-top: 4px;
-}
-.code-comment>.section>.detail>.foot a {
- font-size: 12px;
- color: #999;
-}
-.code-comment>.section>.detail>.foot a:hover {
- font-size: 12px;
- color: #333;
-}
-.code-comment>.section>.detail>.foot .middot:before {
- vertical-align: 25%;
- color: #999;
-}
.code-comment>.add-reply {
- margin-top: 16px;
+ margin-top: 1.2rem;
}
.code-comment .markdown-rendered {
font-size: inherit;
line-height: inherit;
}
-
-@media(max-width: 991px) {
- .code-comments th.expanded, .code-comments td.expanded {
- display: none;
- }
- .code-comment>.section>.user-avatar img {
- width: 24px;
- height: 24px;
- }
- .code-comment>.section>.detail {
- padding-left: 32px;
- }
- .code-comment>.section>.detail>.body {
- padding-top: 12px;
- margin-left: -26px;
- }
- .code-comment>.section>.detail>.foot {
- margin-left: -26px;
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css b/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css
index 71b1a4c380..35ed0673f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.css
@@ -1,4 +1,17 @@
.sp-replacer {
- border-radius: 4px;
- padding: 5px;
+ border-radius: 0.42rem;
+ background: white;
+ border-color: #e4e6ef;
+ height: calc(1.5em + 1.3rem + 2px);
+ padding: 0.65rem 1rem;
+}
+.sp-replacer:hover {
+ border-color: #e4e6ef;
+}
+.sp-replacer.sp-active {
+ border-color: #69b3ff;
+ color: var(--gray-dark);
+}
+.sp-replacer .sp-dd {
+ color: var(--gray-dark);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js b/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js
index a2bd529f2c..e3258a24c5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js
@@ -7,17 +7,7 @@ onedev.server.colorPicker = {
showInitial: true,
allowEmpty: allowEmpty,
hideAfterPaletteSelect:true,
- showPalette: true,
- palette: [
- ["#000","#444","#666","#999","#ccc","#eee","#f3f3f3","#fff"],
- ["#f00","#f90","#ff0","#0f0","#0ff","#00f","#90f","#f0f"],
- ["#f4cccc","#fce5cd","#fff2cc","#d9ead3","#d0e0e3","#cfe2f3","#d9d2e9","#ead1dc"],
- ["#ea9999","#f9cb9c","#ffe599","#b6d7a8","#a2c4c9","#9fc5e8","#b4a7d6","#d5a6bd"],
- ["#e06666","#f6b26b","#ffd966","#93c47d","#76a5af","#6fa8dc","#8e7cc3","#c27ba0"],
- ["#c00","#e69138","#f1c232","#6aa84f","#45818e","#3d85c6","#674ea7","#a64d79"],
- ["#900","#b45f06","#bf9000","#38761d","#134f5c","#0b5394","#351c75","#741b47"],
- ["#600","#783f04","#7f6000","#274e13","#0c343d","#073763","#20124d","#4c1130"]
- ]
+ showPalette: false
});
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
index a8ee2e3cec..0ed9d24085 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
@@ -1,65 +1,65 @@
<wicket:panel>
- <div class="commit-list">
- <div class="head">
- <form wicket:id="query" class="clearable-wrapper">
+ <div class="commit-list card">
+ <div class="card-body">
+ <form wicket:id="query" class="clearable-wrapper mb-4">
<div class="input-group">
<input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query commits here">
<span class="input-group-append">
- <button wicket:id="submit" type="submit" class="btn btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ <button wicket:id="submit" type="submit" class="btn btn-outline-secondary btn-icon" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
</span>
</div>
</form>
- <div class="operations">
- <a wicket:id="showSavedQueries" class="show-saved-queries">
- <wicket:svg href="eye" class="icon"></wicket:svg>
- Show Saved Queries
+ <div class="mb-4">
+ <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4">
+ <wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
</a>
- <a wicket:id="saveQuery" class="save-query">
- <wicket:svg href="save" class="icon"></wicket:svg>
- Save Query
+ <a wicket:id="saveQuery" class="save-query text-gray">
+ <wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
</div>
+ <div wicket:id="body" class="body resize-aware">
+ <div wicket:id="feedback"></div>
+ <ul class="list list-unstyled">
+ <li wicket:id="commits" class="d-flex align-items-start"></li>
+ </ul>
+ <div wicket:id="noCommits" class="no-commits"></div>
+ </div>
+ <div wicket:id="foot" class="foot text-center">
+ <a wicket:id="more" class="btn btn-primary">More commits</a>
+ <div wicket:id="tooMany" class="alert alert-light-warning">Too many commits to load</div>
+ </div>
</div>
- <div wicket:id="body" class="body">
- <div wicket:id="feedback"></div>
- <ul class="list list-unstyled">
- <li wicket:id="commits"></li>
- </ul>
- <div wicket:id="noCommits" class="no-records">No commits found</div>
- </div>
- <div wicket:id="foot" class="foot">
- <a wicket:id="more" class="btn btn-secondary">More commits</a>
- <div wicket:id="tooMany" class="alert alert-warning">Too many commits to load</div>
- </div>
</div>
<wicket:fragment wicket:id="commitFrag">
- <div class="avatar">
+ <div class="avatar mr-3">
<span wicket:id="avatar"></span>
</div>
- <div class="detail">
- <div class="message-and-labels clearfix">
- <div wicket:id="message" class="message float-left"></div>
- <div wicket:id="labels" class="float-left">
- <span wicket:id="label" class="badge badge-secondary"></span>
+ <div class="detail mt-n1">
+ <div class="message-and-labels d-flex align-items-start flex-wrap">
+ <div wicket:id="message" class="message mr-3"></div>
+ <div class="labels">
+ <wicket:container wicket:id="labels">
+ <span wicket:id="label" class="badge badge-secondary badge-sm mr-2"></span>
+ </wicket:container>
</div>
</div>
<div wicket:id="contribution"></div>
</div>
- <div class="actions">
- <span wicket:id="buildStatus" class="build-status"></span>
- <span class="btn-group hash">
+ <div class="actions d-flex ml-auto">
+ <span wicket:id="buildStatus" class="build-status mr-2"></span>
+ <span class="btn-group hash mr-2 d-none d-xl-flex">
<a wicket:id="hashLink" class="btn btn-outline-secondary hash"><span wicket:id="hash"></span></a>
- <a wicket:id="copyHash" class="btn btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
+ <a wicket:id="copyHash" class="btn btn-outline-secondary btn-icon"><wicket:svg href="copy" class="icon"></wicket:svg></a>
</span>
<span class="btn-group browse">
- <a wicket:id="browseCode" title="Browse code" class="btn btn-outline-secondary"><wicket:svg href="files" class="icon"></wicket:svg></a>
+ <a wicket:id="browseCode" title="Browse code" class="btn btn-outline-secondary btn-icon"><wicket:svg href="files" class="icon"></wicket:svg></a>
<wicket:enclosure>
- <a wicket:id="compare" class="compare btn btn-outline-secondary" title="Compare with base revision"><wicket:svg href="diff" class="icon"></wicket:svg></a>
+ <a wicket:id="compare" class="compare btn btn-outline-secondary btn-icon" title="Compare with base revision"><wicket:svg href="diff" class="icon"></wicket:svg></a>
</wicket:enclosure>
</span>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="dateFrag">
- <wicket:svg href="calendar" class="icon icon-lg mr-1"></wicket:svg> <span wicket:id="date"></span>
+ <wicket:svg href="calendar" class="icon icon-lg mr-2"></wicket:svg> <span wicket:id="date"></span>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 0f359733a9..6d2d4a5550 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -52,8 +52,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
@@ -71,6 +71,7 @@ import io.onedev.server.util.Constants;
import io.onedev.server.util.ProjectAndRevision;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.behavior.CommitQueryBehavior;
+import io.onedev.server.web.behavior.RunTaskBehavior;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
@@ -318,7 +319,7 @@ public abstract class CommitListPanel extends Panel {
super.onComponentTag(tag);
configure();
if (!isEnabled())
- tag.put("disabled", "disabled");
+ tag.append("class", "disabled", " ");
if (!querySubmitted)
tag.put("title", "Query not submitted");
else if (queryModel.getObject() == null)
@@ -407,52 +408,68 @@ public abstract class CommitListPanel extends Panel {
foot.add(new AjaxLink<Void>("more") {
+ private RunTaskBehavior taskBehavior;
+
@Override
- public void onClick(AjaxRequestTarget target) {
- page++;
+ protected void onInitialize() {
+ super.onInitialize();
- Commits commits = commitsModel.getObject();
- int commitIndex = 0;
- int lastCommitIndex = 0;
- for (int i=0; i<commits.last.size(); i++) {
- RevCommit lastCommit = commits.last.get(i);
- RevCommit currentCommit = commits.current.get(i);
- if (lastCommit == null) {
- if (currentCommit == null) {
- if (!commits.last.get(i+1).name().equals(commits.current.get(i+1).name()))
- replaceItem(target, i);
- } else {
- addCommitClass(replaceItem(target, i), commitIndex);
+ add(taskBehavior = new RunTaskBehavior() {
+
+ @Override
+ protected void runTask(AjaxRequestTarget target) {
+ page++;
+
+ Commits commits = commitsModel.getObject();
+ int commitIndex = 0;
+ int lastCommitIndex = 0;
+ for (int i=0; i<commits.last.size(); i++) {
+ RevCommit lastCommit = commits.last.get(i);
+ RevCommit currentCommit = commits.current.get(i);
+ if (lastCommit == null) {
+ if (currentCommit == null) {
+ if (!commits.last.get(i+1).name().equals(commits.current.get(i+1).name()))
+ replaceItem(target, i);
+ } else {
+ addCommitClass(replaceItem(target, i), commitIndex);
+ }
+ } else {
+ if (currentCommit == null) {
+ replaceItem(target, i);
+ } else if (commitIndex != lastCommitIndex
+ || !lastCommit.name().equals(currentCommit.name())){
+ addCommitClass(replaceItem(target, i), commitIndex);
+ }
+ }
+ if (lastCommit != null)
+ lastCommitIndex++;
+ if (currentCommit != null)
+ commitIndex++;
+ }
+
+ StringBuilder builder = new StringBuilder();
+ for (int i=commits.last.size(); i<commits.current.size(); i++) {
+ Component item = newCommitItem(commitsView.newChildId(), i);
+ if (commits.current.get(i) != null)
+ addCommitClass(item, commitIndex++);
+ commitsView.add(item);
+ target.add(item);
+ builder.append(String.format("$('#%s>.list').append(\"<li id='%s'></li>\");",
+ body.getMarkupId(), item.getMarkupId()));
}
- } else {
- if (currentCommit == null) {
- replaceItem(target, i);
- } else if (commitIndex != lastCommitIndex
- || !lastCommit.name().equals(currentCommit.name())){
- addCommitClass(replaceItem(target, i), commitIndex);
- }
+ target.prependJavaScript(builder);
+ target.add(foot);
+ target.appendJavaScript(renderCommitGraph());
+
+ getProject().cacheCommitStatus(getBuildManager().queryStatus(getProject(), getCommitIdsToQueryStatus()));
}
- if (lastCommit != null)
- lastCommitIndex++;
- if (currentCommit != null)
- commitIndex++;
- }
+
+ });
+ }
- StringBuilder builder = new StringBuilder();
- for (int i=commits.last.size(); i<commits.current.size(); i++) {
- Component item = newCommitItem(commitsView.newChildId(), i);
- if (commits.current.get(i) != null)
- addCommitClass(item, commitIndex++);
- commitsView.add(item);
- target.add(item);
- builder.append(String.format("$('#%s>.list').append(\"<li id='%s'></li>\");",
- body.getMarkupId(), item.getMarkupId()));
- }
- target.prependJavaScript(builder);
- target.add(foot);
- target.appendJavaScript(renderCommitGraph());
-
- getProject().cacheCommitStatus(getBuildManager().queryStatus(getProject(), getCommitIdsToQueryStatus()));
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ taskBehavior.requestRun(target);
}
@Override
@@ -740,7 +757,10 @@ public abstract class CommitListPanel extends Panel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new CommitListResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript(renderCommitGraph()));
+
+ String jsonOfCommits = asJSON(commitsModel.getObject().current);
+ String script = String.format("onedev.server.commitList.onDomReady('%s', %s);", body.getMarkupId(), jsonOfCommits);
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
/*
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
index f0946ba668..2e675fbec9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
@@ -1,91 +1,46 @@
-.commit-list>.head {
+.commit-list>div>.body {
position: relative;
}
-.commit-list>.head>* {
- margin-bottom: 20px;
-}
-.commit-list>.head>.operations>* {
- margin-right: 16px;
- color: #444;
- white-space: nowrap;
-}
-.commit-list>.head>.operations>*:last-child {
- margin-right: 0;
-}
-.commit-list>.body {
- position: relative;
-}
-.commit-list>.body .no-commits {
- font-size: 16px;
-}
-.commit-list>.body>ul>li {
- padding: 4px 8px;
- position: relative;
-}
-.commit-list>.body li.commit>.avatar {
- left: 8px;
- top: 8px;
- position: absolute;
-}
-.commit-list>.body .label {
- margin-right: 8px;
-}
-.commit-list>.body .summary a {
- font-weight: bold;
- font-size: 15px;
- line-height: 12px;
-}
-.commit-list>.body .commit>.detail {
- padding-left: 48px;
- padding-right: 200px;
- word-break: break-all;
-}
-.commit-list>.body .commit.with-status>.detail {
- padding-right: 270px;
+.commit-list li.date {
+ border-bottom: 1px solid var(--light-gray);
+ font-size: 1.5rem;
+ padding-bottom: 0.5rem;
+ margin-bottom: 0.5rem;
+ margin-top: 1.8rem;
+ align-items: center !important;
}
-.commit-list>.body .commit>.actions {
- position: absolute;
- right: 8px;
- top: 8px;
+
+.commit-list li.commit {
+ padding: 0.4rem 0;
+ border-radius: 0.42rem;
}
-.commit-list>.body li.commit:hover, .commit-list>.body li.commit.hover {
- background: #F7ECB9;
+.commit-list .commit-message>.summary {
+ font-weight: 600;
+ font-size: 1.1rem;
}
-.commit-list>.body .commit-message .highlight {
+
+.commit-lis .commit-message .highlight {
background: yellow;
}
-.commit-list>.body li.commit .contribution {
- font-size: 12px;
-}
-.commit-list>.body .message-and-labels {
- margin-bottom: 4px;
-}
-.commit-list>.body .message-and-labels .commit-message {
- margin-right: 8px;
-}
-.commit-list>.body .message-and-labels .badge {
- margin-right: 4px;
-}
-.commit-list>.body .commit>.actions>span {
- margin-left: 4px;
-}
-.commit-list>.body>.list {
- margin-bottom: 0;
-}
-.commit-list>.foot {
- text-align: center;
-}
-.commit-list>.foot>.alert, .commit-list>.foot>.btn {
- margin-top: 12px;
- margin-bottom: 0;
+
+@media(max-width: 991px) {
+ .commit-list .commit-graph, .commit-list li.commit .actions {
+ display: none !important;
+ }
+ .commit-list ul.list {
+ margin-left: 0 !important;
+ }
}
-.commit-list li.date {
- font-size: 18px;
- margin-top: 12px;
- text-align: left;
- border-bottom: 1px solid #EEE;
+@media(min-width: 992px) {
+ .commit-list li.commit {
+ padding-left: 0.6rem;
+ padding-right: 0.6rem;
+ }
+ .commit-list li.commit:hover, .commit-list li.commit.hover {
+ background: var(--light);
+ }
}
.commit-graph {
@@ -198,14 +153,9 @@
stroke: #9b0f7b;
}
-@media(max-width: 991px) {
- .commit-list li.commit .hash, .commit-list li.commit .browse {
- display: none;
- }
- .commit-list>.body .commit>.detail {
- padding-right: 0;
- }
- .commit-list>.body .commit.with-status>.detail {
- padding-right: 60px;
- }
+.commit-list .no-commits {
+ background: url(/icon/empty.svg) no-repeat scroll center center;
+ background-size: 240px 240px;
+ border-top: none;
+ height: 240px;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.js b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.js
index 1e653a83e0..e696c9f1f1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.js
@@ -1,4 +1,13 @@
onedev.server.commitList = {
+ onDomReady: function(containerId, commits) {
+ $("#" + containerId).on("resized", function() {
+ $(".commit-graph").each(function() {
+ onedev.server.commitList.drawGraph($(this));
+ });
+ return false;
+ });
+ onedev.server.commitList.renderGraph(containerId, commits);
+ },
renderGraph: function(containerId, commits) {
var $commitList = $("#" + containerId + ">ul");
@@ -426,13 +435,3 @@ onedev.server.commitList = {
}
};
-$(function() {
- $(window).resize(function(e) {
- if ($(".commit-graph").length == 0)
- return;
- e.stopPropagation();
- $(".commit-graph").each(function() {
- onedev.server.commitList.drawGraph($(this));
- });
- });
-});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html
index 3da1057ff9..06663e8ca8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
- <div class="commit-message">
- <span wicket:id="summary" class="summary"></span>
- <a class="ellipsis-expander" href="javascript:void(0);" title="Toggle detail message" onclick="$(this).next().toggle(); $(window).resize();" wicket:id="toggle">
- <wicket:svg href="ellipsis" class="icon icon-sm"/>
+ <div class="commit-message d-flex align-items-center flex-wrap">
+ <span wicket:id="summary" class="summary text-break mr-2"></span>
+ <a class="btn btn-xs h-75 btn-secondary btn-icon" href="javascript:void(0);" title="Toggle detail message" onclick="$(this).next().toggle(); $(window).resize();" wicket:id="toggle">
+ <wicket:svg href="ellipsis" class="icon"/>
</a>
- <pre wicket:id="detail" class="detail"></pre>
+ <pre wicket:id="detail" class="detail text-break w-100"></pre>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css b/server-core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css
index 79e9fa452b..2a241f483f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css
@@ -1,14 +1,8 @@
.commit-message>.detail {
display: none;
- color: #666;
- font-size: 12px;
- border: none;
- border-left: 4px solid #E8E8E8;
- background: none;
- margin: 8px 0;
- padding: 0 0 0 12px;
+ font-size: 0.9rem;
+ border-left: 4px solid var(--light-gray);
+ margin: 1rem 0;
+ padding: 0 0 0 1rem;
border-radius: 0;
}
-.commit:hover .commit-message>.detail {
- border-left-color: #D8D8D8;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
index 21466f44ed..1e5e77de7d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <a wicket:id="status" class="commit-status"><span wicket:id="icon"></span> <wicket:svg href="arrow" class="icon icon-sm rotate-90"></wicket:svg></a>
+ <a wicket:id="status"><svg wicket:id="icon"></svg> <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
index 2946705d6c..79c14691f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
@@ -98,7 +98,7 @@ public abstract class CommitStatusPanel extends Panel {
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
- String cssClasses = "commit-status ";
+ String cssClasses = "commit-status text-nowrap ";
String title;
Build.Status status = statusModel.getObject();
if (status != null) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html b/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html
index 5cc5b98f59..aa5292bd1e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
- <span class="contributor">
- <a wicket:id="author" class="name"></a>
+ <span class="contributor text-muted">
+ <a wicket:id="author" class="name text-muted"></a>
committed
<wicket:enclosure child="committer">
- with <a wicket:id="committer" class="name"></a>
+ with <a wicket:id="committer" class="name text-muted"></a>
</wicket:enclosure>
<span wicket:id="date"></span>
</span>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java b/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java
index 3c3b1007f8..cdde7edf4e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java
@@ -1,7 +1,5 @@
package io.onedev.server.web.component.contributorpanel;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
@@ -38,10 +36,4 @@ public class ContributorPanel extends Panel {
add(new Label("date", DateUtils.formatAge(committer.getWhen())));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ContributorResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorResourceReference.java
deleted file mode 100644
index c4cb2e602f..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.contributorpanel;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class ContributorResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ContributorResourceReference() {
- super(ContributorResourceReference.class, "contributor.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/contributor.css b/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/contributor.css
deleted file mode 100644
index 0311ac7f77..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/contributor.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.contributor {
- color: #888;
-}
-.contributor a {
- color: #666;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java
index 9027b7736e..0f977c7a4f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java
@@ -38,7 +38,7 @@ public abstract class CreateTagLink extends ModalLink {
@Override
protected void onCreate(AjaxRequestTarget target, String tag) {
modal.close();
- CreateTagLink.this.onCreate(target, tag);
+ CreateTagLink.this.onCreated(target, tag);
}
@Override
@@ -56,5 +56,5 @@ public abstract class CreateTagLink extends ModalLink {
super.onDetach();
}
- protected abstract void onCreate(AjaxRequestTarget target, String tag);
+ protected abstract void onCreated(AjaxRequestTarget target, String tag);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html
index a032444c75..63d88ce547 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="create-tag">
<div class="modal-header">
<h5 class="modal-title">Create Tag</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwareDataTable.java b/server-core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwareDataTable.java
index ea090701dd..1fcb2508fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwareDataTable.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwareDataTable.java
@@ -15,7 +15,9 @@ import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.OddEvenItem;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.component.pagenavigator.HistoryAwarePagingNavigator;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -29,6 +31,9 @@ public class HistoryAwareDataTable<T, S> extends DataTable<T, S> {
if (pagingHistorySupport != null)
setCurrentPage(pagingHistorySupport.getCurrentPage());
+
+ addTopToolbar(new AjaxFallbackHeadersToolbar<S>(this, dataProvider));
+
addBottomToolbar(new NavigationToolbar(this) {
@Override
@@ -44,8 +49,13 @@ public class HistoryAwareDataTable<T, S> extends DataTable<T, S> {
}
});
- addTopToolbar(new AjaxFallbackHeadersToolbar<S>(this, dataProvider));
- addBottomToolbar(new NoRecordsToolbar(this));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new NoRecordsBehavior());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/HeaderSelector.html b/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/HeaderSelector.html
index 17152d1a90..df120987a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/HeaderSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/HeaderSelector.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input type="checkbox" wicket:id="checkbox">
+ <label class="checkbox"><input type="checkbox" wicket:id="checkbox"></label>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/RowSelector.html b/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/RowSelector.html
index 17152d1a90..df120987a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/RowSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/RowSelector.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input type="checkbox" wicket:id="checkbox">
+ <label class="checkbox"><input type="checkbox" wicket:id="checkbox"></label>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html
index bc746d5708..ce1fa39c8a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
<div class="text-diff cm-s-eclipse">
- <div class="head clearfix">
- <div wicket:id="diffStat" class="float-left"></div>
- <div wicket:id="title" class="float-left"></div>
- <div wicket:id="actions" class="btn-group float-right">
- <a wicket:id="blameFile" class="btn btn-sm btn-outline-secondary">Blame</a>
- <a wicket:id="viewFile" class="btn btn-sm btn-outline-secondary">View</a>
- <a wicket:id="editFile" class="btn btn-sm btn-outline-secondary">Edit</a>
+ <div class="head d-flex align-items-center flex-wrap px-3 py-2 border">
+ <div wicket:id="diffStat" class="mr-2"></div>
+ <div wicket:id="title" class="mr-3 text-break"></div>
+ <div wicket:id="actions" class="ml-auto">
+ <a wicket:id="blameFile" title="Blame" class="btn btn-xs btn-icon btn-light btn-hover-secondary btn-active-primary"><wicket:svg href="commit" class="icon"/></a>
+ <a wicket:id="viewFile" title="View" class="btn btn-xs btn-icon btn-light btn-hover-secondary ml-1"><wicket:svg href="eye" class="icon"/></a>
+ <a wicket:id="editFile" title="Edit" class="btn btn-xs btn-icon btn-light btn-hover-secondary ml-1"><wicket:svg href="edit" class="icon"/></a>
</div>
</div>
<table class="body diff"><wicket:container wicket:id="diffLines"></wicket:container></table>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
index b631ba4fa8..850a7578e8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -78,6 +78,7 @@ import io.onedev.server.web.component.diff.revision.DiffViewMode;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
@@ -198,6 +199,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
}
target.add(TextDiffPanel.this);
blameModel.setObject(blameInfo != null);
+ ((BasePage)getPage()).resizeWindow(target);
}
}.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
@@ -431,6 +433,15 @@ public class TextDiffPanel extends Panel implements SourceAware {
};
add(symbolTooltip);
+ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return blameInfo!=null? "need-width": "";
+ }
+
+ }));
+
setOutputMarkupId(true);
}
@@ -1034,7 +1045,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
String expandSvg = String.format("<svg class='icon'><use xlink:href='%s'/></svg>",
SpriteImage.getVersionedHref(IconScope.class, "expand2"));
- String ellipsisSvg = String.format("<svg class='icon icon-sm'><use xlink:href='%s'/></svg>",
+ String ellipsisSvg = String.format("<svg class='icon'><use xlink:href='%s'/></svg>",
SpriteImage.getVersionedHref(IconScope.class, "ellipsis"));
String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css
index dcd48ec3e4..1ca36cbd7c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css
@@ -1,28 +1,11 @@
-.text-diff {
- border: 1px solid #E0E0E0;
- position: relative;
-}
.text-diff>.head {
- padding: 8px;
- border-bottom: 1px solid #E0E0E0;
-}
-.text-diff>.head .diff-title span {
- word-break: break-all;
-}
-.text-diff>.head .actions>a {
- margin-right: 0;
+ border-radius: 0.42rem 0.42rem 0 0;
}
-.text-diff>.head>div {
- margin-right: 8px;
-}
-.text-diff>.head>div:last-child {
- margin-right: 0;
-}
-
.text-diff>.body {
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
- font-size: 12px;
+ font-size: 0.9rem;
table-layout: fixed;
+ width: 100%;
border-collapse: separate;
}
@@ -35,42 +18,50 @@
position: relative;
}
.text-diff>.body>tbody>tr>td.number {
- padding: 0 4px;
- border-left: 1px solid #E0E0E0;
+ padding: 0 0.3rem;
+ border-left: 1px solid var(--light-gray);
text-align: right;
- font-size: 12px;
- color: #9E9E9E;
+ color: var(--gray);
+}
+.text-diff>.body>tbody>tr>td:last-child {
+ border-right: 1px solid var(--light-gray);
+}
+.text-diff>.body>tbody>tr:last-child>td:first-child {
+ border-radius: 0 0 0 0.42rem;
+}
+.text-diff>.body>tbody>tr:last-child>td:last-child {
+ border-radius: 0 0 0.42rem 0;
}
.text-diff>.body>tbody>tr>td.operation {
- border-left: 1px solid #E0E0E0;
+ border-left: 1px solid var(--light-gray);
}
.text-diff>.body>tbody>tr>td:FIRST-CHILD {
- border-left: none !important;
-}
-.text-diff>.body>tbody>tr:FIRST-CHILD>td {
- border-top: none !important;
+ border-left: 1px solid var(--light-gray);
}
.text-diff>.body>tbody>tr:LAST-CHILD>td {
- border-bottom: none !important;
+ border-bottom: 1px solid var(--light-gray);
}
.text-diff>.body>tbody>tr.expander>td.skipped {
- padding: 6px 16px;
- border-left: 1px solid #D8E2F2;
- background: #f4f7fb;
- color: #999;
+ padding: 0.5rem 1.2rem;
+ border-left: 1px solid var(--light-gray);
+ background: var(--light);
+ color: var(--gray);
}
.text-diff>.body>tbody>tr.expander>td.expander {
- border-left: 1px solid #D8E2F2;
text-align: center;
+ overflow: hidden;
}
.text-diff>.body>tbody>tr.expander>td.expander a {
display: block;
- background: #edf2f9;
- padding: 6px 0;
- color: #888;
+ background: var(--light);
+ color: var(--gray);
+ padding: 2rem 0;
+ margin: -2rem 0;
}
-.text-diff>.body>tbody>tr.expander>td.expander>a:hover {
- background: #4078c0;
+
+.text-diff>.body>tbody>tr.expander>td.expander>a:hover,
+.text-diff>.body>tbody>tr.expander>td.expander>a:focus {
+ background: var(--primary);
color: white;
}
.text-diff>.body>tbody>tr>td.old.number {
@@ -119,19 +110,10 @@
}
.text-diff>.body>tbody>tr>td.operation {
font-weight: bold;
- padding: 0 4px 0 4px;
-}
-.text-diff>.body>tbody>tr.original+.expanded>td {
- border-top: 1px solid #E8E8E8;
-}
-.text-diff>.body>tbody>tr.expanded+.original>td {
- border-top: 1px solid #E8E8E8;
-}
-.text-diff>.body>tbody>tr.expanded>td {
- background: #F9F9F9;
+ padding: 0 0.3rem 0 0.3rem;
}
.text-diff>.body>tbody>tr:hover>td {
- background: #E8F2FE !important;
+ background: var(--light-primary) !important;
}
.text-diff>.body>tbody>tr.code {
background: inherit;
@@ -153,68 +135,55 @@
}
.text-diff>.body>tbody>tr>td.number>.comment-indicator {
- margin: 0 4px;
- color: #999;
- font-size: 13px;
+ margin: 0 0.3rem;
+ color: var(--gray);
+ font-size: 1rem;
}
.text-diff>.body>tbody>tr>td.number>.comment-indicator:hover {
- color: #555;
+ color: var(--dark);
}
.text-diff>.body>tbody>tr>td.number>.comment-indicator svg {
margin-top: 0;
}
.comment-popover a {
display: block;
- color: #999;
+ color: var(--gray);
text-decoration: none;
white-space: nowrap;
}
.comment-popover a:hover {
- color: #555;
+ color: var(--dark);
}
.text-diff>.body>tbody>tr>td.number>.comment-trigger.active,
.comment-popover .comment-trigger.active {
- color: black;
+ color: var(--dark);
}
.text-diff>.body>tbody>tr>td.number>.comment-trigger.active {
- line-height: 14px;
+ line-height: 1rem;
}
.text-diff>.body>tbody>tr>td.blame {
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
- padding: 0 4px;
- border-left: 1px solid #E0E0E0;
+ padding: 0 0.3rem;
+ border-left: 1px solid var(--secondary);
}
.text-diff>.body>tbody>tr>td.blame.abbr {
text-overflow: inherit;
}
.text-diff>.body>tbody>tr>td.blame .hash, .text-diff>.body>tbody>tr>td.blame .date {
- margin-right: 8px;
+ margin-right: 0.6rem;
}
.text-diff>.body>tbody>tr>td.blame.abbr .hash {
margin-right: 0;
}
.text-diff>.body>tbody>tr>td.blame .same-as-above {
margin-left: 90px;
- margin-top: -8px;
- color: #666;
- font-size: 16px;
+ margin-top: -0.6rem;
+ color: var(--gray);
+ font-size: 1.2rem;
}
.text-diff>.body>tbody>tr>td.blame.abbr .same-as-above {
- margin-left: 14px;
-}
-.diff-tokentooltip {
- background-color: #FBFCC5;
- border: 1px solid black;
- border-radius: 4px;
- color: black;
- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
- font-size: 10pt;
- overflow: auto;
- padding: 4px 8px;
- z-index: 100;
- max-width: 900px;
- max-height: 600px;
+ margin-left: 1rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
index b789b9f2e0..172d677cfa 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
@@ -562,8 +562,6 @@ onedev.server.textDiff = {
}
onedev.server.textDiff.initBlameTooltip(containerId, $expandedTrs.find(">td.blame>a.hash"));
-
- $(window).resize();
},
getMarkInfo: function($container, mark) {
var oldOrNew = mark.leftSide?"old":"new";
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.css b/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.css
index caeeb1af7a..0349470c02 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.css
@@ -1,10 +1,10 @@
.diff-stat-bar {
- color: #ddd;
+ color: var(--secondary);
}
.diff-stat-bar>i {
- font-size: 10px;
+ font-size: 16px;
font-style: normal;
- word-spacing: -2px;
+ word-spacing: -4px;
}
.diff-stat-bar .additions {
color: #35c335;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html b/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html
index 633dc1db4c..396a733504 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html
@@ -2,7 +2,7 @@
<div class="diff-title">
<wicket:enclosure child="renamedTitle">
<span wicket:id="renamedTitle"></span>
- <wicket:svg href="arrow3" class="icon"/>
+ <wicket:svg href="arrow" class="icon"/>
</wicket:enclosure>
<span wicket:id="title"></span>
<span wicket:id="modeChange" class="message"></span>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java b/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java
index 8457ea81a5..07cc97435c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java
@@ -33,7 +33,7 @@ public class BlobDiffTitle extends Panel {
if (change.getOldBlobIdent().mode != null && change.getNewBlobIdent().mode != null
&& !change.getOldBlobIdent().mode.equals(change.getNewBlobIdent().mode)) {
modeChange = Integer.toString(change.getOldBlobIdent().mode, 8)
- + " " + SpriteImage.getVersionedHref(IconScope.class, "arrow3") + " "
+ + " " + SpriteImage.getVersionedHref(IconScope.class, "arrow2") + " "
+ Integer.toString(change.getNewBlobIdent().mode, 8);
} else {
modeChange = null;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
index e2a01e52ab..1c697d6d88 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
@@ -1,65 +1,65 @@
<wicket:panel>
- <div class="revision-diff resize-aware scroll-aware">
- <div wicket:id="revisionsIndexing" class="revisions-indexing">
- <img wicket:id="icon">
- <span>Revisions indexing in progress... (symbol navigation in revisions will be accurate after indexed)</span>
+ <div class="revision-diff">
+ <div wicket:id="revisionsIndexing" class="alert alert-light-warning revision-indexing">
+ <wicket:svg href="loading" class="icon spin"/>
+ Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)
</div>
<!-- disable auto focus here as otherwise we have problems jumping to marked code blocks -->
- <table class="head no-autofocus">
- <tr>
- <td class="view-mode">
- <span class="btn-group">
- <a wicket:id="unified" class="btn btn-outline-secondary">Unified</a>
- <a wicket:id="split" class="btn btn-outline-secondary">Split</a>
- </span>
- </td>
- <td class="whitespace-option">
- <span wicket:id="whitespaceOption" class="btn btn-outline-secondary dropdown-toggle" title="White space options">White space</span>
- </td>
- <td class="path-filter">
- <form wicket:id="pathFilter">
- <div class="clearable-wrapper">
- <div class="input-group">
- <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off" placeholder="Filter by path">
- <span class="input-group-append">
- <button wicket:id="submit" title="Filter" class="btn btn-outline-secondary" type="submit"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
- </span>
- </div>
+ <div class="head no-autofocus d-flex align-items-center flex-wrap">
+ <div class="view-mode mr-3 mb-4 flex-shrink-0">
+ <span class="btn-group">
+ <a wicket:id="unified" class="btn btn-outline-secondary">Unified</a>
+ <a wicket:id="split" class="btn btn-outline-secondary">Split</a>
+ </span>
+ </div>
+ <div class="whitespace-option mr-3 mb-4 flex-shrink-0">
+ <span wicket:id="whitespaceOption" class="btn btn-outline-secondary dropdown-toggle" title="White space options">White space</span>
+ </div>
+ <div class="path-filter mb-4 flex-grow-1">
+ <form wicket:id="pathFilter">
+ <div class="clearable-wrapper">
+ <div class="input-group">
+ <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off" placeholder="Filter by path">
+ <span class="input-group-append">
+ <button wicket:id="submit" title="Filter" class="btn btn-icon btn-outline-secondary" type="submit"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ </span>
</div>
- </form>
- </td>
- </tr>
- </table>
+ </div>
+ </form>
+ </div>
+ </div>
<div wicket:id="body" class="body">
<div wicket:id="feedback"></div>
<div class="title"><a wicket:id="totalFiles" class="total-files"></a></div>
- <div wicket:id="tooManyFiles" class="alert alert-warning">Sorry we are unable to display all files as there are too many</div>
+ <div wicket:id="tooManyFiles" class="alert alert-light-warning">Sorry we are unable to display all files as there are too many</div>
<ul wicket:id="diffStats" class="diff-stats list-unstyled">
- <li wicket:id="diffStats" class="diff-stat clearfix">
- <svg wicket:id="icon" class="icon float-left"></svg>
- <a wicket:id="file" class="file float-left"><span wicket:id="name"></span></a>
- <span wicket:id="hasComments" title="There are comments on this file"><wicket:svg href="comments" class="icon"></wicket:svg></span>
+ <li wicket:id="diffStats" class="diff-stat d-flex align-items-center flex-wrap mb-2">
+ <svg wicket:id="icon" class="icon mr-2"></svg>
+ <a wicket:id="file" class="file mr-2 text-break"><span wicket:id="name"></span></a>
+ <span wicket:id="hasComments" class="mr-2 text-gray" title="There are comments on this file"><wicket:svg href="comments" class="icon"></wicket:svg></span>
<wicket:enclosure child="bar">
- <span wicket:id="bar" class="bar float-right"></span>
- <span wicket:id="deletions" class="deletions float-right"></span>
- <span wicket:id="additions" class="additions float-right"></span>
+ <span class="text-nowrap ml-auto">
+ <span wicket:id="additions" class="additions"></span>
+ <span wicket:id="deletions" class="deletions"></span>
+ <span wicket:id="bar" class="bar"></span>
+ </span>
</wicket:enclosure>
</li>
</ul>
- <div class="detail">
- <div wicket:id="comment" class="comment">
- <div class="ui-resizable-handle ui-resizable-e"></div>
- <div class="content">
- <div wicket:id="head" class="head clearfix">
- <a wicket:id="context" class="float-left context close" title="Compare with another revision"><wicket:svg href="diff" class="icon"></wicket:svg></a>
- <a wicket:id="locate" class="float-left locate close"><wicket:svg href="hand" class="icon"></wicket:svg></a>
- <a wicket:id="close" class="float-left close" title="Hide comment"><wicket:svg href="times" class="icon"></wicket:svg></a>
+ <div class="detail d-flex align-items-stretch">
+ <div wicket:id="comment" class="comment need-width border border-right-0 rounded d-flex overflow-hidden flex-shrink-0 position-sticky mr-4">
+ <div class="content flex-grow-1 overflow-hidden d-flex flex-column">
+ <div wicket:id="head" class="head d-flex align-items-center px-3 py-2 border-bottom">
+ <a wicket:id="context" class="btn btn-xs btn-icon btn-hover-primary btn-light mr-2 context" title="Compare with another revision"><wicket:svg href="diff" class="icon"></wicket:svg></a>
+ <a wicket:id="locate" class="btn btn-xs btn-icon btn-hover-primary btn-light locate mr-auto"><wicket:svg href="hand" class="icon"></wicket:svg></a>
+ <a wicket:id="close" class="ml-3" title="Hide comment"><wicket:svg href="times" class="icon"></wicket:svg></a>
</div>
- <div wicket:id="body" class="body"></div>
+ <div wicket:id="body" class="body overflow-auto flex-grow-1 p-3"></div>
</div>
+ <div class="ui-resizable-handle ui-resizable-e flex-shrink-0"></div>
</div>
- <ul class="diffs list-unstyled">
- <li wicket:id="diffs" class="diff">
+ <ul class="diffs list-unstyled flex-grow-1 mb-0">
+ <li wicket:id="diffs" class="diff mb-4">
<div wicket:id="diff"></div>
</li>
</ul>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index ddda48bd06..c127e260a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -30,7 +30,6 @@ import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -48,7 +47,6 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.eclipse.jgit.diff.DiffEntry;
@@ -64,7 +62,6 @@ import com.google.common.collect.Sets;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.parser.TerminalExpect;
-import io.onedev.commons.jsymbol.util.NoAntiCacheImage;
import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
@@ -104,6 +101,7 @@ import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.project.comment.CommentInput;
import io.onedev.server.web.component.revisionpicker.RevisionSelector;
import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.util.ProjectAttachmentSupport;
import io.onedev.server.web.util.SuggestionUtils;
@@ -383,7 +381,6 @@ public class RevisionDiffPanel extends Panel {
SourceAware sourceAware = getSourceAware(prevBlameFile);
sourceAware.onUnblame(target);
}
- target.appendJavaScript("onedev.server.revisionDiff.reposition();");
}
};
@@ -412,15 +409,12 @@ public class RevisionDiffPanel extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new NoAntiCacheImage("icon",
- new PackageResourceReference(RevisionDiffPanel.class, "indexing.gif")));
-
+
add(new WebSocketObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
handler.add(component);
- handler.appendJavaScript("$(window).resize();");
}
@Override
@@ -475,13 +469,21 @@ public class RevisionDiffPanel extends Panel {
cookie.setPath("/");
response.addCookie(cookie);
target.add(RevisionDiffPanel.this);
+ ((BasePage)getPage()).resizeWindow(target);
}
}.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
@Override
protected String load() {
- return each==diffMode?" active":"";
+ if (diffMode == each) {
+ if (diffMode == DiffViewMode.SPLIT)
+ return "active need-width";
+ else
+ return "active";
+ } else {
+ return "";
+ }
}
})));
@@ -502,11 +504,8 @@ public class RevisionDiffPanel extends Panel {
}
@Override
- public String getIconHref() {
- if (whitespaceOptionModel.getObject() == each)
- return "tick";
- else
- return null;
+ public boolean isSelected() {
+ return whitespaceOptionModel.getObject() == each;
}
@Override
@@ -615,9 +614,7 @@ public class RevisionDiffPanel extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
-
response.render(OnDomReadyHeaderItem.forScript("onedev.server.revisionDiff.onDomReady();"));
- response.render(OnLoadHeaderItem.forScript("onedev.server.revisionDiff.onWindowLoad();"));
}
};
@@ -633,7 +630,7 @@ public class RevisionDiffPanel extends Panel {
@Override
public String getObject() {
String icon = String.format("<svg class='icon'><use xlink:href='%s'/></svg>",
- SpriteImage.getVersionedHref("arrow2"));
+ SpriteImage.getVersionedHref("arrow"));
return "Total " + changesAndCountModel.getObject().getChanges().size() + " files " + icon;
}
@@ -673,7 +670,7 @@ public class RevisionDiffPanel extends Panel {
BlobChange change = item.getModelObject();
String icon;
if (change.getType() == null) {
- icon = "file";
+ icon = "square";
} else if (change.getType() == ChangeType.ADD || change.getType() == ChangeType.COPY)
icon = "plus-square";
else if (change.getType() == ChangeType.DELETE)
@@ -689,7 +686,7 @@ public class RevisionDiffPanel extends Panel {
WebMarkupContainer fileLink = new WebMarkupContainer("file");
fileLink.add(new Label("name", change.getPath()));
- fileLink.add(AttributeModifier.replace("href", "#diff-" + change.getPath()));
+ fileLink.add(AttributeModifier.replace("href", "#diff-" + encodePath(change.getPath())));
item.add(fileLink);
item.add(new Label("additions", "+" + change.getAdditions()));
@@ -725,7 +722,7 @@ public class RevisionDiffPanel extends Panel {
@Override
protected void populateItem(ListItem<BlobChange> item) {
BlobChange change = item.getModelObject();
- item.setMarkupId("diff-" + change.getPath());
+ item.setMarkupId("diff-" + encodePath(change.getPath()));
if (commentSupport != null) {
item.add(new BlobDiffPanel(DIFF_ID, projectModel, requestModel, change, diffMode,
getBlobBlameModel(change), new BlobCommentSupport() {
@@ -756,6 +753,7 @@ public class RevisionDiffPanel extends Panel {
@Override
public void onOpenComment(AjaxRequestTarget target, CodeComment comment) {
RevisionDiffPanel.this.onOpenComment(target, comment);
+ ((BasePage)getPage()).resizeWindow(target);
}
@Override
@@ -824,7 +822,6 @@ public class RevisionDiffPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
clearComment(target);
- target.appendJavaScript("onedev.server.revisionDiff.reposition();");
Mark mark = getMark();
if (mark != null) {
SourceAware sourceAware = getSourceAware(mark.getPath());
@@ -894,7 +891,6 @@ public class RevisionDiffPanel extends Panel {
sourceAware.onCommentAdded(target, comment);
((CommentSupport)commentSupport).onCommentOpened(target, comment);
- target.appendJavaScript(String.format("onedev.server.revisionDiff.reposition();"));
}
});
@@ -919,11 +915,11 @@ public class RevisionDiffPanel extends Panel {
}
((CommentSupport)commentSupport).onAddComment(target, mark);
String script = String.format(""
- + "onedev.server.revisionDiff.reposition(); "
+ "setTimeout(function() {"
+ " var $textarea = $('#%s textarea');"
+ " $textarea.caret($textarea.val().length);"
- + "}, 100);",
+ + "}, 100);"
+ + "$(window).resize();",
commentContainer.getMarkupId());
target.appendJavaScript(script);
}
@@ -1029,7 +1025,10 @@ public class RevisionDiffPanel extends Panel {
sourceAware.unmark(target);
}
commentSupport.onCommentOpened(target, comment);
- target.appendJavaScript("onedev.server.revisionDiff.reposition();");
+ }
+
+ private String encodePath(String path) {
+ return path.replace("/", "-").replace(" ", "-");
}
private @Nullable IModel<Boolean> getBlobBlameModel(BlobChange change) {
@@ -1157,7 +1156,6 @@ public class RevisionDiffPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
CodeComment comment = getOpenComment();
clearComment(target);
- target.appendJavaScript("onedev.server.revisionDiff.reposition();");
if (comment != null) {
SourceAware sourceAware = getSourceAware(comment.getMark().getPath());
if (sourceAware != null)
@@ -1299,7 +1297,6 @@ public class RevisionDiffPanel extends Panel {
if (sourceAware != null)
sourceAware.onCommentDeleted(target, comment);
((CommentSupport)commentSupport).onCommentClosed(target);
- target.appendJavaScript("onedev.server.revisionDiff.reposition();");
Mark mark = getMark();
if (mark != null) {
sourceAware = getSourceAware(mark.getPath());
@@ -1312,6 +1309,7 @@ public class RevisionDiffPanel extends Panel {
commentContainer.replace(new WebMarkupContainer(BODY_ID));
commentContainer.setVisible(false);
target.add(commentContainer);
+ ((BasePage)getPage()).resizeWindow(target);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/indexing.gif b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/indexing.gif
deleted file mode 100644
index 1560b646cf..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/indexing.gif and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css
index cdf7844d8f..fab7355025 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css
@@ -1,40 +1,9 @@
-.revision-diff {
- min-width: 600px;
-}
-.revision-diff.additionalWidth1 {
- min-width: 900px;
-}
-.revision-diff.additionalWidth2 {
- min-width: 1200px;
-}
-.revision-diff.additionalWidth3 {
- min-width: 1500px;
-}
-
-.revision-diff>.revisions-indexing {
- padding: 8px 8px 9px 8px;
- background: #fcf8e3;
- border: 1px solid #faebcc;
- border-radius: 4px;
- color: #8a6d3b;
- font-size: 13px;
- margin-bottom: 20px;
-}
-.revision-diff>.head {
- margin-bottom: 16px;
-}
-.revision-diff>.head td.view-mode {
- width: 140px;
-}
-.revision-diff>.head td.whitespace-option {
- width: 140px;
-}
.revision-diff>.body>.title {
- font-size: 16px;
- margin-bottom: 16px;
+ font-size: 1.2rem;
+ margin-bottom: 1.2rem;
}
.revision-diff>.body>.alert {
- margin-bottom: 16px;
+ margin-bottom: 1.2rem;
}
.revision-diff>.body>.title>a .icon {
transform: rotate(90deg);
@@ -42,17 +11,6 @@
.revision-diff>.body>.title>a.expanded .icon {
transform: rotate(-90deg);
}
-.revision-diff>.body>.diff-stats>.diff-stat {
- font-size: 13px;
-}
-.revision-diff>.body>.diff-stats>.diff-stat>.icon {
- width: 16px;
- height: 16px;
- margin-top: 2px;
-}
-.revision-diff>.body>.diff-stats>.diff-stat .has-comments {
- color: #999;
-}
.revision-diff>.body>.diff-stats>.diff-stat .dot-square,
.revision-diff>.body>.diff-stats>.diff-stat .arrow-square {
@@ -64,74 +22,34 @@
.revision-diff>.body>.diff-stats>.diff-stat .minus-square {
fill: #C33535;
}
-.revision-diff>.body>.diff-stats {
- margin-top: -10px;
-}
-.revision-diff>.body>.diff-stats>.diff-stat {
- padding: 6px 0;
- border-bottom: 1px solid #F2F2F2;
-}
-.revision-diff>.body>.diff-stats>.diff-stat:last-child {
- border-bottom: none;
-}
-.revision-diff>.body>.diff-stats>.diff-stat a.file {
- padding: 0 6px;
-}
-.revision-diff>.body>.diff-stats>.diff-stat>.additions {
+.revision-diff>.body>.diff-stats>.diff-stat>span>.additions {
color: #35C335;
}
-.revision-diff>.body>.diff-stats>.diff-stat>.deletions {
+.revision-diff>.body>.diff-stats>.diff-stat>span>.deletions {
color: #C33535;
}
-.revision-diff>.body>.diff-stats>.diff-stat>.additions,
-.revision-diff>.body>.diff-stats>.diff-stat>.deletions {
- font-size: 12px;
+.revision-diff>.body>.diff-stats>.diff-stat>span>.additions,
+.revision-diff>.body>.diff-stats>.diff-stat>span>.deletions {
+ font-size: 1rem;
font-weight: bold;
- margin-right: 4px;
- margin-top: 2px;
-}
-.revision-diff>.body>.detail>.diffs {
- margin-bottom: 0;
-}
-.revision-diff>.body>.detail>.diffs>.diff {
- margin-bottom: 20px;
- background: white;
-}
-.revision-diff>.body>.detail {
- position: relative;
+ margin-right: 0.3rem;
}
+
.revision-diff>.body>.detail>.comment {
- border: 1px solid #E0E0E0;
- margin-right: 12px;
- padding-right: 3px;
- background: white;
- position: fixed;
- z-index: 100;
-}
-.revision-diff>.body>.detail>.comment>.content>.head>a {
- margin-right: 8px;
+ top: 2rem;
+ max-height: calc(100vh - 2rem - var(--topbar-height));
}
+
.revision-diff>.body>.detail>.comment>.ui-resizable-handle {
- position: absolute;
- background: #F2F2F2 url(vgrabber.png) no-repeat scroll center center;
+ border-right: 1px solid var(--light-gray);
+ background: var(--light) url(/icon/grip3.svg) no-repeat scroll center center;
+ background-size: 18px 18px;
cursor: e-resize;
- width: 8px;
- right: 0;
- top: 0;
-}
-.revision-diff>.body>.detail>.comment>.content>.head {
- font-weight: bold;
- padding: 8px 12px;
- background: #F2F2F2;
-}
-.revision-diff>.body>.detail>.comment>.content>.head .title {
- margin-bottom: 8px;
-}
-.revision-diff>.body>.detail>.comment>.content>.body {
- overflow: auto;
- border-left: 3px solid #F2F2F2;
- border-bottom: 3px solid #F2F2F2;
-}
-.revision-diff>.body>.detail>.comment>.content>.body>* {
- margin: 12px;
+ width: 4px;
+ position: relative;
+ right: 0;
}
+
+.revision-diff>.body>.detail>.diffs>.diff:last-child {
+ margin-bottom: 0 !important;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js
index 5922ce5aee..00244abbf8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js
@@ -1,6 +1,5 @@
onedev.server.revisionDiff = {
onDomReady: function() {
- $(".revision-diff").on("resized scrolled", onedev.server.revisionDiff.reposition);
var cookieName = "revisionDiff.showDiffStats";
var $body = $(".revision-diff>.body");
var $diffStats = $body.children(".diff-stats");
@@ -15,88 +14,7 @@ onedev.server.revisionDiff = {
$diffStatsToggle.addClass("expanded");
Cookies.set(cookieName, "yes", {expires: Infinity});
}
- onedev.server.revisionDiff.reposition();
});
-
- var $image = $body.find("img");
- if ($image.length == 0) {
- onedev.server.revisionDiff.reposition();
- } else {
- var loadedImages = 0;
- $image.on("load", function() {
- loadedImages++;
- if (loadedImages == $image.length) {
- onedev.server.revisionDiff.reposition();
- }
- });
- }
-
- onedev.server.revisionDiff.reposition();
- },
- onWindowLoad: function() {
- if (window.location.hash) {
- var $anchor = $(window.location.hash);
- if ($anchor.length != 0) {
- var $detail = $(".revision-diff>.body>.detail");
- var $scrollParent = $detail.scrollParent();
- var detailOffset = $detail.offset().top - $scrollParent.offset().top;
- if ($scrollParent.scrollTop() < detailOffset)
- $scrollParent.scrollTop(detailOffset);
- $anchor[0].scrollIntoView();
- }
- }
- },
- reposition: function(e) {
- if ($(".revision-diff>.body>.detail").length == 0)
- return;
-
- if (e) {
- e.stopPropagation();
- if (e.target && $(e.target).hasClass("ui-resizable"))
- return;
- }
-
- var additionalWidth = 0;
- if ($(".revision-diff>.body>.detail>.comment").length != 0)
- additionalWidth++;
- if ($(".revision-diff>.body>.detail td.blame").length != 0)
- additionalWidth++;
- if ($(".diff-mode-split>.revision-diff").length != 0)
- additionalWidth++;
-
- $(".revision-diff").removeClass("additionalWidth1").removeClass("additionalWidth2").removeClass("additionalWidth3");
- if (additionalWidth != 0)
- $(".revision-diff").addClass("additionalWidth" + additionalWidth);
-
- var $detail = $(".revision-diff>.body>.detail");
- var $comment = $detail.children(".comment");
- var $diffs = $detail.children(".diffs");
- if ($comment.is(":visible")) {
- var $scrollParent = $detail.scrollParent();
- var scrollParentHeight = $scrollParent[0].clientHeight;
- var scrollParentTop = $scrollParent.offset().top;
- $detail.css("padding-left", $comment.outerWidth(true));
- $comment.css("left", $detail.offset().left);
- var diffsTop = $diffs.offset().top;
- var commentTop;
- if (diffsTop <= scrollParentTop)
- commentTop = scrollParentTop;
- else
- commentTop = diffsTop;
- $comment.css("top", commentTop);
- var $lastDiff = $diffs.children().last();
- var commentHeight = scrollParentTop + scrollParentHeight - commentTop;
- var $commentResizeHandle = $comment.children(".ui-resizable-handle");
- $commentResizeHandle.outerHeight(commentHeight - 2);
- var $commentHead = $comment.find(">.content>.head");
- $comment.find(">.content>.body").outerHeight(commentHeight-2-$commentHead.outerHeight());
- var diffsHeight = $diffs.outerHeight();
- var windowHeight = $(window).height();
- $detail.height(windowHeight>diffsHeight?windowHeight:diffsHeight);
- } else {
- $detail.css("padding-left", "0");
- $detail.height($diffs.outerHeight());
- }
},
initComment: function() {
var $comment = $(".revision-diff>.body>.detail>.comment");
@@ -108,14 +26,12 @@ onedev.server.revisionDiff = {
commentWidth = $(".revision-diff").outerWidth()/3;
$comment.outerWidth(commentWidth);
var $commentResizeHandle = $comment.children(".ui-resizable-handle");
- var $diffs = $(".revision-diff>.body>.detail>.diffs");
$comment.resizable({
autoHide: false,
handles: {"e": $commentResizeHandle},
minWidth: 200,
stop: function(e, ui) {
Cookies.set(commentWidthCookieKey, ui.size.width, {expires: Infinity});
- $(window).resize();
}
});
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/vgrabber.png b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/vgrabber.png
deleted file mode 100644
index 1d78ce7647..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/vgrabber.png and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavCssResourceReference.java
deleted file mode 100644
index a24c59c347..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.entity.nav;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class EntityNavCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public EntityNavCssResourceReference() {
- super(EntityNavCssResourceReference.class, "entity-nav.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.html b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.html
index f633c1c36a..ad92784f9d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="entity-nav">
- <a wicket:id="prev" class="prev"><wicket:svg href="arrow3" class="icon icon-lg rotate-180"/></a>
- <span wicket:id="current"></span>
- <a wicket:id="next" class="next"><wicket:svg href="arrow3" class="icon icon-lg"/></a>
+ <div class="entity-nav d-flex align-items-center justify-content-between font-size-h6">
+ <a wicket:id="prev" class="prev mr-4"><wicket:svg href="arrow2" class="icon icon-lg rotate-180"/></a>
+ <span wicket:id="current" class="mr-4"></span>
+ <a wicket:id="next" class="next"><wicket:svg href="arrow2" class="icon icon-lg"/></a>
</div>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
index 3eeba9c81d..84036b6d10 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
@@ -7,8 +7,6 @@ import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -33,12 +31,6 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {
entityName = WordUtils.uncamel(typeArguments.get(0).getSimpleName()).toLowerCase();
}
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getCursor() != null);
- }
-
private Cursor getCursor() {
if (getCursorSupport() != null)
return getCursorSupport().getCursor();
@@ -54,13 +46,13 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(getCursor().getOffset()>0);
+ setEnabled(getCursor() != null && getCursor().getOffset() > 0);
}
@Override
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
- if (getCursor().getOffset() <= 0)
+ if (getCursor() == null || getCursor().getOffset() <= 0)
tag.put("disabled", "disabled");
tag.put("title", "Next " + entityName);
}
@@ -87,13 +79,13 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(getCursor().getOffset()<getCursor().getCount()-1);
+ setEnabled(getCursor() != null && getCursor().getOffset()<getCursor().getCount()-1);
}
@Override
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
- if (getCursor().getOffset() >= getCursor().getCount()-1)
+ if (getCursor() == null || getCursor().getOffset() >= getCursor().getCount()-1)
tag.put("disabled", "disabled");
tag.put("title", "Previous " + entityName);
}
@@ -123,18 +115,15 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {
@Override
public String getObject() {
- return entityName + " " + (getCursor().getCount()-getCursor().getOffset()) + " of " + getCursor().getCount();
+ if (getCursor() != null)
+ return entityName + " " + (getCursor().getCount()-getCursor().getOffset()) + " of " + getCursor().getCount();
+ else
+ return entityName + " 1 of 1";
}
}));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new EntityNavCssResourceReference()));
- }
-
protected abstract EntityQuery<T> parse(String queryString, boolean inProject);
protected abstract T getEntity();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/entity-nav.css b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/entity-nav.css
deleted file mode 100644
index b793a784c7..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/entity-nav.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.entity-nav {
- font-size: 16px;
- position: relative;
- text-align: center;
-}
-.entity-nav a {
- position: absolute;
- color: #666;
- top: 0;
-}
-.entity-nav .prev {
- left: 0;
-}
-.entity-nav .next {
- right: 0;
-}
-
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.html
index 114808307e..e818ef9cf5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.html
@@ -7,9 +7,7 @@
<span wicket:id="watchers"><a wicket:id="watcher" class="avatar"></a></span> <a wicket:id="more">and more</a>
</div>
</wicket:enclosure>
- <div class="actions">
- <a wicket:id="watch" class="watch-status btn btn-sm btn-outline-secondary"></a>
- </div>
+ <a wicket:id="watch" class="watch-status btn btn-sm btn-outline-secondary mt-2"></a>
</div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/entity-watches.css b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/entity-watches.css
index d0b4538b60..9615549a51 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/entity-watches.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/entity-watches.css
@@ -1,10 +1,9 @@
.entity-watches>.head {
- font-weight: bold;
- margin-bottom: 16px;
-}
-.entity-watches .body>* {
- margin-bottom: 16px;
+ font-weight: 600;
+ margin-bottom: 0.8rem;
}
.entity-watches>.body a.avatar {
- margin-right: 8px;
+ margin-right: 0.8rem;
+ margin-bottom: 0.8rem;
+ display: inline-block;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java b/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java
index 345737c5aa..e55a840ba4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java
@@ -65,6 +65,8 @@ public abstract class FloatingPanel extends Panel {
@Override
protected void respond(AjaxRequestTarget target) {
FloatingPanel.this.remove();
+ String script = String.format("onedev.server.floating.close('%s');", getMarkupId(true));
+ target.appendJavaScript(script);
onClosed();
}
@@ -103,7 +105,7 @@ public abstract class FloatingPanel extends Panel {
public final void close() {
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
if (target != null) {
- String script = String.format("onedev.server.floating.close($('#%s'), false);", getMarkupId(true));
+ String script = String.format("onedev.server.floating.close('%s');", getMarkupId(true));
target.appendJavaScript(script);
}
if (getParent() != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java
index d54757b663..5c106e980f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java
@@ -6,6 +6,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
+import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class FloatingResourceReference extends BaseDependentResourceReference {
@@ -20,6 +21,7 @@ public class FloatingResourceReference extends BaseDependentResourceReference {
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js
index 1d0a70825d..2c4b1dfebc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js
@@ -21,8 +21,9 @@ onedev.server.floating = {
if (!$floating.is(e.target) && $floating.has(e.target).length === 0 && !contains) {
var $trigger = $floating.data("trigger");
- if (!$trigger || !$trigger.is(e.target) && $trigger.has(e.target).length === 0)
- onedev.server.floating.close($floating, true);
+ if (!$trigger || !$trigger.is(e.target) && $trigger.has(e.target).length === 0) {
+ $floating.data("closeCallback")();
+ }
}
});
$(document).on("mouseup touchstart", $floating.data("mouseUpOrTouchStart"));
@@ -30,7 +31,7 @@ onedev.server.floating = {
$floating.data("keydown", function(e) {
if (e.keyCode == 27 && $(".select2-drop:visible").length == 0
&& $(".flatpickr-calendar.open").length == 0) {
- onedev.server.floating.close($floating, true);
+ $floating.data("closeCallback")();
}
});
@@ -48,10 +49,12 @@ onedev.server.floating = {
var alignment = $floating.data("alignment");
if (alignment && alignment.target && alignment.target.element
&& !document.body.contains(alignment.target.element)) {
- onedev.server.floating.close($floating, true);
+ $floating.data("closeCallback")();
} else {
- if (alignment)
+ if (alignment) {
$floating.align(alignment);
+ $floating.trigger("resized");
+ }
if (!openTriggered) {
$floating.trigger("open");
openTriggered = true;
@@ -61,11 +64,10 @@ onedev.server.floating = {
$(document).on("afterElementReplace", $floating.data("afterElementReplace"));
},
- close: function($floating, callCloseCallback) {
- if ($floating.length != 0) { // floating might already been closed
- if (callCloseCallback)
- $floating.data("closeCallback")();
-
+ close: function(floatingId) {
+ var $floating = $("#" + floatingId);
+
+ if ($floating.length != 0) {
var alignment = $floating.data("alignment");
if (alignment && alignment.target.element)
@@ -83,12 +85,9 @@ onedev.server.floating = {
$floating.remove();
});
} else {
- // remove floating later, otherwise, closeCallback attached to floating will not execute
- setTimeout(function() {
- $floating.remove();
- }, 0);
+ $floating.remove();
}
}
}
-};
\ No newline at end of file
+};
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
index f6f9f7584b..bff2d692b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
@@ -1,15 +1,15 @@
<wicket:panel>
<div class="issue-activities">
- <table>
+ <table class="w-100">
<tr wicket:id="activities" class="activity">
<td class="avatar"><a wicket:id="avatar"></a></td>
<td wicket:id="content" class="content"></td>
</tr>
</table>
- <div wicket:id="addComment"></div>
+ <div wicket:id="addComment" class="mt-4"></div>
</div>
<wicket:fragment wicket:id="loginToCommentFrag">
- <div class="login-to-comment">
+ <div class="login-to-comment alert alert-light-info text-center font-size-h6">
<a wicket:id="login">Login to comment</a>
</div>
</wicket:fragment>
@@ -17,17 +17,15 @@
<form wicket:id="form" class="add-comment leave-confirm no-autofocus">
<div wicket:id="feedback"></div>
<div wicket:id="comment" placeholder="Leave a comment"></div>
- <div class="actions">
+ <div class="mt-3">
<button wicket:id="save" class="btn btn-primary dirty-aware">Comment</button>
</div>
</form>
</wicket:fragment>
<wicket:fragment wicket:id="optionsFrag">
<div class="issue-activity-options">
- <span class="btn-group btn-group-toggle">
- <a wicket:id="showComments" class="btn btn-sm btn-outline-secondary" title="Show comments"><wicket:svg href="comments" class="icon"></wicket:svg></a>
- <a wicket:id="showChangeHistory" class="btn btn-sm btn-outline-secondary" title="Show change history"><wicket:svg href="history" class="icon"></wicket:svg></a>
- </span>
+ <a wicket:id="showComments" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Show comments"><wicket:svg href="comments" class="icon"></wicket:svg></a>
+ <a wicket:id="showChangeHistory" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Show change history"><wicket:svg href="history" class="icon"></wicket:svg></a>
</div>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index c32f77a7ef..fd6ba9cbcf 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -58,7 +58,7 @@ import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
-import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.page.simple.security.LoginPage;
import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
index d860d7ed66..40dc4376f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
@@ -1,23 +1,17 @@
-.issue-activity-options {
- text-align: right;
-}
-.issue-activity-options>div {
- padding-left: 12px;
- display: inline-block;
-}
.issue-activities>table {
table-layout: fixed;
}
.issue-activities tr.activity.new>.avatar {
- border-left-color: #4667EE;
+ border-left-color: var(--primary);
}
.issue-activities>table>tbody>tr>td {
- border-bottom: 1px solid #EEE;
- padding: 16px 0;
+ border-top: 1px solid var(--light-gray);
+ padding: 1.25rem 0;
+ vertical-align: top;
}
-.issue-activities>table>tbody>tr:last-child>td {
- border-bottom: none;
+.issue-activities>table>tbody>tr:first-child>td {
+ border-top: none;
}
.issue-activities>table>tbody>tr>td.avatar {
width: 48px;
@@ -28,48 +22,14 @@
width: 40px;
height: 40px;
}
-.issue-activities>table>tbody>tr>td.content {
- padding-left: 16px;
-}
-.issue-activities .activity>.content>.head {
- color: #888;
-}
-.issue-activities .activity.commit .body a.summary {
- font-size: 14px;
- margin-right: 4px;
-}
-
-.issue-activities .activity>.content>.body {
- margin-top: 8px;
-}
-
-.issue-activities .activity>.content>.body>.actions {
- margin-top: 8px;
-}
-.issue-activities .activity>.content>.body>.actions a {
- color: #888;
- margin-right: 0;
-}
-.issue-activities .activity>.content>.body .actions .middot {
- margin: 0 4px;
-}
-.issue-activities .activity>.content>.body .field-change>.change {
- margin-bottom: 12px;
+.issue-activities>table>tbody>tr>td.avatar .avatar.system-avatar {
+ width: 46px;
+ height: 46px;
+ margin-left: -3px;
}
-
-.issue-activities .activity>.content>.head a {
- color: #999;
- margin-left: 8px;
-}
-.issue-activities .add-comment {
- margin-top: 16px;
-}
-.issue-activities .login-to-comment {
- border: 1px solid #EEE;
- vertical-align: center;
- text-align: center;
- padding: 20px;
- font-size: 20px;
- background: #F9F9F9;
- border-radius: 4px;
+.issue-activities>table>tbody>tr>td.content {
+ padding-left: 1.25rem;
}
+.issue-activities>table>tbody>tr>td.content>.body {
+ margin-top: 1rem;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html
index 44421aedf2..d19574c835 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="leave-confirm board-spec-edit">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Edit Board</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
index 2fde068aae..22b9e38400 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
@@ -82,7 +82,7 @@ public abstract class BoardEditPanel extends Panel {
} else {
boards.add(board);
}
- onBoardSaved(target, board);
+ onSave(target, board);
} else {
target.add(form);
}
@@ -129,7 +129,7 @@ public abstract class BoardEditPanel extends Panel {
setOutputMarkupId(true);
}
- protected abstract void onBoardSaved(AjaxRequestTarget target, BoardSpec board);
+ protected abstract void onSave(AjaxRequestTarget target, BoardSpec board);
protected abstract void onCancel(AjaxRequestTarget target);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
index 2308aedafd..d20f257c41 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
@@ -1,21 +1,21 @@
<wicket:panel>
<div class="issue-commits">
- <div wicket:id="commits" class="commit clearfix">
- <div class="avatar">
+ <div wicket:id="commits" class="commit d-flex py-3">
+ <div class="avatar flex-shrink-0 mr-2">
<span wicket:id="avatar"></span>
</div>
- <div class="detail">
+ <div class="detail flex-grow-1 mr-3">
<div wicket:id="message" class="message"></div>
<div wicket:id="contribution"></div>
</div>
- <div class="actions">
- <span wicket:id="buildStatus" class="build-status"></span>
- <span class="btn-group hash">
- <a wicket:id="hashLink" class="btn btn-secondary hash"><span wicket:id="hash"></span></a>
- <a wicket:id="copyHash" class="btn btn-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
+ <div class="d-none d-lg-block flex-shrink-0">
+ <span wicket:id="buildStatus" class="build-status mr-2"></span>
+ <span class="btn-group hash mr-2">
+ <a wicket:id="hashLink" class="btn btn-outline-secondary hash"><span wicket:id="hash"></span></a>
+ <a wicket:id="copyHash" class="btn btn-icon btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
</span>
<span class="btn-group browse">
- <a wicket:id="browseCode" title="Browse code" class="btn btn-secondary"><wicket:svg href="files" class="icon"></wicket:svg></a>
+ <a wicket:id="browseCode" title="Browse code" class="btn btn-icon btn-outline-secondary"><wicket:svg href="files" class="icon"></wicket:svg></a>
</span>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css
index ac2118ea2e..879d837e81 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css
@@ -1,49 +1,11 @@
.issue-commits>.commit {
- color: #888;
- position: relative;
- padding: 8px 8px;
- border-top: 1px solid #DDD;
+ border-top: 1px solid var(--light-gray);
}
.issue-commits>.commit:first-child {
border-top: none;
}
-.issue-commits>.commit>.avatar {
- left: 8px;
- top: 12px;
- position: absolute;
-}
-.issue-commits>.commit>.detail .summary a {
- font-weight: bold;
- font-size: 15px;
- line-height: 12px;
-}
-.issue-commits>.commit>.detail {
- padding-left: 48px;
- padding-right: 180px;
- word-break: break-all;
-}
-.issue-commits>.commit>.detail>.message {
- margin-bottom: 4px;
-}
-.issue-commits>.commit.with-status>.detail {
- padding-right: 240px;
-}
-.issue-commits>.commit>.actions {
- position: absolute;
- right: 8px;
- top: 12px;
-}
-
-@media(max-width: 991px) {
- .issue-commits>.commit>.actions>.browse,
- .issue-commits>.commit>.actions>.hash {
- display: none;
- }
- .issue-commits>.commit>.detail {
- padding-right: 0;
- }
- .issue-commits>.commit.with-status>.detail {
- padding-right: 60px;
- }
-}
+.issue-commits>.commit .commit-message>.summary {
+ font-weight: 600;
+ font-size: 1.1rem;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html
index fddea2c523..037a6baf8c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="new-issue">
<div class="form-group">
- <label class="control-label">Title <span class="required">*</span></label>
+ <label class="control-label">Title <span class="text-danger">*</span></label>
<input wicket:id="title" type="text" class="form-control" placeholder="Input title here">
<div wicket:id="titleFeedback"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesCssResourceReference.java
deleted file mode 100644
index c773e3ac3b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.issue.fieldvalues;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class FieldValuesCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public FieldValuesCssResourceReference() {
- super(FieldValuesCssResourceReference.class, "field-values.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
index f7b621c998..48dcc5fe5f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div wicket:id="content" class="field-values clearfix"></div>
+ <div wicket:id="content" class="field-values d-flex flex-wrap"></div>
<wicket:fragment wicket:id="nonEmptyValuesFrag">
- <div wicket:id="values" class="value float-left"><span wicket:id="value"></span></div>
+ <div wicket:id="values" class="value mb-2 mr-2"><span wicket:id="value"></span></div>
</wicket:fragment>
<wicket:fragment wicket:id="linkFrag">
<a wicket:id="link"><span wicket:id="label"></span></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index 4d13a6def3..09ff45643b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -3,8 +3,6 @@ package io.onedev.server.web.component.issue.fieldvalues;
import javax.annotation.Nullable;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -157,8 +155,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
try {
String backgroundColor = choiceProvider.getChoices(false).get(value);
if (backgroundColor == null)
- backgroundColor = "#E8E8E8";
- String fontColor = ColorUtils.isLight(backgroundColor)?"#333":"#f9f9f9";
+ backgroundColor = "#E4E6EF";
+ String fontColor = ColorUtils.isLight(backgroundColor)?"#3F4254":"white";
String style = String.format(
"background-color: %s; color: %s;",
backgroundColor, fontColor);
@@ -212,10 +210,4 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
@Nullable
protected abstract Input getField();
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new FieldValuesCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css
deleted file mode 100644
index 9bdfe6001e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.field-values>.value {
- margin-right: 4px;
-}
-.field-values>.value .label {
- font-size: 11px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html
index b6dede1664..dc8eb58c14 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html
@@ -3,38 +3,24 @@
<form wicket:id="form">
<div class="modal-header">
<h5 wicket:id="title" class="modal-title"></h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
- <div class="select-fields">
- <label class="control-label">Fields to Change</label>
- <div class="checkboxes clearfix">
- <div wicket:id="feedback"></div>
- <div class="float-left">
- <div class="checkbox">
- <label>
- <input wicket:id="stateCheck" type="checkbox"> State
- </label>
- </div>
- </div>
- <div class="float-left">
- <div class="checkbox">
- <label>
- <input wicket:id="milestoneCheck" type="checkbox"> Milestone
- </label>
- </div>
- </div>
- <div wicket:id="customFields" class="float-left">
- <div class="checkbox">
- <label>
- <input wicket:id="customFieldCheck" type="checkbox"> <span wicket:id="name"></span>
- </label>
- </div>
- </div>
- </div>
+ <div class="mb-3 font-size-lg">Fields to Change</div>
+ <div wicket:id="feedback"></div>
+ <div class="d-flex flex-wrap mb-4">
+ <label class="checkbox flex-shrink-0 mr-3">
+ <input wicket:id="stateCheck" type="checkbox"> State
+ </label>
+ <label class="checkbox flex-shrink-0 mr-3">
+ <input wicket:id="milestoneCheck" type="checkbox"> Milestone
+ </label>
+ <label wicket:id="customFields" class="checkbox flex-shrink-0 mr-3">
+ <input wicket:id="customFieldCheck" type="checkbox"> <wicket:container wicket:id="name"></wicket:container>
+ </label>
</div>
- <div wicket:id="builtInFieldsEditor"></div>
- <div wicket:id="customFieldsEditor"></div>
+ <div wicket:id="builtInFieldsEditor" class="mb-4"></div>
+ <div wicket:id="customFieldsEditor" class="mb-4"></div>
<div wicket:id="comment" placeholder="Leave a comment"></div>
</div>
<div class="modal-footer">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index 9fdf8598f5..b30324f7f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -1,58 +1,54 @@
<wicket:panel>
- <div class="issue-list">
- <div class="head">
- <form wicket:id="query" class="clearable-wrapper">
- <div class="input-group">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order issues here">
- <span class="input-group-append">
- <button wicket:id="submit" type="submit" class="btn btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
- </span>
- </div>
- </form>
- <a wicket:id="newIssue" class="open-new btn btn-success"></a>
- <div class="operations">
- <a wicket:id="showSavedQueries" class="show-saved-queries">
- <wicket:svg href="eye" class="icon"></wicket:svg>
- Show Saved Queries
+ <div class="issue-list card">
+ <div class="card-body">
+ <div class="d-flex mb-4">
+ <form wicket:id="query" class="clearable-wrapper flex-grow-1">
+ <div class="input-group">
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order issues here">
+ <span class="input-group-append">
+ <button wicket:id="submit" type="submit" class="btn btn-outline-secondary btn-icon" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ </span>
+ </div>
+ </form>
+ <a wicket:id="newIssue" class="add-new btn btn-primary btn-icon flex-shrink-0 ml-3" title="Create new issue"><wicket:svg href="plus" class="icon"/></a>
+ </div>
+ <div class="mb-5">
+ <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4">
+ <wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
</a>
- <a wicket:id="saveQuery" class="save-query">
- <wicket:svg href="save" class="icon"></wicket:svg>
- Save Query
+ <a wicket:id="saveQuery" class="save-query text-gray mr-4">
+ <wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <a wicket:id="batchEditSelected">
- <wicket:svg href="edit-selected" class="icon"></wicket:svg>
- Batch Edit Selected
+ <a wicket:id="batchEditSelected" class="text-gray mr-4">
+ <wicket:svg href="edit-selected" class="icon"></wicket:svg> Batch Edit Selected
</a>
- <a wicket:id="batchEditAll">
- <wicket:svg href="edit-all" class="icon"></wicket:svg>
- Batch Edit All
+ <a wicket:id="batchEditAll" class="text-gray mr-4">
+ <wicket:svg href="edit" class="icon"></wicket:svg> Batch Edit All
</a>
- <a wicket:id="listFields" class="list-fields">
- <wicket:svg href="select" class="icon"></wicket:svg>
- Display Fields
+ <a wicket:id="listFields" class="list-fields text-gray mr-4">
+ <wicket:svg href="select" class="icon"></wicket:svg> Display Fields
</a>
- <a wicket:id="orderBy" class="order-by">
- <wicket:svg href="sort" class="icon"></wicket:svg>
- Order By
+ <a wicket:id="orderBy" class="order-by text-gray">
+ <wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
</div>
- </div>
- <div wicket:id="body" class="body">
- <div wicket:id="feedback"></div>
- <table wicket:id="issues" class="table"></table>
+ <div wicket:id="body" class="body">
+ <div wicket:id="feedback"></div>
+ <table wicket:id="issues" class="table"></table>
+ </div>
</div>
</div>
<wicket:fragment wicket:id="contentFrag">
- <div class="primary clearfix">
- <div class="float-left">
- <a wicket:id="number" class="number"></a>
- <span wicket:id="title" class="title"></span>
+ <div class="primary d-flex mb-3">
+ <div class="mr-4 flex-grow-1">
+ <a wicket:id="number" class="number h6 mr-2"></a>
+ <span wicket:id="title" class="title h6 mr-1"></span>
<a wicket:id="copy" title="Copy issue number and title" class="copy">
<wicket:svg href="copy" class="icon"></wicket:svg>
</a>
</div>
- <div class="float-right">
- <span class="votes" title="Votes">
+ <div class="flex-shrink-0 d-none d-lg-block text-muted">
+ <span class="votes mr-2" title="Votes">
<wicket:svg href="thumb-up" class="icon"></wicket:svg> <span wicket:id="votes"></span>
</span>
<span class="comments" title="Comments">
@@ -60,12 +56,12 @@
</span>
</div>
</div>
- <div class="secondary clearfix">
- <div class="float-left clearfix">
- <div wicket:id="fields" class="field float-left"></div>
+ <div class="secondary d-flex flex-wrap">
+ <div class="flex-grow-1 d-flex flex-wrap">
+ <div wicket:id="fields" class="field"></div>
</div>
- <div class="last-update float-right">
- <a wicket:id="user"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
+ <div class="last-update flex-shrink-0 d-none d-lg-block text-muted font-size-sm">
+ <a wicket:id="user" class="text-muted"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
</div>
</div>
</wicket:fragment>
@@ -77,7 +73,7 @@
<form wicket:id="form">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Fields to Display</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<input wicket:id="fields" type="hidden" class="form-control">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index d41191854a..6f80579672 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -37,7 +37,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
@@ -50,8 +50,8 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import edu.emory.mathcs.backport.java.util.Collections;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -76,8 +76,8 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
-import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.behavior.IssueQueryBehavior;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.issue.IssueStateLabel;
@@ -93,7 +93,6 @@ import io.onedev.server.web.component.project.selector.ProjectSelector;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.stringchoice.StringMultiChoice;
-import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
@@ -148,6 +147,7 @@ public abstract class IssueListPanel extends Panel {
super.onDetach();
}
+ @Nullable
protected abstract Project getProject();
protected IssueQuery getBaseQuery() {
@@ -237,7 +237,7 @@ public abstract class IssueListPanel extends Panel {
super.onComponentTag(tag);
configure();
if (!isEnabled())
- tag.put("disabled", "disabled");
+ tag.append("class", "disabled", " ");
if (!querySubmitted)
tag.put("title", "Query not submitted");
else if (queryModel.getObject() == null)
@@ -287,11 +287,7 @@ public abstract class IssueListPanel extends Panel {
query = new IssueQuery();
query.getSorts().clear();
query.getSorts().addAll(object);
- String queryString = query.toString();
- if (queryString.length() != 0)
- queryStringModel.setObject(queryString);
- else
- queryStringModel.setObject(null);
+ queryStringModel.setObject(query.toString());
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
doQuery(target);
@@ -345,6 +341,47 @@ public abstract class IssueListPanel extends Panel {
});
add(queryForm);
+ if (getProject() == null) {
+ add(new DropdownLink("newIssue") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {
+
+ @Override
+ protected Collection<Project> load() {
+ List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class)
+ .getPermittedProjects(new AccessProject()));
+
+ Predicate<Project> issueManagementEnabledPredicate = item -> item.isIssueManagementEnabled();
+ CollectionUtils.filter(projects, issueManagementEnabledPredicate);
+
+ Collections.sort(projects, new Comparator<Project>() {
+
+ @Override
+ public int compare(Project o1, Project o2) {
+ return o1.getName().compareTo(o2.getName());
+ }
+
+ });
+ return projects;
+ }
+
+ }) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Project project) {
+ setResponsePage(NewIssuePage.class, NewIssuePage.paramsOf(project));
+ }
+
+ };
+ }
+
+ });
+ } else {
+ add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject())));
+ }
+
add(new ModalLink("listFields") {
private List<String> listFields;
@@ -443,75 +480,15 @@ public abstract class IssueListPanel extends Panel {
}
});
-
- if (getProject() != null) {
- add(new Link<Void>("newIssue") {
-
- @Override
- public IModel<?> getBody() {
- return Model.of(String.format(
- "<svg class='icon'><use xlink:href='%s'/></svg> New",
- SpriteImage.getVersionedHref(IconScope.class, "plus")));
- }
-
- @Override
- public void onClick() {
- IssueQuery query = queryModel.getObject();
- String template = query!=null && query.getCriteria()!=null? query.getCriteria().toString(): null;
- setResponsePage(NewIssuePage.class, NewIssuePage.paramsOf(getProject(), template));
- }
-
- }.setEscapeModelStrings(false));
- } else {
- add(new DropdownLink("newIssue") {
-
- @Override
- public IModel<?> getBody() {
- return Model.of(String.format(
- "<svg class='icon'><use xlink:href='%s'/></svg> New <svg class='icon rotate-90'><use xlink:href='%s'/></svg>",
- SpriteImage.getVersionedHref(IconScope.class, "plus"), SpriteImage.getVersionedHref(IconScope.class, "arrow")));
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {
-
- @Override
- protected Collection<Project> load() {
- List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class)
- .getPermittedProjects(new AccessProject()));
-
- Predicate<Project> issueManagementEnabledPredicate = item -> item.isIssueManagementEnabled();
- CollectionUtils.filter(projects, issueManagementEnabledPredicate);
-
- Collections.sort(projects, new Comparator<Project>() {
-
- @Override
- public int compare(Project o1, Project o2) {
- return o1.getName().compareTo(o2.getName());
- }
-
- });
- return projects;
- }
-
- }) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Project project) {
- setResponsePage(NewIssuePage.class,
- NewIssuePage.paramsOf(project, queryStringModel.getObject()));
- }
-
- };
- }
-
- }.setEscapeModelStrings(false));
- }
ModalLink batchEditSelectedLink;
add(batchEditSelectedLink = new ModalLink("batchEditSelected") {
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
@Override
protected Component newContent(String id, ModalPanel modal) {
return new BatchEditPanel(id) {
@@ -567,6 +544,11 @@ public abstract class IssueListPanel extends Panel {
add(new ModalLink("batchEditAll") {
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
@Override
protected Component newContent(String id, ModalPanel modal) {
return new BatchEditPanel(id) {
@@ -817,6 +799,7 @@ public abstract class IssueListPanel extends Panel {
});
issuesTable.addBottomToolbar(new NoRecordsToolbar(issuesTable));
+ issuesTable.add(new NoRecordsBehavior());
setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
index 561463c7be..e0b1ad31c8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
@@ -1,74 +1,19 @@
-@media(max-width: 991px) {
- .issue-list>.body .float-right {
- display: none;
- }
-}
-
-.issue-list>.head {
- position: relative;
-}
-.issue-list>.head>* {
- margin-bottom: 20px;
-}
-.issue-list>.head>form {
- margin-right: 120px;
-}
-.issue-list>.head>.open-new {
- width: 100px;
- position: absolute;
- right: 0;
- top: 0;
-}
-.issue-list>.head>.operations>* {
- margin-right: 16px;
- color: #444;
- white-space: nowrap;
-}
-.issue-list>.head>.operations>*:last-child {
- margin-right: 0;
-}
-.issue-list>.body td a.number, .issue-list>.body td .title>a {
- margin-right: 4px;
- font-weight: bold;
- font-size: 15px;
-}
-
-.issue-list>.body td .issue-state {
- margin-right: 4px;
-}
-.issue-list>.body td .secondary>.float-left>div {
- margin-right: 12px;
- margin-top: 8px;
-}
-.issue-list>.body td .secondary>.float-right {
- margin-top: 8px;
-}
-.issue-list>.body td .last-update, .issue-list>.body td .comments, .issue-list>.body td .votes {
- color: #888;
- font-size: 13px;
+.issue-list>div>.body table>tbody>tr>td {
+ padding: 1.2rem 0.8rem 0.7rem 0.8rem;
}
.issue-list .field.undefined {
display: none;
}
-.issue-list>.body td .votes {
- margin-right: 8px;
+.issue-list .field .issue-state {
+ margin-bottom: 0.5rem;
+ margin-right: 0.5rem;
}
-.issue-list>.body .new-indicator {
+.issue-list>div>.body .new-indicator {
width: 4px;
padding: 0;
}
-.issue-list>.body tr.issue.new td.new-indicator {
- background: #4667EE;
-}
-.issue-batch-edit form .modal-body>div {
- margin-bottom: 20px;
-}
-.issue-batch-edit .alert {
- margin-top: 10px;
- margin-bottom: 5px;
-}
-.issue-batch-edit .select-fields>.checkboxes>* {
- margin-right: 10px;
+.issue-list>div>.body tr.issue.new td.new-indicator {
+ background: var(--primary);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html
index dfd0d09810..78ef7c8f93 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html
@@ -1,11 +1,11 @@
<wicket:panel>
<div class="issue-operations">
- <div class="state-and-actions clearfix">
- <div wicket:id="state" class="float-left state">
+ <div class="state-and-actions d-flex flex-wrap">
+ <div wicket:id="state" class="state">
<div wicket:id="state"></div>
</div>
- <a wicket:id="transitions" class="btn btn-primary btn-sm float-left"><span wicket:id="label"></span></a>
- <a wicket:id="moreInfo" class="more-info" title="More info"><wicket:svg href="ellipsis" class="icon rotate-90"></wicket:svg></a>
+ <a wicket:id="transitions" class="btn btn-primary btn-sm mr-3"><span wicket:id="label"></span></a>
+ <a wicket:id="newIssue" class="new-issue btn btn-primary btn-sm btn-icon ml-auto" title="Create new issue"><wicket:svg href="plus" class="icon"/></a>
</div>
<div wicket:id="actionOptions" class="action-options"></div>
</div>
@@ -13,8 +13,8 @@
<form wicket:id="form" class="state-transition leave-confirm">
<div wicket:id="fields"></div>
<div wicket:id="comment"></div>
- <div class="actions">
- <button wicket:id="save" type="submit" class="btn btn-primary">Ok</button>
+ <div class="mt-3">
+ <button wicket:id="save" type="submit" class="btn btn-primary mr-1">Ok</button>
<a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
</div>
</form>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index 9c091d5471..99c4acfcda 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -20,6 +20,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
@@ -45,9 +46,9 @@ import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
-import io.onedev.server.web.component.sideinfo.SideInfoLink;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
@@ -219,7 +220,8 @@ public abstract class IssueOperationsPanel extends Panel {
}));
- addOrReplace(new SideInfoLink("moreInfo"));
+ addOrReplace(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class,
+ NewIssuePage.paramsOf(getIssue().getProject())));
newEmptyActionOptions(null);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
index f376799dfb..00b8f5bcea 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
@@ -1,35 +1,18 @@
.issue-operations>div {
- margin-bottom: 20px;
-}
-.issue-operations>.state-and-actions {
- margin-bottom: 12px;
- padding-right: 30px;
- position: relative;
+ margin-bottom: 1.5rem;
}
.issue-operations>.state-and-actions>.state {
- margin-right: 16px;
- padding-right: 16px;
+ margin-right: 1.2rem;
+ padding-right: 1.2rem;
}
.issue-operations>.state-and-actions>.state.with-separator {
- border-right: 1px solid #E0E0E0;
+ border-right: 1px solid var(--light-gray);
}
+
.issue-operations>.state-and-actions>.state>.issue-state {
- font-size: 17px;
- padding: 7px 12px;
+ padding: 0.55rem 0.75rem;
+ font-size: 0.925rem;
+ border: 1px solid transparent;
+ line-height: 1.35;
display: block;
}
-.issue-operations>.state-and-actions>.btn.active {
- background-color: #204C72;
-}
-.issue-operations>.state-and-actions>* {
- margin-right: 10px;
- margin-bottom: 8px;
-}
-.issue-operations>.state-and-actions>.more-info {
- position: absolute;
- right: 0;
- top: -3px;
- font-size: 24px;
- margin: 0;
- color: #666;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
index c0509284fc..d9dd55787e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
@@ -1,6 +1,5 @@
<wicket:panel>
<div class="issue-side">
- <div wicket:id="issueNav" class="nav"></div>
<div wicket:id="fields" class="fields"></div>
<div class="milestone">
<div class="head">Milestone</div>
@@ -13,18 +12,16 @@
<div class="body">
<wicket:enclosure child="voters">
<div class="voters">
- <span wicket:id="voters"><a wicket:id="voter" class="avatar"></a></span> <a wicket:id="more">and more</a>
+ <span wicket:id="voters" class="mr-2 mb-3 d-inline-block"><a wicket:id="voter" class="avatar"></a></span> <a wicket:id="more">and more</a>
</div>
</wicket:enclosure>
- <div class="actions">
- <a wicket:id="vote" class="btn btn-outline-secondary btn-sm vote"><wicket:svg href="thumb-up" class="icon"></wicket:svg> <span wicket:id="label"></span></a>
- </div>
+ <a wicket:id="vote" class="btn btn-outline-secondary btn-sm vote"><wicket:svg href="thumb-up" class="icon mr-2"></wicket:svg> <span wicket:id="label"></span></a>
</div>
</div>
<div wicket:id="watches" class="watches"></div>
<wicket:enclosure child="delete">
- <div class="actions">
- <a wicket:id="delete" class="delete btn btn-danger btn-sm"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
+ <div>
+ <a wicket:id="delete" class="delete btn btn-light-danger">Delete</a>
</div>
</wicket:enclosure>
</div>
@@ -43,30 +40,34 @@
</tr>
</table>
</div>
- <div class="actions">
- <a wicket:id="edit" class="btn btn-outline-secondary btn-sm edit"><wicket:svg href="edit" class="icon"></wicket:svg> Edit</a>
+ <wicket:enclosure>
+ <div class="d-flex align-items-center mt-3">
+ <a wicket:id="edit" class="btn btn-light btn-xs btn-icon btn-hover-primary edit" title="Edit fields"><wicket:svg href="edit" class="icon mr-2"></wicket:svg></a>
</div>
+ </wicket:enclosure>
</wicket:fragment>
<wicket:fragment wicket:id="fieldsEditFrag">
<form wicket:id="form" class="fields-edit leave-confirm">
<div wicket:id="editor"></div>
- <div class="actions">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
+ <div class="mt-4">
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary mr-1" value="Save">
<a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
</div>
</form>
</wicket:fragment>
<wicket:fragment wicket:id="milestoneViewFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- <span wicket:id="status" class="status"></span>
- <a wicket:id="edit" title="Change milestone" class="edit action"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <div wicket:id="progress" class="progress"></div>
+ <div class="d-flex align-items-center">
+ <a wicket:id="link" class="mr-3"><span wicket:id="label"></span></a>
+ <span wicket:id="status" class="status mr-3"></span>
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary edit action" title="Change milestone"><wicket:svg href="edit" class="icon mr-2"></wicket:svg></a>
+ </div>
+ <div wicket:id="progress" class="mt-3"></div>
</wicket:fragment>
<wicket:fragment wicket:id="milestoneEditFrag">
<form wicket:id="form">
<input wicket:id="milestone" type="hidden" class="form-control">
- <div class="actions">
- <a wicket:id="save" class="dirty-aware btn btn-primary btn-sm">Save</a>
+ <div class="mt-4">
+ <a wicket:id="save" class="dirty-aware btn btn-primary btn-sm mr-1">Save</a>
<a wicket:id="cancel" class="btn btn-secondary btn-sm">Cancel</a>
</div>
</form>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 5c96e6b7a1..fec6f2e61c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -10,8 +10,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -41,7 +39,6 @@ import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
-import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.IssueVoteManager;
import io.onedev.server.entitymanager.IssueWatchManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -54,7 +51,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.security.SecurityUtils;
@@ -62,7 +58,6 @@ import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.web.ajaxlistener.AppendLoadingIndicatorListener;
import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.component.issue.statestats.StateStatsBar;
@@ -75,8 +70,7 @@ import io.onedev.server.web.component.user.list.SimpleUserListLink;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
-import io.onedev.server.web.page.security.LoginPage;
-import io.onedev.server.web.util.CursorSupport;
+import io.onedev.server.web.page.simple.security.LoginPage;
@SuppressWarnings("serial")
public abstract class IssueSidePanel extends Panel {
@@ -89,30 +83,6 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected void onBeforeRender() {
- addOrReplace(new EntityNavPanel<Issue>("issueNav") {
-
- @Override
- protected EntityQuery<Issue> parse(String queryString, boolean inProject) {
- return IssueQuery.parse(inProject?getProject():null, queryString, true, true, false, false, false);
- }
-
- @Override
- protected Issue getEntity() {
- return getIssue();
- }
-
- @Override
- protected List<Issue> query(EntityQuery<Issue> query, int offset, int count, boolean inProject) {
- return getIssueManager().query(inProject?getProject():null, query, offset, count, false);
- }
-
- @Override
- protected CursorSupport<Issue> getCursorSupport() {
- return IssueSidePanel.this.getCursorSupport();
- }
-
- });
-
addOrReplace(newFieldsContainer());
addOrReplace(newMilestoneContainer());
addOrReplace(newVotesContainer());
@@ -136,7 +106,10 @@ public abstract class IssueSidePanel extends Panel {
});
- addOrReplace(newDeleteLink("delete"));
+ if (SecurityUtils.canManageIssues(getProject()))
+ addOrReplace(newDeleteLink("delete"));
+ else
+ addOrReplace(new WebMarkupContainer("delete").setVisible(false));
super.onBeforeRender();
}
@@ -542,10 +515,6 @@ public abstract class IssueSidePanel extends Panel {
private IssueChangeManager getIssueChangeManager() {
return OneDev.getInstance(IssueChangeManager.class);
}
-
- private IssueManager getIssueManager() {
- return OneDev.getInstance(IssueManager.class);
- }
@Override
public void renderHead(IHeaderResponse response) {
@@ -555,8 +524,6 @@ public abstract class IssueSidePanel extends Panel {
protected abstract Issue getIssue();
- @Nullable
- protected abstract CursorSupport<Issue> getCursorSupport();
-
protected abstract Component newDeleteLink(String componentId);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css b/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css
index ce70a863c6..435b0de4da 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css
@@ -1,45 +1,28 @@
-.issue-side>div>.head {
- font-weight: bold;
- margin-bottom: 16px;
-}
-.issue-side>div .body>* {
- margin-bottom: 16px;
-}
-.issue-side>div>.body a.avatar {
- margin-right: 8px;
-}
-.issue-side>div>.body .field-values a.avatar {
- margin-right: 0;
-}
.issue-side>* {
- margin-bottom: 20px;
- border-top: 1px solid #E8E8E8;
- padding-top: 20px;
+ margin-bottom: 1.5rem;
+ border-top: 1px dashed var(--secondary);
+ padding-top: 1.5rem;
}
.issue-side>div:first-child {
border-top: none;
padding-top: 0;
}
-
-.issue-side .fields td {
- padding-bottom: 12px;
- vertical-align: top;
-}
-.issue-side .fields tr:last-child td {
- padding-bottom: 0;
+.issue-side>div>.head {
+ font-weight: 600;
+ margin-bottom: 0.8rem;
}
-.issue-side .fields td.name {
- white-space: nowrap;
- padding-right: 20px;
+.issue-side>.fields>.body>table {
+ width: 100%;
}
-.issue-side a.action {
- margin-top: 0;
- margin-left: 8px;
- color: #666;
+.issue-side>.fields>.body>table>tbody>tr>td.name {
+ padding: 0 0.6rem 1.2rem 0;
+ vertical-align: top;
+ font-weight: 600;
}
-.issue-side .milestone .status {
- margin-left: 4px;
+.issue-side>.fields>.body>table>tbody>tr>td.values {
+ padding-bottom: 0.6rem;
+ vertical-align: top;
}
-.issue-side .milestone>.body>.progress {
- margin-top: 20px;
+.issue-side>.fields>.body>table>tbody>tr:last-child>td {
+ padding-bottom: 0;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.html b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.html
index 8566cb6f27..58253b0ba0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <div class="state-stats resize-aware"><a wicket:id="states">&nbsp;</a></div>
+ <div class="state-stats"><a wicket:id="states">&nbsp;</a></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java
index 55cce97eaa..64daa72006 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java
@@ -5,9 +5,8 @@ import java.util.stream.Collectors;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.GenericPanel;
@@ -37,8 +36,10 @@ public abstract class StateStatsBar extends GenericPanel<Map<String, Integer>> {
if (count != null) {
Link<Void> link = newStateLink(statesView.newChildId(), state.getName());
link.add(AttributeAppender.append("title", count + " " + state.getName().toLowerCase() + " issues"));
- link.add(AttributeAppender.append("data-percent", count*1.0/totalCount));
- link.add(AttributeAppender.append("style", "background-color: " + state.getColor()));
+ link.add(AttributeAppender.append("style", ""
+ + "background-color: " + state.getColor() + ";"
+ + "width: " + count*100.0/totalCount + "%;"
+ + "min-width: 4px;"));
statesView.add(link);
}
}
@@ -50,9 +51,11 @@ public abstract class StateStatsBar extends GenericPanel<Map<String, Integer>> {
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
tag.setName("span");
+ tag.put("style", "width: 100%;");
}
}.setEscapeModelStrings(false));
+
add(AttributeAppender.append("title", "No issues in milestone"));
}
@@ -64,9 +67,7 @@ public abstract class StateStatsBar extends GenericPanel<Map<String, Integer>> {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new StateStatsResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript(
- String.format("onedev.server.stateStats.onDomReady('%s');", getMarkupId())));
+ response.render(CssHeaderItem.forReference(new StateStatsCssResourceReference()));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsCssResourceReference.java
new file mode 100644
index 0000000000..473ec5db52
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.issue.statestats;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class StateStatsCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public StateStatsCssResourceReference() {
+ super(StateStatsCssResourceReference.class, "state-stats.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsResourceReference.java
deleted file mode 100644
index ce76911fde..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsResourceReference.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.onedev.server.web.component.issue.statestats;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class StateStatsResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public StateStatsResourceReference() {
- super(StateStatsResourceReference.class, "state-stats.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- StateStatsResourceReference.class, "state-stats.css")));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.css b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.css
index 440efe695a..2d56efaaae 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.css
@@ -1,22 +1,24 @@
.state-stats {
white-space: nowrap;
min-width: 100px;
+ line-height: 1.1rem;
+ width: 100%;
}
.state-stats>span {
display: inline-block;
- border: 1px solid #BBB;
- border-radius: 3px;
+ border: 1px solid var(--light-gray);
+ border-radius: 0.42rem;
}
.state-stats>a {
display: inline-block;
text-decoration: none;
}
.state-stats>a:first-child {
- border-radius: 3px 0 0 3px;
+ border-radius: 0.42rem 0 0 0.42rem;
}
.state-stats>a:last-child {
- border-radius: 0 3px 3px 0;
+ border-radius: 0 0.42rem 0.42rem 0;
}
.state-stats>a:first-child:last-child {
- border-radius: 3px;
+ border-radius: 0.42rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.js b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.js
deleted file mode 100644
index cac1bf6671..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.js
+++ /dev/null
@@ -1,18 +0,0 @@
-onedev.server.stateStats = {
- onDomReady: function(containerId) {
- var $stateStats = $("#" + containerId + ">.state-stats");
- function calcWidth() {
- $stateStats.children("a").width("auto").each(function() {
- var totalWidth = $(this).parent().width();
- var percent = $(this).data("percent");
- var width = totalWidth*percent;
- if (width < 4)
- width = 4;
- $(this).width(width);
- });
- $stateStats.children("span").outerWidth("100%");
- }
- $stateStats.on("resized", calcWidth);
- calcWidth();
- }
-};
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/ChangeListener.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/ChangeListener.java
deleted file mode 100644
index 9651fb6456..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/ChangeListener.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.onedev.server.web.component.issue.statetransition;
-
-import java.io.Serializable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-public interface ChangeListener extends Serializable {
-
- void onChanged(AjaxRequestTarget target);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html
deleted file mode 100644
index 97c0d43573..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<wicket:panel>
- <div class="state-transition-list def-list list">
- <div class="head">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New</a>
- </div>
- <table wicket:id="stateTransitions" class="table table-hover"></table>
- </div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="viewTransitionFrag">
- <div class="actions">
- <a wicket:id="edit" class="btn btn-sm btn-outline-secondary"><wicket:svg href="edit" class="icon"></wicket:svg> Edit</a>
- <a wicket:id="delete" class="btn btn-sm btn-outline-secondary"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
- </div>
- <div wicket:id="viewer"></div>
- </wicket:fragment>
-</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java
deleted file mode 100644
index 3c36ce709d..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package io.onedev.server.web.component.issue.statetransition;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.unbescape.html.HtmlEscape;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.support.issue.TransitionSpec;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.asset.icon.IconScope;
-import io.onedev.server.web.behavior.sortable.SortBehavior;
-import io.onedev.server.web.behavior.sortable.SortPosition;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.layout.SideFloating;
-
-@SuppressWarnings("serial")
-public abstract class StateTransitionListPanel extends Panel {
-
- private final List<TransitionSpec> transitions;
-
- public StateTransitionListPanel(String componentId, List<TransitionSpec> transitions) {
- super(componentId);
- this.transitions = transitions;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new ModalLink("addNew") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new TransitionEditPanel(id, transitions, -1) {
-
- @Override
- protected void onChanged(AjaxRequestTarget target) {
- StateTransitionListPanel.this.onChanged(target);
- target.add(StateTransitionListPanel.this);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- };
- }
-
- });
-
- List<IColumn<TransitionSpec, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("From States")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
- TransitionSpec transition = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, transition) {
-
- @Override
- protected Component newLabel(String componentId) {
- String icon = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg>",
- SpriteImage.getVersionedHref(IconScope.class, "grip"));
- String label = HtmlEscape.escapeHtml5(StringUtils.join(transition.getFromStates()));
- return new Label(componentId, icon + " " + label).setEscapeModelStrings(false);
- }
-
- });
- }
- });
-
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("To State")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
- TransitionSpec transition = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, transition) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, transition.getToState());
- }
-
- });
- }
-
- });
-
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("Do Transition When")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
- TransitionSpec transition = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, transition) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, transition.getTrigger().getDescription());
- }
-
- });
- }
-
- });
-
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("Applicable Issues")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
- TransitionSpec transition = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, transition) {
-
- @Override
- protected Component newLabel(String componentId) {
- if (transition.getTrigger().getIssueQuery() != null)
- return new Label(componentId, transition.getTrigger().getIssueQuery());
- else
- return new Label(componentId, "<i>All</i>").setEscapeModelStrings(false);
- }
-
- });
- }
-
- });
-
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel.getObject()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
- }
-
- };
- }
-
- });
- }
-
- @Override
- public String getCssClass() {
- return "ellipsis";
- }
-
- });
-
- IDataProvider<TransitionSpec> dataProvider = new ListDataProvider<TransitionSpec>() {
-
- @Override
- protected List<TransitionSpec> getData() {
- return transitions;
- }
-
- };
-
- DataTable<TransitionSpec, Void> dataTable;
- add(dataTable = new DataTable<TransitionSpec, Void>("stateTransitions", columns, dataProvider, Integer.MAX_VALUE));
- dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
-
- dataTable.add(new SortBehavior() {
-
- @Override
- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
- int fromIndex = from.getItemIndex();
- int toIndex = to.getItemIndex();
- if (fromIndex < toIndex) {
- for (int i=0; i<toIndex-fromIndex; i++)
- Collections.swap(transitions, fromIndex+i, fromIndex+i+1);
- } else {
- for (int i=0; i<fromIndex-toIndex; i++)
- Collections.swap(transitions, fromIndex-i, fromIndex-i-1);
- }
- onChanged(target);
- target.add(StateTransitionListPanel.this);
- }
-
- }.sortable("tbody"));
-
- setOutputMarkupId(true);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new StateTransitionListResourceReference()));
- }
-
- private int getTransitionSpecIndex(TransitionSpec transition) {
- for (int i=0; i<transitions.size(); i++) {
- if (transitions.get(i) == transition)
- return i;
- }
- return -1;
- }
-
- private abstract class ColumnFragment extends Fragment {
-
- private final int index;
-
- public ColumnFragment(String id, TransitionSpec transition) {
- super(id, "columnFrag", StateTransitionListPanel.this);
- this.index = getTransitionSpecIndex(transition);
- Preconditions.checkState(this.index != -1);
- }
-
- private TransitionSpec getTransition() {
- return transitions.get(index);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
-
- @Override
- protected String getTitle() {
- return "State Transition";
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "transition-spec def-detail"));
- }
-
- @Override
- protected Component newBody(String id) {
- SideFloating sideFloating = this;
- Fragment fragment = new Fragment(id, "viewTransitionFrag", StateTransitionListPanel.this);
- fragment.add(BeanContext.view("viewer", getTransition(), Sets.newHashSet("name"), true));
-
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- sideFloating.close();
- return new TransitionEditPanel(id, transitions, index) {
-
- @Override
- protected void onChanged(AjaxRequestTarget target) {
- StateTransitionListPanel.this.onChanged(target);
- target.add(StateTransitionListPanel.this);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- };
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this state?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- transitions.remove(index);
- onChanged(target);
- target.add(StateTransitionListPanel.this);
- close();
- }
-
- });
-
- fragment.setOutputMarkupId(true);
-
- return fragment;
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
-
- protected abstract Component newLabel(String componentId);
-
- }
-
- protected abstract void onChanged(AjaxRequestTarget target);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListResourceReference.java
deleted file mode 100644
index 35afe62d0a..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.issue.statetransition;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class StateTransitionListResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public StateTransitionListResourceReference() {
- super(StateTransitionListResourceReference.class, "state-transition-list.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/UseDefaultListener.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/UseDefaultListener.java
deleted file mode 100644
index d274b6defb..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/UseDefaultListener.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.onedev.server.web.component.issue.statetransition;
-
-import java.io.Serializable;
-
-public interface UseDefaultListener extends Serializable {
-
- void onUseDefault();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/state-transition-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/state-transition-list.css
deleted file mode 100644
index 0b32c2a036..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/state-transition-list.css
+++ /dev/null
@@ -1,24 +0,0 @@
-.state-transition-list>.head>a {
- margin-right: 8px;
-}
-.transition-spec-edit .property-prerequisite>.value .control-label,
-.transition-spec-edit .property-trigger>.value .control-label {
- font-weight: normal;
-}
-.floating.transition-spec .property-authorized .name {
- border-right: none;
- text-align: left;
-}
-.floating.transition-spec .property-authorized .value {
- white-space: nowrap;
-}
-.floating.transition-spec .property-prerequisite .property-inputName td.name,
-.floating.transition-spec .property-buttonLabel td.name,
-.floating.transition-spec .property-issueQuery td.name,
-.floating.transition-spec .property-branches td.name,
-.floating.transition-spec .property-jobNames td.name,
-.floating.transition-spec .property-authorizedRoles td.name,
-.floating.transition-spec .property-promptFields td.name {
- border-right: none;
- text-align: left;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitleCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitleCssResourceReference.java
deleted file mode 100644
index bbe8a8325a..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitleCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.issue.title;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class IssueTitleCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public IssueTitleCssResourceReference() {
- super(IssueTitleCssResourceReference.class, "issue-title.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html
index 260076a002..27a34e9c11 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html
@@ -1,25 +1,19 @@
<wicket:panel>
- <div wicket:id="content" class="issue-title"></div>
+ <div wicket:id="content" class="issue-title d-flex align-items-center justify-content-start flex-nowrap flex-grow-1"></div>
<wicket:fragment wicket:id="titleEditFrag">
- <form wicket:id="form">
- <div wicket:id="feedback"></div>
- <div class="clearable-wrapper">
+ <form wicket:id="form" class="flex-grow-1 d-flex align-items-center">
+ <div class="clearable-wrapper flex-grow-1 mr-3">
<input wicket:id="title" type="text" placeholder="Input title" class="form-control">
</div>
- <div class="actions">
- <button wicket:id="save" title="Save" value="Save" class="btn btn-success" type="submit"><wicket:svg href="tick" class="icon"/></button>
- <a wicket:id="cancel" title="Cancel" type="button" value="Cancel" class="btn btn-danger"><wicket:svg href="times" class="icon"/></a>
+ <div class="flex-shrink-0 text-nowrap">
+ <button wicket:id="save" title="Save" value="Save" class="btn btn-primary btn-icon mr-1" type="submit"><wicket:svg href="tick" class="icon"/></button>
+ <a wicket:id="cancel" title="Cancel" type="button" value="Cancel" class="btn btn-danger btn-icon"><wicket:svg href="times" class="icon"/></a>
</div>
</form>
</wicket:fragment>
<wicket:fragment wicket:id="titleViewFrag">
- <div class="view clearfix">
- <span class="float-left">
- <span wicket:id="title"></span>
- <a wicket:id="copy" title="Copy issue number and title" class="copy"><wicket:svg href="copy" class="icon"></wicket:svg></a>
- <a wicket:id="edit" title="Edit issue title" class="edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- </span>
- <a wicket:id="create" class="create btn btn-success btn-sm float-right"><wicket:svg href="plus" class="icon"></wicket:svg> New</a>
- </div>
+ <span wicket:id="title" class="mr-3"></span>
+ <a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary copy flex-shrink-0 mr-3" title="Copy issue number and title"><wicket:svg href="copy" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary edit flex-shrink-0 mr-3" title="Edit issue title"><wicket:svg href="edit" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
index bee223fe67..44a0a4208e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
@@ -1,48 +1,24 @@
package io.onedev.server.web.component.issue.title;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
-import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.issue.fieldspec.DateField;
-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;
-import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.search.entity.issue.IssueQueryLexer;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.Input;
-import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
-import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
@@ -50,16 +26,26 @@ public abstract class IssueTitlePanel extends Panel {
private static final String CONTENT_ID = "content";
- private final boolean withIssueCreation;
-
- public IssueTitlePanel(String id, boolean withIssueCreation) {
+ public IssueTitlePanel(String id) {
super(id);
- this.withIssueCreation = withIssueCreation;
}
private Fragment newTitleEditor() {
Fragment titleEditor = new Fragment(CONTENT_ID, "titleEditFrag", this);
+
Form<?> form = new Form<Void>("form");
+ form.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (form.hasError())
+ return "is-invalid";
+ else
+ return "";
+ }
+
+ }));
+
TextField<String> titleInput = new TextField<String>("title", Model.of(getIssue().getTitle()));
titleInput.add(new ReferenceInputBehavior(false) {
@@ -108,7 +94,6 @@ public abstract class IssueTitlePanel extends Panel {
titleEditor.add(form);
- form.add(new FencedFeedbackPanel("feedback", form));
titleEditor.setOutputMarkupId(true);
return titleEditor;
@@ -145,66 +130,6 @@ public abstract class IssueTitlePanel extends Panel {
});
titleViewer.add(new CopyToClipboardLink("copy", Model.of(getIssue().getNumberAndTitle())));
- if (withIssueCreation) {
- titleViewer.add(new BookmarkablePageLink<Void>("create", NewIssuePage.class) {
-
- @Override
- public PageParameters getPageParameters() {
- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
- List<String> criterias = new ArrayList<>();
- if (getIssue().getMilestone() != null) {
- criterias.add(Criteria.quote(Issue.NAME_MILESTONE) + " "
- + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
- + Criteria.quote(getIssue().getMilestoneName()));
- }
- for (Map.Entry<String, Input> entry: getIssue().getFieldInputs().entrySet()) {
- if (getIssue().isFieldVisible(entry.getKey())) {
- List<String> strings = entry.getValue().getValues();
- if (strings.isEmpty()) {
- criterias.add(Criteria.quote(entry.getKey()) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty));
- } else {
- FieldSpec field = issueSetting.getFieldSpec(entry.getKey());
- if (field.isAllowMultiple()) {
- for (String string: strings) {
- criterias.add(Criteria.quote(entry.getKey()) + " "
- + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
- + Criteria.quote(string));
- }
- } else if (!(field instanceof DateField)) {
- criterias.add(Criteria.quote(entry.getKey()) + " "
- + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
- + Criteria.quote(strings.iterator().next()));
- }
- }
- }
- }
-
- String query;
- if (!criterias.isEmpty())
- query = StringUtils.join(criterias, " and ");
- else
- query = null;
-
- return NewIssuePage.paramsOf(getIssue().getProject(), query);
- }
-
- }.add(new WebSocketObserver() {
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
- return Sets.newHashSet(Issue.getWebSocketObservable(getIssue().getId()));
- }
-
- }).setOutputMarkupId(true));
- } else {
- titleViewer.add(new WebMarkupContainer("create").setVisible(false));
- }
-
titleViewer.setOutputMarkupId(true);
return titleViewer;
@@ -217,12 +142,6 @@ public abstract class IssueTitlePanel extends Panel {
add(newTitleViewer());
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new IssueTitleCssResourceReference()));
- }
-
protected abstract Issue getIssue();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css b/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css
deleted file mode 100644
index db830481f1..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.issue-title {
- font-size: 20px;
- font-weight: bold;
- position: relative;
-}
-.issue-title .view>.float-left>a {
- color: #666;
- margin-left: 4px;
- font-size: 16px;
-}
-.issue-title .view>.float-right {
- margin-left: 8px;
-}
-.issue-title input[type=text] {
- font-weight: normal;
-}
-.issue-title .alert {
- font-weight: normal;
- font-size: 14px;
-}
-.issue-title form {
- position: relative;
- padding-right: 100px;
-}
-.issue-title form .actions {
- position: absolute;
- top: 0;
- right: 0;
- margin: 0;
-}
-.issue-title form .actions>:first-child {
- margin-right: 0;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html
index 7eac99ce34..7384c70373 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html
@@ -4,10 +4,10 @@
<form wicket:id="form" class="fix-states leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Fix Undefined States</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
- <div class="alert alert-warning">
+ <div class="alert alert-light-warning">
Please resolve undefined states below. Note that if you select to delete an undefined state,
all issues with that state will be deleted
</div>
@@ -37,7 +37,7 @@
<form wicket:id="form" class="fix-fields leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Fix Undefined Fields</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div class="alert alert-warning">
@@ -69,7 +69,7 @@
<form wicket:id="form" class="fix-field-values leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Fix Undefined Field Values</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div class="alert alert-warning">
@@ -100,12 +100,4 @@
</div>
</form>
</wicket:fragment>
- <wicket:fragment wicket:id="completedFrag">
- <div class="message-box">
- <div class="content">Workflow Reconciliation Completed</div>
- <div class="actions">
- <a wicket:id="ok" class="btn btn-secondary">Ok</a>
- </div>
- </div>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java
index c19b26fc60..47076edb25 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java
@@ -6,14 +6,17 @@ import java.util.HashSet;
import java.util.Map;
import org.apache.wicket.Component;
+import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -29,6 +32,7 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.web.ajaxlistener.ChangeTextListener;
import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;
import io.onedev.server.web.ajaxlistener.SelfDisableListener;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValueResolution.FixType;
import io.onedev.server.web.editable.BeanContext;
@@ -49,7 +53,15 @@ public abstract class WorkflowReconcilePanel extends Panel {
}
private Component newLoadingComponent(String id, String loadingMessage) {
- return new Label(id, loadingMessage).add(AttributeAppender.append("class", "reconcile-checking"));
+ return new Label(id, loadingMessage) {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("h5");
+ }
+
+ }.add(AttributeAppender.append("class", "p-4 m-0"));
}
private IssueManager getIssueManager() {
@@ -346,41 +358,43 @@ public abstract class WorkflowReconcilePanel extends Panel {
}
private Component checkFieldValueOrders(String markupId) {
- return new AjaxLazyLoadPanel(markupId) {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new DisableGlobalLoadingIndicatorListener());
- }
+ return new Label(markupId, "Checking field value orders...") {
+ private AbstractPostAjaxBehavior behavior;
+
@Override
- public Component getLazyLoadComponent(String markupId) {
- getIssueManager().fixFieldValueOrders();
-
- SettingManager settingManager = OneDev.getInstance(SettingManager.class);
- GlobalIssueSetting issueSetting = settingManager.getIssueSetting();
- issueSetting.setReconciled(true);
- settingManager.saveIssueSetting(issueSetting);
-
- Fragment fragment = new Fragment(markupId, "completedFrag", WorkflowReconcilePanel.this);
- fragment.add(new AjaxLink<Void>("ok") {
-
+ protected void onInitialize() {
+ super.onInitialize();
+ add(behavior = new AbstractPostAjaxBehavior() {
+
@Override
- public void onClick(AjaxRequestTarget target) {
+ protected void respond(AjaxRequestTarget target) {
+ getIssueManager().fixFieldValueOrders();
+
+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);
+ GlobalIssueSetting issueSetting = settingManager.getIssueSetting();
+ issueSetting.setReconciled(true);
+ settingManager.saveIssueSetting(issueSetting);
+ Session.get().success("Workflow reconciliation completed");
onCompleted(target);
}
});
- return fragment;
}
@Override
- public Component getLoadingComponent(String markupId) {
- return newLoadingComponent(markupId, "Checking field value orders...");
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("h5");
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(OnDomReadyHeaderItem.forScript(behavior.getCallbackScript()));
}
- };
+ }.add(AttributeAppender.append("class", "p-4 m-0"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/workflow-reconcile.css b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/workflow-reconcile.css
index d98580d2ab..6a477f3b2f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/workflow-reconcile.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/workflow-reconcile.css
@@ -1,7 +1,3 @@
-.reconcile-checking {
- padding: 20px;
- font-size: 18px;
-}
.fix-states .undefined {
width: 50%;
}
@@ -14,6 +10,3 @@
width: 50%;
}
-.workflow-reconciliation .completed .modal-footer {
- text-align: center;
-}
\ No newline at end of file
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.html
index 3bb6433a96..d17b82ae67 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
@@ -1,15 +1,15 @@
<wicket:panel>
<div class="job-list">
<div wicket:id="jobs" class="job">
- <div class="head">
+ <div class="head text-nowrap d-flex align-items-center p-3">
<a wicket:id="name" class="name"><b wicket:id="label"></b></a>
- <a wicket:id="showInList" class="show-in-list" title="Show in build list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
- <a wicket:id="run" class="run" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>
+ <a wicket:id="showInList" class="ml-2" title="Show in build list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
+ <a wicket:id="run" class="run ml-2" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>
</div>
<div class="body">
<div wicket:id="detail"></div>
</div>
</div>
- <div wicket:id="note" class="note"><wicket:svg href="info-circle" class="icon"/> Some jobs are hidden due to permission policy</div>
+ <div wicket:id="note" class="small text-gray"><wicket:svg href="info-circle" class="icon"/> Some jobs are hidden due to permission policy</div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css
index 45bd77b847..e461c0fcc0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css
@@ -1,33 +1,6 @@
-.job-list {
- padding: 12px;
-}
-.job-list>.note {
- font-size: 12px;
- color: #666;
-}
-.job-list>.job {
- margin-bottom: 8px;
-}
.job-list>.job>.head {
- padding: 4px 0;
- white-space: nowrap;
-}
-.job-list>.job>.head .show-in-list {
- color: #666;
- margin-left: 8px;
-}
-.job-list>.job>.head .run {
- color: #666;
- margin-left: 4px;
-}
-
-.job-list>.job>.body {
- border-top: 1px solid #D8D8D8;
- padding-top: 8px;
-}
-.job-list>.job>.body .simple-build-list {
- padding: 0;
+ border-bottom: 1px solid var(--light-gray);
}
-.job-list>.job>.body .no-builds {
- padding: 0;
+.job-list .no-builds {
+ margin: 0.5rem 1rem !important;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
index 6b005ad7a9..908c38746d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
<div class="modal-header">
<h5 wicket:id="title" class="modal-title"></h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div wicket:id="content" class="modal-body insert-url"></div>
<wicket:fragment wicket:id="tabbedFrag">
- <ul wicket:id="tabs" class="tabs nav nav-tabs"></ul>
+ <ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>
<div wicket:id="content"></div>
</wicket:fragment>
<wicket:fragment wicket:id="inputUrlFrag">
@@ -15,7 +15,7 @@
<div class="form-group">
<label wicket:id="urlLabel" class="control-label"></label>
<input wicket:id="url" class="form-control url"></input>
- <p wicket:id="urlHelp" class="help-block"></p>
+ <p wicket:id="urlHelp" class="form-text text-muted"></p>
</div>
<div class="form-group">
<label wicket:id="textLabel" class="control-label"></label>
@@ -55,8 +55,8 @@
<form wicket:id="form" class="upload-attachment">
<div wicket:id="feedback" class="feedback"></div>
<div wicket:id="file"></div>
- <div class="actions clearfix">
- <button wicket:id="insert" type="submit" class="dirty-aware btn btn-primary float-right">Insert</button>
+ <div class="text-right mt-4">
+ <button wicket:id="insert" type="submit" class="dirty-aware btn btn-primary">Insert</button>
</div>
</form>
</wicket:fragment>
@@ -71,10 +71,10 @@
<div class="input-group">
<input wicket:id="directory" class="form-control"></input>
<span class="input-group-append">
- <a wicket:id="select" title="Select" class="btn btn-secondary"><wicket:svg href="folder-open" class="icon"></wicket:svg></a>
+ <a wicket:id="select" title="Select" class="btn btn-outline-secondary btn-icon"><wicket:svg href="folder-open" class="icon"></wicket:svg></a>
</span>
</div>
- <p class="help-block">Optionally specify relative directory to put uploaded files</p>
+ <p class="form-text text-muted">Optionally specify relative directory to put uploaded files</p>
</div>
<div class="form-group">
<label>Summary Commit Message</label>
@@ -84,9 +84,9 @@
<label>Detail Commit Message</label>
<textarea wicket:id="detailCommitMessage" class="form-control" rows="5"></textarea>
</div>
- <div class="actions clearfix">
- <button wicket:id="insert" class="btn btn-primary float-right">Commit &amp; Insert</button>
- </div>
+ <div class="text-right">
+ <button wicket:id="insert" class="btn btn-primary">Commit &amp; Insert</button>
+ </div>
</form>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
index ace072c9e7..d9a222fe3c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
@@ -1,66 +1,39 @@
<wicket:panel>
- <div wicket:id="container" class="markdown-editor autofit no-autosize name-changing-listener">
- <div class="head">
- <div class="actions clearfix">
- <div class="float-left normal-mode clearfix">
- <a class="do-bold float-left" title="Bold"><wicket:svg href="bold" class="icon"></wicket:svg></a>
- <a class="do-italic float-left" title="Italic"><wicket:svg href="italic" class="icon"></wicket:svg></a>
- <a class="do-header float-left" title="Heading"><wicket:svg href="header" class="icon"></wicket:svg></a>
- <span class="separator float-left"></span>
- <a class="do-link float-left" title="Link (Ctrl-L)"><wicket:svg href="link" class="icon"></wicket:svg></a>
- <a class="do-image float-left" title="Image (Ctrl-I)"><wicket:svg href="image" class="icon"></wicket:svg></a>
- <span class="separator float-left"></span>
- <a class="do-list float-left" title="Unordered list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
- <a class="do-orderlist float-left" title="Ordered list"><wicket:svg href="ordered-list" class="icon"></wicket:svg></a>
- <a class="do-tasklist float-left" title="Task list"><wicket:svg href="tick-box" class="icon"></wicket:svg></a>
- <a class="do-code float-left" title="Code"><wicket:svg href="code" class="icon"></wicket:svg></a>
- <a class="do-quote float-left" title="Quote"><wicket:svg href="quote" class="icon"></wicket:svg></a>
- <span class="separator float-left"></span>
- <a class="do-emoji float-left" title="Show emojis"><wicket:svg href="smile" class="icon"></wicket:svg></a>
- <a class="do-mention float-left" title="Mention someone"><wicket:svg href="at" class="icon"></wicket:svg></a>
- <div class="reference float-left dropdown">
- <a data-toggle="dropdown" title="Reference issue, build, or pull request"><wicket:svg href="hash" class="icon"></wicket:svg></a>
- <div class="dropdown-menu" aria-labelledby="dLabel">
- <a class="dropdown-item do-reference" data-reference="issue"><wicket:svg href="bug" class="icon"></wicket:svg> Reference Issue</a>
- <a class="dropdown-item do-reference" data-reference="pull request"><wicket:svg href="pull-request" class="icon"></wicket:svg> Reference Pull Request</a>
- <a class="dropdown-item do-reference" data-reference="build"><wicket:svg href="play-circle" class="icon"></wicket:svg> Reference Build</a>
- </div>
- </div>
+ <div wicket:id="container" class="markdown-editor no-autosize name-changing-listener d-flex flex-column flex-grow-1 overflow-hidden">
+ <div class="head flex-shrink-0">
+ <div class="actions d-flex flex-wrap">
+ <div class="normal-mode flex-wrap d-none d-lg-flex mr-4">
+ <a class="do-bold" title="Bold"><wicket:svg href="bold" class="icon"></wicket:svg></a>
+ <a class="do-italic" title="Italic"><wicket:svg href="italic" class="icon"></wicket:svg></a>
+ <a class="do-header" title="Heading"><wicket:svg href="header" class="icon"></wicket:svg></a>
+ <span class="separator"></span>
+ <a class="do-link" title="Link (Ctrl-L)"><wicket:svg href="link" class="icon"></wicket:svg></a>
+ <a class="do-image" title="Image (Ctrl-I)"><wicket:svg href="image" class="icon"></wicket:svg></a>
+ <span class="separator"></span>
+ <a class="do-list" title="Unordered list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
+ <a class="do-orderlist" title="Ordered list"><wicket:svg href="ordered-list" class="icon"></wicket:svg></a>
+ <a class="do-tasklist" title="Task list"><wicket:svg href="tick-box" class="icon"></wicket:svg></a>
+ <a class="do-code" title="Code"><wicket:svg href="code" class="icon"></wicket:svg></a>
+ <a class="do-quote" title="Quote"><wicket:svg href="quote" class="icon"></wicket:svg></a>
+ <span class="separator"></span>
+ <a class="do-emoji" title="Show emojis"><wicket:svg href="smile" class="icon"></wicket:svg></a>
+ <a wicket:id="doMention" class="do-mention" title="Mention someone"><wicket:svg href="at" class="icon"></wicket:svg></a>
+ <a wicket:id="doReference" title="Reference issue, build, or pull request"><wicket:svg href="hash" class="icon"></wicket:svg></a>
</div>
- <div class="float-left dropdown compact-mode">
- <a href="#" data-toggle="dropdown" type="button"><wicket:svg href="menu" class="icon"></wicket:svg></a>
- <div class="dropdown-menu" aria-labelledby="dLabel">
- <a class="dropdown-item do-bold"><wicket:svg href="bold" class="icon"></wicket:svg> Bold</a>
- <a class="dropdown-item do-italic"><wicket:svg href="italic" class="icon"></wicket:svg> Italic</a>
- <a class="dropdown-item do-header"><wicket:svg href="header" class="icon"></wicket:svg> Heading</a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item do-link"><wicket:svg href="link" class="icon"></wicket:svg> Link <span class="float-right">Ctrl-L</span></a>
- <a class="dropdown-item do-image"><wicket:svg href="image" class="icon"></wicket:svg> Image <span class="float-right">Ctrl-I</span></a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item do-list"><wicket:svg href="unordered-list" class="icon"></wicket:svg> Unordered List</a>
- <a class="dropdown-item do-orderlist"><wicket:svg href="ordered-list" class="icon"></wicket:svg> Ordered List</a>
- <a class="dropdown-item do-tasklist"><wicket:svg href="tick-box" class="icon"></wicket:svg> Task List</a>
- <a class="dropdown-item do-code"><wicket:svg href="code" class="icon"></wicket:svg> Code</a>
- <a class="dropdown-item do-quote"><wicket:svg href="quote" class="icon"></wicket:svg> Quote</a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item do-emoji"><wicket:svg href="smile" class="icon"></wicket:svg> Show Emojis</a>
- <a class="dropdown-item do-mention"><wicket:svg href="at" class="icon"></wicket:svg> Mention Someone</a>
- <a class="dropdown-item do-reference" data-reference="issue"><wicket:svg href="bug" class="icon"></wicket:svg> Reference Issue</a>
- <a class="dropdown-item do-reference" data-reference="pull request"><wicket:svg href="pull-request" class="icon"></wicket:svg> Reference Pull Request</a>
- <a class="dropdown-item do-reference" data-reference="build"><wicket:svg href="play-circle" class="icon"></wicket:svg> Reference Build</a>
- </div>
+ <div class="compact-mode mr-4">
+ <a wicket:id="actionMenuTrigger"><wicket:svg href="menu" class="icon"></wicket:svg></a>
</div>
- <div class="float-right clearfix">
- <a class="do-fullscreen float-left" title="Full screen"><wicket:svg href="expand" class="icon"></wicket:svg></a>
- <a class="do-help float-left" title="Help"><wicket:svg href="question" class="icon"></wicket:svg></a>
- <span class="separator float-left"></span>
- <a wicket:id="editLink" class="edit float-left" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a class="preview float-left" title="Preview"><wicket:svg href="eye" class="icon"></wicket:svg></a>
- <a wicket:id="splitLink" class="split float-left" title="Split view"><wicket:svg href="split" class="icon"></wicket:svg></a>
+ <div class="ml-auto d-flex flex-wrap">
+ <a class="do-fullscreen" title="Full screen"><wicket:svg href="expand" class="icon"></wicket:svg></a>
+ <a class="do-help" title="Help"><wicket:svg href="question" class="icon"></wicket:svg></a>
+ <span class="separator"></span>
+ <a wicket:id="editLink" class="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a class="preview" title="Preview"><wicket:svg href="eye" class="icon"></wicket:svg></a>
+ <a wicket:id="splitLink" class="split" title="Split view"><wicket:svg href="split" class="icon"></wicket:svg></a>
</div>
</div>
- <div class="warning alert alert-warning">
- <a class="close" data-dismiss="alert"><span>&times;</span></a>
+ <div class="warning alert alert-light-warning">
+ <a class="close" data-dismiss="alert"><span><wicket:svg href="times" class="icon"/></span></a>
<div class="message"><wicket:svg href="warning" class="icon"/> Below content is restored from an unsaved change</div>
</div>
<div class="emojis"></div>
@@ -69,15 +42,39 @@
<span wicket:id="canAttachFile">You may drop file/image to the input box, or paste image from clipboard</span>
</div>
</div>
- <div class="body clearfix">
- <div wicket:id="edit" class="edit">
- <textarea wicket:id="input"></textarea>
- <div class="ui-resizable-handle ui-resizable-s"></div>
+ <div class="body d-flex flex-grow-1 overflow-hidden position-relative">
+ <div wicket:id="edit" class="edit d-flex flex-column overflow-hidden position-relative flex-grow-1">
+ <textarea wicket:id="input" class="form-control flex-grow-1 overflow-auto"></textarea>
+ <div class="ui-resizable-handle ui-resizable-s flex-shrink-0"></div>
</div>
- <div wicket:id="preview" class="preview">
- <div wicket:id="rendered" class="markdown-rendered"></div>
- <div class="ui-resizable-handle ui-resizable-s"></div>
+ <div wicket:id="preview" class="preview position-relative d-flex flex-column flex-grow-1 overflow-hidden">
+ <div wicket:id="rendered" class="markdown-rendered overflow-auto flex-grow-1"></div>
+ <div class="ui-resizable-handle ui-resizable-s flex-shrink-0"></div>
</div>
+ <div class="ui-resizable-handle ui-resizable-s flex-shrink-0"></div>
</div>
</div>
+ <wicket:fragment wicket:id="referenceMenuFrag">
+ <a class="dropdown-item do-reference" data-reference="issue"><wicket:svg href="bug" class="icon mr-1"></wicket:svg> Reference Issue</a>
+ <a class="dropdown-item do-reference" data-reference="pull request"><wicket:svg href="pull-request" class="icon mr-1"></wicket:svg> Reference Pull Request</a>
+ <a class="dropdown-item do-reference" data-reference="build"><wicket:svg href="play-circle" class="icon mr-1"></wicket:svg> Reference Build</a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="actionMenuFrag">
+ <a class="dropdown-item do-bold"><wicket:svg href="bold" class="icon mr-1"></wicket:svg> Bold</a>
+ <a class="dropdown-item do-italic"><wicket:svg href="italic" class="icon mr-1"></wicket:svg> Italic</a>
+ <a class="dropdown-item do-header"><wicket:svg href="header" class="icon mr-1"></wicket:svg> Heading</a>
+ <div class="dropdown-divider"></div>
+ <a class="dropdown-item do-link"><wicket:svg href="link" class="icon mr-1"></wicket:svg> Link <span class="float-right">Ctrl-L</span></a>
+ <a class="dropdown-item do-image"><wicket:svg href="image" class="icon mr-1"></wicket:svg> Image <span class="float-right">Ctrl-I</span></a>
+ <div class="dropdown-divider"></div>
+ <a class="dropdown-item do-list"><wicket:svg href="unordered-list" class="icon mr-1"></wicket:svg> Unordered List</a>
+ <a class="dropdown-item do-orderlist"><wicket:svg href="ordered-list" class="icon mr-1"></wicket:svg> Ordered List</a>
+ <a class="dropdown-item do-tasklist"><wicket:svg href="tick-box" class="icon mr-1"></wicket:svg> Task List</a>
+ <a class="dropdown-item do-code"><wicket:svg href="code" class="icon mr-1"></wicket:svg> Code</a>
+ <a class="dropdown-item do-quote"><wicket:svg href="quote" class="icon mr-1"></wicket:svg> Quote</a>
+ <div class="dropdown-divider"></div>
+ <a class="dropdown-item do-emoji"><wicket:svg href="smile" class="icon mr-1"></wicket:svg> Show Emojis</a>
+ <a wicket:id="doMention" class="dropdown-item do-mention"><wicket:svg href="at" class="icon mr-1"></wicket:svg> Mention Someone</a>
+ <wicket:container wicket:id="doReference"></wicket:container>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 2230f3e390..78a02a6fb8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -32,6 +32,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
@@ -59,6 +60,8 @@ import io.onedev.server.util.markdown.MarkdownManager;
import io.onedev.server.util.validation.ProjectNameValidator;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.markdown.emoji.EmojiOnes;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.ProjectPage;
@@ -160,6 +163,59 @@ public class MarkdownEditor extends FormComponentPanel<String> {
container.add(edit);
container.add(AttributeAppender.append("class", compactMode?"compact-mode":"normal-mode"));
+
+ container.add(new DropdownLink("doReference") {
+
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new Fragment(id, "referenceMenuFrag", MarkdownEditor.this) {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ String script = String.format("onedev.server.markdown.setupActionMenu($('#%s'), $('#%s'));",
+ container.getMarkupId(), getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ }.setOutputMarkupId(true);
+ }
+
+ }.setVisible(getReferenceSupport() != null));
+
+ container.add(new DropdownLink("actionMenuTrigger") {
+
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new Fragment(id, "actionMenuFrag", MarkdownEditor.this) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new WebMarkupContainer("doMention").setVisible(getUserMentionSupport() != null));
+
+ if (getReferenceSupport() != null)
+ add(new Fragment("doReference", "referenceMenuFrag", MarkdownEditor.this));
+ else
+ add(new WebMarkupContainer("doReference").setVisible(false));
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ String script = String.format("onedev.server.markdown.setupActionMenu($('#%s'), $('#%s'));",
+ container.getMarkupId(), getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ }.setOutputMarkupId(true);
+ }
+
+ });
+
+ container.add(new WebMarkupContainer("doMention").setVisible(getUserMentionSupport() != null));
edit.add(input = new TextArea<String>("input", Model.of(getModelObject())));
for (AttributeModifier modifier: getInputModifiers())
@@ -450,7 +506,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
autosaveKey);
response.render(OnDomReadyHeaderItem.forScript(script));
- script = String.format("onedev.server.markdown.onWindowLoad('%s');", container.getMarkupId());
+ script = String.format("onedev.server.markdown.onLoad('%s');", container.getMarkupId());
response.render(OnLoadHeaderItem.forScript(script));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java
index fe1ec8d84f..50c8d4fe22 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java
@@ -15,7 +15,6 @@ import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;
import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;
import io.onedev.server.web.asset.hover.HoverResourceReference;
import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
-import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
import io.onedev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference;
import io.onedev.server.web.component.commit.status.CommitStatusCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
@@ -40,7 +39,6 @@ public class MarkdownResourceReference extends BaseDependentResourceReference {
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
dependencies.add(CssHeaderItem.forReference(new CommitStatusCssResourceReference()));
dependencies.add(CssHeaderItem.forReference(
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index 735a155dbb..0a62feeefb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -41,6 +41,8 @@ import io.onedev.server.util.markdown.MarkdownManager;
import io.onedev.server.web.asset.lozad.LozadResourceReference;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.component.build.status.BuildStatusIcon;
+import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.page.project.ProjectPage;
@SuppressWarnings("serial")
@@ -162,13 +164,13 @@ public class MarkdownViewer extends GenericPanel<String> {
CloseInfo closeInfo = request.getCloseInfo();
if (closeInfo == null) {
status = PullRequest.STATE_OPEN;
- statusCss = "label-warning";
+ statusCss = "badge-warning";
} else {
status = closeInfo.getStatus().toString();
if (closeInfo.getStatus() == CloseInfo.Status.DISCARDED)
- statusCss = "label-danger";
+ statusCss = "badge-danger";
else
- statusCss = "label-success";
+ statusCss = "badge-success";
}
String script = String.format("onedev.server.markdown.renderPullRequestTooltip('%s', '%s', '%s')",
@@ -180,14 +182,14 @@ public class MarkdownViewer extends GenericPanel<String> {
Build build = OneDev.getInstance(BuildManager.class).find(referenceId);
// check permission here as build project may not be the same as current project
if (build != null && SecurityUtils.canAccess(build)) {
- String statusCss = "fa build-status build-status-" + build.getStatus().name().toLowerCase();
- String statusTitle = build.getStatus().getDisplayName();
+ String iconHref = SpriteImage.getVersionedHref(BuildStatusIcon.getIconHref(build.getStatus()));
+ String iconCss = BuildStatusIcon.getIconClass(build.getStatus());
String title = build.getJobName();
if (build.getVersion() != null)
title += " : " + build.getVersion();
String script = String.format("onedev.server.markdown.renderBuildTooltip('%s', '%s', '%s')",
- JavaScriptEscape.escapeJavaScript(title), statusTitle, statusCss);
+ JavaScriptEscape.escapeJavaScript(title), iconHref, iconCss);
target.appendJavaScript(script);
}
break;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/hgrabber.png b/server-core/src/main/java/io/onedev/server/web/component/markdown/hgrabber.png
deleted file mode 100644
index ca55b22c64..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/component/markdown/hgrabber.png and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
index 74feefeef3..cdd2e90d8a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
@@ -1,95 +1,94 @@
-@media(max-width: 991px) {
- .markdown-editor .normal-mode {
- display: none;
- }
-}
@media(min-width: 992px) {
.markdown-editor.compact-mode .normal-mode,
.markdown-editor.normal-mode .compact-mode {
- display: none;
+ display: none !important;
}
}
-body.fullscreen {
- overflow: hidden;
-}
.markdown-editor.fullscreen {
position: fixed;
left: 0;
top: 0;
- width: 100%;
+ bottom: 0;
+ right: 0;
z-index: 1060;
- padding: 20px;
+ padding: 1.6rem;
background: white;
}
-.markdown-editor.compact-mode>.head .split .fa {
- transform: rotate(270deg);
-}
.markdown-editor>.head>.warning {
margin-bottom: 0;
- padding-top: 8px;
- padding-bottom: 8px;
+ padding-top: 0.6rem;
+ padding-bottom: 0.6rem;
display: none;
}
.markdown-editor>.head>.warning, .markdown-editor>.head>.help, .markdown-editor>.head>.emojis {
- margin: 4px;
+ margin: 0.3rem;
}
.markdown-editor>.head {
background: white;
- border: 1px solid #E0E0E0;
+ border: 1px solid var(--light-gray);
border-bottom: none;
- border-radius: 4px 4px 0 0;
- padding: 4px;
+ border-radius: 0.42rem 0.42rem 0 0;
+ padding: 0.3rem;
}
.markdown-editor>.head>.actions>div>a, .markdown-editor>.head>.actions>div>.dropdown>a {
- color: #777;
- padding: 2px;
+ padding: 0.15rem;
+ color: var(--gray);
border: 1px solid white;
- border-radius: 2px;
+ border-radius: 0.42rem;
display: block;
- width: 24px;
+ width: 2rem;
text-align: center;
- margin-right: 4px;
+ margin-right: 0.3rem;
+}
+.markdown-editor.compact-mode>.head .split>.icon {
+ transform: rotate(-90deg);
}
.markdown-editor>.head>.actions .separator {
display: block;
- border-left: 1px solid #E0E0E0;
- margin-right: 4px;
- height: 24px;
+ border-left: 1px solid var(--light-gray);
+ margin-right: 0.3rem;
+ height: 2rem;
}
.markdown-editor>.head>.actions>div>a:hover, .markdown-editor>.head>.actions>div>a.active,
.markdown-editor>.head>.actions>div>.dropdown>a:hover, .markdown-editor>.head>.actions>div>.dropdown>a.active {
- background: #EEE;
- border: 1px solid #E0E0E0;
+ background: var(--light);
+ border: 1px solid var(--light-gray);
}
.markdown-editor .ui-resizable-handle {
- background: #EEE url(hgrabber.png) no-repeat scroll center center;
+ background: var(--light-gray) url(/icon/grip2.svg) no-repeat scroll center center;
+ background-size: 20px 20px;
cursor: s-resize;
- height: 8px;
- bottom: -8px;
+ height: 4px;
+ bottom: 0;
+ border-radius: 0 0 0.42rem 0.42rem;
+}
+
+.markdown-editor.fullscreen .ui-resizable-handle {
+ display: none;
}
.markdown-editor>.head>.emojis {
display: none;
}
.markdown-editor>.head>.emojis.loaded {
- font-size: 12px;
- line-height: 24px;
+ font-size: 0.95rem;
+ line-height: 2rem;
height: 200px;
overflow: auto;
}
.markdown-editor>.head>.emojis.loading {
- font-size: 16px;
- color: #888;
+ font-size: 1.25rem;
+ color: var(--gray-dark);
}
.markdown-editor>.head>.emojis .emoji {
- margin-right: 12px;
+ margin-right: 1rem;
}
.markdown-editor>.head>.emojis .emoji img {
- width: 16px;
- height: 16px;
+ width: 1.25rem;
+ height: 1.25rem;
}
.markdown-editor.preview>.emojis .emoji img {
opacity: 0.5;
@@ -100,12 +99,25 @@ body.fullscreen {
}
.markdown-editor>.body>.preview>.markdown-rendered {
- border: 1px solid #E0E0E0;
- padding: 8px;
- border-radius: 0 0 4px 4px;
+ border: 1px solid var(--light-gray);
+ padding: 0.6rem;
+ border-radius: 0 0 0.42rem 0.42rem;
background: white;
}
+.markdown-editor.preview-mode>.body>.edit, .markdown-editor.edit-mode>.body>.preview {
+ display: none !important;
+}
+.markdown-editor.normal-mode.split-mode>.body>.edit>textarea {
+ border-radius: 0 0 0 0.42rem;
+}
+.markdown-editor.normal-mode.split-mode>.body>.preview>.markdown-rendered {
+ border-radius: 0 0 0.42rem 0;
+}
+.markdown-editor.fullscreen>.body>* {
+ height: 100% !important;
+}
+
/*
* Do not display header link in preview mode as otherwise we need to reserve a big margin
* at left side
@@ -114,89 +126,51 @@ body.fullscreen {
display: none;
}
-.markdown-editor.normal-mode.edit-mode>.body>.edit {
- width: 100%;
-}
-.markdown-editor.normal-mode.edit-mode>.body>.preview {
- display: none;
+.markdown-editor.normal-mode>.body>div {
+ flex: 1;
}
-.markdown-editor.normal-mode.preview-mode>.body>.edit {
- display: none;
-}
-.markdown-editor.normal-mode.preview-mode>.body>.preview {
- width: 100%;
-}
-.markdown-editor.normal-mode.split-mode>.body>.edit {
- float: left;
- width: 50%;
-}
-.markdown-editor.normal-mode.split-mode>.body>.preview {
- float: left;
- width: 50%;
-}
-
-.markdown-editor.compact-mode.edit-mode>.body>.edit {
- width: 100%;
-}
-.markdown-editor.compact-mode.edit-mode>.body>.preview {
- display: none;
-}
-.markdown-editor.compact-mode.preview-mode>.body>.edit {
- display: none;
-}
-.markdown-editor.compact-mode.preview-mode>.body>.preview {
- width: 100%;
-}
-.markdown-editor.compact-mode.split-mode>.body>.edit {
- width: 100%;
+.markdown-editor.compact-mode>.body {
+ flex-direction: column;
}
.markdown-editor.compact-mode.split-mode>.body>.preview {
- width: 100%;
+ margin-top: 0.5rem;
+}
+.markdown-editor.compact-mode.split-mode>.body>.preview>.markdown-rendered {
+ border-radius: 0.42rem;
}
.markdown-editor>.body>.edit>textarea {
- border: 1px solid #E0E0E0;
- border-radius: 0 0 4px 4px;
- overflow: auto;
width: 100%;
display: block;
resize: none;
- padding: 8px;
-}
-.markdown-editor>.body>.preview>.markdown-rendered {
- overflow: auto;
+ padding: 0.6rem;
+ border-radius: 0 0 0.42rem 0.42rem;
}
.markdown-editor>.body>.preview>.markdown-rendered>.message {
- color: #999;
-}
-.markdown-editor.normal-mode.split-mode>.body>.edit>textarea {
- border-radius: 0 0 0 4px;
-}
-.markdown-editor.normal-mode.split-mode>.body>.preview>.markdown-rendered {
- border-left: none;
- border-radius: 0 0 4px 0;
-}
-.markdown-editor.compact-mode.split-mode>.body>.preview {
- margin-top: 8px;
- border-left: none;
- border-radius: 0 0 4px 0;
+ color: var(--gray);
}
+
.compact-mode.dropdown a {
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
}
+.markdown-editor.compact-mode>.body>.ui-resizable-handle,
+.markdown-editor.normal-mode>.body>div>.ui-resizable-handle {
+ display: none;
+}
+
.atwho-view .emoji {
display: inline-block;
- height: 20px;
- width: 20px;
+ height: 1.5rem;
+ width: 1.5rem;
vertical-align: middle;
background-repeat: no-repeat;
- background-size: 20px 20px;
+ background-size: 1.5rem 1.5rem;
}
.atwho-view .avatar img {
display: inline-block;
- width: 20px;
- height: 20px;
+ width: 1.5rem;
+ height: 1.5rem;
vertical-align: middle;
}
.atwho-view .cur .text-muted {
@@ -207,7 +181,7 @@ body.fullscreen {
padding: 0;
}
.insert-url .attachment {
- margin-bottom: 20px;
+ margin-bottom: 1.5rem;
}
.insert-url .attachment:LAST-CHILD {
margin-bottom: 0;
@@ -220,68 +194,70 @@ body.fullscreen {
max-width: 100%;
}
.insert-url .attachment.image .btn {
- margin-top: 8px;
+ margin-top: 0.6rem;
}
.insert-url .alert-info {
- margin-top: 20px;
+ margin-top: 1.5rem;
}
.markdown-editor>.body>.edit>textarea>.drag-over {
- border: 2px solid #69B7F7;
+ border: 2px solid #187DE4;
}
.markdown-rendered li {
- margin-bottom: 6px;
+ margin-bottom: 0.5rem;
}
.markdown-rendered .emoji {
- width: 20px;
- height: 20px;
+ width: 1.5rem;
+ height: 1.5rem;
}
.markdown-rendered table {
width: auto;
- margin-bottom: 10px;
+ margin-bottom: 1rem;
}
.markdown-rendered table th, .markdown-rendered table td {
- padding: 4px 8px;
- border: 1px solid #C8C8C8;
+ padding: 0.4rem 0.8rem;
+ border: 1px solid var(--secondary);
}
.markdown-rendered table tr:nth-child(even) td {
- background: #F5F5F5;
+ background: var(--light);
}
.markdown-rendered h1, .markdown-rendered h2, .markdown-rendered h3,
.markdown-rendered h4, .markdown-rendered h5, .markdown-rendered h6 {
font-weight: bold;
}
.markdown-rendered pre.highlight {
- padding: 8px;
- border: 1px dashed #BBB;
- background: #F9F9F9;
+ padding: 0.6rem;
+ border: 1px dashed var(--secondary);
position: relative;
word-break: normal;
+ border-radius: 0.42rem;
+}
+.markdown-rendered pre.highlight>code {
+ background: none;
}
.markdown-rendered blockquote {
- font-size: 15px;
- border-left: 4px solid #ddd;
- color: #777;
- padding: 0 16px;
+ font-size: 1.15rem;
+ border-left: 0.3rem solid var(--secondary);
+ color: var(--gray);
+ padding: 0 1.23rem;
}
.markdown-rendered img {
max-width: 100%;
}
.markdown-rendered .task-list-item {
list-style: none;
- margin-left: -21px;
+ margin-left: -1rem;
}
.markdown-rendered .task-list-item input {
- margin-right: 8px;
+ margin-right: 0.6rem;
+ vertical-align: middle;
}
.markdown-rendered .header-link {
display: none;
position: absolute;
- font-size: 24px;
- margin-left: -24px;
}
.markdown-rendered h1:hover .header-link,
.markdown-rendered h2:hover .header-link,
@@ -292,81 +268,91 @@ body.fullscreen {
display: inline;
}
-.markdown-rendered h1,
-.markdown-rendered h2,
-.markdown-rendered h3,
-.markdown-rendered h4,
-.markdown-rendered h5,
-.markdown-rendered h6 {
- margin-left: -24px;
- padding-left: 24px;
+.markdown-rendered h1, .markdown-rendered h2,
+.markdown-rendered h3, .markdown-rendered h4,
+.markdown-rendered h5, .markdown-rendered h6 {
position: relative;
}
+
.markdown-rendered h1 .header-link {
- margin-top: 10px;
+ margin-left: -24px;
}
.markdown-rendered h2 .header-link {
- margin-top: 4px;
+ margin-left: -22px;
}
.markdown-rendered h3 .header-link {
- margin-top: 2px;
+ margin-left: -20px;
+}
+.markdown-rendered h4 .header-link {
+ margin-left: -18px;
}
.markdown-rendered h5 .header-link {
- margin-top: -2px;
+ margin-left: -16px;
}
.markdown-rendered h6 .header-link {
- margin-top: -6px;
+ margin-left: -14px;
}
-.markdown-rendered a.header-link {
- color: #333;
- text-decoration: none;
+
+.markdown-rendered h1 {
+ margin-left: -24px;
+ padding-left: 24px;
}
-#reference-tooltip {
- z-index: 1000;
+.markdown-rendered h2 {
+ margin-left: -22px;
+ padding-left: 22px;
}
-#reference-tooltip .content {
- background-color: #FBFCC5;
- border: 1px solid black;
- border-radius: 4px;
- padding: 12px;
+.markdown-rendered h3 {
+ margin-left: -20px;
+ padding-left: 20px;
}
-#reference-tooltip .content .label {
- margin-right: 4px;
+.markdown-rendered h4 {
+ margin-left: -18px;
+ padding-left: 18px;
}
-#reference-tooltip .content.user {
- position: relative;
- padding-left: 60px;
+.markdown-rendered h5 {
+ margin-left: -16px;
+ padding-left: 16px;
}
-#reference-tooltip .content.user .avatar {
- width: 36px;
- height: 36px;
- position: absolute;
- left: 16px;
- top: 16px;
+.markdown-rendered h6 {
+ margin-left: -14px;
+ padding-left: 14px;
}
-#reference-tooltip .content.user .name {
- padding: 0 !important;
- margin: 0 !important;
- font-weight: bold;
+.markdown-rendered h1 .header-link .icon {
+ width: 20px;
+ height: 20px;
}
-#reference-tooltip .content.commit .head {
- font-weight: bold;
- margin-bottom: 12px;
+.markdown-rendered h2 .header-link .icon {
+ width: 18px;
+ height: 18px;
}
-#reference-tooltip .content.commit .author {
- margin-right: 4px;
+.markdown-rendered h3 .header-link .icon {
+ width: 16px;
+ height: 16px;
}
-#reference-tooltip .content.commit .body {
- background: none;
- border: none;
- padding: 0;
- margin: 0;
+.markdown-rendered h4 .header-link .icon {
+ width: 14px;
+ height: 14px;
}
-#reference-tooltip .content.build .status:before {
- margin-right: 4px;
+.markdown-rendered h5 .header-link .icon {
+ width: 14px;
+ height: 14px;
}
-#reference-tooltip .content.build .title {
- margin-left: 10px;
+.markdown-rendered h6 .header-link .icon {
+ width: 12px;
+ height: 12px;
+}
+.markdown-rendered a.header-link {
+ color: var(--gray-dark);
+}
+
+#reference-tooltip {
+ z-index: 1000;
+ background-color: var(--light-info);
+ border-radius: 0.42rem;
+ color: var(--info);
+ font-size: 12px;
+ padding: 1rem;
+ box-shadow: 0px 10px 30px 0px rgba(82, 63, 105, 0.08);
}
.markdown-image-loading {
@@ -378,4 +364,16 @@ body.fullscreen {
.reference.mention {
text-decoration: none;
+}
+
+.markdown-rendered a {
+ color: var(--primary);
+}
+.markdown-rendered a:hover, .markdown-rendered a:focus {
+ color: #0073e9;
+}
+
+.insert-url .dropzone.dropzone-field {
+ border: 2px dashed var(--light-gray);
+ border-radius: 0.42rem;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index f00e41e745..59a85dff5c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -14,50 +14,25 @@ onedev.server.markdown = {
$input[0].dispatchEvent(evt);
}
},
- autofit: function(containerId, width, height) {
- var $container = $("#" + containerId);
- var $head = $container.children(".head");
- var $body = $container.children(".body");
- var $edit = $body.children(".edit");
- var $input = $edit.children("textarea");
- var $preview = $body.children(".preview");
- var $rendered = $preview.children(".markdown-rendered");
-
- $container.outerWidth(width).outerHeight(height);
-
- width = $container.width();
- height = $container.height();
-
- height -= $head.outerHeight();
- if ($container.hasClass("compact-mode")) {
- height = height/2;
- }
- $input.outerHeight(height);
- $edit.outerHeight($input.outerHeight());
- $rendered.outerHeight($input.outerHeight());
- $preview.outerHeight($rendered.outerHeight());
- },
onDomReady: function(containerId, callback, atWhoLimit, attachmentSupport,
attachmentMaxSize, canMentionUser, canReferenceEntity,
projectNamePattern, autosaveKey) {
var $container = $("#" + containerId);
+ $container.data("callback", callback);
+ $container.data("autosaveKey", autosaveKey);
+
var $head = $container.children(".head");
var $body = $container.children(".body");
var $editLink = $head.find(".edit");
var $previewLink = $head.find(".preview");
var $splitLink = $head.find(".split");
- var $emojis = $head.children(".emojis");
- var $help = $head.children(".help");
- var $warning = $head.children(".warning");
var $edit = $body.children(".edit");
var $input = $edit.children("textarea");
var $preview = $body.children(".preview");
var $rendered = $preview.children(".markdown-rendered");
- var $resizeHandles = $container.find(".ui-resizable-handle");
+ var $help = $head.children(".help");
- $container.data("autosaveKey", autosaveKey);
-
- $head.find(".dropdown>button").dropdown();
+ $head.find(".dropdown>a").dropdown();
$editLink.click(function() {
$container.removeClass("preview-mode").removeClass("split-mode").addClass("edit-mode");
@@ -65,7 +40,6 @@ onedev.server.markdown = {
$editLink.addClass("active");
$previewLink.removeClass("active");
$splitLink.removeClass("active");
- onLayoutChange();
Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".split", false, {expires: Infinity});
});
$previewLink.click(function() {
@@ -85,11 +59,12 @@ onedev.server.markdown = {
$rendered.data("caret", caret);
$rendered.data("caretOffset", caretOffset);
- $rendered.html("<div class='message'>Loading...</div>");
+ onedev.server.perfectScrollbar.empty($rendered);
+ $rendered.prepend("<div class='message'>Loading...</div>");
+
$editLink.removeClass("active");
$previewLink.addClass("active");
$splitLink.removeClass("active");
- onLayoutChange();
callback("render", $input.val());
});
$splitLink.click(function() {
@@ -97,21 +72,17 @@ onedev.server.markdown = {
$input.focus();
- $rendered.html("<div class='message'>Loading...</div>");
+ onedev.server.perfectScrollbar.empty($rendered);
+ $rendered.prepend("<div class='message'>Loading...</div>");
+
$editLink.removeClass("active");
$previewLink.removeClass("active");
$splitLink.addClass("active");
- onLayoutChange();
callback("render", $input.val());
Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".split", true, {expires: Infinity});
});
- function onLayoutChange() {
- if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
- $rendered.outerHeight($input.outerHeight());
- $preview.outerHeight($edit.outerHeight());
- }
- }
+ onedev.server.markdown.setupActionMenu($container, $head.find(".normal-mode"));
var previewTimeout = 500;
$input.doneEvents("input inserted.atwho", function() {
@@ -279,172 +250,48 @@ onedev.server.markdown = {
onedev.server.markdown.fireInputEvent($input);
});
+ var minHeight = 75;
+ $body.resizable({
+ autoHide: false,
+ handles: {"s": $body.children(".ui-resizable-handle")},
+ minHeight: minHeight,
+ stop: function() {
+ Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".bodyHeight",
+ $body.height(), {expires: Infinity});
+ }
+ });
+
$edit.resizable({
autoHide: false,
handles: {"s": $edit.children(".ui-resizable-handle")},
- minHeight: 75,
- resize: function(e, ui) {
- $input.outerHeight($edit.height());
- if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
- $rendered.outerHeight($input.outerHeight());
- $preview.outerHeight($edit.outerHeight());
- }
- },
- stop: function(e, ui) {
- Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".inputHeight",
- $input.outerHeight(), {expires: Infinity});
- if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
- Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".renderedHeight",
- $rendered.outerHeight(), {expires: Infinity});
- }
+ minHeight: minHeight,
+ stop: function() {
+ Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".editHeight",
+ $edit.height(), {expires: Infinity});
}
});
$preview.resizable({
+ autoHide: false,
handles: {"s": $preview.children(".ui-resizable-handle")},
- minHeight: 75,
- resize: function(e, ui) {
- $rendered.outerHeight($preview.height());
- if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
- $input.outerHeight($rendered.outerHeight());
- $edit.outerHeight($preview.outerHeight());
- }
- },
- stop: function(e, ui) {
- Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".renderedHeight",
- $rendered.outerHeight(), {expires: Infinity});
- if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
- Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".inputHeight",
- $input.outerHeight(), {expires: Infinity});
- }
- }
- });
-
- $warning.on("closed.bs.alert", function () {
- if (!$resizeHandles.is(":visible"))
- onedev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight());
- })
-
- $container.on("autofit", function(e, width, height) {
- $resizeHandles.hide();
- onedev.server.markdown.autofit(containerId, width, height);
- });
-
- $head.find(".do-bold").click(function() {
- var selected = $input.range();
- if (selected.length != 0) {
- $input.range("**" + selected.text + "**").range(selected.start+2, selected.end+2);
- } else {
- $input.range("**strong text**").range(selected.start+2, selected.end+2+"strong text".length);
- }
- $input.focus();
- onedev.server.markdown.fireInputEvent($input);
- });
-
- $head.find(".do-italic").click(function() {
- var selected = $input.range();
- if (selected.length != 0) {
- $input.range("_" + selected.text + "_").range(selected.start+1, selected.end+1);
- } else {
- $input.range("_emphasized text_").range(selected.start+1, selected.end+1+"emphasized text".length);
- }
- $input.focus();
- onedev.server.markdown.fireInputEvent($input);
- });
-
- $head.find(".do-header").click(function() {
- var selected = $input.range();
- if (selected.length != 0) {
- $input.range("### " + selected.text).range(selected.start+4, selected.end+4);
- } else {
- $input.range("### heading text").range(selected.start+4, selected.end+4+"heading text".length);
- }
- $input.focus();
- onedev.server.markdown.fireInputEvent($input);
- });
-
- $head.find(".do-list, .do-orderlist, .do-tasklist").click(function() {
- var leading;
- if ($(this).hasClass("do-list"))
- leading = "-";
- else if ($(this).hasClass("do-orderlist"))
- leading = "1.";
- else
- leading = "- [ ]";
- var selected = $input.range();
- if (selected.length != 0) {
- var splitted = selected.text.split("\n");
- var insert = "";
- for (var i in splitted) {
- if (i != 0)
- insert += "\n";
- insert += leading + " " + splitted[i];
- }
- $input.range(insert).range(selected.start+leading.length+1, selected.start+leading.length+1+splitted[0].length);
- } else {
- var text;
- if ($(this).hasClass("do-tasklist"))
- text = " task text here";
- else
- text = " list text here";
- $input.range(leading + text).range(selected.start+leading.length+1, selected.start+leading.length+1+text.length);
+ minHeight: minHeight,
+ stop: function() {
+ Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".previewHeight",
+ $preview.height(), {expires: Infinity});
}
- $input.focus();
- onedev.server.markdown.fireInputEvent($input);
});
- $head.find(".do-code").click(function() {
- var langHint = "programming language";
- var selected = $input.range();
- if (selected.length != 0) {
- $input.range("\n```" + langHint + "\n" + selected.text + "\n```\n").range(selected.start+4, selected.start+4+langHint.length);
- } else {
- $input.range("\n```" + langHint + "\ncode text here\n```\n").range(selected.start+4, selected.start+4+langHint.length);
- }
- $input.focus();
- onedev.server.markdown.fireInputEvent($input);
- });
-
- $head.find(".do-quote").click(function() {
- var selected = $input.range();
- if (selected.length != 0)
- $input.range("> " + selected.text).range(selected.start+2, selected.end+2);
- else
- $input.range("> quote here").range(selected.start+2, selected.start+2+"quote here".length);
- $input.focus();
- onedev.server.markdown.fireInputEvent($input);
- });
-
- $head.find(".do-emoji").click(function() {
- if (!$emojis.hasClass("loaded") && !$emojis.hasClass("loading")) {
- $emojis.addClass("loading");
- $emojis.html("Loading emojis...");
- callback("loadEmojis");
- }
- $emojis.toggle();
- $head.find(".do-emoji").toggleClass("active");
- if (!$resizeHandles.is(":visible"))
- onedev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight());
- });
-
$head.find(".do-help").click(function() {
$(this).toggleClass("active");
$help.toggle();
- if (!$resizeHandles.is(":visible"))
- onedev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight());
});
- function getReplacement() {
+ $head.find(".do-fullscreen").click(function() {
var $replacement = $container.closest("form");
if ($replacement.length == 0)
$replacement = $container;
- return $replacement;
- }
-
- $head.find(".do-fullscreen").click(function() {
- var $replacement = getReplacement();
+
if ($container.hasClass("fullscreen")) {
- $("body").removeClass("fullscreen");
$container.removeClass("fullscreen");
var $placeholder = $("#" + containerId + "-placeholder");
@@ -456,18 +303,8 @@ onedev.server.markdown = {
$container.removeClass("normal-mode");
$container.addClass("compact-mode");
}
- if ($container.data("resizeHandlesVisiblePreviously"))
- $resizeHandles.show();
-
- if ($resizeHandles.is(":visible")) {
- $container.css("width", "inherit").css("height", "inherit");
- onedev.server.markdown.restoreSizeFromCookie($container);
- } else {
- $(window).resize();
- }
} else {
$container.addClass("fullscreen");
- $container.data("resizeHandlesVisiblePreviously", $resizeHandles.is(":visible"));
if ($container.hasClass("compact-mode")) {
$container.removeClass("compact-mode");
$container.addClass("normal-mode");
@@ -475,60 +312,16 @@ onedev.server.markdown = {
} else {
$container.data("compactModePreviously", false);
}
- $resizeHandles.hide();
var $placeholder = $("<div id='" + containerId + "-placeholder'></div>");
$placeholder.insertAfter($replacement);
- $("body").append($replacement).addClass("fullscreen");
+ $("body").append($replacement);
$(this).addClass("active");
- $(window).resize();
}
+
if ($input.is(":visible"))
$input.focus();
});
-
- $(window).resize(function() {
- if ($container.hasClass("fullscreen")) {
- onedev.server.markdown.autofit(containerId, $(window).width(), $(window).height());
- }
- });
- if (!canMentionUser)
- $head.find(".do-mention").remove();
- if (!canReferenceEntity)
- $head.find(".do-reference, .reference.dropdown").remove();
-
- $head.find(".do-mention, .do-reference").click(function() {
- if (!$edit.is(":visible"))
- return;
-
- var atChar = $(this).hasClass("do-mention")? "@": "#";
- var prevChar;
- var caret = $input.caret();
- if (caret != 0)
- prevChar = $input.val().charAt(caret-1);
-
- var prefix = $(this).data("reference");
- if (prefix === undefined)
- prefix = "";
- else
- prefix = prefix + " ";
-
- if (prevChar === undefined || prevChar === ' ' || prevChar === '\n')
- $input.caret(prefix + atChar);
- else
- $input.caret(" " + prefix + atChar);
-
- $input.atwho("run");
- onedev.server.markdown.fireInputEvent($input);
- });
-
- $head.find(".do-image, .do-link").click(function() {
- if ($(this).hasClass("do-image"))
- callback("selectImage");
- else
- callback("selectLink");
- });
-
$input.on("keydown", function(e) {
if ($(".atwho-view").filter(":visible").length == 0) {
if ((e.ctrlKey|e.metaKey) && e.keyCode == 76) {
@@ -611,9 +404,9 @@ onedev.server.markdown = {
},
displayTpl: function() {
if (matchReference().type)
- return "<li><span class='text-muted'>#${referenceNumber}</span> - ${referenceTitle}</li>";
+ return "<li><span>#${referenceNumber}</span> - ${referenceTitle}</li>";
else
- return "<li><span class='text-muted'>${referenceType} #${referenceNumber}</span> - ${referenceTitle}</li>";
+ return "<li><span>${referenceType} #${referenceNumber}</span> - ${referenceTitle}</li>";
},
insertTpl: function() {
if (matchReference().type)
@@ -780,45 +573,189 @@ onedev.server.markdown = {
$rendered.scrollTop(scrollTop);
},
- restoreSizeFromCookie: function($container) {
- var $body = $container.children(".body");
+ setupActionMenu: function($container, $actionMenu) {
+ var callback = $container.data("callback");
+
+ var $head = $container.children(".head");
+ var $body = $container.children(".body");
+ var $emojis = $head.children(".emojis");
var $edit = $body.children(".edit");
var $input = $edit.children("textarea");
- var $preview = $body.children(".preview");
- var $rendered = $preview.children(".markdown-rendered");
-
- var defaultHeight = 200;
- var inputHeight = Cookies.get(onedev.server.markdown.getCookiePrefix($container)+".inputHeight");
- if (inputHeight) {
- $input.outerHeight(parseInt(inputHeight));
- } else {
- $input.outerHeight(defaultHeight);
+
+ function closeMenu() {
+ var closeCallback = $actionMenu.closest(".floating").data("closeCallback");
+ if (closeCallback)
+ closeCallback();
}
- $edit.outerHeight($input.outerHeight());
- var renderedHeight;
- if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) {
- renderedHeight = $input.outerHeight();
- } else {
- renderedHeight = Cookies.get(onedev.server.markdown.getCookiePrefix($container)+".renderedHeight");
- if (!renderedHeight)
- renderedHeight = defaultHeight;
- }
- $rendered.outerHeight(renderedHeight);
- $preview.outerHeight($rendered.outerHeight());
- },
- onWindowLoad: function(containerId) {
+ $actionMenu.find(".do-bold").click(function() {
+ var selected = $input.range();
+ if (selected.length != 0) {
+ $input.range("**" + selected.text + "**").range(selected.start+2, selected.end+2);
+ } else {
+ $input.range("**strong text**").range(selected.start+2, selected.end+2+"strong text".length);
+ }
+ $input.focus();
+ onedev.server.markdown.fireInputEvent($input);
+ closeMenu();
+ });
+
+ $actionMenu.find(".do-italic").click(function() {
+ var selected = $input.range();
+ if (selected.length != 0) {
+ $input.range("_" + selected.text + "_").range(selected.start+1, selected.end+1);
+ } else {
+ $input.range("_emphasized text_").range(selected.start+1, selected.end+1+"emphasized text".length);
+ }
+ $input.focus();
+ onedev.server.markdown.fireInputEvent($input);
+ closeMenu();
+ });
+
+ $actionMenu.find(".do-header").click(function() {
+ var selected = $input.range();
+ if (selected.length != 0) {
+ $input.range("### " + selected.text).range(selected.start+4, selected.end+4);
+ } else {
+ $input.range("### heading text").range(selected.start+4, selected.end+4+"heading text".length);
+ }
+ $input.focus();
+ onedev.server.markdown.fireInputEvent($input);
+ closeMenu();
+ });
+
+ $actionMenu.find(".do-list, .do-orderlist, .do-tasklist").click(function() {
+ var leading;
+ if ($(this).hasClass("do-list"))
+ leading = "-";
+ else if ($(this).hasClass("do-orderlist"))
+ leading = "1.";
+ else
+ leading = "- [ ]";
+ var selected = $input.range();
+ if (selected.length != 0) {
+ var splitted = selected.text.split("\n");
+ var insert = "";
+ for (var i in splitted) {
+ if (i != 0)
+ insert += "\n";
+ insert += leading + " " + splitted[i];
+ }
+ $input.range(insert).range(selected.start+leading.length+1, selected.start+leading.length+1+splitted[0].length);
+ } else {
+ var text;
+ if ($(this).hasClass("do-tasklist"))
+ text = " task text here";
+ else
+ text = " list text here";
+ $input.range(leading + text).range(selected.start+leading.length+1, selected.start+leading.length+1+text.length);
+ }
+ $input.focus();
+ onedev.server.markdown.fireInputEvent($input);
+ closeMenu();
+ });
+
+ $actionMenu.find(".do-code").click(function() {
+ var langHint = "programming language";
+ var selected = $input.range();
+ if (selected.length != 0) {
+ $input.range("\n```" + langHint + "\n" + selected.text + "\n```\n").range(selected.start+4, selected.start+4+langHint.length);
+ } else {
+ $input.range("\n```" + langHint + "\ncode text here\n```\n").range(selected.start+4, selected.start+4+langHint.length);
+ }
+ $input.focus();
+ onedev.server.markdown.fireInputEvent($input);
+ closeMenu();
+ });
+
+ $actionMenu.find(".do-quote").click(function() {
+ var selected = $input.range();
+ if (selected.length != 0)
+ $input.range("> " + selected.text).range(selected.start+2, selected.end+2);
+ else
+ $input.range("> quote here").range(selected.start+2, selected.start+2+"quote here".length);
+ $input.focus();
+ onedev.server.markdown.fireInputEvent($input);
+ closeMenu();
+ });
+
+ $actionMenu.find(".do-emoji").click(function() {
+ if (!$emojis.hasClass("loaded") && !$emojis.hasClass("loading")) {
+ $emojis.addClass("loading");
+ $emojis.html("Loading emojis...");
+ callback("loadEmojis");
+ }
+ $emojis.toggle();
+ $actionMenu.find(".do-emoji").toggleClass("active");
+ closeMenu();
+ });
+
+ $actionMenu.find(".do-mention, .do-reference").click(function() {
+ closeMenu();
+
+ if (!$edit.is(":visible"))
+ return;
+
+ var atChar = $(this).hasClass("do-mention")? "@": "#";
+ var prevChar;
+ var caret = $input.caret();
+ if (caret != 0)
+ prevChar = $input.val().charAt(caret-1);
+
+ var prefix = $(this).data("reference");
+ if (prefix === undefined)
+ prefix = "";
+ else
+ prefix = prefix + " ";
+
+ if (prevChar === undefined || prevChar === ' ' || prevChar === '\n')
+ $input.caret(prefix + atChar);
+ else
+ $input.caret(" " + prefix + atChar);
+
+ $input.atwho("run");
+ onedev.server.markdown.fireInputEvent($input);
+ });
+
+ $actionMenu.find(".do-image, .do-link").click(function() {
+ if ($(this).hasClass("do-image"))
+ callback("selectImage");
+ else
+ callback("selectLink");
+ closeMenu();
+ });
+ },
+ onLoad: function(containerId) {
var $container = $("#" + containerId);
var $head = $container.children(".head");
var $body = $container.children(".body");
var $warning = $head.children(".warning");
- var $rendered = $body.find(">.preview>.markdown-rendered");
- var $input = $body.find(">.edit>textarea");
- var $resizeHandles = $container.find(".ui-resizable-handle");
+ var $edit = $body.children(".edit");
+ var $preview = $body.children(".preview");
+ var $input = $edit.children("textarea");
- if ($resizeHandles.is(":visible")) {
- onedev.server.markdown.restoreSizeFromCookie($container);
- }
+ if ($body.find(".ui-resizable-handle:visible").length != 0) {
+ var defaultHeight = 200;
+ if ($container.hasClass("normal-mode")) {
+ var bodyHeight = Cookies.get(onedev.server.markdown.getCookiePrefix($container)+".bodyHeight");
+ if (bodyHeight)
+ $body.height(parseInt(bodyHeight));
+ else
+ $body.height(defaultHeight);
+ } else {
+ var editHeight = Cookies.get(onedev.server.markdown.getCookiePrefix($container)+".editHeight");
+ if (editHeight)
+ $edit.height(parseInt(editHeight));
+ else
+ $edit.height(defaultHeight);
+
+ var previewHeight = Cookies.get(onedev.server.markdown.getCookiePrefix($container)+".previewHeight");
+ if (previewHeight)
+ $preview.height(parseInt(previewHeight));
+ else
+ $preview.height(defaultHeight);
+ }
+ }
var autosaveKey = $container.data("autosaveKey");
if (autosaveKey) {
@@ -827,8 +764,6 @@ onedev.server.markdown = {
if (autosaveValue && $input.val() != autosaveValue) {
$input.val(autosaveValue);
$warning.show();
- if (!$resizeHandles.is(":visible"))
- onedev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight());
onedev.server.markdown.fireInputEvent($input);
}
}
@@ -847,7 +782,9 @@ onedev.server.markdown = {
existingImages[key] = elements;
});
- $rendered.html(html);
+ onedev.server.perfectScrollbar.empty($rendered);
+ $rendered.prepend(html);
+
onedev.server.markdown.initRendered($rendered);
// Avoid loading existing image
@@ -868,7 +805,6 @@ onedev.server.markdown = {
$rendered.find("img").on("load", function() {
onedev.server.markdown.syncPreviewScroll(containerId);
});
-
},
initRendered: function($rendered) {
$rendered.find("span.header-anchor").parent().addClass("header-anchor");
@@ -932,8 +868,11 @@ onedev.server.markdown = {
var $rendered = $container.find(".markdown-rendered");
var content = $rendered.data("content");
- if (content)
- $rendered.html(content).removeData("content");
+
+ if (content) {
+ onedev.server.perfectScrollbar.empty($rendered);
+ $rendered.prepend(content).removeData("content");
+ }
if (taskCallback) {
var $task = $container.find(".task-list-item");
@@ -985,8 +924,8 @@ onedev.server.markdown = {
renderIssueTooltip: function(title, state, stateFontColor, stateBackgroundColor) {
var $tooltip = $("#reference-tooltip");
$tooltip.append("" +
- "<div class='content issue'>" +
- " <span class='state label'></span> <span class='title'></span>" +
+ "<div class='d-flex issue align-items-center'>" +
+ " <span class='state badge mr-3'></span> <span class='title font-weight-bold'></span>" +
"</div>");
$tooltip.find(".state").css({
"color": stateFontColor,
@@ -998,41 +937,37 @@ onedev.server.markdown = {
renderPullRequestTooltip: function(title, status, statusCss) {
var $tooltip = $("#reference-tooltip");
$tooltip.append("" +
- "<div class='content pull-request'>" +
- " <span class='label status'></span> <span class='title'></span>" +
+ "<div class='d-flex align-items-center'>" +
+ " <span class='badge status mr-3'></span> <span class='title font-weight-bold'></span>" +
"</div>");
$tooltip.find(".status").addClass(statusCss).text(status);
$tooltip.find(".title").text(title);
$tooltip.align({placement: $tooltip.data("alignment"), target: {element: $tooltip.data("trigger")}});
},
- renderBuildTooltip: function(title, status, statusCss) {
+ renderBuildTooltip: function(title, iconHref, iconCss) {
var $tooltip = $("#reference-tooltip");
$tooltip.append("" +
- "<div class='content build'>" +
- " <span class='status'></span> <span class='title'></span>" +
+ "<div class='d-flex align-items-center'>" +
+ " <svg class='mr-2 " + iconCss + "'><use xlink:href='" + iconHref + "'/></svg> <span class='title font-weight-bold'></span>" +
"</div>");
- $tooltip.find(".status").addClass(statusCss).text(status);
$tooltip.find(".title").text(title);
$tooltip.align({placement: $tooltip.data("alignment"), target: {element: $tooltip.data("trigger")}});
},
renderUserTooltip: function(avatarUrl, name, email) {
var $tooltip = $("#reference-tooltip");
$tooltip.append("" +
- "<div class='content user'>" +
- " <img class='avatar'></img><div class='name'></div><div class='email'></div>" +
+ "<div class='d-flex align-items-center'>" +
+ " <img class='avatar mr-2'></img> <div class='name font-weight-bold'></div>" +
"</div>");
$tooltip.find(".avatar").attr("src", avatarUrl);
$tooltip.find(".name").text(name);
- $tooltip.find(".email").text(email);
$tooltip.align({placement: $tooltip.data("alignment"), target: {element: $tooltip.data("trigger")}});
},
renderCommitTooltip: function(author, date, commitMessage) {
var $tooltip = $("#reference-tooltip");
$tooltip.append("" +
- "<div class='content commit'>" +
- " <div class='head'><span class='author'></span> <span class='date'></span></div>" +
- " <pre class='body'></pre>" +
- "</div>");
+ " <div class='font-weight-bolder mb-2'><span class='author'></span> <span class='date'></span></div>" +
+ " <pre class='body mb-0'></pre>");
$tooltip.find(".author").text(author);
$tooltip.find(".date").text(date);
$tooltip.find(".body").text(commitMessage);
@@ -1045,14 +980,14 @@ onedev.server.markdown = {
var $edit = $body.children(".edit");
var $input = $edit.children("textarea");
var $emojis = $head.children(".emojis");
- var $resizeHandles = $container.find(".ui-resizable-handle");
var contentHtml = "";
for (var i in emojis) {
var emoji = emojis[i];
contentHtml += "<a class='emoji' title='" + emoji.name + "'><img src='" + emoji.url + "'></img></a> ";
}
- $emojis.html(contentHtml);
+ onedev.server.perfectScrollbar.empty($emojis);
+ $emojis.prepend(contentHtml);
$emojis.removeClass("loading");
$emojis.addClass("loaded");
$emojis.find(".emoji").click(function() {
@@ -1062,11 +997,8 @@ onedev.server.markdown = {
$input.caret(":" + $(this).attr("title") + ": ");
onedev.server.markdown.fireInputEvent($input);
});
- if (!$resizeHandles.is(":visible"))
- onedev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight());
},
insertUrl: function(containerId, isImage, url, name, replaceMessage) {
- var $head = $("#" + containerId + ">.head");
var $body = $("#" + containerId + ">.body");
var $input = $body.find(">.edit>textarea");
diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuItem.java b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuItem.java
index a2762c0053..49221cc654 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuItem.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuItem.java
@@ -17,6 +17,10 @@ public abstract class MenuItem implements Serializable {
public abstract String getLabel();
+ public boolean isSelected() {
+ return false;
+ }
+
public abstract WebMarkupContainer newLink(String id);
@Nullable
diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.html b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.html
index b302569e27..09349e1e84 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.html
@@ -3,6 +3,6 @@
<li wicket:id="items"><wicket:container wicket:id="content"></wicket:container></li>
</ul>
<wicket:fragment wicket:id="contentFrag">
- <a wicket:id="link"><svg wicket:id="icon" class="icon"></svg> <span wicket:id="label" class="text"></span> <span wicket:id="shortcut" class="shortcut"></span></a>
+ <a wicket:id="link" class="text-nowrap d-flex align-items-center"><svg wicket:id="tick" class="icon-tick icon mr-2 ml-n2"/><svg wicket:id="icon" class="icon mr-3"/><span wicket:id="label" class="text"/><span wicket:id="shortcut" class="shortcut ml-auto text-right"/></a>
</wicket:fragment>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java
index ce52859045..b13ac8f68c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.component.menu;
import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -27,20 +28,20 @@ abstract class MenuPanel extends Panel {
setOutputMarkupId(true);
List<MenuItem> menuItems = getMenuItems();
- boolean hasIcons = false;
- boolean hasShortcuts = false;
+ AtomicBoolean hasIcons = new AtomicBoolean(false);
+ AtomicBoolean hasShortcuts = new AtomicBoolean(false);
+ AtomicBoolean hasSelections = new AtomicBoolean(false);
for (MenuItem menuItem: menuItems) {
- if (menuItem.getIconHref() != null)
- hasIcons = true;
- if (menuItem.getShortcut() != null)
- hasShortcuts = true;
+ if (menuItem != null) {
+ if (menuItem.getIconHref() != null)
+ hasIcons.set(true);
+ if (menuItem.getShortcut() != null)
+ hasShortcuts.set(true);
+ if (menuItem.isSelected())
+ hasSelections.set(true);
+ }
}
- if (hasIcons)
- add(AttributeAppender.append("class", "has-icons"));
- if (hasShortcuts)
- add(AttributeAppender.append("class", "has-shortcuts"));
-
add(new ListView<MenuItem>("items", new LoadableDetachableModel<List<MenuItem>>() {
@Override
@@ -56,9 +57,28 @@ abstract class MenuPanel extends Panel {
if (menuItem != null) {
Fragment fragment = new Fragment("content", "contentFrag", MenuPanel.this);
WebMarkupContainer link = menuItem.newLink("link");
- link.add(new SpriteImage("icon", menuItem.getIconHref()));
+ if (menuItem.isSelected())
+ link.add(new SpriteImage("tick", "tick"));
+ else if (hasSelections.get())
+ link.add(new SpriteImage("tick"));
+ else
+ link.add(new WebMarkupContainer("tick").setVisible(false));
+
+ if (menuItem.getIconHref() != null)
+ link.add(new SpriteImage("icon", menuItem.getIconHref()));
+ else if (hasIcons.get())
+ link.add(new SpriteImage("icon"));
+ else
+ link.add(new WebMarkupContainer("icon").setVisible(false));
+
link.add(new Label("label", menuItem.getLabel()));
- link.add(new Label("shortcut", menuItem.getShortcut()));
+
+ if (menuItem.getShortcut() != null)
+ link.add(new Label("shortcut", menuItem.getShortcut()));
+ else if (hasShortcuts.get())
+ link.add(new Label("shortcut", " "));
+ else
+ link.add(new WebMarkupContainer("shortcut").setVisible(false));
fragment.add(link);
item.add(fragment);
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/menu.css b/server-core/src/main/java/io/onedev/server/web/component/menu/menu.css
index 41f809c5aa..2e83b23c7a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/menu/menu.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/menu.css
@@ -1,49 +1,32 @@
.floating.menu .content {
- padding: 4px 0;
- min-width: 120px;
+ min-width: 10rem;
+ padding: 0.5rem 0;
+ margin: 0.125rem 0 0;
}
.floating.menu ul {
margin:0;
padding: 0;
}
-.floating.menu li {
- white-space: nowrap;
+.floating.menu li:hover, .floating.menu li:focus {
+ background-color: var(--light);
}
-.floating.menu li:hover {
- background-color: #f5f5f5;
+.floating.menu li a {
+ padding: 0.75rem 1.25rem;
+ color: var(--dark);
}
-.floating.menu ul>li>a {
- position: relative;
- color: #333333;
- display: block;
- font-weight: normal;
- line-height: 20px;
- text-decoration: none;
- padding: 6px 24px;
- white-space: nowrap;
+.floating.menu li a .icon-tick {
+ width: 13px;
+ height: 13px;
}
-.floating.menu .shortcut {
+.floating.menu li a .shortcut {
font-weight: bold;
- color: #666;
- position: absolute;
- right: 12px;
+ color: var(--gray);
+ width: 5rem;
}
-.floating.menu .has-icons ul>li>a {
- padding-left: 32px;
-}
-.floating.menu .has-shortcuts ul>li>a {
- padding-right: 120px;
-}
-.floating.menu ul>li>a>.icon {
- position: absolute;
- left: 8px;
- top: 14px;
- color: #444;
- width: 14px;
- height: 14px;
-}
-.floating.menu ul>li.dropdown-divider div {
- border-top: 1px solid #DDD;
- margin: 8px 0;
+.floating.menu li.dropdown-divider div {
+ height: 0;
+ margin: 0.5rem 0;
+ overflow: hidden;
+ border-top: 1px solid var(--light-gray);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/MilestoneStatusLabel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/MilestoneStatusLabel.java
index 5463708b77..5623ea220c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/MilestoneStatusLabel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/MilestoneStatusLabel.java
@@ -38,7 +38,7 @@ public class MilestoneStatusLabel extends Label {
@Override
public String getObject() {
- return "label label-" + (milestoneModel.getObject().isClosed()? "success": "warning");
+ return "badge badge-" + (milestoneModel.getObject().isClosed()? "success": "warning");
}
}));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java
index e3085c6a9e..63469ffc0c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java
@@ -42,9 +42,9 @@ public class MilestoneChoiceProvider extends ChoiceProvider<Milestone> {
writer.key("id").value(choice.getId()).key("name").value(HtmlEscape.escapeHtml5(choice.getName()));
writer.key("statusName").value(choice.getStatusName());
if (choice.isClosed())
- writer.key("statusClass").value("label-success");
+ writer.key("statusClass").value("badge-success");
else
- writer.key("statusClass").value("label-warning");
+ writer.key("statusClass").value("badge-warning");
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/milestone-choice.js b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/milestone-choice.js
index 86d655a994..8fe6baded4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/milestone-choice.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/milestone-choice.js
@@ -4,7 +4,7 @@ onedev.server.milestoneChoiceFormatter = {
},
formatResult: function(milestone) {
- return "<span class='milestone'>" + milestone.name + " <span class='label " + milestone.statusClass + "'>" + milestone.statusName + "</span></span>";
+ return "<span class='milestone'>" + milestone.name + " <span class='ml-2 badge " + milestone.statusClass + "'>" + milestone.statusName + "</span></span>";
},
escapeMarkup: function(m) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.html
index dda2343e6d..6aa674a219 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.html
@@ -3,7 +3,7 @@
<form>
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Please Confirm</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="message" class="message"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessagePanel.html b/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessagePanel.html
index a3b26689cc..2ddd97a583 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessagePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/message/MessagePanel.html
@@ -2,7 +2,7 @@
<div class="message">
<div class="modal-header">
<h5 class="modal-title">Please Note</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="content" class="content"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardPanel.java
new file mode 100644
index 0000000000..8569409140
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardPanel.java
@@ -0,0 +1,53 @@
+package io.onedev.server.web.component.offcanvas;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+
+@SuppressWarnings("serial")
+public abstract class OffCanvasCardPanel extends OffCanvasPanel {
+
+ public OffCanvasCardPanel(AjaxRequestTarget target, Placement placement, @Nullable String width) {
+ super(target, placement, width);
+ add(AttributeAppender.append("class", "off-canvas-card"));
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new OffCanvasCardSupportPanel(id) {
+
+ @Override
+ protected void onClose(AjaxRequestTarget target) {
+ close();
+ }
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return OffCanvasCardPanel.this.newTitle(componentId);
+ }
+
+ @Override
+ protected Component newBody(String componentId) {
+ return OffCanvasCardPanel.this.newBody(componentId);
+ }
+
+ @Override
+ protected Component newFooter(String componentId) {
+ return OffCanvasCardPanel.this.newFooter(componentId);
+ }
+
+ };
+ }
+
+ protected abstract Component newTitle(String componentId);
+
+ protected abstract Component newBody(String componentId);
+
+ @Nullable
+ protected Component newFooter(String componentId) {
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.html b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.html
new file mode 100644
index 0000000000..54cbb3cc08
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.html
@@ -0,0 +1,16 @@
+<wicket:panel>
+ <div class="card h-100">
+ <div class="card-header flex-nowrap">
+ <div wicket:id="title" class="card-title"></div>
+ <div class="card-toolbar">
+ <a wicket:id="close" class="text-muted text-hover-primary" title="Close"><wicket:svg href="times" class="icon"></wicket:svg></a>
+ </div>
+ </div>
+
+ <!-- perfect scrollbar is installed to body tag, so we attach user
+ supplied body one level down, to make sure that the body tag will never
+ be updated-->
+ <div class="card-body h-100 ps ps-scroll"><div wicket:id="body"></div></div>
+ <div wicket:id="footer" class="card-footer"></div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.java b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.java
new file mode 100644
index 0000000000..245faf66bb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.java
@@ -0,0 +1,55 @@
+package io.onedev.server.web.component.offcanvas;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Panel;
+
+@SuppressWarnings("serial")
+abstract class OffCanvasCardSupportPanel extends Panel {
+
+ public OffCanvasCardSupportPanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(newTitle("title"));
+
+ add(newBody("body"));
+
+ Component footer = newFooter("footer");
+ if (footer != null)
+ add(footer);
+ else
+ add(new WebMarkupContainer("footer").setVisible(false));
+
+ add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onClose(target);
+ }
+
+ });
+
+ setOutputMarkupId(true);
+ }
+
+ protected abstract Component newTitle(String componentId);
+
+ protected abstract Component newBody(String componentId);
+
+ @Nullable
+ protected Component newFooter(String componentId) {
+ return null;
+ }
+
+ protected abstract void onClose(AjaxRequestTarget target);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCssResourceReference.java
new file mode 100644
index 0000000000..0446ca290b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.offcanvas;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class OffCanvasCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public OffCanvasCssResourceReference() {
+ super(OffCanvasCssResourceReference.class, "off-canvas.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.java b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.java
new file mode 100644
index 0000000000..09564ba3b4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.java
@@ -0,0 +1,32 @@
+package io.onedev.server.web.component.offcanvas;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.util.Animation;
+
+@SuppressWarnings("serial")
+public abstract class OffCanvasPanel extends FloatingPanel {
+
+ public enum Placement {LEFT, RIGHT}
+
+ public OffCanvasPanel(AjaxRequestTarget target, Placement placement, @Nullable String width) {
+ super(target, null, Animation.valueOf(placement.name()));
+ add(AttributeAppender.append("class", "off-canvas off-canvas-" + placement.name().toLowerCase()));
+ if (width != null)
+ add(AttributeAppender.append("style", "width: " + width).setSeparator(";"));
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(CssHeaderItem.forReference(new OffCanvasCssResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/off-canvas.css b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/off-canvas.css
new file mode 100644
index 0000000000..815208186d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/off-canvas.css
@@ -0,0 +1,22 @@
+.floating.off-canvas {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ border: none;
+ width: 360px;
+ border-radius: 0;
+}
+
+.floating.off-canvas>.content {
+ height: 100%;
+}
+.floating.off-canvas-left {
+ left: 0;
+}
+.floating.off-canvas-right {
+ right: 0;
+}
+.floating.off-canvas>.content>.card {
+ box-shadow: none;
+ border-radius: 0;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.html
index b9e01ffc9a..74e27f31e1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.html
@@ -1,29 +1,27 @@
<wicket:panel>
- <div class="order-edit">
- <table wicket:id="selected" class="selected">
- <tr wicket:id="selectedItems" class="clearfix">
- <td class="drag-indicator">
- <wicket:svg href="grip" class="icon"/>
- </td>
- <td class="index"><span wicket:id="index"></span></td>
- <td class="name"><span wicket:id="name"></span></td>
- <td class="checkbox">
- <label>
- <input wicket:id="descending" type="checkbox"> descending
- </label>
- </td>
- <td class="actions">
- <a wicket:id="remove" title="Remove"><wicket:svg href="times" class="icon"/></a>
- </td>
- </tr>
- </table>
- <ul wicket:id="available" class="available list-unstyled">
- <li wicket:id="availableItems">
- <a wicket:id="add" title="Add">
- <wicket:svg href="plus" class="icon"></wicket:svg>
- <span wicket:id="name"></span>
- </a>
- </li>
- </ul>
- </div>
+ <table wicket:id="selected" class="selected table table-borderless mb-0">
+ <tr wicket:id="selectedItems" class="clearfix">
+ <td class="drag-indicator">
+ <wicket:svg href="grip" class="icon"/>
+ </td>
+ <td class="index"><span wicket:id="index"></span></td>
+ <td class="name"><span wicket:id="name"></span></td>
+ <td class="checkbox">
+ <label class="checkbox">
+ <input wicket:id="descending" type="checkbox"> descending
+ </label>
+ </td>
+ <td class="actions">
+ <a wicket:id="remove" title="Remove"><wicket:svg href="times" class="icon"/></a>
+ </td>
+ </tr>
+ </table>
+ <ul wicket:id="available" class="available list-unstyled mb-0">
+ <li wicket:id="availableItems">
+ <a wicket:id="add" title="Add" class="d-flex align-items-center text-hover-gray-dark">
+ <wicket:svg href="plus" class="icon"></wicket:svg>
+ <span wicket:id="name"></span>
+ </a>
+ </li>
+ </ul>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.java
index aa1e2583cf..954d6f71dd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/orderedit/OrderEditPanel.java
@@ -38,7 +38,7 @@ public class OrderEditPanel extends GenericPanel<List<EntitySort>> {
protected void onInitialize() {
super.onInitialize();
- getParent().add(AttributeAppender.append("class", "order-edit"));
+ getParent().add(AttributeAppender.append("class", "order-edit ps ps-scroll"));
WebMarkupContainer selectedContainer = new WebMarkupContainer("selected") {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/orderedit/order-edit.css b/server-core/src/main/java/io/onedev/server/web/component/orderedit/order-edit.css
index 96e1853f45..c8ebbf6630 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/orderedit/order-edit.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/orderedit/order-edit.css
@@ -1,39 +1,30 @@
.order-edit {
- padding: 8px;
- overflow: hidden !important;
+ padding: 1rem 0;
}
-.order-edit tr:hover td {
- background: #F2F2F2;
-}
-.order-edit td {
- padding: 8px;
- white-space: nowrap;
-}
-.order-edit .checkbox {
- margin-top: 0;
- margin-bottom: 0;
+.order-edit .selected .drag-indicator {
+ padding-right: 0.2rem;
+ text-align: right;
+ width: 1px;
}
-.order-edit .index, .order-edit .drag-indicator {
- padding-right: 0;
+.order-edit .selected .index {
+ padding-left: 0;
+ padding-right: 0.4rem;
text-align: right;
+ width: 1px;
}
-.order-edit .available td.name {
+.order-edit .selected td.name {
width: 1px;
+ padding-left: 0;
+ white-space: nowrap;
}
-.order-edit ul {
- margin-bottom: 0;
-}
-.order-edit ul>li>a {
+.order-edit .available a {
display: block;
- padding: 8px;
- color: #444;
-}
-.order-edit ul>li>a:hover {
- background: #F2F2F2;
- text-decoration: none;
-}
-.order-edit ul>li>a>i {
- color: #666;
- margin-right: 8px;
-}
\ No newline at end of file
+ padding: 0.6rem 0.8rem;
+}
+.order-edit .available a .icon {
+ margin-right: 0.4rem;
+}
+.order-edit .available a:hover, .order-edit .available a:focus {
+ background: var(--light);
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/HistoryAwarePagingNavigator.html b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/HistoryAwarePagingNavigator.html
index 535716dda1..a55a2d4a3f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/HistoryAwarePagingNavigator.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/HistoryAwarePagingNavigator.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <li class="page-item"><a wicket:id="prev" class="prev page-link">Prev</a></li>
- <li wicket:id="navigation" class="page-item">
- <a wicket:id="pageLink" href="#" class="page-link"><span wicket:id="pageNumber">5</span></a>
+ <li><a wicket:id="prev" class="prev btn btn-sm btn-light btn-icon mr-2"><wicket:svg href="arrow" class="icon stroke-50 flip-x"/></a></li>
+ <li wicket:id="navigation">
+ <a wicket:id="pageLink" href="#" class="btn btn-sm btn-light btn-icon mr-2"><span wicket:id="pageNumber">5</span></a>
</li>
- <li class="page-item"><a wicket:id="next" class="next page-link">Next</a></li>
+ <li><a wicket:id="next" class="next btn btn-sm btn-light btn-icon"><wicket:svg href="arrow" class="icon stroke-50"/></a></li>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/HistoryAwarePagingNavigator.java b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/HistoryAwarePagingNavigator.java
index 68bfb1233b..5126014810 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/HistoryAwarePagingNavigator.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/HistoryAwarePagingNavigator.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.component.pagenavigator;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -13,12 +14,11 @@ import org.apache.wicket.markup.html.navigation.paging.IPagingLabelProvider;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigation;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigationIncrementLink;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigationLink;
-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import io.onedev.server.web.util.PagingHistorySupport;
@SuppressWarnings("serial")
-public class HistoryAwarePagingNavigator extends PagingNavigator {
+public class HistoryAwarePagingNavigator extends org.apache.wicket.markup.html.navigation.paging.PagingNavigator {
private final PagingHistorySupport pagingHistorySupport;
@@ -34,7 +34,7 @@ public class HistoryAwarePagingNavigator extends PagingNavigator {
get("first").remove();
get("last").remove();
- add(AttributeAppender.append("class", "pagination justify-content-center"));
+ add(AttributeAppender.append("class", "pagination justify-content-center align-items-center"));
setOutputMarkupId(true);
}
@@ -117,12 +117,9 @@ public class HistoryAwarePagingNavigator extends PagingNavigator {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- String script = String.format(""
- + "var $nav = $('#%s');"
- + "$nav.find('a[disabled=disabled]').each(function() {"
- + " $(this).parent().addClass('disabled');"
- + "});",
- getMarkupId());
+ response.render(JavaScriptHeaderItem.forReference(new PagingNavigatorResourceReference()));
+
+ String script = String.format("onedev.server.pagingNavigator.onDomReady('%s');", getMarkupId());
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/PagingNavigatorResourceReference.java
similarity index 62%
rename from server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/component/pagenavigator/PagingNavigatorResourceReference.java
index 1f2e195d4b..8dc9f1f0a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/PagingNavigatorResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.detail;
+package io.onedev.server.web.component.pagenavigator;
import java.util.List;
@@ -8,19 +8,19 @@ import org.apache.wicket.markup.head.HeaderItem;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
-public class IssueDetailResourceReference extends BaseDependentResourceReference {
+public class PagingNavigatorResourceReference extends BaseDependentResourceReference {
private static final long serialVersionUID = 1L;
- public IssueDetailResourceReference() {
- super(IssueDetailResourceReference.class, "issue-detail.js");
+ public PagingNavigatorResourceReference() {
+ super(PagingNavigatorResourceReference.class, "paging-navigator.js");
}
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- IssueDetailResourceReference.class, "issue-detail.css")));
+ PagingNavigatorResourceReference.class, "paging-navigator.css")));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.css b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.css
new file mode 100644
index 0000000000..7cfa7238bd
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.css
@@ -0,0 +1,4 @@
+.pagination>li.active>a.btn {
+ color: white;
+ background-color: var(--primary);
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.js b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.js
new file mode 100644
index 0000000000..f5e1cb3a6c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/paging-navigator.js
@@ -0,0 +1,8 @@
+onedev.server.pagingNavigator = {
+ onDomReady: function(containerId) {
+ $('#' + containerId).find('a[disabled=disabled]').each(function() {
+ $(this).addClass("disabled");
+ $(this).parent().addClass('disabled');
+ });
+ }
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.html b/server-core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.html
deleted file mode 100644
index e3ea15965d..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<wicket:panel>
- <div wicket:id="tree" class="path-selector autosize"></div>
- <wicket:fragment wicket:id="treeNodeFrag">
- <svg wicket:id="icon" class="icon"></svg> <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java b/server-core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java
deleted file mode 100644
index 08891ac9d3..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package io.onedev.server.web.component.pathselector;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
-import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
-import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.treewalk.TreeWalk;
-
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.component.blob.BlobIcon;
-import io.onedev.server.web.component.link.PreventDefaultAjaxLink;
-
-@SuppressWarnings("serial")
-public abstract class PathSelector extends Panel {
-
- private final IModel<Project> projectModel;
-
- private final String revision;
-
- private final Set<Integer> pathTypes;
-
- public PathSelector(String id, IModel<Project> projectModel, String revision, int... pathTypes) {
- super(id);
-
- this.projectModel = projectModel;
- this.revision = revision;
- this.pathTypes = new HashSet<>();
- for (int i=0; i<pathTypes.length; i++)
- this.pathTypes.add(pathTypes[i]);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new NestedTree<BlobIdent>("tree", new ITreeProvider<BlobIdent>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Iterator<? extends BlobIdent> getRoots() {
- Repository repository = projectModel.getObject().getRepository();
- try ( RevWalk revWalk = new RevWalk(repository);
- TreeWalk treeWalk = new TreeWalk(repository)) {
- RevCommit commit = revWalk.parseCommit(projectModel.getObject().getObjectId(revision, true));
- treeWalk.addTree(commit.getTree());
-
- List<BlobIdent> roots = new ArrayList<>();
- while (treeWalk.next()) {
- int fileMode = treeWalk.getRawMode(0);
- int fileType = fileMode & FileMode.TYPE_MASK;
- if (fileType == FileMode.TYPE_TREE || pathTypes.contains(fileType))
- roots.add(new BlobIdent(revision, treeWalk.getPathString(), fileMode));
- }
- Collections.sort(roots);
- return roots.iterator();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public boolean hasChildren(BlobIdent node) {
- return node.isTree();
- }
-
- @Override
- public Iterator<? extends BlobIdent> getChildren(BlobIdent node) {
- Repository repository = projectModel.getObject().getRepository();
- try (RevWalk revWalk = new RevWalk(repository)) {
- RevCommit commit = revWalk.parseCommit(projectModel.getObject().getObjectId(revision, true));
- TreeWalk treeWalk = TreeWalk.forPath(repository, node.path, commit.getTree());
- treeWalk.enterSubtree();
- List<BlobIdent> children = new ArrayList<>();
- while (treeWalk.next()) {
- int fileMode = treeWalk.getRawMode(0);
- int fileType = fileMode & FileMode.TYPE_MASK;
- if (fileType == FileMode.TYPE_TREE || pathTypes.contains(fileType))
- children.add(new BlobIdent(revision, treeWalk.getPathString(), fileMode));
- }
- Collections.sort(children);
- return children.iterator();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public IModel<BlobIdent> model(BlobIdent object) {
- return Model.of(object);
- }
-
- }) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new HumanTheme());
- }
-
- @Override
- protected Component newContentComponent(String id, final IModel<BlobIdent> model) {
- BlobIdent blobIdent = model.getObject();
- Fragment fragment = new Fragment(id, "treeNodeFrag", PathSelector.this);
- fragment.add(new BlobIcon("icon", model));
-
- WebMarkupContainer link;
-
- if (pathTypes.contains(blobIdent.mode & FileMode.TYPE_MASK)) {
- link = new PreventDefaultAjaxLink<Void>("link") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- PathSelector.this.updateAjaxAttributes(attributes);
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelect(target, model.getObject());
- }
-
- };
- } else {
- link = new WebMarkupContainer("link");
- link.setRenderBodyOnly(true);
- }
- if (blobIdent.path.indexOf('/') != -1)
- link.add(new Label("label", StringUtils.substringAfterLast(blobIdent.path, "/")));
- else
- link.add(new Label("label", blobIdent.path));
- fragment.add(link);
-
- return fragment;
- }
-
- });
- }
-
- @Override
- protected void onDetach() {
- projectModel.detach();
-
- super.onDetach();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(CssHeaderItem.forReference(new PathSelectorResourceReference()));
- }
-
- protected abstract void onSelect(AjaxRequestTarget target, BlobIdent blobIdent);
-
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pathselector/PathSelectorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pathselector/PathSelectorResourceReference.java
deleted file mode 100644
index 90e1a72180..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/pathselector/PathSelectorResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.pathselector;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class PathSelectorResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public PathSelectorResourceReference() {
- super(PathSelectorResourceReference.class, "path-selector.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pathselector/path-selector.css b/server-core/src/main/java/io/onedev/server/web/component/pathselector/path-selector.css
deleted file mode 100644
index 32f47351f6..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/pathselector/path-selector.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.path-selector {
- padding: 12px 24px 12px 12px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java
index 1c6d315256..a10fbd7106 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java
@@ -57,7 +57,7 @@ public abstract class ProjectPicker extends DropdownLink {
+ "<span class='project-picker'>"
+ " <svg class='icon'><use xlink:href='%s'/></svg>"
+ " <span>%s</span>"
- + " <svg class='icon icon-sm rotate-90'><use xlink:href='%s'/></svg>"
+ + " <svg class='icon rotate-90'><use xlink:href='%s'/></svg>"
+ "</span>",
SpriteImage.getVersionedHref(IconScope.class, "project"),
HtmlEscape.escapeHtml5(getCurrent().getName()),
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java
index 20dfbcc3b8..68901baa98 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java
@@ -1,8 +1,6 @@
package io.onedev.server.web.component.project.avatar;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebComponent;
import io.onedev.server.OneDev;
@@ -30,18 +28,12 @@ public class ProjectAvatar extends WebComponent {
setOutputMarkupId(true);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectAvatarResourceReference()));
- }
-
@Override
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
tag.setName("img");
- tag.append("class", "project-avatar", " ");
+ tag.append("class", "avatar", " ");
tag.put("src", url);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java
index 44b55475cf..76d8e0149c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java
@@ -1,8 +1,6 @@
package io.onedev.server.web.component.project.avatar;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -39,7 +37,7 @@ public class ProjectAvatarLink extends ViewStateAwarePageLink<Void> {
@Override
public IModel<?> getBody() {
- return Model.of("<img src='" + url + "' class='project-avatar'></img>");
+ return Model.of("<img src='" + url + "' class='avatar'></img>");
}
@Override
@@ -51,12 +49,6 @@ public class ProjectAvatarLink extends ViewStateAwarePageLink<Void> {
tag.put("title", tooltip);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectAvatarResourceReference()));
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarResourceReference.java
deleted file mode 100644
index 93ce596667..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.project.avatar;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class ProjectAvatarResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ProjectAvatarResourceReference() {
- super(ProjectAvatarResourceReference.class, "project-avatar.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/project-avatar.css b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/project-avatar.css
deleted file mode 100644
index 901c93e81c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/project-avatar.css
+++ /dev/null
@@ -1,5 +0,0 @@
-img.project-avatar {
- border-radius: 1000px;
- height: 20px;
- width: 20px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java
index caab3f6bb5..ba87cecf9e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java
@@ -11,6 +11,7 @@ import org.unbescape.html.HtmlEscape;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
+import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.component.select2.ChoiceProvider;
@SuppressWarnings("serial")
@@ -21,6 +22,8 @@ public abstract class AbstractProjectChoiceProvider extends ChoiceProvider<Proje
writer.key("id").value(choice.getId());
writer.key("name");
writer.value(HtmlEscape.escapeHtml5(choice.getName()));
+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(choice);
+ writer.key("avatar").value(avatarUrl);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/project-choice.js b/server-core/src/main/java/io/onedev/server/web/component/project/choice/project-choice.js
index 263caa482b..75f68ce9ab 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/project-choice.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/project-choice.js
@@ -1,10 +1,13 @@
onedev.server.projectChoiceFormatter = {
formatSelection: function(project) {
- return project.name;
+ return "<img class='avatar' src='" + project.avatar + "'/><span class='name'>" + project.name + "</span>";
},
formatResult: function(project) {
- return project.name;
+ return "<div class='project'>" +
+ "<img class='avatar' src='" + project.avatar + "'/>" +
+ "<span class='name'>"+ project.name + "</span>" +
+ "</div>";
},
escapeMarkup: function(m) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentCssResourceReference.java
deleted file mode 100644
index 8a69f315b5..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.project.comment;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class ProjectCommentCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ProjectCommentCssResourceReference() {
- super(ProjectCommentCssResourceReference.class, "project-comment.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.html
index 77bed0a38b..9e5857d796 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.html
@@ -2,11 +2,11 @@
<div wicket:id="comment" class="project-comment"></div>
<wicket:fragment wicket:id="viewFrag">
<div wicket:id="content"></div>
- <div wicket:id="actions" class="actions">
- <a wicket:id="edit">Edit</a>
+ <div wicket:id="actions" class="mt-3 d-flex align-items-center">
+ <a wicket:id="edit" class="text-muted text-hover-primary mr-2">Edit</a>
<wicket:enclosure child="delete">
- <span class="middot"></span>
- <a wicket:id="delete">Delete</a>
+ <span class="dot mr-2"></span>
+ <a wicket:id="delete" class="text-muted text-hover-primary">Delete</a>
</wicket:enclosure>
</div>
</wicket:fragment>
@@ -14,8 +14,8 @@
<form wicket:id="form" class="leave-confirm">
<div wicket:id="feedback" class="feedback"></div>
<div wicket:id="input"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware">Save</button>
+ <div class="mt-3">
+ <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware mr-1">Save</button>
<button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>
</div>
</form>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.java
index 72fb277272..e4259d4f67 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.java
@@ -11,8 +11,6 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -74,7 +72,7 @@ public abstract class ProjectCommentPanel extends Panel {
}, getContentVersionSupport()));
} else {
- viewer.add(new Label("content", "<i>No comment</i>").setEscapeModelStrings(false));
+ viewer.add(new Label("content", "<i class='text-muted'>No comment</i>").setEscapeModelStrings(false));
}
WebMarkupContainer actions = new WebMarkupContainer("actions");
@@ -198,12 +196,6 @@ public abstract class ProjectCommentPanel extends Panel {
add(newViewer());
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectCommentCssResourceReference()));
- }
-
@Nullable
protected abstract String getComment();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/project-comment.css b/server-core/src/main/java/io/onedev/server/web/component/project/comment/project-comment.css
deleted file mode 100644
index 1bd460c0e8..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/project-comment.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.project-comment>.actions {
- margin-top: 8px;
-}
-.project-comment>.actions a {
- color: #888;
- margin-right: 0;
-}
-.project-comment .actions .middot {
- margin: 0 4px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolCssResourceReference.java
deleted file mode 100644
index 71d3618387..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.project.gitprotocol;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class GitProtocolCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public GitProtocolCssResourceReference() {
- super(GitProtocolCssResourceReference.class, "git-protocol.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html
index 1138f1f732..a459ddef47 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.html
@@ -1,13 +1,19 @@
<wicket:panel>
- <div class="git-protocol">
- <div class="protocol clearfix">
- <div wicket:id="current" class="float-left"></div>
- <a wicket:id="switch" class="switch float-right"><span wicket:id="label"></span></a>
+ <div class="card">
+ <div class="card-header">
+ <div class="card-title">
+ <div wicket:id="current" class="mr-4"></div>
+ </div>
+ <div class="card-toolbar">
+ <a wicket:id="switch" class="link-primary font-weight-bold"><span wicket:id="label"></span></a>
+ </div>
</div>
- <div wicket:id="noSshKeysWarning" class="no-ssh-keys alert alert-warning">
- No SSH keys configured in your account. You may <a wicket:id="sshKeys">add a key</a> or switch to <a wicket:id="useHttp">HTTP(S)</a> url
+ <div class="card-body">
+ <div wicket:id="noSshKeysWarning" class="alert alert-light-warning mb-4">
+ No SSH keys configured in your account. You may <a wicket:id="sshKeys" class="link-primary">add a key</a> or switch to <a wicket:id="useHttp" class="link-primary">HTTP(S)</a> url
+ </div>
+ <div wicket:id="content"></div>
+ <div wicket:id="fingerPrint" class="mt-4 text-break text-muted"></div>
</div>
- <div wicket:id="content" class="content"></div>
- <div wicket:id="fingerPrint" class="finger-print"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java
index 99da6d69ee..1421d0f99c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java
@@ -5,8 +5,6 @@ import javax.servlet.http.Cookie;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -52,9 +50,9 @@ public abstract class GitProtocolPanel extends Panel {
@Override
protected String load() {
if (useSsh)
- return "Showing SSH url";
+ return "Showing SSH URL";
else
- return "Showing HTTP(S) url";
+ return "Showing HTTP(S) URL";
}
}));
@@ -116,12 +114,6 @@ public abstract class GitProtocolPanel extends Panel {
setOutputMarkupId(true);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new GitProtocolCssResourceReference()));
- }
-
private void switchProtocol(AjaxRequestTarget target, boolean useSsh) {
WebResponse response = (WebResponse) RequestCycle.get().getResponse();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/git-protocol.css b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/git-protocol.css
deleted file mode 100644
index 6aabcbfd16..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/git-protocol.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.git-protocol>div {
- margin-bottom: 12px;
-}
-.git-protocol>div:last-child {
- margin-bottom: 0;
-}
-.git-protocol>.protocol {
- font-weight: bold;
- font-size: 13px;
- color: #666;
- border-bottom: 1px solid #DDD;
- padding-bottom: 8px;
-}
-.git-protocol>.no-ssh-keys {
- font-size: 13px;
- padding: 8px;
- margin-bottom: 16px;
-}
-.git-protocol .finger-print {
- font-size: 13px;
- word-break: break-all;
- color: #666;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.html
similarity index 76%
rename from server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.html
rename to server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.html
index 1c6e42712e..bda79739bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="leave-confirm">
<div class="modal-header">
<h5 class="modal-title">Fork Project</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java
similarity index 98%
rename from server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java
rename to server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java
index 8d76636152..5f92d043bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.info;
+package io.onedev.server.web.component.project.info;
import java.util.Collection;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoCssResourceReference.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoCssResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoCssResourceReference.java
index 64ec792955..88d8aa7aed 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoCssResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoCssResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.info;
+package io.onedev.server.web.component.project.info;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
new file mode 100644
index 0000000000..b3748e36f8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
@@ -0,0 +1,19 @@
+<wicket:panel>
+ <div class="project-info p-4">
+ <div class="d-flex align-items-center justify-content-between">
+ <div class="mr-4">
+ <h5 wicket:id="name" class="mb-0"></h5>
+ <wicket:enclosure child="forkedFrom">
+ <div class="text-muted">
+ Forked from <a wicket:id="forkedFrom"><span wicket:id="label"></span></a>
+ </div>
+ </wicket:enclosure>
+ </div>
+ <div class="btn-group">
+ <a wicket:id="forks" class="btn btn-sm btn-light btn-hover-primary"><span wicket:id="label"></span></a>
+ <a wicket:id="forkNow" class="btn btn-sm btn-light btn-hover-primary btn-icon" title="Fork now"><wicket:svg href="fork" class="icon"/></a>
+ </div>
+ </div>
+ <div wicket:id="description" class="mt-4"></div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
rename to server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
index 1ee12e003b..a1f1f8c626 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.info;
+package io.onedev.server.web.component.project.info;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -43,6 +43,22 @@ public abstract class ProjectInfoPanel extends Panel {
add(new Label("name", getProject().getName()));
+ String query = ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " "
+ + Criteria.quote(getProject().getName());
+ PageParameters params = ProjectListPage.paramsOf(query, 0, getProject().getForks().size());
+ Link<Void> forksLink = new BookmarkablePageLink<Void>("forks", ProjectListPage.class, params) {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (!isEnabled())
+ tag.setName("span");
+ }
+
+ };
+ forksLink.add(new Label("label", getProject().getForks().size() + " forks"));
+ add(forksLink);
+
boolean canReadCode = SecurityUtils.canReadCode(getProject());
add(new ModalLink("forkNow") {
@@ -71,23 +87,6 @@ public abstract class ProjectInfoPanel extends Panel {
}.setVisible(SecurityUtils.canCreateProjects() && canReadCode));
- String query = ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " "
- + Criteria.quote(getProject().getName());
- PageParameters params = ProjectListPage.paramsOf(query, 0, getProject().getForks().size());
- Link<Void> forksLink = new BookmarkablePageLink<Void>("forks", ProjectListPage.class, params) {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- if (!isEnabled())
- tag.setName("span");
- }
-
- };
- forksLink.add(new Label("label", getProject().getForks().size() + " forks"));
-
- add(forksLink.setEnabled(getProject().getForks().size() != 0));
-
if (getProject().getDescription() != null)
add(new MarkdownViewer("description", Model.of(getProject().getDescription()), null));
else
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/project-info.css b/server-core/src/main/java/io/onedev/server/web/component/project/info/project-info.css
new file mode 100644
index 0000000000..e3e954aa06
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/project-info.css
@@ -0,0 +1,3 @@
+.project-info {
+ min-width: 360px;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectCssResourceReference.java
new file mode 100644
index 0000000000..635e92e2d1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.project.list;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class ProjectCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public ProjectCssResourceReference() {
+ super(ProjectCssResourceReference.class, "project-list.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
index 3f10ff6d11..22798e2398 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
@@ -1,33 +1,32 @@
<wicket:panel>
- <div class="project-list">
- <div class="head">
- <form wicket:id="query" class="clearable-wrapper">
- <div class="input-group">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order projects here">
- <span class="input-group-append">
- <button wicket:id="submit" type="submit" class="btn btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
- </span>
- </div>
- </form>
- <a wicket:id="newProject" class="add-new btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> New</a>
- <div class="operations">
- <a wicket:id="showSavedQueries" class="show-saved-queries">
- <wicket:svg href="eye" class="icon"></wicket:svg>
- Show Saved Queries
+ <div class="project-list card">
+ <div class="card-body">
+ <div class="d-flex mb-4">
+ <form wicket:id="query" class="clearable-wrapper flex-grow-1">
+ <div class="input-group">
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order projects here">
+ <span class="input-group-append">
+ <button wicket:id="submit" type="submit" class="btn btn-outline-secondary btn-icon" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ </span>
+ </div>
+ </form>
+ <a wicket:id="addProject" class="btn btn-primary btn-icon flex-shrink-0 ml-3" title="Add project"><wicket:svg href="plus" class="icon"/></a>
+ </div>
+ <div class="operations mb-4">
+ <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4">
+ <wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
</a>
- <a wicket:id="saveQuery" class="save-query">
- <wicket:svg href="save" class="icon"></wicket:svg>
- Save Query
+ <a wicket:id="saveQuery" class="save-query text-gray mr-4">
+ <wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <a wicket:id="orderBy" class="order-by">
- <wicket:svg href="sort" class="icon"></wicket:svg>
- Order By
+ <a wicket:id="orderBy" class="order-by text-gray">
+ <wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
</div>
- </div>
- <div wicket:id="body" class="body">
- <div wicket:id="feedback"></div>
- <table wicket:id="projects" class="table"></table>
+ <div wicket:id="body">
+ <div wicket:id="feedback"></div>
+ <table wicket:id="projects" class="table"></table>
+ </div>
</div>
</div>
<wicket:fragment wicket:id="projectFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 845adf10b1..15dee8df74 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -12,7 +12,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -37,8 +36,8 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityCriteria;
@@ -141,11 +140,6 @@ public class ProjectListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- if (SecurityUtils.canCreateProjects())
- add(new BookmarkablePageLink<Void>("newProject", NewProjectPage.class));
- else
- add(new WebMarkupContainer("newProject").setVisible(false));
-
add(new AjaxLink<Void>("showSavedQueries") {
@Override
@@ -183,7 +177,7 @@ public class ProjectListPanel extends Panel {
super.onComponentTag(tag);
configure();
if (!isEnabled())
- tag.put("disabled", "disabled");
+ tag.append("class", "disabled", " ");
if (!querySubmitted)
tag.put("title", "Query not submitted");
else if (queryModel.getObject() == null)
@@ -227,11 +221,7 @@ public class ProjectListPanel extends Panel {
query.getSorts().clear();
query.getSorts().addAll(object);
queryModel.setObject(query);
- String queryString = query.toString();
- if (queryString.length() != 0)
- queryStringModel.setObject(queryString);
- else
- queryStringModel.setObject(null);
+ queryStringModel.setObject(query.toString());
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
doQuery(target);
@@ -276,10 +266,10 @@ public class ProjectListPanel extends Panel {
}
});
- if (SecurityUtils.canCreateProjects())
- queryForm.add(AttributeAppender.append("class", "can-create-projects"));
add(queryForm);
+ add(new BookmarkablePageLink<Void>("addProject", NewProjectPage.class).setVisible(SecurityUtils.canCreateProjects()));
+
SortableDataProvider<Project, Void> dataProvider = new LoadableDetachableDataProvider<Project, Void>() {
@Override
@@ -372,7 +362,7 @@ public class ProjectListPanel extends Panel {
@Override
public String getCssClass() {
- return "last-update expanded";
+ return "d-none d-sm-table-cell";
}
});
@@ -382,11 +372,11 @@ public class ProjectListPanel extends Panel {
setOutputMarkupId(true);
}
-
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectListResourceReference()));
+ response.render(CssHeaderItem.forReference(new ProjectCssResourceReference()));
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListResourceReference.java
deleted file mode 100644
index 5f4e88556d..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.project.list;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class ProjectListResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ProjectListResourceReference() {
- super(ProjectListResourceReference.class, "project-list.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css b/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css
index 759c2693b8..ae76bcc4e0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css
@@ -1,29 +1,6 @@
-@media(max-width: 767px) {
- .project-list .expanded {
+@media(max-width: 575px) {
+ .project-list table>thead {
display: none;
}
}
-.project-list>.head {
- position: relative;
-}
-.project-list>.head>* {
- margin-bottom: 20px;
-}
-.project-list>.head>form.can-create-projects {
- margin-right: 100px;
-}
-.project-list>.head>.add-new {
- width: 80px;
- position: absolute;
- right: 0;
- top: 0;
-}
-.project-list>.head>.operations>* {
- margin-right: 16px;
- color: #444;
- white-space: nowrap;
-}
-.project-list>.head>.operations>*:last-child {
- margin-right: 0;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html
index 57c3acf839..e5e6629268 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html
@@ -1,17 +1,18 @@
<wicket:panel>
- <div class="project-selector">
+ <div class="project-selector p-4">
<wicket:enclosure child="search">
- <div class="search">
- <input wicket:id="search" class="form-control" placeholder="Search projects...">
+ <div class="d-flex align-items-center">
+ <input wicket:id="search" class="form-control form-control-sm branch" placeholder="Search project"></input>
+ <wicket:svg href="magnify" class="icon text-muted icon-magnify"></wicket:svg>
</div>
</wicket:enclosure>
- <ul wicket:id="projects" class="list-unstyled projects autosize">
+ <ul wicket:id="projects" class="list-unstyled projects overflow-auto mb-0 mt-3">
<li wicket:id="projects" class="project selectable">
<a wicket:id="link">
- <wicket:svg href="tick" class="icon"/> <img wicket:id="avatar"> <span wicket:id="name"></span>
+ <wicket:svg href="tick" class="icon mr-2"/> <img wicket:id="avatar" class="mr-1"> <span wicket:id="name"></span>
</a>
</li>
</ul>
- <div wicket:id="noProjects" class="no-projects autosize">No Projects Found</div>
+ <div wicket:id="noProjects" class="no-projects alert alert-light-warning mb-0 mt-4">No Projects Found</div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css
index ee9d014c68..062be91256 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css
@@ -1,32 +1,14 @@
-.project-selector {
- padding: 20px;
+.project-selector input {
+ padding-right: 2rem;
}
-.project-selector .btn {
- margin-bottom: 12px;
+.project-selector input+.icon {
+ margin-left: -1.8rem;
}
-.project-selector ul {
- margin-top: 12px;
-}
-.project-selector ul li {
- position: relative;
-}
-.project-selector ul a {
- padding: 5px 20px !important;
-}
-
-.project-selector a svg {
- display: none;
- position: absolute;
- left: 4px;
- top: 16px;
+.project-selector .project>a>.icon {
width: 12px;
height: 12px;
+ visibility: hidden;
}
-.project-selector a.current svg {
- display: inline-block;
-}
-
-.project-selector .no-projects {
- margin-top: 12px;
- font-style: italic;
+.project-selector .project>a.current>.icon {
+ visibility: visible;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/property-change.css b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/property-change.css
index cd7805c080..16c1d6f985 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/property-change.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/property-change.css
@@ -1,12 +1,15 @@
.property-change {
width: auto;
- border: 1px dotted #BBB;
- font-size: 13px;
+ border: 1px dashed var(--secondary);
+ font-size: 1rem;
}
.property-change td.name {
white-space: nowrap;
}
+.property-change th {
+ font-weight: 600;
+}
.property-change th, .property-change td {
- padding: 4px 8px;
- border-bottom: 1px dotted #BBB;
+ padding: 0.4rem 0.6rem;
+ border-bottom: 1px dashed var(--secondary);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html
index be287d009c..f039ee0250 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html
@@ -5,7 +5,7 @@
<a wicket:id="user"></a>
</td>
<td class="actions">
- <a wicket:id="delete" title="Remove this assignee"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Remove this assignee"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</td>
</tr>
<wicket:enclosure>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.css
index 27d27aa21a..daf1b90973 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.css
@@ -1,5 +1,6 @@
table.assignments>tbody>tr>td {
- padding: 6px 12px;
+ padding: 0.5rem 1rem;
+ vertical-align: middle;
}
table.assignments>tbody>tr>td:first-child {
padding-left: 0;
@@ -14,6 +15,5 @@ table.assignments>tbody>tr:last-child>td {
padding-bottom: 0;
}
table.assignments>tbody>tr>td.actions {
- font-size: 16px;
text-align: right;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.html
index ef11c885a1..86313339fb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.html
@@ -1,10 +1,10 @@
<wicket:panel>
- <div class="pull-request-jobs clearfix">
+ <div class="pull-request-jobs d-flex align-items-center">
<wicket:container wicket:id="jobs">
- <a wicket:id="job" class="job float-left">
- <span wicket:id="status" class="status"></span>
- <span wicket:id="name" class="name"></span>
- <wicket:svg href="arrow" class="icon icon-sm rotate-90"></wicket:svg>
+ <a wicket:id="job" class="job">
+ <svg wicket:id="status" class="status mr-1"></svg>
+ <span wicket:id="name" class="name mr-1"></span>
+ <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>
</a>
</wicket:container>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css
index 17bf003725..0adbebe9cc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css
@@ -1,5 +1,5 @@
.pull-request-jobs>.job {
- margin-right: 12px;
+ margin-right: 1rem;
}
.pull-request-jobs>.job:last-child {
margin-right: 0;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
index 59bfc4759a..ded7597fb5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -1,56 +1,55 @@
<wicket:panel>
- <div class="pull-request-list">
- <div class="head">
- <form wicket:id="query" class="clearable-wrapper">
- <div class="input-group">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order pull requests here">
- <span class="input-group-append">
- <button wicket:id="submit" type="submit" class="btn btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
- </span>
- </div>
- </form>
- <a wicket:id="newRequest" class="open-new btn btn-success"></a>
- <div class="operations">
- <a wicket:id="showSavedQueries" class="show-saved-queries">
- <wicket:svg href="eye" class="icon"></wicket:svg>
- Show Saved Queries
+ <div class="pull-request-list card">
+ <div class="card-body">
+ <div class="d-flex mb-4">
+ <form wicket:id="query" class="clearable-wrapper flex-grow-1">
+ <div class="input-group">
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order pull requests here">
+ <span class="input-group-append">
+ <button wicket:id="submit" type="submit" class="btn btn-outline-secondary btn-icon" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ </span>
+ </div>
+ </form>
+ <a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-3" title="Open new pull request"><wicket:svg href="plus" class="icon"/></a>
+ </div>
+ <div class="operations mb-5">
+ <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4">
+ <wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
</a>
- <a wicket:id="saveQuery" class="save-query">
- <wicket:svg href="save" class="icon"></wicket:svg>
- Save Query
+ <a wicket:id="saveQuery" class="save-query text-gray mr-4">
+ <wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <a wicket:id="orderBy" class="order-by">
- <wicket:svg href="sort" class="icon"></wicket:svg>
- Order By
+ <a wicket:id="orderBy" class="order-by text-gray">
+ <wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
</div>
- </div>
- <div wicket:id="body" class="body">
- <div wicket:id="feedback"></div>
- <table wicket:id="requests" class="table"></table>
+ <div wicket:id="body" class="body">
+ <div wicket:id="feedback"></div>
+ <table wicket:id="requests" class="table"></table>
+ </div>
</div>
</div>
<wicket:fragment wicket:id="contentFrag">
- <div class="primary clearfix">
- <div class="float-left">
- <a wicket:id="number" class="number"></a>
- <span wicket:id="title" class="title"></span>
+ <div class="primary d-flex flex-wrap mb-3">
+ <div class="flex-grow-1 mr-4">
+ <a wicket:id="number" class="number h6 mr-2"></a>
+ <span wicket:id="title" class="title h6"></span>
</div>
- <div class="float-right comments extra-info" title="Comments">
+ <div class="flex-shrink-0 comments d-none d-lg-block text-muted" title="Comments">
<wicket:svg href="comments" class="icon"></wicket:svg> <span wicket:id="comments"></span>
</div>
</div>
- <div class="secondary clearfix">
- <div class="status float-left"><span wicket:id="status"></span></div>
- <div class="float-left review" wicket:id="reviews"></div>
- <div class="float-left jobs" wicket:id="jobs"></div>
- <div class="branches float-left extra-info">
+ <div class="secondary d-flex flex-wrap">
+ <div class="status flex-shrink-0 mr-3"><span wicket:id="status"></span></div>
+ <div class="review flex-shrink-0 mr-3" wicket:id="reviews"></div>
+ <div class="jobs flex-shrink-0 mr-3" wicket:id="jobs"></div>
+ <div class="branches flex-shrink-0 d-none d-lg-block mr-3">
<a wicket:id="target" title="Target"></a>
- <wicket:svg href="arrow3" class="icon rotate-180"/>
+ <wicket:svg href="arrow2" class="text-gray icon rotate-180"/>
<a wicket:id="source" title="Source"></a>
</div>
- <div class="last-update float-right extra-info">
- <a wicket:id="user"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
+ <div class="last-update ml-auto d-none d-lg-block text-muted font-size-sm">
+ <a wicket:id="user" class="text-muted"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
</div>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 831f3a8d89..b567551388 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.pullrequest.list;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -45,9 +46,8 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
-import edu.emory.mathcs.backport.java.util.Collections;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
@@ -67,7 +67,7 @@ import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
-import io.onedev.server.web.asset.icon.IconScope;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.floating.FloatingPanel;
@@ -81,7 +81,6 @@ import io.onedev.server.web.component.pullrequest.build.PullRequestJobsPanel;
import io.onedev.server.web.component.pullrequest.review.ReviewerAvatar;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
-import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
@@ -218,7 +217,7 @@ public abstract class PullRequestListPanel extends Panel {
super.onComponentTag(tag);
configure();
if (!isEnabled())
- tag.put("disabled", "disabled");
+ tag.append("class", "disabled", " ");
if (!querySubmitted)
tag.put("title", "Query not submitted");
else if (queryModel.getObject() == null)
@@ -264,11 +263,7 @@ public abstract class PullRequestListPanel extends Panel {
query = new PullRequestQuery();
query.getSorts().clear();
query.getSorts().addAll(object);
- String queryString = query.toString();
- if (queryString.length() != 0)
- queryStringModel.setObject(queryString);
- else
- queryStringModel.setObject(null);
+ queryStringModel.setObject(query.toString());
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
doQuery(target);
@@ -319,42 +314,21 @@ public abstract class PullRequestListPanel extends Panel {
}
});
- if (getProject() == null || SecurityUtils.canReadCode(getProject()))
- queryForm.add(AttributeAppender.append("class", "can-create-pull-requests"));
add(queryForm);
-
- if (getProject() != null) {
- add(new BookmarkablePageLink<Void>("newRequest", NewPullRequestPage.class,
- NewPullRequestPage.paramsOf(getProject())) {
-
- @Override
- public IModel<?> getBody() {
- return Model.of(String.format(
- "<svg class='icon'><use xlink:href='%s'/></svg> New",
- SpriteImage.getVersionedHref(IconScope.class, "plus")));
- }
-
- }.setEscapeModelStrings(false));
- } else {
- add(new DropdownLink("newRequest") {
-
- @Override
- public IModel<?> getBody() {
- return Model.of(String.format(
- "<svg class='icon'><use xlink:href='%s'/></svg> New <svg class='icon rotate-90'><use xlink:href='%s'/></svg>",
- SpriteImage.getVersionedHref(IconScope.class, "plus"), SpriteImage.getVersionedHref(IconScope.class, "arrow")));
- }
-
+
+ if (getProject() == null) {
+ add(new DropdownLink("newPullRequest") {
+
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {
-
+
@Override
protected Collection<Project> load() {
List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class)
.getPermittedProjects(new ReadCode()));
Collections.sort(projects, new Comparator<Project>() {
-
+
@Override
public int compare(Project o1, Project o2) {
return o1.getName().compareTo(o2.getName());
@@ -365,16 +339,19 @@ public abstract class PullRequestListPanel extends Panel {
}
}) {
-
+
@Override
protected void onSelect(AjaxRequestTarget target, Project project) {
setResponsePage(NewPullRequestPage.class, NewPullRequestPage.paramsOf(project));
}
-
+
};
}
- }.setEscapeModelStrings(false));
+ });
+ } else {
+ add(new BookmarkablePageLink<Void>("newPullRequest", NewPullRequestPage.class,
+ NewPullRequestPage.paramsOf(getProject())));
}
body = new WebMarkupContainer("body");
@@ -584,6 +561,7 @@ public abstract class PullRequestListPanel extends Panel {
});
requestsTable.addBottomToolbar(new NoRecordsToolbar(requestsTable));
+ requestsTable.add(new NoRecordsBehavior());
setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
index 48d4df6f16..5c53f2f6e1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
@@ -1,68 +1,12 @@
-@media(max-width: 991px) {
- .pull-request-list>.body .extra-info {
- display: none;
- }
+.pull-request-list>div>.body table>tbody>tr>td {
+ padding: 1.2rem 0.8rem;
}
-.pull-request-list>.head {
- position: relative;
-}
-.pull-request-list>.head>* {
- margin-bottom: 20px;
-}
-.pull-request-list>.head>form.can-create-pull-requests {
- margin-right: 120px;
-}
-.pull-request-list>.head>.open-new {
- position: absolute;
- width: 100px;
- right: 0;
- top: 0;
-}
-.pull-request-list>.head>.operations>* {
- margin-right: 16px;
- color: #444;
- white-space: nowrap;
-}
-.pull-request-list>.head>.operations>*:last-child {
- margin-right: 0;
-}
-
-.pull-request-list>.body td a.number, .pull-request-list>.body td .title>a {
- margin-right: 4px;
- font-weight: bold;
- font-size: 15px;
-}
-
-.pull-request-list>.body td .primary {
- margin-bottom: 8px;
-}
-.pull-request-list>.body td .primary>.float-left {
- margin-right: 12px;
-}
-
-.pull-request-list>.body td .secondary {
- line-height: 24px;
-}
-.pull-request-list>.body td .secondary .status,
-.pull-request-list>.body td .secondary .review {
- margin-top: -2px;
-}
-.pull-request-list>.body td .secondary>.float-left {
- margin-right: 12px;
-}
-.pull-request-list>.body td .branches svg {
- margin: -2px 4px;
-}
-.pull-request-list>.body td .last-update,
-.pull-request-list>.body td .comments {
- color: #888;
-}
-
-.pull-request-list>.body .new-indicator {
+.pull-request-list>div>.body .new-indicator {
width: 4px;
padding: 0;
}
-.pull-request-list>.body tr.request.new td.new-indicator {
- background: #4667EE;
+.pull-request-list>div>.body tr.request.new td.new-indicator {
+ background: var(--primary);
}
+
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html
index d30a23059c..9fef34bf68 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html
@@ -10,7 +10,7 @@
<a wicket:id="user"></a>
</td>
<td class="actions">
- <a wicket:id="delete" title="Remove this reviewer"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Remove this reviewer"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</td>
</tr>
<wicket:enclosure child="addReviewer">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css
index 797ae09f3f..d29de68f96 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css
@@ -1,8 +1,9 @@
table.reviews>tbody>tr>td {
- padding: 6px 12px;
+ padding: 0.5rem 1rem;
+ vertical-align: middle;
}
table.reviews>tbody>tr>td.status {
- width: 16px;
+ width: 1.2rem;
padding-right: 0;
}
table.reviews>tbody>tr>td.status .icon {
@@ -21,7 +22,6 @@ table.reviews>tbody>tr:last-child>td {
padding-bottom: 0;
}
table.reviews>tbody>tr>td.actions {
- font-size: 16px;
text-align: right;
}
table.reviews>tbody>tr>td.status span {
@@ -33,8 +33,8 @@ table.reviews>tbody>tr>td.status span {
}
.reviewer-avatar .review-status {
position: absolute;
- left: 12px;
- top: 16px;
+ left: 14px;
+ top: 12px;
}
.reviewer-avatar .review-status.icon {
width: 10px;
@@ -42,11 +42,11 @@ table.reviews>tbody>tr>td.status span {
}
.review-status-approved.icon {
- fill: limegreen;
+ fill: var(--success);
}
.review-status-request-for-changes.icon {
- fill: tomato;
+ fill: var(--danger);
}
.review-status-pending.icon {
- fill: orange;
+ fill: var(--warning);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html
index 24e2802f4b..a116b0fd86 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html
@@ -1,6 +1,6 @@
<wicket:panel>
<span class="text-nowrap">
- <a wicket:id="projectPicker" class="project btn btn-outline-secondary btn-sm"></a>
+ <a wicket:id="projectPicker" class="project btn btn-outline-secondary btn-sm mr-2"></a>
<a wicket:id="revisionPicker" class="revision btn btn-outline-secondary btn-sm"></a>
</span>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java
index f636266758..65d7863f65 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java
@@ -103,10 +103,10 @@ public abstract class RevisionPicker extends DropdownLink {
}
return Model.of(String.format(""
- + "<span class='revision-picker'>"
+ + "<span class='revision-picker text-nowrap'>"
+ " %s"
+ " <span>%s</span>"
- + " <svg class='icon icon-sm rotate-90'><use xlink:href='%s'/></svg>"
+ + " <svg class='icon rotate-90'><use xlink:href='%s'/></svg>"
+ "</span>",
icon.length()!=0?"<svg class='icon'><use xlink:href='" + SpriteImage.getVersionedHref(IconScope.class, icon) + "'/></svg>":"",
label,
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html
index febd494de7..7d0390b07a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html
@@ -1,12 +1,16 @@
<wicket:panel>
- <div class="revision-selector">
- <input wicket:id="revision" class="form-control input-sm revision" placeholder="Input revision"></input><wicket:svg href="magnify" class="icon icon-magnify"></wicket:svg>
- <div wicket:id="feedback" class="feedback"></div>
- <ul wicket:id="tabs" class="nav nav-tabs"></ul>
- <ul wicket:id="items" class="items autosize list-unstyled">
+ <div class="revision-selector p-4">
+ <div class="d-flex align-items-center">
+ <input wicket:id="revision" class="form-control form-control-sm revision" placeholder="Input revision"></input>
+ <wicket:svg href="magnify" class="icon text-muted icon-magnify"></wicket:svg>
+ </div>
+ <div wicket:id="feedback" class="feedback text-danger mt-2"></div>
+ <ul wicket:id="tabs" class="nav nav-tabs nav-tabs-line mb-3"></ul>
+ <ul wicket:id="items" class="items autosuit list-unstyled">
<li wicket:id="items" class="selectable">
- <a wicket:id="link"><svg wicket:id="icon" class="icon"></svg><span wicket:id="label"></span></a>
+ <a wicket:id="link" class="d-flex align-items-center"><svg wicket:id="icon" class="icon mr-2"></svg><span wicket:id="label" class="text-nowrap"></span></a>
</li>
+ <li wicket:id="noItems" class="alert alert-light-warning mb-0"></li>
</ul>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
index 6a60d6702e..b7a9633d82 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
@@ -383,10 +383,10 @@ public abstract class RevisionSelector extends Panel {
} else if (itemValue.startsWith(ADD_FLAG)) {
String label;
if (branchesActive)
- label = "<div class='name'>Create branch <b>" + HtmlEscape.escapeHtml5(ref) + "</b></div>";
+ label = "Create branch <b>" + HtmlEscape.escapeHtml5(ref) + "</b>";
else
- label = "<div class='name'>Create tag <b>" + HtmlEscape.escapeHtml5(ref) + "</b></div>";
- label += "<div class='revision'>from " + HtmlEscape.escapeHtml5(revision) + "</div>";
+ label = "Create tag <b>" + HtmlEscape.escapeHtml5(ref) + "</b>";
+ label += " from " + HtmlEscape.escapeHtml5(revision);
link.add(new Label("label", label).setEscapeModelStrings(false));
icon = "plus";
} else if (ref.equals(revision)) {
@@ -399,7 +399,7 @@ public abstract class RevisionSelector extends Panel {
if (icon != null)
link.add(new SpriteImage("icon", icon));
else
- link.add(new WebMarkupContainer("icon").setVisible(false));
+ link.add(new WebMarkupContainer("icon"));
WebMarkupContainer item = new WebMarkupContainer(itemId);
item.setOutputMarkupId(true);
item.add(AttributeAppender.append("data-value", HtmlEscape.escapeHtml5(itemValue)));
@@ -420,6 +420,16 @@ public abstract class RevisionSelector extends Panel {
item.add(AttributeAppender.append("class", "active"));
itemsView.add(item);
}
+ itemsContainer.add(new Label("noItems", branchesActive? "No branches found": "No tags found") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(itemsView.size() == 0);
+ }
+
+ });
+
itemsContainer.add(new InfiniteScrollBehavior(PAGE_SIZE) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css
index 967b21aadf..b0e5da6253 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css
@@ -1,35 +1,10 @@
-div.revision-selector {
- padding: 12px;
- position: relative;
+.revision-selector {
+ min-width: 240px;
}
-div.revision-selector ul.nav-tabs>li.collapsed {
- display: none !important;
+.revision-selector input+.icon {
+ margin-left: -1.8rem;
}
-div.revision-selector ul.nav-tabs>li.expanded {
- display: block !important;
-}
-div.revision-selector input.revision {
- margin-bottom: 12px;
- padding-right: 26px;
-}
-div.revision-selector .icon-magnify {
- position: absolute;
- top: 26px;
- right: 14px;
-}
-div.revision-selector .nav-tabs {
- margin-bottom: 8px;
-}
-div.revision-selector .nav-tabs>li>a {
- padding: 2px 4px;
- color: #666;
- font-size: 12px;
-}
-div.revision-selector .nav-tabs>li.active>a {
- color: #333;
- font-weight: bold;
-}
-div.revision-selector ul.items {
+.revision-selector .items {
margin-bottom: 0;
/*
* Configure max height to make sure scroll bar appears if there are many refs as we initially only
@@ -37,29 +12,8 @@ div.revision-selector ul.items {
*/
max-height: 600px;
}
-div.revision-selector ul.items>li {
- position: relative;
-}
-div.revision-selector ul.items>li>a {
- padding-left: 20px;
-}
-div.revision-selector ul.items>li.loading-indicator {
- padding-left: 20px;
-}
-div.revision-selector .feedback {
- color: #F94949;
- margin-bottom: 12px;
-}
-div.revision-selector a .icon {
- position: absolute;
- color: #333;
- left: 4px;
- top: 14px;
+
+.revision-selector .items .icon {
width: 12px;
height: 12px;
-}
-div.revision-selector ul.items>li>a .revision {
- font-size: 13px;
- margin-top: 2px;
- color: #666;
-}
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.html b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.html
index 30dc12500d..34559cae01 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="save-request-query">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Save Query</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html
index bdbeccff34..5d20a0f5eb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html
@@ -1,56 +1,54 @@
<wicket:panel>
- <div class="saved-queries">
- <div class="head">
- <h4 class="title">Saved Queries</h4>
- <div class="actions">
- <a wicket:id="edit" class="edit-saved-queries" title="Edit saved queries">
+ <div class="saved-queries card">
+ <div class="card-header">
+ <h3 class="card-title mr-4">Saved Queries</h3>
+ <div class="card-toolbar">
+ <a wicket:id="edit" class="edit-saved-queries mr-2 btn btn-light btn-xs btn-icon btn-hover-primary text-muted" title="Edit saved queries">
<wicket:svg href="edit" class="icon"></wicket:svg>
</a>
- <a wicket:id="close" class="close-saved-queries" title="Hide saved queries">
+ <a wicket:id="close" class="close-saved-queries btn btn-light btn-xs btn-icon btn-hover-danger text-muted" title="Hide saved queries">
<wicket:svg href="times" class="icon"></wicket:svg>
</a>
</div>
</div>
- <hr>
- <div class="body">
+ <div class="card-body">
<wicket:enclosure child="userQueries">
- <div wicket:id="userQueries">
+ <div wicket:id="userQueries" class="mb-4">
<span class="btn-group">
- <a wicket:id="link" class="btn btn-sm btn-outline-secondary"><span wicket:id="label"></span></a><a wicket:id="subscriptionStatus" class="subscription-status btn btn-outline-secondary btn-sm"></a><a wicket:id="watchStatus" class="watch-status btn btn-outline-secondary btn-sm"></a>
+ <a wicket:id="subscriptionStatus" class="subscription-status btn btn-outline-secondary btn-sm btn-icon"></a><a wicket:id="watchStatus" class="watch-status btn btn-outline-secondary btn-icon btn-sm"></a>
+ <a wicket:id="link" class="btn btn-sm btn-outline-secondary"><span wicket:id="label"></span></a>
</span>
</div>
- <hr/>
</wicket:enclosure>
- <div wicket:id="queries">
+ <div wicket:id="queries" class="mb-4">
<span class="btn-group">
- <a wicket:id="link" class="btn btn-sm btn-outline-secondary"><span wicket:id="label"></span></a><a wicket:id="subscriptionStatus" class="subscription-status btn btn-outline-secondary btn-sm"></a><a wicket:id="watchStatus" class="watch-status btn btn-outline-secondary btn-sm"></a>
+ <a wicket:id="subscriptionStatus" class="subscription-status btn btn-outline-secondary btn-sm btn-icon"></a><a wicket:id="watchStatus" class="watch-status btn btn-outline-secondary btn-icon btn-sm"></a>
+ <a wicket:id="link" class="btn btn-sm btn-outline-secondary"><span wicket:id="label"></span></a>
</span>
</div>
- <div wicket:id="watchHint" class="help-block">
- <b><wicket:svg href="bulb" class="icon"/> Tips:</b> You may watch/unwatch specified queries above.
- The first matching query will take effect
- </div>
</div>
</div>
<wicket:fragment wicket:id="editSavedQueriesFrag">
- <div class="modal-header">
- <h5 class="modal-title">Edit Saved Queries</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
- </div>
- <div class="modal-body">
- <ul wicket:id="tab" class="nav nav-tabs"></ul>
- <div wicket:id="tabPanel"></div>
+ <div class="edit-saved-queries">
+ <div class="modal-header">
+ <h5 class="modal-title">Edit Saved Queries</h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <div class="modal-body">
+ <ul wicket:id="tab" class="nav nav-tabs mb-3"></ul>
+ <div wicket:id="tabPanel"></div>
+ </div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="editSavedQueriesContentFrag">
- <form wicket:id="form" class="leave-confirm edit-saved-queries">
+ <form wicket:id="form" class="leave-confirm">
<div wicket:id="feedback"></div>
<div wicket:id="editor"></div>
- <div class="actions">
+ <div class="modal-footer">
<input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
- <a wicket:id="useDefault" class="btn btn-primary">Use Default</a>
+ <a wicket:id="useDefault" class="btn btn-light-primary">Use Default</a>
<a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
</div>
</form>
- </wicket:fragment>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
index b680c18e53..7c4b9ef18a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
@@ -19,7 +19,6 @@ import org.apache.wicket.event.IEvent;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.Link;
@@ -48,6 +47,7 @@ import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.component.watchstatus.WatchStatusLink;
import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.base.BasePage;
@SuppressWarnings("serial")
public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@@ -116,6 +116,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
if (event.getPayload() instanceof SavedQueriesOpened) {
SavedQueriesOpened savedQueriesOpened = (SavedQueriesOpened) event.getPayload();
toggle(savedQueriesOpened.getHandler());
+ ((BasePage) getPage()).resizeWindow(savedQueriesOpened.getHandler());
}
}
@@ -150,6 +151,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
public void onClick(AjaxRequestTarget target) {
toggle(target);
send(getPage(), Broadcast.BREADTH, new SavedQueriesClosed(target));
+ ((BasePage) getPage()).resizeWindow(target);
}
});
@@ -215,7 +217,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
List<Tab> tabs = new ArrayList<>();
ArrayList<T> userQueries = getUserQueries();
- tabs.add(new AjaxActionTab(Model.of("For Mine")) {
+ tabs.add(new AjaxActionTab(Model.of("Mine")) {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
@@ -234,7 +236,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
fragment.add(newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries));
if (SecurityUtils.isAdministrator() || Project.get() != null && SecurityUtils.canManage(Project.get())) {
- tabs.add(new AjaxActionTab(Model.of("For All Users")) {
+ tabs.add(new AjaxActionTab(Model.of("All Users")) {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
@@ -446,16 +448,6 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
});
- add(new WebMarkupContainer("watchHint") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getQuerySetting() != null && getQuerySetting().getQueryWatchSupport() != null);
- }
-
- });
-
setOutputMarkupPlaceholderTag(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css
index 09885f5518..406e8fdf76 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css
@@ -1,69 +1,8 @@
-.saved-queries>.head {
- white-space: nowrap;
-}
-.saved-queries>.head>* {
- display: inline-block;
-}
-.saved-queries>.head>.actions {
- margin: 8px 0 0 12px;
-}
-.saved-queries>.head>.actions>a {
- color: #444;
- opacity: 100;
- margin-right: 0;
-}
-
-.saved-queries>.body>* {
- margin-bottom: 20px;
-}
-.saved-queries>.body>:last-child {
- margin-bottom: 0;
-}
-.saved-queries>.body .btn-group {
- white-space: nowrap;
-}
-.saved-queries>.body .btn-group .btn {
- float: none;
- display: inline-block;
-}
-.saved-queries>.body .watch-status:after,
-.saved-queries>.body .subscription-status:after {
+.saved-queries>.card-body .watch-status:after,
+.saved-queries>.card-body .subscription-status:after {
display: none;
}
-.edit-saved-queries th {
- font-weight: bold !important;
-}
-.edit-saved-queries th.property-name {
- width: 30%;
-}
-.edit-saved-queries>.property {
- border: 1px solid #E8E8E8;
- background: #F9F9F9;
- border-radius: 4px;
- padding: 10px;
-}
-.edit-saved-queries .editable .bean.list>thead>tr>th {
- border-bottom: none;
- padding-bottom: 4px;
-}
-
-.query-save-support {
- display: table;
- width: 100%;
-}
-.query-save-support>div {
- display: table-cell;
-}
-.query-save-support>.side {
- border: 2px solid #E0E0E0;
- padding: 20px;
- border-radius: 4px;
- width: 1%;
-}
-.query-save-support>.main {
- vertical-align: top;
- min-width: 330px;
-}
-.query-save-support>.side+.main {
- padding-left: 20px;
+.edit-saved-queries .modal-footer {
+ margin: -1.75rem;
+ margin-top: 0;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/Select2Choice.java b/server-core/src/main/java/io/onedev/server/web/component/select2/Select2Choice.java
index 579ad24048..82e7e707c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/Select2Choice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/Select2Choice.java
@@ -76,7 +76,7 @@ public class Select2Choice<T> extends AbstractSelect2Choice<T, T> {
@Override
protected void renderInitializationScript(IHeaderResponse response) {
T value;
- if (getWebRequest().getRequestParameters().getParameterNames().contains(getInputName())) {
+ if (hasRawInput()) {
convertInput();
value = getConvertedInput();
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.java
index 9f463299a5..d12c696c85 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.java
@@ -105,8 +105,16 @@ public class Select2MultiChoice<T> extends AbstractSelect2Choice<T, Collection<T
@Override
protected void renderInitializationScript(IHeaderResponse response) {
response.render(JavaScriptHeaderItem.forReference(new DragSortResourceReference()));
- Collection<? extends T> choices = getModelObject();
-
+
+ Collection<? extends T> choices;
+
+ if (hasRawInput()) { // Add this as otherwise cleared options will occur again after validation if the field is required
+ convertInput();
+ choices = getConvertedInput();
+ } else {
+ choices = getModelObject();
+ }
+
if (choices != null && !choices.isEmpty()) {
JsonBuilder selection = new JsonBuilder();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-bootstrap.css b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-bootstrap.css
index cb7ba3a0b3..66b039696e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-bootstrap.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-bootstrap.css
@@ -12,7 +12,7 @@
* with Bootstrap 3's default for .form-control, display:block;
* courtesy of @juristr (@see https://github.com/fk/select2-bootstrap-css/pull/1)
*/
-.select2-container.form-control {
+.select2-container.form-control, .select2-container.form-control-sm, .select2-container.form-control-lg {
background: transparent;
border: none;
display: block;
@@ -29,25 +29,21 @@
.select2-container .select2-choices {
background: none;
padding: 0;
- border-color: #cccccc;
- border-radius: 4px;
+ border-color: #e4e6ef;
+ border-radius: 0.42rem;
color: #555555;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: white;
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.select2-search input {
- border-color: #cccccc;
- border-radius: 4px;
+ border-color: #e4e6ef;
+ border-radius: 0.42rem;
color: #555555;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: white;
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.input-group>.select2-container:not(:first-child)>.select2-choice ,
@@ -56,17 +52,12 @@
border-bottom-left-radius: 0;
}
-.select2-container .select2-choices .select2-search-field input {
- -webkit-box-shadow: none;
- box-shadow: none;
-}
-
/**
* Adjust Select2 input heights to match the Bootstrap default.
*/
.select2-container .select2-choice {
- height: 38px;
- line-height: 1.42857;
+ height: calc(1.5em + 1.3rem + 2px);
+ line-height: 1.42857;
}
/**
@@ -81,14 +72,14 @@
* Address Bootstrap 3 control sizing classes
* @see http://getbootstrap.com/css/#forms-control-sizes
*/
-.select2-container.input-sm .select2-choice,
+.select2-container.form-control-sm .select2-choice,
.input-group-sm .select2-container .select2-choice {
height: 30px;
line-height: 1.5;
border-radius: 3px;
}
-.select2-container.input-lg .select2-choice,
+.select2-container.form-control-lg .select2-choice,
.input-group-lg .select2-container .select2-choice {
height: 45px;
line-height: 1.33;
@@ -96,17 +87,15 @@
}
.select2-container-multi .select2-choices .select2-search-field input {
- height: 32px;
+ height: calc(1.5em + 1.3rem + 2px);
+ line-height: 1.42857;
}
-.select2-container-multi.input-sm .select2-choices .select2-search-field input,
+.select2-container-multi.form-control-sm .select2-choices .select2-search-field input,
.input-group-sm .select2-container-multi .select2-choices .select2-search-field input {
- height: 28px;
-}
-
-.select2-container-multi.input-lg .select2-choices .select2-search-field input,
-.input-group-lg .select2-container-multi .select2-choices .select2-search-field input {
- height: 43px;
+ height: calc(1.35em + 1.1rem + 2px);
+ line-height: 1.35;
+ border-radius: 0.42rem;
}
/**
@@ -121,23 +110,23 @@
.select2-chosen,
.select2-choice > span:first-child,
.select2-container .select2-choices .select2-search-field input {
- padding: 6px 12px;
+ padding: 10px 12px;
}
-.input-sm .select2-chosen,
+.form-control-sm .select2-chosen,
.input-group-sm .select2-chosen,
-.input-sm .select2-choice > span:first-child,
+.form-control-sm .select2-choice > span:first-child,
.input-group-sm .select2-choice > span:first-child,
-.input-sm .select2-choices .select2-search-field input,
+.form-control-sm .select2-choices .select2-search-field input,
.input-group-sm .select2-choices .select2-search-field input {
padding: 5px 10px;
}
-.input-lg .select2-chosen,
+.form-control-lg .select2-chosen,
.input-group-lg .select2-chosen,
-.input-lg .select2-choice > span:first-child,
+.form-control-lg .select2-choice > span:first-child,
.input-group-lg .select2-choice > span:first-child,
-.input-lg .select2-choices .select2-search-field input,
+.form-control-lg .select2-choices .select2-search-field input,
.input-group-lg .select2-choices .select2-search-field input {
padding: 10px 16px;
}
@@ -147,13 +136,13 @@
margin-bottom: 3px;
}
-.select2-container-multi.input-sm .select2-choices .select2-search-choice,
+.select2-container-multi.form-control-sm .select2-choices .select2-search-choice,
.input-group-sm .select2-container-multi .select2-choices .select2-search-choice {
margin-top: 3px;
margin-bottom: 2px;
}
-.select2-container-multi.input-lg .select2-choices .select2-search-choice,
+.select2-container-multi.form-control-lg .select2-choices .select2-search-choice,
.input-group-lg .select2-container-multi .select2-choices .select2-search-choice {
line-height: 24px;
}
@@ -165,7 +154,7 @@
*/
.select2-container .select2-choice .select2-arrow,
.select2-container .select2-choice div {
- border-left: 1px solid #cccccc;
+ border-left: 1px solid #e4e6ef;
background: none;
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
@@ -193,30 +182,30 @@
background-position: -18px 6px;
}
-.select2-container.input-sm .select2-choice .select2-arrow b,
+.select2-container.form-control-sm .select2-choice .select2-arrow b,
.input-group-sm .select2-container .select2-choice .select2-arrow b,
-.select2-container.input-sm .select2-choice div b,
+.select2-container.form-control-sm .select2-choice div b,
.input-group-sm .select2-container .select2-choice div b {
background-position: 0 1px;
}
-.select2-dropdown-open.input-sm .select2-choice .select2-arrow b,
+.select2-dropdown-open.form-control-sm .select2-choice .select2-arrow b,
.input-group-sm .select2-dropdown-open .select2-choice .select2-arrow b,
-.select2-dropdown-open.input-sm .select2-choice div b,
+.select2-dropdown-open.form-control-sm .select2-choice div b,
.input-group-sm .select2-dropdown-open .select2-choice div b {
background-position: -18px 1px;
}
-.select2-container.input-lg .select2-choice .select2-arrow b,
+.select2-container.form-control-lg .select2-choice .select2-arrow b,
.input-group-lg .select2-container .select2-choice .select2-arrow b,
-.select2-container.input-lg .select2-choice div b,
+.select2-container.form-control-lg .select2-choice div b,
.input-group-lg .select2-container .select2-choice div b {
background-position: 0 9px;
}
-.select2-dropdown-open.input-lg .select2-choice .select2-arrow b,
+.select2-dropdown-open.form-control-lg .select2-choice .select2-arrow b,
.input-group-lg .select2-dropdown-open .select2-choice .select2-arrow b,
-.select2-dropdown-open.input-lg .select2-choice div b,
+.select2-dropdown-open.form-control-lg .select2-choice div b,
.input-group-lg .select2-dropdown-open .select2-choice div b {
background-position: -18px 9px;
}
@@ -232,8 +221,6 @@
.has-warning .select2-container-active .select2-choice,
.has-warning .select2-container-multi.select2-container-active .select2-choices {
border-color: #a47e3c;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
}
.has-warning.select2-drop-active {
border-color: #a47e3c;
@@ -253,12 +240,10 @@
.is-invalid.select2-container-active .select2-choice,
.is-invalid.select2-container-multi.select2-container-active .select2-choices {
border-color: #dc3545;
- box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
}
.is-invalid .select2-drop-active,
.is-invalid.select2-drop-active {
border-color: #dc3545;
- box-shadow: 0 3px 0 0.2rem rgba(220, 53, 69, 0.25);
}
.has-success .select2-choice,
@@ -268,8 +253,6 @@
.has-success .select2-container-active .select2-choice,
.has-success .select2-container-multi.select2-container-active .select2-choices {
border-color: #356635;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
}
.has-success.select2-drop-active {
border-color: #356635;
@@ -289,13 +272,11 @@
transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
background-color: #fff;
border-color: #80bdff;
- box-shadow: 0 0 0 0.2rem rgba(0,123,255,.25);
}
.select2-drop-active {
border-color: #80bdff;
outline: 0;
- box-shadow: 0 3px 0 0.2rem rgba(0,123,255,.25);
}
.select2-drop-auto-width,
@@ -369,18 +350,14 @@
.select2-container-multi .select2-choices .select2-search-choice {
color: #555555;
background: white;
- border-color: #cccccc;
+ border-color: #e4e6ef;
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- -webkit-box-shadow: none;
- box-shadow: none;
}
.select2-container-multi .select2-choices .select2-search-choice-focus {
background: #ebebeb;
border-color: #adadad;
color: #333333;
- -webkit-box-shadow: none;
- box-shadow: none;
}
/**
@@ -424,7 +401,7 @@
.select2-container.select2-container-disabled .select2-choices {
cursor: not-allowed;
background-color: #eeeeee;
- border-color: #cccccc;
+ border-color: #e4e6ef;
}
.select2-container.select2-container-disabled .select2-choice .select2-arrow,
.select2-container.select2-container-disabled .select2-choice div,
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css
index 36324d612a..922923734a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css
@@ -34,7 +34,7 @@ Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
overflow: hidden;
position: relative;
- border: 1px solid #aaa;
+ border: 1px solid #e4e6ef;
white-space: nowrap;
line-height: 26px;
color: #444;
@@ -141,10 +141,6 @@ Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
-
- -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
- -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
- box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
}
.select2-drop.select2-drop-above {
@@ -155,10 +151,6 @@ Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
-
- -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
- -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
- box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
}
.select2-container .select2-choice div {
@@ -231,10 +223,6 @@ Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
-moz-border-radius: 0;
border-radius: 0;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-
background: #fff url('select2.png') no-repeat 100% -22px;
background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
@@ -262,17 +250,10 @@ Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
.select2-container-active .select2-choices {
border: 1px solid #5897fb;
outline: none;
-
- -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
- -moz-box-shadow: 0 0 5px rgba(0,0,0,.3);
- box-shadow: 0 0 5px rgba(0,0,0,.3);
}
.select2-dropdown-open .select2-choice {
border-bottom-color: transparent;
- -webkit-box-shadow: 0 1px 0 #fff inset;
- -moz-box-shadow: 0 1px 0 #fff inset;
- box-shadow: 0 1px 0 #fff inset;
-webkit-border-bottom-left-radius: 0;
-moz-border-radius-bottomleft: 0;
@@ -457,10 +438,6 @@ disabled look for disabled choices in the results dropdown
.select2-container-multi.select2-container-active .select2-choices {
border: 1px solid #5897fb;
outline: none;
-
- -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
- -moz-box-shadow: 0 0 5px rgba(0,0,0,.3);
- box-shadow: 0 0 5px rgba(0,0,0,.3);
}
.select2-container-multi .select2-choices li {
float: left;
@@ -481,9 +458,6 @@ disabled look for disabled choices in the results dropdown
color: #666;
outline: 0;
border: 0;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
background: transparent !important;
}
@@ -509,10 +483,6 @@ disabled look for disabled choices in the results dropdown
-moz-border-radius: 3px;
border-radius: 3px;
- -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
- -moz-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
- box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
-
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sidebar/SideBar.html b/server-core/src/main/java/io/onedev/server/web/component/sidebar/SideBar.html
deleted file mode 100644
index df6248fae8..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/sidebar/SideBar.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wicket:panel>
- <div wicket:id="head" class="head"></div>
- <ul wicket:id="tabs" class="tabs list-unstyled"></ul>
- <a wicket:id="miniToggle" class="mini-toggle"></a>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sidebar/SideBar.java b/server-core/src/main/java/io/onedev/server/web/component/sidebar/SideBar.java
deleted file mode 100644
index b0ab8ecfcd..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/sidebar/SideBar.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package io.onedev.server.web.component.sidebar;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.servlet.http.Cookie;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
-
-import io.onedev.server.web.asset.icon.IconScope;
-import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.component.tabbable.Tab;
-import io.onedev.server.web.component.tabbable.Tabbable;
-import io.onedev.server.web.util.WicketUtils;
-
-@SuppressWarnings("serial")
-public abstract class SideBar extends Panel {
-
- private final String miniCookieKey;
-
- public SideBar(String id, @Nullable String miniCookieKey) {
- super(id);
- this.miniCookieKey = miniCookieKey;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(newHead("head"));
- add(new Tabbable("tabs", newTabs()));
-
- String miniToggleContent = String.format("<svg class='icon'><use xlink:href='%s'/></svg>",
- SpriteImage.getVersionedHref(IconScope.class, "arrow2"));
-
- add(new Label("miniToggle", miniToggleContent)
- .setEscapeModelStrings(false)
- .setVisible(miniCookieKey!=null));
-
- add(AttributeAppender.append("class", "sidebar"));
-
- if (miniCookieKey != null) {
- add(AttributeAppender.append("class", "minimizable"));
- WebRequest request = (WebRequest) RequestCycle.get().getRequest();
- Cookie miniCookie = request.getCookie(miniCookieKey);
- if (miniCookie != null) {
- if ("yes".equals(miniCookie.getValue()))
- add(AttributeAppender.append("class", "minimized"));
- } else if (WicketUtils.isDevice()) {
- add(AttributeAppender.append("class", "minimized"));
- }
- }
- }
-
- protected Component newHead(String componentId) {
- return new WebMarkupContainer(componentId).setVisible(false);
- }
-
- protected abstract List<? extends Tab> newTabs();
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new SidebarResourceReference()));
- String script = String.format("onedev.server.sidebar.onDomReady('%s', %s);",
- getMarkupId(true), miniCookieKey!=null?"'"+miniCookieKey+"'":"undefined");
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sidebar/SidebarResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/sidebar/SidebarResourceReference.java
deleted file mode 100644
index 9411b8e818..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/sidebar/SidebarResourceReference.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.onedev.server.web.component.sidebar;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-
-import io.onedev.server.web.asset.cookies.CookiesResourceReference;
-import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
-import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class SidebarResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public SidebarResourceReference() {
- super(SidebarResourceReference.class, "sidebar.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(SidebarResourceReference.class, "sidebar.css")));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css b/server-core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css
deleted file mode 100644
index f5a8610a3b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Side bar */
-.sidebar {
- position: fixed;
- top: 0;
- left: 0;
- bottom: 0;
- background: #FAFAFA;
- overflow: hidden;
- width: 240px;
- border-left: 1px solid #FAFAFA;
- border-right: 1px solid #E0E0E0;
- z-index: 210;
-}
-.sidebar>.tabs {
- position: absolute;
- left: 0;
- right: 0;
- top: 0;
- bottom: 0;
- padding: 10px 0;
- overflow: hidden;
- margin-bottom: 0;
-}
-.sidebar>.tabs>li>a {
- display: block;
- border-left: 4px solid #FAFAFA;
- padding: 12px 6px;
- text-decoration: none;
- color: #616161;
-}
-.sidebar>.tabs>li>a>svg {
- margin-right: 4px;
-}
-.sidebar>.tabs>li:hover>a {
- background: #EEE;
- border-left-color: #9E9E9E;
-}
-.sidebar>.tabs>li.active>a {
- background: #EEE;
- color: #212121;
- border-left-color: #212121;
- font-weight: bold;
-}
-.sidebar+.content {
- padding-left: 240px;
-}
-
-.minimizable.sidebar>.tabs {
- bottom: 40px;
-}
-.minimizable.sidebar>a.mini-toggle {
- display: block;
- border-top: 1px solid #E0E0E0;
- height: 40px;
- text-decoration: none;
- font-size: 24px;
- text-align: center;
- position: absolute;
- bottom: 0;
- left: 0;
- right: 0;
- color: #888;
- font-weight: bold;
- margin-right: 1px;
- background: #FAFAFA;
-}
-.minimizable.sidebar>a.mini-toggle>svg {
- transform: scaleX(-1);
-}
-.minimizable.sidebar>a.mini-toggle:hover {
- background: #EEE;
-}
-
-.minimized.sidebar {
- width: 44px;
-}
-.minimized.sidebar>.tabs>li>a>.text {
- display: none;
-}
-.minimizable.minimized.sidebar>a.mini-toggle>svg {
- transform: scaleX(1);
-}
-.minimized.sidebar+.content {
- padding-left: 44px;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js b/server-core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js
deleted file mode 100644
index 55c3bf1e79..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js
+++ /dev/null
@@ -1,43 +0,0 @@
-onedev.server.sidebar = {
- onDomReady: function(containerId, miniCookieKey) {
- var $sidebar = $("#"+containerId);
- var $tabs = $sidebar.children(".tabs");
- var $miniToggle = $sidebar.children(".mini-toggle");
-
- // Sometimes we have sidebar positioned absolutely in order not to occupy
- // screen estates on mobile devices. In this case, we also disable the
- // perfect scrollbar as container applied with perfect scrollbar can not
- // be panned on mobile
- if ($sidebar.css("position") == "fixed") {
- var ps = new PerfectScrollbar($tabs[0]);
-
- $(window).resize(function() {
- ps.update();
- });
- }
-
- function onMiniToggled() {
- var $links = $sidebar.find("ul>li>a");
- if ($sidebar.hasClass("minimized")) {
- $links.each(function() {
- $(this).attr("title", $(this).find(".text").text());
- });
- } else {
- $links.removeAttr("title");
- }
- }
-
- $miniToggle.click(function() {
- $sidebar.toggleClass("minimized", 100, function() {
- if (miniCookieKey) {
- var cookieValue = $sidebar.hasClass("minimized")?"yes":"no";
- Cookies.set(miniCookieKey, cookieValue, {expires: Infinity});
- }
- onMiniToggled();
- $(window).resize();
- });
- });
-
- onMiniToggled();
- }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoClosed.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoClosed.java
deleted file mode 100644
index 914ed1ae9a..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoClosed.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.sideinfo;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import io.onedev.server.web.util.AjaxPayload;
-
-public class SideInfoClosed extends AjaxPayload {
-
- public SideInfoClosed(AjaxRequestTarget target) {
- super(target);
- }
-
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoCssResourceReference.java
new file mode 100644
index 0000000000..150d9b327b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.sideinfo;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class SideInfoCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public SideInfoCssResourceReference() {
+ super(SideInfoCssResourceReference.class, "side-info.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java
index 58294377eb..4dcd0cb41d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java
@@ -3,6 +3,8 @@ package io.onedev.server.web.component.sideinfo;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.Broadcast;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
@SuppressWarnings("serial")
public class SideInfoLink extends AjaxLink<Void> {
@@ -22,4 +24,10 @@ public class SideInfoLink extends AjaxLink<Void> {
send(getPage(), Broadcast.BREADTH, new SideInfoOpened(target));
}
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new SideInfoCssResourceReference()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.html
index 207b44763f..654c415b9c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.html
@@ -1,4 +1,7 @@
<wicket:panel>
- <a wicket:id="close" class="close" title="Hide"><wicket:svg href="times" class="icon"/></a>
- <div wicket:id="content" class="content"></div>
+ <div class="header d-flex align-items-center flex-shrink-0 border-bottom">
+ <div wicket:id="title" class="title flex-grow-1"></div>
+ <a wicket:id="close" title="Hide" class="flex-shrink-0 ml-4 close align-items-center"><wicket:svg href="times" class="icon"/></a>
+ </div>
+ <div wicket:id="body" class="body flex-grow-1"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java
index d630e0045b..f7af91e4a6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java
@@ -4,13 +4,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.panel.Panel;
+import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
+
@SuppressWarnings("serial")
public abstract class SideInfoPanel extends Panel {
@@ -22,49 +23,45 @@ public abstract class SideInfoPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(newContent("content"));
+ add(newTitle("title"));
+ add(newBody("body"));
+
add(new AjaxLink<Void>("close") {
@Override
public void onClick(AjaxRequestTarget target) {
- String script = String.format("$('#%s').hide('slide', {direction: 'right', duration: 200});", SideInfoPanel.this.getMarkupId());
- target.appendJavaScript(script);
- send(getPage(), Broadcast.BREADTH, new SideInfoClosed(target));
+ target.appendJavaScript(String.format("$('#%s').addClass('closed');", SideInfoPanel.this.getMarkupId()));
}
});
- add(AttributeAppender.append("class", "side-info closed"));
+ add(AttributeAppender.append("class", "side-info d-flex flex-column closed"));
+
+ setOutputMarkupId(true);
}
@Override
public void onEvent(IEvent<?> event) {
super.onEvent(event);
if (event.getPayload() instanceof SideInfoOpened) {
- SideInfoOpened moreInfoSideOpened = (SideInfoOpened) event.getPayload();
- String script = String.format(""
- + "$('#%s').show('slide', {"
- + " direction: 'right', "
- + " duration: 200, "
- + " complete: function() {"
- + " if (!onedev.server.util.isDevice()) "
- + " $(this).data('ps').update();"
- + " }"
- + "});"
- + "$(window).resize();", getMarkupId());
- moreInfoSideOpened.getHandler().appendJavaScript(script);
+ SideInfoOpened sideInfoOpened = (SideInfoOpened) event.getPayload();
+ sideInfoOpened.getHandler().appendJavaScript(String.format(""
+ + "$('#%s').removeClass('closed'); "
+ + "setTimeout(function(){$(window).resize();}, 350);", // Wait for animation to stop
+ getMarkupId()));
}
}
-
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new SideInfoResourceReference()));
- String script = String.format("onedev.server.sideInfo.onDomReady('%s');", getMarkupId());
- response.render(OnDomReadyHeaderItem.forScript(script));
+ response.render(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
+ response.render(CssHeaderItem.forReference(new SideInfoCssResourceReference()));
}
- protected abstract Component newContent(String componentId);
+ protected abstract Component newTitle(String componentId);
+
+ protected abstract Component newBody(String componentId);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoResourceReference.java
deleted file mode 100644
index b601658c3c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoResourceReference.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.onedev.server.web.component.sideinfo;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-
-import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
-import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class SideInfoResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public SideInfoResourceReference() {
- super(SideInfoResourceReference.class, "side-info.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- SideInfoPanel.class, "side-info.css")));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css
index b1bd9310c8..2b83246099 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css
@@ -1,19 +1,51 @@
-.side-info {
- position: fixed;
- top: 51px;
- width: 360px;
- right: 0;
- bottom: 0;
- border-left: 1px solid #E0E0E0;
- padding: 20px;
- background: #FAFAFA;
- z-index: 10;
- box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
- display: none;
- overflow: auto;
+div.side-info {
+ border-radius: 0 0 0.42rem 0;
+ border-left: 1px solid var(--light-gray);
+ background: white;
+ margin: -2rem -2.25rem -2rem 2rem;
+ flex-shrink: 0;
+ transition: all var(--transition-duration) ease;
+ width: 360px;
+ background: white;
}
-.side-info>.close {
- position: absolute;
- top: 20px;
- right: 20px;
+div.side-info>.header, div.side-info>.footer {
+ padding: 1.5rem 2rem;
+}
+div.side-info>.body {
+ padding: 2rem 2.25rem;
+}
+div.side-info>.header .close {
+ border-left: 1px solid var(--secondary);
+ margin-left: 0.6rem;
+ padding-left: 0.6rem;
+ display: none;
+}
+a.side-info {
+ display: none;
+ align-items: center;
+}
+@media(max-width: 1199px) {
+ div.side-info {
+ box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.2);
+ border-left: none;
+ position: fixed;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ z-index: 1050;
+ margin: 0;
+ }
+ div.side-info.closed {
+ right: -360px;
+ box-shadow: none;
+ }
+ div.side-info>.header .close {
+ display: flex;
+ }
+ div.side-info>.body {
+ overflow: auto;
+ }
+ a.side-info {
+ display: inline-flex;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js
deleted file mode 100644
index a30d5b91f7..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js
+++ /dev/null
@@ -1,12 +0,0 @@
-onedev.server.sideInfo = {
- onDomReady: function(containerId) {
- var $container = $("#" + containerId);
- if (!onedev.server.util.isDevice()) {
- var ps = new PerfectScrollbar($container[0]);
- $container.data("ps", ps);
- $(window).resize(function() {
- ps.update();
- });
- }
- }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.html b/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.html
index dfa4e5d967..607fe18d68 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.html
@@ -1,18 +1,18 @@
<wicket:panel>
- <div class="source-format clearfix">
+ <div class="source-format d-flex align-items-center">
<wicket:enclosure child="indentType">
- <div class="float-left indent-type">
- <select wicket:id="indentType" class="form-control"></select>
+ <div class="indent-type mr-2">
+ <select wicket:id="indentType" class="form-control custom-select"></select>
</div>
</wicket:enclosure>
<wicket:enclosure child="tabSize">
- <div class="float-left tab-size">
- <select wicket:id="tabSize" class="form-control"></select>
+ <div class="tab-size mr-2">
+ <select wicket:id="tabSize" class="form-control custom-select"></select>
</div>
</wicket:enclosure>
<wicket:enclosure child="lineWrapMode">
- <div class="float-left line-wrap-mode">
- <select wicket:id="lineWrapMode" class="form-control"></select>
+ <div class="line-wrap-mode mr-2">
+ <select wicket:id="lineWrapMode" class="form-control custom-select"></select>
</div>
</wicket:enclosure>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sourceformat/source-format.css b/server-core/src/main/java/io/onedev/server/web/component/sourceformat/source-format.css
index 688df5ffc7..e8979d6154 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sourceformat/source-format.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/sourceformat/source-format.css
@@ -1,9 +1,9 @@
.source-format select {
- color: #444;
- height: 22px;
- padding: 0;
- border-radius: 3px;
-}
-.source-format>div {
- margin-left: 8px;
+ padding: 0 2rem 0 1rem;
+ height: 2rem;
+ border-radius: 4px;
}
+
+.source-format>div:last-child {
+ margin-right: 0 !important;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java b/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java
index 9005c817ee..9811c01e13 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java
@@ -37,18 +37,16 @@ public class SpriteImage extends WebComponent {
super(id, Model.of(href));
}
+ public SpriteImage(String id) {
+ this(id, (String)null);
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
setEscapeModelStrings(false);
}
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(StringUtils.isNotBlank(getDefaultModelObjectAsString()));
- }
-
private void listResourceMappers(IRequestMapper rootMapper, List<BaseResourceMapper> resourceMappers) {
if (rootMapper instanceof CompoundRequestMapper) {
for (IRequestMapper mapper: (CompoundRequestMapper)rootMapper)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html
index 21c667a68e..27fad5d4a3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div wicket:id="content">
<wicket:enclosure child="declarations">
- <div>Possible declarations</div>
+ <div class="mb-2"><b>Possible declarations</b></div>
<ul class="declarations list-unstyled">
<li wicket:id="declarations">
<img wicket:id="icon">
@@ -17,7 +17,7 @@
</ul>
</wicket:enclosure>
<div>
- <a wicket:id="findOccurrences" class="find-occurrences">All occurrences</a>
+ <a wicket:id="findOccurrences" class="find-occurrences"><b>All occurrences</b></a>
</div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.css b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.css
index 86f3f6552f..d5653ee04d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.css
@@ -1,13 +1,13 @@
.symbol-tooltip {
- background-color: #FBFCC5;
- border: 1px solid black;
- border-radius: 4px;
- color: black;
+ background-color: var(--light-info);
+ border-radius: 0.42rem;
+ color: var(--info);
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
- font-size: 10pt;
- padding: 4px 8px;
+ font-size: 12px;
+ padding: 1rem;
z-index: 10000;
- font-weight: bold;
+ box-shadow: 0px 10px 30px 0px rgba(82, 63, 105, 0.08);
+ max-width: 720px;
}
.symbol-tooltip ul.declarations li {
vertical-align: top;
@@ -15,5 +15,8 @@
white-space: nowrap;
}
.symbol-tooltip ul.declarations .scope {
- color: #666;
+ color: var(--gray);
}
+.symbol-tooltip a.find-occurrences[disabled] {
+ opacity: 100%;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js
index f7b9f84043..518edf7361 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js
@@ -53,11 +53,12 @@ onedev.server.symboltooltip = {
onedev.server.symboltooltip.removeTooltip(container);
}
- var $tooltip = $("<div class='symbol-tooltip' id='" + containerId
+ var $tooltip = $("<div class='symbol-tooltip ps ps-scroll' id='" + containerId
+ "-symbol-tooltip'><img src=" + ajaxIndicatorUrl + "></img></div>");
container.tooltip = $tooltip[0];
container.tooltip.symbolEl = symbolEl;
document.body.appendChild(container.tooltip);
+ $tooltip.data("ps", new PerfectScrollbar(container.tooltip));
$tooltip.mouseover(function() {
cancelHide();
@@ -83,8 +84,8 @@ onedev.server.symboltooltip = {
var $container = $content.parent();
var $tooltip = $("#" + $container.attr("id") + "-symbol-tooltip");
if ($tooltip.length != 0) {
- $tooltip.empty().append($content.children());
- $tooltip.align($tooltip.data("alignment"));
+ onedev.server.perfectScrollbar.empty($tooltip);
+ $tooltip.prepend($content.children()).align($tooltip.data("alignment")).data("ps").update();
}
},
diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java
index ce0fc99e4c..5e21f4a558 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java
@@ -49,13 +49,7 @@ public abstract class AjaxActionTab extends ActionTab {
@Override
protected final void onSelect(Component tabLink) {
AjaxRequestTarget target = Preconditions.checkNotNull(RequestCycle.get().find(AjaxRequestTarget.class));
- Tabbable tabbable = tabLink.findParent(Tabbable.class);
- if (tabbable == null) {
- Tabbable.TabsFragment tabs = Preconditions.checkNotNull(tabLink.findParent(Tabbable.TabsFragment.class));
- tabs.getDropdown().close();
- tabbable = tabs.getTabbable();
- }
- target.add(tabbable);
+ target.add(tabLink.findParent(Tabbable.class));
onSelect(target, tabLink);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html b/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html
index fde969d337..426633ca13 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html
@@ -1,22 +1,6 @@
<wicket:panel>
- <li wicket:id="tabs" class="expanded nav-item">
+ <li wicket:id="tabs" class="nav-item">
<wicket:container wicket:id="tab"></wicket:container>
</li>
- <li class="collapsed active nav-item">
- <wicket:container wicket:id="collapsed"></wicket:container>
- </li>
<li wicket:id="options" class="options"></li>
- <wicket:fragment wicket:id="multiTabCollapsedFrag">
- <a wicket:id="link" class="multiple nav-link"><span wicket:id="label"></span> <wicket:svg href="arrow" class="icon rotate-90"/></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="singleTabCollapsedFrag">
- <a class="single nav-link"><span wicket:id="label"></span></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="tabsFrag">
- <ul class="list-unstyled">
- <li wicket:id="tabs" class="nav-item">
- <wicket:container wicket:id="tab"></wicket:container>
- </li>
- </ul>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java
index 1d6e2bef2d..37ce421773 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java
@@ -7,47 +7,28 @@ import java.util.stream.Collectors;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-
@SuppressWarnings("serial")
public class Tabbable extends GenericPanel<List<? extends Tab>> {
private static final String OPTIONS_ID = "options";
- private final int maxTabsBeforeCollapse;
-
- public Tabbable(String id, IModel<List<? extends Tab>> tabsModel, int maxTabsBeforeCollapse) {
+ public Tabbable(String id, IModel<List<? extends Tab>> tabsModel) {
super(id, tabsModel);
- this.maxTabsBeforeCollapse = maxTabsBeforeCollapse;
}
- public Tabbable(String id, IModel<List<? extends Tab>> tabsModel) {
- this(id, tabsModel, Integer.MAX_VALUE);
- }
-
@SuppressWarnings({ "unchecked", "rawtypes" })
- public Tabbable(String id, List<? extends Tab> tabs, int maxTabsBeforeCollapse) {
- this(id, new Model((Serializable) tabs), maxTabsBeforeCollapse);
- }
-
public Tabbable(String id, List<? extends Tab> tabs) {
- this(id, tabs, Integer.MAX_VALUE);
+ this(id, new Model((Serializable) tabs));
}
@Override
@@ -104,45 +85,6 @@ public class Tabbable extends GenericPanel<List<? extends Tab>> {
});
- if (getTabs().size() > 1) {
- Fragment fragment = new Fragment("collapsed", "multiTabCollapsedFrag", this);
- fragment.add(new DropdownLink("link") {
-
- @Override
- protected void onInitialize(FloatingPanel dropdown) {
- super.onInitialize(dropdown);
- dropdown.add(AttributeAppender.append("class", "menu tabs"));
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new TabsFragment(id, dropdown);
- }
-
- @Override
- protected void onBeforeRender() {
- boolean found = false;
- for (Tab tab: getTabs()) {
- if (tab.isSelected()) {
- addOrReplace(new Label("label", tab.getTitle()));
- found = true;
- break;
- }
- }
- if (!found)
- addOrReplace(new Label("label", "Please select..."));
-
- super.onBeforeRender();
- }
-
- });
- add(fragment);
- } else {
- Fragment fragment = new Fragment("collapsed", "singleTabCollapsedFrag", this);
- fragment.add(new Label("label", getTabs().iterator().next().getTitle()));
- add(fragment);
- }
-
setOutputMarkupId(true);
}
@@ -162,59 +104,7 @@ public class Tabbable extends GenericPanel<List<? extends Tab>> {
if (!found)
addOrReplace(new WebMarkupContainer(OPTIONS_ID).setVisible(false));
- if (getTabs().size() > maxTabsBeforeCollapse)
- add(AttributeAppender.append("class", "collapsed"));
-
super.onBeforeRender();
}
- public class TabsFragment extends Fragment {
-
- private final FloatingPanel dropdown;
-
- public TabsFragment(String id, FloatingPanel dropdown) {
- super(id, "tabsFrag", Tabbable.this);
- this.dropdown = dropdown;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new ListView<Tab>("tabs", new LoadableDetachableModel<List<Tab>>() {
-
- @Override
- protected List<Tab> load() {
- return getTabs().stream().collect(Collectors.toList());
- }
-
- }) {
-
- @Override
- protected void populateItem(ListItem<Tab> item) {
- Tab tab = item.getModelObject();
- if (tab.isSelected())
- item.add(AttributeModifier.append("class", "active"));
-
- item.add(tab.render("tab"));
- }
-
- });
- }
-
- public Tabbable getTabbable() {
- return Tabbable.this;
- }
-
- public FloatingPanel getDropdown() {
- return dropdown;
- }
-
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new TabbableCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/TabbableCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/TabbableCssResourceReference.java
deleted file mode 100644
index ad7129ca0b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/TabbableCssResourceReference.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.onedev.server.web.component.tabbable;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-
-import io.onedev.server.web.component.menu.MenuCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class TabbableCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public TabbableCssResourceReference() {
- super(TabbableCssResourceReference.class, "tabbable.css");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(CssHeaderItem.forReference(new MenuCssResourceReference()));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/tabbable.css b/server-core/src/main/java/io/onedev/server/web/component/tabbable/tabbable.css
deleted file mode 100644
index 0fe33f8614..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/tabbable.css
+++ /dev/null
@@ -1,21 +0,0 @@
-li.collapsed {
- display: none;
-}
-@media(max-width: 767px) {
- ul.nav-tabs>li.collapsed {
- display: block;
- }
- ul.nav-tabs>li.expanded {
- display: none;
- }
-}
-ul.nav-tabs.collapsed>li.collapsed {
- display: block;
-}
-ul.nav-tabs.collapsed>li.expanded {
- display: none;
-}
-
-li.collapsed>a.multiple {
- cursor: pointer !important;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
index 57230fd361..c141122199 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
@@ -36,7 +36,7 @@ import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.schedule.SchedulableTask;
import io.onedev.server.util.schedule.TaskScheduler;
import io.onedev.server.web.component.modal.ModalPanel;
@@ -78,8 +78,8 @@ public abstract class TaskButton extends AjaxButton {
String result;
try {
result = String.format(
- "<div class='task-result alert alert-success'>%s</div>",
- HtmlEscape.escapeHtml5(runTask(new JobLogger() {
+ "<div class='task-result alert alert-light-success'>%s</div>",
+ HtmlEscape.escapeHtml5(runTask(new SimpleLogger() {
@Override
public void log(String message) {
@@ -99,7 +99,7 @@ public abstract class TaskButton extends AjaxButton {
else
result = "Error " + title;
result = String.format(
- "<div class='task-result alert alert-danger'>%s</div>",
+ "<div class='task-result alert alert-light-danger'>%s</div>",
HtmlEscape.escapeHtml5(result));
}
result = StringUtils.replace(result, "\n", "<br>");
@@ -166,7 +166,7 @@ public abstract class TaskButton extends AjaxButton {
submitTask(target);
}
- protected abstract String runTask(JobLogger logger);
+ protected abstract String runTask(SimpleLogger logger);
@Singleton
public static class TaskFutureManager implements SchedulableTask {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.html b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.html
index 32aa17f62b..7e26592189 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.html
@@ -2,13 +2,13 @@
<div class="task-feedback">
<div class="modal-header">
<h5 wicket:id="title" class="modal-title"></h5>
- <button wicket:id="closeIcon" type="button" class="close">&times;</button>
+ <button wicket:id="closeIcon" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<pre wicket:id="messages" class="messages"></pre>
<div wicket:id="result" class="result"></div>
</div>
- <div class="modal-footer">
+ <div class="modal-footer justify-content-center">
<button wicket:id="closeButton"></button>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.css b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.css
index 98c592d1db..096e302db2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.css
@@ -1,6 +1,3 @@
-.task-feedback .modal-footer {
- text-align: center;
-}
.task-feedback .messages {
background: white;
border: none;
@@ -8,6 +5,6 @@
max-height: 480px;
}
.task-feedback .alert {
- margin-top: 12px;
+ margin-top: 1rem;
margin-bottom: 0;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java b/server-core/src/main/java/io/onedev/server/web/component/user/UserAvatar.java
similarity index 78%
rename from server-core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java
rename to server-core/src/main/java/io/onedev/server/web/component/user/UserAvatar.java
index 5510789643..798e999593 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/UserAvatar.java
@@ -1,11 +1,9 @@
-package io.onedev.server.web.component.user.avatar;
+package io.onedev.server.web.component.user;
import javax.annotation.Nullable;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebComponent;
import org.eclipse.jgit.lib.PersonIdent;
@@ -18,9 +16,12 @@ public class UserAvatar extends WebComponent {
private String url;
+ private boolean system;
+
public UserAvatar(String id, @Nullable Long userId, String displayName) {
super(id);
url = getAvatarManager().getAvatarUrl(userId, displayName);
+ system = (userId != null && userId == -1);
}
public UserAvatar(String id, User user) {
@@ -40,15 +41,11 @@ public class UserAvatar extends WebComponent {
protected void onInitialize() {
super.onInitialize();
add(AttributeAppender.append("class", "avatar"));
+ if (system)
+ add(AttributeAppender.append("class", "system-avatar"));
setOutputMarkupId(true);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new UserAvatarResourceReference()));
- }
-
@Override
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenCssResourceReference.java
deleted file mode 100644
index 0eaf3a995e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.user.accesstoken;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class AccessTokenCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public AccessTokenCssResourceReference() {
- super(AccessTokenCssResourceReference.class, "access-token.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html
index 9b2c735f40..3f2e8e4a54 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html
@@ -3,11 +3,9 @@
<div class="input-group">
<input wicket:id="value" class="value form-control" readonly="readonly" type="password">
<span class="input-group-append">
- <a wicket:id="copy" class="btn btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
+ <a wicket:id="copy" class="btn btn-outline-secondary btn-icon"><wicket:svg href="copy" class="icon"></wicket:svg></a>
</span>
</div>
- <div class="actions">
- <a wicket:id="regenerate" class="btn btn-primary">Regenerate</a>
- </div>
+ <a wicket:id="regenerate" class="btn btn-primary mt-4">Regenerate</a>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java
index 5078806d4d..ad5f96d28a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java
@@ -2,8 +2,6 @@ package io.onedev.server.web.component.user.accesstoken;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Panel;
@@ -61,10 +59,4 @@ public abstract class AccessTokenPanel extends Panel {
}.add(new ConfirmClickModifier("This will invalidate current token and generate a new one, do you want to continue?")));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new AccessTokenCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/access-token.css b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/access-token.css
deleted file mode 100644
index 9ca555277c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/access-token.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.access-token>.actions {
- margin-top: 20px;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarResourceReference.java
deleted file mode 100644
index 6514467a85..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.user.avatar;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class UserAvatarResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public UserAvatarResourceReference() {
- super(UserAvatarResourceReference.class, "user-avatar.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/avatar/user-avatar.css b/server-core/src/main/java/io/onedev/server/web/component/user/avatar/user-avatar.css
deleted file mode 100644
index 0e34a79fff..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/user/avatar/user-avatar.css
+++ /dev/null
@@ -1,5 +0,0 @@
-img.avatar {
- border-radius: 1000px;
- height: 20px;
- width: 20px;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.html
index cc4b508f5b..00fa278cb7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.html
@@ -1,15 +1,15 @@
<wicket:panel>
<div class="avatar-edit">
- <div class="current">
- <div class="title">Current avatar</div>
+ <div class="current border-bottom pb-5 mb-5">
+ <h6 class="title mb-4">Current avatar</h6>
<img wicket:id="avatar"/>
- <a wicket:id="useDefault" class="btn btn-primary"><wicket:svg href="undo" class="icon"/> Use Default</a>
+ <a wicket:id="useDefault" class="btn btn-primary mt-4"><wicket:svg href="undo" class="icon mr-2"/> Use Default</a>
</div>
<div class="use-uploaded">
- <div class="title">Upload avatar</div>
+ <h6 class="title mb-4">Upload avatar</h6>
<form wicket:id="form">
<div wicket:id="avatar"></div>
- <button wicket:id="upload" type="submit" class="btn btn-primary"><wicket:svg href="upload" class="icon"/> Upload</button>
+ <button wicket:id="upload" type="submit" class="btn btn-primary mt-4"><wicket:svg href="upload" class="icon mr-2"/> Upload</button>
</form>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java
index 07ae140781..1e3c7dcb9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java
@@ -15,7 +15,7 @@ import io.onedev.server.model.User;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.component.avatarupload.AvatarFileSelected;
import io.onedev.server.web.component.avatarupload.AvatarUploadField;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.UserAvatar;
@SuppressWarnings("serial")
public class AvatarEditPanel extends GenericPanel<User> {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/avatar-edit.css b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/avatar-edit.css
index cc541493e7..c23a1c4b57 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/avatar-edit.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/avatar-edit.css
@@ -1,21 +1,5 @@
-.avatar-edit .title {
- margin-bottom: 20px;
- font-size: 18px;
- font-weight: bold;
-}
-.avatar-edit>.current {
- margin-bottom: 20px;
- padding-bottom: 20px;
- border-bottom: 1px solid #E8E8E8;
-}
.avatar-edit .current img {
height: 240px;
width: 240px;
display: block;
}
-.avatar-edit .current a {
- margin-top: 20px;
-}
-.avatar-edit form>button {
- margin-top: 20px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java
index bca83a1975..4fb351a70e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java
@@ -12,7 +12,7 @@ import org.unbescape.html.HtmlEscape;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.UserAvatar;
@SuppressWarnings("serial")
public class PersonCardPanel extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java
index d5e619e8e8..9a2901c350 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java
@@ -12,7 +12,7 @@ import org.unbescape.html.HtmlEscape;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.UserAvatar;
@SuppressWarnings("serial")
public class UserCardPanel extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceResourceReference.java
index cb47cafc5c..2ab40c299c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceResourceReference.java
@@ -1,11 +1,5 @@
package io.onedev.server.web.component.user.choice;
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.request.resource.CssResourceReference;
-
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class UserChoiceResourceReference extends BaseDependentResourceReference {
@@ -16,12 +10,4 @@ public class UserChoiceResourceReference extends BaseDependentResourceReference
super(UserChoiceResourceReference.class, "user-choice.js");
}
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(CssHeaderItem.forReference(
- new CssResourceReference(UserChoiceResourceReference.class, "user-choice.css")));
- return dependencies;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/user-choice.css b/server-core/src/main/java/io/onedev/server/web/component/user/choice/user-choice.css
deleted file mode 100644
index 653dbed885..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/user-choice.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.select2-results .user .avatar {
- height: 24px;
- width: 24px;
- margin-right: 6px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/user-choice.js b/server-core/src/main/java/io/onedev/server/web/component/user/choice/user-choice.js
index 9237857730..455d69f814 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/user-choice.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/user-choice.js
@@ -1,6 +1,6 @@
onedev.server.userChoiceFormatter = {
formatSelection: function(user) {
- return "<img class='avatar' src='" + user.avatar + "'/>" + user.name;
+ return "<img class='avatar' src='" + user.avatar + "'/><span class='name'>" + user.name + "</span>";
},
formatResult: function(user) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/ident/PersonIdentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/ident/PersonIdentPanel.java
index 4ac5d51675..af8260018f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/ident/PersonIdentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/ident/PersonIdentPanel.java
@@ -11,7 +11,7 @@ import org.eclipse.jgit.lib.PersonIdent;
import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;
import io.onedev.server.web.component.floating.AlignPlacement;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.UserAvatar;
import io.onedev.server.web.component.user.card.PersonCardPanel;
@SuppressWarnings("serial")
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java
index 3ee4ce89ed..7a6f986c94 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java
@@ -11,7 +11,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.model.User;
import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;
import io.onedev.server.web.component.floating.AlignPlacement;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.UserAvatar;
import io.onedev.server.web.component.user.card.UserCardPanel;
@SuppressWarnings("serial")
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.html
index 08f0b74d4e..b05dc72c41 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="simple-user-list">
<div wicket:id="users">
- <img wicket:id="avatar"></img>
+ <img wicket:id="avatar" class="mr-2"></img>
<span wicket:id="name"></span>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java
index e7b74560c1..f086827ba7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
import io.onedev.server.model.User;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.UserAvatar;
@SuppressWarnings("serial")
abstract class SimpleUserListPanel extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/list/simple-user-list.css b/server-core/src/main/java/io/onedev/server/web/component/user/list/simple-user-list.css
index eded4545e7..1dccf202bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/list/simple-user-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/list/simple-user-list.css
@@ -1,7 +1,7 @@
.floating>.content>.simple-user-list {
- padding: 12px 0;
- min-width: 120px;
+ padding: 1rem 0;
+ min-width: 10rem;
}
.floating>.content>.simple-user-list>div {
- padding: 8px 12px;
+ padding: 0.6rem 1rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html
index c3b8b906d5..13984f197b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html
@@ -1,10 +1,10 @@
<wicket:panel>
<form wicket:id="form" class="leave-confirm">
+ <div wicket:id="feedback" class="mb-4"></div>
<div wicket:id="editor"></div>
- <div wicket:id="feedback"></div>
- <div class="actions clearfix">
- <input class="btn btn-primary dirty-aware float-left" value="Save" type="submit">
- <a wicket:id="delete" class="btn btn-danger float-right">Delete</a>
+ <div class="d-flex mt-5">
+ <input class="btn btn-primary dirty-aware mr-1" value="Save" type="submit">
+ <a wicket:id="delete" class="btn btn-danger ml-auto">Delete</a>
</div>
</form>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.html
index 2ef7f7b1d5..bb896e3ac0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.html
@@ -2,7 +2,7 @@
<div class="insert-ssh-key">
<div class="modal-header">
<h5 class="modal-title">Add a SSH Key</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<form wicket:id="form">
<div class="modal-body">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.html b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.html
index d692bf37eb..5ab90ed836 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.html
@@ -1,19 +1,25 @@
<wicket:panel>
- <div class="watch-status">
- <a wicket:id="default">
- <wicket:svg href="tick" class="icon"/>
- <div class="title">Watch if involved (default)</div>
- <div class="description">Start to watch once I am involved</div>
+ <div class="watch-status py-3">
+ <a wicket:id="default" class="d-flex px-3 py-2 text-hover-gray-dark">
+ <wicket:svg href="tick" class="icon mr-2 mt-1"/>
+ <div>
+ <div class="font-weight-bold">Watch if involved (default)</div>
+ <div class="text-muted font-size-sm mt-1">Start to watch once I am involved</div>
+ </div>
</a>
- <a wicket:id="watch">
- <wicket:svg href="tick" class="icon"/>
- <div class="title">Watch</div>
- <div class="description">You will be notified of any activities</div>
+ <a wicket:id="watch" class="d-flex px-3 py-2 text-hover-gray-dark">
+ <wicket:svg href="tick" class="icon mr-2 mt-1"/>
+ <div>
+ <div class="font-weight-bold">Watch</div>
+ <div class="text-muted font-size-sm mt-1">You will be notified of any activities</div>
+ </div>
</a>
- <a wicket:id="doNotWatch">
- <wicket:svg href="tick" class="icon"/>
- <div class="title">Do not watch</div>
- <div class="description">Ignore activities irrelevant to me</div>
+ <a wicket:id="doNotWatch" class="d-flex px-3 py-2 text-hover-gray-dark">
+ <wicket:svg href="tick" class="icon mr-2 mt-1"/>
+ <div>
+ <div class="font-weight-bold">Do not watch</div>
+ <div class="text-muted font-size-sm mt-1">Ignore activities irrelevant to me</div>
+ </div>
</a>
</div>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css
index 0e950e36fe..a392a30054 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css
@@ -1,5 +1,5 @@
.watch-status:AFTER {
- margin-left: 4px;
+ margin-left: 0.5rem;
}
.watch-status.default:AFTER {
content: "Watch if involved";
@@ -19,36 +19,16 @@
display: inline-block;
}
-.floating .watch-status {
- padding: 16px 0;
-}
-.floating .watch-status a {
- display: block;
- color: #333;
- padding: 8px 8px 8px 28px;
- text-decoration: none;
- position: relative;
-}
.floating .watch-status a .icon {
- display: none;
- position: absolute;
width: 12px;
height: 12px;
- left: 8px;
- top: 18px;
-}
-.floating .watch-status a.active .icon {
display: inline-block;
+ visibility: hidden;
}
-.floating .watch-status a .title {
- font-weight: bold;
-}
-.floating .watch-status a .description {
- font-size: 13px;
- color: #666;
- margin-top: 4px;
+.floating .watch-status a.active .icon {
+ visibility: visible;
}
.floating .watch-status a:hover {
- background: #F5F5F5;
+ background: var(--light);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/wizard/Wizard.html b/server-core/src/main/java/io/onedev/server/web/component/wizard/Wizard.html
index caca06a0ae..8256951924 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/wizard/Wizard.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/wizard/Wizard.html
@@ -2,15 +2,15 @@
<form wicket:id="form" class="wizard">
<div class="head">
<div wicket:id="title" class="title"></div>
- <div wicket:id="description" class="help-block"></div>
+ <div wicket:id="description" class="form-text text-muted"></div>
</div>
<div class="body">
<div wicket:id="feedback"></div>
<div wicket:id="content"></div>
</div>
<div class="foot">
- <button wicket:id="previous" type="button" class="btn btn-secondary previous">Previous</button>
- <button wicket:id="skip" type="button" class="btn btn-secondary skip">Skip</button>
+ <button wicket:id="previous" type="button" class="btn btn-light-primary previous">Previous</button>
+ <button wicket:id="skip" type="button" class="btn btn-light-primary skip">Skip</button>
<button type="submit" wicket:id="next" class="btn btn-primary next">Next</button>
<button type="submit" wicket:id="finish" class="btn btn-primary finish">Finish</button>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/wizard/wizard.css b/server-core/src/main/java/io/onedev/server/web/component/wizard/wizard.css
index 1721d60a31..cc626c7ccf 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/wizard/wizard.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/wizard/wizard.css
@@ -1,12 +1,15 @@
.wizard>.head {
- margin-bottom: 20px;
+ margin-bottom: 1.5rem;
}
.wizard>.head>.title {
- font-size: 16px;
+ font-size: 1.25rem;
}
.wizard>.body {
- margin-bottom: 20px;
+ margin-bottom: 1.5rem;
}
.wizard>.foot>* {
- margin-right: 8px;
+ margin-right: 1rem;
+}
+.wizard>.foot>:last-child {
+ margin-right: 0;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.html
index df916d9420..ec80833765 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.html
@@ -1,38 +1,18 @@
<wicket:panel>
<div wicket:id="groups" class="group bean-properties">
- <a wicket:id="toggle" class="toggle"><span wicket:id="groupName"></span> <wicket:svg href="arrow-double" class="icon icon-sm"/></a>
- <wicket:container wicket:id="content"></wicket:container>
- </div>
-
- <wicket:fragment wicket:id="verticalPropertiesFrag">
+ <a wicket:id="toggle" class="toggle d-flex align-items-center"><span wicket:id="groupName" class="mr-3"></span> <wicket:svg href="arrow" class="icon ml-auto"/></a>
<div>
<div wicket:id="properties" class="form-group">
<wicket:enclosure child="name">
<label class="name control-label">
<span wicket:id="name"></span>
- <span wicket:id="required" class="required"></span>
+ <span wicket:id="required" class="text-danger"></span>
</label>
</wicket:enclosure>
<div wicket:id="value" class="value"></div>
<div wicket:id="feedback"></div>
- <div wicket:id="description" class="help-block"></div>
+ <div wicket:id="description" class="text-muted form-text"></div>
</div>
</div>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="horizontalPropertiesFrag">
- <table>
- <tr wicket:id="properties">
- <td wicket:id="name" class="name control-label">
- <span wicket:id="name"></span>
- <span wicket:id="required" class="required"></span>
- </td>
- <td wicket:id="value" class="value">
- <div wicket:id="value"></div>
- <div wicket:id="feedback"></div>
- <div wicket:id="description" class="help-block"></div>
- </td>
- </tr>
- </table>
- </wicket:fragment>
+ </div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
index 51941c4d65..05e1286fe6 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
@@ -22,7 +22,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -38,9 +37,7 @@ import io.onedev.server.util.EditContext;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.util.PathNode.Named;
-import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.OmitName;
-import io.onedev.server.web.editable.annotation.Vertical;
@SuppressWarnings("serial")
public class BeanEditor extends ValueEditor<Serializable> {
@@ -51,8 +48,6 @@ public class BeanEditor extends ValueEditor<Serializable> {
private final Map<String, List<PropertyContext<Serializable>>> propertyContexts = new LinkedHashMap<>();
- private final boolean vertical;
-
private RepeatingView groupsView;
private Map<String, ComponentContext> componentContexts = new HashMap<>();
@@ -66,14 +61,6 @@ public class BeanEditor extends ValueEditor<Serializable> {
propertyContexts.put(entry.getKey(),
entry.getValue().stream().map(it->PropertyContext.of(it)).collect(Collectors.toList()));
}
-
- Class<?> beanClass = descriptor.getBeanClass();
- if (beanClass.getAnnotation(Vertical.class) != null)
- vertical = true;
- else if (beanClass.getAnnotation(Horizontal.class) != null)
- vertical = false;
- else
- vertical = true;
}
private boolean hasTransitiveDependency(String dependentPropertyName, String dependencyPropertyName,
@@ -99,7 +86,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
event.stop();
PropertyUpdating propertyUpdating = (PropertyUpdating) event.getPayload();
for (Component groupContainer: groupsView) {
- RepeatingView propertiesView = (RepeatingView) groupContainer.get("content").get("properties");
+ RepeatingView propertiesView = (RepeatingView) groupContainer.get("properties");
for (Component propertyContainer: propertiesView) {
@SuppressWarnings("unchecked")
PropertyContext<Serializable> propertyContext =
@@ -144,27 +131,12 @@ public class BeanEditor extends ValueEditor<Serializable> {
setOutputMarkupPlaceholderTag(true);
- WebMarkupContainer nameContainer;
- WebMarkupContainer valueContainer;
- if (!vertical) {
- add(nameContainer = new WebMarkupContainer("name"));
- add(valueContainer = new WebMarkupContainer("value"));
- } else {
- nameContainer = this;
- valueContainer = this;
- }
Label nameLabel = new Label("name", property.getDescriptor().getDisplayName());
- nameContainer.add(nameLabel);
+ add(nameLabel);
OmitName omitName = property.getPropertyGetter().getAnnotation(OmitName.class);
- if (omitName != null && omitName.value() != OmitName.Place.VIEWER) {
- if (!vertical) {
- nameContainer.setVisible(false);
- valueContainer.add(AttributeAppender.replace("colspan", "2"));
- } else {
- nameLabel.setVisible(false);
- }
- }
+ if (omitName != null && omitName.value() != OmitName.Place.VIEWER)
+ nameLabel.setVisible(false);
String required;
if (property.isPropertyRequired()
@@ -175,7 +147,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
required = "&nbsp;";
}
- nameContainer.add(new Label("required", required).setEscapeModelStrings(false));
+ add(new Label("required", required).setEscapeModelStrings(false));
Serializable propertyValue;
@@ -188,14 +160,14 @@ public class BeanEditor extends ValueEditor<Serializable> {
ComponentContext.pop();
}
PropertyEditor<Serializable> propertyEditor = property.renderForEdit("value", Model.of(propertyValue));
- valueContainer.add(propertyEditor);
+ add(propertyEditor);
Label descriptionLabel = new Label("description", property.getDescriptor().getDescription());
descriptionLabel.setEscapeModelStrings(false);
descriptionLabel.setOutputMarkupPlaceholderTag(true);
- valueContainer.add(descriptionLabel);
+ add(descriptionLabel);
- valueContainer.add(new FencedFeedbackPanel("feedback", propertyEditor));
+ add(new FencedFeedbackPanel("feedback", propertyEditor));
}
@Override
@@ -267,16 +239,8 @@ public class BeanEditor extends ValueEditor<Serializable> {
toggleLink.add(new Label("groupName", entry.getKey()));
groupContainer.add(toggleLink);
- Fragment contentFrag;
- if (vertical) {
- contentFrag = new Fragment("content", "verticalPropertiesFrag", this);
- contentFrag.add(AttributeAppender.append("class", " vertical"));
- } else {
- contentFrag = new Fragment("content", "horizontalPropertiesFrag", this);
- contentFrag.add(AttributeAppender.append("class", " horizontal"));
- }
RepeatingView propertiesView = new RepeatingView("properties");
- contentFrag.add(propertiesView);
+ groupContainer.add(propertiesView);
for (PropertyContext<Serializable> property: entry.getValue()) {
PropertyContainer propertyContainer = newPropertyContainer(propertiesView.newChildId(), property);
@@ -284,8 +248,6 @@ public class BeanEditor extends ValueEditor<Serializable> {
componentContexts.put(property.getPropertyName(), new ComponentContext(propertyContainer));
}
- groupContainer.add(contentFrag);
-
if (entry.getKey().length() == 0) {
toggleLink.setVisible(false);
groupContainer.add(AttributeAppender.append("class", "expanded"));
@@ -311,11 +273,6 @@ public class BeanEditor extends ValueEditor<Serializable> {
add(AttributeAppender.append("class", "bean-editor editable"));
- if (vertical)
- add(AttributeAppender.append("class", "vertical"));
- else
- add(AttributeAppender.append("class", "horizontal"));
-
setOutputMarkupId(true);
}
@@ -373,7 +330,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
@Override
public ComponentContext getChildContext(String childName) {
for (Component groupContainer: groupsView) {
- RepeatingView propertiesView = (RepeatingView) groupContainer.get("content").get("properties");
+ RepeatingView propertiesView = (RepeatingView) groupContainer.get("properties");
for (Component item: propertiesView) {
@SuppressWarnings("unchecked")
PropertyContext<Serializable> propertyContext = (PropertyContext<Serializable>) item.getDefaultModelObject();
@@ -393,14 +350,6 @@ public class BeanEditor extends ValueEditor<Serializable> {
super(id, Model.of(property));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- String script = String.format("onedev.server.editable.onBeanEditorPropertyContainerDomReady('%s');", getMarkupId());
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.html
index dc248b5590..d30873ce3b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.html
@@ -1,11 +1,13 @@
<wicket:panel>
<div wicket:id="groups" class="group bean-properties">
- <a wicket:id="toggle" class="toggle"><span wicket:id="groupName"></span> <wicket:svg href="arrow-double" class="icon icon-sm"/></a>
- <table>
- <tr wicket:id="properties">
- <td wicket:id="name" class="name"><span wicket:id="content"></span></td>
- <td wicket:id="value" class="value"><div wicket:id="content"></div></td>
- </tr>
- </table>
+ <a wicket:id="toggle" class="toggle d-flex align-items-center">
+ <span wicket:id="groupName" class="mr-3"></span> <wicket:svg href="arrow" class="icon ml-auto"/>
+ </a>
+ <div>
+ <div wicket:id="properties" class="mb-4">
+ <div wicket:id="name" class="name font-weight-bold mb-2"><span wicket:id="content"></span></div>
+ <div wicket:id="value" class="value"><div wicket:id="content"></div></div>
+ </div>
+ </div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
index 624abe1b30..6b66b42fc2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.editable;
import java.io.Serializable;
+import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashSet;
@@ -109,15 +110,33 @@ public class PropertyDescriptor implements Serializable {
}
public boolean isPropertyRequired() {
+ Size size;
return getPropertyGetter().getReturnType().isPrimitive()
- || getPropertyGetter().getAnnotation(NotNull.class) != null
- || getPropertyGetter().getAnnotation(NotEmpty.class) != null
- || getPropertyGetter().getAnnotation(Size.class) != null && getPropertyGetter().getAnnotation(Size.class).min()>=1;
+ || findAnnotation(NotNull.class) != null
+ || findAnnotation(NotEmpty.class) != null
+ || (size = findAnnotation(Size.class)) != null && size.min()>=1;
+ }
+
+ @Nullable
+ private <T extends Annotation> T findAnnotation(Class<T> annotationClass) {
+ Class<?> current = beanClass;
+ while (current != null) {
+ Method method;
+ try {
+ method = current.getMethod(getPropertyGetter().getName());
+ T annotation = method.getAnnotation(annotationClass);
+ if (annotation != null)
+ return annotation;
+ } catch (NoSuchMethodException | SecurityException e) {
+ }
+ current = current.getSuperclass();
+ }
+ return null;
}
@Nullable
public String getNameOfEmptyValue() {
- NameOfEmptyValue annotation = getPropertyGetter().getAnnotation(NameOfEmptyValue.class);
+ NameOfEmptyValue annotation = findAnnotation(NameOfEmptyValue.class);
if (annotation != null)
return annotation.value();
else
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
index 7c10d2a293..d393b7fc56 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
@@ -60,7 +60,10 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {
@Override
protected String load() {
String classes = " property-editor editable ";
- if (!isValid())
+
+ // Do not call !isValid() here as otherwise all parent containers with invalid inputs
+ // will also be marked as is-invalid
+ if (hasErrorMessage())
classes += "is-invalid";
return classes;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/PropertyViewer.html
index cd1868fdae..d64b7f8c5c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyViewer.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyViewer.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <wicket:container wicket:id="content"></wicket:container>
+ <div wicket:id="content"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html
index 51e32a0f8a..325375f3ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html
@@ -1,10 +1,10 @@
<wicket:panel>
<wicket:enclosure child:id="enable">
- <div class="checkbox">
+ <span class="switch switch-sm switch-primary mb-3">
<label>
<input wicket:id="enable" type="checkbox" class="enable">
</label>
- </div>
+ </span>
</wicket:enclosure>
<div wicket:id="beanEditor"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
index d06f4ef73b..d6311f6c8c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
@@ -1,12 +1,12 @@
<wicket:panel>
- <div class="bean-list list">
- <table class="table table-condensed">
+ <div class="bean-list">
+ <table wicket:id="table">
<thead>
<th class="actions minimum"></th>
<th wicket:id="headers">
<span wicket:id="header"></span>
- <span wicket:id="required" class="required"></span>
- <span wicket:id="help"><wicket:svg href="question-circle" class="icon"/></span>
+ <span wicket:id="required" class="text-danger"></span>
+ <span wicket:id="help"><wicket:svg href="question-o" class="icon icon-sm"/></span>
</th>
<th class="actions"></th>
</thead>
@@ -19,17 +19,17 @@
<div wicket:id="propertyEditor"></div>
<div wicket:id="feedback"></div>
</td>
- <td class="actions">
- <a wicket:id="deleteElement" title="Delete this"><wicket:svg href="trash" class="icon delete"/></a>
+ <td class="actions minimum">
+ <a wicket:id="deleteElement" class="btn btn-icon btn-light btn-hover-danger" title="Delete this"><wicket:svg href="trash" class="icon delete"/></a>
</td>
</tr>
</tbody>
- <tfoot wicket:id="noElements">
+ <tfoot wicket:id="noRecords">
<tr>
- <td wicket:id="td" class="no-elements"><div>No elements defined</div></td>
+ <td wicket:id="td">Not defined</td>
</tr>
</tfoot>
</table>
- <div class="foot"><a wicket:id="addElement" title="Add new" class="add-element btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg></a></div>
+ <div class="foot mt-3"><a wicket:id="addElement" title="Add new" class="add-element btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
index 7241fcb8e6..473cfb41eb 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
@@ -13,6 +13,7 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -29,6 +30,7 @@ import io.onedev.server.util.PathNode;
import io.onedev.server.util.PathNode.Indexed;
import io.onedev.server.util.PathNode.Named;
import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.editable.BeanDescriptor;
@@ -48,7 +50,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
private RepeatingView rows;
- private WebMarkupContainer noElements;
+ private WebMarkupContainer noRecords;
public BeanListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
super(id, propertyDescriptor, model);
@@ -102,7 +104,19 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
if (list == null)
list = newList();
- add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {
+ WebMarkupContainer table = new WebMarkupContainer("table") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (rows.size() == 0)
+ NoRecordsBehavior.decorate(tag);
+ }
+
+ };
+ add(table);
+
+ table.add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {
@Override
protected void populateItem(ListItem<PropertyContext<Serializable>> item) {
@@ -130,7 +144,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
});
rows = new RepeatingView("elements");
- add(rows);
+ table.add(rows);
for (Serializable element: list)
addRow(element);
@@ -158,19 +172,23 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
target.prependJavaScript(script);
target.add(newRow);
- target.add(noElements);
+ target.add(noRecords);
+ if (rows.size() == 1) {
+ target.appendJavaScript(String.format("$('#%s>div>table').removeClass('%s');",
+ BeanListPropertyEditor.this.getMarkupId(), NoRecordsBehavior.CSS_CLASS));
+ }
onPropertyUpdating(target);
}
}.setDefaultFormProcessing(false));
- add(noElements = new WebMarkupContainer("noElements") {
+ table.add(noRecords = new WebMarkupContainer("noRecords") {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new WebMarkupContainer("td").add(AttributeAppender.append("colspan", propertyContexts.size()+2)));
+ add(new WebMarkupContainer("td").add(AttributeAppender.append("colspan", propertyContexts.size()+1)));
setOutputMarkupPlaceholderTag(true);
}
@@ -258,7 +276,13 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
markFormDirty(target);
target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));
rows.remove(row);
- target.add(noElements);
+ target.add(noRecords);
+
+ if (rows.size() == 0) {
+ target.appendJavaScript(String.format("$('#%s>div>table').addClass('%s');",
+ BeanListPropertyEditor.this.getMarkupId(), NoRecordsBehavior.CSS_CLASS));
+ }
+
onPropertyUpdating(target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html
index e229f09ea4..a2a2e39a05 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <table class="bean-list table table-condensed">
+ <table wicket:id="table" class="bean-list">
<thead>
<th wicket:id="headers">
<span wicket:id="header"></span>
@@ -12,12 +12,10 @@
</td>
</tr>
</tbody>
- <wicket:enclosure child="noElements">
- <tfoot>
+ <tfoot wicket:id="noRecords">
<tr>
- <td wicket:id="noElements" class="no-elements"><div>No elements defined</div></td>
+ <td wicket:id="td">Not defined</td>
</tr>
</tfoot>
- </wicket:enclosure>
</table>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
index 9b597c773e..e30ffc47a4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
@@ -8,6 +8,7 @@ import java.util.Set;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
@@ -15,6 +16,7 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.PropertyContext;
@@ -52,7 +54,19 @@ public class BeanListPropertyViewer extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {
+ WebMarkupContainer table = new WebMarkupContainer("table") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (elements.isEmpty())
+ NoRecordsBehavior.decorate(tag);
+ }
+
+ };
+ add(table);
+
+ table.add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {
@Override
protected void populateItem(ListItem<PropertyContext<Serializable>> item) {
@@ -62,7 +76,7 @@ public class BeanListPropertyViewer extends Panel {
}
});
- add(new ListView<Serializable>("rows", elements) {
+ table.add(new ListView<Serializable>("rows", elements) {
@Override
protected void populateItem(final ListItem<Serializable> rowItem) {
@@ -80,10 +94,10 @@ public class BeanListPropertyViewer extends Panel {
}
});
- WebMarkupContainer noElements = new WebMarkupContainer("noElements");
- noElements.setVisible(elements.isEmpty());
- noElements.add(AttributeModifier.append("colspan", propertyContexts.size()));
- add(noElements);
+ WebMarkupContainer noRecords = new WebMarkupContainer("noRecords");
+ noRecords.add(new WebMarkupContainer("td").add(AttributeModifier.append("colspan", propertyContexts.size())));
+ noRecords.setVisible(elements.isEmpty());
+ table.add(noRecords);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.html
index ab33a977f4..6196f7d1bc 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="checkbox">
+ <span class="switch switch-sm switch-primary">
<label>
<input wicket:id="input" type="checkbox">
</label>
- </div>
+ </span>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.html
index 3817227265..6bbd331b1a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="hidden">
+ <input wicket:id="input" type="hidden" class="form-control">
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html
index 7325d10171..7e7a9a79c2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html
@@ -1,5 +1,5 @@
<wicket:panel>
<div wicket:id="container" class="code-support">
- <textarea wicket:id="input" class="no-autosize deletion-aware"></textarea>
+ <textarea wicket:id="input" class="no-autosize deletion-aware resize-aware"></textarea>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
index 2d046841fe..31a94cc23f 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
@@ -9,7 +9,7 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.attributes.CallbackParameter;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.IModel;
@@ -139,7 +139,7 @@ public class CodePropertyEditor extends PropertyEditor<List<String>> {
input.getMarkupId(),
getCode().language(),
behavior.getCallbackFunction(matchWith, line, start, end));
- response.render(OnLoadHeaderItem.forScript(script));
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html
index 5a2709ac78..636992b06e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html
@@ -1,5 +1,5 @@
<wicket:panel>
<div class="code-support">
- <textarea wicket:id="input" class="no-autosize"></textarea>
+ <textarea wicket:id="input" class="no-autosize resize-aware"></textarea>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java
index b226fbdf85..cfbcd695d8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java
@@ -4,7 +4,7 @@ import java.util.List;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
@@ -44,7 +44,7 @@ public class CodePropertyViewer extends Panel {
String script = String.format("onedev.server.codeSupport.onViewerDomReady('%s', '%s');",
input.getMarkupId(), language);
- response.render(OnLoadHeaderItem.forScript(script));
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.css b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.css
index af7aa6ff0e..24eecf4a7b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.css
@@ -1,6 +1,6 @@
.code-support {
- border: 1px solid #E0E0E0;
- border-radius: 4px;
+ border: 1px solid var(--light-gray);
+ border-radius: 0.42rem;
padding: 1px;
}
.is-invalid .code-support {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js
index 0f2fa4b6bf..1e02e86428 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js
@@ -79,18 +79,20 @@ onedev.server.codeSupport = {
onedev.server.codemirror.setModeByName(cm, modeName);
onedev.server.codeSupport.trackWidth(inputId);
+ $("#" + inputId).trigger("resized");
},
trackWidth: function(inputId) {
- function setWidth() {
- var $cm = $("#" + inputId).next();
- if ($cm.length != 0) {
- var cm = $cm[0].CodeMirror;
- cm.setSize(1, null); // shrink temporarily in order to get original parent width
- cm.setSize($cm.parent().width(), null);
- cm.refresh();
- }
- }
- setWidth();
- $(window).resize(setWidth);
+ var $input = $("#" + inputId);
+ $input.on("resized", function() {
+ setTimeout(function() {
+ var $cm = $input.next();
+ if ($cm.length != 0) {
+ $cm.hide();
+ $cm[0].CodeMirror.setSize($cm.parent().width(), null);
+ $cm.show();
+ $cm[0].CodeMirror.refresh();
+ }
+ }, 0);
+ });
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
index 9951ab85bd..cff01dde28 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -1,110 +1,119 @@
-.editable>.bean-properties>table {
- width: 100%;
-}
.editable>.group {
- margin-bottom: 12px;
+ margin-bottom: 1rem;
}
.editable>.group:last-child {
margin-bottom: 0;
}
.editable>.group>a {
- display: block;
- text-decoration: none;
- color: #444;
- background: #F5F5F5;
- padding: 4px 8px;
- margin-bottom: 12px;
- border-radius: 4px;
- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+ color: var(--info);
+ background: var(--light-info);
+ padding: 1rem;
+ margin-bottom: 1rem;
+ border-radius: 0.42rem;
+}
+.editable>.group>a:hover, .editable>.group>a:focus {
+ color: white;
+ background: var(--info);
}
.editable>.group>a .icon {
transform: rotate(90deg);
- margin-left: 8px;
}
.editable>.group.expanded>a .icon {
transform: rotate(-90deg);
}
-.editable>.group>div, .editable>.group>table {
+.editable>.group>div {
+ margin-left: 2rem;
display: none;
}
+.editable>.group:first-child>div {
+ margin-left: 0;
+}
.editable>.group.expanded>div {
display: block;
}
-.editable>.group.expanded>table {
- display: table;
+
+.editable table {
+ margin-bottom: 0;
+ width: 100%;
+ border-collapse: separate;
+}
+.editable table.norecords tfoot td {
+ border: none;
+ border-radius: 0.42rem;
+ background-color: var(--light);
+ opacity: 0.5;
+ background-image: none;
+ height: auto;
}
-.editable>.bean-properties>table>tbody>tr>td {
- vertical-align: top;
- padding: 0 8px 16px 0;
+.editable table.norecords tfoot td>div {
+ display: block;
}
-.editable>.bean-properties>table>tbody>tr:last-child>td {
- padding-bottom: 0;
+.editable table th, .editable table td {
+ padding: 0.8rem 1rem;
}
-.editable td.value>div:last-child>div:last-child>table>tbody>tr:last-child>td.value,
-.editable td.value>div:last-child>div:last-child>div:last-child>div:last-child>table>tbody>tr:last-child>td.value {
- padding-bottom: 0;
- margin-bottom: 0;
+.editable table th {
+ font-size: 0.92rem;
+ font-weight: 500;
+ border-top: 1px dashed var(--secondary);
+ border-bottom: 1px dashed var(--secondary);
}
-.editable td.value>div>.checkbox, .editable td.value>div>.checkbox>label {
- margin: 0;
+.editable table th:first-child {
+ border-left: 1px dashed var(--secondary);
+ border-top-left-radius: 0.42rem;
}
-
-.editable>.bean-properties>table>tbody>tr>td.name {
- font-weight: bold;
- border-right: 1px solid #E0E0E0;
- text-align: right;
- white-space: nowrap;
- width: 20%;
- font-size: 12px;
- line-height: 20px;
+.editable table th:last-child {
+ border-right: 1px dashed var(--secondary);
+ border-top-right-radius: 0.42rem;
}
-.editable>.bean-properties>table>tbody>tr>td.value {
- padding-left: 8px;
+.editable table td {
+ border-bottom: 1px dashed var(--secondary);
}
-.editable table {
- margin-bottom: 0;
+.editable table td:first-child {
+ border-left: 1px dashed var(--secondary);
+}
+.editable table td:last-child {
+ border-right: 1px dashed var(--secondary);
+}
+.editable table tr:last-child td:first-child {
+ border-bottom-left-radius: 0.42rem;
+}
+.editable table tr:last-child td:last-child {
+ border-bottom-right-radius: 0.42rem;
}
-.property-editor>.bean-list>table>*>tr>.actions {
- font-size: 18px;
+.editable table>thead>tr>th.minimum, table>tbody>tr>td.minimum {
+ width: 1px;
+ white-space: nowrap;
+ padding-left: 0;
+ padding-right: 0;
+}
+.editable table>thead>tr>th.minimum:first-child, table>tbody>tr>td.minimum:first-child {
+ padding-left: 1rem;
+}
+.editable table>thead>tr>th.minimum:last-child, table>tbody>tr>td.minimum:last-child {
+ padding-right: 1rem;
}
-.editable>.polymorphic>.type-selector {
- margin-bottom: 15px;
+.editable .polymorphic>.type-selector {
+ margin-bottom: 1rem;
}
.bean-editor>input.enable {
- margin-bottom: 12px;
+ margin-bottom: 1rem;
}
.bean-editor .password-confirm {
- margin-top: 12px;
+ margin-top: 1rem;
}
-.property-editor>.bean-editor {
- border-top: 1px dotted #BBB;
- margin-top: 4px;
- padding-top: 12px;
- margin-bottom: 12px;
-}
-.bean-viewer .bean-properties>table>tbody>tr.name-omitted>td {
- padding-left: 0;
-}
.bean-viewer .type-selector {
font-style: italic;
}
.editable ul.feedbackPanel {
- margin: 10px 0;
+ margin: 0.8rem 0;
}
-.bean-editor .bean-list>table>tbody>tr>td {
- border-top: none;
-}
+
.bean-editor .select2-container {
width: 100%;
}
-
-.form-group>.editable>.list>.head {
- margin-top: 8px;
-}
-
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.js b/server-core/src/main/java/io/onedev/server/web/editable/editable.js
index b9798673fe..489f8bf069 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.js
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.js
@@ -3,7 +3,10 @@ onedev.server.editable = {
var $container = $("#" + containerId);
var $groups = $container.children(".group");
$groups.children("a").click(function() {
- $(this).parent().toggleClass("expanded");
+ var $parent = $(this).parent();
+ $parent.toggleClass("expanded");
+ // Fix the issue that placeholder is not displayed after showing the group
+ $parent.find(".select2-container-multi+input").data("select2").clearSearch();
});
$groups.each(function() {
var $group = $(this);
@@ -16,7 +19,7 @@ onedev.server.editable = {
var $container = $("#" + containerId);
var $groups = $container.children(".group");
$groups.children("a").click(function() {
- $(this).parent().toggleClass("expanded");
+ $(this).parent().toggleClass("expanded");
$(window).resize();
});
$groups.each(function() {
@@ -25,15 +28,6 @@ onedev.server.editable = {
onedev.server.editable.checkGroup($group);
});
},
- onBeanEditorPropertyContainerDomReady: function(containerId) {
- var $container = $("#" + containerId);
- $container.find("div.value>.checkbox").each(function() {
- var $checkbox = $(this);
- var $label = $checkbox.parent().prev("label.name");
- $checkbox.children("label").append($label.children("span").text());
- $label.remove();
- });
- },
checkGroup: function($group) {
var hasVisibleProperties = false;
if ($group.children("table").length != 0) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.html
index b6d89295f2..4c0bce6fc4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.html
@@ -3,12 +3,12 @@
<div wicket:id="fields" class="issue-field form-group">
<label class="name control-label">
<span wicket:id="name"></span>
- <span wicket:id="required" class="required">*</span>
+ <span wicket:id="required" class="text-danger">*</span>
</label>
- <select wicket:id="valueProvider" class="form-control value-provider"></select>
+ <select wicket:id="valueProvider" class="form-control custom-select value-provider"></select>
<div wicket:id="value" class="value"></div>
<div wicket:id="feedback" class="feedback"></div>
- <p wicket:id="description" class="help-block"></p>
+ <p wicket:id="description" class="form-text text-muted"></p>
</div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyCssResourceReference.java
deleted file mode 100644
index 57658a0850..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.editable.job.jobdependency;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class JobDependencyCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public JobDependencyCssResourceReference() {
- super(JobDependencyCssResourceReference.class, "job-dependency.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.html
index da9b46b6c7..fb0671f769 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="job-dependency-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Job Dependency</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html
index bb29289fbb..a6843b9a30 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
- <div class="job-dependency-list list">
- <table wicket:id="dependencies" class="table table-condensed table-hover"></table>
- <div class="foot">
- <a wicket:id="addNew" title="Add new" class="btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div class="job-dependency-list">
+ <table wicket:id="dependencies"></table>
+ <div class="foot mt-3">
+ <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java
index 9b91eb8d53..e832a5afb6 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java
@@ -16,8 +16,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
@@ -32,6 +30,7 @@ import io.onedev.server.buildspec.BuildSpecAware;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.buildspec.job.JobDependency;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -214,7 +213,7 @@ class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public String getCssClass() {
- return "actions";
+ return "actions minimum";
}
});
@@ -231,8 +230,8 @@ class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<JobDependency, Void> dataTable;
add(dataTable = new DataTable<JobDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
-
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
@Override
@@ -271,10 +270,4 @@ class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {
return value;
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new JobDependencyCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.html
index ba822dd3c0..ca6b17286a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="def-list job-dependency-list">
+ <div class="job-dependency-list">
<div class="body">
- <table wicket:id="dependencies" class="table table-condensed table-hover"></table>
+ <table wicket:id="dependencies"></table>
</div>
</div>
<wicket:fragment wicket:id="columnFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java
index d603ee0647..1c31d48631 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java
@@ -15,8 +15,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
@@ -27,10 +25,11 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import io.onedev.server.buildspec.job.JobDependency;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.page.layout.SideFloating.Placement;
import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
@@ -126,7 +125,7 @@ class JobDependencyListViewPanel extends Panel {
@Override
public String getCssClass() {
- return "ellipsis";
+ return "ellipsis text-right";
}
});
@@ -145,8 +144,9 @@ class JobDependencyListViewPanel extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
+ add(new NoRecordsBehavior());
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
}
});
@@ -170,17 +170,17 @@ class JobDependencyListViewPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, Placement.RIGHT) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
@Override
- protected String getTitle() {
- return "Job Dependency";
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Job Dependency");
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "job-dependency def-detail"));
+ add(AttributeAppender.append("class", "job-dependency"));
}
@Override
@@ -197,10 +197,4 @@ class JobDependencyListViewPanel extends Panel {
}
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new JobDependencyCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/job-dependency.css b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/job-dependency.css
deleted file mode 100644
index 55b15516f2..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/job-dependency.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.floating.job-dependency td.name {
- width: 160px !important;
- word-break: break-all !important;
- white-space: normal !important;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html
index f8f24a66d5..616ae39646 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="param-spec-edit input-spec-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Job Parameter</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html
index e7b815d2bd..21cb85e1db 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
- <div class="param-spec-list list">
- <table wicket:id="paramSpecs" class="table table-condensed table-hover"></table>
- <div class="foot">
- <a wicket:id="addNew" title="Add new" class="btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div class="param-spec-list">
+ <table wicket:id="paramSpecs"></table>
+ <div class="foot mt-3">
+ <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-light btn-hover-primary btn-icon btn-xs mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-light btn-hover-danger btn-icon btn-xs" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
index b8eb7a71fd..e20b3ecc01 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
@@ -29,6 +29,7 @@ import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.buildspec.job.paramspec.ParamSpec;
import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -165,7 +166,7 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public String getCssClass() {
- return "actions";
+ return "actions text-right";
}
});
@@ -182,7 +183,8 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<ParamSpec, Void> dataTable;
add(dataTable = new DataTable<ParamSpec, Void>("paramSpecs", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.html
index 095c7b0ab3..b9659f6a70 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="def-list param-spec-list">
+ <div class="param-spec-list">
<div class="body">
- <table wicket:id="paramSpecs" class="table table-condensed table-hover"></table>
+ <table wicket:id="paramSpecs"></table>
</div>
</div>
<wicket:fragment wicket:id="columnFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java
index eb5a13bc56..c82010af61 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java
@@ -31,10 +31,12 @@ import com.google.common.collect.Sets;
import io.onedev.server.buildspec.job.paramspec.ParamSpec;
import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
-import io.onedev.server.web.page.layout.SideFloating;
@SuppressWarnings("serial")
class ParamSpecListViewPanel extends Panel {
@@ -111,7 +113,7 @@ class ParamSpecListViewPanel extends Panel {
@Override
public String getCssClass() {
- return "ellipsis";
+ return "text-right ellipsis";
}
});
@@ -131,7 +133,8 @@ class ParamSpecListViewPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ add(new NoRecordsBehavior());
}
});
@@ -162,18 +165,18 @@ class ParamSpecListViewPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
@Override
- protected String getTitle() {
+ protected Component newTitle(String componentId) {
ParamSpec param = paramSpecs.get(index);
- return "Parameter Spec (type: " + EditableUtils.getDisplayName(param.getClass()) + ")";
+ return new Label(componentId, "Parameter Spec (type: " + EditableUtils.getDisplayName(param.getClass()) + ")");
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "param-spec input-spec def-detail"));
+ add(AttributeAppender.append("class", "param-spec input-spec"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListCssResourceReference.java
deleted file mode 100644
index f0737203d9..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.editable.job.paramsupply;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class ParamListCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ParamListCssResourceReference() {
- super(ParamListCssResourceReference.class, "param-list.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.html
index 3b35db6e2d..90ce2071e3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.html
@@ -1,25 +1,25 @@
<wicket:panel>
<div class="job-params-edit">
<div wicket:id="params" class="job-param form-group">
- <label class="name control-label">
+ <label class="name control-label font-weight-bolder">
<span wicket:id="name"></span>
- <span wicket:id="required" class="required">*</span>
+ <span wicket:id="required" class="text-danger">*</span>
</label>
- <select wicket:id="valuesProvider" class="form-control values-provider"></select>
+ <select wicket:id="valuesProvider" class="form-control values-provider custom-select mb-3"></select>
<div wicket:id="values" class="values"></div>
<div wicket:id="feedback" class="feedback"></div>
- <p wicket:id="description" class="help-block"></p>
+ <p wicket:id="description" class="form-text text-muted"></p>
</div>
</div>
<wicket:fragment wicket:id="specifiedValuesFrag">
<div wicket:id="values" class="specified-value">
- <div wicket:id="value"></div>
- <a wicket:id="delete" title="Delete this value"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- <div wicket:id="feedback" class="feedback"></div>
+ <div class="d-flex align-items-center mb-3">
+ <div wicket:id="value" class="flex-grow-1 mr-3"></div>
+ <a wicket:id="delete" class="flex-shrink-0 btn btn-icon btn-light btn-hover-danger" title="Delete this value"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </div>
+ <div wicket:id="feedback" class="feedback mb-3"></div>
</div>
- <a wicket:id="add" class="btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg> Add Value</a>
- <a class="help" title="Add additional values to run matrix build. The job will run for each possible combination of different values across all parameters">
- <wicket:svg href="question-circle" class="icon"/>
- </a>
+ <a wicket:id="add" class="btn btn-light btn-hover-primary btn-block mb-1" title="Add value"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div class="text-muted font-size-sm">Add additional values to run matrix build. The job will run for each possible combination of different values across all parameters</div>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java
index 5338ea6205..06a3203851 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java
@@ -15,7 +15,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -43,10 +42,10 @@ import io.onedev.server.buildspec.job.paramsupply.ValuesProvider;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.editable.BeanDescriptor;
+import io.onedev.server.web.editable.JobSecretEditBean;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.editable.JobSecretEditBean;
import io.onedev.server.web.editable.annotation.ParamSpecProvider;
import io.onedev.server.web.editable.annotation.Password;
@@ -379,7 +378,6 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ParamListCssResourceReference()));
validate();
if (!getModelObject().equals(getConvertedInput())) {
String script = String.format("onedev.server.form.markDirty($('#%s').closest('form'));", getMarkupId());
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.html
index a029837188..788ac236bf 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.html
@@ -1,13 +1,13 @@
<wicket:panel>
- <table class="job-params-view">
- <tr wicket:id="params" class="job-param">
- <td wicket:id="name" class="name"></td>
- <td class="value">
+ <div class="job-params-view">
+ <div wicket:id="params" class="job-param mb-4">
+ <div wicket:id="name" class="name font-weight-bolder mb-2"></div>
+ <div class="value">
<div wicket:id="valuesProvider" class="values-provider"></div>
<div wicket:id="values" class="values"></div>
- </td>
- </tr>
- </table>
+ </div>
+ </div>
+ </div>
<wicket:fragment wicket:id="specifiedValuesFrag">
<ul class="specified-values">
<li wicket:id="values" class="specified-value">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java
index 9724924358..4a0834d602 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java
@@ -4,8 +4,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -74,10 +72,4 @@ class ParamListViewPanel extends Panel {
add(paramsView);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ParamListCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/param-list.css b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/param-list.css
deleted file mode 100644
index fa7617ae77..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/param-list.css
+++ /dev/null
@@ -1,59 +0,0 @@
-.job-params-edit>.job-param>* {
- margin-bottom: 12px;
-}
-.job-params-edit>.job-param>.name {
- font-weight: bold;
-}
-.job-params-edit>.job-param .specified-value {
- position: relative;
- margin-bottom: 12px;
- background: #F0F0F0;
- border-radius: 4px;
- padding: 8px 36px 8px 8px;
-}
-.job-params-edit>.job-param .specified-value>a {
- position: absolute;
- right: 8px;
- top: 8px;
- color: #666;
-}
-.job-params-edit>.job-param .specified-value>a>i {
- font-size: 20px;
-}
-.job-params-edit>.job-param .specified-value.is-invalid {
- background: #FEDADA;
- color: #DD4B4B;
-}
-.job-params-edit>.job-param>.values>.help {
- color: #444;
- font-size: 18px;
- margin-left: 8px;
- vertical-align: middle;
-}
-.job-params-edit>.job-param .help-block {
- margin-bottom: 0;
-}
-.job-params-view>tbody>tr>td {
- padding: 0 8px 16px 0;
- vertical-align: top;
-}
-.job-params-view>tbody>tr>td.name {
- font-weight: bold;
- text-align: right;
- width: 20%;
- font-size: 12px;
- line-height: 20px;
- white-space: nowrap;
- border-right: 1px solid #E0E0E0;
-}
-.job-params-view>tbody>tr>td.value {
- padding-left: 8px;
-}
-.job-params-view .values-provider {
- font-style: italic;
- margin-bottom: 8px;
-}
-.job-params-view .specified-values {
- padding-left: 30px;
-}
-
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionCssResourceReference.java
deleted file mode 100644
index ae176315a3..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.editable.job.postbuildaction;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class ActionCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ActionCssResourceReference() {
- super(ActionCssResourceReference.class, "action.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.html
deleted file mode 100644
index 0cbde66922..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<wicket:panel>
- <div class="action-list list">
- <table wicket:id="actions" class="table table-condensed table-hover"></table>
- <div class="foot">
- <a wicket:id="addNew" title="Add new" class="btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg></a>
- </div>
- </div>
- <wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- </wicket:fragment>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionBean.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.java
rename to server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionBean.java
index 3cdf729c26..a9f17d4d52 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionBean.java
@@ -8,7 +8,7 @@ import io.onedev.server.buildspec.job.action.PostBuildAction;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
-public class ActionBean implements Serializable {
+public class PostBuildActionBean implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.html
similarity index 77%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.html
index decb16198b..42eb6c2fc5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="post-build-action-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Post Build Action</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.java
index 6606fe6437..fb1d7b89a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.java
@@ -18,13 +18,13 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
@SuppressWarnings("serial")
-abstract class ActionEditPanel extends Panel implements BuildSpecAware, JobAware {
+abstract class PostBuildActionEditPanel extends Panel implements BuildSpecAware, JobAware {
private final List<PostBuildAction> actions;
private final int actionIndex;
- public ActionEditPanel(String id, List<PostBuildAction> actions, int actionIndex) {
+ public PostBuildActionEditPanel(String id, List<PostBuildAction> actions, int actionIndex) {
super(id);
this.actions = actions;
@@ -35,7 +35,7 @@ abstract class ActionEditPanel extends Panel implements BuildSpecAware, JobAware
protected void onInitialize() {
super.onInitialize();
- ActionBean bean = new ActionBean();
+ PostBuildActionBean bean = new PostBuildActionBean();
if (actionIndex != -1)
bean.setAction(actions.get(actionIndex));
@@ -54,7 +54,7 @@ abstract class ActionEditPanel extends Panel implements BuildSpecAware, JobAware
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ActionEditPanel.this));
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(PostBuildActionEditPanel.this));
}
@Override
@@ -91,7 +91,7 @@ abstract class ActionEditPanel extends Panel implements BuildSpecAware, JobAware
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ActionEditPanel.this));
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(PostBuildActionEditPanel.this));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.html
new file mode 100644
index 0000000000..e1bbf51c8a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="post-build-action-list">
+ <table wicket:id="actions"></table>
+ <div class="foot mt-3">
+ <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.java
similarity index 83%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.java
index c84d0056eb..ed4c29ccdb 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.java
@@ -16,8 +16,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
@@ -32,6 +30,7 @@ import io.onedev.server.buildspec.BuildSpecAware;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.buildspec.job.action.PostBuildAction;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -42,11 +41,11 @@ import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyUpdating;
@SuppressWarnings("serial")
-class ActionListEditPanel extends PropertyEditor<List<Serializable>> {
+class PostBuildActionListEditPanel extends PropertyEditor<List<Serializable>> {
private final List<PostBuildAction> actions;
- public ActionListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
+ public PostBuildActionListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
super(id, propertyDescriptor, model);
actions = new ArrayList<>();
@@ -70,7 +69,7 @@ class ActionListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new ActionEditPanel(id, actions, -1) {
+ return new PostBuildActionEditPanel(id, actions, -1) {
@Override
protected void onCancel(AjaxRequestTarget target) {
@@ -82,17 +81,17 @@ class ActionListEditPanel extends PropertyEditor<List<Serializable>> {
markFormDirty(target);
modal.close();
onPropertyUpdating(target);
- target.add(ActionListEditPanel.this);
+ target.add(PostBuildActionListEditPanel.this);
}
@Override
public Job getJob() {
- return ActionListEditPanel.this.getJob();
+ return PostBuildActionListEditPanel.this.getJob();
}
@Override
public BuildSpec getBuildSpec() {
- return ActionListEditPanel.this.getBuildSpec();
+ return PostBuildActionListEditPanel.this.getBuildSpec();
}
};
@@ -145,12 +144,12 @@ class ActionListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void populateItem(Item<ICellPopulator<PostBuildAction>> cellItem, String componentId, IModel<PostBuildAction> rowModel) {
- Fragment fragment = new Fragment(componentId, "actionColumnFrag", ActionListEditPanel.this);
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", PostBuildActionListEditPanel.this);
fragment.add(new ModalLink("edit") {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new ActionEditPanel(id, actions, cellItem.findParent(Item.class).getIndex()) {
+ return new PostBuildActionEditPanel(id, actions, cellItem.findParent(Item.class).getIndex()) {
@Override
protected void onCancel(AjaxRequestTarget target) {
@@ -162,17 +161,17 @@ class ActionListEditPanel extends PropertyEditor<List<Serializable>> {
markFormDirty(target);
modal.close();
onPropertyUpdating(target);
- target.add(ActionListEditPanel.this);
+ target.add(PostBuildActionListEditPanel.this);
}
@Override
public Job getJob() {
- return ActionListEditPanel.this.getJob();
+ return PostBuildActionListEditPanel.this.getJob();
}
@Override
public BuildSpec getBuildSpec() {
- return ActionListEditPanel.this.getBuildSpec();
+ return PostBuildActionListEditPanel.this.getBuildSpec();
}
};
@@ -186,7 +185,7 @@ class ActionListEditPanel extends PropertyEditor<List<Serializable>> {
markFormDirty(target);
actions.remove(rowModel.getObject());
onPropertyUpdating(target);
- target.add(ActionListEditPanel.this);
+ target.add(PostBuildActionListEditPanel.this);
}
});
@@ -195,7 +194,7 @@ class ActionListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public String getCssClass() {
- return "actions";
+ return "actions minimum";
}
});
@@ -212,7 +211,8 @@ class ActionListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<PostBuildAction, Void> dataTable;
add(dataTable = new DataTable<PostBuildAction, Void>("actions", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
@@ -228,7 +228,7 @@ class ActionListEditPanel extends PropertyEditor<List<Serializable>> {
Collections.swap(actions, fromIndex-i, fromIndex-i-1);
}
onPropertyUpdating(target);
- target.add(ActionListEditPanel.this);
+ target.add(PostBuildActionListEditPanel.this);
}
}.sortable("tbody"));
@@ -260,10 +260,4 @@ class ActionListEditPanel extends PropertyEditor<List<Serializable>> {
return value;
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ActionCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditSupport.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditSupport.java
index 503c391dbf..1410846eba 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditSupport.java
@@ -16,7 +16,7 @@ import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
-public class ActionListEditSupport implements EditSupport {
+public class PostBuildActionListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
@@ -32,7 +32,7 @@ public class ActionListEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null) {
- return new ActionListViewPanel(id, model.getObject());
+ return new PostBuildActionListViewPanel(id, model.getObject());
} else {
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
}
@@ -43,7 +43,7 @@ public class ActionListEditSupport implements EditSupport {
@Override
public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {
- return new ActionListEditPanel(componentId, descriptor, model);
+ return new PostBuildActionListEditPanel(componentId, descriptor, model);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.html
similarity index 54%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.html
index 07d567c474..6c6eb2df26 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="def-list action-list">
+ <div class="post-build-action-list">
<div class="body">
- <table wicket:id="actions" class="table table-condensed table-hover"></table>
+ <table wicket:id="actions"></table>
</div>
</div>
<wicket:fragment wicket:id="columnFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.java
similarity index 81%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.java
index dc30c1739e..62178ab52e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.java
@@ -15,8 +15,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
@@ -27,17 +25,19 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import io.onedev.server.buildspec.job.action.PostBuildAction;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
-import io.onedev.server.web.page.layout.SideFloating;
@SuppressWarnings("serial")
-class ActionListViewPanel extends Panel {
+class PostBuildActionListViewPanel extends Panel {
private final List<PostBuildAction> actions = new ArrayList<>();
- public ActionListViewPanel(String id, List<Serializable> elements) {
+ public PostBuildActionListViewPanel(String id, List<Serializable> elements) {
super(id);
for (Serializable each: elements)
@@ -105,7 +105,7 @@ class ActionListViewPanel extends Panel {
@Override
public String getCssClass() {
- return "ellipsis";
+ return "ellipsis text-right";
}
});
@@ -125,24 +125,19 @@ class ActionListViewPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ add(new NoRecordsBehavior());
}
});
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ActionCssResourceReference()));
- }
-
private abstract class ColumnFragment extends Fragment {
private final int index;
public ColumnFragment(String id, int index) {
- super(id, "columnFrag", ActionListViewPanel.this);
+ super(id, "columnFrag", PostBuildActionListViewPanel.this);
this.index = index;
}
@@ -155,17 +150,17 @@ class ActionListViewPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
@Override
- protected String getTitle() {
- return "Popst Build Action (type: " + EditableUtils.getDisplayName(actions.get(index).getClass()) + ")";
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Popst Build Action (type: " + EditableUtils.getDisplayName(actions.get(index).getClass()) + ")");
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "post-build-action def-detail"));
+ add(AttributeAppender.append("class", "post-build-action"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/action.css b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/action.css
deleted file mode 100644
index 8f1b5325ca..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/action.css
+++ /dev/null
@@ -1,53 +0,0 @@
-.floating.job-post-build-action td.name {
- width: 160px !important;
- word-break: break-all !important;
- white-space: normal !important;
-}
-.post-build-action-edit .group-issue-detail>.toggle {
- cursor: default;
- font-weight: bold;
- color: inherit;
- font-family: inherit;
- background: none;
- border-bottom: 1px solid #D8D8D8;
- padding: 4px 8px;
- border-radius: 0;
- font-size: 16px;
- background: #F5F5F5;
-}
-.post-build-action-edit .group-issue-detail>div {
- padding: 0 8px;
-}
-.post-build-action-edit .group-issue-detail>.toggle:after {
- display: none;
-}
-.post-build-action-edit .group-issue-detail>div {
- display: block;
-}
-
-.post-build-action.def-detail .group-issue-detail>table {
- display: table;
-}
-.post-build-action.def-detail .group-issue-detail>.toggle {
- cursor: default;
- font-weight: bold;
-}
-.post-build-action.def-detail .group-issue-detail>.toggle:after {
- display: none;
-}
-.post-build-action.def-detail .group-issue-detail td.name {
- width: 100px;
-}
-.post-build-action.def-detail .group-issue-detail .issue-fields-view td {
- padding: 0 8px 16px 0;
-}
-.post-build-action.def-detail .group-issue-detail .issue-fields-view td.name {
- font-weight: bold;
- text-align: right;
- font-size: 12px;
- line-height: 20px;
- border-right: 1px solid #E0E0E0;
-}
-.post-build-action.def-detail .group-issue-detail .issue-fields-view td.value {
- padding-left: 8px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.html
index 04584e9f00..c4226ccd84 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="job-privilege-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Job Privilege</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.html
index 84f3fa10e3..03a8eac54d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
- <div class="job-privilege-list list">
- <table wicket:id="privileges" class="table table-condensed table-hover"></table>
- <div class="foot">
- <a wicket:id="addNew" title="Add new" class="btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div class="job-privilege-list">
+ <table wicket:id="privileges"></table>
+ <div class="foot mt-3">
+ <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.java
index f3b276b537..d940440436 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.java
@@ -26,6 +26,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.model.support.role.JobPrivilege;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -171,7 +172,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public String getCssClass() {
- return "actions";
+ return "actions minimum";
}
});
@@ -188,7 +189,8 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<JobPrivilege, Void> dataTable;
add(dataTable = new DataTable<JobPrivilege, Void>("privileges", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.html
index 299009ea51..e401f803d8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="def-list job-privilege-list">
+ <div class="job-privilege-list">
<div class="body">
- <table wicket:id="privileges" class="table table-condensed table-hover"></table>
+ <table wicket:id="privileges"></table>
</div>
</div>
<wicket:fragment wicket:id="columnFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.java
index 7dd2c108ae..e757f39c2c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.java
@@ -25,10 +25,11 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import io.onedev.server.model.support.role.JobPrivilege;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel.Placement;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.page.layout.SideFloating.Placement;
@SuppressWarnings("serial")
class JobPrivilegeListViewPanel extends Panel {
@@ -88,7 +89,7 @@ class JobPrivilegeListViewPanel extends Panel {
@Override
public String getCssClass() {
- return "ellipsis";
+ return "ellipsis text-right";
}
});
@@ -108,7 +109,8 @@ class JobPrivilegeListViewPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ add(new NoRecordsBehavior());
}
});
@@ -132,17 +134,17 @@ class JobPrivilegeListViewPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, Placement.RIGHT) {
+ new OffCanvasCardPanel(target, Placement.RIGHT, null) {
@Override
- protected String getTitle() {
- return "Job Privilege";
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Job Privilege");
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "job-privilege def-detail"));
+ add(AttributeAppender.append("class", "job-privilege"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.html
index abae53bca7..aa2ad70dd4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="job-dependency-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Project Dependency</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html
index bb29289fbb..5b6c7683f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
- <div class="job-dependency-list list">
- <table wicket:id="dependencies" class="table table-condensed table-hover"></table>
- <div class="foot">
- <a wicket:id="addNew" title="Add new" class="btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div class="job-dependency-list">
+ <table wicket:id="dependencies"></table>
+ <div class="foot mt-3">
+ <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java
index 6553bce0a2..b23d22ee9e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java
@@ -30,6 +30,7 @@ import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.buildspec.job.ProjectDependency;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -177,7 +178,7 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>
@Override
public String getCssClass() {
- return "actions";
+ return "actions minimum";
}
});
@@ -194,7 +195,8 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>
DataTable<ProjectDependency, Void> dataTable;
add(dataTable = new DataTable<ProjectDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.html
index ba822dd3c0..ca6b17286a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="def-list job-dependency-list">
+ <div class="job-dependency-list">
<div class="body">
- <table wicket:id="dependencies" class="table table-condensed table-hover"></table>
+ <table wicket:id="dependencies"></table>
</div>
</div>
<wicket:fragment wicket:id="columnFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java
index 640c4a4aa8..aa331bd5f8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java
@@ -27,10 +27,11 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import io.onedev.server.buildspec.job.ProjectDependency;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel.Placement;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.page.layout.SideFloating.Placement;
@SuppressWarnings("serial")
class ProjectDependencyListViewPanel extends Panel {
@@ -106,7 +107,7 @@ class ProjectDependencyListViewPanel extends Panel {
@Override
public String getCssClass() {
- return "ellipsis";
+ return "ellipsis text-right";
}
});
@@ -126,7 +127,8 @@ class ProjectDependencyListViewPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ add(new NoRecordsBehavior());
}
});
@@ -150,17 +152,17 @@ class ProjectDependencyListViewPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, Placement.RIGHT) {
+ new OffCanvasCardPanel(target, Placement.RIGHT, null) {
@Override
- protected String getTitle() {
- return "Project Dependency";
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Project Dependency");
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "project-dependency def-detail"));
+ add(AttributeAppender.append("class", "project-dependency"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.html
index 60c76afafa..17d3d5a1f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="job-report-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Job Report</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.html
index 26a1ef3c02..23667dcde5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
- <div class="report-list list">
- <table wicket:id="reports" class="table table-condensed table-hover"></table>
- <div class="foot">
- <a wicket:id="addNew" title="Add new" class="btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div class="job-report-list">
+ <table wicket:id="reports"></table>
+ <div class="foot mt-3">
+ <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java
index f4cffb3d6f..e8d6830e0c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java
@@ -30,6 +30,7 @@ import io.onedev.server.buildspec.BuildSpecAware;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.buildspec.job.JobReport;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -185,7 +186,7 @@ class JobReportListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public String getCssClass() {
- return "actions";
+ return "actions minimum";
}
});
@@ -202,7 +203,8 @@ class JobReportListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<JobReport, Void> dataTable;
add(dataTable = new DataTable<JobReport, Void>("reports", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.html
index 6b2e4ca3e2..77faca7dd1 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="def-list report-list">
+ <div class="job-report-list">
<div class="body">
- <table wicket:id="reports" class="table table-condensed table-hover"></table>
+ <table wicket:id="reports"></table>
</div>
</div>
<wicket:fragment wicket:id="columnFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java
index 4265ec70c2..5cdc598826 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java
@@ -25,10 +25,12 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import io.onedev.server.buildspec.job.JobReport;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
-import io.onedev.server.web.page.layout.SideFloating;
@SuppressWarnings("serial")
class JobReportListViewPanel extends Panel {
@@ -104,7 +106,7 @@ class JobReportListViewPanel extends Panel {
@Override
public String getCssClass() {
- return "ellipsis";
+ return "ellipsis text-right";
}
});
@@ -124,7 +126,8 @@ class JobReportListViewPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ add(new NoRecordsBehavior());
}
});
@@ -148,18 +151,18 @@ class JobReportListViewPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
@Override
- protected String getTitle() {
+ protected Component newTitle(String componentId) {
JobReport report = reports.get(index);
- return "Report (type: " + EditableUtils.getDisplayName(report.getClass()) + ")";
+ return new Label(componentId, "Report (type: " + EditableUtils.getDisplayName(report.getClass()) + ")");
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "job-report def-detail"));
+ add(AttributeAppender.append("class", "job-report"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceCssResourceReference.java
deleted file mode 100644
index 733b2ad746..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.editable.job.service;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class JobServiceCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public JobServiceCssResourceReference() {
- super(JobServiceCssResourceReference.class, "job-service.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.html
index f5b284fd0d..747194b37c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="job-service-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Service</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.html
index cb3aae08de..3ba759e11f 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
- <div class="job-service-list list">
- <table wicket:id="services" class="table table-condensed table-hover"></table>
- <div class="foot">
- <a wicket:id="addNew" title="Add new" class="btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div class="job-service-list">
+ <table wicket:id="services"></table>
+ <div class="foot mt-3">
+ <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.java
index c025adf5b0..1349323e81 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.java
@@ -16,8 +16,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
@@ -32,6 +30,7 @@ import io.onedev.server.buildspec.BuildSpecAware;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.buildspec.job.JobService;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -204,7 +203,7 @@ class JobServiceListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public String getCssClass() {
- return "actions";
+ return "actions minimum";
}
});
@@ -221,7 +220,8 @@ class JobServiceListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<JobService, Void> dataTable;
add(dataTable = new DataTable<JobService, Void>("services", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
@@ -261,10 +261,4 @@ class JobServiceListEditPanel extends PropertyEditor<List<Serializable>> {
return value;
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new JobServiceCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.html
index 82c78444ad..31e4bbea47 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="def-list job-service-list">
+ <div class="job-service-list">
<div class="body">
- <table wicket:id="services" class="table table-condensed table-hover"></table>
+ <table wicket:id="services"></table>
</div>
</div>
<wicket:fragment wicket:id="columnFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.java
index 82db454061..42675f5ce7 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.java
@@ -15,8 +15,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
@@ -27,10 +25,11 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import io.onedev.server.buildspec.job.JobService;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel.Placement;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.page.layout.SideFloating.Placement;
@SuppressWarnings("serial")
class JobServiceListViewPanel extends Panel {
@@ -105,7 +104,7 @@ class JobServiceListViewPanel extends Panel {
@Override
public String getCssClass() {
- return "ellipsis";
+ return "ellipsis text-right";
}
});
@@ -125,18 +124,13 @@ class JobServiceListViewPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ add(new NoRecordsBehavior());
}
});
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new JobServiceCssResourceReference()));
- }
-
private abstract class ColumnFragment extends Fragment {
private final int index;
@@ -155,17 +149,17 @@ class JobServiceListViewPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, Placement.RIGHT) {
+ new OffCanvasCardPanel(target, Placement.RIGHT, null) {
@Override
- protected String getTitle() {
- return "Service";
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Service");
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "job-service def-detail"));
+ add(AttributeAppender.append("class", "job-service"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/job-service.css b/server-core/src/main/java/io/onedev/server/web/editable/job/service/job-service.css
deleted file mode 100644
index 6c98a6eb31..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/job-service.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.def-detail.job-service .editable>.bean-properties>table>tbody>tr>td.name {
- min-width: 150px;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.html
index acfe65c744..31162f3211 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="job-trigger-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Job Trigger</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html
index 874bf9faf8..1d1b5c156a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
- <div class="job-trigger-list list">
- <table wicket:id="triggers" class="table table-condensed table-hover"></table>
- <div class="foot">
- <a wicket:id="addNew" title="Add new" class="btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div class="job-trigger-list">
+ <table wicket:id="triggers"></table>
+ <div class="foot mt-3">
+ <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java
index fc1bff6355..26c86a1310 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java
@@ -28,6 +28,7 @@ import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.buildspec.job.trigger.JobTrigger;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -182,7 +183,7 @@ class JobTriggerListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public String getCssClass() {
- return "actions";
+ return "minimum actions";
}
});
@@ -199,7 +200,8 @@ class JobTriggerListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<JobTrigger, Void> dataTable;
add(dataTable = new DataTable<JobTrigger, Void>("triggers", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.html
index ce5c0034eb..009f06babd 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="def-list job-trigger-list">
+ <div class="job-trigger-list">
<div class="body">
- <table wicket:id="triggers" class="table table-condensed table-hover"></table>
+ <table wicket:id="triggers"></table>
</div>
</div>
<wicket:fragment wicket:id="columnFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java
index c5f40e33dd..a2d4b0fc2c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java
@@ -25,10 +25,12 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import io.onedev.server.buildspec.job.trigger.JobTrigger;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
-import io.onedev.server.web.page.layout.SideFloating;
@SuppressWarnings("serial")
class JobTriggerListViewPanel extends Panel {
@@ -107,7 +109,7 @@ class JobTriggerListViewPanel extends Panel {
@Override
public String getCssClass() {
- return "ellipsis";
+ return "ellipsis text-right";
}
});
@@ -127,7 +129,8 @@ class JobTriggerListViewPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ add(new NoRecordsBehavior());
}
});
@@ -151,17 +154,17 @@ class JobTriggerListViewPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
@Override
- protected String getTitle() {
- return "Trigger (type: " + EditableUtils.getDisplayName(triggers.get(index).getClass()) + ")";
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Trigger (type: " + EditableUtils.getDisplayName(triggers.get(index).getClass()) + ")");
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "job-trigger def-detail"));
+ add(AttributeAppender.append("class", "job-trigger"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
index 6a83d66c39..5d332e97d9 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
@@ -1,8 +1,8 @@
<wicket:panel>
<div class="polymorphic">
- <div wicket:id="typeSelectorContainer" class="type-selector form-group">
- <select wicket:id="typeSelector" class="form-control"></select>
- <p wicket:id="typeDescription" class="help-block"></p>
+ <div wicket:id="typeSelectorContainer" class="type-selector">
+ <select wicket:id="typeSelector" class="form-control custom-select"></select>
+ <p wicket:id="typeDescription" class="form-text text-muted"></p>
</div>
<div wicket:id="beanEditor"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html
index 1eb3860976..5d383f1849 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html
@@ -2,7 +2,7 @@
<div class="polymorphic">
<div class="type-selector">
<div wicket:id="type"></div>
- <p wicket:id="typeDescription" class="type-description help-block"></p>
+ <p wicket:id="typeDescription" class="type-description form-text text-muted"></p>
</div>
<div wicket:id="beanViewer"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html
deleted file mode 100644
index bf02f87f8d..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<wicket:panel>
- <div class="locator-list list">
- <table wicket:id="locators" class="table table-condensed table-hover"></table>
- <div class="foot">
- <a wicket:id="addNew" title="Add new" class="btn btn-success btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg></a>
- </div>
- </div>
- <wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- </wicket:fragment>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorEditPanel.html
similarity index 59%
rename from server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorEditPanel.html
index a2162fa4d3..272d1a1222 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorEditPanel.html
@@ -1,11 +1,11 @@
<wicket:panel>
- <form wicket:id="form" class="locator-edit leave-confirm">
+ <form wicket:id="form" class="service-locator-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Service Locator</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
- <div wicket:id="feedback"></div>
+ <div wicket:id="feedback" class="mb-4"></div>
<div wicket:id="editor"></div>
</div>
<div class="modal-footer">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorEditPanel.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorEditPanel.java
index 69137b9e20..8b1110c84a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorEditPanel.java
@@ -19,13 +19,13 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
@SuppressWarnings("serial")
-abstract class LocatorEditPanel extends Panel implements BuildSpecAware, JobAware {
+abstract class ServiceLocatorEditPanel extends Panel implements BuildSpecAware, JobAware {
private final List<ServiceLocator> locators;
private final int locatorIndex;
- public LocatorEditPanel(String id, List<ServiceLocator> locators, int locatorIndex) {
+ public ServiceLocatorEditPanel(String id, List<ServiceLocator> locators, int locatorIndex) {
super(id);
this.locators = locators;
@@ -59,7 +59,7 @@ abstract class LocatorEditPanel extends Panel implements BuildSpecAware, JobAwar
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(LocatorEditPanel.this));
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ServiceLocatorEditPanel.this));
}
@Override
@@ -92,7 +92,7 @@ abstract class LocatorEditPanel extends Panel implements BuildSpecAware, JobAwar
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(LocatorEditPanel.this));
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ServiceLocatorEditPanel.this));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.html
new file mode 100644
index 0000000000..c7f6368895
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="service-locator-list">
+ <table wicket:id="locators" class="table"></table>
+ <div class="foot mt-3">
+ <a wicket:id="addNew" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" class="btn btn-light btn-hover-primary btn-xs btn-icon mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-light btn-hover-danger btn-xs btn-icon" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java
index b32b86c766..f38ee4c390 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java
@@ -30,6 +30,7 @@ import io.onedev.server.buildspec.BuildSpecAware;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -41,11 +42,11 @@ import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyUpdating;
@SuppressWarnings("serial")
-class LocatorListEditPanel extends PropertyEditor<List<Serializable>> {
+class ServiceLocatorListEditPanel extends PropertyEditor<List<Serializable>> {
private final List<ServiceLocator> locators;
- public LocatorListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
+ public ServiceLocatorListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
super(id, propertyDescriptor, model);
locators = new ArrayList<>();
@@ -77,7 +78,7 @@ class LocatorListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new LocatorEditPanel(id, locators, -1) {
+ return new ServiceLocatorEditPanel(id, locators, -1) {
@Override
protected void onCancel(AjaxRequestTarget target) {
@@ -89,17 +90,17 @@ class LocatorListEditPanel extends PropertyEditor<List<Serializable>> {
markFormDirty(target);
modal.close();
onPropertyUpdating(target);
- target.add(LocatorListEditPanel.this);
+ target.add(ServiceLocatorListEditPanel.this);
}
@Override
public BuildSpec getBuildSpec() {
- return LocatorListEditPanel.this.getBuildSpec();
+ return ServiceLocatorListEditPanel.this.getBuildSpec();
}
@Override
public Job getJob() {
- return LocatorListEditPanel.this.getJob();
+ return ServiceLocatorListEditPanel.this.getJob();
}
};
@@ -177,12 +178,12 @@ class LocatorListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {
- Fragment fragment = new Fragment(componentId, "actionColumnFrag", LocatorListEditPanel.this);
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", ServiceLocatorListEditPanel.this);
fragment.add(new ModalLink("edit") {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new LocatorEditPanel(id, locators, cellItem.findParent(Item.class).getIndex()) {
+ return new ServiceLocatorEditPanel(id, locators, cellItem.findParent(Item.class).getIndex()) {
@Override
protected void onCancel(AjaxRequestTarget target) {
@@ -194,17 +195,17 @@ class LocatorListEditPanel extends PropertyEditor<List<Serializable>> {
markFormDirty(target);
modal.close();
onPropertyUpdating(target);
- target.add(LocatorListEditPanel.this);
+ target.add(ServiceLocatorListEditPanel.this);
}
@Override
public BuildSpec getBuildSpec() {
- return LocatorListEditPanel.this.getBuildSpec();
+ return ServiceLocatorListEditPanel.this.getBuildSpec();
}
@Override
public Job getJob() {
- return LocatorListEditPanel.this.getJob();
+ return ServiceLocatorListEditPanel.this.getJob();
}
};
@@ -219,7 +220,7 @@ class LocatorListEditPanel extends PropertyEditor<List<Serializable>> {
markFormDirty(target);
locators.remove(rowModel.getObject());
onPropertyUpdating(target);
- target.add(LocatorListEditPanel.this);
+ target.add(ServiceLocatorListEditPanel.this);
}
});
@@ -246,6 +247,7 @@ class LocatorListEditPanel extends PropertyEditor<List<Serializable>> {
add(dataTable = new DataTable<ServiceLocator, Void>("locators", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+ dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
@@ -261,7 +263,7 @@ class LocatorListEditPanel extends PropertyEditor<List<Serializable>> {
Collections.swap(locators, fromIndex-i, fromIndex-i-1);
}
onPropertyUpdating(target);
- target.add(LocatorListEditPanel.this);
+ target.add(ServiceLocatorListEditPanel.this);
}
}.sortable("tbody"));
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditSupport.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditSupport.java
index e3aeb94af5..7b688443e3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditSupport.java
@@ -16,7 +16,7 @@ import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
-public class LocatorListEditSupport implements EditSupport {
+public class ServiceLocatorListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
@@ -32,7 +32,7 @@ public class LocatorListEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null)
- return new LocatorListViewPanel(id, model.getObject());
+ return new ServiceLocatorListViewPanel(id, model.getObject());
else
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
}
@@ -42,7 +42,7 @@ public class LocatorListEditSupport implements EditSupport {
@Override
public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {
- return new LocatorListEditPanel(componentId, descriptor, model);
+ return new ServiceLocatorListEditPanel(componentId, descriptor, model);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListViewPanel.html
similarity index 53%
rename from server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListViewPanel.html
index 0339be2e0e..5f2f42a970 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListViewPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="def-list locator-list">
+ <div class="service-locator-list">
<div class="body">
- <table wicket:id="locators" class="table table-condensed table-hover"></table>
+ <table wicket:id="locators"></table>
</div>
</div>
<wicket:fragment wicket:id="columnFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListViewPanel.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListViewPanel.java
index 7d681cb5af..411aa5996d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListViewPanel.java
@@ -27,18 +27,19 @@ import org.apache.wicket.model.Model;
import com.google.common.collect.Sets;
import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel.Placement;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EmptyValueLabel;
-import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.page.layout.SideFloating.Placement;
@SuppressWarnings("serial")
-class LocatorListViewPanel extends Panel {
+class ServiceLocatorListViewPanel extends Panel {
private final List<ServiceLocator> locators = new ArrayList<>();
- public LocatorListViewPanel(String id, List<Serializable> elements) {
+ public ServiceLocatorListViewPanel(String id, List<Serializable> elements) {
super(id);
for (Serializable each: elements)
@@ -141,7 +142,7 @@ class LocatorListViewPanel extends Panel {
@Override
public String getCssClass() {
- return "ellipsis";
+ return "ellipsis text-right";
}
});
@@ -162,6 +163,7 @@ class LocatorListViewPanel extends Panel {
super.onInitialize();
addTopToolbar(new HeadersToolbar<Void>(this, null));
addBottomToolbar(new NoRecordsToolbar(this));
+ add(new NoRecordsBehavior());
}
});
@@ -172,7 +174,7 @@ class LocatorListViewPanel extends Panel {
private final int index;
public ColumnFragment(String id, int index) {
- super(id, "columnFrag", LocatorListViewPanel.this);
+ super(id, "columnFrag", ServiceLocatorListViewPanel.this);
this.index = index;
}
@@ -185,17 +187,17 @@ class LocatorListViewPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, Placement.RIGHT) {
+ new OffCanvasCardPanel(target, Placement.RIGHT, null) {
@Override
- protected String getTitle() {
- return "Service Locator";
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Service Locator");
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "locator def-detail"));
+ add(AttributeAppender.append("class", "service-locator"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/img/Img.java b/server-core/src/main/java/io/onedev/server/web/img/ImageScope.java
similarity index 59%
rename from server-core/src/main/java/io/onedev/server/web/img/Img.java
rename to server-core/src/main/java/io/onedev/server/web/img/ImageScope.java
index 8af9887503..03096ecb7c 100644
--- a/server-core/src/main/java/io/onedev/server/web/img/Img.java
+++ b/server-core/src/main/java/io/onedev/server/web/img/ImageScope.java
@@ -1,5 +1,5 @@
package io.onedev.server.web.img;
-public class Img {
+public class ImageScope {
}
diff --git a/server-core/src/main/java/io/onedev/server/web/img/apple-touch-icon.png b/server-core/src/main/java/io/onedev/server/web/img/apple-touch-icon.png
deleted file mode 100644
index a0efcd6a94..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/img/apple-touch-icon.png and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/img/favicon.ico b/server-core/src/main/java/io/onedev/server/web/img/favicon.ico
deleted file mode 100644
index 373afd7128..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/img/favicon.ico and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/img/mesh.jpg b/server-core/src/main/java/io/onedev/server/web/img/mesh.jpg
new file mode 100644
index 0000000000..e96f71df87
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/img/mesh.jpg differ
diff --git a/server-core/src/main/java/io/onedev/server/web/img/sleeping-panda.png b/server-core/src/main/java/io/onedev/server/web/img/sleeping-panda.png
new file mode 100644
index 0000000000..3783863600
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/img/sleeping-panda.png differ
diff --git a/server-core/src/main/java/io/onedev/server/web/page/DashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/DashboardPage.java
index 1cbe1713f0..5fd27779e6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/DashboardPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/DashboardPage.java
@@ -1,6 +1,8 @@
package io.onedev.server.web.page;
+import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.layout.LayoutPage;
@@ -15,4 +17,9 @@ public class DashboardPage extends LayoutPage {
throw new RestartResponseException(ProjectListPage.class, ProjectListPage.paramsOf(0, 0));
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Dashboard");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.html
index 249a8cbd7c..67af37b5fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div id="administration">
+ <div id="administration" class="m-5">
<wicket:child></wicket:child>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
index d1f05c0044..d51178815a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
@@ -37,5 +37,6 @@ public abstract class AdministrationPage extends LayoutPage implements ScriptIde
public ScriptIdentity getScriptIdentity() {
return new SiteAdministrator();
}
-
+
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css
index c8d45e1bc6..54481df4c9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css
@@ -1,54 +1,3 @@
-.auto-backup {
- margin-bottom: 20px;
-}
-
-#administration>.server-information>.page-title {
- border-bottom: none;
- margin-bottom: 0;
-}
-.server-information table td {
- padding: 8px;
- font-size: 13px;
-}
-.server-information table td.name {
- width: 200px;
- font-weight: bold;
- font-size: 12px;
-}
-
-.server-log>.head {
- margin-bottom: 20px;
-}
-.server-log>.body>pre {
- overflow: visible;
- background: white;
- border: none;
- padding: 0;
-}
-
-.license-detail .properties td {
- padding: 0 16px 16px 0;
-}
-.license-detail .properties tr:last-child td {
- padding-bottom: 0;
-}
-.license-detail .properties td.name {
- width: 200px;
-}
-.license-management .actions a {
- margin-right: 16px;
-}
-
-.JobExecutorsPage {
- min-width: 900px;
-}
-
-.job-executor .panel-heading .name,
-.role .panel-heading .name {
- margin-right: 8px;
-}
-
-#ssh-setting textarea {
- height: 300px;
+.ssh-setting textarea {
font-family: monospace;
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html
index 32d1eb8b1a..fa794a16e0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html
@@ -1,23 +1,18 @@
<wicket:extend>
- <div id="authenticator">
- <div class="page-title">
- External Authentication
- <div class="help-block">OneDev takes user login information and sends to specified external
- system for authentication at server side</div>
+ <div class="card">
+ <div class="card-body">
+ <form wicket:id="authenticator" class="authenticator leave-confirm">
+ <div wicket:id="editor" class="mb-5"></div>
+ <button wicket:id="save" class="btn btn-primary dirty-aware mr-3">Save Setting</button>
+ <input wicket:id="test" type="submit" class="btn btn-light-primary" value="Test setting">
+ </form>
</div>
- <form wicket:id="authenticator" class="authenticator leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-primary dirty-aware">Save Setting</button>
- <input wicket:id="test" type="submit" class="btn btn-primary" value="Test setting">
- </div>
- </form>
</div>
<wicket:fragment wicket:id="testFrag">
<form wicket:id="form" class="authenticator-test">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Authentication Test</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
index c6ae7b8e30..12ccf971a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
@@ -8,6 +8,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -21,7 +22,7 @@ import com.google.common.base.Joiner;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.authenticator.Authenticated;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.taskbutton.TaskButton;
import io.onedev.server.web.editable.BeanContext;
@@ -135,7 +136,7 @@ public class AuthenticatorPage extends AdministrationPage {
}
@Override
- protected String runTask(JobLogger logger) {
+ protected String runTask(SimpleLogger logger) {
Authenticated authenticated = bean.getAuthenticator().authenticate(
new UsernamePasswordToken(token.getUserName(), token.getPassword()));
StringBuilder retrievedInfoBuilder = new StringBuilder();
@@ -191,4 +192,9 @@ public class AuthenticatorPage extends AdministrationPage {
add(form);
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "External Authenticator");
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html
index 2bfa80e742..4d0a671701 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html
@@ -1,12 +1,11 @@
<wicket:extend>
- <div class="page-title">Database Backup</div>
- <div class="database-backup">
- <form wicket:id="backupSetting" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions">
- <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting">
- <a wicket:id="backupNow" class="btn btn-primary">Backup now</a>
- </div>
- </form>
+ <div class="card">
+ <div class="card-body">
+ <form wicket:id="backupSetting" class="leave-confirm">
+ <div wicket:id="editor" class="mb-4"></div>
+ <input type="submit" class="btn btn-primary dirty-aware mr-1" value="Save Setting">
+ <a wicket:id="backupNow" class="btn btn-light-primary">Backup now</a>
+ </form>
+ </div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
index 6a43808768..8d5fedccb6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
@@ -4,6 +4,8 @@ import java.io.File;
import java.io.IOException;
import org.apache.tika.mime.MimeTypes;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -75,4 +77,9 @@ public class DatabaseBackupPage extends AdministrationPage {
add(form);
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Database Backup");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.html
new file mode 100644
index 0000000000..78cc89b768
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.html
@@ -0,0 +1,10 @@
+<wicket:extend>
+ <div class="card general-security-setting">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor" class="mb-4"></div>
+ <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting">
+ </form>
+ </div>
+ </div>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.java
similarity index 64%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.java
index 578c8a0777..9cbc4ce278 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.java
@@ -1,5 +1,7 @@
-package io.onedev.server.web.page.admin.securitysetting;
+package io.onedev.server.web.page.admin.generalsecuritysetting;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -10,9 +12,9 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.AdministrationPage;
@SuppressWarnings("serial")
-public class SecuritySettingPage extends AdministrationPage {
+public class GeneralSecuritySettingPage extends AdministrationPage {
- public SecuritySettingPage(PageParameters params) {
+ public GeneralSecuritySettingPage(PageParameters params) {
super(params);
}
@@ -22,7 +24,7 @@ public class SecuritySettingPage extends AdministrationPage {
SecuritySetting securitySetting = OneDev.getInstance(SettingManager.class).getSecuritySetting();
- Form<?> form = new Form<Void>("securitySetting") {
+ Form<?> form = new Form<Void>("form") {
@Override
protected void onSubmit() {
@@ -30,7 +32,7 @@ public class SecuritySettingPage extends AdministrationPage {
OneDev.getInstance(SettingManager.class).saveSecuritySetting(securitySetting);
getSession().success("Security setting has been updated");
- setResponsePage(SecuritySettingPage.class);
+ setResponsePage(GeneralSecuritySettingPage.class);
}
};
@@ -39,4 +41,9 @@ public class SecuritySettingPage extends AdministrationPage {
add(form);
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "General Security Setting");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.html
index bb42d991b4..62850fe13d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="groovy-script-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Edit Groovy Script</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html
index ac866cede2..ed12ace70b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html
@@ -1,26 +1,17 @@
<wicket:extend>
- <div class="page-title">Groovy Scripts</div>
- <div class="help-block">All Groovy scripts used across the system should be defined here and reviewed
- by the site administrator for security reasons</div>
- <div class="groovy-script-list def-list list">
- <div class="head clearfix">
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New</a>
- </div>
- </div>
- <div class="body">
- <table wicket:id="scripts" class="table table-hover"></table>
+ <div class="card">
+ <div class="card-body">
+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add groovy script"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <table wicket:id="scripts" class="table"></table>
</div>
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span> </a>
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
</wicket:fragment>
- <wicket:fragment wicket:id="viewScriptFrag">
- <div class="actions">
- <a wicket:id="edit" class="btn btn-sm btn-secondary"><wicket:svg href="edit" class="icon"></wicket:svg> Edit</a>
- <a wicket:id="delete" class="btn btn-sm btn-secondary"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
+ <wicket:fragment wicket:id="scriptActionsFrag">
+ <div class="d-flex">
+ <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
+ <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
</div>
- <div wicket:id="feedback"></div>
- <div wicket:id="viewer"></div>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
index fb85914932..d2e4a7a241 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
@@ -15,8 +15,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
@@ -36,14 +34,16 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.server.web.page.layout.SideFloating;
import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
@@ -86,6 +86,11 @@ public class GroovyScriptListPage extends AdministrationPage {
};
}
+
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
});
@@ -95,16 +100,9 @@ public class GroovyScriptListPage extends AdministrationPage {
@Override
public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(LoopItem.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- String html = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg> %s",
- SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(rowModel.getObject().getName()));
- return new Label(componentId, html).setEscapeModelStrings(false);
- }
-
- });
+ String html = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg> %s",
+ SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(rowModel.getObject().getName()));
+ cellItem.add(new Label(componentId, html).setEscapeModelStrings(false));
}
});
@@ -112,15 +110,7 @@ public class GroovyScriptListPage extends AdministrationPage {
@Override
public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {
- GroovyScript script = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(LoopItem.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, TextUtils.describe(script.isCanBeUsedByBuildJobs()));
- }
-
- });
+ cellItem.add(new Label(componentId, TextUtils.describe(rowModel.getObject().isCanBeUsedByBuildJobs())));
}
});
@@ -129,31 +119,100 @@ public class GroovyScriptListPage extends AdministrationPage {
@Override
public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {
- cellItem.add(new ColumnFragment(componentId, 0) {
+ int scriptIndex = cellItem.findParent(LoopItem.class).getIndex();
+
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", GroovyScriptListPage.this);
+ fragment.add(new AjaxLink<Void>("link") {
@Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, scripts.get(scriptIndex).getName());
+ }
@Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "groovy-script"));
+ }
+
+ @Override
+ protected Component newBody(String componentId) {
+ return BeanContext.view(componentId, scripts.get(scriptIndex), Sets.newHashSet("name"), true);
}
- };
+ @Override
+ protected Component newFooter(String componentId) {
+ Fragment fragment = new Fragment(componentId, "scriptActionsFrag", GroovyScriptListPage.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ close();
+ return new GroovyScriptEditPanel(id, scriptIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(scriptsTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected List<GroovyScript> getScripts() {
+ return scripts;
+ }
+
+ };
+ }
+
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this script?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ scripts.remove(scriptIndex);
+ OneDev.getInstance(SettingManager.class).saveGroovyScripts(scripts);
+ target.add(scriptsTable);
+ close();
+ }
+
+ });
+
+ return fragment;
+ }
+
+ };
}
- });
+ });
+ cellItem.add(fragment);
}
@Override
public String getCssClass() {
- return "ellipsis";
+ return "text-right";
}
-
+
});
IDataProvider<GroovyScript> dataProvider = new ListDataProvider<GroovyScript>() {
@@ -168,6 +227,7 @@ public class GroovyScriptListPage extends AdministrationPage {
add(scriptsTable = new DataTable<GroovyScript, Void>("scripts", columns, dataProvider, Integer.MAX_VALUE));
scriptsTable.addTopToolbar(new HeadersToolbar<Void>(scriptsTable, null));
scriptsTable.addBottomToolbar(new NoRecordsToolbar(scriptsTable));
+ scriptsTable.add(new NoRecordsBehavior());
scriptsTable.setOutputMarkupId(true);
scriptsTable.add(new SortBehavior() {
@@ -196,105 +256,10 @@ public class GroovyScriptListPage extends AdministrationPage {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new GroovyScriptResourceReference()));
}
-
- private abstract class ColumnFragment extends Fragment {
-
- private final int scriptIndex;
-
- public ColumnFragment(String id, int scriptIndex) {
- super(id, "columnFrag", GroovyScriptListPage.this);
- this.scriptIndex = scriptIndex;
- }
- protected abstract Component newLabel(String componentId);
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
-
- private GroovyScript getScript() {
- return scripts.get(scriptIndex);
- }
-
- @Override
- protected String getTitle() {
- return getScript().getName();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "groovy-script def-detail"));
- }
-
- @Override
- protected Component newBody(String id) {
- SideFloating sideFloating = this;
- Fragment fragment = new Fragment(id, "viewScriptFrag", GroovyScriptListPage.this);
- fragment.add(BeanContext.view("viewer", getScript(), Sets.newHashSet("name"), true));
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- sideFloating.close();
- return new GroovyScriptEditPanel(id, scriptIndex) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(scriptsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected List<GroovyScript> getScripts() {
- return scripts;
- }
-
- };
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this script?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- scripts.remove(scriptIndex);
- OneDev.getInstance(SettingManager.class).saveGroovyScripts(scripts);
- target.add(scriptsTable);
- close();
- }
-
- });
-
- fragment.add(new FencedFeedbackPanel("feedback", fragment));
- fragment.setOutputMarkupId(true);
-
- return fragment;
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
-
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Groovy Scripts");
}
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/groovy-script.css b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/groovy-script.css
index 92b2a58743..5e4b906cb0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/groovy-script.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/groovy-script.css
@@ -1,8 +1,8 @@
-.groovy-script.def-detail td.name {
+.floating.groovy-script.off-canvas td.name {
width: 120px !important;
}
@media(min-width: 768px) {
-.groovy-script.floating.side.def-detail {
+.groovy-script.floating.off-canvas {
width: 600px;
}
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
index c0d6231c78..c6062f5e61 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
@@ -1,22 +1,19 @@
<wicket:extend>
- <div class="page-title">Group Administration</div>
- <div class="group-list list">
- <div class="head clearfix">
- <div class="float-left clearable-wrapper">
- <input wicket:id="filterGroups" class="form-control search" placeholder="Filter groups">
+ <div class="card">
+ <div class="card-body">
+ <div class="d-flex align-items-center mb-4">
+ <div class="clearable-wrapper mr-3 flex-grow-1">
+ <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name">
+ </div>
+ <a wicket:id="addNew" class="btn btn-icon btn-primary flex-shrink-0"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New Group</a>
- </div>
- </div>
- <div class="body">
- <table wicket:id="groups" class="groups table table-hover"></table>
+ <table wicket:id="groups" class="groups table"></table>
</div>
</div>
<wicket:fragment wicket:id="nameFrag">
<a wicket:id="link"><span wicket:id="label"></span></a>
</wicket:fragment>
<wicket:fragment wicket:id="actionFrag">
- <a wicket:id="delete" title="Delete this group"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this group"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
index 750f56bebb..a5d7d40696 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -177,7 +178,7 @@ public class GroupListPage extends AdministrationPage {
}
});
- columns.add(new AbstractColumn<Group, Void>(Model.of("Is Administrator")) {
+ columns.add(new AbstractColumn<Group, Void>(Model.of("Is Admin")) {
@Override
public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,
@@ -194,10 +195,15 @@ public class GroupListPage extends AdministrationPage {
IModel<Group> rowModel) {
cellItem.add(new Label(componentId, rowModel.getObject().isCreateProjects()));
}
+
+ @Override
+ public String getCssClass() {
+ return "d-none d-lg-table-cell";
+ }
});
- columns.add(new AbstractColumn<Group, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<Group, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId, IModel<Group> rowModel) {
@@ -298,5 +304,10 @@ public class GroupListPage extends AdministrationPage {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new GroupCssResourceReference()));
}
-
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Groups");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.html
index 6d742c883d..568ec2bf64 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.html
@@ -1,22 +1,11 @@
<wicket:extend>
- <div id="group">
- <div wicket:id="groupSidebar"></div>
- <div class="content">
+ <div class="card group-detail">
+ <div class="card-body">
+ <ul wicket:id="groupTabs" class="tabs nav nav-bold nav-tabs nav-tabs-line font-weight-bold mb-4"></ul>
<wicket:child></wicket:child>
</div>
</div>
- <wicket:fragment wicket:id="sidebarHeadFrag">
- <wicket:svg href="group" class="icon"></wicket:svg>
- <span wicket:id="name"></span>
- </wicket:fragment>
- <wicket:fragment wicket:id="navContextFrag">
- <a wicket:id="dropdown" class="dropdown group-dropdown">
- <wicket:svg href="group" class="icon"></wicket:svg>
- <span wicket:id="name" class="ellipsis-text"></span>
- <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>
- </a>
- </wicket:fragment>
- <wicket:fragment wicket:id="navContextDropdownFrag">
- <ul wicket:id="menu" class="menu list-unstyled"></ul>
+ <wicket:fragment wicket:id="topbarTitleFrag">
+ <a wicket:id="groups">Groups</a> <span class="dot"></span> <span wicket:id="groupName" class="text-truncate"></span>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java
index fba172af95..c94b58d418 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java
@@ -6,10 +6,10 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -19,12 +19,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.model.Group;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.floating.AlignPlacement;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.sidebar.SideBar;
import io.onedev.server.web.component.tabbable.PageTab;
-import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.page.admin.group.authorization.GroupAuthorizationsPage;
@@ -61,56 +56,14 @@ public abstract class GroupPage extends AdministrationPage {
protected void onInitialize() {
super.onInitialize();
- add(new SideBar("groupSidebar", null) {
-
- @Override
- protected Component newHead(String componentId) {
- Fragment fragment = new Fragment(componentId, "sidebarHeadFrag", GroupPage.this);
- fragment.add(new Label("name", getGroup().getName()));
- return fragment;
- }
-
- @Override
- protected List<? extends Tab> newTabs() {
- return GroupPage.this.newTabs();
- }
-
- });
- }
-
- private List<? extends Tab> newTabs() {
List<PageTab> tabs = new ArrayList<>();
tabs.add(new GroupTab("Profile", "profile", GroupProfilePage.class));
tabs.add(new GroupTab("Members", "members", GroupMembershipsPage.class));
tabs.add(new GroupTab("Authorized Projects", "project", GroupAuthorizationsPage.class));
- return tabs;
- }
-
- @Override
- protected Component newNavContext(String componentId) {
- Fragment fragment = new Fragment(componentId, "navContextFrag", this);
- DropdownLink link = new DropdownLink("dropdown", AlignPlacement.bottom(15)) {
-
- @Override
- protected void onInitialize(FloatingPanel dropdown) {
- super.onInitialize(dropdown);
- dropdown.add(AttributeAppender.append("class", "nav-context-dropdown user-nav-context-dropdown"));
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- Fragment fragment = new Fragment(id, "navContextDropdownFrag", GroupPage.this);
- fragment.add(new Tabbable("menu", newTabs()));
- return fragment;
- }
-
- };
- link.add(new Label("name", getGroup().getName()));
- fragment.add(link);
- return fragment;
- }
+ add(new Tabbable("groupTabs", tabs));
+ }
@Override
protected void onDetach() {
@@ -140,4 +93,12 @@ public abstract class GroupPage extends AdministrationPage {
return params;
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "topbarTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("groups", GroupListPage.class));
+ fragment.add(new Label("groupName", getGroup().getName()));
+ return fragment;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupTabHead.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupTabHead.html
index f2ef7cdc99..9aca73e53d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupTabHead.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupTabHead.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <a wicket:id="link">
+ <a wicket:id="link" class="nav-link">
<svg wicket:id="icon" class="icon"></svg>
<span wicket:id="label" class="text"></span>
</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html
index 63aaae8654..3b13c9c4b3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html
@@ -1,10 +1,7 @@
<wicket:extend>
- <div class="page-title">Project Authorizations</div>
- <form wicket:id="form" class="authorization-list list">
+ <form wicket:id="form" class="authorization-list leave-confirm">
<div wicket:id="feedback"></div>
<div wicket:id="editor"></div>
- <div class="actions">
- <input type="submit" class="btn btn-primary" value="Save">
- </div>
+ <input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">
</form>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.java
index 5ef1374efb..0907c1105d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.java
@@ -70,5 +70,5 @@ public class GroupAuthorizationsPage extends GroupPage {
form.add(PropertyContext.edit("editor", authorizationsBean, "authorizations"));
add(form);
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.html
index 2ac8d557eb..ba982f89ea 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.html
@@ -1,11 +1,15 @@
<wicket:extend>
- <div class="page-title">New Group</div>
- <div class="new-group">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions clearfix">
- <input class="btn btn-primary dirty-aware float-left" value="Save" type="submit">
- </div>
- </form>
+ <div class="new-group card">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor"></div>
+ <div class="actions clearfix">
+ <input class="btn btn-primary dirty-aware float-left" value="Save" type="submit">
+ </div>
+ </form>
+ </div>
</div>
+ <wicket:fragment wicket:id="topbarTitleFrag">
+ <a wicket:id="groups">Groups</a> <span class="dot"></span> <span class="text-truncate">Create Group</span>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.java
index a59e5cd879..5b141fa067 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.java
@@ -1,9 +1,12 @@
package io.onedev.server.web.page.admin.group.create;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -16,6 +19,7 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.page.admin.group.GroupCssResourceReference;
+import io.onedev.server.web.page.admin.group.GroupListPage;
import io.onedev.server.web.page.admin.group.membership.GroupMembershipsPage;
@SuppressWarnings("serial")
@@ -67,5 +71,12 @@ public class NewGroupPage extends AdministrationPage {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new GroupCssResourceReference()));
}
-
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "topbarTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("groups", GroupListPage.class));
+ return fragment;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css b/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css
index 3a09c3f296..a8280bfa66 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css
@@ -1,46 +1,6 @@
-@media(max-width: 767px) {
- #group>.sidebar {
- display: none;
- }
- #group>.sidebar+.content {
- padding-left: 0;
- }
-}
-#group>.sidebar {
- background: white;
- border-left: none;
- /* make it absolute as we do not want to make it stay fixed to occupy screen space on mobile screen */
- position: absolute;
- z-index: 0;
- /* use hacks below to make the sidebar extend to the screen bottom even if body does not reach to the bottom */
- margin-bottom: -10000px;
- padding-bottom: 10000px;
-}
-#group>.sidebar>.head {
- border-bottom: 4px solid #EEE;
- font-size: 16px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- height: 40px;
- padding: 8px 14px;
-}
-
-#group>.sidebar>.tabs {
- top: 40px;
-}
-#group>.sidebar>.tabs>li>a {
- border-left: none;
- padding: 12px 14px;
-}
-#administration>.minimized.sidebar+.content>#group>.sidebar {
- left: 44px;
-}
-
-#group .authorization-list.list .select2-container,
-#group .membership-list.list .head .select2-container {
+.group-detail .membership-list .head .select2-container {
width: 240px;
}
-#group .authorization-list.list .property-roleName .select2-container {
- width: 360px;
+.group-detail .authorization-list .select2-container {
+ width: 100%;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.html
index 880e0dd20e..aa60bce88b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.html
@@ -1,18 +1,17 @@
<wicket:extend>
- <div class="page-title">Group Memberships</div>
- <div class="membership-list list">
- <div class="head clearfix">
- <div class="float-left clearable-wrapper">
- <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by user name">
+ <div class="membership-list">
+ <div class="head d-flex flex-wrap">
+ <div class="clearable-wrapper mr-3 mb-4">
+ <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by name...">
</div>
- <div class="float-left">
+ <div class="mr-3 mb-4">
<input wicket:id="addNew" type="hidden" class="form-control">
</div>
- <div class="float-left">
- <a wicket:id="deleteSelected" class="btn btn-secondary"><wicket:svg href="trash" class="icon"></wicket:svg> Delete Selected</a>
+ <div class="mb-4">
+ <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>
</div>
</div>
- <table wicket:id="memberships" class="memberships table table-hover"></table>
+ <table wicket:id="memberships" class="memberships table"></table>
</div>
<wicket:fragment wicket:id="nameFrag">
<a wicket:id="link"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java
index 8e893e7f8e..2aced1e05a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java
@@ -48,7 +48,7 @@ import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
import io.onedev.server.web.component.select2.SelectToAddChoice;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.UserAvatar;
import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;
import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;
import io.onedev.server.web.page.admin.group.GroupPage;
@@ -272,5 +272,5 @@ public class GroupMembershipsPage extends GroupPage {
add(membershipsTable = new HistoryAwareDataTable<Membership, Void>("memberships", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.html
index 0a3dd2030a..0e83bfdd23 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.html
@@ -1,12 +1,11 @@
<wicket:extend>
- <div class="page-title">Group Profile</div>
- <div class="profile">
+ <div class="group-profile">
<form wicket:id="form" class="leave-confirm">
+ <div wicket:id="feedback" class="mb-4"></div>
<div wicket:id="editor"></div>
- <div wicket:id="feedback"></div>
- <div class="actions clearfix">
- <input class="btn btn-primary dirty-aware float-left" value="Save" type="submit">
- <a wicket:id="delete" class="btn btn-danger float-right">Delete</a>
+ <div class="mt-5 d-flex">
+ <input class="btn btn-primary dirty-aware mr-1" value="Save" type="submit">
+ <a wicket:id="delete" class="btn btn-danger ml-auto">Delete</a>
</div>
</form>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.html
index 8797445e0b..134ec69adb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.html
@@ -1,8 +1,8 @@
<wicket:extend>
- <div class="page-title">Issue Setting</div>
- <div id="issue-setting">
- <div wicket:id="workflowChangeAlert"></div>
- <ul wicket:id="issueSettingTabs" class="tabs nav nav-tabs"></ul>
- <wicket:child></wicket:child>
+ <div wicket:id="workflowChangeAlert" class="mb-5"></div>
+ <div class="issue-setting card">
+ <div class="card-body">
+ <wicket:child></wicket:child>
+ </div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java
index 32ef72dca5..068a9c953a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java
@@ -1,30 +1,18 @@
package io.onedev.server.web.page.admin.issuesetting;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;
-import io.onedev.server.web.component.tabbable.PageTab;
-import io.onedev.server.web.component.tabbable.Tab;
-import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;
-import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;
-import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
-import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
-import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionsPage;
@SuppressWarnings("serial")
-public class IssueSettingPage extends AdministrationPage {
+public abstract class IssueSettingPage extends AdministrationPage {
private final GlobalIssueSetting setting;
@@ -45,14 +33,6 @@ public class IssueSettingPage extends AdministrationPage {
}
});
-
- List<Tab> tabs = new ArrayList<>();
- tabs.add(new PageTab(Model.of("Custom Fields"), IssueFieldListPage.class));
- tabs.add(new PageTab(Model.of("States"), IssueStateListPage.class));
- tabs.add(new PageTab(Model.of("State Transitions"), StateTransitionsPage.class));
- tabs.add(new PageTab(Model.of("Default Boards"), DefaultBoardListPage.class));
- tabs.add(new PageTab(Model.of("Description Templates"), IssueTemplateListPage.class));
- add(new Tabbable("issueSettingTabs", tabs));
}
public GlobalIssueSetting getSetting() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.html
index fcfe7934d6..7ba20a91f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.html
@@ -1,24 +1,18 @@
<wicket:extend>
- <div class="help-block">Define default issue boards for all projects here.
- A certain project can override this setting to define its own issue boards.</div>
- <div class="issue-boards def-list list">
- <div class="head clearfix">
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New</a>
- </div>
- </div>
- <div class="body">
- <table wicket:id="issueBoards" class="table table-hover"></table>
- </div>
+ <div class="text-muted mb-4">
+ <wicket:svg href="bulb" class="icon"/> Define default issue boards for all projects here.
+ A certain project can override this setting to define its own issue boards.
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add default issue board"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <table wicket:id="issueBoards" class="table"></table>
+
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
</wicket:fragment>
- <wicket:fragment wicket:id="viewBoardFrag">
- <div class="actions">
- <a wicket:id="edit" class="btn btn-sm btn-outline-secondary"><wicket:svg href="edit" class="icon"></wicket:svg> Edit</a>
- <a wicket:id="delete" class="btn btn-sm btn-outline-secondary"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
+ <wicket:fragment wicket:id="boardActionsFrag">
+ <div class="d-flex">
+ <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
+ <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
</div>
- <div wicket:id="viewer"></div>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java
index 38b898721b..34afceee7a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java
@@ -15,8 +15,8 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.IDataProvider;
@@ -26,25 +26,24 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.unbescape.html.HtmlEscape;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.BoardSpec;
-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.issue.board.BoardEditPanel;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
-import io.onedev.server.web.page.layout.SideFloating;
@SuppressWarnings("serial")
public class DefaultBoardListPage extends IssueSettingPage {
@@ -55,14 +54,6 @@ public class DefaultBoardListPage extends IssueSettingPage {
super(params);
}
- private int getBoardSpecIndex(String boardName) {
- for (int i=0; i<getSetting().getBoardSpecs().size(); i++) {
- if (getSetting().getBoardSpecs().get(i).getName().equals(boardName))
- return i;
- }
- return -1;
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
@@ -74,7 +65,7 @@ public class DefaultBoardListPage extends IssueSettingPage {
return new BoardEditPanel(id, getSetting().getBoardSpecs(), -1) {
@Override
- protected void onBoardSaved(AjaxRequestTarget target, BoardSpec board) {
+ protected void onSave(AjaxRequestTarget target, BoardSpec board) {
target.add(boardsTable);
modal.close();
OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
@@ -97,60 +88,33 @@ public class DefaultBoardListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
BoardSpec board = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, board) {
-
- @Override
- protected Component newLabel(String componentId) {
- String html = String.format("<svg class='icon drag-indicator'><use xlink:href='%s'/></svg> %s",
- SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(board.getName()));
- return new Label(componentId, html).setEscapeModelStrings(false);
- }
-
- });
+ String html = String.format("<svg class='icon drag-indicator'><use xlink:href='%s'/></svg> %s",
+ SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(board.getName()));
+ cellItem.add(new Label(componentId, html).setEscapeModelStrings(false));
}
});
- columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("Identify Field")) {
+ columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("Columns")) {
@Override
public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
BoardSpec board = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, board) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, board.getIdentifyField());
- }
-
- });
+ cellItem.add(new Label(componentId, StringUtils.join(board.getDisplayColumns())));
}
});
- columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("Columns")) {
+ columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("Identify Field")) {
@Override
public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
BoardSpec board = rowModel.getObject();
- List<String> columnsForDisplay = new ArrayList<>();
- for (String column: rowModel.getObject().getColumns()) {
- if (column == null) {
- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
- FieldSpec field = issueSetting.getFieldSpec(board.getIdentifyField());
- if (field != null)
- columnsForDisplay.add("<i>" + HtmlEscape.escapeHtml5(field.getNameOfEmptyValue()) + "</i>");
- } else {
- columnsForDisplay.add(HtmlEscape.escapeHtml5(column));
- }
- }
- cellItem.add(new ColumnFragment(componentId, board) {
+ cellItem.add(new Label(componentId, board.getIdentifyField()));
+ }
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, StringUtils.join(columnsForDisplay)).setEscapeModelStrings(false);
- }
-
- });
+ @Override
+ public String getCssClass() {
+ return "d-none d-lg-table-cell";
}
});
@@ -159,28 +123,90 @@ public class DefaultBoardListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel.getObject()) {
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", DefaultBoardListPage.this);
+ fragment.add(new AjaxLink<Void>("link") {
@Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, rowModel.getObject().getName());
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "board-spec"));
+ }
+
+ @Override
+ protected Component newBody(String componentId) {
+ BoardSpec board = rowModel.getObject();
+ board.setEditColumns(board.getDisplayColumns());
+ return BeanContext.view(componentId, board, Sets.newHashSet("name"), true);
+ }
@Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
+ protected Component newFooter(String componentId) {
+ int boardIndex = cellItem.findParent(LoopItem.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "boardActionsFrag", DefaultBoardListPage.this);
+
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ close();
+ return new BoardEditPanel(id, getSetting().getBoardSpecs(), boardIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, BoardSpec board) {
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(boardsTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this board?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getSetting().getBoardSpecs().remove(boardIndex);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(boardsTable);
+ close();
+ }
+
+ });
+
+ return fragment;
}
-
- };
+
+ };
}
});
+ cellItem.add(fragment);
}
-
+
@Override
public String getCssClass() {
- return "ellipsis";
+ return "text-right";
}
});
@@ -197,6 +223,7 @@ public class DefaultBoardListPage extends IssueSettingPage {
add(boardsTable = new DataTable<BoardSpec, Void>("issueBoards", columns, dataProvider, Integer.MAX_VALUE));
boardsTable.addTopToolbar(new HeadersToolbar<Void>(boardsTable, null));
boardsTable.addBottomToolbar(new NoRecordsToolbar(boardsTable));
+ boardsTable.add(new NoRecordsBehavior());
boardsTable.setOutputMarkupId(true);
boardsTable.add(new SortBehavior() {
@@ -219,106 +246,10 @@ public class DefaultBoardListPage extends IssueSettingPage {
}.sortable("tbody"));
}
-
- private abstract class ColumnFragment extends Fragment {
- private final BoardSpec board;
-
- public ColumnFragment(String id, BoardSpec board) {
- super(id, "columnFrag", DefaultBoardListPage.this);
- this.board = board;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- int index = getBoardSpecIndex(board.getName());
- Preconditions.checkState(index != -1);
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
-
- private BoardSpec getBoard() {
- return getSetting().getBoardSpecs().get(index);
-
- }
- @Override
- protected String getTitle() {
- return getBoard().getName();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "board-spec def-detail"));
- }
-
- @Override
- protected Component newBody(String id) {
- SideFloating sideFloating = this;
- Fragment fragment = new Fragment(id, "viewBoardFrag", DefaultBoardListPage.this);
-
- board.populateEditColumns();
-
- fragment.add(BeanContext.view("viewer", getBoard(), Sets.newHashSet("name"), true));
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- sideFloating.close();
- return new BoardEditPanel(id, getSetting().getBoardSpecs(), index) {
-
- @Override
- protected void onBoardSaved(AjaxRequestTarget target, BoardSpec board) {
- target.add(boardsTable);
- modal.close();
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- };
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this board?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- getSetting().getBoardSpecs().remove(index);
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- target.add(boardsTable);
- close();
- }
-
- });
-
- fragment.setOutputMarkupId(true);
-
- return fragment;
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
-
- protected abstract Component newLabel(String componentId);
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Default Issue Boards");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html
index 39ce65a385..7fd2f6592a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="field-spec-edit input-spec-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Edit Field</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html
index 484d204d7e..be35a07064 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html
@@ -1,23 +1,23 @@
<wicket:extend>
- <div class="help-block">Define all custom issue fields here. Each project can
- decide to use all or a subset of these fields via its issue transition setting</div>
- <div class="issue-fields def-list list">
- <div class="head clearfix">
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New</a>
- </div>
+ <div class="issue-fields">
+ <div class="text-muted text-light-info mb-4">
+ <wicket:svg href="bulb" class="icon"/> Define all custom issue fields here. Each project can
+ decide to use all or a subset of these fields via its issue transition setting.
</div>
- <table wicket:id="issueFields" class="table table-hover"></table>
+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add custom field"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <table wicket:id="issueFields" class="table"></table>
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
</wicket:fragment>
- <wicket:fragment wicket:id="viewFieldFrag">
- <div class="actions">
- <a wicket:id="edit" class="btn btn-sm btn-outline-secondary"><wicket:svg href="edit" class="icon"></wicket:svg> Edit</a>
- <a wicket:id="delete" class="btn btn-sm btn-outline-secondary"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
- </div>
+ <wicket:fragment wicket:id="fieldDetailFrag">
<div wicket:id="viewer1"></div>
<div wicket:id="viewer2"></div>
</wicket:fragment>
+ <wicket:fragment wicket:id="fieldActionsFrag">
+ <div class="d-flex">
+ <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
+ <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
+ </div>
+ </wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java
index 8c7be93dd7..2abeb86c6a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java
@@ -16,10 +16,10 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.IDataProvider;
@@ -29,7 +29,6 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.unbescape.html.HtmlEscape;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
@@ -38,16 +37,18 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.fieldspec.FieldSpec;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChanged;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
-import io.onedev.server.web.page.layout.SideFloating;
import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
@@ -97,16 +98,9 @@ public class IssueFieldListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
FieldSpec field = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, field) {
-
- @Override
- protected Component newLabel(String componentId) {
- String html = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg> %s",
- SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(field.getName()));
- return new Label(componentId, html).setEscapeModelStrings(false);
- }
-
- });
+ String html = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg> %s",
+ SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(field.getName()));
+ cellItem.add(new Label(componentId, html).setEscapeModelStrings(false));
}
});
@@ -115,14 +109,7 @@ public class IssueFieldListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
FieldSpec field = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, field) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, EditableUtils.getDisplayName(field.getClass()));
- }
-
- });
+ cellItem.add(new Label(componentId, EditableUtils.getDisplayName(field.getClass())));
}
});
@@ -131,19 +118,12 @@ public class IssueFieldListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
FieldSpec field = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, field) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, TextUtils.describe(getSetting().getListFields().contains(field.getName())));
- }
-
- });
+ cellItem.add(new Label(componentId, TextUtils.describe(getSetting().getListFields().contains(field.getName()))));
}
@Override
public String getCssClass() {
- return "display-in-issue-list";
+ return "d-none d-lg-table-cell";
}
});
@@ -152,30 +132,107 @@ public class IssueFieldListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel.getObject()) {
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", IssueFieldListPage.this);
+ fragment.add(new AjaxLink<Void>("link") {
@Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ FieldSpec field = rowModel.getObject();
+ return new Label(componentId, field.getName() + " (type: " + EditableUtils.getDisplayName(field.getClass()) + ")");
+ }
@Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "field-spec input-spec"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ FieldSpec field = rowModel.getObject();
+ Fragment fragment = new Fragment(id, "fieldDetailFrag", IssueFieldListPage.this);
+ fragment.add(BeanContext.view("viewer1", field, Sets.newHashSet("name"), true));
+ FieldBean bean = new FieldBean();
+ bean.setPromptUponIssueOpen(getSetting().getPromptFieldsUponIssueOpen().contains(field.getName()));
+ fragment.add(BeanContext.view("viewer2", bean, Sets.newHashSet("field"), true));
+
+ fragment.setOutputMarkupId(true);
+
+ return fragment;
}
-
+
+ @Override
+ protected Component newFooter(String componentId) {
+ int fieldIndex = cellItem.findParent(LoopItem.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "fieldActionsFrag", IssueFieldListPage.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ close();
+ return new FieldEditPanel(id, fieldIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(fieldsTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected GlobalIssueSetting getSetting() {
+ return IssueFieldListPage.this.getSetting();
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this field?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getSetting().getFieldSpecs().remove(fieldIndex);
+ getSetting().setReconciled(false);
+ send(getPage(), Broadcast.BREADTH, new WorkflowChanged(target));
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(fieldsTable);
+ close();
+ }
+
+ });
+
+ return fragment;
+ }
+
};
+
}
});
+
+ cellItem.add(fragment);
}
@Override
public String getCssClass() {
- return "ellipsis";
+ return "text-right";
}
-
+
});
IDataProvider<FieldSpec> dataProvider = new ListDataProvider<FieldSpec>() {
@@ -190,6 +247,7 @@ public class IssueFieldListPage extends IssueSettingPage {
add(fieldsTable = new DataTable<FieldSpec, Void>("issueFields", columns, dataProvider, Integer.MAX_VALUE));
fieldsTable.addTopToolbar(new HeadersToolbar<Void>(fieldsTable, null));
fieldsTable.addBottomToolbar(new NoRecordsToolbar(fieldsTable));
+ fieldsTable.add(new NoRecordsBehavior());
fieldsTable.setOutputMarkupId(true);
fieldsTable.add(new SortBehavior() {
@@ -219,117 +277,9 @@ public class IssueFieldListPage extends IssueSettingPage {
response.render(CssHeaderItem.forReference(new InputSpecCssResourceReference()));
}
- private int getFieldSpecIndex(String fieldName) {
- for (int i=0; i<getSetting().getFieldSpecs().size(); i++) {
- if (getSetting().getFieldSpecs().get(i).getName().equals(fieldName))
- return i;
- }
- return -1;
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Issue Custom Fields");
}
-
- private abstract class ColumnFragment extends Fragment {
-
- private final FieldSpec field;
-
- public ColumnFragment(String id, FieldSpec field) {
- super(id, "columnFrag", IssueFieldListPage.this);
- this.field = field;
- }
-
- protected abstract Component newLabel(String componentId);
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- int index = getFieldSpecIndex(field.getName());
- Preconditions.checkState(index != -1);
-
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
-
- @Override
- protected String getTitle() {
- return field.getName() + " (type: " + EditableUtils.getDisplayName(field.getClass()) + ")";
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "field-spec input-spec def-detail"));
- }
-
- @Override
- protected Component newBody(String id) {
- SideFloating sideFloating = this;
- Fragment fragment = new Fragment(id, "viewFieldFrag", IssueFieldListPage.this);
- fragment.add(BeanContext.view("viewer1", field, Sets.newHashSet("name"), true));
- FieldBean bean = new FieldBean();
- bean.setPromptUponIssueOpen(getSetting().getPromptFieldsUponIssueOpen().contains(field.getName()));
- fragment.add(BeanContext.view("viewer2", bean, Sets.newHashSet("field"), true));
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- sideFloating.close();
- return new FieldEditPanel(id, index) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(fieldsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected GlobalIssueSetting getSetting() {
- return IssueFieldListPage.this.getSetting();
- }
-
- };
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this field?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- getSetting().getFieldSpecs().remove(index);
- getSetting().setReconciled(false);
- send(getPage(), Broadcast.BREADTH, new WorkflowChanged(target));
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- target.add(fieldsTable);
- close();
- }
-
- });
-
- fragment.setOutputMarkupId(true);
-
- return fragment;
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
-
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css
index 38ef738490..91d0cf17af 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css
@@ -1,24 +1,5 @@
-#issue-setting .issue-states table>tbody>tr>td:first-child a span {
- border-radius: 3px;
- padding: 2px 6px;
- margin-right: 8px;
-}
-#issue-setting .issue-states table .color span {
- display: block;
+.issue-setting .issue-states table .color div {
width: 24px;
height: 24px;
- border-radius: 3px;
-}
-#issue-setting .default-queries th.property-name {
- width: 30%;
-}
-.field-spec-edit .property-nameOfEmptyValue .control-label {
- font-weight: normal;
-}
-
-@media(max-width: 991px) {
- #issue-setting .display-in-issue-list, .field-spec .property-displayInIssueList,
- .field-spec-edit .property-displayInIssueList {
- display: none;
- }
+ border-radius: 0.42rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.html
index a50330a347..e9c75960c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="issue-template-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Edit Template</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.html
index d12155ab8b..649be66e59 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.html
@@ -1,25 +1,18 @@
<wicket:extend>
- <div class="help-block">Define issue templates here. When a new issue is created, the first
- template with criteria matching the issue will be used </div>
- <div class="issue-templates def-list list">
- <div class="head clearfix">
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New</a>
- </div>
- </div>
- <div class="body">
- <table wicket:id="issueTemplates" class="table table-hover"></table>
- </div>
+ <div class="text-muted mb-4">
+ <wicket:svg href="bulb" class="icon"/> Define issue templates here.
+ When a new issue is created, the first template with criteria matching the issue will be used.
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue description template"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <table wicket:id="issueTemplates" class="table"></table>
+
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
</wicket:fragment>
- <wicket:fragment wicket:id="viewTemplateFrag">
- <div class="actions">
- <a wicket:id="edit" class="btn btn-sm btn-outline-secondary"><wicket:svg href="edit" class="icon"></wicket:svg> Edit</a>
- <a wicket:id="delete" class="btn btn-sm btn-outline-secondary"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
+ <wicket:fragment wicket:id="templateActionsFrag">
+ <div class="d-flex">
+ <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
+ <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
</div>
- <div wicket:id="feedback"></div>
- <div wicket:id="viewer"></div>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java
index d3b0ecb8df..f330570143 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java
@@ -15,11 +15,10 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.IDataProvider;
@@ -29,25 +28,27 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.unbescape.html.HtmlEscape;
-import com.google.common.base.Preconditions;
-
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.IssueTemplate;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
-import io.onedev.server.web.page.layout.SideFloating;
@SuppressWarnings("serial")
public class IssueTemplateListPage extends IssueSettingPage {
+ private static final int MAX_DESCRIPTION_LEN = 200;
+
public IssueTemplateListPage(PageParameters params) {
super(params);
}
@@ -96,53 +97,123 @@ public class IssueTemplateListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<IssueTemplate>> cellItem, String componentId, IModel<IssueTemplate> rowModel) {
+ String label;
IssueTemplate template = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, template) {
+ if (template.getIssueQuery() != null)
+ label = HtmlEscape.escapeHtml5(template.getIssueQuery());
+ else
+ label = "<i>All</i>";
+ cellItem.add(new Label(componentId, label).setEscapeModelStrings(false));
+ }
+ });
+
+ columns.add(new AbstractColumn<IssueTemplate, Void>(Model.of("Description Template")) {
- @Override
- protected Component newLabel(String componentId) {
- String label;
- if (template.getIssueQuery() != null)
- label = HtmlEscape.escapeHtml5(template.getIssueQuery());
- else
- label = "<i>All</i>";
- return new Label(componentId, label).setEscapeModelStrings(false);
- }
-
- });
+ @Override
+ public void populateItem(Item<ICellPopulator<IssueTemplate>> cellItem, String componentId, IModel<IssueTemplate> rowModel) {
+ cellItem.add(new Label(componentId, StringUtils.abbreviate(rowModel.getObject().getIssueDescription(), MAX_DESCRIPTION_LEN)));
}
+
});
columns.add(new AbstractColumn<IssueTemplate, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<IssueTemplate>> cellItem, String componentId, IModel<IssueTemplate> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel.getObject()) {
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", IssueTemplateListPage.this);
+ fragment.add(new AjaxLink<Void>("link") {
@Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Description Template");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "issue-template"));
+ }
+
+ @Override
+ protected Component newBody(String componentId) {
+ return BeanContext.view(componentId, rowModel.getObject());
+ }
@Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
+ protected Component newFooter(String componentId) {
+ int templateIndex = cellItem.findParent(LoopItem.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "templateActionsFrag", IssueTemplateListPage.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ close();
+ return new IssueTemplateEditPanel(id, templateIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(templatesTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected GlobalIssueSetting getSetting() {
+ return IssueTemplateListPage.this.getSetting();
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this template?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getSetting().getIssueTemplates().remove(templateIndex);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(templatesTable);
+ close();
+ }
+
+ });
+
+ return fragment;
}
-
- };
+
+ };
}
- });
+ });
+ cellItem.add(fragment);
}
@Override
public String getCssClass() {
- return "ellipsis";
+ return "text-right";
}
-
});
+
IDataProvider<IssueTemplate> dataProvider = new ListDataProvider<IssueTemplate>() {
@Override
@@ -155,6 +226,7 @@ public class IssueTemplateListPage extends IssueSettingPage {
add(templatesTable = new DataTable<IssueTemplate, Void>("issueTemplates", columns, dataProvider, Integer.MAX_VALUE));
templatesTable.addTopToolbar(new HeadersToolbar<Void>(templatesTable, null));
templatesTable.addBottomToolbar(new NoRecordsToolbar(templatesTable));
+ templatesTable.add(new NoRecordsBehavior());
templatesTable.setOutputMarkupId(true);
templatesTable.add(new SortBehavior() {
@@ -178,117 +250,15 @@ public class IssueTemplateListPage extends IssueSettingPage {
}.sortable("tbody"));
}
- private abstract class ColumnFragment extends Fragment {
-
- private final IssueTemplate template;
-
- public ColumnFragment(String id, IssueTemplate template) {
- super(id, "columnFrag", IssueTemplateListPage.this);
- this.template = template;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- int index = getSetting().getIssueTemplates().indexOf(template);
- Preconditions.checkState(index != -1);
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
-
- private IssueTemplate getTemplate() {
- return getSetting().getIssueTemplates().get(index);
- }
-
- @Override
- protected String getTitle() {
- return "Template Detail";
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "issue-template def-detail"));
- }
-
- @Override
- protected Component newBody(String id) {
- SideFloating sideFloating = this;
- Fragment fragment = new Fragment(id, "viewTemplateFrag", IssueTemplateListPage.this);
- fragment.add(BeanContext.view("viewer", getTemplate()));
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected String getModalCssClass() {
- return "modal-lg";
- }
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- sideFloating.close();
- return new IssueTemplateEditPanel(id, index) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(templatesTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected GlobalIssueSetting getSetting() {
- return IssueTemplateListPage.this.getSetting();
- }
-
- };
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this template?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- getSetting().getIssueTemplates().remove(index);
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- target.add(templatesTable);
- close();
- }
-
- });
-
- fragment.add(new FencedFeedbackPanel("feedback", fragment));
- fragment.setOutputMarkupId(true);
-
- return fragment;
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
-
- protected abstract Component newLabel(String componentId);
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new IssueTemplateCssResourceReference()));
}
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "<span class='text-truncate'>Issue Description Templates</span>").setEscapeModelStrings(false);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/issue-template.css b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/issue-template.css
index 2fd47c06ec..818b3b9fb3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/issue-template.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/issue-template.css
@@ -1,5 +1,5 @@
-@media(min-width: 768px) {
-.issue-template.floating.side.def-detail {
+@media(min-width: 992px) {
+.floating.off-canvas.issue-template {
width: 600px;
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.html
index d8319f56fd..2870d44e77 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.html
@@ -1,25 +1,14 @@
<wicket:extend>
- <div class="help-block">Define all custom issue states here. The first state will be used as
- initial state of created issues</div>
- <div class="issue-states def-list list">
- <div class="head clearfix">
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New</a>
- </div>
- </div>
- <div class="body">
- <table wicket:id="issueStates" class="table table-hover"></table>
+ <div class="issue-states">
+ <div class="text-muted mb-4">
+ <wicket:svg href="bulb" class="icon"/> Define all custom issue states here. The first state will be used as
+ initial state of created issues
</div>
+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue state"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <table wicket:id="issueStates" class="table"></table>
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="viewStateFrag">
- <div class="actions">
- <a wicket:id="edit" class="btn btn-sm btn-outline-secondary"><wicket:svg href="edit" class="icon"></wicket:svg> Edit</a>
- <a wicket:id="delete" class="btn btn-sm btn-outline-secondary"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
- </div>
- <div wicket:id="feedback"></div>
- <div wicket:id="viewer"></div>
+ <wicket:fragment wicket:id="stateActionsFrag">
+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit this state"><wicket:svg href="edit" class="icon align-middle"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this state"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java
index 87928f7acd..4df0d8e4fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java
@@ -16,9 +16,8 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.IDataProvider;
@@ -28,23 +27,19 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.unbescape.html.HtmlEscape;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChanged;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
-import io.onedev.server.web.page.layout.SideFloating;
@SuppressWarnings("serial")
public class IssueStateListPage extends IssueSettingPage {
@@ -55,14 +50,6 @@ public class IssueStateListPage extends IssueSettingPage {
private DataTable<StateSpec, Void> statesTable;
- private int getStateSpecIndex(String stateName) {
- for (int i=0; i<getSetting().getStateSpecs().size(); i++) {
- if (getSetting().getStateSpecs().get(i).getName().equals(stateName))
- return i;
- }
- return -1;
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
@@ -101,19 +88,12 @@ public class IssueStateListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
StateSpec state = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, state) {
-
- @Override
- protected Component newLabel(String componentId) {
- String html = String.format("<svg class='icon drag-indicator'><use xlink:href='%s'/></svg> %s",
- SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(state.getName()));
+ String html = String.format("<svg class='icon drag-indicator'><use xlink:href='%s'/></svg> %s",
+ SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(state.getName()));
- if (getStateSpecIndex(state.getName()) == 0)
- html += " <span class='badge badge-secondary'>Initial</span>";
- return new Label(componentId, html).setEscapeModelStrings(false);
- }
-
- });
+ if (cellItem.findParent(LoopItem.class).getIndex() == 0)
+ html += " <span class='badge badge-light-info badge-sm ml-2'>Initial</span>";
+ cellItem.add(new Label(componentId, html).setEscapeModelStrings(false));
}
});
@@ -122,14 +102,8 @@ public class IssueStateListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
StateSpec state = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, state) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId).add(AttributeAppender.append("style", "background: " + state.getColor() + ";"));
- }
-
- }.add(AttributeAppender.append("class", "color")));
+ cellItem.add(new Label(componentId).add(AttributeAppender.append("style", "background: " + state.getColor() + ";")));
+ cellItem.add(AttributeAppender.append("class", "color"));
}
});
@@ -139,50 +113,73 @@ public class IssueStateListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
StateSpec state = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, state) {
-
- @Override
- protected Component newLabel(String componentId) {
- String description = state.getDescription();
- if (description != null)
- return new Label(componentId, description);
- else
- return new Label(componentId, "<i>No description</i>").setEscapeModelStrings(false);
- }
-
- });
+ String description = state.getDescription();
+ if (description != null)
+ cellItem.add(new Label(componentId, description));
+ else
+ cellItem.add(new Label(componentId, "<i>No description</i>").setEscapeModelStrings(false));
}
+ @Override
+ public String getCssClass() {
+ return "d-none d-lg-table-cell";
+ }
+
});
- columns.add(new AbstractColumn<StateSpec, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel.getObject()) {
+ int stateIndex = cellItem.findParent(LoopItem.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "stateActionsFrag", IssueStateListPage.this);
+ fragment.add(new ModalLink("edit") {
@Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
+ protected Component newContent(String id, ModalPanel modal) {
+ return new StateEditPanel(id, stateIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(statesTable);
+ modal.close();
+ }
@Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
}
-
+
+ @Override
+ protected GlobalIssueSetting getSetting() {
+ return IssueStateListPage.this.getSetting();
+ }
+
};
}
});
- }
+ fragment.add(new AjaxLink<Void>("delete") {
- @Override
- public String getCssClass() {
- return "ellipsis";
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this state?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getSetting().getStateSpecs().remove(stateIndex);
+ getSetting().setReconciled(false);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(statesTable);
+ send(getPage(), Broadcast.BREADTH, new WorkflowChanged(target));
+ }
+
+ });
+ cellItem.add(fragment);
}
-
+
});
IDataProvider<StateSpec> dataProvider = new ListDataProvider<StateSpec>() {
@@ -197,6 +194,7 @@ public class IssueStateListPage extends IssueSettingPage {
add(statesTable = new DataTable<StateSpec, Void>("issueStates", columns, dataProvider, Integer.MAX_VALUE));
statesTable.addTopToolbar(new HeadersToolbar<Void>(statesTable, null));
statesTable.addBottomToolbar(new NoRecordsToolbar(statesTable));
+ statesTable.add(new NoRecordsBehavior());
statesTable.setOutputMarkupId(true);
statesTable.add(new SortBehavior() {
@@ -219,108 +217,10 @@ public class IssueStateListPage extends IssueSettingPage {
}.sortable("tbody"));
}
-
- private abstract class ColumnFragment extends Fragment {
-
- private final StateSpec state;
-
- public ColumnFragment(String id, StateSpec state) {
- super(id, "columnFrag", IssueStateListPage.this);
- this.state = state;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- int index = getStateSpecIndex(state.getName());
- Preconditions.checkState(index != -1);
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
- private StateSpec getState() {
- return getSetting().getStateSpecs().get(index);
- }
-
- @Override
- protected String getTitle() {
- return getState().getName();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "state-spec def-detail"));
- }
-
- @Override
- protected Component newBody(String id) {
- SideFloating sideFloating = this;
- Fragment fragment = new Fragment(id, "viewStateFrag", IssueStateListPage.this);
- fragment.add(BeanContext.view("viewer", getState(), Sets.newHashSet("name"), true));
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- sideFloating.close();
- return new StateEditPanel(id, index) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(statesTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected GlobalIssueSetting getSetting() {
- return IssueStateListPage.this.getSetting();
- }
-
- };
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this state?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- getSetting().getStateSpecs().remove(index);
- getSetting().setReconciled(false);
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- target.add(statesTable);
- send(getPage(), Broadcast.BREADTH, new WorkflowChanged(target));
- close();
- }
-
- });
-
- fragment.add(new FencedFeedbackPanel("feedback", fragment));
- fragment.setOutputMarkupId(true);
-
- return fragment;
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
-
- protected abstract Component newLabel(String componentId);
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Issue States");
}
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.html
index 9719943de1..7f98a71302 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="state-spec-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Edit State</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html
new file mode 100644
index 0000000000..932a1c30ec
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html
@@ -0,0 +1,19 @@
+<wicket:extend>
+ <div class="state-transitions">
+ <div class="text-muted mb-4">
+ <wicket:svg href="bulb" class="icon"/> Define default issue transitions for all projects here.
+ A certain project can override this setting to define its own issue transitions.
+ </div>
+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue state transition"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <table wicket:id="stateTransitions" class="table"></table>
+ </div>
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="transitionActionsFrag">
+ <div class="d-flex">
+ <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
+ <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
+ </div>
+ </wicket:fragment>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
new file mode 100644
index 0000000000..0dfa74fe84
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
@@ -0,0 +1,280 @@
+package io.onedev.server.web.page.admin.issuesetting.transitionspec;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.LoopItem;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.unbescape.html.HtmlEscape;
+
+import com.google.common.collect.Sets;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.administration.GlobalIssueSetting;
+import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.asset.icon.IconScope;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
+
+@SuppressWarnings("serial")
+public class StateTransitionListPage extends IssueSettingPage {
+
+ private DataTable<TransitionSpec, Void> transitionsTable;
+
+ public StateTransitionListPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new TransitionEditPanel(id, -1) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(transitionsTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected GlobalIssueSetting getSetting() {
+ return StateTransitionListPage.this.getSetting();
+ }
+
+ };
+ }
+
+ });
+
+ List<IColumn<TransitionSpec, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("From States")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
+ TransitionSpec transition = rowModel.getObject();
+ String icon = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg>",
+ SpriteImage.getVersionedHref(IconScope.class, "grip"));
+ String label = HtmlEscape.escapeHtml5(StringUtils.join(transition.getFromStates()));
+ cellItem.add(new Label(componentId, icon + " " + label).setEscapeModelStrings(false));
+ }
+ });
+
+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("To State")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
+ TransitionSpec transition = rowModel.getObject();
+ cellItem.add(new Label(componentId, transition.getToState()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("Do Transition When")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
+ TransitionSpec transition = rowModel.getObject();
+ cellItem.add(new Label(componentId, transition.getTrigger().getDescription()));
+ }
+
+ @Override
+ public String getCssClass() {
+ return "d-none d-lg-table-cell";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("Applicable Issues")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
+ TransitionSpec transition = rowModel.getObject();
+ if (transition.getTrigger().getIssueQuery() != null)
+ cellItem.add(new Label(componentId, transition.getTrigger().getIssueQuery()));
+ else
+ cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));
+ }
+
+ @Override
+ public String getCssClass() {
+ return "d-none d-lg-table-cell";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", StateTransitionListPage.this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "State Transition");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "transition-spec def-detail"));
+ }
+
+ @Override
+ protected Component newBody(String componentId) {
+ return BeanContext.view(componentId, rowModel.getObject(), Sets.newHashSet("name"), true);
+ }
+
+ @Override
+ protected Component newFooter(String componentId) {
+ int transitionIndex = cellItem.findParent(LoopItem.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "transitionActionsFrag", StateTransitionListPage.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ close();
+ return new TransitionEditPanel(id, transitionIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(transitionsTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected GlobalIssueSetting getSetting() {
+ return StateTransitionListPage.this.getSetting();
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this transition?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getSetting().getTransitionSpecs().remove(transitionIndex);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(transitionsTable);
+ close();
+ }
+
+ });
+
+ return fragment;
+ }
+
+ };
+ }
+
+ });
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "text-right";
+ }
+
+ });
+
+ IDataProvider<TransitionSpec> dataProvider = new ListDataProvider<TransitionSpec>() {
+
+ @Override
+ protected List<TransitionSpec> getData() {
+ return getSetting().getTransitionSpecs();
+ }
+
+ };
+
+ add(transitionsTable = new DataTable<TransitionSpec, Void>("stateTransitions", columns, dataProvider, Integer.MAX_VALUE));
+ transitionsTable.addTopToolbar(new HeadersToolbar<Void>(transitionsTable, null));
+ transitionsTable.addBottomToolbar(new NoRecordsToolbar(transitionsTable));
+ transitionsTable.add(new NoRecordsBehavior());
+
+ transitionsTable.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(getSetting().getTransitionSpecs(), fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(getSetting().getTransitionSpecs(), fromIndex-i, fromIndex-i-1);
+ }
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(transitionsTable);
+ }
+
+ }.sortable("tbody"));
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "<span class='text-truncate'>Issue State Transitions</span>").setEscapeModelStrings(false);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionsPage.html
deleted file mode 100644
index 9a12deca06..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionsPage.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wicket:extend>
- <div class="help-block">Define default issue transitions for all projects here.
- A certain project can override this setting to define its own issue transitions.</div>
- <div wicket:id="content"></div>
-</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionsPage.java
deleted file mode 100644
index d1a415566f..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionsPage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.onedev.server.web.page.admin.issuesetting.transitionspec;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.web.component.issue.statetransition.StateTransitionListPanel;
-import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
-
-@SuppressWarnings("serial")
-public class StateTransitionsPage extends IssueSettingPage {
-
- public StateTransitionsPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new StateTransitionListPanel("content", getSetting().getTransitionSpecs()) {
-
- @Override
- protected void onChanged(AjaxRequestTarget target) {
- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
- }
-
- });
-
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.html
similarity index 79%
rename from server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.html
index c376528002..a2bf7f91a4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="transition-spec-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Edit State Transition</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
similarity index 84%
rename from server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
index 61d50f6e4c..1535820ce2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.issue.statetransition;
+package io.onedev.server.web.page.admin.issuesetting.transitionspec;
import java.util.List;
@@ -24,13 +24,11 @@ import io.onedev.server.web.editable.BeanEditor;
@SuppressWarnings("serial")
abstract class TransitionEditPanel extends Panel implements InputContext {
- private final List<TransitionSpec> transitions;
-
private final int transitionIndex;
- public TransitionEditPanel(String id, List<TransitionSpec> transitions, int transitionIndex) {
+ public TransitionEditPanel(String id, int transitionIndex) {
super(id);
- this.transitions = transitions;
+
this.transitionIndex = transitionIndex;
}
@@ -40,10 +38,10 @@ abstract class TransitionEditPanel extends Panel implements InputContext {
TransitionSpec transition;
if (transitionIndex != -1)
- transition = SerializationUtils.clone(transitions.get(transitionIndex));
+ transition = SerializationUtils.clone(getSetting().getTransitionSpecs().get(transitionIndex));
else
transition = new TransitionSpec();
-
+
Form<?> form = new Form<Void>("form") {
@Override
@@ -78,10 +76,11 @@ abstract class TransitionEditPanel extends Panel implements InputContext {
super.onSubmit(target, form);
if (transitionIndex != -1)
- transitions.set(transitionIndex, transition);
+ getSetting().getTransitionSpecs().set(transitionIndex, transition);
else
- transitions.add(transition);
- onChanged(target);
+ getSetting().getTransitionSpecs().add(transition);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ onSave(target);
}
});
@@ -119,7 +118,9 @@ abstract class TransitionEditPanel extends Panel implements InputContext {
return getIssueSetting().getFieldSpec(inputName);
}
- protected abstract void onChanged(AjaxRequestTarget target);
+ protected abstract GlobalIssueSetting getSetting();
+
+ protected abstract void onSave(AjaxRequestTarget target);
protected abstract void onCancel(AjaxRequestTarget target);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.html
index 1d43597d24..571b8bb28b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.html
@@ -1,11 +1,9 @@
<wicket:panel>
<form wicket:id="form" class="leave-confirm">
<div wicket:id="feedback"></div>
- <div wicket:id="editor"></div>
- <div class="actions">
- <button wicket:id="save" type="submit" class="btn btn-primary dirty-aware">Save</button>
- <button wicket:id="testingExecutor" type="submit" class="btn btn-primary">Test</button>
- <button wicket:id="cancel" class="btn btn-secondary">Cancel</button>
- </div>
+ <div wicket:id="editor" class="mb-4"></div>
+ <button wicket:id="save" type="submit" class="btn btn-primary dirty-aware mr-1">Save</button>
+ <button wicket:id="testingExecutor" type="submit" class="btn btn-light-primary mr-1">Test</button>
+ <button wicket:id="cancel" class="btn btn-secondary">Cancel</button>
</form>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
index 2ce99bbc6a..50b69ca8b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
@@ -21,7 +21,7 @@ import org.apache.wicket.util.visit.IVisitor;
import com.google.common.collect.Sets;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
@@ -181,7 +181,7 @@ abstract class JobExecutorEditPanel extends Panel {
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- protected String runTask(JobLogger logger) {
+ protected String runTask(SimpleLogger logger) {
((Testable)bean.getExecutor()).test(testData, logger);
return "Job executor tested successfully";
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
index 3814c78d03..25f91f6e51 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
@@ -1,13 +1,22 @@
<wicket:panel>
<div class="job-executor card">
<div class="card-header">
- <span class="drag-indicator"><wicket:svg href="grip" class="icon"></wicket:svg></span>
- <span wicket:id="name" class="name"></span>
- <a wicket:id="edit" title="Edit this executor"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete this executor"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- <div class="form-check-inline">
- <input wicket:id="enable" type="checkbox" class="form-check-input">
- <label wicket:id="enableLabel" class="form-check-label">Enable</label>
+ <div class="card-title">
+ <span class="drag-indicator mr-2"><wicket:svg href="grip" class="icon"></wicket:svg></span>
+ <span wicket:id="name" class="name mr-3"></span>
+ <a wicket:id="edit" title="Edit this executor" class="btn btn-light btn-xs btn-icon btn-hover-primary text-muted mr-2">
+ <wicket:svg href="edit" class="icon"/>
+ </a>
+ <a wicket:id="delete" title="Delete this executor" class="btn btn-light btn-xs btn-icon btn-hover-danger text-muted mr-4">
+ <wicket:svg href="trash" class="icon"/>
+ </a>
+ </div>
+ <div class="card-toolbar">
+ <span class="switch switch-sm switch-primary mb-n2">
+ <label>
+ <input wicket:id="enable" type="checkbox">
+ </label>
+ </span>
</div>
</div>
<div class="card-body">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
index 33c9514b0d..3480d9035e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
@@ -8,7 +8,6 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -97,8 +96,7 @@ abstract class JobExecutorPanel extends Panel {
});
- AjaxCheckBox checkbox;
- add(checkbox = new AjaxCheckBox("enable", Model.of(getExecutor().isEnabled())) {
+ add(new AjaxCheckBox("enable", Model.of(getExecutor().isEnabled())) {
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -108,7 +106,6 @@ abstract class JobExecutorPanel extends Panel {
}
});
- add(new WebMarkupContainer("enableLabel").add(AttributeAppender.append("for", checkbox.getMarkupId())));
add(BeanContext.view("executor", getExecutor()).setOutputMarkupId(true));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html
index bbd2acb5fb..afe0052883 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html
@@ -1,23 +1,36 @@
<wicket:extend>
- <div class="page-title">Job Executors</div>
- <div class="help-block">
- For a given build job, the first matching job executor will be used
- </div>
- <div wicket:id="jobExecutorSetting" class="card-list">
- <ul class="list-unstyled job-executors">
- <li wicket:id="executors" class="job-executor"><div wicket:id="executor"></div></li>
- </ul>
- <div wicket:id="newExecutor"></div>
+ <div class="job-executors">
+ <div class="alert alert-info mb-5">
+ <wicket:svg href="bulb" class="icon"></wicket:svg>
+ For a given build job, the first matching executor will be used
+ </div>
+
+ <div class="body">
+ <div wicket:id="jobExecutorSetting">
+ <ul class="list-unstyled">
+ <li wicket:id="executors" class="executor mb-5"><div wicket:id="executor"></div></li>
+ </ul>
+ <div wicket:id="newExecutor"></div>
+ </div>
+ </div>
</div>
<wicket:fragment wicket:id="editNewFrag">
<div class="executor card">
- <div class="card-header">Edit Executor</div>
+ <div class="card-header">
+ <div class="card-title">Edit Executor</div>
+ </div>
<div class="card-body">
<div wicket:id="editor"></div>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="addNewLinkFrag">
- <a wicket:id="link" class="add-new"><wicket:svg href="plus-circle-o" class="icon"></wicket:svg> Add Executor</a>
+ <div class="card">
+ <div class="card-header">
+ <div class="card-title">
+ <a wicket:id="link" class="add-new"><wicket:svg href="plus-circle-o" class="icon align-middle mr-1"></wicket:svg> <span>Add Executor</span></a>
+ </div>
+ </div>
+ </div>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.java
index 5e9e6c65c6..db230d3e99 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.java
@@ -6,6 +6,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -83,7 +84,7 @@ public class JobExecutorsPage extends AdministrationPage {
target.add(container);
}
- }.items("li.executor").handle(".panel-heading"));
+ }.items("li.executor").handle(".card-header"));
container.add(newAddNewFrag());
}
@@ -122,4 +123,9 @@ public class JobExecutorsPage extends AdministrationPage {
return fragment;
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Job Executors");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html
index 9a873d97f3..6ba932a861 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html
@@ -1,10 +1,11 @@
<wicket:extend>
- <div class="page-title">Mail Setting</div>
- <form wicket:id="mailSetting" class="mail-setting leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions">
- <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save Setting">
- <input wicket:id="sendingTestMail" type="submit" class="btn btn-primary" value="Send Test Mail">
+ <div class="card mail-setting">
+ <div class="card-body">
+ <form wicket:id="mailSetting" class="leave-confirm">
+ <div wicket:id="editor" class="mb-4"></div>
+ <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware mr-1" value="Save Setting">
+ <input wicket:id="sendingTestMail" type="submit" class="btn btn-light-primary" value="Send Test Mail">
+ </form>
</div>
- </form>
+ </div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
index 8e6296c61e..d34f49add7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
@@ -1,6 +1,8 @@
package io.onedev.server.web.page.admin.mailsetting;
+import org.apache.wicket.Component;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -14,7 +16,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.User;
import io.onedev.server.notification.MailManager;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.component.taskbutton.TaskButton;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
@@ -65,7 +67,7 @@ public class MailSettingPage extends AdministrationPage {
}
@Override
- protected String runTask(JobLogger logger) {
+ protected String runTask(SimpleLogger logger) {
User user = SecurityUtils.getUser();
String body = "Great, your mail setting is working!";
@@ -98,4 +100,9 @@ public class MailSettingPage extends AdministrationPage {
add(form);
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Mail Setting");
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.html
index af436c71d4..b10a3b4403 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.html
@@ -1,11 +1,13 @@
<wicket:extend>
- <div class="page-title">New Role</div>
- <div class="new-role">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions clearfix">
- <input class="btn btn-primary dirty-aware float-left" value="Save" type="submit">
- </div>
- </form>
+ <div class="new-role card">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor"></div>
+ <input class="btn btn-primary dirty-aware mt-3" value="Save" type="submit">
+ </form>
+ </div>
</div>
+ <wicket:fragment wicket:id="topbarTitleFrag">
+ <a wicket:id="roles">Roles</a> <span class="dot"></span> <span class="text-truncate">Create New</span>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java
index 8ca607d9ff..dbe8fb5882 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java
@@ -1,9 +1,10 @@
package io.onedev.server.web.page.admin.role;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -61,9 +62,10 @@ public class NewRolePage extends AdministrationPage {
}
@Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new RoleCssResourceReference()));
+ protected Component newTopbarTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "topbarTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("roles", RoleListPage.class));
+ return fragment;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleCssResourceReference.java
deleted file mode 100644
index 526ef4452b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.admin.role;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class RoleCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public RoleCssResourceReference() {
- super(RoleCssResourceReference.class, "role.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html
index 6e33461671..9698278440 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html
@@ -1,17 +1,21 @@
<wicket:extend>
- <div class="page-title">Role Detail</div>
- <div wicket:id="content" id="role"></div>
+ <div class="card">
+ <div wicket:id="content" class="card-body"></div>
+ </div>
<wicket:fragment wicket:id="ownerFrag">
<div class="alert alert-info"><b>Project Owner</b> is a built-in role with full permission over projects</div>
</wicket:fragment>
<wicket:fragment wicket:id="nonOwnerFrag">
<form wicket:id="form" class="leave-confirm">
+ <div wicket:id="feedback" class="mb-4"></div>
<div wicket:id="editor"></div>
- <div wicket:id="feedback"></div>
- <div class="actions clearfix">
- <input class="btn btn-primary dirty-aware float-left" value="Save" type="submit">
- <a wicket:id="delete" class="btn btn-danger float-right">Delete</a>
+ <div class="mt-5 d-flex">
+ <input class="btn btn-primary dirty-aware mr-1" value="Save" type="submit">
+ <a wicket:id="delete" class="btn btn-danger ml-auto">Delete</a>
</div>
</form>
</wicket:fragment>
+ <wicket:fragment wicket:id="topbarTitleFrag">
+ <a wicket:id="roles">Roles</a> <span class="dot"></span> <span wicket:id="roleName" class="text-truncate"></span>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java
index 4a2bba5eae..bdc6bc20c4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java
@@ -3,12 +3,13 @@ package io.onedev.server.web.page.admin.role;
import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.Session;
import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
@@ -141,12 +142,6 @@ public class RoleDetailPage extends AdministrationPage {
super.onDetach();
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new RoleCssResourceReference()));
- }
-
public Role getRole() {
return roleModel.getObject();
}
@@ -162,4 +157,12 @@ public class RoleDetailPage extends AdministrationPage {
return params;
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "topbarTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("roles", RoleListPage.class));
+ fragment.add(new Label("roleName", getRole().getName()));
+ return fragment;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html
index 3b5085b3ba..24a3f483a5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html
@@ -1,22 +1,19 @@
<wicket:extend>
- <div class="page-title">Role Administration</div>
- <div class="role-list list">
- <div class="head clearfix">
- <div class="float-left clearable-wrapper">
- <input wicket:id="filterRoles" class="form-control search" placeholder="Filter roles">
+ <div class="card">
+ <div class="card-body">
+ <div class="d-flex align-items-center mb-4">
+ <div class="clearable-wrapper flex-grow-1 mr-3">
+ <input wicket:id="filterRoles" class="form-control search" placeholder="Filter roles...">
+ </div>
+ <a wicket:id="addNew" class="btn btn-icon btn-primary flex-shrink-0"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New Role</a>
- </div>
- </div>
- <div class="body">
- <table wicket:id="roles" class="roles table table-hover"></table>
+ <table wicket:id="roles" class="roles table"></table>
</div>
</div>
<wicket:fragment wicket:id="nameFrag">
<a wicket:id="link"><span wicket:id="label"></span></a>
</wicket:fragment>
<wicket:fragment wicket:id="actionFrag">
- <a wicket:id="delete" title="Delete this role"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this role"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
index 2159a8259d..8bbc686d4f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -15,8 +16,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextField;
@@ -178,7 +177,7 @@ public class RoleListPage extends AdministrationPage {
}
});
- columns.add(new AbstractColumn<Role, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<Role, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<Role>> cellItem, String componentId, IModel<Role> rowModel) {
@@ -284,9 +283,8 @@ public class RoleListPage extends AdministrationPage {
}
@Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new RoleCssResourceReference()));
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Roles");
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.css b/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html
deleted file mode 100644
index d360e8f57f..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<wicket:extend>
- <div class="page-title">Security Setting</div>
- <div class="security-setting">
- <form wicket:id="securitySetting" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions">
- <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting">
- </div>
- </form>
- </div>
-</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.html
index a5188911fe..7c234d4a2d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.html
@@ -1,42 +1,43 @@
<wicket:extend>
- <div class="server-information">
- <div class="page-title">Server Information</div>
- <table class="table">
- <tbody>
- <tr>
- <td class="name">System Date and Time</td>
- <td wicket:id="systemDateTime" class="value"></td>
- </tr>
- <tr>
- <td class="name">Operating System</td>
- <td wicket:id="os" class="value"></td>
- </tr>
- <tr>
- <td class="name">JVM</td>
- <td wicket:id="jvm" class="value"></td>
- </tr>
- <tr>
- <td class="name">Total Heap Memory</td>
- <td wicket:id="totalMemory" class="value"></td>
- </tr>
- <tr>
- <td class="name">Used Heap Memory</td>
- <td wicket:id="usedMemory" class="value"></td>
- </tr>
- <tr>
- <td class="name">Heap Memory Usage</td>
- <td class="value">
- <div class="progress mb-3">
- <div wicket:id="memoryUsage" class="progress-bar"></div>
- </div>
- <button wicket:id="gc" class="btn btn-outline-secondary btn-sm gc">Force Garbage Collection</button>
- </td>
- </tr>
- <tr>
- <td class="name">OS User Name</td>
- <td wicket:id="osUserName" class="value"></td>
- </tr>
- </tbody>
- </table>
+ <div class="server-information card">
+ <div class="card-body">
+ <table class="table table-borderless">
+ <tbody>
+ <tr>
+ <td class="name font-weight-bold">System Date and Time</td>
+ <td wicket:id="systemDateTime" class="value"></td>
+ </tr>
+ <tr>
+ <td class="name font-weight-bold">Operating System</td>
+ <td wicket:id="os" class="value"></td>
+ </tr>
+ <tr>
+ <td class="name font-weight-bold">JVM</td>
+ <td wicket:id="jvm" class="value"></td>
+ </tr>
+ <tr>
+ <td class="name font-weight-bold">Total Heap Memory</td>
+ <td wicket:id="totalMemory" class="value"></td>
+ </tr>
+ <tr>
+ <td class="name font-weight-bold">Used Heap Memory</td>
+ <td wicket:id="usedMemory" class="value"></td>
+ </tr>
+ <tr>
+ <td class="name font-weight-bold">Heap Memory Usage</td>
+ <td class="value">
+ <div class="progress mb-3">
+ <div wicket:id="memoryUsage" class="progress-bar"></div>
+ </div>
+ <button wicket:id="gc" class="btn btn-outline-primary btn-sm gc">Force Garbage Collection</button>
+ </td>
+ </tr>
+ <tr>
+ <td class="name font-weight-bold">OS User Name</td>
+ <td wicket:id="osUserName" class="value"></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
index 29a248d651..6075ee1803 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.page.admin.serverinformation;
import java.util.Date;
+import org.apache.wicket.Component;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
@@ -75,4 +76,10 @@ public class ServerInformationPage extends AdministrationPage {
});
}
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Server Information");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html
index 7c859628f9..ed0dacf6e5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html
@@ -1,11 +1,8 @@
<wicket:extend>
- <div class="page-title">Server Log</div>
- <div class="server-log">
- <div class="head">
- <a wicket:id="download" class="btn btn-outline-secondary"><wicket:svg href="download" class="icon"/> Download Full Log</a>
- </div>
- <div class="body">
- <div wicket:id="warning" class="alert alert-warning"></div>
+ <div wicket:id="warning" class="alert alert-warning mb-4"></div>
+ <div class="card server-log">
+ <div class="card-body">
+ <a wicket:id="download" class="btn btn-light btn-hover-primary btn-block mb-4" title="Download log"><wicket:svg href="download" class="icon mr-2"/> Download</a>
<pre wicket:id="logContent"></pre>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java
index ff5ba8bcaf..a92eba6adb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.page.admin.serverlog;
import java.util.List;
+import org.apache.wicket.Component;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.ResourceLink;
@@ -41,4 +42,9 @@ public class ServerLogPage extends AdministrationPage {
add(new Label("logContent", content));
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Server Log");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.html
index f5b359f006..ee5edfeed1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.html
@@ -1,12 +1,11 @@
<wicket:extend>
- <div id="ssh-setting">
- <div class="page-title">SSH Setting</div>
- <form wicket:id="form" class="leave-confirm no-autosize">
- <div wicket:id="editor"></div>
- <div class="actions">
- <a wicket:id="rekey" class="btn btn-primary">Regenerate Private Key</a>
- <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting">
- </div>
- </form>
+ <div class="card ssh-setting">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor" class="mb-4"></div>
+ <input type="submit" class="btn btn-primary dirty-aware mr-1" value="Save Setting">
+ <a wicket:id="rekey" class="btn btn-light-primary">Regenerate Private Key</a>
+ </form>
+ </div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
index 710141c202..da49c57126 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
@@ -1,7 +1,9 @@
package io.onedev.server.web.page.admin.ssh;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -66,5 +68,10 @@ public class SshSettingPage extends AdministrationPage {
form.setOutputMarkupId(true);
add(form);
}
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "SSH Setting");
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.html
index 6a1d71232d..24a350a455 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="sso-connector-edit leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Edit Single Sign On Provider</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.html
index 080fccbe6d..5ea39ae640 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.html
@@ -1,26 +1,21 @@
<wicket:extend>
- <div id="sso-connectors">
- <div class="page-title">Single Sign On Providers</div>
- <div class="def-list list">
- <div class="head clearfix">
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New</a>
- </div>
- </div>
- <div class="body">
- <table wicket:id="connectors" class="table table-hover"></table>
- </div>
+ <div class="card">
+ <div class="card-body">
+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add SSO Provider"><wicket:svg href="plus" class="icon"/></a>
+ <table wicket:id="connectors" class="table"></table>
</div>
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span> </a>
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></a>
</wicket:fragment>
- <wicket:fragment wicket:id="viewConnectorFrag">
- <div class="actions">
- <a wicket:id="edit" class="btn btn-sm btn-secondary"><wicket:svg href="edit" class="icon"></wicket:svg> Edit</a>
- <a wicket:id="delete" class="btn btn-sm btn-secondary"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
- </div>
- <div wicket:id="feedback"></div>
+ <wicket:fragment wicket:id="connectorDetailFrag">
+ <div wicket:id="additionalInfo" class="mb-4"></div>
<div wicket:id="viewer"></div>
</wicket:fragment>
+ <wicket:fragment wicket:id="connectorActionsFrag">
+ <div class="d-flex">
+ <a wicket:id="edit" class="btn btn-light-primary mr-1">Edit</a>
+ <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
+ </div>
+ </wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java
index ca68895577..b31c50d79b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java
@@ -15,8 +15,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -36,15 +34,17 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.server.web.page.layout.SideFloating;
@SuppressWarnings("serial")
public class SsoConnectorListPage extends AdministrationPage {
@@ -95,16 +95,9 @@ public class SsoConnectorListPage extends AdministrationPage {
@Override
public void populateItem(Item<ICellPopulator<SsoConnector>> cellItem, String componentId, IModel<SsoConnector> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(LoopItem.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- String html = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg> %s",
- SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(rowModel.getObject().getName()));
- return new Label(componentId, html).setEscapeModelStrings(false);
- }
-
- });
+ String html = String.format("<svg class='drag-indicator icon'><use xlink:href='%s'/></svg> %s",
+ SpriteImage.getVersionedHref("grip"), HtmlEscape.escapeHtml5(rowModel.getObject().getName()));
+ cellItem.add(new Label(componentId, html).setEscapeModelStrings(false));
}
});
@@ -112,14 +105,7 @@ public class SsoConnectorListPage extends AdministrationPage {
@Override
public void populateItem(Item<ICellPopulator<SsoConnector>> cellItem, String componentId, IModel<SsoConnector> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(LoopItem.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, EditableUtils.getDisplayName(rowModel.getObject().getClass()));
- }
-
- });
+ cellItem.add(new Label(componentId, EditableUtils.getDisplayName(rowModel.getObject().getClass())));
}
});
@@ -128,29 +114,106 @@ public class SsoConnectorListPage extends AdministrationPage {
@Override
public void populateItem(Item<ICellPopulator<SsoConnector>> cellItem, String componentId, IModel<SsoConnector> rowModel) {
- cellItem.add(new ColumnFragment(componentId, 0) {
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", SsoConnectorListPage.this);
+ int connectorIndex = cellItem.findParent(LoopItem.class).getIndex();
+
+ fragment.add(new AjaxLink<Void>("link") {
@Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, rowModel.getObject().getName());
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "sso-connector"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ Fragment fragment = new Fragment(id, "connectorDetailFrag", SsoConnectorListPage.this);
+
+ fragment.add(connectors.get(connectorIndex).renderAdditionalInfo("additionalInfo"));
+
+ fragment.add(BeanContext.view("viewer", rowModel.getObject(), Sets.newHashSet("name"), true));
+ fragment.setOutputMarkupId(true);
+
+ return fragment;
+ }
@Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
+ protected Component newFooter(String componentId) {
+ Fragment fragment = new Fragment(componentId, "connectorActionsFrag", SsoConnectorListPage.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ close();
+ return new SsoConnectorEditPanel(id, connectorIndex) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(connectorsTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected List<SsoConnector> getConnectors() {
+ return connectors;
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this connector?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ SsoConnector connector = connectors.remove(connectorIndex);
+ OneDev.getInstance(TransactionManager.class).run(new Runnable() {
+
+ @Override
+ public void run() {
+ OneDev.getInstance(SettingManager.class).saveSsoConnectors(connectors);
+ OneDev.getInstance(UserManager.class).onDeleteSsoConnector(connector.getName());
+ }
+
+ });
+ target.add(connectorsTable);
+ close();
+ }
+
+ });
+ return fragment;
}
-
- };
+
+ };
}
});
-
+ cellItem.add(fragment);
}
@Override
public String getCssClass() {
- return "ellipsis";
+ return "text-right";
}
});
@@ -167,6 +230,7 @@ public class SsoConnectorListPage extends AdministrationPage {
add(connectorsTable = new DataTable<SsoConnector, Void>("connectors", columns, dataProvider, Integer.MAX_VALUE));
connectorsTable.addTopToolbar(new HeadersToolbar<Void>(connectorsTable, null));
connectorsTable.addBottomToolbar(new NoRecordsToolbar(connectorsTable));
+ connectorsTable.add(new NoRecordsBehavior());
connectorsTable.setOutputMarkupId(true);
connectorsTable.add(new SortBehavior() {
@@ -189,118 +253,10 @@ public class SsoConnectorListPage extends AdministrationPage {
}.sortable("tbody"));
}
-
- private abstract class ColumnFragment extends Fragment {
-
- private final int connectorIndex;
-
- public ColumnFragment(String id, int connectorIndex) {
- super(id, "columnFrag", SsoConnectorListPage.this);
- this.connectorIndex = connectorIndex;
- }
- protected abstract Component newLabel(String componentId);
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new SideFloating(target, SideFloating.Placement.RIGHT) {
-
- private SsoConnector getConnector() {
- return connectors.get(connectorIndex);
- }
-
- @Override
- protected String getTitle() {
- return getConnector().getName();
- }
-
- @Override
- protected Component renderSubHeader(String componentId) {
- return connectors.get(connectorIndex).renderSubHeader(componentId);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "sso-connector def-detail"));
- }
-
- @Override
- protected Component newBody(String id) {
- SideFloating sideFloating = this;
- Fragment fragment = new Fragment(id, "viewConnectorFrag", SsoConnectorListPage.this);
- fragment.add(BeanContext.view("viewer", getConnector(), Sets.newHashSet("name"), true));
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- sideFloating.close();
- return new SsoConnectorEditPanel(id, connectorIndex) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(connectorsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected List<SsoConnector> getConnectors() {
- return connectors;
- }
-
- };
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this connector?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- SsoConnector connector = connectors.remove(connectorIndex);
- OneDev.getInstance(TransactionManager.class).run(new Runnable() {
-
- @Override
- public void run() {
- OneDev.getInstance(SettingManager.class).saveSsoConnectors(connectors);
- OneDev.getInstance(UserManager.class).onDeleteSsoConnector(connector.getName());
- }
-
- });
- target.add(connectorsTable);
- close();
- }
-
- });
-
- fragment.add(new FencedFeedbackPanel("feedback", fragment));
- fragment.setOutputMarkupId(true);
-
- return fragment;
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
-
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "<span class='text-truncate'>Single Sign On Providers</span>").setEscapeModelStrings(false);
}
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorResourceReference.java
deleted file mode 100644
index 8868647b21..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.admin.sso;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class SsoConnectorResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public SsoConnectorResourceReference() {
- super(SsoConnectorResourceReference.class, "sso-connector.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java
index 2bf56d9f26..f092a3315b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java
@@ -16,7 +16,7 @@ import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.page.DashboardPage;
import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.page.simple.security.LoginPage;
@SuppressWarnings("serial")
public class SsoProcessPage extends BasePage {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/sso-connector.css b/server-core/src/main/java/io/onedev/server/web/page/admin/sso/sso-connector.css
deleted file mode 100644
index 92b2a58743..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/sso-connector.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.groovy-script.def-detail td.name {
- width: 120px !important;
-}
-@media(min-width: 768px) {
-.groovy-script.floating.side.def-detail {
- width: 600px;
-}
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html
index d8e84f15db..ebe02fc702 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html
@@ -1,9 +1,10 @@
<wicket:extend>
- <div class="page-title">System Setting</div>
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions">
- <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting">
+ <div class="card">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor" class="mb-4"></div>
+ <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting">
+ </form>
</div>
- </form>
+ </div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java
index f36b05f590..94c9231fa3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java
@@ -4,6 +4,8 @@ import java.io.File;
import java.util.Collection;
import java.util.HashSet;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -49,4 +51,9 @@ public class SystemSettingPage extends AdministrationPage {
add(form);
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "System Setting");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
index 526b3105df..11efa96b50 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
@@ -1,23 +1,20 @@
<wicket:extend>
- <div class="page-title">User Administration</div>
- <div class="user-list list">
- <div class="head clearfix">
- <div class="float-left clearable-wrapper">
- <input wicket:id="filterUsers" class="form-control search" placeholder="Filter users">
+ <div class="card user-list">
+ <div class="card-body">
+ <div class="d-flex align-items-center mb-4">
+ <div class="clearable-wrapper flex-grow-1 mr-3">
+ <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by name">
+ </div>
+ <a wicket:id="addNew" class="btn btn-icon btn-primary flex-shrink-0"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New User</a>
- </div>
- </div>
- <div class="body">
- <table wicket:id="users" class="users table table-hover"></table>
+ <table wicket:id="users" class="users table"></table>
</div>
</div>
<wicket:fragment wicket:id="nameFrag">
<a wicket:id="link"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a>
</wicket:fragment>
- <wicket:fragment wicket:id="actionFrag">
- <a wicket:id="impersonate" title="Impersonate this user"><wicket:svg href="user-tick" class="icon"/></a>
- <a wicket:id="delete" title="Delete this user"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <wicket:fragment wicket:id="actionsFrag">
+ <a wicket:id="impersonate" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-2" title="Impersonate this user"><wicket:svg href="user-tick" class="icon align-middle"/></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this user"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
index 279ad33794..3791b2c896 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -43,7 +44,7 @@ import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
import io.onedev.server.web.component.link.ActionablePageLink;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.UserAvatar;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.page.admin.user.create.NewUserPage;
import io.onedev.server.web.page.admin.user.profile.UserProfilePage;
@@ -191,7 +192,7 @@ public class UserListPage extends AdministrationPage {
@Override
public String getCssClass() {
- return "expanded";
+ return "d-none d-lg-table-cell";
}
@Override
@@ -206,7 +207,7 @@ public class UserListPage extends AdministrationPage {
@Override
public String getCssClass() {
- return "expanded";
+ return "d-none d-lg-table-cell";
}
@Override
@@ -221,7 +222,7 @@ public class UserListPage extends AdministrationPage {
@Override
public String getCssClass() {
- return "expanded";
+ return "d-none d-lg-table-cell";
}
@Override
@@ -231,11 +232,11 @@ public class UserListPage extends AdministrationPage {
});
- columns.add(new AbstractColumn<User, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<User, Void>(Model.of("Actions")) {
@Override
public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId, IModel<User> rowModel) {
- Fragment fragment = new Fragment(componentId, "actionFrag", UserListPage.this);
+ Fragment fragment = new Fragment(componentId, "actionsFrag", UserListPage.this);
fragment.add(new AjaxLink<Void>("delete") {
@@ -354,4 +355,9 @@ public class UserListPage extends AdministrationPage {
response.render(CssHeaderItem.forReference(new UserCssResourceReference()));
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Users");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.html
index 2801f039ca..5f8eb5092a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.html
@@ -1,22 +1,11 @@
<wicket:extend>
- <div id="user">
- <div wicket:id="userSidebar"></div>
- <div class="content">
+ <div class="card user-detail">
+ <div class="card-body">
+ <ul wicket:id="userTabs" class="tabs nav nav-bold nav-tabs nav-tabs-line text-weight-bold mb-4"></ul>
<wicket:child></wicket:child>
</div>
</div>
- <wicket:fragment wicket:id="sidebarHeadFrag">
- <img wicket:id="avatar" class="mr-2">
- <span wicket:id="name"></span>
- </wicket:fragment>
- <wicket:fragment wicket:id="navContextFrag">
- <a wicket:id="dropdown" class="dropdown user-dropdown">
- <img wicket:id="avatar">
- <span wicket:id="name" class="ellipsis-text"></span>
- <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>
- </a>
- </wicket:fragment>
- <wicket:fragment wicket:id="navContextDropdownFrag">
- <ul wicket:id="menu" class="menu list-unstyled"></ul>
+ <wicket:fragment wicket:id="topbarTitleFrag">
+ <a wicket:id="users">Users</a> <span class="dot"></span> <span wicket:id="userName"></span>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
index eb01244988..eabf6660c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
@@ -6,27 +6,21 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.web.component.floating.AlignPlacement;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.sidebar.SideBar;
import io.onedev.server.web.component.tabbable.PageTab;
-import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.page.admin.user.accesstoken.UserAccessTokenPage;
import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;
@@ -68,27 +62,6 @@ public abstract class UserPage extends AdministrationPage {
protected void onInitialize() {
super.onInitialize();
- add(new SideBar("userSidebar", null) {
-
- @Override
- protected Component newHead(String componentId) {
- Fragment fragment = new Fragment(componentId, "sidebarHeadFrag", UserPage.this);
- User user = userModel.getObject();
- fragment.add(new UserAvatar("avatar", user)
- .add(AttributeAppender.append("title", user.getDisplayName())));
- fragment.add(new Label("name", user.getDisplayName()));
- return fragment;
- }
-
- @Override
- protected List<? extends Tab> newTabs() {
- return UserPage.this.newTabs();
- }
-
- });
- }
-
- private List<? extends Tab> newTabs() {
List<PageTab> tabs = new ArrayList<>();
tabs.add(new UserTab("Profile", "profile", UserProfilePage.class));
@@ -100,9 +73,9 @@ public abstract class UserPage extends AdministrationPage {
tabs.add(new UserTab("SSH Keys", "key", UserSshKeysPage.class));
tabs.add(new UserTab("Access Token", "token", UserAccessTokenPage.class));
- return tabs;
+ add(new Tabbable("userTabs", tabs));
}
-
+
@Override
protected void onDetach() {
userModel.detach();
@@ -110,32 +83,6 @@ public abstract class UserPage extends AdministrationPage {
super.onDetach();
}
- @Override
- protected Component newNavContext(String componentId) {
- Fragment fragment = new Fragment(componentId, "navContextFrag", this);
- DropdownLink link = new DropdownLink("dropdown", AlignPlacement.bottom(15)) {
-
- @Override
- protected void onInitialize(FloatingPanel dropdown) {
- super.onInitialize(dropdown);
- dropdown.add(AttributeAppender.append("class", "nav-context-dropdown user-nav-context-dropdown"));
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- Fragment fragment = new Fragment(id, "navContextDropdownFrag", UserPage.this);
- fragment.add(new Tabbable("menu", newTabs()));
- return fragment;
- }
-
- };
- link.add(new UserAvatar("avatar", getUser()));
- link.add(new Label("name", getUser().getDisplayName()));
- fragment.add(link);
-
- return fragment;
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -152,4 +99,12 @@ public abstract class UserPage extends AdministrationPage {
return params;
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "topbarTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("users", UserListPage.class));
+ fragment.add(new Label("userName", getUser().getDisplayName()));
+ return fragment;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTabHead.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTabHead.html
index ea469334a0..eee6128169 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTabHead.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTabHead.html
@@ -1,6 +1,6 @@
<wicket:panel>
- <a wicket:id="link">
- <svg wicket:id="icon" class="icon"></svg>
+ <a wicket:id="link" class="nav-link">
+ <svg wicket:id="icon" class="icon mr-1"></svg>
<span wicket:id="label" class="text"></span>
</a>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/accesstoken/UserAccessTokenPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/accesstoken/UserAccessTokenPage.html
index e41837ec59..b34efc8486 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/accesstoken/UserAccessTokenPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/accesstoken/UserAccessTokenPage.html
@@ -1,10 +1,7 @@
<wicket:extend>
<div id="user-access-token">
- <div class="page-title">
- Access Token
- <div class="help-block">Access token can be used to access api, or clone code in build spec via HTTP(S) protocol.
- It has same permission over all projects accessible by this user</div>
- </div>
+ <div class="font-size-sm text-muted mb-4"><wicket:svg href="bulb" class="icon"/> Access token can be used to access api, or clone code in build spec via HTTP(S) protocol.
+ It has same permission over all projects accessible by this user</div>
<div wicket:id="accessToken"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html
index 63aaae8654..1fbc80499e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html
@@ -1,10 +1,7 @@
<wicket:extend>
- <div class="page-title">Project Authorizations</div>
- <form wicket:id="form" class="authorization-list list">
- <div wicket:id="feedback"></div>
+ <form wicket:id="form" class="authorization-list leave-confirm">
+ <div wicket:id="feedback" class="mb-4"></div>
<div wicket:id="editor"></div>
- <div class="actions">
- <input type="submit" class="btn btn-primary" value="Save">
- </div>
+ <input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">
</form>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/avatar/UserAvatarPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/avatar/UserAvatarPage.java
index 9d01c866cb..4a93799518 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/avatar/UserAvatarPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/avatar/UserAvatarPage.java
@@ -17,5 +17,5 @@ public class UserAvatarPage extends UserPage {
super.onInitialize();
add(new AvatarEditPanel("content", userModel));
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.html
index 0d795ef099..d0af2360c8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.html
@@ -1,15 +1,18 @@
<wicket:extend>
- <div class="page-title">New User</div>
- <div class="new-user">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions clearfix">
- <input class="btn btn-primary dirty-aware float-left" value="Create" type="submit">
- <div class="form-check form-inline pt-1">
- <input wicket:id="continueToAdd" id="continueToAdd" type="checkbox" class="form-check-input">
- <label class="form-check-label" for="continueToAdd">Continue to add other user after create</label>
- </div>
- </div>
- </form>
+ <div class="card">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor" class="mb-4"></div>
+ <div class="d-flex align-items-center">
+ <input class="btn btn-primary dirty-aware mr-4" value="Create" type="submit">
+ <div class="checkbox-inline">
+ <label class="checkbox">
+ <input wicket:id="continueToAdd" type="checkbox" class="form-check-input">
+ Continue to add other user after create
+ </label>
+ </div>
+ </div>
+ </form>
+ </div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java
index 23630caa50..fc91312401 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java
@@ -1,9 +1,11 @@
package io.onedev.server.web.page.admin.user.create;
import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
@@ -96,4 +98,9 @@ public class NewUserPage extends AdministrationPage {
response.render(CssHeaderItem.forReference(new UserCssResourceReference()));
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Create User");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html
index 553e7a8262..3be64e0833 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html
@@ -1,19 +1,16 @@
<wicket:extend>
- <div class="page-title">Belonging Groups</div>
- <div class="membership-list list">
- <div class="head clearfix">
- <div wicket:id="externalManagedNote" class="alert alert-info"></div>
- <div class="float-left clearable-wrapper">
- <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by group name">
- </div>
- <div class="float-left">
- <input wicket:id="addNew" type="hidden" class="form-control">
- </div>
- <div class="float-left">
- <a wicket:id="deleteSelected" class="btn btn-secondary"><wicket:svg href="trash" class="icon"></wicket:svg> Delete Selected</a>
+ <div class="membership-list">
+ <div class="head">
+ <div wicket:id="externalManagedNote" class="alert alert-light-info mb-4"></div>
+ <div class="d-flex align-items-center flex-wrap">
+ <div class="clearable-wrapper mr-3 mb-4">
+ <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name...">
+ </div>
+ <input wicket:id="addNew" type="hidden" class="form-control mr-3 mb-4">
+ <a wicket:id="deleteSelected" class="btn btn-danger mb-4">Delete Selected</a>
</div>
</div>
- <table wicket:id="memberships" class="memberships table table-hover"></table>
+ <table wicket:id="memberships" class="memberships table"></table>
</div>
<wicket:fragment wicket:id="groupFrag">
<a wicket:id="group"></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java
index 36a22025f6..c0a40f7ee7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java
@@ -272,5 +272,5 @@ public class UserMembershipsPage extends UserPage {
add(membershipsTable = new HistoryAwareDataTable<Membership, Void>("memberships", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.html
index 9c2faa12fe..d93f935cce 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.html
@@ -1,4 +1,3 @@
<wicket:extend>
- <div class="page-title">Change Password</div>
<div wicket:id="content"></div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java
index d72d056161..821ff2e3d7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java
@@ -34,5 +34,5 @@ public class UserPasswordPage extends UserPage {
add(new PasswordEditPanel("content", userModel));
}
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.html
index 0fab081917..47f26df51e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.html
@@ -1,8 +1,5 @@
<wicket:extend>
- <div id="user-profile">
- <div class="page-title">User Profile</div>
- <div wicket:id="externalManagedNote" class="alert alert-info"></div>
- <div wicket:id="content"></div>
- <a wicket:id="delete" class="btn btn-danger">Delete</a>
- </div>
+ <div wicket:id="externalManagedNote" class="alert alert-info"></div>
+ <div wicket:id="content"></div>
+ <a wicket:id="delete" class="btn btn-danger">Delete</a>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html
index 622856cfec..4835fe2668 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html
@@ -1,9 +1,8 @@
<wicket:extend>
- <div class="page-title">SSH Keys</div>
<div class="user-ssh-key-list list">
<div class="head">
- <a class="add-new btn btn-success" wicket:id="newKey"><wicket:svg href="plus" class="icon"></wicket:svg> New SSH Key</a>
- <div wicket:id="sshKeyNote" class="alert alert-info"></div>
+ <div wicket:id="sshKeyNote" class="alert alert-light-info mb-4"></div>
+ <a class="add-new btn-icon btn btn-primary" title="Add SSH key" wicket:id="newKey"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
<div class="body">
<div wicket:id="keyList"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java
index e178d91a90..aca2b59c8f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java
@@ -84,5 +84,5 @@ public class UserSshKeysPage extends UserPage {
add(keyList.setOutputMarkupId(true));
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css b/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css
index f394950fa9..063824ca29 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css
@@ -1,64 +1,6 @@
-@media(max-width: 767px) {
- #user>.sidebar {
- display: none;
- }
- #user>.sidebar+.content {
- padding-left: 0;
- }
- .user-list.list .expanded {
- display: none;
- }
-}
-.nav-context .user-dropdown .avatar {
- width: 24px;
- height: 24px;
-}
-#user>.sidebar {
- background: white;
- border-left: none;
- /* make it absolute as we do not want to make it stay fixed to occupy screen space on mobile screen */
- position: absolute;
- z-index: 0;
- /* use hacks below to make the sidebar extend to the screen bottom even if body does not reach to the bottom */
- margin-bottom: -10000px;
- padding-bottom: 10000px;
-}
-#user>.sidebar>.head {
- border-bottom: 4px solid #EEE;
- padding: 10px;
- font-size: 16px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- height: 54px;
-}
-#user>.sidebar>.head img {
- width: 32px;
- height: 32px;
-}
-#user>.sidebar>.tabs {
- top: 54px;
-}
-#user>.sidebar>.tabs>li>a {
- padding: 12px 14px;
- border-left: none;
-}
-#administration>.minimized.sidebar+.content>#user>.sidebar {
- left: 44px;
-}
-
-#user .membership-list .head .select2-container,
-#user .authorization-list .select2-container {
+.user-detail .membership-list .head .select2-container {
width: 240px;
}
-#user .authorization-list .property-roleNames .select2-container {
- width: 360px;
-}
-
-.new-user .actions .btn {
- margin-right: 20px;
-}
-
-#user-profile>a, #my-profile>a {
- margin-top: 20px;
-}
+.user-detail .authorization-list .select2-container {
+ width: 100%;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.html b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.html
index e72e0630d9..6b1e8daae6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.html
@@ -17,11 +17,9 @@
<div wicket:id="sessionFeedback" id="session-feedback"></div>
<div id="ajax-loading-indicator"><div>Please wait...</div></div>
- <!-- Two divs are used here in order to make overlay works in IE. -->
- <div id="ajax-loading-overlay"><div></div></div>
<div wicket:id="keepSessionAlive" style="display:none;"></div>
- <div class="websocket-error websocket-server-error">
- <wicket:svg href="warning" class="icon"/> Page is in error, reload to recover
+ <div class="websocket-error">
+ Page is in error, reload to recover
</div>
<div wicket:id="rootComponents"></div>
</body>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index bbb6e0515d..def8d851ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -51,8 +51,8 @@ import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.page.init.ServerInitPage;
-import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.page.simple.security.LoginPage;
+import io.onedev.server.web.page.simple.serverinit.ServerInitPage;
import io.onedev.server.web.websocket.WebSocketManager;
@SuppressWarnings("serial")
@@ -74,25 +74,45 @@ public abstract class BasePage extends WebPage {
if (!isPermitted())
unauthorized();
- add(new Label("pageTitle", getPageTitle()) {
+ AbstractPostAjaxBehavior popStateBehavior;
+ add(popStateBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setMethod(Method.POST);
+ }
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ String encodedData = params.getParameterValue("data").toString();
+
+ byte[] bytes = Base64.decodeBase64(encodedData.getBytes());
+ Serializable data = (Serializable) SerializationUtils.deserialize(bytes);
+ onPopState(target, data);
+ resizeWindow(target);
+ target.appendJavaScript("onedev.server.viewState.getFromHistoryAndSetToView();");
+ }
+
+ });
+
+ add(new Label("pageTitle", getPageTitle()) {
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- /*
- * Render page resources in first child to make sure every other resources appears after it,
- * including onDomReady and onWindowLoad call
- */
response.render(JavaScriptHeaderItem.forReference(new BaseResourceReference()));
-
- response.render(OnDomReadyHeaderItem.forScript(String.format("onedev.server.onDomReady('%s');",
- SpriteImage.getVersionedHref(IconScope.class, null))));
+
+ response.render(OnDomReadyHeaderItem.forScript(
+ String.format("onedev.server.onDomReady('%s', %s);",
+ SpriteImage.getVersionedHref(IconScope.class, null),
+ popStateBehavior.getCallbackFunction(explicit("data")).toString())));
response.render(OnLoadHeaderItem.forScript("onedev.server.onWindowLoad();"));
}
});
-
add(new WebMarkupContainer("pageRefresh") {
@Override
@@ -125,6 +145,7 @@ public abstract class BasePage extends WebPage {
builder.append(clazz.getSimpleName()).append(" ");
clazz = clazz.getSuperclass();
}
+
String script = String.format("$('body').addClass('%s');", builder.toString());
add(new Label("script", script).setEscapeModelStrings(false));
@@ -134,63 +155,29 @@ public abstract class BasePage extends WebPage {
add(rootComponents = new RepeatingView("rootComponents"));
- if (!(getPage() instanceof LoginPage)) {
- add(new AbstractPostAjaxBehavior() {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.setMethod(Method.POST);
- }
+ int sessionTimeout = AppLoader.getInstance(ServletContextHandler.class)
+ .getSessionHandler().getMaxInactiveInterval();
+ add(new WebMarkupContainer("keepSessionAlive")
+ .add(new AjaxSelfUpdatingTimerBehavior(Duration.milliseconds(sessionTimeout*500L))));
+
+ add(new WebSocketBehavior() {
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- String encodedData = params.getParameterValue("data").toString();
-
- byte[] bytes = Base64.decodeBase64(encodedData.getBytes());
- Serializable data = (Serializable) SerializationUtils.deserialize(bytes);
- onPopState(target, data);
- target.appendJavaScript("onedev.server.viewState.getFromHistoryAndSetToView();");
- }
+ @Override
+ protected void onMessage(WebSocketRequestHandler handler, TextMessage message) {
+ super.onMessage(handler, message);
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
-
- String script = String.format("onedev.server.history.init(%s);",
- getCallbackFunction(explicit("data")));
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- });
-
- int sessionTimeout = AppLoader.getInstance(ServletContextHandler.class)
- .getSessionHandler().getMaxInactiveInterval();
- add(new WebMarkupContainer("keepSessionAlive")
- .add(new AjaxSelfUpdatingTimerBehavior(Duration.milliseconds(sessionTimeout*500L))));
+ if (message.getText().startsWith(WebSocketManager.OBSERVABLE_CHANGED)) {
+ List<String> observables = Splitter.on('\n').splitToList(
+ message.getText().substring(WebSocketManager.OBSERVABLE_CHANGED.length()+1));
+ for (WebSocketObserver observer: findWebSocketObservers()) {
+ if (CollectionUtils.containsAny(observer.getObservables(), observables))
+ observer.onObservableChanged(handler);
+ }
+ }
+
+ }
- add(new WebSocketBehavior() {
-
- @Override
- protected void onMessage(WebSocketRequestHandler handler, TextMessage message) {
- super.onMessage(handler, message);
-
- if (message.getText().startsWith(WebSocketManager.OBSERVABLE_CHANGED)) {
- List<String> observables = Splitter.on('\n').splitToList(
- message.getText().substring(WebSocketManager.OBSERVABLE_CHANGED.length()+1));
- for (WebSocketObserver observer: findWebSocketObservers()) {
- if (CollectionUtils.containsAny(observer.getObservables(), observables))
- observer.onObservableChanged(handler);
- }
- }
-
- }
-
- });
- } else {
- add(new WebMarkupContainer("keepSessionAlive"));
- }
+ });
}
@@ -282,4 +269,9 @@ public abstract class BasePage extends WebPage {
protected int getPageRefreshInterval() {
return 0;
}
+
+ public void resizeWindow(IPartialPageRequestHandler handler) {
+ handler.appendJavaScript("$(window).resize();");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
index 6f58e873c9..631173cee0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
@@ -14,6 +14,7 @@ import io.onedev.server.web.asset.autosize.AutoSizeResourceReference;
import io.onedev.server.web.asset.bootstrap.BootstrapResourceReference;
import io.onedev.server.web.asset.cookies.CookiesResourceReference;
import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
+import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
public class BaseResourceReference extends JavaScriptResourceReference {
@@ -31,6 +32,7 @@ public class BaseResourceReference extends JavaScriptResourceReference {
dependencies.add(JavaScriptHeaderItem.forReference(new BootstrapResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new AlignResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new AutoSizeResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index a97ac3e13e..bc8c493b0e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -1,67 +1,40 @@
-body {
- background: white;
- height: 100%;
-}
-a {
- color: #1f3b7b;
-}
-a.embedded-reference {
- color: #0d87e9;
-}
-.head .actions a {
- color: #333;
-}
.pointer {
cursor: pointer;
}
+
.drag-indicator {
- color: #999;
+ color: var(--muted);
}
.is-invalid .form-control, .is-invalid.form-control {
- border-color: #dc3545;
+ border-color: var(--danger);
background: none;
}
-.is-invalid .form-control:focus, .form-control.is-invalid:focus {
- border-color: #dc3545;
- box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
-}
-
-.red {
- color: red;
-}
-/* FEEDBACK */
#session-feedback {
position: fixed;
max-width: 75%;
- padding: 6px 12px;
+ padding: 0.75rem 1.25rem;
z-index: 10000;
- border-radius: 0 0 4px 4px;
- border: 1px solid;
- border-top: none;
+ border-radius: 0 0 0.42rem 0.42rem;
+ box-shadow: -1px 4px 14px -1px rgba(0,0,0,0.28);
top: 0;
display: none;
}
+
#session-feedback.success {
- background: #DFF0D8;
- color: #204021;
+ background-color: var(--success);
}
#session-feedback.error {
- background: #F2DEDE;
- color: #A94442;
- border-color: #622726;
+ background-color: var(--danger);
}
#session-feedback.warning {
- background: #FCF8E3;
- color: #8A6D3B;
- border-color: #815A0D;
+ background-color: var(--warning);
}
#session-feedback.info {
- background: #D9EDF7;
- color: #31708F;
- border-color: #145562;
+ background-color: var(--info);
}
+
#session-feedback ul {
padding: 0;
margin: 0;
@@ -72,78 +45,60 @@ a.embedded-reference {
padding: 0;
margin: 0;
background: none;
+ color: white !important;
+ font-weight: 500;
}
ul.feedbackPanel {
- margin: 0 0 20px 0;
+ margin: 0 0 1rem 0;
padding: 0;
list-style: none;
}
ul.feedbackPanel>li {
+ border-left: 4px solid;
margin: 0;
- padding: 0 0 0 12px;
- border-left: 6px solid;
+ padding: 0 0 0 1.25rem;
}
+
li.feedbackPanelERROR, li.feedbackPanelFATAL {
- color: #DD4B4B;
- background: #FEDADA;
- border-left-color: #BF1111;
+ color: var(--danger);
+ background-color: var(--light-danger);
}
li.feedbackPanelSUCCESS {
- color: #399529;
- background: #E5FBE5;
- border-left-color: #19A519;
+ color: var(--success);
+ background-color: var(--light-success);
}
li.feedbackPanelINFO {
- color: #31708f;
- background: #d9edf7;
- border-left-color: #46A7D8;
+ color: var(--info);
+ background-color: var(--light-info);
}
li.feedbackPanelWARNING {
- background: #FDF3C9;
- color: #836A05;
- border-left-color: #AD8C07;
+ color: var(--warning);
+ background-color: var(--light-warning);
}
ul.feedbackPanel>li:first-child {
- border-radius: 4px 4px 0 0;
- padding-top: 8px;
+ border-radius: 0 0.42rem 0 0;
+ padding-top: 0.75rem;
}
ul.feedbackPanel>li:last-child {
- border-radius: 0 0 4px 4px;
- padding-bottom: 8px;
+ border-radius: 0 0 0.42rem 0;
+ padding-bottom: 0.75rem;
}
ul.feedbackPanel>li:first-child:last-child {
- border-radius: 4px;
-}
-form .required {
- font-size: 16px;
- color: #B94A48;
-}
-
-.nav-tabs .nav-item.active .nav-link {
- color: #495057;
- background-color: #fff;
- border-color: #dee2e6 #dee2e6 #fff;
-}
-
-.help-block {
- display: block;
- font-size: 14px;
- margin-top: 5px;
- margin-bottom: 10px;
- color: #737373;
+ border-radius: 0 0.42rem 0.42rem 0;
}
table {
border-spacing: 0;
}
-td, th {
- padding: 0;
+table>thead>tr>th, table>tbody>tr>td {
+ vertical-align: top;
}
.table>thead>tr>th {
border-top: none;
}
+
tr.navigation>td {
padding: 20px;
}
@@ -161,10 +116,10 @@ tr.navigation>td {
/* TABLE COMPONENTS */
table .row-selector {
- width: 24px;
+ width: 1px;
}
-table>thead>tr>th {
- white-space: nowrap;
+table .row-selector .checkbox span {
+ margin: 0;
}
.pagination {
@@ -173,287 +128,83 @@ table>thead>tr>th {
.pagination a.first, .pagination a.prev, .pagination a.next, .pagination a.last {
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
}
-.norecords-td {
- font-style: italic;
-}
-/* TREE */
-.tree-theme-windows .tree-node span.tree-content a {
- color: #444444;
-}
.tree-content {
white-space: nowrap;
}
a.tree-junction {
text-decoration: none;
}
-
-/* Tabs */
-.tabbable>.tab-content {
- padding-top: 16px;
-}
-
-.help-block {
- font-size: 13px;
-}
-
/* Ajax Loading Indicator */
#ajax-loading-indicator {
position: fixed;
top: 0;
- left: 50%;
+ left: calc(50% - 65px);
display:none;
z-index: 10000;
-}
-#ajax-loading-indicator>div {
- position:relative;
- left:-50%;
- top:0;
+ box-shadow: -1px 4px 14px -1px rgba(0,0,0,0.28);
text-align:center;
- font-weight: bold;
+ font-weight: 500;
width: 130px;
- background: #FAF3D0;
- color: #8A6D3B;
- border: 2px solid #F6DBA4;
+ background: var(--warning);
+ color: white;
border-top:none;
- padding:6px 12px;
- border-radius:0 0 4px 4px;
-}
+ padding:0.5rem 1rem;
+ border-radius:0 0 0.42rem 0.42rem;
+}
.working-indicator {
- color: #25A305;
- margin-left: 4px;
+ color: var(--success);
+ margin-left: 0.4rem;
}
-/* Ajax Loading Overlay */
-#ajax-loading-overlay {
- z-index:1;
- display: none;
-}
-#ajax-loading-overlay>div {
- bottom: 0;
- left: 0;
- position: fixed;
- right: 0;
- top: 0;
- z-index: 1000000;
- filter:alpha(opacity=0); /* Only applies to IE */
- background: white; /* This will be overwritten by browsers that support rgba */
- background: rgba(255,255,255,0.0); /* IE ignores this since it's not supported */
-}
-
/* WEB SOCKET ERROR */
.websocket-error {
z-index: 1050;
+ padding: 0.75rem 1.25rem;
display: none;
position: fixed;
- left: 50%;
+ max-width: 75%;
top: 0;
- background: #f2dede;
- border: 1px solid #ebccd1;
- color: #a94442;
- padding: 4px 8px;
- margin-left: -120px;
+ background: var(--danger);
+ border-radius: 0 0 0.42rem 0.42rem;
+ color: white;
}
-.websocket-error span {
- color: #F54D4D;
-}
-.websocket-error.websocket-client-error {
- margin-left: -240px;
-}
-
-/* FILE INPUT */
-.btn-file {
- position: relative;
- overflow: hidden;
-}
-.btn-file input[type=file] {
- position: absolute;
- top: 0;
- right: 0;
- min-width: 100%;
- min-height: 100%;
- font-size: 100px;
- text-align: right;
- filter: alpha(opacity=0);
- opacity: 0;
- outline: none;
- background: white;
- cursor: inherit;
- display: block;
-}
-
-.center-box {
- padding: 50px;
- max-width: 600px;
- min-width: 300px;
- background: #FAFAFA;
- border: 8px solid #E0E0E0;
- margin-left: auto;
- margin-right: auto;
- margin-top: 50px;
- margin-bottom: 50px;
- color: #333;
-}
-.center-box .logo {
- width: 40px;
- height: 40px;
- margin-right: 8px;
-}
-@media(max-width: 738px) {
- .center-box {
- border: none;
- background: none;
- }
-}
-.wide.center-box {
- max-width: 900px;
- min-width: 900px;
-}
-
-.center-box h1 {
- font-size: 32px;
- margin: 0 0 30px;
- font-weight: 300;
-}
-.center-box h1 .fa {
- font-size: 32px;
-}
-
-
-a {
- cursor: pointer;
-}
-a.fa {
- text-decoration: none;
- color: #666;
-}
-table {
- width: 100%;
-}
-table>tbody>tr>td {
- vertical-align: top;
-}
-table.table>thead>tr>th>a {
- color: black;
- text-decoration: underline;
-}
textarea {
resize: none;
}
-form>.actions {
- margin-top: 20px;
-}
-form>.actions>.btn {
- margin-right: 12px;
-}
-form>.actions>.btn:last-child {
- margin-right: 0;
-}
-.actions>a {
- margin-right: 8px;
-}
-.actions>a:last-child {
- margin-right: 0;
-}
-.nav-tabs>li>a {
- color: #777;
-}
-div.center {
- text-align: center;
-}
div.no-records {
font-style: italic;
font-size: 16px;
}
-.middot:before {
- content: ".";
- font-size: 16px;
- line-height: 12px;
- vertical-align: top;
- color: #999;
-}
-
.input-group>.form-control+.btn.input-group-addon {
- border-radius: 0 4px 4px 0;
+ border-radius: 0.42rem;
border-left: none;
}
li.selectable a, a.selectable {
border: 1px solid white;
- text-decoration: none !important;
display: block;
- padding: 2px 4px;
- color: #333;
+ padding: 0.3rem 0.6rem;
+ color: var(--gray-dark);
+ border-radius: 3px;
}
-li.selectable:hover a, a.selectable:hover {
- background-color: #E0F0FC;
+li.selectable:hover a, a.selectable:hover, li.selectable.active a, a.selectable.active {
+ background-color: var(--light-primary);
border-color: #BBDFF9;
}
-li.selectable.active a, a.selectable.active {
- background-color: #CBE8FB;
- border-color: #8BC8F9;
-}
-
-.ellipsis-expander {
- display: inline-block;
- background: #DDD;
- padding: 0px 6px;
- border-radius: 2px;
- color: #777;
- vertical-align: middle;
- line-height: 16px;
-}
-.ellipsis-expander svg {
- color: #666;
-}
-.ellipsis-expander:hover {
- background: #888;
-}
-.ellipsis-expander:hover svg {
- color: white;
-}
-
-input.search {
- width: 200px;
-}
-
-.list>.head {
- margin-bottom: 8px;
-}
-.list>.foot {
- margin-top: 8px;
-}
-.list>.head>.float-left {
- margin-right: 20px;
- margin-bottom: 8px;
-}
-
-table>thead>tr>th.minimum, table>tbody>tr>td.minimum {
- width: 1px;
-}
-table>tbody>tr>td.actions a {
- color: #666;
- margin-right: 8px;
-}
-table>tbody>tr>td.actions a:last-child {
- margin-right: 0;
-}
-
-.nav-tabs {
- margin-bottom: 20px;
-}
-.nav-tabs>li>a>.badge {
- margin-left: 8px;
-}
.hash {
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
}
+.dropdown-toggle .dropdown-caret {
+ margin-left: 0.2rem;
+}
+
.dropdown-menu>.dropdown-item i {
margin-right: 4px;
}
@@ -482,78 +233,35 @@ a.input-clear {
text-decoration: none;
color: #999;
z-index: 10;
- background: white;
text-align: center;
}
a.input-clear .icon {
width: 14px;
height: 14px;
- margin-top: 0;
}
a.input-clear.input-group-clear {
- right: 48px;
+ right: 52px;
}
a.input-clear.input-group-clear-2 {
- right: 88px;
-}
-.message-box>.content, .confirm-box>.content {
- font-size: 18px;
- padding: 10px 20px;
-}
-.message-box>.actions, .confirm-box>.actions {
- border-top: 1px solid #E0E0E0;
- padding: 12px;
- text-align: center;
-}
-.confirm-box>.actions {
- text-align: right;
-}
-.confirm-box>.actions>* {
- margin-right: 8px;
-}
-
-.project-avatar+.name, .avatar+.name {
- margin-left: 2px !important;
+ right: 86px;
}
-.alert {
- font-size: 16px;
- border: none;
- border-left: 6px solid;
-}
-.alert-info {
- border-color: #46A7D8;
-}
-.alert-success {
- border-color: #19A519;
- background: #E5FBE5;
- color: #399529;
-}
-.alert-danger {
- color: #DD4B4B;
- background: #FEDADA;
- border-color: #BF1111;
-}
-.alert-warning {
- background: #FDF3C9;
- color: #836A05;
- border-color: #AD8C07;
+img.avatar {
+ border-radius: 1000px;
+ height: 20px;
+ width: 20px;
}
-
-a.disabled:not(.btn), a[disabled="disabled"]:not(.btn) {
- cursor: default;
- color: #AAA !important;
- text-decoration: none;
+.avatar+.name {
+ display: inline !important;
+ margin-left: 0.4rem !important;
}
.floating {
- background-clip: padding-box;
- background-color: #FFF;
- border: 1px solid rgba(0, 0, 0, 0.2);
- box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+ background-color: white;
position: absolute;
- border-radius: 3px;
+ border-radius: 0.42rem;
z-index: 2000;
+ box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.2);
}
/* wicket default ajax lazyload style */
@@ -561,164 +269,291 @@ a.disabled:not(.btn), a[disabled="disabled"]:not(.btn) {
margin: 8px;
}
-.nav.nav-tabs>li.options {
- margin-left: auto;
+td.no-elements {
+ font-style: italic;
}
-.def-list table>tbody>tr>td {
- padding: 0;
+.code {
+ border: 1px dashed #d7dae7;
+ border-radius: 0.42rem;
+ padding: 0.75rem 1rem;
+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+ font-size: 0.9rem;
+ color: var(--gray-dark);
}
-.def-list table a {
- display: block;
- color: #666;
- text-decoration: none;
- padding: 8px;
+.icon {
+ fill: currentColor;
+ width: 16px;
+ height: 16px;
+}
+.icon.icon-sm, .icon.icon-xs, .btn.btn-xs .icon {
+ width: 14px;
+ height: 14px;
+}
+.icon.icon-lg, .btn.btn-lg .icon {
+ width: 20px;
+ height: 20px;
+}
+.icon.icon-hero {
+ width: 100px;
+ height: 100px;
}
-.floating.side.def-detail {
- width: 480px;
+label.form-check-inline {
+ margin-bottom: 0;
}
-@media(max-width: 767px) {
- .floating.side.def-detail {
- width: 360px;
- }
+.rotate-90 {
+ transform: rotate(90deg);
}
-.floating.side.def-detail .additional-info {
- margin-bottom: 12px;
- border-bottom: 1px solid #EEE;
- padding-bottom: 12px;
+.rotate-180 {
+ transform: rotate(180deg);
}
-.floating.side.def-detail .actions {
- margin-bottom: 12px;
+.rotate-270 {
+ transform: rotate(270deg);
+}
+.flip-x {
+ transform: scaleX(-1);
+}
+.flip-y {
+ transform: scaleY(-1);
}
-td.no-elements {
- font-style: italic;
+.stroke-20 {
+ stroke: currentColor;
+ stroke-width: 20px;
+}
+.stroke-50 {
+ stroke: currentColor;
+ stroke-width: 50px;
}
-td.ellipsis {
- font-size: 16px;
+a {
+ cursor: pointer;
}
-.card {
- border-width: 2px;
+a.disabled:not(.btn), a[disabled]:not(.btn) {
+ opacity: 0.3;
+ color: inherit !important;
}
-.card-list .drag-indicator {
- margin-right: 8px;
+
+.no-animation, .no-animation * {
+ animation: none !important;
+ transition: none !important;
}
-.card-list .card-header a {
- color: #444;
- margin-right: 8px;
+
+.ps.ps-scroll {
+ position: relative;
}
-.card-list .card-header input {
- vertical-align: text-top;
+.ps.ps-scroll>.ps__rail-x {
+ height: 4px;
+ background-color: transparent;
+}
+.ps.ps-scroll>.ps__rail-y {
+ width: 4px;
+ background-color: transparent;
+}
+.ps.ps-scroll>.ps__rail-x:hover, .ps.ps-scroll>.ps__rail-x:focus,
+.ps.ps-scroll>.ps__rail-y:hover, .ps.ps-scroll>.ps__rail-y:focus {
+ background-color: transparent;
+ opacity: 1;
+}
+.ps.ps-scroll>.ps__rail-x>.ps__thumb-x {
+ height: 4px;
+ border-radius: 0.42rem !important;
+ opacity: 1;
+}
+.ps.ps-scroll>.ps__rail-y>.ps__thumb-y {
+ width: 4px;
+ border-radius: 0.42rem !important;
+ opacity: 1;
+}
+.ps.ps-scroll>.ps__rail-x>.ps__thumb-x,
+.ps.ps-scroll>.ps__rail-y>.ps__thumb-y {
+ background: var(--light-dark);
+}
+
+.tree-theme-human .tree-node {
+ padding: 2px 0 2px 2px;
+ display: flex;
+ align-items: center;
+}
+.tree-theme-human .tree-node>a {
+ width: 8px !important;
+ flex-grow: 0;
+ flex-shrink: 0;
+}
+.tree-theme-human .tree-junction-collapsed {
+ width: 0 !important;
+ height: 0 !important;
+ border-top: 4px solid transparent;
+ border-bottom: 4px solid transparent;
+ border-left: 4px solid var(--gray-dark);
+ border-right: 4px solid transparent;
+ background-image: none !important;
+}
+.tree-theme-human .tree-junction-collapsed:hover {
+ border-left-color: var(--primary);
+}
+.tree-theme-human .tree-junction-expanded {
+ width: 0 !important;
+ height: 0 !important;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid var(--gray-dark);
+ border-bottom: 4px solid transparent;
+ background-image: none !important;
+ margin: 4px 2px 0 -2px;
+}
+.tree-theme-human .tree-junction-expanded:hover {
+ border-top-color: var(--primary);
+}
+
+.tree-theme-human span.tree-content {
+ margin-left: 0.4rem !important;
}
-.card-list input[type="checkbox"]+label {
- font-weight: normal;
+.tree-theme-human span.tree-content a {
+ color: var(--gray-dark) !important;
+ text-decoration: none !important;
}
-.card-list .add-new {
- display: block;
- padding: 16px;
- background: #F2F2F2;
- border: 2px solid #DDD;
- border-radius: 4px;
- font-size: 16px;
- color: #444;
- margin-bottom: 16px;
+.tree-theme-human span.tree-content a:not(.selectable):hover {
+ color: var(--primary) !important;
}
-.card-list a.add-new:hover {
- text-decoration: none;
- background-color: #EBEBEB;
- border-color: #ADADAD;
+
+.subtree-dropdown-trigger>span {
+ display: block;
+ width: 0;
+ height: 0;
+ border-top: 4px solid transparent;
+ border-bottom: 4px solid transparent;
+ border-left: 4px solid var(--gray-dark);
}
-.card-list .disabled .card, .card-list .disabled .card span, .card-list .disabled .card a {
- color: #999;
+.ps.ps-scroll.overflow-auto {
+ overflow: auto !important;
}
-.card-list .add-new svg {
- width: 20px;
- height: 20px;
+
+.mw-1px {
+ min-width: 1px;
}
-.card-header .checkbox {
- display: inline-block;
- margin: 0;
+pre {
+ white-space: pre-wrap;
}
-.tree-theme-human span.tree-content a {
- color: #1f3b7b !important;
+.spin {
+ animation-name: spin;
+ animation-duration: 2000ms;
+ animation-iteration-count: infinite;
+ animation-timing-function: linear;
}
-.vertical-middle {
- vertical-align: middle !important;
+
+@keyframes spin {
+ from {
+ transform: rotate(0deg);
+ }
+ to {
+ transform: rotate(360deg);
+ }
}
-.code {
- border: 1px dashed #BBB;
- background: #F5F5F5;
- border-radius: 4px;
- padding: 8px;
- font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
- font-size: 13px;
- margin-bottom: 8px;
+.dot {
+ display: inline-block;
+ width: 4px;
+ height: 4px;
+ min-width: 4px;
+ border-radius: 100%;
+ background: var(--muted);
}
-.icon {
- fill: currentColor;
- width: 18px;
- height: 18px;
- margin-top: -4px;
+.autofit {
+ overflow: hidden;
}
-.icon.icon-sm {
- width: 14px;
- height: 14px;
+
+.close:hover, .close:focus {
+ color: var(--primary) !important;
+}
+
+.side-main {
+ display: flex;
+ min-height: fit-content;
+}
+.side-main>*>* {
+ height: 100%;
+}
+.side-main>.side {
+ margin-right: 2rem;
+ flex: 0 0 auto;
}
-.icon.icon-lg {
- width: 22px;
- height: 22px;
+.side-main>.main {
+ flex: 1 1 0;
}
-.btn .icon {
- width: 16px;
- height: 16px;
+@media(max-width: 991px) {
+ .side-main.side-main-wrap {
+ flex-wrap: wrap;
+ }
+ .side-main.side-main-wrap>* {
+ flex: 0 0 100%;
+ }
+ .side-main.side-main-wrap>.side {
+ margin-right: 0;
+ margin-bottom: 2rem;
+ }
}
-.btn.btn-sm .icon {
- width: 14px;
- height: 14px;
+
+.card-body .card-body {
+ padding: 0;
+}
+.card-body .card, .floating .card {
+ border-radius: 0;
+ box-shadow: none;
}
-.btn .icon.icon-sm {
- width: 14px;
- height: 14px;
+.nav-tabs-line {
+ align-items: center;
+}
+.nav-tabs-line>.options {
+ margin-left: auto;
+ flex-shrink: 0;
}
-.dropdown-menu a>svg:first-child {
- margin-right: 4px;
+tr.ui-sortable-helper {
+ box-shadow: 2px 2px 6px 2px rgba(0, 0, 0, 0.3);
+ border: none !important;
}
-label.form-check-inline {
- margin-bottom: 0;
+tr.ui-sortable-helper td {
+ background: white;
+ border: none !important;
}
-.rotate-90 {
- transform: rotate(90deg);
+
+table.norecords {
+ border-collapse: separate;
}
-.rotate-180 {
- transform: rotate(180deg);
+table.norecords thead {
+ display: none;
}
-.rotate-270 {
- transform: rotate(270deg);
+table.norecords tfoot td {
+ background: url(/icon/empty.svg) no-repeat scroll center center;
+ background-size: 240px 240px;
+ border-top: none;
+ height: 240px;
}
-.flip-x {
- transform: scaleX(-1);
+table.norecords tfoot td>div {
+ display: none;
}
-.flip-y {
- transform: scaleY(-1);
+
+.form-group .control-label {
+ font-weight: 500;
}
-@keyframes spin {
- from {
- transform: rotate(0deg);
- }
- to {
- transform: rotate(360deg);
- }
+.alert.alert-loose {
+ padding: 2rem 2.25rem;
+}
+
+.form-text a {
+ color: var(--primary);
+}
+.form-text a:hover, .form-text a:focus {
+ color: #0073e9 !important;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index 9a11587a2b..5f2b472322 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -210,10 +210,6 @@ onedev.server = {
},
setupAjaxLoadingIndicator: function() {
- $("#ajax-loading-overlay").click(function(e) {
- e.stopPropagation();
- });
-
var ongoingAjaxRequests = 0;
Wicket.Event.subscribe('/ajax/call/beforeSend', function(e, attributes) {
if (ongoingAjaxRequests == 0) {
@@ -377,7 +373,9 @@ onedev.server = {
if (messagesToSent.indexOf(message) == -1)
messagesToSent.push(message);
} else if (message == "ErrorMessage") {
- $(".websocket-server-error").show();
+ var $websocketError = $(".websocket-error");
+ $websocketError.css("left", ($(window).width()-$websocketError.outerWidth()) / 2);
+ $websocketError.slideDown("slow");
}
});
},
@@ -389,27 +387,28 @@ onedev.server = {
* a source code)
*/
viewState: {
- getInnerMostAutoFit: function() {
- var $innerMost;
- var $autofits = $(".autofit").filter(":visible");
- while ($autofits.length != 0) {
- $innerMost = $autofits.first();
- $autofits = $innerMost.find(".autofit").filter(":visible");
- }
- return $innerMost;
- },
getFromView: function() {
- var $innerMost = onedev.server.viewState.getInnerMostAutoFit();
- if ($innerMost) {
- return $innerMost.triggerHandler("getViewState");
+ var $autofit = $(".autofit:visible:not(:has('.autofit:visible'))");
+ if ($autofit.length != 0) {
+ var events = jQuery._data($autofit[0], 'events');
+ if (events && events["getViewState"])
+ return $autofit.triggerHandler("getViewState");
+ else
+ return {scroll:{left: $autofit.scrollLeft(), top: $autofit.scrollTop()}};
} else {
return undefined;
}
},
setToView: function(viewState) {
- var $innerMost = onedev.server.viewState.getInnerMostAutoFit();
- if ($innerMost) {
- $innerMost.triggerHandler("setViewState", viewState);
+ var $autofit = $(".autofit:visible:not(:has('.autofit:visible'))");
+ if ($autofit) {
+ var events = jQuery._data($autofit[0], 'events');
+ if (events && events["setViewState"]) {
+ $autofit.triggerHandler("setViewState", viewState);
+ } else if (viewState.scroll) {
+ $autofit.scrollLeft(viewState.scroll.left);
+ $autofit.scrollTop(viewState.scroll.top);
+ }
}
},
getFromHistory: function() {
@@ -449,7 +448,7 @@ onedev.server = {
else
return url;
},
- init: function(callback) {
+ init: function(popStateCallback) {
// Use a timeout here solve the problem that Safari (and previous versions of Chrome)
// fires event "onpopstate" on initial page load and this causes the page to reload
// infinitely
@@ -461,7 +460,7 @@ onedev.server = {
if (!event.state || !event.state.data) {
location.reload();
} else {
- callback(event.state.data);
+ popStateCallback(event.state.data);
onedev.server.history.current = {
state: event.state,
url: window.location.href
@@ -610,6 +609,100 @@ onedev.server = {
installListener($(document));
},
+ setupDropdownToggle: function() {
+ function doSetup($container) {
+ $container.find(".dropdown-toggle:not('.no-dropdown-caret')").addBack(".dropdown-toggle:not('.no-dropdown-caret')").each(function() {
+ if ($(this).find(".dropdown-caret").length == 0) {
+ $(this).append("<svg class='dropdown-caret icon rotate-90'><use xlink:href='" + onedev.server.icons + "#arrow'/></svg>");
+ }
+ });
+ }
+ $(document).on("afterElementReplace", function(event, componentId) {
+ doSetup($("#" + componentId));
+ });
+ doSetup($(document));
+ },
+
+ setupCheckbox: function() {
+ function doSetup($container) {
+ $container.find(".checkbox").addBack(".checkbox").each(function() {
+ if ($(this).find(">input+span:empty").length == 0) {
+ $(this).find(">input").after("<span></span>");
+ }
+ });
+ }
+ $(document).on("afterElementReplace", function(event, componentId) {
+ doSetup($("#" + componentId));
+ });
+ doSetup($(document));
+ },
+
+ setupRadio: function() {
+ function doSetup($container) {
+ $container.find(".radio").addBack(".radio").each(function() {
+ if ($(this).find(">input+span:empty").length == 0) {
+ $(this).find(">input").after("<span></span>");
+ }
+ });
+ }
+ $(document).on("afterElementReplace", function(event, componentId) {
+ doSetup($("#" + componentId));
+ });
+ doSetup($(document));
+ },
+
+ setupSwitch: function() {
+ function doSetup($container) {
+ $container.find(".switch").addBack(".switch").each(function() {
+ if ($(this).find(">label>input+span:empty").length == 0) {
+ $(this).find(">label>input").after("<span></span>");
+ }
+ if ($(this).find(">input+span:empty").length == 0) {
+ $(this).find(">input").after("<span></span>");
+ }
+ });
+ }
+ $(document).on("afterElementReplace", function(event, componentId) {
+ doSetup($("#" + componentId));
+ });
+ doSetup($(document));
+ },
+ perfectScrollbar: {
+ setup: function() {
+ function doSetup($container, afterElementReplace) {
+ $container.find(".ps.ps-scroll").addBack(".ps.ps-scroll").each(function() {
+ if (onedev.server.util.isDevice()) {
+ $(this).addClass("overflow-auto");
+ } else {
+ var ps = new PerfectScrollbar(this);
+ $(this).addClass("resize-aware").on("resized", function() {
+ ps.update();
+ return false;
+ });
+ setTimeout(function() {
+ ps.update();
+ }, 0);
+ $(this).data("ps", ps);
+ }
+ });
+ if (afterElementReplace) {
+ setTimeout(function() {
+ $container.parent().closest(".ps-scroll").trigger("resized");
+ }, 0);
+ }
+ }
+ $(document).on("afterElementReplace", function(event, componentId) {
+ doSetup($("#" + componentId), true);
+ });
+ doSetup($(document));
+ },
+ empty: function(element) {
+ $(element).contents().each(function() {
+ if (!$(this).hasClass("ps__rail-x") && !$(this).hasClass("ps__rail-y"))
+ $(this).remove();
+ });
+ }
+ },
setupInputClear: function() {
function installClearer($container) {
var selector = ".clearable-wrapper";
@@ -621,7 +714,7 @@ onedev.server = {
var $input = $wrapper.find("input[type=text], input:not([type])");
if (!$input.hasClass("clearable")) {
$input.addClass("clearable");
- var $clear = $("<a class='input-clear'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#times'/></svg></a>");
+ var $clear = $("<a class='input-clear'><svg class='icon align-middle'><use xlink:href='" + onedev.server.icons + "#times'/></svg></a>");
$wrapper.append($clear);
if ($input.next().hasClass("input-group-append")) {
$clear.addClass("input-group-clear input-group-clear-" + $input.next().children("button").length);
@@ -655,14 +748,14 @@ onedev.server = {
});
},
- onDomReady: function(icons) {
+ onDomReady: function(icons, popStateCallback) {
onedev.server.icons = icons;
+
$(window).resize(function() {
+ var $autofit = $(".autofit:visible:not(:has('.autofit:visible'))");
+ $autofit.css("overflow", "auto").parents(":not('html'):not('body')").css("overflow", "hidden");
$(document).find(".resize-aware").trigger("resized");
});
- $(window).scroll(function() {
- $(document).find(".scroll-aware").trigger("scrolled");
- });
onedev.server.setupAjaxLoadingIndicator();
onedev.server.form.setupDirtyCheck();
@@ -672,6 +765,12 @@ onedev.server = {
onedev.server.setupInputClear();
onedev.server.setupAlertClose();
onedev.server.setupModalOverlays();
+ onedev.server.setupDropdownToggle();
+ onedev.server.setupCheckbox();
+ onedev.server.setupRadio();
+ onedev.server.setupSwitch();
+ onedev.server.history.init(popStateCallback);
+ onedev.server.perfectScrollbar.setup();
$(document).keydown(function(e) {
if (e.keyCode == 27)
@@ -686,12 +785,7 @@ onedev.server = {
onWindowLoad: function() {
onedev.server.setupAutoSize();
onedev.server.focus.setupAutoFocus();
-
- /*
- * Browser will also issue resize event after window is loaded, but that is too late,
- * as getFromHistoryAndSetToView() must be happened after view size has been adjusted
- */
- $(window).resize();
+
onedev.server.viewState.getFromHistoryAndSetToView();
// Let others have a chance to do something before marking the page as visited
@@ -709,6 +803,8 @@ onedev.server = {
});
*/
+ $(window).resize();
+
if (location.hash && !onedev.server.viewState.getFromHistory()) {
// Scroll anchors into view (for instance the markdown headline)
var nameOrId = decodeURIComponent(location.hash.slice(1));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.html b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.html
index 1780822542..1161a8ce36 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.html
@@ -1,7 +1,6 @@
<wicket:extend>
- <div class="page-title">Builds</div>
- <div id="build-list" class="query-save-support">
- <div wicket:id="side" class="side"></div>
- <div wicket:id="main" class="main"></div>
+ <div class="side-main side-main-wrap p-5">
+ <div wicket:id="savedQueries" class="side"></div>
+ <div wicket:id="builds" class="main"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
index ca2a619cac..7b42e835b8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
@@ -65,7 +66,7 @@ public class BuildListPage extends LayoutPage {
protected void onInitialize() {
super.onInitialize();
- add(savedQueries = new SavedQueriesPanel<NamedBuildQuery>("side") {
+ add(savedQueries = new SavedQueriesPanel<NamedBuildQuery>("savedQueries") {
@Override
protected NamedQueriesBean<NamedBuildQuery> newNamedQueriesBean() {
@@ -104,7 +105,7 @@ public class BuildListPage extends LayoutPage {
});
- add(buildList = new BuildListPanel("main", new IModel<String>() {
+ add(buildList = new BuildListPanel("builds", new IModel<String>() {
@Override
public void detach() {
@@ -242,4 +243,10 @@ public class BuildListPage extends LayoutPage {
return paramsOf(query, page, expectedCount);
}
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Builds");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/ErrorPageResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/error/ErrorPageResourceReference.java
deleted file mode 100644
index b7083281dd..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/error/ErrorPageResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.error;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class ErrorPageResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ErrorPageResourceReference() {
- super(ErrorPageResourceReference.class, "error-page.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.html b/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.html
deleted file mode 100644
index b8c5cf62fa..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<wicket:extend>
- <div wicket:id="error" class="wide center-box">
- <div wicket:id="title" class="title"></div>
- <div class="actions">
- <a wicket:id="home" class="btn btn-primary">Back to home</a>
- <a wicket:id="showDetail" class="btn btn-primary">Show Error Detail</a>
- </div>
- <div wicket:id="detail"></div>
- </div>
- <wicket:fragment wicket:id="detailFrag">
- <div class="detail">
- <div class="head">Error Detail</div>
- <div wicket:id="body" class="body"></div>
- </div>
- </wicket:fragment>
-</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.html b/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.html
deleted file mode 100644
index 091c3d1db2..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<wicket:extend>
- <div class="wide center-box in-use">
- <div class="title">Unable to delete</div>
- <div wicket:id="inUseDetail" class="detail"></div>
- <a class="btn btn-primary" href="javascript:window.history.back();">Go Back</a>
- </div>
-</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/error-page.css b/server-core/src/main/java/io/onedev/server/web/page/error/error-page.css
deleted file mode 100644
index 518877d8e8..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/error/error-page.css
+++ /dev/null
@@ -1,28 +0,0 @@
-body.error .center-box {
- width: 75%;
- padding: 20px;
- margin-top: 50px;
- margin-bottom: 50px;
-}
-
-body.error .center-box>div {
- margin-bottom: 20px;
-}
-
-body.error .center-box>.title {
- font-size: 20px;
- font-weight: bold;
- border: none;
- background: none;
- font-family: inherit;
-}
-
-body.error .center-box .detail>.head {
- font-size: 18px;
- margin-bottom: 20px;
-}
-body.error .center-box .detail>.body {
- white-space: pre-wrap;
- word-wrap: break-word;
- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.html b/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.html
deleted file mode 100644
index 437e970f4f..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html xmlns:wicket>
-<wicket:extend>
- <div id="server-init" class="center-box">
- <div class="title">
- <wicket:svg href="logo" class="icon logo"></wicket:svg>
- <span wicket:id="title"></span>
- </div>
- <div wicket:id="wizard"></div>
- </div>
-</wicket:extend>
-</html>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitResourceReference.java
deleted file mode 100644
index 3bf54ec8b7..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.init;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class ServerInitResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ServerInitResourceReference() {
- super(ServerInitResourceReference.class, "server-init.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/init/server-init.css b/server-core/src/main/java/io/onedev/server/web/page/init/server-init.css
deleted file mode 100644
index a133850623..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/init/server-init.css
+++ /dev/null
@@ -1,18 +0,0 @@
-#server-init.center-box {
- width: 900px;
-}
-#server-init.inited {
- text-align: center;
-}
-#server-init>.title {
- font-size: 32px;
- font-weight: bold;
-}
-#server-init>.title .fa {
- font-size: 32px;
-}
-#server-init .wizard {
- padding-top: 20px;
- border-top: 1px solid #BBB;
- margin-top: 20px;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/init/welcome.css b/server-core/src/main/java/io/onedev/server/web/page/init/welcome.css
deleted file mode 100644
index 56b5e39538..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/init/welcome.css
+++ /dev/null
@@ -1,11 +0,0 @@
-#welcome {
- padding: 20px;
-}
-#welcome .head {
- font-size: 24px;
- font-weight: bold;
- margin-bottom: 20px;
-}
-#welcome .body {
- font-size: 16px;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.html b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.html
index af0edf252f..fe26e592c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.html
@@ -1,10 +1,9 @@
<wicket:extend>
- <div class="page-title">Issues</div>
- <div id="issue-list">
- <div wicket:id="workflowChangeAlert"></div>
- <div class="query-save-support">
- <div wicket:id="side" class="side"></div>
- <div wicket:id="main" class="main"></div>
+ <div class="p-5">
+ <div wicket:id="workflowChangeAlert" class="mb-5"></div>
+ <div class="side-main side-main-wrap">
+ <div wicket:id="savedQueries" class="side"></div>
+ <div wicket:id="issues" class="main"></div>
</div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
index 78e2e5f9fe..69caba3034 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
@@ -69,7 +70,7 @@ public class IssueListPage extends LayoutPage {
});
- add(savedQueries = new SavedQueriesPanel<NamedIssueQuery>("side") {
+ add(savedQueries = new SavedQueriesPanel<NamedIssueQuery>("savedQueries") {
@Override
protected NamedQueriesBean<NamedIssueQuery> newNamedQueriesBean() {
@@ -108,7 +109,7 @@ public class IssueListPage extends LayoutPage {
});
- add(issueList = new IssueListPanel("main", new IModel<String>() {
+ add(issueList = new IssueListPanel("issues", new IModel<String>() {
@Override
public void detach() {
@@ -246,5 +247,10 @@ public class IssueListPage extends LayoutPage {
return paramsOf(query, page);
}
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Issues");
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.java b/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.java
deleted file mode 100644
index 2c3997c9bc..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.onedev.server.web.page.layout;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.page.builds.BuildListPage;
-
-public class BuildListTab implements MainTab {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new ViewStateAwarePageLink<Void>(componentId,
- BuildListPage.class, BuildListPage.paramsOf(0, 0)) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public IModel<?> getBody() {
- return Model.of("Builds");
- }
-
- };
- }
-
- @Override
- public boolean isAuthorized() {
- return true;
- }
-
- @Override
- public boolean isActive(LayoutPage page) {
- return page instanceof BuildListPage;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.html b/server-core/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.html
deleted file mode 100644
index 436fcf7a88..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<wicket:panel>
- <div class="head">
- <span wicket:id="title" class="title"></span>
- <a wicket:id="close" class="close" title="Close"><wicket:svg href="times" class="icon"></wicket:svg></a>
- <div wicket:id="subHeader" class="help-block"></div>
- </div>
- <div class="body">
- <div wicket:id="content"></div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.java b/server-core/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.java
deleted file mode 100644
index 27c9c2ba7c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/CloseablePanel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.onedev.server.web.page.layout;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Panel;
-
-@SuppressWarnings("serial")
-abstract class CloseablePanel extends Panel {
-
- private final String title;
-
- public CloseablePanel(String id, String title) {
- super(id);
- this.title = title;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("title", title));
- add(renderSubHeader("subHeader"));
- add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onClose(target);
- }
-
- });
- add(newFloatingContent("content"));
- }
-
- protected Component renderSubHeader(String componentId) {
- return new WebMarkupContainer(componentId).setVisible(false);
- }
-
- protected abstract Component newFloatingContent(String componentId);
-
- protected abstract void onClose(AjaxRequestTarget target);
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultUICustomization.java b/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultUICustomization.java
new file mode 100644
index 0000000000..a300e7eb24
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultUICustomization.java
@@ -0,0 +1,41 @@
+package io.onedev.server.web.page.layout;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.web.page.DashboardPage;
+import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.page.builds.BuildListPage;
+import io.onedev.server.web.page.issues.IssueListPage;
+import io.onedev.server.web.page.project.NewProjectPage;
+import io.onedev.server.web.page.project.ProjectListPage;
+import io.onedev.server.web.page.pullrequests.PullRequestListPage;
+
+public class DefaultUICustomization implements UICustomization {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Class<? extends BasePage> getHomePage() {
+ return DashboardPage.class;
+ }
+
+ @Override
+ public List<SidebarMenuItem> getMainMenuItems() {
+ List<SidebarMenuItem> menuItems = new ArrayList<>();
+
+ menuItems.add(new SidebarMenuItem.Page("project", "Projects", ProjectListPage.class,
+ ProjectListPage.paramsOf(0, 0), Lists.newArrayList(NewProjectPage.class)));
+ menuItems.add(new SidebarMenuItem.Page("pull-request", "Pull Requests", PullRequestListPage.class,
+ PullRequestListPage.paramsOf(0)));
+ menuItems.add(new SidebarMenuItem.Page("bug", "Issues", IssueListPage.class,
+ IssueListPage.paramsOf(0)));
+ menuItems.add(new SidebarMenuItem.Page("play-circle", "Builds", BuildListPage.class,
+ BuildListPage.paramsOf(0, 0)));
+
+ return menuItems;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/IssueListTab.java b/server-core/src/main/java/io/onedev/server/web/page/layout/IssueListTab.java
deleted file mode 100644
index e53ca7f95d..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/IssueListTab.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.onedev.server.web.page.layout;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.page.issues.IssueListPage;
-
-public class IssueListTab implements MainTab {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new ViewStateAwarePageLink<Void>(componentId,
- IssueListPage.class, IssueListPage.paramsOf(0)) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public IModel<?> getBody() {
- return Model.of("Issues");
- }
-
- };
- }
-
- @Override
- public boolean isAuthorized() {
- return true;
- }
-
- @Override
- public boolean isActive(LayoutPage page) {
- return page instanceof IssueListPage;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index 053b21013c..0094a95b11 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -1,149 +1,99 @@
<wicket:extend>
- <div id="layout">
- <nav class="navbar navbar-expand-md fixed-top navbar-dark bg-dark">
- <div class="navbar-header">
- <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
- <span class="navbar-toggler-icon"></span>
- </button>
- <a wicket:id="brandLink" class="navbar-brand">
- <wicket:svg alt="OneDev" href="logo" class="icon"></wicket:svg>
+ <div wicket:id="sidebar" class="sidebar">
+ <div class="sidebar-header">
+ <a wicket:id="brandLink" class="sidebar-brand">
+ <wicket:svg href="logo" class="icon"></wicket:svg>
+ ONEDEV
+ </a>
+ <a href="javascript:void(0);" class="sidebar-mini-toggle d-none d-lg-inline"><wicket:svg href="expand3" class="icon"></wicket:svg></a>
+ <a href="javascript:void(0);" class="sidebar-close d-lg-none"><wicket:svg href="times" class="icon"></wicket:svg></a>
+ </div>
+ <div class="sidebar-body ps ps-scroll">
+ <div wicket:id="menus" class="sidebar-menu">
+ <div wicket:id="header" class="menu-header"></div>
+ <div wicket:id="body" class="menu-body"></div>
+ </div>
+ </div>
+ <div class="sidebar-footer">
+ <div wicket:id="productVersion" class="sidebar-version"></div>
+ <div class="dropdown sidebar-help">
+ <a href="#" class="dropdown-toggle no-dropdown-caret" data-toggle="dropdown">
+ <wicket:svg href="question-o" class="icon"></wicket:svg>
+ </a>
+ <div class="dropdown-menu">
+ <a wicket:id="docLink" class="dropdown-item" target="_blank">Documentation</a>
+ <a href="https://code.onedev.io/projects/onedev-server/issues?query=%22State%22+is+%22Open%22" class="dropdown-item" target="_blank">Support &amp; Bug Report</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div wicket:id="topbar" class="topbar">
+ <div class="topbar-left">
+ <a wicket:id="brandLink" class="topbar-brand">
+ <wicket:svg href="logo" class="icon"></wicket:svg>
+ </a>
+ <a class="sidebar-toggle topbar-link d-lg-none">
+ <wicket:svg href="menu" class="icon"></wicket:svg>
+ </a>
+ <div wicket:id="title" class="topbar-title"></div>
+ </div>
+ <div class="topbar-right text-nowrap">
+ <a href="https://github.com/theonedev/onedev" class="github topbar-link d-none d-sm-inline" target="_blank">
+ <wicket:svg href="github" class="icon"></wicket:svg>
+ </a>
+ <a wicket:id="signIn" class="topbar-link"><wicket:svg href="login" class="icon"/> <span class="d-none d-sm-inline">Sign In</span></a>
+ <div wicket:id="userInfo" class="dropdown user-info">
+ <a href="#" class="dropdown-toggle user-info no-dropdown-caret topbar-link" data-toggle="dropdown">
+ <img wicket:id="avatar">
+ <span wicket:id="name" class="ml-2 d-none d-lg-inline"></span>
</a>
- <div wicket:id="navContext" class="nav-context"></div>
+ <div class="dropdown-menu">
+ <a wicket:id="myProfile" class="dropdown-item">
+ <wicket:svg href="profile" class="icon mr-2"></wicket:svg>
+ My Profile
+ </a>
+ <a wicket:id="myAvatar" class="dropdown-item">
+ <wicket:svg href="avatar" class="icon mr-2"></wicket:svg>
+ Edit Avatar
+ </a>
+ <a wicket:id="myPassword" class="dropdown-item">
+ <wicket:svg href="password" class="icon mr-2"></wicket:svg>
+ Change Password
+ </a>
+ <a wicket:id="mySshKeys" class="dropdown-item">
+ <wicket:svg href="key" class="icon mr-2"></wicket:svg>
+ SSH Keys
+ </a>
+ <a wicket:id="myAccessToken" class="dropdown-item">
+ <wicket:svg href="token" class="icon mr-2"></wicket:svg>
+ Access Token
+ </a>
+ <a wicket:id="signOut" class="dropdown-item">
+ <wicket:svg href="logout" class="icon mr-2"></wicket:svg>
+ <span wicket:id="label"></span>
+ </a>
+ </div>
</div>
- <div class="collapse navbar-collapse" id="navbar-collapse">
- <ul class="navbar-nav">
- <li wicket:id="navTabs" class="nav-item"><a wicket:id="tab" class="nav-link"></a></li>
- <li wicket:id="navAdministration" class="nav-item dropdown">
- <a href="#" class="dropdown-toggle nav-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Administration</a>
- <div class="dropdown-menu administration-menu">
- <a wicket:id="userManagement" class="dropdown-item">
- <wicket:svg href="user" class="icon"></wicket:svg>
- User Management
- </a>
- <a wicket:id="roleManagement" class="dropdown-item">
- <wicket:svg href="role" class="icon"></wicket:svg>
- Role Management
- </a>
- <a wicket:id="groupManagement" class="dropdown-item">
- <wicket:svg href="group" class="icon"></wicket:svg>
- Group Management
- </a>
- <a wicket:id="securitySetting" class="dropdown-item">
- <wicket:svg href="lock" class="icon"></wicket:svg>
- Security Setting
- </a>
- <a wicket:id="externalAuthentication" class="dropdown-item">
- <wicket:svg href="key" class="icon"></wicket:svg>
- External Authentication
- </a>
- <a wicket:id="sso" class="dropdown-item">
- <wicket:svg href="login" class="icon"></wicket:svg>
- Single Sign On Providers
- </a>
- <a wicket:id="sshSetting" class="dropdown-item">
- <wicket:svg href="shield" class="icon"></wicket:svg>
- SSH Setting
- </a>
- <div role="separator" class="dropdown-divider"></div>
- <a wicket:id="systemSetting" class="dropdown-item">
- <wicket:svg href="sliders" class="icon"></wicket:svg>
- System Setting
- </a>
- <a wicket:id="issueSetting" class="dropdown-item">
- <wicket:svg href="bug" class="icon"></wicket:svg>
- Issue Setting
- </a>
- <a wicket:id="mailSetting" class="dropdown-item">
- <wicket:svg href="mail" class="icon"></wicket:svg>
- Mail Setting
- </a>
- <div role="separator" class="dropdown-divider"></div>
- <a wicket:id="jobExecutors" class="dropdown-item">
- <wicket:svg href="run" class="icon"></wicket:svg>
- Job Executors
- </a>
- <a wicket:id="groovyScripts" class="dropdown-item">
- <wicket:svg href="script" class="icon"></wicket:svg>
- Groovy Scripts
- </a>
- <div role="separator" class="dropdown-divider"></div>
- <a wicket:id="databaseBackup" class="dropdown-item">
- <wicket:svg href="database" class="icon"></wicket:svg>
- Database Backup
- </a>
- <a wicket:id="serverLog" class="dropdown-item">
- <wicket:svg href="log" class="icon"></wicket:svg>
- Server Log
- </a>
- <a wicket:id="serverInformation" class="dropdown-item">
- <wicket:svg href="computer" class="icon"></wicket:svg>
- Server Information
- </a>
- </div>
- </li>
- </ul>
- <ul class="navbar-nav ml-auto">
- <li class="nav-item github">
- <a href="https://github.com/theonedev/onedev" class="nav-link" target="_blank">
- <wicket:svg href="github-o" class="icon"></wicket:svg>
- <span class="name">GitHub</span>
- </a>
- </li>
- <li class="nav-item dropdown help">
- <a href="#" class="dropdown-toggle nav-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
- <wicket:svg href="question-circle" class="icon"></wicket:svg>
- <span class="name">Help</span>
- </a>
- <div class="dropdown-menu dropdown-menu-right">
- <div wicket:id="productVersion" class="dropdown-item-text"></div>
- <div role="separator" class="dropdown-divider"></div>
- <a wicket:id="docLink" class="dropdown-item" target="_blank">Documentation</a>
- <a href="https://github.com/theonedev/onedev/issues" class="dropdown-item" target="_blank">Support &amp; Bug Report</a>
- </div>
- </li>
- <wicket:container wicket:id="notSignedIn">
- <li class="nav-item"><a wicket:id="signIn" class="nav-link">Sign in</a></li>
- <wicket:enclosure child="signUp">
- <li class="nav-item"><a wicket:id="signUp" class="nav-link">Sign Up</a></li>
- </wicket:enclosure>
- </wicket:container>
- <li wicket:id="navSignedIn" class="nav-item dropdown signed-in">
- <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a>
- <div class="dropdown-menu dropdown-menu-right my-menu">
- <div wicket:id="header" class="dropdown-item-text"></div>
- <div role="separator" class="dropdown-divider"></div>
- <a wicket:id="myProfile" class="dropdown-item">
- <wicket:svg href="profile" class="icon"></wicket:svg>
- My Profile
- </a>
- <a wicket:id="myAvatar" class="dropdown-item">
- <wicket:svg href="avatar" class="icon"></wicket:svg>
- Edit Avatar
- </a>
- <a wicket:id="myPassword" class="dropdown-item">
- <wicket:svg href="password" class="icon"></wicket:svg>
- Change Password
- </a>
- <a wicket:id="mySshKeys" class="dropdown-item">
- <wicket:svg href="key" class="icon"></wicket:svg>
- SSH Keys
- </a>
- <a wicket:id="myAccessToken" class="dropdown-item">
- <wicket:svg href="token" class="icon"></wicket:svg>
- Access Token
- </a>
- <div role="separator" class="dropdown-divider"></div>
- <a wicket:id="signOut" class="dropdown-item">
- <wicket:svg href="logout" class="icon"></wicket:svg>
- <span wicket:id="label"></span>
- </a>
- </div>
- </li>
- </ul>
- </div>
- </nav>
- <div class="body">
- <wicket:child></wicket:child>
</div>
</div>
+ <div class="main autofit d-flex flex-column resize-aware">
+ <wicket:child></wicket:child>
+ </div>
+
+ <wicket:fragment wicket:id="menuHeaderFrag">
+ <img wicket:id="icon" class="menu-header-icon"></img>
+ <span wicket:id="label" class="menu-header-text"></span>
+ <a wicket:id="moreInfo" class="mehu-header-ellipsis" title="More info"><wicket:svg href="ellipsis" class="icon"/></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="menuBodyFrag">
+ <div wicket:id="items" class="menu-item">
+ <a wicket:id="link" class="menu-link">
+ <svg wicket:id="icon" class="icon menu-icon"></svg>
+ <span wicket:id="bullet" class="menu-bullet"></span>
+ <span wicket:id="label" class="menu-text"></span>
+ <svg wicket:id="arrow" class="icon menu-arrow"></svg>
+ </a>
+ <div wicket:id="subMenu" class="menu-body"></div>
+ </div>
+ </wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 89edb053ae..93265b39c2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -1,43 +1,64 @@
package io.onedev.server.web.page.layout;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.Cookie;
+
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.ExternalImage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import com.google.common.collect.Lists;
+
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.launcher.loader.Plugin;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
-import io.onedev.server.web.page.admin.AdministrationPage;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.component.user.UserAvatar;
import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
+import io.onedev.server.web.page.admin.generalsecuritysetting.GeneralSecuritySettingPage;
import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;
import io.onedev.server.web.page.admin.group.GroupListPage;
import io.onedev.server.web.page.admin.group.GroupPage;
import io.onedev.server.web.page.admin.group.create.NewGroupPage;
-import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
+import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;
import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;
+import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
+import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
+import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;
import io.onedev.server.web.page.admin.jobexecutor.JobExecutorsPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.role.NewRolePage;
import io.onedev.server.web.page.admin.role.RoleDetailPage;
import io.onedev.server.web.page.admin.role.RoleListPage;
-import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
import io.onedev.server.web.page.admin.serverlog.ServerLogPage;
import io.onedev.server.web.page.admin.ssh.SshSettingPage;
@@ -54,9 +75,9 @@ import io.onedev.server.web.page.my.password.MyPasswordPage;
import io.onedev.server.web.page.my.profile.MyProfilePage;
import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;
import io.onedev.server.web.page.project.ProjectListPage;
-import io.onedev.server.web.page.security.LoginPage;
-import io.onedev.server.web.page.security.LogoutPage;
-import io.onedev.server.web.page.security.RegisterPage;
+import io.onedev.server.web.page.simple.security.LoginPage;
+import io.onedev.server.web.page.simple.security.LogoutPage;
+import io.onedev.server.web.util.WicketUtils;
@SuppressWarnings("serial")
public abstract class LayoutPage extends BasePage {
@@ -69,140 +90,221 @@ public abstract class LayoutPage extends BasePage {
protected void onInitialize() {
super.onInitialize();
- User loginUser = getLoginUser();
+ WebMarkupContainer sidebar = new WebMarkupContainer("sidebar");
+
+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();
+ Cookie cookie = request.getCookie("sidebar.minimized");
+ if (cookie != null && "true".equals(cookie.getValue()))
+ sidebar.add(AttributeAppender.append("class", "sidebar-minimized"));
+ add(sidebar);
UICustomization customization = OneDev.getInstance(UICustomization.class);
- add(new BookmarkablePageLink<Void>("brandLink", customization.getHomePage()));
- add(newNavContext("navContext"));
-
- RepeatingView tabsView = new RepeatingView("navTabs");
- for (MainTab tab: customization.getMainTabs()) {
- if (tab.isAuthorized()) {
- WebMarkupContainer tabContainer = new WebMarkupContainer(tabsView.newChildId());
- tabContainer.add(tab.render("tab"));
- if (tab.isActive((LayoutPage) getPage()))
- tabContainer.add(AttributeAppender.append("class", "active"));
- tabsView.add(tabContainer);
+ sidebar.add(new BookmarkablePageLink<Void>("brandLink", customization.getHomePage()));
+
+ sidebar.add(new ListView<SidebarMenu>("menus", new LoadableDetachableModel<List<SidebarMenu>>() {
+
+ @Override
+ protected List<SidebarMenu> load() {
+ List<SidebarMenu> menus = new ArrayList<>();
+ List<SidebarMenuItem> menuItems = new ArrayList<>(customization.getMainMenuItems());
+ if (SecurityUtils.isAdministrator()) {
+ List<SidebarMenuItem> administrationMenuItems = new ArrayList<>();
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "System Setting",
+ SystemSettingPage.class, new PageParameters()));
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "User Management", UserListPage.class,
+ new PageParameters(), Lists.newArrayList(NewUserPage.class, UserPage.class)));
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Role Management", RoleListPage.class,
+ new PageParameters(), Lists.newArrayList(NewRolePage.class, RoleDetailPage.class)));
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Group Management", GroupListPage.class,
+ new PageParameters(), Lists.newArrayList(NewGroupPage.class, GroupPage.class)));
+
+ List<SidebarMenuItem> securitySettingMenuItems = new ArrayList<>();
+ securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "General Setting",
+ GeneralSecuritySettingPage.class, new PageParameters()));
+ securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "External Authentication",
+ AuthenticatorPage.class, new PageParameters()));
+ securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "SSO Providers",
+ SsoConnectorListPage.class, new PageParameters()));
+ securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "SSH Setting",
+ SshSettingPage.class, new PageParameters()));
+
+ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Security Setting", securitySettingMenuItems));
+
+ List<SidebarMenuItem> issueSettingMenuItems = new ArrayList<>();
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Custom Fields",
+ IssueFieldListPage.class, new PageParameters()));
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "States",
+ IssueStateListPage.class, new PageParameters()));
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "State Transitions",
+ StateTransitionListPage.class, new PageParameters()));
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Default Boards",
+ DefaultBoardListPage.class, new PageParameters()));
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Description Templates",
+ IssueTemplateListPage.class, new PageParameters()));
+
+ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Issue Setting", issueSettingMenuItems));
+
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Mail Setting",
+ MailSettingPage.class, new PageParameters()));
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Job Executors",
+ JobExecutorsPage.class, new PageParameters()));
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Groovy Scripts",
+ GroovyScriptListPage.class, new PageParameters()));
+
+ List<SidebarMenuItem> maintenanceMenuItems = new ArrayList<>();
+ maintenanceMenuItems.add(new SidebarMenuItem.Page(null, "Database Backup",
+ DatabaseBackupPage.class, new PageParameters()));
+ maintenanceMenuItems.add(new SidebarMenuItem.Page(null, "Server Log",
+ ServerLogPage.class, new PageParameters()));
+ maintenanceMenuItems.add(new SidebarMenuItem.Page(null, "Server Information",
+ ServerInformationPage.class, new PageParameters()));
+
+ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "System Maintenance", maintenanceMenuItems));
+
+ menuItems.add(new SidebarMenuItem.SubMenu("gear", "Administration", administrationMenuItems));
+ }
+ menus.add(new SidebarMenu(null, menuItems));
+ menus.addAll(getSidebarMenus());
+ return menus;
}
- }
- add(tabsView);
-
- WebMarkupContainer administrationContainer = new WebMarkupContainer("navAdministration");
- WebMarkupContainer item;
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("userManagement", UserListPage.class));
- if (getPage() instanceof UserListPage || getPage() instanceof NewUserPage || getPage() instanceof UserPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("roleManagement", RoleListPage.class));
- if (getPage() instanceof RoleListPage || getPage() instanceof NewRolePage || getPage() instanceof RoleDetailPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("groupManagement", GroupListPage.class));
- if (getPage() instanceof GroupListPage || getPage() instanceof NewGroupPage || getPage() instanceof GroupPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("securitySetting", SecuritySettingPage.class));
- if (getPage() instanceof SecuritySettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("externalAuthentication", AuthenticatorPage.class));
- if (getPage() instanceof AuthenticatorPage)
- item.add(AttributeAppender.append("class", "active"));
+
+ }) {
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("sso", SsoConnectorListPage.class));
- if (getPage() instanceof SsoConnectorListPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("sshSetting", SshSettingPage.class));
- if (getPage() instanceof SshSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("jobExecutors", JobExecutorsPage.class));
- if (getPage() instanceof JobExecutorsPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("groovyScripts", GroovyScriptListPage.class));
- if (getPage() instanceof GroovyScriptListPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("systemSetting", SystemSettingPage.class));
- if (getPage() instanceof SystemSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("issueSetting", IssueFieldListPage.class));
- if (getPage() instanceof IssueSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("mailSetting", MailSettingPage.class));
- if (getPage() instanceof MailSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("databaseBackup", DatabaseBackupPage.class));
- if (getPage() instanceof DatabaseBackupPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("serverLog", ServerLogPage.class));
- if (getPage() instanceof ServerLogPage)
- item.add(AttributeAppender.append("class", "active"));
+ @Override
+ protected void populateItem(ListItem<SidebarMenu> item) {
+ SidebarMenu menu = item.getModelObject();
+
+ SidebarMenu.Header header = menu.getMenuHeader();
+ if (header != null) {
+ Fragment fragment = new Fragment("header", "menuHeaderFrag", LayoutPage.this);
+ fragment.add(new ExternalImage("icon", Model.of(header.getImageUrl())));
+ fragment.add(new Label("label", header.getLabel()));
+ fragment.add(new DropdownLink("moreInfo") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return header.newMoreInfo(id, dropdown);
+ }
+
+ });
+ item.add(fragment);
+ } else {
+ item.add(new WebMarkupContainer("header").setVisible(false));
+ }
+
+ class MenuBody extends Fragment {
+
+ private final List<SidebarMenuItem> menuItems;
+
+ public MenuBody(String componentId, List<SidebarMenuItem> menuItems) {
+ super(componentId, "menuBodyFrag", LayoutPage.this);
+ this.menuItems = menuItems;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new ListView<SidebarMenuItem>("items", menuItems) {
+
+ @Override
+ protected void populateItem(ListItem<SidebarMenuItem> item) {
+ SidebarMenuItem menuItem = item.getModelObject();
+ WebMarkupContainer menuLink;
+ if (menuItem instanceof SidebarMenuItem.Page) {
+ SidebarMenuItem.Page page = (SidebarMenuItem.Page) menuItem;
+ menuLink = new BookmarkablePageLink<Void>("link", page.getPageClass(), page.getPageParams());
+ menuLink.add(new WebMarkupContainer("arrow").setVisible(false));
+ item.add(new WebMarkupContainer("subMenu").setVisible(false));
+ } else {
+ SidebarMenuItem.SubMenu subMenu = (SidebarMenuItem.SubMenu) menuItem;
+ menuLink = new WebMarkupContainer("link");
+ menuLink.add(AttributeAppender.append("class", "menu-toggle"));
+ menuLink.add(new SpriteImage("arrow", "arrow"));
+ MenuBody menuBody = new MenuBody("subMenu", subMenu.getMenuItems());
+ if (!subMenu.isActive())
+ menuBody.add(AttributeAppender.append("style", "display:none;"));
+ item.add(menuBody);
+ }
+
+ int nestLevel = WicketUtils.findParents(item, MenuBody.class).size();
+
+ if (menuItem.getIconHref() != null) {
+ menuLink.add(new SpriteImage("icon", menuItem.getIconHref()));
+ menuLink.add(new WebMarkupContainer("bullet").setVisible(false));
+ } else {
+ menuLink.add(new WebMarkupContainer("icon").setVisible(false));
+ String bulletType = nestLevel % 2 == 0? "menu-bullet-line": "menu-bullet-dot dot";
+ menuLink.add(new WebMarkupContainer("bullet").add(AttributeAppender.append("class", bulletType)));
+ }
+ menuLink.add(AttributeAppender.append("style", "padding-left: " + (25 + (15*(nestLevel-1))) + "px;"));
+ menuLink.add(AttributeAppender.append("title", menuItem.getLabel()));
+ menuLink.add(new Label("label", menuItem.getLabel()));
+ if (menuItem.isActive())
+ menuLink.add(AttributeAppender.append("class", "active open"));
+ item.add(menuLink);
+ }
+
+ });
+ }
+
+ }
+
+ item.add(new MenuBody("body", menu.getMenuItems()));
+ }
+
+ });
- administrationContainer.add(item = new ViewStateAwarePageLink<Void>("serverInformation", ServerInformationPage.class));
- if (getPage() instanceof ServerInformationPage)
- item.add(AttributeAppender.append("class", "active"));
+ Plugin product = AppLoader.getProduct();
+ sidebar.add(new Label("productVersion", "Ver. " + product.getVersion()));
+ sidebar.add(new ExternalLink("docLink", OneDev.getInstance().getDocRoot() + "/"));
- if (getPage() instanceof AdministrationPage)
- administrationContainer.add(AttributeAppender.append("class", "active"));
- administrationContainer.setVisible(SecurityUtils.isAdministrator());
- add(administrationContainer);
+ WebMarkupContainer topbar = new WebMarkupContainer("topbar");
+ add(topbar);
- Plugin product = AppLoader.getProduct();
- add(new Label("productVersion", product.getVersion()));
- add(new ExternalLink("docLink", OneDev.getInstance().getDocRoot() + "/"));
+ topbar.add(newTopbarTitle("title"));
+
+ User loginUser = getLoginUser();
- WebMarkupContainer notSignedInContainer = new WebMarkupContainer("notSignedIn");
- notSignedInContainer.add(new Link<Void>("signIn") {
+ topbar.add(new Link<Void>("signIn") {
@Override
public void onClick() {
throw new RestartResponseAtInterceptPageException(LoginPage.class);
}
- });
+ }.setVisible(loginUser == null));
- boolean enableSelfRegister = OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfRegister();
- notSignedInContainer.add(new ViewStateAwarePageLink<Void>("signUp", RegisterPage.class).setVisible(enableSelfRegister));
- notSignedInContainer.setVisible(loginUser == null);
- add(notSignedInContainer);
+ topbar.add(new BookmarkablePageLink<Void>("brandLink", customization.getHomePage()));
- WebMarkupContainer signedInContainer = new WebMarkupContainer("navSignedIn");
+ WebMarkupContainer userInfo = new WebMarkupContainer("userInfo");
if (loginUser != null) {
- signedInContainer.add(new UserAvatar("avatar", loginUser));
- signedInContainer.add(new Label("name", loginUser.getDisplayName()));
- signedInContainer.add(new Label("header", loginUser.getDisplayName()));
+ userInfo.add(new UserAvatar("avatar", loginUser));
+ userInfo.add(new Label("name", loginUser.getDisplayName()));
} else {
- signedInContainer.add(new WebMarkupContainer("avatar"));
- signedInContainer.add(new WebMarkupContainer("name"));
- signedInContainer.add(new WebMarkupContainer("header"));
+ userInfo.add(new WebMarkupContainer("avatar"));
+ userInfo.add(new WebMarkupContainer("name"));
}
- signedInContainer.add(item = new ViewStateAwarePageLink<Void>("myProfile", MyProfilePage.class));
+ WebMarkupContainer item;
+ userInfo.add(item = new ViewStateAwarePageLink<Void>("myProfile", MyProfilePage.class));
if (getPage() instanceof MyProfilePage)
item.add(AttributeAppender.append("class", "active"));
- signedInContainer.add(item = new ViewStateAwarePageLink<Void>("myAvatar", MyAvatarPage.class));
+ userInfo.add(item = new ViewStateAwarePageLink<Void>("myAvatar", MyAvatarPage.class));
if (getPage() instanceof MyAvatarPage)
item.add(AttributeAppender.append("class", "active"));
- signedInContainer.add(item = new ViewStateAwarePageLink<Void>("myPassword", MyPasswordPage.class));
+ userInfo.add(item = new ViewStateAwarePageLink<Void>("myPassword", MyPasswordPage.class));
if (getPage() instanceof MyPasswordPage)
item.add(AttributeAppender.append("class", "active"));
- signedInContainer.add(item = new ViewStateAwarePageLink<Void>("mySshKeys", MySshKeysPage.class));
+ userInfo.add(item = new ViewStateAwarePageLink<Void>("mySshKeys", MySshKeysPage.class));
if (getPage() instanceof MySshKeysPage)
item.add(AttributeAppender.append("class", "active"));
- signedInContainer.add(item = new ViewStateAwarePageLink<Void>("myAccessToken", MyAccessTokenPage.class));
+ userInfo.add(item = new ViewStateAwarePageLink<Void>("myAccessToken", MyAccessTokenPage.class));
if (getPage() instanceof MyAccessTokenPage)
item.add(AttributeAppender.append("class", "active"));
@@ -219,19 +321,19 @@ public abstract class LayoutPage extends BasePage {
};
signOutLink.add(new Label("label", "Exit Impersonation"));
- signedInContainer.add(signOutLink);
+ userInfo.add(signOutLink);
} else {
ViewStateAwarePageLink<Void> signOutLink = new ViewStateAwarePageLink<Void>("signOut", LogoutPage.class);
signOutLink.add(new Label("label", "Sign Out"));
- signedInContainer.add(signOutLink);
+ userInfo.add(signOutLink);
}
- signedInContainer.setVisible(loginUser != null);
+ userInfo.setVisible(loginUser != null);
if (getPage() instanceof MyPage)
- signedInContainer.add(AttributeAppender.append("class", "active"));
+ userInfo.add(AttributeAppender.append("class", "active"));
- add(signedInContainer);
+ topbar.add(userInfo);
}
@Override
@@ -242,11 +344,15 @@ public abstract class LayoutPage extends BasePage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new LayoutResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new LayoutResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.layout.onDomReady();"));
+ response.render(OnLoadHeaderItem.forScript("onedev.server.layout.onLoad();"));
}
-
- protected Component newNavContext(String componentId) {
- return new WebMarkupContainer(componentId);
+
+ protected List<SidebarMenu> getSidebarMenus() {
+ return Lists.newArrayList();
}
+
+ protected abstract Component newTopbarTitle(String componentId);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutResourceReference.java
index 46ee5898b4..70d20633fb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutResourceReference.java
@@ -1,13 +1,27 @@
package io.onedev.server.web.page.layout;
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
-public class LayoutResourceReference extends BaseDependentCssResourceReference {
+public class LayoutResourceReference extends BaseDependentResourceReference {
private static final long serialVersionUID = 1L;
public LayoutResourceReference() {
- super(LayoutResourceReference.class, "layout.css");
+ super(LayoutResourceReference.class, "layout.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ LayoutResourceReference.class, "layout.css")));
+ return dependencies;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/MainTab.java b/server-core/src/main/java/io/onedev/server/web/page/layout/MainTab.java
deleted file mode 100644
index 34b255fee2..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/MainTab.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.onedev.server.web.page.layout;
-
-import java.io.Serializable;
-
-import org.apache.wicket.Component;
-
-public interface MainTab extends Serializable {
-
- Component render(String componentId);
-
- boolean isAuthorized();
-
- boolean isActive(LayoutPage page);
-
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/ProjectListTab.java b/server-core/src/main/java/io/onedev/server/web/page/layout/ProjectListTab.java
deleted file mode 100644
index c2af5419e4..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/ProjectListTab.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.onedev.server.web.page.layout;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.page.project.NewProjectPage;
-import io.onedev.server.web.page.project.ProjectListPage;
-import io.onedev.server.web.page.project.ProjectPage;
-
-public class ProjectListTab implements MainTab {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
-
- return new ViewStateAwarePageLink<Void>(componentId,
- ProjectListPage.class, ProjectListPage.paramsOf(0, 0)) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public IModel<?> getBody() {
- return Model.of("Projects");
- }
-
- };
- }
-
- @Override
- public boolean isAuthorized() {
- return true;
- }
-
- @Override
- public boolean isActive(LayoutPage page) {
- return page instanceof ProjectListPage
- || page instanceof ProjectPage
- || page instanceof NewProjectPage;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/PullRequestListTab.java b/server-core/src/main/java/io/onedev/server/web/page/layout/PullRequestListTab.java
deleted file mode 100644
index 2509c850f5..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/PullRequestListTab.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.onedev.server.web.page.layout;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.page.pullrequests.PullRequestListPage;
-
-public class PullRequestListTab implements MainTab {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new ViewStateAwarePageLink<Void>(componentId,
- PullRequestListPage.class, PullRequestListPage.paramsOf(0)) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public IModel<?> getBody() {
- return Model.of("Pull Requests");
- }
-
- };
- }
-
- @Override
- public boolean isAuthorized() {
- return true;
- }
-
- @Override
- public boolean isActive(LayoutPage page) {
- return page instanceof PullRequestListPage;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/SideFloating.java b/server-core/src/main/java/io/onedev/server/web/page/layout/SideFloating.java
deleted file mode 100644
index 4e21c10d3c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/SideFloating.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.onedev.server.web.page.layout;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.util.Animation;
-
-@SuppressWarnings("serial")
-public abstract class SideFloating extends FloatingPanel {
-
- public enum Placement {LEFT, RIGHT}
-
- public SideFloating(AjaxRequestTarget target, Placement placement) {
- super(target, null, Animation.valueOf(placement.name()));
- add(AttributeAppender.append("class", "side side-" + placement.name().toLowerCase()));
- }
-
- protected abstract String getTitle();
-
- protected Component renderSubHeader(String componentId) {
- return new WebMarkupContainer(componentId).setVisible(false);
- }
-
- protected abstract Component newBody(String id);
-
- @Override
- protected Component newContent(String id) {
- return new CloseablePanel(id, getTitle()) {
-
- protected void onClose(AjaxRequestTarget target) {
- close();
- }
-
- @Override
- protected Component renderSubHeader(String componentId) {
- return SideFloating.this.renderSubHeader(componentId);
- }
-
- @Override
- protected Component newFloatingContent(String id) {
- return SideFloating.this.newBody(id);
- }
-
- };
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java
new file mode 100644
index 0000000000..e98f5a7f0a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java
@@ -0,0 +1,64 @@
+package io.onedev.server.web.page.layout;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.web.component.floating.FloatingPanel;
+
+public class SidebarMenu implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Header menuHeader;
+
+ private final List<SidebarMenuItem> menuItems;
+
+ public SidebarMenu(@Nullable Header menuHeader, List<SidebarMenuItem> menuItems) {
+ this.menuHeader = menuHeader;
+ this.menuItems = menuItems;
+ }
+
+ @Nullable
+ public Header getMenuHeader() {
+ return menuHeader;
+ }
+
+ public List<SidebarMenuItem> getMenuItems() {
+ return menuItems;
+ }
+
+ @Nullable
+ protected Component newMenuHeader() {
+ return null;
+ }
+
+ public static abstract class Header implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String imageUrl;
+
+ private final String label;
+
+ public Header(String imageUrl, String label) {
+ this.imageUrl = imageUrl;
+ this.label = label;
+ }
+
+ public String getImageUrl() {
+ return imageUrl;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ protected abstract Component newMoreInfo(String componentId, FloatingPanel dropdown);
+
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.java b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.java
new file mode 100644
index 0000000000..801457dfa7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.java
@@ -0,0 +1,126 @@
+package io.onedev.server.web.page.layout;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.web.util.WicketUtils;
+
+public abstract class SidebarMenuItem implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String iconHref;
+
+ private final String label;
+
+ public SidebarMenuItem(@Nullable String iconHref, String label) {
+ this.iconHref = iconHref;
+ this.label = label;
+ }
+
+ @Nullable
+ public String getIconHref() {
+ return iconHref;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public abstract boolean isActive();
+
+ public abstract static class Action extends SidebarMenuItem {
+
+ private static final long serialVersionUID = 1L;
+
+ public Action(String iconHref, String label) {
+ super(iconHref, label);
+ }
+
+ @Override
+ public boolean isActive() {
+ return false;
+ }
+
+ public abstract void onClick(AjaxRequestTarget target);
+ }
+
+ public static class Page extends SidebarMenuItem {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Class<? extends org.apache.wicket.Page> pageClass;
+
+ private final PageParameters pageParams;
+
+ private final List<Class<? extends org.apache.wicket.Page>> additionalPageClasses;
+
+ public Page(String icon, String label, Class<? extends org.apache.wicket.Page> pageClass, PageParameters pageParams) {
+ this(icon, label, pageClass, pageParams, Lists.newArrayList());
+ }
+
+ public Page(String icon, String label, Class<? extends org.apache.wicket.Page> pageClass, PageParameters pageParams,
+ List<Class<? extends org.apache.wicket.Page>> additionalPageClasses) {
+ super(icon, label);
+ this.pageClass = pageClass;
+ this.pageParams = pageParams;
+ this.additionalPageClasses = additionalPageClasses;
+ }
+
+ public Class<? extends org.apache.wicket.Page> getPageClass() {
+ return pageClass;
+ }
+
+ public PageParameters getPageParams() {
+ return pageParams;
+ }
+
+ public List<Class<? extends org.apache.wicket.Page>> getAdditionalPageClasses() {
+ return additionalPageClasses;
+ }
+
+ @Override
+ public boolean isActive() {
+ org.apache.wicket.Page currentPage = WicketUtils.getPage();
+ if (pageClass.isAssignableFrom(currentPage.getClass()))
+ return true;
+
+ for (Class<?> pageClass: additionalPageClasses) {
+ if (pageClass.isAssignableFrom(currentPage.getClass()))
+ return true;
+ }
+ return false;
+ }
+
+ }
+
+ public static class SubMenu extends SidebarMenuItem {
+
+ private static final long serialVersionUID = 1L;
+
+ private final List<SidebarMenuItem> menuItems;
+
+ public SubMenu(String icon, String label, List<SidebarMenuItem> menuItems) {
+ super(icon, label);
+ this.menuItems = menuItems;
+ }
+
+ public List<SidebarMenuItem> getMenuItems() {
+ return menuItems;
+ }
+
+ @Override
+ public boolean isActive() {
+ return menuItems.stream().anyMatch(it->it.isActive());
+ }
+
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/UICustomization.java b/server-core/src/main/java/io/onedev/server/web/page/layout/UICustomization.java
index 8b673f26f1..6624ccd19e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/UICustomization.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/UICustomization.java
@@ -1,13 +1,14 @@
package io.onedev.server.web.page.layout;
+import java.io.Serializable;
import java.util.List;
import io.onedev.server.web.page.base.BasePage;
-public interface UICustomization {
+public interface UICustomization extends Serializable {
Class<? extends BasePage> getHomePage();
- List<MainTab> getMainTabs();
+ List<SidebarMenuItem> getMainMenuItems();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
index f3056fb251..f2072ade2b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
@@ -1,126 +1,350 @@
-.navbar.fixed-top {
- max-height: 500px;
- overflow-y: auto;
+:root {
+ --sidebar-width: 265px;
+ --sidebar-mini-width: 51px;
+ --topbar-height: 50px;
+ --transition-duration: 0.3s;
+ --brand-size: 30px;
}
-.navbar-brand svg {
- width: 32px;
- height: 32px;
+body {
+ position: static !important;
}
-.navbar-header>.nav-context {
- color: white;
- display: inline-block;
- margin-top: 10px;
+.sidebar {
+ background-color: #1e1e2d;
+ width: var(--sidebar-width);
+ position: fixed;
+ left: calc(var(--sidebar-width) * -1);
+ top: 0;
+ bottom: 0;
+ flex-direction: column;
+ z-index: 1031;
+ display: flex;
+ transition: all var(--transition-duration) ease;
}
-@media(min-width: 768px) {
- .navbar-header>.nav-context {
- display: none;
- }
- .navbar.fixed-top {
- overflow-y: visible;
- }
+.sidebar.sidebar-docked {
+ left: 0;
+ box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.2);
}
-.navbar .avatar {
- width: 24px;
- height: 24px;
+
+.sidebar a {
+ color: #5c5e81;
+}
+.sidebar a:hover, .sidebar a:focus, .sidebar a.open, .sidebar a.active {
+ color: var(--primary) !important;
+}
+
+.sidebar-header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 20px;
+ flex: 0 0 var(--topbar-height);
+ background: #1a1a27;
+}
+.sidebar-brand {
+ font-weight: 600;
+ font-size: 1.4rem;
+ display: flex;
+ align-items: center;
+ color: white !important;
+}
+.sidebar .sidebar-brand:hover, .sidebar .sidebar-brand:focus {
+ color: white !important;
+}
+.sidebar-brand svg {
+ width: var(--brand-size);
+ height: var(--brand-size);
+ margin-right: 1rem;
+}
+
+.sidebar-mini-toggle svg {
+ width: 20px;
+ height: 20px;
+ transform: rotate(180deg);
+}
+.sidebar-close svg {
+ width: 20px;
+ height: 20px;
+}
+.sidebar-body {
+ flex-grow: 1;
+ height: 100%;
+}
+.sidebar-menu {
+ margin: 20px 0;
}
-.navbar-nav .nav-item .nav-link .icon {
- margin: 0;
+.sidebar-menu .menu-header {
+ display: flex;
+ padding: 0 25px;
+ margin: 20px 0 0 0;
+ height: 40px;
+ align-items: center;
+ justify-content: center;
+ flex-wrap: wrap;
}
-.navbar-header>.nav-context .text {
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
- max-width: 240px;
+.sidebar-menu .menu-header-icon {
+ width: 20px;
+ height: 20px;
}
-.navbar-header>.nav-context a {
+.sidebar-menu .menu-header-text {
+ color: #5c5e81;
+ font-weight: 500;
+ margin-left: 0.8rem;
+ flex-grow: 1;
+}
+
+.sidebar-menu .menu-arrow {
+ width: 16px;
+ height: 16px;
+ transition: all 0.3s ease;
+}
+.sidebar-menu .menu-toggle.open .menu-arrow {
+ transform: rotate(90deg);
+}
+
+.sidebar-menu .menu-link {
+ display: flex;
+ padding: 9px 25px;
+ min-height: 44px;
+ align-items: center;
+ justify-content: center;
+}
+
+.sidebar-menu .menu-bullet-line {
+ width: 5px;
+ height: 1px;
+}
+.sidebar-menu .menu-icon {
+ width: 20px;
+ height: 20px;
+}
+.sidebar-menu .menu-bullet {
+ background-color: #5c5e81;
+}
+.sidebar-menu .menu-link:hover .menu-bullet,
+.sidebar-menu .menu-link:focus .menu-bullet,
+.sidebar-menu .menu-link.active .menu-bullet,
+.sidebar-menu .menu-link.open .menu-bullet {
+ background-color: var(--primary);
+}
+
+.sidebar-menu .menu-text {
+ flex-grow: 1;
+ margin-left: 1rem;
+ color: #9899ac;
+}
+
+.sidebar-menu .menu-link:hover .menu-text, .sidebar-menu .menu-link:focus .menu-text,
+.sidebar-menu .menu-link.active .menu-text, .sidebar-menu .menu-link.open .menu-text,
+.sidebar-menu .menu-link:hover .menu-arrow, .sidebar-menu .menu-link:focus .menu-arrow,
+.sidebar-menu .menu-link.active .menu-arrow, .sidebar-menu .menu-link.open .menu-arriw {
color: white;
- text-decoration: none;
-}
-@media (max-width: 767px) {
- .navbar .github .icon,
- .navbar .help .icon,
- .navbar .signed-in .avatar,
- .navbar .signed-in .dropdown-header,
- .navbar .signed-in .dropdown-header+.dropdown-divider {
- display: none;
- }
}
-@media (min-width: 768px) {
- .navbar .github .name,
- .navbar .help .name,
- .navbar .signed-in .name {
- display: none;
- }
+
+.sidebar-menu .menu-body .menu-link:hover,
+.sidebar-menu .menu-body .menu-link:focus,
+.sidebar-menu .menu-body .menu-link.open,
+.sidebar-menu .menu-body .menu-link.active {
+ background-color: #1b1b28;
}
-#layout>.body {
- padding: 79px 20px 20px 20px;
- width: 100%;
+.sidebar-footer {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 20px;
+ flex: 0 0 var(--topbar-height);
+ background: #1a1a27;
+}
+.sidebar-version {
+ font-weight: 500;
+ color: var(--gray);
+}
+.sidebar-help .dropdown-menu .dropdown-item {
+ color: var(--dark);
+}
+.sidebar-help .dropdown-menu .dropdown-item:hover,
+.sidebar-help .dropdown-menu .dropdown-item:focus {
+ color: #101221 !important;
}
-#layout .sidebar {
- top: 59px;
+.sidebar-help svg {
+ width: 16px;
+ height: 16px;
}
-.floating.side {
+.topbar {
position: fixed;
- top: 59px;
- border-top: none;
- border-bottom: none;
- bottom: 0;
- width: 360px;
- border-radius: 0;
- overflow: auto;
-}
-.floating.side-left {
- border-left: none;
+ display: flex;
+ align-items: center;
+ top: 0;
left: 0;
-}
-.floating.side-right {
- border-right: none;
right: 0;
+ height: var(--topbar-height);
+ background: white;
+ padding: 0 0.8rem 0 1.2rem;
+ z-index: 1030;
+ box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);
+ transition: all var(--transition-duration) ease;
}
-.floating.side>.content>.head {
- padding: 12px;
- font-weight: bold;
- font-size: 16px;
- border-bottom: 1px solid #E0E0E0;
+
+.topbar-left {
+ display: flex;
+ align-items: center;
+ flex-grow: 1;
+ min-width: 1px;
}
-.floating.side>.content>.head>.help-block {
- font-weight: normal;
- margin-bottom: 0;
+.topbar-brand {
+ display: none;
+ margin: 0 1rem 0 -0.4rem;
+ color: var(--gray-dark) !important;
}
-.floating.side>.content>.body {
- padding: 12px;
+.topbar-brand svg {
+ width: var(--brand-size);
+ height: var(--brand-size);
}
-.nav-context-dropdown.floating>.content {
- padding: 20px;
- width: 100vw;
+.sidebar-toggle {
+ min-width: 36px;
+ min-height: 36px;
+ color: var(--gray);
+ display: flex;
+ align-items: center;
}
-.nav-context-dropdown.floating .menu a {
- display: block;
- color: #666;
- padding: 8px;
- text-decoration: none;
+.sidebar-toggle svg {
+ width: 24px;
+ height: 24px;
}
-.nav-context-dropdown.floating .menu li.active a {
- background: #EEE;
- color: black;
- font-weight: bold;
+
+.topbar-title {
+ flex-grow: 1;
+ color: var(--dark);
+ font-size: 1.25rem;
+ font-weight: 500;
+ margin-right: 1rem;
+ display: flex;
+ align-items: center;
+ min-width: 1px;
}
-.nav-context-dropdown.floating .menu li:hover a {
- background: #EEE;
+
+.topbar-title .dot {
+ background-color: #B5B5C3;
+ margin: 0 0.75rem;
}
-.page-title {
- font-weight: bold;
- font-size: 18px;
- margin-bottom: 20px;
- padding-bottom: 20px;
- border-bottom: 1px solid #E8E8E8;
+.topbar-right {
+ display: flex;
+ align-items: center;
+}
+.topbar input.search {
+ width: 100%;
+}
+.topbar-right a.topbar-link {
+ padding: 0.5rem;
+ color: #6c7293;
+ border-radius: 0.42rem;
+}
+
+.topbar-right a.topbar-link:hover,
+.topbar-right .active>a.topbar-link,
+.topbar-right .show>a.topbar-link {
+ background: rgba(77, 89, 149, 0.06);
+}
+
+body>.main {
+ transition: all var(--transition-duration) ease;
+ position: absolute;
+ top: var(--topbar-height);
+ left: 0;
+ right: 0;
+ bottom: 0;
+}
+
+@media(min-width: 992px) {
+ .sidebar {
+ left: 0 !important;
+ }
+ .sidebar.sidebar-minimized {
+ width: var(--sidebar-mini-width);
+ }
+ .sidebar-minimized .sidebar-mini-toggle svg {
+ transform: rotate(0deg);
+ }
+ .sidebar-minimized .menu-body .menu-link {
+ padding-left: 0 !important;
+ padding-right: 0 !important;
+ }
+ .sidebar-minimized .menu-body .menu-body .menu-link {
+ padding-left: 25px !important;
+ padding-right: 25px !important;
+ }
+ .sidebar-minimized .menu-body .menu-body .menu-text {
+ margin-left: 0;
+ }
+ .sidebar-minimized .sidebar-brand, .sidebar-minimized .menu-header-text,
+ .sidebar-minimized .menu-body .menu-body, .sidebar-minimized .menu-bullet,
+ .sidebar-minimized .sidebar-menu>.menu-body>.menu-item>.menu-link>.menu-text,
+ .sidebar-minimized .sidebar-menu>.menu-body>.menu-item>.menu-link>.menu-arrow,
+ .sidebar-minimized .sidebar-version {
+ display: none;
+ }
+
+ .sidebar-minimized .menu-link .menu-icon {
+ color: var(--gray);
+ }
+
+ .sidebar-minimized .menu-link:hover .menu-icon, .sidebar-minimized .menu-link:focus .menu-icon,
+ .sidebar-minimized .menu-link.active .menu-icon, .sidebar-minimized .menu-link.open .menu-icon {
+ color: var(--primary);
+ }
+
+ .sidebar-minimized .menu-arrow {
+ margin-left: 1rem;
+ }
+
+ .sidebar-minimized .menu-toggle.open .menu-arrow {
+ transform: rotate(0deg);
+ }
+
+ .sidebar-minimized .sidebar-header, .sidebar-minimized .sidebar-footer {
+ justify-content: center;
+ padding: 0;
+ }
+ .topbar {
+ left: var(--sidebar-width);
+ }
+ .sidebar-minimized ~ .topbar {
+ left: var(--sidebar-mini-width);
+ }
+ .sidebar-minimized ~ .topbar .topbar-brand {
+ display: inline;
+ }
+ body>.main {
+ left: var(--sidebar-width);
+ }
+ .sidebar-minimized ~ .main {
+ left: var(--sidebar-mini-width);
+ }
+
+ .sidebar-minimized .menu-body .menu-body .menu-link:hover,
+ .sidebar-minimized .menu-body .menu-body .menu-link:focus,
+ .sidebar-minimized .menu-body .menu-body .menu-link.open,
+ .sidebar-minimized .menu-body .menu-body .menu-link.active {
+ background-color: var(--light);
+ }
+
+ .sidebar-minimized .menu-body .menu-body .menu-link .menu-text {
+ color: var(--dark);
+ }
+
+ .sidebar-minimized .menu-body .menu-body .menu-link:hover .menu-arrow,
+ .sidebar-minimized .menu-body .menu-body .menu-link:focus .menu-arrow,
+ .sidebar-minimized .menu-body .menu-body .menu-link.active .menu-arrow,
+ .sidebar-minimized .menu-body .menu-body .menu-link.open .menu-arriw {
+ color: var(--primary);
+ }
+
}
-.page-title>.help-block {
- font-weight: normal;
- margin-bottom: -10px;
+.sidebar-body.ps.ps-scroll>.ps__rail-x>.ps__thumb-x,
+.sidebar-body.ps.ps-scroll>.ps__rail-y>.ps__thumb-y {
+ background: var(--muted);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js
new file mode 100644
index 0000000000..06f1e27e13
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js
@@ -0,0 +1,141 @@
+onedev.server.layout = {
+ onDomReady: function() {
+ var $body = $("body");
+ var $sidebar = $(".sidebar");
+ var $sidebarBody = $(".sidebar-body");
+
+ var sidebarHideBreakpoint = 992;
+
+ var resizeTimer;
+ $(window).resize(function() {
+ if (window.innerWidth >= sidebarHideBreakpoint)
+ $sidebar.removeClass("sidebar-docked");
+ $body.addClass("no-animation");
+ clearTimeout(resizeTimer);
+ resizeTimer = setTimeout(function() {
+ $body.removeClass("no-animation");
+ }, 300);
+ });
+
+ $(".sidebar-mini-toggle").click(function() {
+ $sidebar.toggleClass("sidebar-minimized");
+ Cookies.set("sidebar.minimized", $sidebar.hasClass("sidebar-minimized"));
+ setTimeout(function() {
+ $(window).resize();
+ }, 300);
+ });
+ $(".sidebar-toggle").click(function() {
+ $sidebar.addClass("sidebar-docked");
+ });
+ $(".sidebar-close").click(function() {
+ $sidebar.removeClass("sidebar-docked");
+ });
+
+ $(document).on("mouseup touchstart", function(e) {
+ if (!$sidebar.is(e.target) && $sidebar.has(e.target).length === 0)
+ $sidebar.removeClass("sidebar-docked");
+ });
+
+ $(document).on("keydown", function(e) {
+ if (e.keyCode == 27)
+ $sidebar.removeClass("sidebar-docked");
+ });
+
+ $(".sidebar-menu .menu-toggle").click(function() {
+ if (window.innerWidth < sidebarHideBreakpoint || !$(".sidebar").hasClass("sidebar-minimized")) {
+ var $this = $(this);
+ $this.toggleClass("open");
+ $this.next().slideToggle(300, function() {
+ $sidebarBody.trigger("resized");
+ $this.parent().scrollIntoView($sidebarBody[0], true);
+ });
+ }
+ });
+
+ $sidebar.find(".menu-link:not('.menu-toggle')").click(function() {
+ window.sessionStorage.setItem("onedev.sidebar.scrollTop", $sidebarBody.scrollTop());
+ });
+
+ var processTimer;
+ function processSubMenus($rightmost) {
+ if (window.innerWidth >= sidebarHideBreakpoint && $(".sidebar").hasClass("sidebar-minimized")) {
+ clearTimeout(processTimer);
+ processTimer = setTimeout(function() {
+ $(".sidebar-menu .menu-body .menu-body").each(function() {
+ if ($rightmost.closest(this).length == 0) {
+ var $this = $(this);
+ $this.removeAttr("style").removeClass("ps ps-scroll").hide().prev(".menu-toggle").removeClass("open");
+ var ps = $this.data("ps");
+ if (ps) {
+ ps.destroy();
+ $this.removeData("ps");
+ }
+ }
+ });
+ if (!$rightmost.is(":visible")) {
+ $rightmost.show().css({
+ "position": "fixed",
+ "background": "white",
+ "box-shadow": "0px 0px 8px 0px rgba(0,0,0,0.2)",
+ "max-height": ($(window).height() - 50) + "px",
+ "border-radius": "0.42rem",
+ "padding": "0.5rem 0"
+ });
+ var $parent = $rightmost.parent().closest(".menu-body");
+ var $toggler = $rightmost.prev(".menu-toggle");
+ $toggler.addClass("open");
+ var left = $parent.offset().left + $parent.outerWidth();
+ var top = $toggler.offset().top - $(window).scrollTop();
+ if (top + $rightmost.outerHeight() > $(window).height())
+ top = $(window).height() - $rightmost.outerHeight() - 25;
+ $rightmost.css("left", left).css("top", top);
+ $rightmost.addClass("ps ps-scroll");
+ var ps = new PerfectScrollbar($rightmost[0]);
+ ps.update();
+ $rightmost.data("ps", ps);
+ }
+ }, 200);
+ }
+ }
+
+ $(".sidebar-menu .menu-toggle").mouseover(function() {
+ processSubMenus($(this).next());
+ return false;
+ });
+ $(".sidebar-menu .menu-body").mouseover(function() {
+ processSubMenus($(this));
+ return false;
+ });
+ $(".sidebar-menu .menu-body").mouseout(function() {
+ processSubMenus($(".sidebar-menu .menu-body").first());
+ return false;
+ });
+
+ var $main = $body.children(".main");
+
+ $main.on("resized", function() {
+ var count = $(".need-width:visible:not(:has('.need-width:visible'))").length;
+ if (count != 0) {
+ var minWidth = 600 + 300*count;
+ $main.css("min-width", minWidth + "px");
+ } else {
+ $main.css("min-width", "");
+ }
+ return false;
+ });
+ },
+ onLoad: function() {
+ var $sidebarBody = $(".sidebar-body");
+ var scrollTop = window.sessionStorage.getItem("onedev.sidebar.scrollTop");
+ var currentMenuLinkCount = $(".sidebar-menu .menu-link").length;
+ if (scrollTop) {
+ window.sessionStorage.removeItem("onedev.sidebar.scrollTop");
+ $sidebarBody.scrollTop(scrollTop);
+ } else {
+ var menuChanged = (currentMenuLinkCount != window.sessionStorage.getItem("onedev.sidebar.menuLinkCount"));
+ $(".sidebar-menu .menu-link.active:visible").last()
+ .scrollIntoView(document.querySelector(".sidebar-body"), menuChanged);
+ }
+ window.sessionStorage.setItem("onedev.sidebar.menuLinkCount", currentMenuLinkCount);
+ }
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.java
index 2701fec9eb..ebb3dc46a5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.java
@@ -4,7 +4,7 @@ import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.layout.LayoutPage;
-import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.page.simple.security.LoginPage;
@SuppressWarnings("serial")
public abstract class MyPage extends LayoutPage {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokenPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokenPage.html
index 888bb0e7f4..1dc6d38442 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokenPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokenPage.html
@@ -1,10 +1,12 @@
<wicket:extend>
- <div id="my-access-token">
- <div class="page-title">
- Access Token
- <div class="help-block">Access token can be used to access api, or clone code in build spec via HTTP(S) protocol.
- It has same permission over all projects accessible by your account</div>
+ <div class="card m-5">
+ <div class="card-body">
+ <div class="font-size-sm text-muted mb-4">
+ <wicket:svg href="bulb" class="icon"/> Access token can be used to access api, or clone code
+ in build spec via HTTP(S) protocol. It has same permission over all projects accessible by
+ your account.
+ </div>
+ <div wicket:id="accessToken"></div>
</div>
- <div wicket:id="accessToken"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokenPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokenPage.java
index 4452eb3da9..21b9ead198 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokenPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokenPage.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.my.accesstoken;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.model.User;
@@ -28,4 +30,9 @@ public class MyAccessTokenPage extends MyPage {
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "My Access Token");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.html
index d93f935cce..547ea8ecf7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.html
@@ -1,3 +1,7 @@
<wicket:extend>
- <div wicket:id="content"></div>
+ <div class="card m-5">
+ <div class="card-body">
+ <div wicket:id="content"></div>
+ </div>
+ </div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.java
index f59dd8ef1e..d8f1ffd280 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.my.avatar;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -26,5 +28,10 @@ public class MyAvatarPage extends MyPage {
}));
}
-
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Edit My Avatar");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.html
index 9c2faa12fe..547ea8ecf7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.html
@@ -1,4 +1,7 @@
<wicket:extend>
- <div class="page-title">Change Password</div>
- <div wicket:id="content"></div>
+ <div class="card m-5">
+ <div class="card-body">
+ <div wicket:id="content"></div>
+ </div>
+ </div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java
index d7be76892e..f80d9cd743 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.my.password;
+import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -42,5 +43,10 @@ public class MyPasswordPage extends MyPage {
}));
}
}
-
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Change My Password");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html
index 662ab840ed..60a00a40a5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html
@@ -1,8 +1,9 @@
<wicket:extend>
- <div id="my-profile">
- <div class="page-title">My Profile</div>
- <div wicket:id="externalManagedNote" class="alert alert-info"></div>
- <div wicket:id="content"></div>
- <a wicket:id="delete" class="btn btn-danger">Delete</a>
+ <div class="card">
+ <div class="card-body">
+ <div wicket:id="externalManagedNote" class="alert alert-info"></div>
+ <div wicket:id="content"></div>
+ <a wicket:id="delete" class="btn btn-danger">Delete</a>
+ </div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java
index 18c89cfc25..2835275851 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.my.profile;
+import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -50,4 +51,9 @@ public class MyProfilePage extends MyPage {
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "My Profile");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html
index c68c136931..6cff007061 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html
@@ -1,12 +1,11 @@
<wicket:extend>
- <div class="page-title">SSH Keys</div>
- <div class="my-ssh-key-list list">
- <div class="head">
- <a class="add-new btn btn-success" wicket:id="newKey"><wicket:svg href="plus" class="icon"></wicket:svg> New SSH Key</a>
- <div wicket:id="sshKeyNote" class="alert alert-info"></div>
- </div>
- <div class="body">
- <div wicket:id="keyList"></div>
+ <div class="p-5">
+ <div wicket:id="sshKeyNote" class="alert alert-info mb-5"></div>
+ <div class="card">
+ <div class="card-body">
+ <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add SSH Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div wicket:id="keyList"></div>
+ </div>
</div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
index e5a60668d6..97f4914757 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
@@ -20,6 +20,8 @@ import io.onedev.server.web.page.my.MyPage;
@SuppressWarnings("serial")
public class MySshKeysPage extends MyPage {
+ private SshKeyListPanel keyList;
+
public MySshKeysPage(PageParameters params) {
super(params);
}
@@ -28,15 +30,16 @@ public class MySshKeysPage extends MyPage {
protected void onInitialize() {
super.onInitialize();
- SshKeyListPanel keyList = new SshKeyListPanel("keyList", new LoadableDetachableModel<List<SshKey>>() {
-
- @Override
- protected List<SshKey> load() {
- return new ArrayList<>(getLoginUser().getSshKeys());
- }
-
- });
-
+ add(new Label("sshKeyNote", "Your SSH keys are managed from " + getLoginUser().getAuthSource()) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getLoginUser().isSshKeyExternalManaged());
+ }
+
+ });
+
add(new ModalLink("newKey") {
@Override
@@ -67,20 +70,23 @@ public class MySshKeysPage extends MyPage {
super.onConfigure();
setVisible(!getLoginUser().isSshKeyExternalManaged());
}
+ });
- });
-
- add(new Label("sshKeyNote", "Your SSH keys are managed from " + getLoginUser().getAuthSource()) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getLoginUser().isSshKeyExternalManaged());
- }
-
- });
+ keyList = new SshKeyListPanel("keyList", new LoadableDetachableModel<List<SshKey>>() {
+
+ @Override
+ protected List<SshKey> load() {
+ return new ArrayList<>(getLoginUser().getSshKeys());
+ }
+
+ });
add(keyList.setOutputMarkupId(true));
}
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "My SSH Keys");
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html
index 7afaf461f4..56379f1d62 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html
@@ -1,11 +1,10 @@
<wicket:extend>
- <div class="page-title">New Project</div>
- <div class="new-project">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions">
+ <div class="card new-project">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor" class="mb-4"></div>
<input class="btn btn-primary dirty-aware" value="Create" type="submit">
- </div>
- </form>
+ </form>
+ </div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
index d540a2ff68..bba9f0eee6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
@@ -2,9 +2,9 @@ package io.onedev.server.web.page.project;
import java.util.Collection;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -63,14 +63,13 @@ public class NewProjectPage extends LayoutPage {
}
@Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new ProjectResourceReference()));
+ protected boolean isPermitted() {
+ return SecurityUtils.canCreateProjects();
}
@Override
- protected boolean isPermitted() {
- return SecurityUtils.canCreateProjects();
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Create Project");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html
index 7beb1449cb..811fdd035d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html
@@ -1,7 +1,6 @@
<wicket:extend>
- <div class="page-title">Projects</div>
- <div id="project-list" class="query-save-support">
- <div wicket:id="side" class="side"></div>
- <div wicket:id="main" class="main"></div>
+ <div class="side-main side-main-wrap p-5">
+ <div wicket:id="savedQueries" class="side"></div>
+ <div wicket:id="projects" class="main"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
index 0f6c71444b..a4430d26eb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
@@ -64,7 +65,7 @@ public class ProjectListPage extends LayoutPage {
protected void onInitialize() {
super.onInitialize();
- add(savedQueries = new SavedQueriesPanel<NamedProjectQuery>("side") {
+ add(savedQueries = new SavedQueriesPanel<NamedProjectQuery>("savedQueries") {
@Override
protected NamedQueriesBean<NamedProjectQuery> newNamedQueriesBean() {
@@ -103,7 +104,7 @@ public class ProjectListPage extends LayoutPage {
});
- add(projectList = new ProjectListPanel("main", new IModel<String>() {
+ add(projectList = new ProjectListPanel("projects", new IModel<String>() {
@Override
public void detach() {
@@ -240,5 +241,10 @@ public class ProjectListPage extends LayoutPage {
}
return paramsOf(query, page, expectedCount);
}
-
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Projects");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
index d8694065dc..8c8dfea1cc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
@@ -1,38 +1,12 @@
<wicket:extend>
- <div id="project">
- <div wicket:id="sidebar"></div>
- <div class="content">
- <wicket:child></wicket:child>
- </div>
+ <div class="project flex-grow-1 d-flex flex-column">
+ <wicket:child></wicket:child>
</div>
- <wicket:fragment wicket:id="sidebarHeadFrag">
- <a wicket:id="link">
- <img wicket:id="avatar">
- <span wicket:id="name"></span>
- <wicket:svg href="ellipsis" class="icon"></wicket:svg>
- </a>
- </wicket:fragment>
- <wicket:fragment wicket:id="navContextFrag">
- <a wicket:id="dropdown" class="dropdown">
- <img wicket:id="avatar">
- <span wicket:id="name" class="ellipsis-text"></span>
- <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>
- </a>
- </wicket:fragment>
- <wicket:fragment wicket:id="navContextDropdownFrag">
- <div wicket:id="info" class="info"></div>
- <ul class="menu list-unstyled">
- <li wicket:id="items">
- <wicket:container wicket:id="item"></wicket:container>
- </li>
- <li wicket:id="setting" class="setting">
- <a onclick="$(this).parent().toggleClass('expanded'); var $floating = $(this).closest('.floating'); $floating.align($floating.data('alignment'));">
- <wicket:svg href="gear" class="icon"></wicket:svg>
- Settings
- <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>
- </a>
- <ul wicket:id="menu" class="menu list-unstyled"></ul>
- </li>
- </ul>
+ <wicket:fragment wicket:id="topbarTitleFrag">
+ <a wicket:id="projects" class="d-none d-sm-inline">Projects</a>
+ <span class="dot d-none d-sm-inline"></span>
+ <a wicket:id="projectLink" class="text-truncate"><span wicket:id="label"></span></a>
+ <span class="dot"></span>
+ <wicket:container wicket:id="projectTitle"></wicket:container>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 85dd58670c..b5db3d23c1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -7,39 +7,30 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
-import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.server.OneDev;
+import com.google.common.collect.Lists;
+
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.floating.AlignPlacement;
+import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.project.avatar.ProjectAvatar;
-import io.onedev.server.web.component.sidebar.SideBar;
-import io.onedev.server.web.component.tabbable.Tab;
-import io.onedev.server.web.component.tabbable.Tabbable;
+import io.onedev.server.web.component.project.info.ProjectInfoPanel;
import io.onedev.server.web.page.layout.LayoutPage;
+import io.onedev.server.web.page.layout.SidebarMenu;
+import io.onedev.server.web.page.layout.SidebarMenuItem;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
@@ -49,27 +40,29 @@ import io.onedev.server.web.page.project.codecomments.ProjectCodeCommentsPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
-import io.onedev.server.web.page.project.info.ProjectInfoPanel;
-import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
+import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
+import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
+import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;
+import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;
+import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;
import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;
import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;
import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
-import io.onedev.server.web.page.project.setting.ProjectSettingPage;
-import io.onedev.server.web.page.project.setting.ProjectSettingTab;
import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;
import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;
import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;
-import io.onedev.server.web.page.project.setting.build.BuildSettingPage;
+import io.onedev.server.web.page.project.setting.build.ActionAuthorizationsPage;
+import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;
import io.onedev.server.web.page.project.setting.build.JobSecretsPage;
-import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;
+import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;
import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;
import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;
import io.onedev.server.web.page.project.stats.ProjectContribsPage;
-import io.onedev.server.web.page.project.stats.ProjectStatsPage;
+import io.onedev.server.web.page.project.stats.SourceLinesPage;
import io.onedev.server.web.page.project.tags.ProjectTagsPage;
import io.onedev.server.web.util.ProjectAware;
@@ -129,51 +122,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
@Override
protected void onInitialize() {
super.onInitialize();
-
- add(new SideBar("sidebar", "project.miniSidebar") {
-
- @Override
- protected List<? extends Tab> newTabs() {
- List<ProjectTab> tabs = ProjectPage.this.newTabs();
- if (SecurityUtils.canManage(getProject()))
- tabs.add(new ProjectTab(Model.of("Setting"), "gear", 0, GeneralSettingPage.class, ProjectSettingPage.class));
- return tabs;
- }
-
- @Override
- protected Component newHead(String componentId) {
- Fragment fragment = new Fragment(componentId, "sidebarHeadFrag", ProjectPage.this);
- Project project = getProject();
- AlignPlacement placement = new AlignPlacement(0, 100, 0, 0);
- AjaxLink<Void> link = new DropdownLink("link", placement) {
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new ProjectInfoPanel(id, projectModel) {
-
- @Override
- protected void onPromptForkOption(AjaxRequestTarget target) {
- dropdown.close();
- }
- };
- }
-
- };
- link.add(new ProjectAvatar("avatar", getProject()));
- link.add(new Label("name", project.getName()));
- fragment.add(link);
-
- return fragment;
- }
-
- });
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(CssHeaderItem.forReference(new ProjectResourceReference()));
}
@Override
@@ -186,181 +134,132 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
return projectModel.getObject();
}
- private List<ProjectTab> newTabs() {
- List<ProjectTab> tabs = new ArrayList<>();
+ @Override
+ protected List<SidebarMenu> getSidebarMenus() {
+ List<SidebarMenu> menus = super.getSidebarMenus();
+
+ List<SidebarMenuItem> menuItems = new ArrayList<>();
+
if (SecurityUtils.canReadCode(getProject())) {
- tabs.add(new ProjectTab(Model.of("Files"), "files", 0, ProjectBlobPage.class));
- tabs.add(new ProjectTab(Model.of("Commits"), "commit", 0,
- ProjectCommitsPage.class, CommitDetailPage.class) {
-
- @Override
- public Component render(String componentId) {
- return new ProjectTabHead(componentId, this) {
- @Override
-
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>(linkId,
- pageClass, ProjectCommitsPage.paramsOf(getProject(), null));
- }
-
- };
- }
-
- });
- tabs.add(new ProjectTab(Model.of("Branches"), "branch",
- 0, ProjectBranchesPage.class));
- tabs.add(new ProjectTab(Model.of("Tags"), "tag",
- 0, ProjectTagsPage.class));
+ List<SidebarMenuItem> codeMenuItems = new ArrayList<>();
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Files",
+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject())));
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Commits",
+ ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getProject(), null),
+ Lists.newArrayList(CommitDetailPage.class)));
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Branches",
+ ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject())));
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Tags",
+ ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject())));
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Comments",
+ ProjectCodeCommentsPage.class, ProjectCodeCommentsPage.paramsOf(getProject(), 0)));
+ codeMenuItems.add(new SidebarMenuItem.Page(null, "Compare",
+ RevisionComparePage.class, RevisionComparePage.paramsOf(getProject())));
+
+ menuItems.add(new SidebarMenuItem.SubMenu("code", "Code", codeMenuItems));
- tabs.add(new ProjectTab(Model.of("Pull Requests"), "pull-request",
- 0, ProjectPullRequestsPage.class, NewPullRequestPage.class, PullRequestDetailPage.class,
- InvalidPullRequestPage.class) {
-
- @Override
- public Component render(String componentId) {
- return new ProjectTabHead(componentId, this) {
-
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>(linkId,
- pageClass, ProjectPullRequestsPage.paramsOf(getProject(), 0));
- }
-
- };
- }
-
- });
- }
-
+ menuItems.add(new SidebarMenuItem.Page("pull-request", "Pull Requests",
+ ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(getProject(), 0),
+ Lists.newArrayList(NewPullRequestPage.class, PullRequestDetailPage.class, InvalidPullRequestPage.class)));
+ }
if (getProject().isIssueManagementEnabled()) {
- tabs.add(new ProjectTab(Model.of("Issues"), "bug", 0, ProjectIssueListPage.class,
- ProjectIssuesPage.class, IssueDetailPage.class, NewIssuePage.class) {
-
- @Override
- public Component render(String componentId) {
- return new ProjectTabHead(componentId, this) {
-
- @Override
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>(linkId,
- pageClass, ProjectIssueListPage.paramsOf(getProject(), 0));
- }
-
- };
- }
-
- });
+ List<SidebarMenuItem> issueMenuItems = new ArrayList<>();
+ issueMenuItems.add(new SidebarMenuItem.Page(null, "List",
+ ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(getProject(), 0),
+ Lists.newArrayList(NewIssuePage.class, IssueDetailPage.class)));
+ issueMenuItems.add(new SidebarMenuItem.Page(null, "Boards",
+ IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject())));
+
+ menuItems.add(new SidebarMenuItem.SubMenu("bug", "Issues", issueMenuItems));
+
+ menuItems.add(new SidebarMenuItem.Page("milestone", "Milestones",
+ MilestoneListPage.class, MilestoneListPage.paramsOf(getProject(), false, null),
+ Lists.newArrayList(NewMilestonePage.class, MilestoneDetailPage.class, MilestoneEditPage.class)));
+
}
+ menuItems.add(new SidebarMenuItem.Page("play-circle", "Builds",
+ ProjectBuildsPage.class, ProjectBuildsPage.paramsOf(getProject(), 0),
+ Lists.newArrayList(BuildDetailPage.class, InvalidBuildPage.class)));
- tabs.add(new ProjectTab(Model.of("Builds"), "play-circle", 0, ProjectBuildsPage.class,
- BuildDetailPage.class, InvalidBuildPage.class) {
-
- @Override
- public Component render(String componentId) {
- return new ProjectTabHead(componentId, this) {
-
- @Override
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>(linkId,
- pageClass, ProjectBuildsPage.paramsOf(getProject(), 0));
- }
-
- };
- }
+ if (SecurityUtils.canReadCode(getProject())) {
+ List<SidebarMenuItem> statsMenuItems = new ArrayList<>();
+ statsMenuItems.add(new SidebarMenuItem.Page(null, "Contributions",
+ ProjectContribsPage.class, ProjectContribsPage.paramsOf(getProject())));
+ statsMenuItems.add(new SidebarMenuItem.Page(null, "Source Lines",
+ SourceLinesPage.class, SourceLinesPage.paramsOf(getProject())));
- });
+ menuItems.add(new SidebarMenuItem.SubMenu("statistics", "Statistics", statsMenuItems));
+ }
- if (SecurityUtils.canReadCode(getProject())) {
- tabs.add(new ProjectTab(Model.of("Code Comments"), "comments", 0, ProjectCodeCommentsPage.class) {
-
- @Override
- public Component render(String componentId) {
- return new ProjectTabHead(componentId, this) {
-
- @Override
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>(linkId,
- pageClass, ProjectCodeCommentsPage.paramsOf(getProject(), 0));
- }
-
- };
- }
-
- });
- tabs.add(new ProjectTab(Model.of("Compare"), "compare", 0, RevisionComparePage.class));
- tabs.add(new ProjectTab(Model.of("Statistics"), "statistics", 0, ProjectContribsPage.class,
- ProjectStatsPage.class));
+ if (SecurityUtils.canManage(getProject())) {
+ List<SidebarMenuItem> settingMenuItems = new ArrayList<>();
+ settingMenuItems.add(new SidebarMenuItem.Page(null, "General Setting",
+ GeneralProjectSettingPage.class, GeneralProjectSettingPage.paramsOf(getProject())));
+ settingMenuItems.add(new SidebarMenuItem.Page(null, "Edit Avatar",
+ AvatarEditPage.class, AvatarEditPage.paramsOf(getProject())));
+ settingMenuItems.add(new SidebarMenuItem.Page(null, "Authorizations",
+ ProjectAuthorizationsPage.class, ProjectAuthorizationsPage.paramsOf(getProject())));
+ settingMenuItems.add(new SidebarMenuItem.Page(null, "Branch Protection",
+ BranchProtectionsPage.class, BranchProtectionsPage.paramsOf(getProject())));
+ settingMenuItems.add(new SidebarMenuItem.Page(null, "Tag Protection",
+ TagProtectionsPage.class, TagProtectionsPage.paramsOf(getProject())));
+
+ List<SidebarMenuItem> buildSettingMenuItems = new ArrayList<>();
+
+ buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Job Secrets",
+ JobSecretsPage.class, JobSecretsPage.paramsOf(getProject())));
+ buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Action Authorizations",
+ ActionAuthorizationsPage.class, ActionAuthorizationsPage.paramsOf(getProject())));
+ buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Build Preserve Rules",
+ BuildPreservationsPage.class, BuildPreservationsPage.paramsOf(getProject())));
+
+ settingMenuItems.add(new SidebarMenuItem.SubMenu(null, "Build Setting", buildSettingMenuItems));
+ settingMenuItems.add(new SidebarMenuItem.Page(null, "Web Hooks",
+ WebHooksPage.class, WebHooksPage.paramsOf(getProject())));
+ menuItems.add(new SidebarMenuItem.SubMenu("sliders", "Settings", settingMenuItems));
}
- return tabs;
- }
-
- @Override
- protected Component newNavContext(String componentId) {
- Fragment fragment = new Fragment(componentId, "navContextFrag", this);
- DropdownLink link = new DropdownLink("dropdown", AlignPlacement.bottom(15)) {
-
+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(getProject());
+ SidebarMenu.Header menuHeader = new SidebarMenu.Header(avatarUrl, "CURRENT PROJECT") {
+
@Override
- protected void onInitialize(FloatingPanel dropdown) {
- super.onInitialize(dropdown);
- dropdown.add(AttributeAppender.append("class", "nav-context-dropdown project-nav-context-dropdown"));
- }
+ protected Component newMoreInfo(String componentId, FloatingPanel dropdown) {
+ return new ProjectInfoPanel(componentId, projectModel) {
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- Fragment fragment = new Fragment(id, "navContextDropdownFrag", ProjectPage.this);
- fragment.add(new ProjectInfoPanel("info", projectModel) {
-
@Override
protected void onPromptForkOption(AjaxRequestTarget target) {
dropdown.close();
}
- });
- fragment.add(new ListView<ProjectTab>("items", newTabs()) {
-
- @Override
- protected void populateItem(ListItem<ProjectTab> item) {
- ProjectTab tab = item.getModelObject();
- item.add(tab.render("item"));
- if (tab.isActive(getPage()))
- item.add(AttributeAppender.append("class", "active"));
- }
-
- });
- WebMarkupContainer settingItem = new WebMarkupContainer("setting");
- settingItem.setVisible(SecurityUtils.canManage(getProject()));
- settingItem.add(new Tabbable("menu", newSettingTabs()));
- if (getPage() instanceof ProjectSettingPage)
- settingItem.add(AttributeAppender.append("class", "active expanded"));
- fragment.add(settingItem);
- return fragment;
+ };
}
};
- link.add(new ProjectAvatar("avatar", getProject()));
- link.add(new Label("name", getProject().getName()));
- fragment.add(link);
-
- return fragment;
- }
-
- protected List<ProjectSettingTab> newSettingTabs() {
- List<ProjectSettingTab> tabs = new ArrayList<>();
- tabs.add(new ProjectSettingTab("General Setting", "sliders", GeneralSettingPage.class));
- tabs.add(new ProjectSettingTab("Edit Avatar", "avatar", AvatarEditPage.class));
- tabs.add(new ProjectSettingTab("Authorizations", "user", ProjectAuthorizationsPage.class));
- tabs.add(new ProjectSettingTab("Branch Protection", "branch-lock", BranchProtectionsPage.class));
- tabs.add(new ProjectSettingTab("Tag Protection", "tag-lock", TagProtectionsPage.class));
- tabs.add(new ProjectSettingTab("Build Setting", "gear-run",
- JobSecretsPage.class, BuildSettingPage.class));
- tabs.add(new ProjectSettingTab("Web Hooks", "webhook", WebHooksPage.class));
- return tabs;
+ menus.add(new SidebarMenu(menuHeader, menuItems));
+ return menus;
}
-
+
@Override
protected void onDetach() {
projectModel.detach();
super.onDetach();
}
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "topbarTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("projects", ProjectListPage.class));
+
+ ViewStateAwarePageLink<?> link = new ViewStateAwarePageLink<Void>("projectLink",
+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject()));
+ link.add(new Label("label", getProject().getName()));
+
+ fragment.add(link);
+
+ fragment.add(newProjectTitle("projectTitle"));
+ return fragment;
+ }
+
+ protected abstract Component newProjectTitle(String componentId);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectResourceReference.java
deleted file mode 100644
index 0af635a476..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class ProjectResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ProjectResourceReference() {
- super(ProjectResourceReference.class, "project.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectTab.java
deleted file mode 100644
index f8b04f533e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectTab.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package io.onedev.server.web.page.project;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-
-import io.onedev.server.web.component.tabbable.PageTab;
-
-@SuppressWarnings("serial")
-public class ProjectTab extends PageTab {
-
- private final String iconHref;
-
- private final int count;
-
- public ProjectTab(IModel<String> titleModel, String iconHref, int count,
- Class<? extends ProjectPage> mainPageClass) {
- super(titleModel, mainPageClass);
- this.iconHref = iconHref;
- this.count = count;
- }
-
- public ProjectTab(IModel<String> titleModel, String iconHref, int count,
- Class<? extends ProjectPage> mainPageClass,
- Class<? extends ProjectPage> additionalPageClass1) {
- super(titleModel, mainPageClass, additionalPageClass1);
- this.iconHref = iconHref;
- this.count = count;
- }
-
- public ProjectTab(IModel<String> titleModel, String iconHref, int count,
- Class<? extends ProjectPage> mainPageClass,
- Class<? extends ProjectPage> additionalPageClass1,
- Class<? extends ProjectPage> additionalPageClass2) {
- super(titleModel, mainPageClass, additionalPageClass1, additionalPageClass2);
- this.iconHref = iconHref;
- this.count = count;
- }
-
- public ProjectTab(IModel<String> titleModel, String iconHref, int count,
- Class<? extends ProjectPage> mainPageClass,
- Class<? extends ProjectPage> additionalPageClass1,
- Class<? extends ProjectPage> additionalPageClass2,
- Class<? extends ProjectPage> additionalPageClass3) {
- super(titleModel, mainPageClass, additionalPageClass1,
- additionalPageClass2, additionalPageClass3);
- this.iconHref = iconHref;
- this.count = count;
- }
-
- public ProjectTab(IModel<String> titleModel, String iconHref, int count,
- Class<? extends ProjectPage> mainPageClass,
- Class<? extends ProjectPage> additionalPageClass1,
- Class<? extends ProjectPage> additionalPageClass2,
- Class<? extends ProjectPage> additionalPageClass3,
- Class<? extends ProjectPage> additionalPageClass4) {
- super(titleModel, mainPageClass, additionalPageClass1,
- additionalPageClass2, additionalPageClass3, additionalPageClass4);
- this.iconHref = iconHref;
- this.count = count;
- }
-
- public ProjectTab(IModel<String> titleModel, String iconHref, int count,
- Class<? extends ProjectPage> mainPageClass,
- Class<? extends ProjectPage> additionalPageClass1,
- Class<? extends ProjectPage> additionalPageClass2,
- Class<? extends ProjectPage> additionalPageClass3,
- Class<? extends ProjectPage> additionalPageClass4,
- Class<? extends ProjectPage> additionalPageClass5) {
- super(titleModel, mainPageClass, additionalPageClass1, additionalPageClass2,
- additionalPageClass3, additionalPageClass4, additionalPageClass5);
- this.iconHref = iconHref;
- this.count = count;
- }
-
- public String getIconHref() {
- return iconHref;
- }
-
- /**
- * @return the count
- */
- public int getCount() {
- return count;
- }
-
- public Component render(String componentId) {
- return new ProjectTabHead(componentId, this);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectTabHead.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectTabHead.html
deleted file mode 100644
index 3d0bc8a575..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectTabHead.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<wicket:panel>
- <a wicket:id="link">
- <svg wicket:id="icon" class="icon"></svg>
- <span wicket:id="text" class="text"></span>
- <span wicket:id="count" class="badge"></span>
- </a>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectTabHead.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectTabHead.java
deleted file mode 100644
index 45298471ea..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectTabHead.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.onedev.server.web.page.project;
-
-import org.apache.wicket.Page;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.svg.SpriteImage;
-
-@SuppressWarnings("serial")
-public class ProjectTabHead extends Panel {
-
- private final ProjectTab tab;
-
- public ProjectTabHead(String id, ProjectTab tab) {
- super(id);
-
- this.tab = tab;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Link<?> link = newLink("link", tab.getMainPageClass());
- link.add(new SpriteImage("icon", tab.getIconHref()));
-
- link.add(new Label("text", tab.getTitleModel()));
-
- link.add(new Label("count", tab.getCount()).setVisible(tab.getCount()!=0));
- add(link);
- }
-
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- ProjectPage page = (ProjectPage) getPage();
- return new ViewStateAwarePageLink<Void>("link",pageClass, ProjectPage.paramsOf(page.getProject()));
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html
index efb49ce496..3bb735f346 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="upload-blobs">
<div class="modal-header">
<h5 class="modal-title">Upload Files</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
@@ -12,7 +12,7 @@
<div class="form-group">
<label>Directory</label>
<input wicket:id="directory" class="form-control"></input>
- <p class="help-block">Optionally specify relative directory to put uploaded files</p>
+ <p class="form-text text-muted">Optionally specify relative directory to put uploaded files</p>
</div>
<div class="form-group">
<label>Summary Commit Message</label>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.html
deleted file mode 100644
index d50a400ab6..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<wicket:panel>
- <div class="clone-or-download">
- <div wicket:id="clone" class="clone"></div>
- <div class="download">
- <div>
- <a wicket:id="downloadAsZip" class="btn btn-block btn-primary">Download zip</a>
- </div>
- <div>
- <a wicket:id="downloadAsTgz" class="btn btn-block btn-primary">Download tar.gz</a>
- </div>
- </div>
- </div>
- <wicket:fragment wicket:id="urlFrag">
- <div class="url input-group">
- <div class="input-group-prepend">
- <span class="input-group-text">Clone</span>
- </div>
- <input wicket:id="value" readonly="readonly" class="form-control">
- <div class="input-group-append">
- <a wicket:id="copy" class="btn btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
- </div>
- </div>
- </wicket:fragment>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/GetCodePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/GetCodePanel.html
new file mode 100644
index 0000000000..7e2096d131
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/GetCodePanel.html
@@ -0,0 +1,19 @@
+<wicket:panel>
+ <div wicket:id="clone" class="clone"></div>
+ <div class="d-flex justify-content-between download">
+ <a wicket:id="downloadAsZip" class="btn btn-block btn-primary mr-4 text-nowrap">Download zip</a>
+ <span></span>
+ <a wicket:id="downloadAsTgz" class="btn btn-block btn-primary text-nowrap">Download tar.gz</a>
+ </div>
+ <wicket:fragment wicket:id="urlFrag">
+ <div class="url input-group">
+ <div class="input-group-prepend">
+ <span class="input-group-text">Clone</span>
+ </div>
+ <input wicket:id="value" readonly="readonly" class="form-control">
+ <div class="input-group-append">
+ <a wicket:id="copy" class="btn btn-icon btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
+ </div>
+ </div>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/GetCodePanel.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/GetCodePanel.java
index 0042beda67..38b45fae5b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/CloneOrDownloadPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/GetCodePanel.java
@@ -16,11 +16,11 @@ import io.onedev.server.web.resource.ArchiveResource;
import io.onedev.server.web.resource.ArchiveResourceReference;
@SuppressWarnings("serial")
-public abstract class CloneOrDownloadPanel extends Panel {
+public abstract class GetCodePanel extends Panel {
private final DropdownLink dropdown;
- public CloneOrDownloadPanel(String id, DropdownLink dropdown) {
+ public GetCodePanel(String id, DropdownLink dropdown) {
super(id);
this.dropdown = dropdown;
}
@@ -33,7 +33,7 @@ public abstract class CloneOrDownloadPanel extends Panel {
@Override
protected Component newContent(String componentId) {
- Fragment fragment = new Fragment(componentId, "urlFrag", CloneOrDownloadPanel.this);
+ Fragment fragment = new Fragment(componentId, "urlFrag", GetCodePanel.this);
IModel<String> urlModel = new LoadableDetachableModel<String>() {
@Override
@@ -49,7 +49,7 @@ public abstract class CloneOrDownloadPanel extends Panel {
@Override
protected Project getProject() {
- return CloneOrDownloadPanel.this.getProject();
+ return GetCodePanel.this.getProject();
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
index fd9f6ba510..95ef88cfb1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
@@ -1,27 +1,30 @@
<wicket:extend>
- <div id="project-blob">
- <div class="head clearfix">
- <a wicket:id="revisionPicker" class="revision-picker float-left"></a>
- <div wicket:id="buildStatus" class="build-status float-left"></div>
- <div wicket:id="blobNavigator" class="blob-navigator float-left"></div>
- <div wicket:id="blobOperations" class="operations float-right">
- <a wicket:id="cloneOrDownload" title="Clone or download project" class="clone-or-download"><b>Clone or Download <wicket:svg href="arrow" class="icon icon-sm rotate-90"></wicket:svg></b></a>
- <a wicket:id="add" title="Add files to current directory">Add <wicket:svg href="arrow" class="icon icon-sm rotate-90"></wicket:svg></a>
- <a wicket:id="search" title="Search files, symbols and texts">Search <wicket:svg href="arrow" class="icon icon-sm rotate-90"></wicket:svg></a>
- <a wicket:id="history" title="Commit history of current path">History</a>
+ <div class="project-blob flex-grow-1 d-flex flex-column">
+ <div class="head d-flex align-items-center justify-content-between flex-wrap px-3 flex-shrink-0">
+ <div class="d-flex flex-wrap align-items-center">
+ <a wicket:id="revisionPicker" class="revision-picker mr-3 py-2"></a>
+ <div wicket:id="buildStatus" class="build-status mr-3 py-2"></div>
+ <div wicket:id="blobNavigator" class="blob-navigator mr-3 py-2"></div>
</div>
+ <div wicket:id="blobOperations" class="d-flex align-items-center py-2">
+ <a wicket:id="getCode" title="Code clone or download" class="mr-4 text-nowrap link-info font-weight-bold"><wicket:svg href="download2" class="icon"/> Code</a>
+ <a wicket:id="add" title="Add files to current directory" class="mr-3 text-nowrap dropdown-toggle">Add</a>
+ <a wicket:id="search" title="Search files, symbols and texts" class="mr-3 text-nowrap dropdown-toggle">Search</a>
+ <a wicket:id="history" title="Commit history of current path" class="text-nowrap">History</a>
+ </div>
+ </div>
+ <div wicket:id="revisionIndexing" class="p-3 revision-indexing text-warning flex-shrink-0">
+ <wicket:svg href="loading" class="icon spin"/>
+ Revision indexing in progress... (search in this revision will be accurate after indexed)
</div>
- <!-- below is used to hold file navigator if there is not enough space in head -->
- <div class="blob-navigator clearfix"></div>
- <div wicket:id="revisionIndexing" class="revision-indexing">
- <img wicket:id="icon">
- <span>Revision indexing in progress... (search in this revision will be accurate after indexed)</span>
+ <div wicket:id="buildSupportNote" class="build-support-note p-3 text-info flex-shrink-0">
+ <wicket:svg href="bulb" class="icon"/>
+ Enable build support by <a wicket:id="addFile" class="link-primary"></a>
</div>
- <div wicket:id="buildSupportNote" class="build-support-note"><wicket:svg href="bulb" class="icon"/> Enable build support by <a wicket:id="addFile"></a></div>
- <div wicket:id="blobContent" class="blob-content"></div>
- <div wicket:id="searchResult" class="search-result">
- <div id="search-result-resize-handle" class="ui-resizable-handle ui-resizable-n"></div>
- <div wicket:id="content"></div>
+ <div wicket:id="blobContent" class="blob-content autofit flex-grow-1 d-flex flex-column"></div>
+ <div wicket:id="searchResult" class="search-result flex-shrink-0 flex-column overflow-hidden">
+ <div id="search-result-resize-handle" class="ui-resizable-handle ui-resizable-n flex-shrink-0"></div>
+ <div wicket:id="content" class="flex-grow-1 d-flex flex-column overflow-hidden"></div>
</div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index 1c3f55669e..e0bb4a4db3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -40,7 +40,6 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.eclipse.jgit.lib.FileMode;
@@ -56,7 +55,6 @@ import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
-import io.onedev.commons.jsymbol.util.NoAntiCacheImage;
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
@@ -234,13 +232,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
add(revisionIndexing = new WebMarkupContainer("revisionIndexing") {
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new NoAntiCacheImage("icon", new PackageResourceReference(ProjectBlobPage.class, "indexing.gif")));
- setOutputMarkupPlaceholderTag(true);
- }
-
@Override
protected void onConfigure() {
super.onConfigure();
@@ -259,7 +250,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
}
}
- });
+ }.setOutputMarkupPlaceholderTag(true));
+
revisionIndexing.add(new WebSocketObserver() {
@Override
@@ -603,7 +595,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
blobOperations.add(new ViewStateAwarePageLink<Void>("history", ProjectCommitsPage.class,
ProjectCommitsPage.paramsOf(getProject(), query, compareWith)));
- blobOperations.add(new DropdownLink("cloneOrDownload") {
+ blobOperations.add(new DropdownLink("getCode") {
@Override
protected void onConfigure() {
@@ -611,9 +603,15 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
setVisible(state.blobIdent.revision != null && state.blobIdent.path == null);
}
+ @Override
+ protected void onInitialize(FloatingPanel dropdown) {
+ super.onInitialize(dropdown);
+ dropdown.add(AttributeAppender.append("class", "get-code"));
+ }
+
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
- return new CloneOrDownloadPanel(id, this) {
+ return new GetCodePanel(id, this) {
@Override
protected Project getProject() {
@@ -748,7 +746,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
};
} else {
- commitStatus = new WebMarkupContainer("buildStatus");
+ commitStatus = new WebMarkupContainer("buildStatus").add(AttributeAppender.append("class", "d-none"));
}
commitStatus.setOutputMarkupPlaceholderTag(true);
@@ -905,7 +903,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
newBlobOperations(target);
newBuildSupportNote(target);
newBlobContent(target);
- resizeWindow(target);
}
@Override
@@ -983,13 +980,13 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
};
if (target != null) {
target.appendJavaScript(""
- + "$('#project-blob>.search-result').show(); "
- + "$('#project-blob .search-result>.body').focus();");
+ + "$('.project-blob>.search-result').css('display', 'flex'); "
+ + "$('.project-blob .search-result>.body').focus();");
}
} else {
content = new WebMarkupContainer("content").setOutputMarkupId(true);
if (target != null)
- target.appendJavaScript("$('#project-blob>.search-result').hide();");
+ target.appendJavaScript("$('.project-blob>.search-result').hide();");
else
searchResult.add(AttributeAppender.replace("style", "display: none;"));
}
@@ -1016,14 +1013,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
newBlobOperations(target);
newBuildSupportNote(target);
newBlobContent(target);
- resizeWindow(target);
}
}
- private void resizeWindow(IPartialPageRequestHandler partialPageRequestHandler) {
- partialPageRequestHandler.appendJavaScript("$(window).resize();");
- }
-
@Override
public BlobIdent getBlobIdent() {
return state.blobIdent;
@@ -1091,6 +1083,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
state.requestId = null;
newSearchResult(target, null);
onResolvedRevisionChange(target);
+ resizeWindow(target);
} else if (!Objects.equal(state.blobIdent.path, blobIdent.path)) {
state.blobIdent.path = blobIdent.path;
state.blobIdent.mode = blobIdent.mode;
@@ -1483,4 +1476,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
return new JobIdentity(getProject(), null);
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Files");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/hgrabber.png b/server-core/src/main/java/io/onedev/server/web/page/project/blob/hgrabber.png
deleted file mode 100644
index ca55b22c64..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/page/project/blob/hgrabber.png and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/indexing.gif b/server-core/src/main/java/io/onedev/server/web/page/project/blob/indexing.gif
deleted file mode 100644
index 1560b646cf..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/page/project/blob/indexing.gif and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html
index c161832a50..14e75c4060 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html
@@ -1,10 +1,10 @@
<wicket:panel>
- <div class="blob-navigator clearfix">
- <div wicket:id="treeSegments" class="float-left clearfix">
- <a wicket:id="link" class="float-left"><span wicket:id="label"></span></a>
+ <div class="blob-navigator d-flex align-items-center flex-wrap">
+ <div wicket:id="treeSegments" class="d-flex align-items-center mr-1">
+ <a wicket:id="link" class="mr-1"><span wicket:id="label"></span></a>
<!-- below separator makes slash appearing in path when the path is copied -->
<span style="position:absolute; top: -10000px;">/</span>
- <a wicket:id="subtreeDropdownTrigger" class="subtree-dropdown-trigger float-left"></a>
+ <a wicket:id="subtreeDropdownTrigger" class="subtree-dropdown-trigger d-flex align-items-center justify-content-center"><span></span></a>
</div>
<div wicket:id="lastSegment" class="float-left last-segment"></div>
</div>
@@ -13,10 +13,10 @@
</wicket:fragment>
<wicket:fragment wicket:id="nameEditFrag">
<form wicket:id="form" class="leave-confirm name">
- <input wicket:id="input" type="text" placeholder="Name your file" class="form-control input-sm"></input>
+ <input wicket:id="input" type="text" placeholder="Name your file" class="form-control form-control-sm form-control-solid"></input>
</form>
</wicket:fragment>
<wicket:fragment wicket:id="treeNodeFrag">
- <a wicket:id="link"><svg wicket:id="icon" class="icon"></svg> <span wicket:id="label"></span></a>
+ <a wicket:id="link"><svg wicket:id="icon" class="icon mr-1"></svg> <span wicket:id="label"></span></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
index 8392ff5a19..21a9516aeb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
@@ -133,7 +133,7 @@ public class BlobNavigator extends Panel {
else
link.add(new Label("label", blobIdent.path));
} else {
- link.add(new Label("label", context.getProject().getName()));
+ link.add(new Label("label", "ROOT"));
}
item.add(link);
@@ -182,7 +182,7 @@ public class BlobNavigator extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new HumanTheme());
+ add(new HumanTheme());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/arrow-down.png b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/arrow-down.png
deleted file mode 100644
index 685feb21ea..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/arrow-down.png and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/arrow-right.png b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/arrow-right.png
deleted file mode 100644
index c3e0d199f6..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/arrow-right.png and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css
index cd6d984872..19ca6758c3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css
@@ -1,18 +1,32 @@
.subtree-dropdown-trigger {
- background: url(arrow-right.png) no-repeat center top 5px;
- width: 16px;
- height: 20px;
+ width: 16px;
+ height: 16px;
+ background: white;
+ border-radius: 2px;
+}
+.subtree-dropdown-trigger>span {
display: block;
+ width: 0;
+ height: 0;
+ border-top: 4px solid transparent;
+ border-bottom: 4px solid transparent;
+ border-left: 4px solid var(--gray-dark);
}
+
.subtree-dropdown-trigger:hover, .subtree-dropdown-trigger.dropdown-open {
- background-image: url(arrow-down.png);
+ background: var(--primary);
+ padding-top: 6px;
+}
+.subtree-dropdown-trigger:hover>span, .subtree-dropdown-trigger.dropdown-open>span {
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid white;
}
.subtree-dropdown {
- padding: 8px 24px 8px 4px;
+ padding: 1rem;
max-width: 800px;
}
-.blob-navigator .add {
- font-size: 18px;
- line-height: 20px;
- vertical-align: middle;
-}
+
+.blob-navigator .name .form-control {
+ width: 200px;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
index b5451e4723..8c03e55b6f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
@@ -1,138 +1,53 @@
-body.ProjectBlobPage.additionalWidth1 {
- min-width: 700px;
+.ProjectBlobPage .sidebar {
+ box-shadow: none;
+ border-right: 1px solid var(--light-gray);
}
-body.ProjectBlobPage.additionalWidth2 {
- min-width: 1000px;
+.ProjectBlobPage .topbar {
+ box-shadow: none;
+ border-bottom: 1px solid var(--light-gray);
}
-body.ProjectBlobPage.additionalWidth3 {
- min-width: 1300px;
-}
-#project-blob {
- margin: -20px;
+.project-blob {
background: white;
}
-#project-blob>.head {
- border-bottom: 1px solid #E0E0E0;
- height: 34px;
-}
-#project-blob>.head>.revision-picker {
- padding: 0;
- border-right: 1px solid #E0E0E0;
-}
-#project-blob>.head>.build-status a {
- padding: 5px 6px 5px 6px;
- border-right: 1px solid #E0E0E0;
- color: #333;
- text-decoration: none;
- display: block;
-}
-#project-blob>.head>.build-status a:hover {
- background: #EEE;
-}
-#project-blob>.head>.revision-picker:empty,
-#project-blob>.head>.build-status:empty {
- display: none;
-}
-#project-blob>.head>a.revision-picker {
- display: block;
- color: #333;
- text-decoration: none;
- white-space: nowrap;
-}
-#project-blob>.head>a.revision-picker:hover {
- background: #EEE;
- clear: both;
-}
-#project-blob>.head>a.revision-picker, #project-blob>.head>.blob-navigator, #project-blob>.blob-navigator>div {
- padding: 5px 8px;
-}
-#project-blob>.head>.blob-navigator {
- padding: 5px 8px 0px 8px;
-}
-#project-blob>.blob-navigator>div {
- padding: 0px 8px;
-}
-#project-blob>.head>.blob-navigator form.name input {
- height: 33px;
- border: 1px solid #E0E0E0;
- border-top: none;
- border-bottom: none;
- border-radius: 0;
- margin-top: -5px;
- padding-left: 0px 8px;
- width: 160px;
-}
-#project-blob>.blob-navigator {
- border-bottom: 1px solid #E0E0E0;
-}
-#project-blob>.blob-navigator form.name input {
- border-top: 1px solid #E0E0E0;
- border-bottom: 1px solid #E0E0E0;
- height: 26px;
- margin-top: -1px;
- border-radius: 3px;
- width: 160px;
-}
-
-#project-blob>.head>.operations {
- margin-top: 4px;
-}
-#project-blob>.head>.operations>a {
- padding: 4px;
- color: #333;
+.project-blob>.head {
+ border-bottom: 1px solid var(--light-gray);
+ min-height: 40px;
}
-#project-blob>.blob-navigator {
- display: none;
- padding: 2px 0 3px 0;
+.project-blob .revision-indexing+.build-support-note {
+ padding-top: 0 !important;
}
-#project-blob>.revision-indexing {
- padding: 8px 8px 9px 8px;
- background: #fcf8e3;
- border-top: 1px solid #F2E084;
- border-bottom: 1px solid #F7EBAF;
- color: #8a6d3b;
- font-size: 13px;
+.project-blob>.blob-content {
+ overflow: auto;
}
-#project-blob>.build-support-note {
- padding: 8px;
- border-top: 1px solid #68D056;
- border-bottom: 1px solid #68D056;
- background: #E5FBE5;
- color: #399529;
-}
-#project-blob>.search-result {
+.project-blob>.search-result {
height: 200px;
- border-top: 1px solid #E0E0E0;
+ border-top: 1px solid var(--light-gray);
top: 0 !important;
}
-#project-blob>.search-result>.ui-resizable-handle {
- background: #F2F2F2 url(hgrabber.png) no-repeat scroll center center;
+.project-blob>.search-result>.ui-resizable-handle {
+ background: var(--light) url(/icon/grip2.svg) no-repeat scroll center center;
+ background-size: 20px 20px;
cursor: n-resize;
- height: 8px;
+ height: 4px;
top: 0;
position: relative;
}
-.floating ul.contributors {
- margin: 0;
- padding: 8px 0;
+.floating.get-code {
+ max-width: 480px !important;
}
-.floating ul.contributors>li>a {
- display: block;
- padding: 4px 8px;
- text-decoration: none;
- color: #666;
+.floating.get-code .download {
+ padding: 0 2.25rem 2rem 2.25rem;
}
-.floating ul.contributors>li>a:hover {
- background: #EEE;
+.floating.get-code .card {
+ box-shadow: none;
}
.markdown-rendered a+.missing, img+.missing {
- color: #333;
- background: #FDB3B3;
+ background: var(--light-danger);
margin-left: 4px;
padding: 0 2px;
}
@@ -141,28 +56,6 @@ body.ProjectBlobPage.additionalWidth3 {
}
.markdown-rendered .missing+.add-missing {
- color: #05B305;
+ color: var(--success);
margin-left: 4px;
}
-.clone-or-download {
- max-width: 480px;
- padding: 12px;
-}
-.clone-or-download>.clone input {
- background: white;
-}
-.clone-or-download>.download {
- margin-top: 20px;
- display: table;
- width: 100%;
-}
-.clone-or-download>.download>div {
- display: table-cell;
- width: 50%;
-}
-.clone-or-download>.download>:first-child {
- padding-right: 10px;
-}
-.clone-or-download>.download>:last-child {
- padding-left: 10px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js
index fa86ed0cfb..cb6e3d575c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js
@@ -1,11 +1,8 @@
onedev.server.projectBlob = {
onDomReady: function(callback) {
- // hide browser scrollbar as we will manage it in blob content container
- $("body").css("overflow", "hidden");
-
var cookieKey = "projectBlob.searchResult.height";
- var $searchResult = $("#project-blob>.search-result");
+ var $searchResult = $(".project-blob>.search-result");
var height = Cookies.get(cookieKey);
if (height)
$searchResult.outerHeight(height);
@@ -15,7 +12,7 @@ onedev.server.projectBlob = {
handles: {"n": "#search-result-resize-handle"},
minHeight: 100,
resize: function(e, ui) {
- var blobContentHeight = $("#project-blob>.blob-content").outerHeight();
+ var blobContentHeight = $(".project-blob>.blob-content").outerHeight();
if(blobContentHeight < 150)
$(this).resizable({maxHeight: ui.size.height});
},
@@ -24,82 +21,7 @@ onedev.server.projectBlob = {
Cookies.set(cookieKey, ui.size.height, {expires: Infinity});
}
});
-
- $(window).resize(function(e) {
- e.stopPropagation();
-
- var additionalWidth = 0;
- if ($(".source-view .CodeMirror-annotations").length != 0)
- additionalWidth ++;
- if ($(".source-view>.comment").length != 0)
- additionalWidth ++;
- if ($(".source-view>.outline").length != 0)
- additionalWidth ++;
-
- $("body").removeClass("additionalWidth1").removeClass("additionalWidth2").removeClass("additionalWidth3");
- if (additionalWidth != 0)
- $("body").addClass("additionalWidth" + additionalWidth);
-
- var $head = $("#project-blob>.head");
- var $revisionPicker = $head.children(".revision-picker");
- var $buildStatus = $head.children(".build-status");
- var $operations = $head.children(".operations");
- var headWidth = $head.width();
-
- // below code moves file navigator to bottom if it is too wide
- var maxWidth = headWidth - $revisionPicker.outerWidth() - $operations.outerWidth();
- if ($buildStatus.length != 0)
- maxWidth -= $buildStatus.outerWidth();
- var maxHeight = $head.height();
-
- var $blobNavigator = $head.children(".blob-navigator");
- if ($blobNavigator.length != 0) {
- if ($blobNavigator.outerWidth() > maxWidth || $blobNavigator.outerHeight() > maxHeight)
- $("#project-blob>.blob-navigator").show().append($blobNavigator);
- } else {
- $blobNavigator = $("#project-blob>.blob-navigator>div");
- if ($blobNavigator.outerWidth() <= maxWidth && $blobNavigator.outerHeight() <= maxHeight) {
- $blobNavigator.insertAfter($revisionPicker.next());
- $("#project-blob>.blob-navigator").hide();
- }
- }
-
- var $blobContent = $("#project-blob>.blob-content");
-
- var minWindowWidth = onedev.server.projectBlob.parseCssDimension($("body").css("min-width"));
-
- var windowWidth = $(window).width();
- if (windowWidth < minWindowWidth) {
- windowWidth = minWindowWidth;
- $("body").css("overflow-x", "visible");
- } else {
- $("body").css("overflow-x", "hidden");
- }
- var width = windowWidth-$blobContent.offset().left;
-
- var height = $(window).height()-$blobContent.offset().top;
-
- var $searchResult = $("#project-blob>.search-result");
- if ($searchResult.is(":visible")) {
- var $searchResultHead = $searchResult.find(".search-result>.head");
- var $searchResultBody = $searchResult.find(".search-result>.body");
-
- $searchResult.outerWidth(width);
- $searchResultBody.outerWidth($searchResult.width());
-
- var searchResultBodyHeight = $searchResult.height()
- - $("#search-result-resize-handle").outerHeight()
- - $searchResultHead.outerHeight();
- $searchResultBody.outerHeight(searchResultBodyHeight);
-
- height -= $searchResult.outerHeight();
- }
- $blobContent.outerWidth(width).outerHeight(height);
- $blobContent.find(".autofit:visible").first().triggerHandler(
- "autofit", [$blobContent.width(), $blobContent.height()]);
- });
-
/*
* Do not use hotkey plugin here as otherwise codemirror search will not function
* properly in readonly mode
@@ -115,14 +37,5 @@ onedev.server.projectBlob = {
}
}
});
-
- },
- parseCssDimension: function(cssDimension) {
- var index = cssDimension.indexOf("px");
- if (index && index != -1) {
- return parseInt(cssDimension.substring(0, index));
- } else {
- return 0;
- }
- }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html
index 77b9879fc3..49ecf28dc4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html
@@ -1,20 +1,16 @@
<wicket:panel>
- <div class="commit-option">
- <div class="head">
- Commit Your Change
- </div>
+ <div class="commit-option p-4">
+ <h5 class="mb-4">Commit Your Change</h5>
<div class="body">
<form wicket:id="form">
<div wicket:id="feedback"></div>
<div wicket:id="changed" class="changed">
- <div class="alert alert-warning">Someone made below change since you started editing</div>
+ <div class="alert alert-light-warning">Someone made below change since you started editing</div>
<div wicket:id="changes" class="changes"></div>
</div>
- <div wicket:id="commitMessage" class="no-autosize"></div>
- <div class="actions">
- <input wicket:id="save" type="submit" class="btn btn-primary" value="Commit">
- <input wicket:id="cancel" type="button" class="btn btn-secondary" value="Cancel">
- </div>
+ <div wicket:id="commitMessage" class="no-autosize mb-4"></div>
+ <input wicket:id="save" type="submit" class="btn btn-primary mr-1" value="Commit">
+ <input wicket:id="cancel" type="button" class="btn btn-secondary" value="Cancel">
</form>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index e6e13012c6..f117b1fa5b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -361,6 +361,7 @@ public abstract class CommitOptionPanel extends Panel {
context.onCommitted(target, refUpdated, position);
if (autosaveKey != null)
target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));
+ target.appendJavaScript("$(window).resize();");
return true;
} else {
newChangedContainer(target);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css
index af398163db..05ede9853d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css
@@ -1,20 +1,9 @@
-.commit-option {
- padding: 20px;
-}
-.commit-option>.head {
- font-weight: bold;
- font-size: 16px;
- margin-bottom: 20px;
-}
.commit-option>.body .changed>.changes {
margin-bottom: 20px;
}
.commit-option>.body .text-diff>.head>.actions {
display: none;
}
-.commit-option>.body .text-diff>.head>.actions {
- display: none;
-}
.commit-option>.body textarea {
height: 360px;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html
index 19fc53bf87..39fb9c1026 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html
@@ -1,37 +1,37 @@
<wicket:panel>
- <div class="blob-edit autofit">
- <div class="head clearfix">
- <div class="float-left active tab edit">
- <a>
- <wicket:svg href="edit" class="icon"></wicket:svg>
+ <div class="blob-edit d-flex flex-column flex-grow-1">
+ <div class="head d-flex align-items-stretch px-3 flex-shrink-0 border-bottom">
+ <div class="active tab edit mr-4 d-flex align-items-stretch">
+ <a class="d-flex align-items-center font-weight-bold">
+ <wicket:svg href="edit" class="icon mr-1"></wicket:svg>
Edit
</a>
</div>
- <div wicket:id="editPlainTab" class="float-left tab edit-plain">
- <a>
- <wicket:svg href="edit-file" class="icon"></wicket:svg>
+ <div wicket:id="editPlainTab" class="tab edit-plain mr-4 d-flex align-items-stretch">
+ <a class="d-flex align-items-center font-weight-bold">
+ <wicket:svg href="edit-file" class="icon mr-1"></wicket:svg>
Edit Source
</a>
</div>
- <div wicket:id="saveTab" class="float-left save tab">
- <a>
- <wicket:svg href="save" class="icon"></wicket:svg>
+ <div wicket:id="saveTab" class="save tab mr-4 d-flex align-items-stretch">
+ <a class="d-flex align-items-center font-weight-bold">
+ <wicket:svg href="save" class="icon mr-1"></wicket:svg>
Save
</a>
</div>
- <div class="float-left cancel"><a wicket:id="cancelLink" tabindex="-1">Cancel</a></div>
- <div wicket:id="editOptions" class="options float-right expanded"></div>
+ <div class="cancel mr-4 d-flex align-items-center"><a wicket:id="cancelLink" tabindex="-1">Cancel</a></div>
+ <div wicket:id="editOptions" class="options ml-auto d-none d-sm-flex align-items-center"></div>
</div>
- <div class="body">
- <form wicket:id="content" class="content leave-confirm" onsubmit="return false;">
- <div wicket:id="feedback" class="feedback"></div>
- <div wicket:id="editor" class="editor"></div>
+ <div class="body flex-grow-1 d-flex flex-column">
+ <form wicket:id="content" class="content leave-confirm d-flex d-none flex-grow-1 flex-column" onsubmit="return false;">
+ <div wicket:id="feedback" class="feedback flex-shrink-0"></div>
+ <div wicket:id="editor" class="editor d-flex flex-column flex-grow-1 autofit"></div>
<input wicket:id="position" type="hidden" class="position">
- <a wicket:id="edit" class="edit submit">submit</a>
- <a wicket:id="editPlain" class="edit-plain submit">submit</a>
- <a wicket:id="save" class="save submit">submit</a>
+ <a wicket:id="edit" class="edit submit d-none">submit</a>
+ <a wicket:id="editPlain" class="edit-plain submit d-none">submit</a>
+ <a wicket:id="save" class="save submit d-none">submit</a>
</form>
- <div wicket:id="commitOptions" class="commit-options"></div>
+ <div wicket:id="commitOptions" class="commit-options flex-grow-1 d-none flex-column autofit"></div>
</div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
index a3a83a3873..221421a1ce 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
@@ -25,6 +25,7 @@ import io.onedev.server.util.Provider;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.blob.navigator.BlobNameChanging;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
@@ -122,6 +123,7 @@ public abstract class BlobEditPanel extends Panel {
protected void onError(AjaxRequestTarget target, Form<?> form) {
super.onError(target, form);
target.add(form);
+ ((BasePage)getPage()).resizeWindow(target);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.css
index 0b1152680c..addf93d2dd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.css
@@ -1,54 +1,21 @@
-@media(max-width: 767px) {
- .blob-edit>.head .expanded {
- display: none;
- }
-}
.blob-edit>.head {
- border-bottom: 1px solid #BDBDBD;
- height: 41px;
+ border-bottom: 1px solid var(--light-gray);
+ height: 3rem;
}
.blob-edit>.head .tab a {
- margin-top: 7px;
- border-radius: 4px 4px 0 0;
- padding: 4px 12px;
- display: block;
- color: #666;
- text-decoration: none;
-}
-.blob-edit>.head .edit {
- margin-left: 12px;
-}
-.blob-edit>.head .edit-plain, .blob-edit>.head .save {
- margin-left: 2px;
-}
-.blob-edit>.head .options {
- margin-top: 4px;
- margin-right: -8px;
+ border-bottom: 1px solid transparent;
+ margin-bottom: -1px;
}
-.blob-edit>.head .tab:hover a {
- background: #EEE;
+.blob-edit>.head .active.tab a, .blob-edit>.head .tab a:focus, .blob-edit>.head .tab a:hover {
+ border-color: var(--primary);
}
.blob-edit>.head .active.tab a {
- background: white;
- border: 1px solid #BDBDBD;
- border-bottom: 1px solid white;
- font-weight: bold;
- color: #333;
-}
-.blob-edit>.head .cancel {
- margin: 11px 0 0 12px;
-}
-.blob-edit>.body {
- margin-top: 1px;
- overflow: auto;
-}
-.blob-edit>.body>.content>.submit,
-.blob-edit>.body>.content>.plain-editor,
-.blob-edit>.body>.commit-options,
-.blob-edit>.body>.dirty-check {
- display: none;
+ color: var(--primary);
}
.blob-edit>.body>form>.feedback>ul {
- margin: 20px 20px 0 20px;
+ margin-bottom: 0;
+}
+.blob-edit>.body>form>.feedback>ul>li {
+ border-radius: 0;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js
index d90c0541f1..4dee66cb01 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js
@@ -25,9 +25,6 @@ onedev.server.blobEdit = {
}
$content.children(".save.submit").click();
});
-
- if ($body.find(".autofit:visible").length != 0)
- $body.css("overflow", "visible");
$blobEdit.on("getViewState", function(e) {
var $content = $body.children(".content");
@@ -45,14 +42,6 @@ onedev.server.blobEdit = {
}
});
- $blobEdit.on("autofit", function(e, width, height) {
- $blobEdit.outerWidth(width);
- $blobEdit.outerHeight(height);
- height = $blobEdit.height()-$head.outerHeight();
- $body.outerWidth(width).outerHeight(height);
- $body.find(".autofit:visible").first().triggerHandler("autofit", [$body.width(), $body.height()]);
- });
-
$container.mouseover(function() {
/*
* While inputting file names of a new file, the blob content will be re-created to
@@ -73,21 +62,16 @@ onedev.server.blobEdit = {
var $blobEdit = $tab.closest(".blob-edit");
var $body = $blobEdit.children(".body");
- $body.children().hide();
+ $body.children().removeClass("d-flex");
- if ($body.find(".autofit:visible").length != 0)
- $body.css("overflow", "visible");
- else
- $body.css("overflow", "auto");
-
var $content = $body.children(".content");
if ($tab.hasClass("edit") || $tab.hasClass("edit-plain")) {
- $content.show();
+ $content.addClass("d-flex");
} else {
- $body.children(".commit-options").show();
+ $body.children(".commit-options").addClass("d-flex");
}
-
- $(window).resize();
+
+ $(window).resize();
if (!$tab.hasClass("save"))
onedev.server.viewState.getFromHistoryAndSetToView();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.html
index a6c36e86c8..fc55c3e16f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
- <div class="plain-edit autofit blob-submit-aware">
- <div class="source"></div>
- <textarea wicket:id="input" class="input"></textarea>
+ <div class="plain-edit blob-submit-aware d-flex flex-column flex-grow-1">
+ <div class="source resize-aware autofit overflow-hidden d-flex flex-column flex-grow-1"></div>
+ <textarea wicket:id="input" class="input flex-shrink-0"></textarea>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js
index 1a50f72295..9679ab4431 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js
@@ -34,19 +34,16 @@ onedev.server.plainEdit = {
});
onedev.server.codemirror.bindShortcuts(cm);
-
- $plainEdit.on("autofit", function(e, width, height) {
- if (cm.getOption("fullScreen"))
- return;
-
- $plainEdit.outerWidth(width);
- $plainEdit.outerHeight(height);
- cm.setSize($plainEdit.width(), $plainEdit.height());
- cm.refresh();
- });
$plainEdit.on("beforeSubmit", function() {
$plainEdit.children("textarea").val($plainEdit.find(">.source>.CodeMirror")[0].CodeMirror.getValue());
});
+
+ $source.on("resized", function() {
+ setTimeout(function() {
+ cm.setSize("100%", $source.height());
+ });
+ return false;
+ });
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html
index 122ff38a1c..68ea2bfc5c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html
@@ -2,13 +2,13 @@
<div wicket:id="content" class="build-spec build-spec-view"></div>
<wicket:fragment wicket:id="validFrag">
<div class="valid">
- <div class="head">
- <a class="jobs">Jobs</a>
- <a class="properties">Properties</a>
- </div>
+ <div class="head">
+ <a class="jobs">Jobs</a>
+ <a class="properties">Properties</a>
+ </div>
<div class="body">
<div wicket:id="jobs" class="jobs"></div>
- <div wicket:id="properties" class="properties"></div>
+ <div wicket:id="properties" class="properties d-none"></div>
</div>
</div>
</wicket:fragment>
@@ -19,14 +19,14 @@
</div>
</wicket:fragment>
<wicket:fragment wicket:id="hasJobsFrag">
- <div class="side">
+ <div class="side flex-shrink-0">
<div class="navs">
- <div wicket:id="navs" class="nav">
- <a class="select"><span wicket:id="jobName"></span></a>
- <a wicket:id="run" class="run" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>
+ <div wicket:id="navs" class="nav btn-group btn-block mb-3">
+ <a class="select btn btn-secondary justify-content-start"><span wicket:id="jobName"></span></a>
+ <a wicket:id="run" class="run btn btn-secondary btn-icon flex-grow-0 flex-shrink-0" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>
</div>
</div></div>
- <div class="contents">
+ <div class="contents ml-4 flex-grow-1">
<div wicket:id="contents" class="content"></div>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
index ae6b5acf6a..1f71784f13 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
@@ -49,7 +49,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
Fragment validFrag = new Fragment("content", "validFrag", this);
if (!buildSpec.getJobs().isEmpty()) {
Fragment hasJobsFrag = new Fragment("jobs", "hasJobsFrag", this);
-
+ hasJobsFrag.add(AttributeAppender.append("class", "d-flex d-none"));
RepeatingView navsView = new RepeatingView("navs");
RepeatingView jobsView = new RepeatingView("contents");
for (Job job: buildSpec.getJobs()) {
@@ -72,17 +72,17 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
validFrag.add(hasJobsFrag);
} else {
- validFrag.add(new Label("jobs", "No jobs defined").add(AttributeAppender.append("class", "not-defined")));
+ validFrag.add(new Label("jobs", "No jobs defined").add(AttributeAppender.append("class", "not-defined alert alert-light-warning font-weight-bold d-flex d-none")));
}
if (!buildSpec.getProperties().isEmpty())
validFrag.add(PropertyContext.view("properties", buildSpec, "properties"));
else
- validFrag.add(new Label("properties", "No properties defined").add(AttributeAppender.append("class", "not-defined")));
+ validFrag.add(new Label("properties", "No properties defined").add(AttributeAppender.append("class", "not-defined alert alert-light-warning font-weight-bold d-flex d-none")));
add(validFrag);
} else {
- add(new Label("content", "Build spec not defined").add(AttributeAppender.append("class", "not-defined")));
+ add(new Label("content", "Build spec not defined").add(AttributeAppender.append("class", "not-defined m-4 alert alert-light-warning font-weight-bold")));
}
} catch (Exception e) {
Fragment invalidFrag = new Fragment("content", "invalidFrag", this);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html
index c4a756b7de..0ef7e99307 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html
@@ -7,29 +7,31 @@
<a class="properties">Properties</a>
</div>
<div class="body position-aware">
- <div class="jobs">
- <div class="side">
+ <div class="jobs d-flex d-none flex-nowrap">
+ <div class="side flex-shrink-0">
<!-- do not leave white space between navs and nav element as we are using .navs:not(:empty)
in css -->
- <div class="navs"><div wicket:id="navs" class="nav">
- <a class="select">
- <span class="drag-indicator"><wicket:svg href="grip" class="icon"/></span>
+ <div class="navs"><div wicket:id="navs" class="nav btn-group btn-block mb-3">
+ <a class="select btn btn-secondary justify-content-start">
+ <wicket:svg href="grip" class="icon drag-indicator flex-shrink-0 mr-1"/>
<span class="name"></span>
</a>
- <a title="Delete job" class="delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a title="Delete job" class="delete btn btn-secondary btn-hover-danger btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</div></div>
- <div class="add">
- <a wicket:id="create" class="create btn btn-success">
- <wicket:svg href="plus" class="icon"></wicket:svg> Add Job
+ <div class="add btn-group btn-block">
+ <a wicket:id="create" class="create btn btn-primary justify-content-start">
+ <wicket:svg href="plus" class="icon flex-shrink-0 mr-1"></wicket:svg> Add Job
</a>
- <a wicket:id="suggestions" class="suggestions btn btn-success" title="Job suggestions"><wicket:svg href="wand" class="icon"/></a>
+ <a wicket:id="suggestions" class="suggestions btn btn-primary flex-grow-0 flex-shrink-0 btn-icon" title="Job suggestions">
+ <wicket:svg href="wand" class="icon"/>
+ </a>
</div>
</div>
- <div class="contents">
+ <div class="contents flex-grow-1 ml-4">
<div wicket:id="contents" class="content"></div>
</div>
</div>
- <div wicket:id="properties" class="properties"></div>
+ <div wicket:id="properties" class="properties d-flex d-none"></div>
</div>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
index 1931d872ee..b25bea0aeb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
@@ -343,6 +343,5 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
}
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css
index 312cf33f0b..a00b1121e8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css
@@ -1,138 +1,51 @@
.build-spec {
- padding: 20px;
+ padding: 1.5rem;
}
.build-spec>.valid {
min-width: 800px;
}
-.build-spec.not-defined {
- font-style: italic;
- font-size: 16px;
- text-align: center;
-}
.build-spec>.invalid>.title {
- font-size: 20px;
+ font-size: 1.5rem;
color: red;
- margin-bottom: 20px;
+ margin-bottom: 1.5rem;
}
.build-spec>.invalid>.error-message {
white-space: pre-wrap;
word-wrap: break-word;
- font-size: 13px;
+ font-size: 1rem;
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
}
.build-spec>.valid>.head {
- margin-bottom: 20px;
- padding-bottom: 8px;
- border-bottom: 1px solid #E8E8E8;
+ margin-bottom: 1.5rem;
+ padding-bottom: 0.6rem;
+ border-bottom: 1px solid var(--light-gray);
}
.build-spec>.valid>.head>a {
font-weight: bold;
- font-size: 16px;
- margin-bottom: 16px;
- margin-right: 8px;
+ font-size: 1.2rem;
+ margin-bottom: 1.2rem;
+ margin-right: 0.6rem;
}
.build-spec>.valid>.head>a.active {
- font-size: 20px;
-}
-.build-spec>.valid>.body>.not-defined {
- font-size: 16px;
- font-style: italic;
-}
-
-.build-spec>.valid>.body>.jobs {
- position: relative;
+ font-size: 1.5rem;
+ color: var(--primary);
}
.build-spec>.valid>.body>.jobs>.side {
- position: absolute;
- left: 0;
- top: 0;
- width: 240px;
+ min-width: 220px;
}
-.build-spec>.valid>.body>.jobs>.contents {
- margin-left: 260px;
-}
-
.build-spec>.valid>.body>.jobs>.side>.navs:not(:empty) {
- margin-bottom: 20px;
-}
-.build-spec>.valid>.body>.jobs>.side>.navs>.nav {
- position: relative;
- background: #444;
- border-radius: 4px;
- margin-bottom: 8px;
- display: block;
+ margin-bottom: 1.5rem;
}
-.build-spec>.valid>.body>.jobs>.side>.navs>.nav a {
- color: #BBB;
-}
-.build-spec>.valid>.body>.jobs>.side>.navs>.nav .drag-indicator {
- color: inherit;
- margin-right: 4px;
-}
-.build-spec>.valid>.body>.jobs>.side>.navs>.nav:hover a,
.build-spec>.valid>.body>.jobs>.side>.navs>.nav.active a {
- color: white;
- font-weight: bold;
-}
-.build-spec>.valid>.body>.jobs>.side>.navs>.nav.active {
- background: #080808;
-}
-.build-spec>.valid>.body>.jobs>.side>.navs>.nav:first-child:last-child {
- border-radius: 4px;
-}
-
-.build-spec>.valid>.body>.jobs>.side>.navs>.nav>.select {
- padding: 8px 28px 8px 8px;
- text-decoration: none;
- display: block;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-.build-spec>.valid>.body>.jobs>.side>.navs>.nav>.delete,
-.build-spec>.valid>.body>.jobs>.side>.navs>.nav>.run {
- right: 0;
- top: 0;
- position: absolute;
- border-left: 1px solid #EEE;
- padding: 8px 8px;
- display: block;
-}
-.build-spec>.valid>.body>.jobs>.side .add {
- position: relative;
-}
-.build-spec>.valid>.body>.jobs>.side .create {
- display: block;
- margin-right: 38px;
- border-radius: 4px 0 0 4px;
-}
-.build-spec>.valid>.body>.jobs>.side .create.no-suggestions {
- margin-right: 0;
- border-radius: 4px;
-}
-.build-spec>.valid>.body>.jobs>.side .suggestions {
- position: absolute;
- right: 0;
- top: 0;
- border-radius: 0 4px 4px 0;
- border-left: none;
+ background: var(--gray-dark);
+ border-color: var(--gray-dark);
+ color: white;
}
.build-spec>.valid>.body>.jobs>.contents>.content {
- border-radius: 4px;
- border: 2px solid #DDD;
- padding: 20px;
-}
-
-.build-spec>.valid>.body>.jobs>.content .bean-properties>table>tbody>tr>td.name {
- width: 200px;
-}
-.build-spec>.valid>.body>.jobs>.content .bean-properties>table>tbody>tr.property-retry td.name {
- width: 100px;
-}
-.build-spec>.valid>.body>.jobs>.content .bean-properties>table>tbody>tr>td.value .form-control {
- height: 32px;
- font-size: 13px;
+ border-radius: 0.42rem;
+ border: 1px solid var(--light-gray);
+ padding: 1.5rem;
}
-.build-spec>.valid>.body>.jobs>.content .def-list table>tbody>tr>td:first-child>div>a {
- margin-left: 0;
+.build-spec>.valid>.body>.properties>.bean-list {
+ flex-grow: 1;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js
index 234115bf63..97e1ae75c5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js
@@ -53,10 +53,9 @@ onedev.server.buildSpec = {
$head.children().removeClass("active");
$head.children(".jobs").addClass("active");
var $body = $valid.children(".body");
- $body.children().hide();
+ $body.children().removeClass("d-flex");
var $jobs = $body.children(".jobs");
- $jobs.show();
- $(window).resize();
+ $jobs.addClass("d-flex");
onedev.server.focus.doFocus($jobs);
},
showJob: function(index) {
@@ -69,8 +68,10 @@ onedev.server.buildSpec = {
$contents.children().hide();
var $content = $contents.children().eq(index);
$content.show();
- $(window).resize();
onedev.server.focus.doFocus($content);
+
+ // Fix the issue that add button and icon not aligned sometimes
+ $navs.next().hide().show(0);
},
showProperties: function() {
var $valid = $(".build-spec>.valid");
@@ -79,10 +80,9 @@ onedev.server.buildSpec = {
$head.children(".properties").addClass("active");
var $body = $valid.children(".body");
- $body.children().hide();
+ $body.children().removeClass("d-flex");
var $properties = $body.children(".properties");
- $properties.show();
- $(window).resize();
+ $properties.addClass("d-flex");
onedev.server.focus.doFocus($properties);
},
showSelection: function(selection) {
@@ -113,6 +113,7 @@ onedev.server.buildSpec = {
selection += "/" + $nav.data("name");
if ($valid.data("selectCallback"))
$valid.data("selectCallback")(selection);
+ $(window).resize();
},
selectJob: function() {
var $nav = $(this).parent();
@@ -122,12 +123,14 @@ onedev.server.buildSpec = {
if ($valid.data("selectCallback"))
$valid.data("selectCallback")("jobs/" + $nav.data("name"));
}
+ $(window).resize();
},
selectProperties: function() {
onedev.server.buildSpec.showProperties();
var $valid = $(".build-spec>.valid");
if ($valid.data("selectCallback"))
$valid.data("selectCallback")("properties");
+ $(window).resize();
},
deleteJob: function() {
var $nav = $(this).parent();
@@ -147,6 +150,10 @@ onedev.server.buildSpec = {
onedev.server.buildSpec.showJob(0);
$valid.data("deleteCallback")(index);
+ // Fix the issue that add button and icon not aligned sometimes
+ $navs.next().hide().show(0);
+
+ $(window).resize();
}
},
swapJobs: function(index1, index2) {
@@ -159,6 +166,7 @@ onedev.server.buildSpec = {
for (var i = 0; i < index1-index2; i++)
$contents.children().eq(index1-i).after($contents.children().eq(index1-i-1));
}
+ $(window).resize();
},
trackJobNameChange: function(index) {
var $jobs = $(".build-spec>.valid>.body>.jobs");
@@ -167,7 +175,7 @@ onedev.server.buildSpec = {
var $contents = $jobs.children(".contents");
var $content = $contents.children().eq(index);
- var $input = $content.find(">div>table>tbody>tr.property-name>td input");
+ var $input = $content.find(">div>div>.property-name input");
function syncName() {
var name = $input.val().trim();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.java
deleted file mode 100644
index 4290985821..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.failsafe;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class FailsafeResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public FailsafeResourceReference() {
- super(FailsafeResourceReference.class, "failsafe.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html
index 037535bbbf..359e5627cd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="failsafe">
- Unable to show content
+ <div class="alert alert-light-warning m-4 d-flex align-items-center">
+ <wicket:svg href="warning" class="icon mr-2"/> Unable to show content
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java
index 8e004fb76e..27f15cf6c8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java
@@ -1,8 +1,5 @@
package io.onedev.server.web.page.project.blob.render.renderers.failsafe;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
@@ -13,13 +10,6 @@ public class FailsafeViewPanel extends BlobViewPanel {
super(id, context);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(CssHeaderItem.forReference(new FailsafeResourceReference()));
- }
-
@Override
protected boolean isEditSupported() {
return false;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/failsafe.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/failsafe.css
deleted file mode 100644
index f192dc2e4f..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/failsafe.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.blob-content .failsafe {
- padding: 20px;
- font-style: italic;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
index fc2b34b2a1..5789357f8a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
@@ -1,28 +1,26 @@
<wicket:panel>
- <div class="folder-view autofit">
- <table class="files">
+ <div class="folder-view">
+ <table class="files table">
<tr wicket:id="parent" class="parent">
- <td colspan="3">
- <a wicket:id="link"><wicket:svg href="level-up" class="icon"/> <span>..</span></a>
+ <td colspan="4">
+ <a wicket:id="link"><wicket:svg href="level-up" class="icon mr-1"/> <span>..</span></a>
</td>
</tr>
<tr wicket:id="children" class="child">
- <td class="path">
- <a wicket:id="pathLink"><svg wicket:id="icon" class="icon"></svg> <span wicket:id="label"></span></a>
+ <td class="path text-break">
+ <a wicket:id="pathLink"><svg wicket:id="icon" class="icon mr-1"></svg> <span wicket:id="label"></span></a>
</td>
- <td wicket:id="lastCommit" class="last-commit author expanded"></td>
- <td class="last-commit message"></td>
- <td class="last-commit when expanded"></td>
+ <td wicket:id="lastCommit" class="last-commit author"></td>
+ <td class="last-commit message d-none d-lg-table-cell"></td>
+ <td class="last-commit when text-gray d-none d-lg-table-cell"></td>
</tr>
</table>
<div wicket:id="readme" class="readme">
<div class="head">
- <span wicket:id="title" class="title"></span>
- <span class="actions">
- <a wicket:id="edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- </span>
+ <b wicket:id="title" class="title mr-2"></b>
+ <a wicket:id="edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
</div>
- <div wicket:id="body" class="body"></div>
+ <div wicket:id="body" class="body p-4"></div>
</div>
</div>
<div wicket:id="userCard" class="user-card-content"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java
index cc36d1e294..0aa0f096df 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java
@@ -8,7 +8,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
import io.onedev.server.web.asset.hover.HoverResourceReference;
-import io.onedev.server.web.component.user.avatar.UserAvatarResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class FolderViewResourceReference extends BaseDependentResourceReference {
@@ -26,7 +25,6 @@ public class FolderViewResourceReference extends BaseDependentResourceReference
new CssResourceReference(FolderViewResourceReference.class, "folder-view.css")));
// add this dependency as the lazy loaded last commits information includes avatar displaying
- dependencies.add(CssHeaderItem.forReference(new UserAvatarResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css
index 9181e5f070..47f45ffb66 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css
@@ -1,54 +1,19 @@
-@media(max-width: 767px) {
- .folder-view .expanded {
- display: none;
- }
-}
-.folder-view {
- overflow: auto;
-}
.folder-view>table>tbody>tr>td {
- padding: 6px 12px;
- border-top: 1px solid #EEE;
+ padding: 0.6rem 1.2rem;
+ border-top: 1px solid var(--light);
}
-.folder-view>table>tbody>tr>td.path, .folder-view>table>tbody>tr>td.last-commit.author,
-.folder-view>table>tbody>tr>td.last-commit.when {
- white-space: nowrap;
-}
-.folder-view>table>tbody>tr>td.last-commit, .folder-view>table>tbody>tr>td.last-commit a {
- font-size: 13px;
-}
-.folder-view>table>tbody>tr>td.last-commit.when {
- color: #888;
-}
.folder-view>table>tbody>tr:first-child>td {
border-top: none;
}
-.folder-view>table tr.parent td {
- padding: 3px 12px;
-}
-.folder-view>table tr.parent td a i {
- margin-right: 2px;
-}
-.folder-view>table tr.parent td a span {
- font-size: 18px;
-}
.folder-view>.readme>.head {
- padding: 6px 12px;
- background: #F9F9F9;
- font-weight: bold;
- border-top: 1px solid #E0E0E0;
- border-bottom: 1px solid #EEE;
-}
-.folder-view>.readme>.head>.title {
- margin-right: 4px;
+ padding: 0.5rem 1rem;
+ background: var(--light);
+ border-top: 1px solid var(--light-gray);
+ border-bottom: 1px solid var(--light-gray);
}
.folder-view>.readme>.body {
- padding: 20px;
max-width: 900px;
margin-left: auto;
margin-right: auto;
}
-.folder-view a.user {
- text-decoration: none;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
index 595d34c923..33962568bd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
@@ -30,7 +30,7 @@ onedev.server.folderView = {
$row.children(".last-commit.when").append("<span>" + lastCommit.when + "</span>");
var $message = $row.children(".last-commit.message");
$message.append(lastCommit.html);
-
+
var alignment = {targetX: 0, targetY: 0, x: 0, y: 100, offset: 8};
$row.find("a.user").hover(function() {
var $card = $("<div id='user-card' class='floating'></div>");
@@ -43,25 +43,10 @@ onedev.server.folderView = {
}, alignment);
}
});
+ onedev.server.viewState.getFromHistoryAndSetToView();
}
}
- });
-
- $folderView.on("getViewState", function(e) {
- return {scroll:{left: $folderView.scrollLeft(), top: $folderView.scrollTop()}};
- });
-
- $folderView.on("setViewState", function(e, viewState) {
- if (viewState.scroll) {
- $folderView.scrollLeft(viewState.scroll.left);
- $folderView.scrollTop(viewState.scroll.top);
- }
- });
-
- $folderView.on("autofit", function(e, width, height) {
- $folderView.outerWidth(width);
- $folderView.outerHeight(height);
- });
+ });
},
onUserCardAvailable: function() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.html
index ce303f69a8..5f5ee6edd1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <div wicket:id="input" class="no-autosize"></div>
+ <div wicket:id="input" class="no-autosize d-flex flex-grow-1 flex-column autofit"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/markdown-blob.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/markdown-blob.css
index 4c4ad897c9..e43ebc27ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/markdown-blob.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/markdown-blob.css
@@ -1,10 +1,14 @@
.blob-view>.body>div>.markdown-viewer {
- padding: 20px;
+ padding: 1.6rem;
max-width: 900px;
margin-left: auto;
margin-right: auto;
}
+.blob-edit .markdown-editor .ui-resizable-handle {
+ display: none;
+}
+
.blob-edit .markdown-editor>.head {
border: none;
}
@@ -12,15 +16,3 @@
.blob-edit .markdown-editor>.body>.preview>.markdown-rendered {
border-radius: 0 !important;
}
-.blob-edit .markdown-editor.edit-mode>.body>.edit>textarea,
-.blob-edit .markdown-editor.preview-mode>.body>.preview>.markdown-rendered,
-.blob-edit .markdown-editor.split-mode>.body>.preview>.markdown-rendered {
- border-bottom: none;
- border-left: none;
- border-right: none;
-}
-.blob-edit .markdown-editor.split-mode>.body>.edit>textarea,
-.blob-edit .markdown-editor>.body>.preview>.markdown-rendered {
- border-bottom: none;
- border-left: none;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsCssResourceReference.java
deleted file mode 100644
index 18b6c2cf84..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.nocommits;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class NoCommitsCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public NoCommitsCssResourceReference() {
- super(NoCommitsCssResourceReference.class, "no-commits.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
index 64f3b8bb81..6f2e9fe3d5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
@@ -1,11 +1,14 @@
<wicket:panel>
- <div class="no-commits alert alert-warning">
- <div class="title">Project does not have any code yet</div>
- <div class="content">You may initialize code of the project by <a wicket:id="addFiles">adding files</a>,
- or <a wicket:id="pushInstructions">pushing an existing repository</a></div>
+ <div class="m-4 no-commits text-center">
+ <img src="/img/sleeping-panda.png" class="text-center mb-5">
+ <h3 class="alert-heading mb-3">Project does not have any code yet</h3>
+ <div class="mb-4">
+ You may initialize code of the project by <a wicket:id="addFiles" class="link-primary">adding files</a>,
+ or <a wicket:id="pushInstructions" class="link-primary">pushing an existing repository</a>
+ </div>
</div>
<wicket:fragment wicket:id="pushInstructionsFrag">
- <div class="title">Run below commands from within your git repository:</div>
+ <div class="mb-3">Run below commands from within your git repository:</div>
<div class="code">
<div>git remote add origin <span wicket:id="url"></span></div>
<div>git push -u origin master</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
index de62f72c4d..a9a7278b9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
@@ -7,8 +7,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -115,6 +113,42 @@ public class NoCommitsPanel extends Panel {
}
});
+
+ add(new DropdownLink("pushInstructions") {
+
+ @Override
+ protected void onInitialize(FloatingPanel dropdown) {
+ super.onInitialize(dropdown);
+ dropdown.add(AttributeAppender.append("style", "max-width:480px;"));
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new GitProtocolPanel(id) {
+
+ @Override
+ protected Component newContent(String componentId) {
+ Fragment fragment = new Fragment(id, "pushInstructionsFrag", NoCommitsPanel.this);
+ fragment.add(new Label("url", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return getProtocolUrl();
+ }
+
+ }));
+ return fragment;
+ }
+
+ @Override
+ protected Project getProject() {
+ return context.getProject();
+ }
+
+ };
+ }
+
+ });
} else {
add(new WebMarkupContainer("addFiles") {
@@ -125,50 +159,18 @@ public class NoCommitsPanel extends Panel {
}
});
+ add(new WebMarkupContainer("pushInstructions") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ });
}
- add(new DropdownLink("pushInstructions") {
-
- @Override
- protected void onInitialize(FloatingPanel dropdown) {
- super.onInitialize(dropdown);
- dropdown.add(AttributeAppender.append("class", "push-instructions"));
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new GitProtocolPanel(id) {
-
- @Override
- protected Component newContent(String componentId) {
- Fragment fragment = new Fragment(id, "pushInstructionsFrag", NoCommitsPanel.this);
- fragment.add(new Label("url", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- return getProtocolUrl();
- }
-
- }));
- return fragment;
- }
-
- @Override
- protected Project getProject() {
- return context.getProject();
- }
-
- };
- }
-
- });
setOutputMarkupId(true);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new NoCommitsCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
deleted file mode 100644
index 83359b45dd..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.no-commits {
- margin: 20px;
-}
-.no-commits>.title {
- font-size: 18px;
- font-weight: bold;
- margin-bottom: 20px;
-}
-.push-instructions {
- padding: 12px;
-}
-.push-instructions .title {
- font-weight: bold;
- font-size: 16px;
- margin-bottom: 12px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html
index 83ebc6df77..6d31c6f865 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div class="no-name alert alert-warning">
+ <div class="no-name alert alert-light-warning">
Please specify file name above before editing content
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
index 31e6e508e2..3f677ee744 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
@@ -50,8 +50,8 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {
@Override
public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceEdit.onIndentTypeChange('%s', '%s');",
- getEditor().getMarkupId(), sourceFormat.getIndentType());
+ String script = String.format("onedev.server.sourceEdit.onIndentTypeChange('%s');",
+ sourceFormat.getIndentType());
target.appendJavaScript(script);
}
@@ -59,8 +59,8 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {
@Override
public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceEdit.onTabSizeChange('%s', %s);",
- getEditor().getMarkupId(), sourceFormat.getTabSize());
+ String script = String.format("onedev.server.sourceEdit.onTabSizeChange(%s);",
+ sourceFormat.getTabSize());
target.appendJavaScript(script);
}
@@ -68,8 +68,8 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {
@Override
public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceEdit.onLineWrapModeChange('%s', '%s');",
- getEditor().getMarkupId(), sourceFormat.getLineWrapMode());
+ String script = String.format("onedev.server.sourceEdit.onLineWrapModeChange('%s');",
+ sourceFormat.getLineWrapMode());
target.appendJavaScript(script);
}
@@ -102,13 +102,10 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {
public void position(AjaxRequestTarget target, String position) {
String script;
PlanarRange mark = SourceRendererProvider.getRange(position);
- if (mark != null) {
- script = String.format("onedev.server.sourceEdit.mark('%s', %s);",
- getEditor().getMarkupId(), getJson(mark));
- } else {
- script = String.format("onedev.server.sourceEdit.mark('%s', undefined);",
- getEditor().getMarkupId());
- }
+ if (mark != null)
+ script = String.format("onedev.server.sourceEdit.mark(%s);", getJson(mark));
+ else
+ script = String.format("onedev.server.sourceEdit.mark();");
target.appendJavaScript(script);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html
index 9932f37136..edc8780bbb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html
@@ -1,12 +1,12 @@
<wicket:panel>
<!-- Make it no-autofocus as we will do focus with CodeMirror. Also this is necessary to fix the issue that
file name input loses focus when add file via firefox in Linux -->
- <div class="source-edit autofit blob-submit-aware no-autofocus">
- <div class="warning alert alert-warning">
- <button class="close" data-dismiss="alert"><span>&times;</span></button>
+ <div class="source-edit blob-submit-aware no-autofocus d-flex flex-grow-1 flex-column">
+ <div class="m-3 warning alert alert-light-warning d-shrink-0">
+ <button class="close" data-dismiss="alert"><span><wicket:svg href="times" class="icon"/></span></button>
<div class="message"><wicket:svg href="warning" class="icon"/> Below content is restored from an unsaved change</div>
</div>
- <div class="code"></div>
- <textarea wicket:id="input" class="input"></textarea>
+ <div class="code flex-grow-1 autofit overflow-hidden resize-aware"></div>
+ <textarea wicket:id="input" class="input d-none"></textarea>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
index dc1a16392e..b18c7f6ff3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
@@ -1,25 +1,25 @@
<wicket:extend>
- <div class="source-view autofit">
- <div wicket:id="comment" class="comment">
- <div class="ui-resizable-handle ui-resizable-e"></div>
- <div class="content">
- <div wicket:id="head" class="head clearfix">
- <a wicket:id="context" class="float-left context close" title="Compare with another revision"><wicket:svg href="diff" class="icon"></wicket:svg></a>
- <a wicket:id="locate" class="float-left locate close" title="Locate marked text of this comment"><wicket:svg href="hand" class="icon"></wicket:svg></a>
- <a wicket:id="close" class="float-left close" title="Hide comment"><wicket:svg href="times" class="icon"></wicket:svg></a>
+ <div class="source-view flex-grow-1 d-flex">
+ <div wicket:id="comment" class="comment need-width d-flex overflow-hidden flex-shrink-0">
+ <div class="content flex-grow-1 overflow-hidden d-flex flex-column">
+ <div wicket:id="head" class="head d-flex align-items-center px-3 py-2 flex-shrink-0 border-bottom">
+ <a wicket:id="context" class="context btn btn-light btn-icon btn-xs btn-hover-primary mr-2" title="Compare with another revision"><wicket:svg href="diff" class="icon"></wicket:svg></a>
+ <a wicket:id="locate" class="locate btn btn-light btn-icon btn-xs btn-hover-primary mr-auto" title="Locate marked text of this comment"><wicket:svg href="hand" class="icon"></wicket:svg></a>
+ <a wicket:id="close" class="ml-3" title="Hide comment"><wicket:svg href="times" class="icon"></wicket:svg></a>
</div>
- <div wicket:id="body" class="body"></div>
+ <div wicket:id="body" class="body overflow-auto flex-grow-1 p-3"></div>
</div>
+ <div class="ui-resizable-handle ui-resizable-e flex-shrink-0"></div>
</div>
- <div class="code"></div>
- <div wicket:id="outline" class="outline">
- <div class="ui-resizable-handle ui-resizable-w"></div>
- <div class="content">
- <div class="head clearfix">
- <span class="float-left">Outline</span>
- <a wicket:id="close" class="float-right close" title="Hide outline"><wicket:svg href="times" class="icon"/></a>
+ <div class="code flex-grow-1 autofit overflow-hidden d-flex flex-column resize-aware"></div>
+ <div wicket:id="outline" class="outline need-width d-flex overflow-hidden flex-shrink-0">
+ <div class="ui-resizable-handle ui-resizable-w flex-shrink-0"></div>
+ <div class="content flex-grow-1 overflow-hidden d-flex flex-column">
+ <div class="head d-flex align-items-center justify-content-between px-3 py-2 flex-shrink-0 border-bottom">
+ <h6 class="mb-0">Outline</h6>
+ <a wicket:id="close" class="text-muted text-hover-primary" title="Close"><wicket:svg href="times" class="icon"></wicket:svg></a>
</div>
- <div wicket:id="body" class="body"></div>
+ <div wicket:id="body" class="body overflow-auto flex-grow-1"></div>
</div>
</div>
</div>
@@ -31,11 +31,11 @@
<div class="outline-search">
<div class="modal-header">
<h5 class="modal-title">Outline Search</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<input wicket:id="input" class="form-control">
- <div wicket:id="result" class="result"></div>
+ <div wicket:id="result" class="result ps ps-scroll mt-3"></div>
</div>
</div>
</wicket:fragment>
@@ -45,16 +45,14 @@
<wicket:fragment wicket:id="newCommentFrag">
<form wicket:id="form" class="new-comment leave-confirm">
<div wicket:id="feedback" class="feedback"></div>
- <div class="form-group">
+ <div class="form-group mb-3">
<div wicket:id="content"></div>
</div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware">Save</button>
- <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>
- </div>
+ <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware mr-1">Save</button>
+ <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>
</form>
</wicket:fragment>
<wicket:fragment wicket:id="actionsFrag">
- <wicket:enclosure child="outline"><label><input type="checkbox" wicket:id="outline" class="outline-toggle"> Outline</label></wicket:enclosure>
+ <wicket:enclosure child="outline"><label class="checkbox"><input type="checkbox" wicket:id="outline" class="outline-toggle"> Outline</label></wicket:enclosure>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index 3a7c354014..3c9bddcbae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -188,7 +188,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
}
@Override
- protected WebMarkupContainer newOptions(String id) {
+ protected WebMarkupContainer newFormats(String id) {
sourceFormat = new SourceFormatPanel(id, null, new OptionChangeCallback() {
@Override
@@ -210,7 +210,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
}
@Override
- public WebMarkupContainer newAdditionalActions(String id) {
+ public WebMarkupContainer newExtraOptions(String id) {
WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);
if (hasOutline()) {
actions.add(new CheckBox("outline", Model.of(isOutlineVisibleInitially())).add(new OnChangeAjaxBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.css
index b50961ef23..5bfe6677fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.css
@@ -1,25 +1,12 @@
-.blob-edit>.head .source-format {
- margin: 2px 12px 0 0;
-}
-.blob-edit .source-edit .input {
- display: none;
-}
-.blob-edit .source-edit .warning {
- border-radius: 0;
- margin: 0;
- border-left: none;
- border-top: none;
- border-right: none;
- padding-top: 8px;
- padding-bottom: 8px;
- display: none;
-}
.source-edit>.code {
background: none;
border: none;
- border-radius: none;
+ border-radius: 0;
padding: 0;
margin: 0;
font-family: inherit;
font-size: inherit;
}
+.source-edit>.warning {
+ display: none;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js
index 2a27bbafe3..4500427888 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js
@@ -46,7 +46,7 @@ onedev.server.sourceEdit = {
if (doneTimer)
clearTimeout(doneTimer);
doneTimer = setTimeout(function() {
- var cm = onedev.server.sourceEdit.getCodeMirror(containerId);
+ var cm = $(".source-edit>.code>.CodeMirror")[0].CodeMirror;
var content = cm.doc.getValue();
if (content.trim().length != 0)
localStorage.setItem(autosaveKey, content);
@@ -54,44 +54,38 @@ onedev.server.sourceEdit = {
}, 500);
});
- $sourceEdit.on("getViewState", function(e) {
+ $code.on("getViewState", function(e) {
return onedev.server.codemirror.getViewState(cm);
});
- $sourceEdit.on("setViewState", function(e, viewState) {
+ $code.on("setViewState", function(e, viewState) {
onedev.server.codemirror.setViewState(cm, viewState);
});
- $sourceEdit.on("autofit", function(e, width, height) {
- if (cm.getOption("fullScreen"))
- return;
-
- $sourceEdit.outerWidth(width);
- $sourceEdit.outerHeight(height);
- if ($warning.is(":visible"))
- cm.setSize($sourceEdit.width(), $sourceEdit.height()-$warning.outerHeight());
- else
- cm.setSize($sourceEdit.width(), $sourceEdit.height());
+ $code.on("resized", function() {
+ setTimeout(function() {
+ cm.setSize("100%", $code.height());
+ });
+ return false;
});
$sourceEdit.on("beforeSubmit", function() {
- var cm = onedev.server.sourceEdit.getCodeMirror(containerId);
+ var cm = $(".source-edit>.code>.CodeMirror")[0].CodeMirror;
$sourceEdit.children("textarea").val(cm.getValue());
});
$warning.on("closed.bs.alert", function () {
$(window).resize();
- })
+ });
},
onWindowLoad: function(containerId, mark, autosaveKey) {
var $container = $("#" + containerId);
var $warning = $container.find(">.source-edit>.warning");
- var cm = onedev.server.sourceEdit.getCodeMirror(containerId);
+ var cm = $(".source-edit>.code>.CodeMirror")[0].CodeMirror;
onedev.server.form.registerAutosaveKey($container.closest("form.leave-confirm"), autosaveKey);
var autosaveValue = localStorage.getItem(autosaveKey);
if (autosaveValue) {
cm.doc.setValue(autosaveValue);
$warning.show();
- $(window).resize();
}
if (mark && onedev.server.viewState.getFromHistory() === undefined
@@ -99,8 +93,8 @@ onedev.server.sourceEdit = {
onedev.server.codemirror.scrollTo(cm, mark);
}
},
- mark: function(containerId, mark) {
- var cm = onedev.server.sourceEdit.getCodeMirror(containerId);
+ mark: function(mark) {
+ cm = $(".source-edit>.code>.CodeMirror")[0].CodeMirror;
if (mark) {
if (cm.oldDocValue) {
var dmp = new diff_match_patch();
@@ -173,19 +167,16 @@ onedev.server.sourceEdit = {
onedev.server.codemirror.clearMark(cm);
}
},
- getCodeMirror: function(containerId) {
- return $("#" + containerId + ">.source-edit>.code>.CodeMirror")[0].CodeMirror;
- },
- onIndentTypeChange: function(containerId, indentType) {
- var cm = onedev.server.sourceEdit.getCodeMirror(containerId);
+ onIndentTypeChange: function(indentType) {
+ var cm = $(".source-edit>.code>.CodeMirror")[0].CodeMirror;
cm.setOption("indentWithTabs", indentType == "Tabs");
},
- onLineWrapModeChange: function(containerId, lineWrapMode) {
- var cm = onedev.server.sourceEdit.getCodeMirror(containerId);
+ onLineWrapModeChange: function(lineWrapMode) {
+ var cm = $(".source-edit>.code>.CodeMirror")[0].CodeMirror;
cm.setOption("lineWrapping", lineWrapMode == "Soft wrap");
},
- onTabSizeChange: function(containerId, tabSize) {
- var cm = onedev.server.sourceEdit.getCodeMirror(containerId);
+ onTabSizeChange: function(tabSize) {
+ var cm = $(".source-edit>.code>.CodeMirror")[0].CodeMirror;
cm.setOption("tabSize", tabSize);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css
index 67f826dfab..ff33af826f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css
@@ -1,75 +1,39 @@
-.source-view {
- position: relative;
-}
.source-view>.code {
background: none;
border: none;
- border-radius: none;
+ border-radius: 0;
padding: 0;
margin: 0;
font-family: inherit;
font-size: inherit;
}
-.source-view>.comment {
- background: white;
- position: absolute;
- padding-right: 4px;
- top: 0;
- left: 0;
-}
-.source-view>.comment>.content>.head>a {
- margin-right: 8px;
-}
-
.source-view>.comment>.ui-resizable-handle {
- position: absolute;
- border-right: 1px solid #E0E0E0;
- background: #F2F2F2 url(vgrabber.png) no-repeat scroll center center;
+ border-right: 1px solid var(--light-gray);
+ background: var(--light) url(/icon/grip3.svg) no-repeat scroll center center;
+ background-size: 18px 18px;
cursor: e-resize;
- width: 8px;
- right: 0;
- top: 0;
-}
-.source-view>.comment>.content>.head {
- font-weight: bold;
- padding: 8px 12px;
- background: #F2F2F2;
-}
-.source-view>.comment>.content>.body {
- overflow: auto;
-}
-.source-view>.comment>.content>.body>* {
- margin: 12px;
+ width: 4px;
+ position: relative;
+ right: 0;
}
-
.source-view>.outline {
- background: white;
- position: absolute;
- padding-left: 4px;
- top: 0;
- right: 0;
+ left: 0 !important;
}
.source-view>.outline>.ui-resizable-handle {
- position: absolute;
- border-left: 1px solid #E0E0E0;
- background: #F2F2F2 url(vgrabber.png) no-repeat scroll center center;
+ border-left: 1px solid var(--light-gray);
+ background: var(--light) url(/icon/grip3.svg) no-repeat scroll center center;
+ background-size: 18px 18px;
cursor: w-resize;
- width: 8px;
- left: 0;
- top: 0;
-}
-.source-view>.outline .tree-node {
- line-height: 1.8;
-}
-.source-view>.outline>.content>.head {
- font-size: 16px;
- padding: 4px 8px 4px 12px;
- background: #F2F2F2;
+ width: 4px;
+ position: relative;
+ left: 0;
}
.source-view>.outline>.content>.body {
- font-size: 13px;
- padding: 4px 4px 4px 8px;
- overflow: auto;
+ padding: 0.5rem 1rem;
+}
+.source-view>.outline>.content>.body .tree-content {
+ border-radius: 4px;
+ padding: 1px 4px 1px 3px;
}
.source-view>.outline>.content>.body .tree-content.active {
background: #FCF5DA;
@@ -82,19 +46,19 @@
padding-left: 4px;
}
.CodeMirror-comment a {
- color: #999 !important;
+ color: var(--gray) !important;
}
.CodeMirror-comment a:hover {
- color: #333 !important;
+ color: var(--dark) !important;
}
.comment-popover a {
display: block;
- color: #999;
+ color: var(--gray);
text-decoration: none;
white-space: nowrap;
}
.comment-popover a:hover, .comment-trigger.active {
- color: #333;
+ color: var(--dark) !important;
}
.CodeMirror-comment .comment-trigger.active {
line-height: 14px;
@@ -117,14 +81,12 @@
}
.CodeMirror-annotation .same-as-above {
margin-left: 100px;
- color: #666;
+ color: var(--gray);
}
.CodeMirror-activeline .CodeMirror-annotation {
background: #E8F2FE;
}
.outline-search .result {
- margin-top: 20px;
height: 400px;
- overflow: auto;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
index da127ae534..6033d65ea4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
@@ -44,7 +44,7 @@ onedev.server.sourceView = {
}
if (blameInfos) {
- onedev.server.sourceView.blame(blameInfos);
+ onedev.server.sourceView.blame(blameInfos);
}
onedev.server.sourceView.highlightCommentTrigger();
@@ -96,49 +96,18 @@ onedev.server.sourceView = {
}, 500);
});
- $sourceView.on("getViewState", function() {
+ $code.on("getViewState", function() {
return onedev.server.codemirror.getViewState(cm);
});
- $sourceView.on("setViewState", function(e, viewState) {
+ $code.on("setViewState", function(e, viewState) {
return onedev.server.codemirror.setViewState(cm, viewState);
});
- $sourceView.on("autofit", function(event, width, height) {
- if (cm.getOption("fullScreen"))
- return;
-
- $sourceView.outerWidth(width);
- $sourceView.outerHeight(height);
- $code.outerHeight($sourceView.height());
-
- var $comment = $sourceView.children(".comment");
- var paddingLeft;
- if ($comment.is(":visible")) {
- paddingLeft = $comment.outerWidth();
- $comment.children(".ui-resizable-handle").outerHeight($sourceView.height());
-
- var $commentHead = $comment.find(">.content>.head");
- var $commentBody = $comment.find(">.content>.body");
- $commentBody.outerHeight($sourceView.height() - $commentHead.outerHeight());
- } else {
- paddingLeft = 0;
- }
- $sourceView.css("padding-left", paddingLeft);
-
- var $outline = $sourceView.children(".outline");
- if ($outline.is(":visible")) {
- $sourceView.css("padding-right", $outline.outerWidth());
- $outline.css("left", $code.outerWidth() + paddingLeft);
- $outline.children(".ui-resizable-handle").outerHeight($sourceView.height());
-
- var $outlineHead = $outline.find(">.content>.head");
- var $outlineBody = $outline.find(">.content>.body");
- $outlineBody.outerHeight($sourceView.height() - $outlineHead.outerHeight());
- } else {
- $sourceView.css("padding-right", "0");
- }
-
- cm.setSize($code.width(), $code.height());
+ $code.on("resized", function() {
+ setTimeout(function() {
+ cm.setSize("100%", $code.height());
+ });
+ return false;
});
},
checkShortcutsBinding() {
@@ -164,7 +133,7 @@ onedev.server.sourceView = {
&& onedev.server.viewState.carryOver === undefined) {
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
onedev.server.codemirror.scrollTo(cm, mark);
- }
+ }
},
initComment: function() {
var $sourceView = $(".source-view");
@@ -225,11 +194,9 @@ onedev.server.sourceView = {
syncOutline: function(symbolId) {
var $symbol = $("#" + symbolId);
var $body = $(".source-view>.outline>.content>.body");
- $symbol.scrollIntoView(20);
+ $symbol.scrollIntoView();
$body.find(".tree-content").removeClass("active");
$symbol.addClass("active");
-
- $(window).resize();
},
restoreMark: function() {
var $sourceView = $(".source-view");
@@ -324,11 +291,11 @@ onedev.server.sourceView = {
var $content;
if (unableCommentMessage) {
- $content = $("<div><span class='invalid'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> " + unableCommentMessage + "</a>");
+ $content = $("<div><span class='invalid'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> " + unableCommentMessage + "</a>");
} else {
- $content = $("<div><a class='permanent'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#link'/></svg> Permanent link of this selection</a>");
+ $content = $("<div><a class='permanent'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#link'/></svg> Permanent link of this selection</a>");
$content.children("a.permanent").attr("href", markUrl);
- $content.append("<a class='copy-marked'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#copy'/></svg> Copy selected text to clipboard</a>");
+ $content.append("<a class='copy-marked'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#copy'/></svg> Copy selected text to clipboard</a>");
var clipboard = new Clipboard(".copy-marked", {
text: function(trigger) {
return cm.getSelection("\n");
@@ -341,7 +308,7 @@ onedev.server.sourceView = {
$(".selection-popover").remove();
});
if (loggedIn) {
- $content.append("<a class='comment'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#comment'/></svg> Add comment on this selection</a>");
+ $content.append("<a class='comment'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#comment'/></svg> Add comment on this selection</a>");
$content.children("a.comment").click(function() {
if ($(".source-view").find("form.dirty").length != 0
&& !confirm("There are unsaved changes, discard and continue?")) {
@@ -352,7 +319,7 @@ onedev.server.sourceView = {
callback("addComment", mark.fromRow, mark.fromColumn, mark.toRow, mark.toColumn);
});
} else {
- $content.append("<span class='comment'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> Login to comment on selection</span>");
+ $content.append("<span class='comment'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> Login to comment on selection</span>");
}
}
@@ -405,7 +372,6 @@ onedev.server.sourceView = {
}
onedev.server.sourceView.highlightCommentTrigger();
$(window).resize();
-
onedev.server.sourceView.clearMark();
},
onAddComment: function(mark) {
@@ -432,8 +398,8 @@ onedev.server.sourceView = {
$sourceView.data("openComment", comment);
$sourceView.data("mark", comment.mark);
onedev.server.sourceView.highlightCommentTrigger();
- $(window).resize();
+ $(window).resize();
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
onedev.server.codemirror.scrollIntoView(cm, comment.mark);
},
@@ -446,8 +412,8 @@ onedev.server.sourceView = {
},
onToggleOutline: function() {
onedev.server.sourceView.exitFullScreen();
- $(window).resize();
$(".outline-toggle").prop("checked", $(".source-view>.outline").is(":visible"));
+ $(window).resize();
},
highlightCommentTrigger: function() {
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
@@ -552,6 +518,7 @@ onedev.server.sourceView = {
}
}
}
+ $(".CodeMirror-annotations").addClass("need-width");
} else {
cm.clearGutter("CodeMirror-annotations");
var gutters = cm.getOption("gutters").slice();
@@ -597,7 +564,7 @@ onedev.server.sourceView = {
var $prev = $selectables.eq(index);
$active.removeClass("active");
$prev.addClass("active");
- $result.find("a.active").scrollIntoView(36);
+ $result.find("a.active").scrollIntoView();
}
};
@@ -612,7 +579,7 @@ onedev.server.sourceView = {
var $next = $selectables.eq(index);
$active.removeClass("active");
$next.addClass("active");
- $result.find("a.active").scrollIntoView(36);
+ $result.find("a.active").scrollIntoView();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/vgrabber.png b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/vgrabber.png
deleted file mode 100644
index 1d78ce7647..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/vgrabber.png and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewCssResourceReference.java
new file mode 100644
index 0000000000..d1b10aee0b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.project.blob.render.view;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class BlobViewCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public BlobViewCssResourceReference() {
+ super(BlobViewCssResourceReference.class, "blob-view.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
index fe222bfbda..40a7a0be9d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
@@ -1,43 +1,39 @@
<wicket:panel>
- <div class="blob-view autofit">
- <div class="head clearfix">
- <div class="float-left info expanded">
+ <div class="blob-view d-flex flex-column flex-grow-1">
+ <div class="head d-flex align-items-center px-3 py-2 justify-content-between flex-shrink-0">
+ <div class="info d-none d-xl-block mr-4 text-gray">
<wicket:enclosure child="lines">
<span wicket:id="lines"></span>
- <span class="separator">|</span>
+ <span class="text-muted">|</span>
<span wicket:id="charset"></span>
- <span class="separator">|</span>
+ <span class="text-muted">|</span>
</wicket:enclosure>
<span wicket:id="size"></span>
</div>
- <div class="actions-and-options float-right clearfix">
- <div wicket:id="options" class="float-left options expanded"></div>
- <div class="float-left actions">
+ <div class="tools d-flex align-items-center">
+ <div class="actions d-flex align-items-center">
<wicket:container wicket:id="changeActions">
- <a wicket:id="edit">
+ <span wicket:id="edit">
+ <a wicket:id="link" class="btn btn-xs btn-light btn-hover-primary btn-icon" title="Edit">
<wicket:svg href="edit" class="icon"></wicket:svg>
- Edit
</a>
- <a wicket:id="delete">
+ </span>
+ <span wicket:id="delete">
+ <a wicket:id="link" class="btn btn-xs btn-light btn-hover-danger btn-icon" title="Delete">
<wicket:svg href="trash" class="icon"></wicket:svg>
- Delete
</a>
+ </span>
</wicket:container>
- <a wicket:id="raw">
+ <a wicket:id="raw" class="btn btn-xs btn-light btn-hover-primary btn-icon" title="Raw">
<wicket:svg href="file" class="icon"></wicket:svg>
- Raw
</a>
- <wicket:enclosure child="viewPlain">
- <label><input type="checkbox" wicket:id="viewPlain"> View Source</label>
- </wicket:enclosure>
- <wicket:enclosure child="blame">
- <label><input type="checkbox" wicket:id="blame"> Blame</label>
- </wicket:enclosure>
- <wicket:container wicket:id="extraActions"></wicket:container>
</div>
+ <!-- Put all options in a single line to make :empty selector working -->
+ <div class="options d-flex align-items-center"><wicket:enclosure child="viewPlain"><label class="checkbox"><input type="checkbox" wicket:id="viewPlain"> View Source</label></wicket:enclosure><wicket:enclosure child="blame"><label class="checkbox"><input type="checkbox" wicket:id="blame"> Blame</label></wicket:enclosure><wicket:container wicket:id="extraOptions"></wicket:container></div>
+ <div wicket:id="formats" class="formats d-none d-sm-block"></div>
</div>
</div>
- <div class="body">
+ <div class="body autofit flex-grow-1 d-flex flex-column">
<wicket:child></wicket:child>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
index 95df6c8bd9..55d1d70f7e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
@@ -7,11 +7,10 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -54,13 +53,13 @@ public abstract class BlobViewPanel extends Panel {
protected abstract boolean isViewPlainSupported();
- protected WebMarkupContainer newOptions(String id) {
+ protected WebMarkupContainer newFormats(String id) {
WebMarkupContainer options = new WebMarkupContainer(id);
options.setVisible(false);
return options;
}
- protected WebMarkupContainer newAdditionalActions(String id) {
+ protected WebMarkupContainer newExtraOptions(String id) {
return new WebMarkupContainer(id);
}
@@ -75,64 +74,58 @@ public abstract class BlobViewPanel extends Panel {
boolean reviewRequired = project.isReviewRequiredForModification(user, revision, path);
boolean buildRequired = project.isBuildRequiredForModification(user, revision, path);
+ WebMarkupContainer edit = new WebMarkupContainer("edit");
+ changeActions.add(edit);
if (isEditSupported()) {
- AjaxLink<Void> editLink = new ViewStateAwareAjaxLink<Void>("edit", true) {
+ String title;
+ if (reviewRequired)
+ title = "Review required for this change. Submit pull request instead";
+ else if (buildRequired)
+ title = "Build required for this change. Submit pull request instead";
+ else
+ title = "Edit on branch " + context.getBlobIdent().revision;
+
+ edit.add(AttributeAppender.append("title", title));
+
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link", true) {
- @Override
- protected void disableLink(ComponentTag tag) {
- super.disableLink(tag);
-
- }
-
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
}
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- if (reviewRequired) {
- tag.append("class", "disabled", " ");
- tag.put("title", "Review required for this change. Submit pull request instead");
- } else if (buildRequired) {
- tag.append("class", "disabled", " ");
- tag.put("title", "Build required for this change. Submit pull request instead");
- } else {
- tag.put("title", "Edit on branch " + context.getBlobIdent().revision);
- }
- }
-
@Override
public void onClick(AjaxRequestTarget target) {
context.onModeChange(target, Mode.EDIT, null);
}
};
- editLink.setEnabled(!reviewRequired && !buildRequired);
+ if (reviewRequired || buildRequired) {
+ link.add(AttributeAppender.append("class", "disabled"));
+ link.setEnabled(false);
+ }
- changeActions.add(editLink);
+ edit.add(link);
} else {
- changeActions.add(new WebMarkupContainer("edit").setVisible(false));
+ edit.add(new WebMarkupContainer("link").setVisible(false));
}
- AjaxLink<Void> deleteLink = new ViewStateAwareAjaxLink<Void>("delete") {
+ WebMarkupContainer delete = new WebMarkupContainer("delete");
+ changeActions.add(delete);
+
+ String title;
+ if (reviewRequired)
+ title = "Review required for this change. Submit pull request instead";
+ else if (buildRequired)
+ title = "Build required for this change. Submit pull request instead";
+ else
+ title = "Delete from branch " + context.getBlobIdent().revision;
+
+ delete.add(AttributeAppender.append("title", title));
+
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- if (reviewRequired) {
- tag.append("class", "disabled", " ");
- tag.put("title", "Review required for this change. Submit pull request instead");
- } else if (buildRequired) {
- tag.append("class", "disabled", " ");
- tag.put("title", "Build required for this change. Submit pull request instead");
- } else {
- tag.put("title", "Delete from branch " + context.getBlobIdent().revision);
- }
- }
-
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
@@ -146,14 +139,23 @@ public abstract class BlobViewPanel extends Panel {
};
- deleteLink.setEnabled(!reviewRequired && !buildRequired);
+ if (reviewRequired || buildRequired) {
+ link.add(AttributeAppender.append("class", "disabled"));
+ link.setEnabled(false);
+ }
- changeActions.add(deleteLink);
+ delete.add(link);
} else {
changeActions.setVisible(false);
- changeActions.add(new WebMarkupContainer("edit"));
- changeActions.add(new WebMarkupContainer("delete"));
+
+ WebMarkupContainer edit = new WebMarkupContainer("edit");
+ edit.add(new WebMarkupContainer("link"));
+ changeActions.add(edit);
+
+ WebMarkupContainer delete = new WebMarkupContainer("delete");
+ delete.add(new WebMarkupContainer("link"));
+ changeActions.add(delete);
}
changeActions.setOutputMarkupId(true);
@@ -208,7 +210,7 @@ public abstract class BlobViewPanel extends Panel {
add(new Label("size", FileUtils.byteCountToDisplaySize(context.getProject().getBlob(context.getBlobIdent(), true).getSize())));
- add(newOptions("options"));
+ add(newFormats("formats"));
add(new ResourceLink<Void>("raw", new RawBlobResourceReference(),
RawBlobResource.paramsOf(context.getProject(), context.getBlobIdent())));
@@ -265,7 +267,7 @@ public abstract class BlobViewPanel extends Panel {
}));
- add(newAdditionalActions("extraActions"));
+ add(newExtraOptions("extraOptions"));
newChangeActions(null);
setOutputMarkupId(true);
@@ -274,10 +276,7 @@ public abstract class BlobViewPanel extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new BlobViewResourceReference()));
-
- response.render(OnDomReadyHeaderItem.forScript(String.format("onedev.server.blobView.onDomReady('%s');", getMarkupId())));
+ response.render(CssHeaderItem.forReference(new BlobViewCssResourceReference()));
}
public BlobRenderContext getContext() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewResourceReference.java
deleted file mode 100644
index 3f9202de5d..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewResourceReference.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.view;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.request.resource.CssResourceReference;
-
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class BlobViewResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public BlobViewResourceReference() {
- super(BlobViewResourceReference.class, "blob-view.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(BlobViewResourceReference.class, "blob-view.css")));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css
index 2b6ba2aac9..4b25fff35f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css
@@ -1,38 +1,30 @@
-@media(max-width: 767px) {
- .blob-view>.head .expanded {
- display: none;
- }
-}
.blob-view>.head {
- border-bottom: 1px solid #E0E0E0;
- padding: 4px 8px;
+ border-bottom: 1px solid var(--light-gray);
}
-.blob-view>.body {
- overflow: auto;
+.blob-view>.head>.tools>* {
+ margin-left: 1.2rem;
}
-.blob-view>.head>.info {
- color: #666;
+.blob-view>.head>.tools>.options {
+ padding-left: 1.2rem;
+ border-left: 1px solid var(--light-gray);
}
-.blob-view>.head>.info .separator {
- color: #E0E0E0;
+.blob-view>.head>.tools>.options:empty {
+ display: none !important;
}
-.blob-view>.head .actions {
- white-space: nowrap;
+
+.blob-view>.head>.tools>:first-child {
+ margin-left: 0;
}
-.blob-view>.head .actions>* {
- color: #333;
- margin-left: 12px;
- margin-right: 0;
+.blob-view>.head>.tools>.actions>* {
+ margin-right: 0.6rem;
}
-.blob-view>.head .actions>input {
- vertical-align: top;
+.blob-view>.head>.tools>.actions>:last-child {
+ margin-right: 0;
}
-.blob-view>.head .actions label {
- font-weight: normal;
- margin-bottom: 0;
- display: inline-block;
+
+.blob-view>.head>.tools>.options>* {
+ margin-right: 1.4rem;
}
-.blob-view>.head .actions input[type=checkbox] {
- position: relative;
- top: 2px;
+.blob-view>.head>.tools>.options>:last-child {
+ margin-right: 0;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.js
deleted file mode 100644
index 2a5963259c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.js
+++ /dev/null
@@ -1,36 +0,0 @@
-onedev.server.blobView = {
-
- onDomReady: function(containerId) {
- var $blobView = $("#" + containerId + ">.blob-view");
- var $head = $blobView.find(">.head");
- var $body = $blobView.find(">.body");
-
- if ($body.find(".autofit").length != 0)
- $body.css("overflow", "visible");
-
- $blobView.on("getViewState", function(e) {
- return {scroll:{left: $body.scrollLeft(), top: $body.scrollTop()}};
- });
-
- $blobView.on("setViewState", function(e, viewState) {
- if (viewState.scroll) {
- $body.scrollLeft(viewState.scroll.left);
- $body.scrollTop(viewState.scroll.top);
- }
- });
-
- $blobView.on("autofit", function(e, width, height) {
- $blobView.outerWidth(width);
- $blobView.outerHeight(height);
-
- height = $blobView.height()-$head.outerHeight();
- $body.outerWidth(width).outerHeight(height);
- $body.find(".autofit:visible").first().triggerHandler("autofit", [$body.width(), $body.height()]);
- });
- },
-
- onWindowLoad: function() {
-
- }
-
-};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html
index 66c7504464..d96c2b81cd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html
@@ -2,10 +2,10 @@
<form wicket:id="form" class="advanced-search">
<div class="modal-header">
<h5 class="modal-title">Advanced Search</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
- <ul wicket:id="tabs" class="nav nav-tabs"></ul>
+ <ul wicket:id="tabs" class="nav nav-tabs nav-tabs-line nav-bold"></ul>
<div wicket:id="searchOptions"></div>
</div>
<div class="modal-footer">
@@ -15,13 +15,13 @@
</form>
<wicket:fragment wicket:id="symbolSearchFrag">
<div wicket:id="term" class="form-group">
- <label>Search For</label>
+ <label>Search For <span class="text-danger">*</span></label>
<input wicket:id="term" name="searchFor" class="form-control" type="text">
- <p class="help-block">(* = any string, ? = any character)</p>
+ <p class="form-text text-muted">(* = any string, ? = any character)</p>
<div wicket:id="feedback" class="mt-2"></div>
</div>
<div class="form-group">
- <label class="form-check-inline"><input wicket:id="caseSensitive" type="checkbox" class="form-check-input"> Case sensitive</label>
+ <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
</div>
<div class="form-group">
<label>File name patterns (separated by comma)</label>
@@ -29,36 +29,36 @@
</div>
<wicket:enclosure child="insideCurrentDir">
<div class="form-group">
- <label class="checkbox-inline"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
+ <label class="checkbox"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
</div>
</wicket:enclosure>
</wicket:fragment>
<wicket:fragment wicket:id="fileSearchFrag">
<div wicket:id="term" class="form-group">
- <label>Search For</label>
+ <label>Search For <span class="text-danger">*</span></label>
<input wicket:id="term" name="searchFor" class="form-control" type="text">
- <p class="help-block">(* = any string, ? = any character)</p>
+ <p class="form-text text-muted">(* = any string, ? = any character)</p>
<div wicket:id="feedback" class="mt-2"></div>
</div>
- <div class="form-group">
- <label class="form-check-inline"><input wicket:id="caseSensitive" type="checkbox" class="form-check-input"> Case sensitive</label>
+ <div class="checkbox-inline">
+ <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
+ <wicket:enclosure child="insideCurrentDir">
+ <label class="checkbox"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
+ </wicket:enclosure>
</div>
- <wicket:enclosure child="insideCurrentDir">
- <div class="form-group">
- <label class="checkbox-inline"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
- </div>
- </wicket:enclosure>
</wicket:fragment>
<wicket:fragment wicket:id="textSearchFrag">
<div wicket:id="term" class="form-group">
- <label>Search For</label>
+ <label>Search For <span class="text-danger">*</span></label>
<input wicket:id="term" name="searchFor" class="form-control" type="text">
<div wicket:id="feedback" class="mt-2"></div>
</div>
<div class="form-group">
- <label class="form-check-inline"><input wicket:id="regex" type="checkbox" class="form-check-input"> Regular expression</label>
- <label class="form-check-inline"><input wicket:id="wholeWord" type="checkbox" class="form-check-input"> Whole word</label>
- <label class="form-check-inline"><input wicket:id="caseSensitive" type="checkbox" class="form-check-input"> Case sensitive</label>
+ <div class="checkbox-inline">
+ <label class="checkbox"><input wicket:id="regex" type="checkbox"> Regular expression</label>
+ <label class="checkbox"><input wicket:id="wholeWord" type="checkbox"> Whole word</label>
+ <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
+ </div>
</div>
<div class="form-group">
<label>File name patterns (separated by comma)</label>
@@ -66,7 +66,7 @@
</div>
<wicket:enclosure child="insideCurrentDir">
<div class="form-group">
- <label class="checkbox-inline"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
+ <label class="checkbox"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
</div>
</wicket:enclosure>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/advanced-search.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/advanced-search.css
index 81de788a8a..3449645b0b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/advanced-search.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/advanced-search.css
@@ -1,6 +1,3 @@
.advanced-search .nav-tabs {
margin-bottom: 16px;
}
-.advanced-search .help-block {
- margin-bottom: 0;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html
index 8f9aa53ffe..c2e72a2ef0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html
@@ -2,13 +2,13 @@
<div class="quick-search">
<div class="modal-header">
<h5 class="modal-title">File and Symbol Search</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<input wicket:id="input" class="form-control"></input>
- <div wicket:id="result" class="result">
+ <div wicket:id="result" class="result mt-3 overflow-auto">
<wicket:enclosure child="symbolHits">
- <ul class="list-unstyled">
+ <ul class="list-unstyled mb-0">
<li wicket:id="symbolHits" class="hit selectable">
<a wicket:id="link">
<span class="icon"><img wicket:id="icon"></img></span>
@@ -23,14 +23,13 @@
<wicket:enclosure child="moreSymbolHits">
<li class="hit selectable more-matches">
<a wicket:id="moreSymbolHits">
- <span class="icon"><wicket:link><img src="point.png"></img></wicket:link></span>
- <em class="text">Show more</em>
+ <wicket:svg href="hand" class="icon"></wicket:svg> Show more
</a>
</li>
</wicket:enclosure>
</ul>
</wicket:enclosure>
- <div wicket:id="noMatches" class="no-matches"><wicket:svg href="info-circle" class="icon"/> No any matches</div>
+ <div wicket:id="noMatches" class="no-matches alert alert-light-warning"><wicket:svg href="info-circle" class="icon"/> No any matches</div>
</div>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/point.png b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/point.png
deleted file mode 100644
index 7efc7c6c38..0000000000
Binary files a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/point.png and /dev/null differ
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.css
index e253f5db4d..bc3d0d867c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.css
@@ -1,17 +1,10 @@
.quick-search .result {
- margin-top: 16px;
height: 400px;
- overflow: auto;
-}
-.quick-search .result ul {
- margin-bottom: 0;
}
.quick-search .result li.hit .scope {
- color: #666;
+ color: var(--gray);
font-size: 12px;
}
-.quick-search .no-matches, .quick-search .help {
- font-size: 16px;
- color: #666;
-}
-
+.quick-search .more-matches a[disabled] {
+ opacity: 100%;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js
index 093e4afffc..140975a9f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js
@@ -26,7 +26,7 @@ onedev.server.onQuickSearchDomReady = function(containerId, callback) {
$active.removeClass("active");
$prev.addClass("active");
}
- $result.find("li.hit.active").scrollIntoView(36);
+ $result.find("li.hit.active").scrollIntoView();
};
function onKeydown(e) {
@@ -38,7 +38,7 @@ onedev.server.onQuickSearchDomReady = function(containerId, callback) {
$active.removeClass("active");
$next.addClass("active");
}
- $result.find("li.hit.active").scrollIntoView(36);
+ $result.find("li.hit.active").scrollIntoView();
};
$body.children().bind("keydown", "return", onReturn);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html
index d7e55cfb9a..1e47639ac0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html
@@ -1,32 +1,28 @@
<wicket:panel>
- <div class="search-result">
- <div class="head clearfix">
- <div class="title float-left">Search Result</div>
- <div class="actions float-left">
- <a wicket:id="prevMatch" title="Show previous match"><wicket:svg href="arrow3" class="icon rotate-90"></wicket:svg></a>
- <a wicket:id="nextMatch" title="Show next match"><wicket:svg href="arrow3" class="icon rotate-90"></wicket:svg></a>
- <a wicket:id="expandAll" title="Expand all"><wicket:svg href="plus-square" class="icon"></wicket:svg></a>
+ <div class="search-result d-flex flex-column flex-grow-1 overflow-hidden">
+ <div class="head d-flex align-items-center px-3 py-2 flex-shrink-0">
+ <h6 class="title mr-4 mb-0">Search Result</h6>
+ <div class="actions text-nowrap mr-2">
+ <a wicket:id="prevMatch" title="Show previous match" class="mr-1"><wicket:svg href="arrow2" class="icon rotate-270"></wicket:svg></a>
+ <a wicket:id="nextMatch" title="Show next match" class="mr-1"><wicket:svg href="arrow2" class="icon rotate-90"></wicket:svg></a>
+ <a wicket:id="expandAll" title="Expand all" class="mr-2"><wicket:svg href="plus-square" class="icon"></wicket:svg></a>
<a wicket:id="collapseAll" title="Collapse all"><wicket:svg href="minus-square" class="icon"></wicket:svg></a>
</div>
- <wicket:enclosure child="hasMoreMessage">
- <div class="warning float-left">
- (<span wicket:id="hasMoreMessage"></span>)
- </div>
- </wicket:enclosure>
- <div class="float-right">
- <a wicket:id="close" class="close" title="Close"><wicket:svg href="times" class="icon"></wicket:svg></a>
+ <div wicket:id="hasMoreMessage" class="warning mr-2 d-none d-md-inline text-muted"></div>
+ <div class="ml-auto">
+ <a wicket:id="close" class="text-muted text-hover-primary" title="Close"><wicket:svg href="times" class="icon"></wicket:svg></a>
</div>
</div>
- <ul class="body list-unstyled">
- <li wicket:id="blobs" class="blob">
- <a wicket:id="expandLink" class="expand"><svg wicket:id="icon" class="icon icon-sm"></svg></a>
- <a wicket:id="blobLink" class="blob selectable">
+ <ul class="body list-unstyled mb-0 px-3 py-2 overflow-auto flex-grow-1">
+ <li wicket:id="blobs" class="blob text-nowrap border-0">
+ <a wicket:id="expandLink" class="expand"><svg wicket:id="icon" class="icon"></svg></a>
+ <a wicket:id="blobLink" class="blob selectable d-inline-block">
<wicket:svg href="file" class="icon"></wicket:svg>
<span wicket:id="label"></span>
</a>
<ul wicket:id="hits" class="list-unstyled">
<li wicket:id="hits" class="hit">
- <a wicket:id="hitLink" class="hit selectable">
+ <a wicket:id="hitLink" class="hit selectable d-inline-block">
<img wicket:id="icon"></img>
<span wicket:id="lineNo" class="line-no"></span>
<span wicket:id="label"></span>
@@ -39,8 +35,8 @@
</li>
</ul>
</li>
- <li wicket:id="noMatchingResult" class="no-matching-result">
- <wicket:svg href="warning" class="icon"/> Sorry, I am unable to find anything matching your query
+ <li wicket:id="noMatchingResult" class="no-matching-result my-2 alert alert-light-warning">
+ <wicket:svg href="warning" class="icon mr-1"/> Nothing matching your query
</li>
</ul>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
index 5e444d87ad..2696c958f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
@@ -134,7 +134,7 @@ public abstract class SearchResultPanel extends Panel {
String script = String.format(""
+ "$('#%s').find('.selectable').removeClass('active');"
+ "$('#%s').addClass('active');"
- + "$('#%s>.search-result>.body a.selectable.active').scrollIntoView(25);",
+ + "$('#%s>.search-result>.body a.selectable.active').scrollIntoView();",
getMarkupId(), activeLinkId, getMarkupId());
target.appendJavaScript(script);
@@ -249,7 +249,7 @@ public abstract class SearchResultPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- String message = "too many matches, displaying " + MAX_QUERY_ENTRIES + " of them";
+ String message = "(too many matches, displaying " + MAX_QUERY_ENTRIES + " of them)";
add(new Label("hasMoreMessage", message).setVisible(hasMore));
add(prevMatchLink = new AjaxLink<Void>("prevMatch") {
@@ -324,7 +324,6 @@ public abstract class SearchResultPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
RequestCycle.get().setMetaData(ExpandStatusKey.INSTANCE, ExpandStatus.EXPAND_ALL);
target.add(SearchResultPanel.this);
- target.appendJavaScript("$(window).resize();");
}
@Override
@@ -349,7 +348,6 @@ public abstract class SearchResultPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
RequestCycle.get().setMetaData(ExpandStatusKey.INSTANCE, ExpandStatus.COLLAPSE_ALL);
target.add(SearchResultPanel.this);
- target.appendJavaScript("$(window).resize();");
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.css
index 42d632bc8e..352f31ba50 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.css
@@ -1,46 +1,10 @@
.search-result>.head {
- padding: 4px 10px;
- font-size: 16px;
- border-bottom: 1px solid #E0E0E0;
- background: white;
-}
-.search-result>.head .actions {
- margin-left: 16px;
-}
-.search-result>.head .warning {
- margin-left: 8px;
- font-size: 13px;
- vertical-align: middle;
- color: #666;
-}
-.search-result>.head a {
- color: #666;
-}
-.search-result>.head em {
- margin-right: 8px;
-}
-.search-result>.head em i {
- color: #999;
+ border-bottom: 1px solid var(--secondary);
}
-.search-result>.body {
- overflow: auto;
- padding: 0 10px;
- margin-bottom: 0;
-}
-.search-result>.body>li {
- border: none;
- white-space: nowrap;
-}
.search-result>.body>li .expand {
margin-right: -4px;
}
-.search-result>.body>li a {
- color: #333;
-}
-.search-result>.body>li a.selectable {
- display: inline-block;
-}
.search-result>.body a.selectable.active span {
background-color: inherit !important;
}
@@ -54,9 +18,6 @@
transform: rotate(90deg);
}
.search-result>.body>li .scope {
- color: #666;
+ color: var(--gray);
font-size: 12px;
}
-.search-result>.body>li.no-matching-result {
- margin-top: 10px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
index 71625e5ca5..2fb500c823 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
@@ -1,22 +1,18 @@
-<html xmlns:wicket>
<wicket:extend>
- <div class="page-title">Branches</div>
- <div id="project-branches">
- <div class="list">
- <div class="head clearfix">
- <div class="input-group float-left base">
+ <div class="card project-branches m-5">
+ <div class="card-body">
+ <div class="head d-flex flex-wrap">
+ <div class="input-group base mr-3 mb-4 d-none d-lg-inline-flex">
<span class="input-group-prepend"><span class="input-group-text">Base</span></span>
<input wicket:id="baseBranch" type="hidden" class="form-control">
</div>
- <div class="float-left clearable-wrapper">
- <input wicket:id="filterBranches" class="form-control search" placeholder="Filter branches">
- </div>
- <div class="float-left">
- <a wicket:id="createBranch" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> New</a>
+ <div class="clearable-wrapper mr-3 mb-4">
+ <input wicket:id="filterBranches" class="form-control search" placeholder="Filter branches...">
</div>
+ <a wicket:id="createBranch" class="btn btn-primary btn-icon mb-4"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
<div class="body">
- <table wicket:id="branches" class="branches table table-hover"></table>
+ <table wicket:id="branches" class="branches table"></table>
<div id="searching-branches" class="ajax-indicator">
<img src="/img/ajax-indicator-big.gif">
</div>
@@ -24,21 +20,22 @@
</div>
</div>
<wicket:fragment wicket:id="branchFrag">
- <div class="title">
- <a wicket:id="branchLink" class="name"><span wicket:id="name"></span></a>
- <span wicket:id="buildStatus" class="build-status"></span>
- <span class="badge badge-secondary" wicket:id="default">default</span>
- <a wicket:id="makeDefault" class="make-default btn btn-sm btn-outline-secondary"><wicket:svg href="tick" class="icon"/> make default</a>
+ <div class="title my-2">
+ <a wicket:id="branchLink" class="name mr-2"><span wicket:id="name"></span></a>
+ <span wicket:id="buildStatus" class="build-status mr-2"></span>
+ <span class="badge badge-secondary mr-2" wicket:id="default">default</span>
</div>
- <div class="commit-message">
- <a wicket:id="messageLink"><span wicket:id="message"></span></a>
+ <div class="commit-message mb-2">
+ <span wicket:id="message"></span>
</div>
- <div class="commit-contributor">
+ <div class="commit-contributor mb-2">
<span wicket:id="contributor" class="contributor"></span>
</div>
<div wicket:id="actions" class="actions">
- <a wicket:id="effectiveRequest"><wicket:svg href="pull-request" class="icon"></wicket:svg> <span wicket:id="label"></span></a>
- <a wicket:id="delete" title="Delete this branch"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
+ <a wicket:id="download" class="btn btn-light btn-hover-primary btn-sm btn-icon mr-2 mb-2" title="Download tag archive"><wicket:svg href="download" class="icon"/></a>
+ <a wicket:id="delete" class="btn btn-sm btn-icon btn-light btn-hover-danger mr-2 mb-2" title="Delete this branch"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="makeDefault" class="make-default btn btn-sm btn-light btn-hover-primary mr-2 mb-2"><wicket:svg href="tick" class="icon mr-2"/> Set default</a>
+ <a wicket:id="effectiveRequest" class="btn btn-sm mr-2 mb-2"><wicket:svg href="pull-request" class="icon"></wicket:svg> <span wicket:id="label"></span></a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="aheadBehindFrag">
@@ -51,7 +48,7 @@
<form wicket:id="form" class="create-branch">
<div class="modal-header">
<h5 class="modal-title">Create Branch</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
@@ -67,7 +64,7 @@
<div class="confirm-delete-branch">
<div class="modal-header">
<h5 class="modal-title">Please confirm</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div wicket:id="body" class="modal-body"></div>
<div class="modal-footer">
@@ -81,4 +78,3 @@
These pull requests will be discarded if the branch is deleted.
</wicket:fragment>
</wicket:extend>
-</html>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 51b1978b0b..5c9bcc860f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -80,6 +80,7 @@ import io.onedev.server.web.component.branch.choice.BranchSingleChoice;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.link.ArchiveMenuLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
@@ -93,6 +94,7 @@ import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
public class ProjectBranchesPage extends ProjectPage {
@@ -404,7 +406,7 @@ public class ProjectBranchesPage extends ProjectPage {
}));
searchField.add(new OnSearchingBehavior());
-
+
add(new ModalLink("createBranch") {
private BranchBeanWithRevision helperBean = new BranchBeanWithRevision();
@@ -480,8 +482,8 @@ public class ProjectBranchesPage extends ProjectPage {
return fragment;
}
- });
-
+ });
+
List<IColumn<RefInfo, Void>> columns = new ArrayList<>();
columns.add(new AbstractColumn<RefInfo, Void>(Model.of("")) {
@@ -510,23 +512,6 @@ public class ProjectBranchesPage extends ProjectPage {
});
- fragment.add(new AjaxLink<Void>("makeDefault") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- getProject().setDefaultBranch(branch);
- target.add(branchesTable);
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.canManage(getProject())
- && !branch.equals(getProject().getDefaultBranch()));
- }
-
- });
-
fragment.add(new WebMarkupContainer("default") {
@Override
@@ -540,11 +525,19 @@ public class ProjectBranchesPage extends ProjectPage {
RevCommit lastCommit = getProject().getRevCommit(ref.getRef().getObjectId(), true);
fragment.add(new ContributorPanel("contributor", lastCommit.getAuthorIdent(), lastCommit.getCommitterIdent()));
- PageParameters params = CommitDetailPage.paramsOf(getProject(), lastCommit.name());
- link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);
- link.add(new Label("message", lastCommit.getShortMessage()));
- fragment.add(link);
-
+ fragment.add(new Label("message", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ RevCommit lastCommit = getProject().getRevCommit(rowModel.getObject().getRef().getObjectId(), true);
+ PageParameters params = CommitDetailPage.paramsOf(getProject(), lastCommit.name());
+ String commitUrl = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
+ ReferenceTransformer transformer = new ReferenceTransformer(getProject(), commitUrl);
+ return transformer.apply(lastCommit.getShortMessage());
+ }
+
+ }).setEscapeModelStrings(false));
+
WebMarkupContainer actionsContainer = new WebMarkupContainer("actions");
fragment.add(actionsContainer.setOutputMarkupId(true));
@@ -557,9 +550,11 @@ public class ProjectBranchesPage extends ProjectPage {
PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(effectiveRequest));
if (effectiveRequest.isOpen()) {
requestLink.add(new Label("label", "Open"));
+ requestLink.add(AttributeAppender.append("class", "btn-warning"));
requestLink.add(AttributeAppender.append("title", "A pull request is open for this change"));
} else {
requestLink.add(new Label("label", "Merged"));
+ requestLink.add(AttributeAppender.append("class", "btn-success"));
requestLink.add(AttributeAppender.append("title",
"This change is squashed/rebased onto base branch via a pull request"));
}
@@ -570,6 +565,15 @@ public class ProjectBranchesPage extends ProjectPage {
}
actionsContainer.add(requestLink);
+ actionsContainer.add(new ArchiveMenuLink("download", projectModel) {
+
+ @Override
+ protected String getRevision() {
+ return branch;
+ }
+
+ });
+
actionsContainer.add(new ModalLink("delete") {
@Override
@@ -652,7 +656,24 @@ public class ProjectBranchesPage extends ProjectPage {
}
});
-
+
+ actionsContainer.add(new AjaxLink<Void>("makeDefault") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getProject().setDefaultBranch(branch);
+ target.add(branchesTable);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canManage(getProject())
+ && !branch.equals(getProject().getDefaultBranch()));
+ }
+
+ });
+
cellItem.add(fragment);
}
@@ -675,7 +696,7 @@ public class ProjectBranchesPage extends ProjectPage {
@Override
public String getCssClass() {
- return "behind behind-ahead";
+ return "behind behind-ahead d-none d-lg-table-cell";
}
});
@@ -692,7 +713,7 @@ public class ProjectBranchesPage extends ProjectPage {
@Override
public String getCssClass() {
- return "ahead behind-ahead";
+ return "ahead behind-ahead d-none d-lg-table-cell";
}
});
@@ -851,4 +872,9 @@ public class ProjectBranchesPage extends ProjectPage {
return SecurityUtils.canReadCode(getProject());
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Branches");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css b/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css
index 98b6088111..5908e68cb3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css
@@ -1,71 +1,61 @@
-@media(max-width: 991px) {
- #project-branches>.list>table .behind-ahead {
- display: none;
- }
-}
-#project-branches>.list>.head>.base {
+.project-branches .head>.base {
width: 240px;
}
-#project-branches>.list>.body>table>thead {
+.project-branches .body>table>thead {
display: none;
}
-#project-branches>.list>.body>table td.branch>div {
- margin: 8px 0;
-}
-
-#project-branches>.list>.body>table .branch .make-default {
- display: none;
-}
-#project-branches>.list>.body>table>tbody>tr:hover .branch .make-default {
- display: inline;
-}
-#project-branches>.list>.body>table td.branch>.title>.name {
- font-weight: bold;
+.project-branches .body>table td:first-child {
+ padding-left: 0;
}
-#project-branches .actions a {
- color: #444;
+.project-branches .body>table td:last-child {
+ padding-right: 0;
}
-#project-branches>.list>.body>table td.branch>.title>* {
- margin-right: 8px;
-}
-#project-branches>.list>.body>table td.branch>.title .build-status svg {
- margin: 0;
+.project-branches .body>table td.branch>.title>.name {
+ font-weight: bold;
+ font-size: 1.1rem;
}
-#project-branches>.list>.body>table td.behind {
+.project-branches .body>table td.behind {
padding-right: 0;
}
-#project-branches>.list>.body>table td.ahead {
+.project-branches .body>table td.ahead {
padding-left: 0;
}
-#project-branches>.list>.body>table td.behind>div {
- border-right: 2px solid #BBB;
+.project-branches .body>table td.behind>div {
+ border-right: 2px solid var(--light-dark);
}
-#project-branches>.list>.body>table td.behind-ahead div.text {
+.project-branches .body>table td.behind-ahead div.text {
margin: 0 8px;
}
-#project-branches>.list>.body>table td.behind-ahead {
+.project-branches .body>table td.behind-ahead {
font-size: 13px;
padding-top: 12px;
width: 20%;
}
-#project-branches>.list>.body>table td.behind-ahead.behind>div {
+.project-branches .body>table td.behind-ahead.behind>div {
text-align: right;
}
-#project-branches>.list>.body>table .bar {
+.project-branches .body>table .bar {
height: 6px;
display: inline-block;
}
-#project-branches>.list>.body>table .ahead .bar {
- background: #ccc;
- border-radius: 0 2px 2px 0;
+.project-branches .body>table .ahead .bar {
+ background: var(--light-dark);
+ border-radius: 0 4px 4px 0;
}
-#project-branches>.list>.body>table .behind .bar {
- background: #ccc;
+.project-branches .body>table .behind .bar {
+ background: var(--light-dark);
border-radius: 2px 0 0 2px;
}
+@media(max-width: 991px) {
+ .project-branches .body>table td {
+ padding-left: 0;
+ padding-right: 0;
+ }
+}
+
#searching-branches {
position: absolute;
left: 50%;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.html
index 1780822542..1161a8ce36 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.html
@@ -1,7 +1,6 @@
<wicket:extend>
- <div class="page-title">Builds</div>
- <div id="build-list" class="query-save-support">
- <div wicket:id="side" class="side"></div>
- <div wicket:id="main" class="main"></div>
+ <div class="side-main side-main-wrap p-5">
+ <div wicket:id="savedQueries" class="side"></div>
+ <div wicket:id="builds" class="main"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
index d069df51b2..876f4a8c1e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
@@ -64,7 +65,7 @@ public class ProjectBuildsPage extends ProjectPage {
protected void onInitialize() {
super.onInitialize();
- add(savedQueries = new SavedQueriesPanel<NamedBuildQuery>("side") {
+ add(savedQueries = new SavedQueriesPanel<NamedBuildQuery>("savedQueries") {
@Override
protected NamedQueriesBean<NamedBuildQuery> newNamedQueriesBean() {
@@ -105,7 +106,7 @@ public class ProjectBuildsPage extends ProjectPage {
});
- add(buildList = new BuildListPanel("main", new IModel<String>() {
+ add(buildList = new BuildListPanel("builds", new IModel<String>() {
@Override
public void detach() {
@@ -243,5 +244,10 @@ public class ProjectBuildsPage extends ProjectPage {
}
return paramsOf(project, query, page);
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Builds");
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailCssResourceReference.java
new file mode 100644
index 0000000000..a077827d6c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.project.builds.detail;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class BuildDetailCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public BuildDetailCssResourceReference() {
+ super(BuildDetailCssResourceReference.class, "build-detail.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
index a4415d1282..8532a58691 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
@@ -1,25 +1,34 @@
<wicket:extend>
- <div id="build-detail">
- <div class="main">
- <div class="summary clearfix">
- <div wicket:id="title" class="title float-left"></div>
- <div wicket:id="status" class="status float-left">
- <span wicket:id="statusIcon"></span>
- <span wicket:id="statusLabel"></span>
+ <div class="build-detail d-flex flex-column card m-5 flex-grow-1">
+ <div class="card-header flex-shrink-0 flex-nowrap">
+ <div class="card-title flex-wrap">
+ <span wicket:id="title" class="mr-4 text-break"></span>
+ <div wicket:id="status" class="status text-nowrap mr-4">
+ <svg wicket:id="statusIcon" class="mr-2"></svg>
+ <span wicket:id="statusLabel"></span>
+ </div>
+ <div wicket:id="actions">
+ <a wicket:id="rebuild" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-3" title="Re-run this build"><wicket:svg href="re-run" class="icon"/></a>
+ <a wicket:id="cancel" class="btn btn-icon btn-light btn-hover-danger btn-xs mr-3" title="Cancel this build"><wicket:svg href="cancel" class="icon"/></a>
</div>
- <div wicket:id="actions" class="actions float-left">
- <a wicket:id="rebuild" class="btn btn-warning btn-sm"><wicket:svg href="undo" class="icon flip-y"/> Rebuild</a>
- <a wicket:id="cancel" class="btn btn-danger btn-sm"><wicket:svg href="cancel" class="icon"/> Cancel</a>
- </div>
- <div class="float-left down-stream">
- <a wicket:id="downstream" class="btn btn-secondary btn-sm">Downstream <wicket:svg href="arrow" class="icon rotate90"/></a>
- </div>
- <a wicket:id="moreInfo" class="more-info float-right" title="More info"><wicket:svg href="ellipsis" class="icon"/></a>
- </div>
- <pre wicket:id="errorMessage" class="error-message alert alert-danger"></pre>
- <ul wicket:id="buildTabs" class="tabs nav nav-tabs"></ul>
- <wicket:child></wicket:child>
+ <a wicket:id="downstream" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-4" title="Downstream jobs"><wicket:svg href="next" class="icon ml-1"/></a>
+ </div>
+ <div class="card-toolbar">
+ <a wicket:id="moreInfo" class="more-info side-info ml-auto" title="More info"><wicket:svg href="ellipsis" class="icon"/></a>
+ </div>
+ </div>
+ <div class="card-body d-flex flex-grow-1 position-relative">
+ <div class="main flex-grow-1 d-flex flex-column">
+ <pre wicket:id="errorMessage" class="error-message alert alert-danger ps ps-scroll mb-4 flex-shrink-0"></pre>
+ <ul wicket:id="buildTabs" class="tabs nav nav-tabs nav nav-tabs-line nav-bold mb-5 flex-shrink-0"></ul>
+ <wicket:child></wicket:child>
+ </div>
+ <div wicket:id="side" class="more-info"></div>
</div>
- <div wicket:id="side"></div>
</div>
+ <wicket:fragment wicket:id="projectTitleFrag">
+ <a wicket:id="builds" class="text-nowrap">Builds</a>
+ <span class="dot"></span>
+ <span wicket:id="buildNumber"></span>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index b673e8c3d7..e86e8318ab 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -18,12 +18,13 @@ import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -46,6 +47,8 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.inputspec.InputContext;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.script.identity.JobIdentity;
@@ -56,6 +59,7 @@ import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.build.side.BuildSidePanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
+import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.job.joblist.JobListPanel;
import io.onedev.server.web.component.link.DropdownLink;
@@ -87,8 +91,6 @@ public abstract class BuildDetailPage extends ProjectPage
public static final String PARAM_BUILD = "build";
- private static final int MAX_TABS_BEFORE_COLLAPSE = 10;
-
protected final IModel<Build> buildModel;
private final IModel<List<Job>> downstreamJobsModel = new LoadableDetachableModel<List<Job>>() {
@@ -353,12 +355,6 @@ public abstract class BuildDetailPage extends ProjectPage
setOutputMarkupPlaceholderTag(true);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildDetail.onErrorMessageDomReady();"));
- }
-
@Override
protected void onConfigure() {
super.onConfigure();
@@ -426,7 +422,7 @@ public abstract class BuildDetailPage extends ProjectPage
return tabs;
}
- }, MAX_TABS_BEFORE_COLLAPSE) {
+ }) {
@Override
public void onInitialize() {
@@ -440,7 +436,7 @@ public abstract class BuildDetailPage extends ProjectPage
add(new SideInfoPanel("side") {
@Override
- protected Component newContent(String componentId) {
+ protected Component newBody(String componentId) {
return new BuildSidePanel(componentId) {
@Override
@@ -448,27 +444,9 @@ public abstract class BuildDetailPage extends ProjectPage
return BuildDetailPage.this.getBuild();
}
- @Override
- protected CursorSupport<Build> getCursorSupport() {
- return new CursorSupport<Build>() {
-
- @Override
- public Cursor getCursor() {
- return WebSession.get().getBuildCursor();
- }
-
- @Override
- public void navTo(AjaxRequestTarget target, Build entity, Cursor cursor) {
- WebSession.get().setBuildCursor(cursor);
- setResponsePage(getPageClass(), paramsOf(entity));
- }
-
- };
- }
-
@Override
protected Component newDeleteLink(String componentId) {
- Link<Void> deleteLink = new Link<Void>(componentId) {
+ return new Link<Void>(componentId) {
@Override
public void onClick() {
@@ -483,14 +461,52 @@ public abstract class BuildDetailPage extends ProjectPage
setResponsePage(ProjectBuildsPage.class, ProjectBuildsPage.paramsOf(getProject()));
}
- };
- deleteLink.add(new ConfirmClickModifier("Do you really want to delete this build?"));
- deleteLink.setVisible(SecurityUtils.canManage(getBuild()));
- return deleteLink;
+ }.add(new ConfirmClickModifier("Do you really want to delete this build?"));
}
};
}
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new EntityNavPanel<Build>(componentId) {
+
+ @Override
+ protected EntityQuery<Build> parse(String queryString, boolean inProject) {
+ return BuildQuery.parse(inProject?getProject():null, queryString, true, true);
+ }
+
+ @Override
+ protected Build getEntity() {
+ return getBuild();
+ }
+
+ @Override
+ protected List<Build> query(EntityQuery<Build> query, int offset, int count, boolean inProject) {
+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);
+ return buildManager.query(inProject?getProject():null, query, offset, count);
+ }
+
+ @Override
+ protected CursorSupport<Build> getCursorSupport() {
+ return new CursorSupport<Build>() {
+
+ @Override
+ public Cursor getCursor() {
+ return WebSession.get().getBuildCursor();
+ }
+
+ @Override
+ public void navTo(AjaxRequestTarget target, Build entity, Cursor cursor) {
+ WebSession.get().setBuildCursor(cursor);
+ setResponsePage(getPageClass(), paramsOf(entity));
+ }
+
+ };
+ }
+
+ };
+ }
});
@@ -499,8 +515,7 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new BuildDetailResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildDetail.onDomReady();"));
+ response.render(CssHeaderItem.forReference(new BuildDetailCssResourceReference()));
}
@Override
@@ -534,4 +549,13 @@ public abstract class BuildDetailPage extends ProjectPage
return new JobIdentity(getBuild().getProject(), getBuild().getCommitId());
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("builds", ProjectBuildsPage.class,
+ ProjectBuildsPage.paramsOf(getProject())));
+ fragment.add(new Label("buildNumber", "#" + getBuild().getNumber()));
+ return fragment;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailResourceReference.java
deleted file mode 100644
index 02563dc06e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailResourceReference.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.onedev.server.web.page.project.builds.detail;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-
-import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class BuildDetailResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public BuildDetailResourceReference() {
- super(BuildDetailResourceReference.class, "build-detail.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- BuildDetailResourceReference.class, "build-detail.css")));
- dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.html
index d54d9b371e..03d11c32ea 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.html
@@ -1,19 +1,29 @@
<wicket:extend>
- <div class="invalid-build alert alert-danger">
- <div class="head">
- Unable to show build as corresponding commit no longer exist in the underlying git repository
- </div>
- <div class="body">
- This might happen for two reasons:
- <ul>
- <li> The project points to a wrong git repository. In this case, you will need to copy over the correct repository,
- or make sure that the correct global storage directory is specified.</li>
- <li> The commit is no longer needed and have been garbage collected.
- <wicket:enclosure child="delete">
- In this case, you may also <a wicket:id="delete">delete the build</a>
- </wicket:enclosure>
- </li>
- </ul>
+ <div class="card m-5">
+ <div class="card-body">
+ <div class="d-flex">
+ <wicket:svg href="sad-panda" class="icon icon-hero flex-shrink-0 ml-n4"/>
+ <div>
+ <h4 class="mb-3">
+ Unable to show build as corresponding commit no longer exist in git repository
+ </h4>
+ This might happen for two reasons:
+ <ul>
+ <li> The project points to a wrong git repository. In this case, you will need to copy over the correct repository,
+ or make sure that the correct global storage directory is specified.</li>
+ <li> The commit is no longer needed and have been garbage collected.
+ <wicket:enclosure child="delete">
+ In this case, you may also <a wicket:id="delete" class="link-primary">delete the build</a>
+ </wicket:enclosure>
+ </li>
+ </ul>
+ </div>
+ </div>
</div>
</div>
+ <wicket:fragment wicket:id="projectTitleFrag">
+ <a wicket:id="builds" class="text-nowrap">Builds</a>
+ <span class="dot"></span>
+ <span wicket:id="buildNumber"></span>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java
index c9dfb12199..c9616c456b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java
@@ -2,10 +2,12 @@ package io.onedev.server.web.page.project.builds.detail;
import javax.persistence.EntityNotFoundException;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.flow.RedirectToUrlException;
@@ -96,9 +98,12 @@ public class InvalidBuildPage extends ProjectPage {
}
@Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new InvalidBuildResourceReference()));
+ protected Component newProjectTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("builds", ProjectBuildsPage.class,
+ ProjectBuildsPage.paramsOf(getProject())));
+ fragment.add(new Label("buildNumber", "#" + getBuild().getNumber()));
+ return fragment;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildResourceReference.java
deleted file mode 100644
index 7137d83dd7..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.builds.detail;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class InvalidBuildResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public InvalidBuildResourceReference() {
- super(InvalidBuildResourceReference.class, "invalid-build.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java
index 55cadd4003..92fc685784 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java
@@ -36,6 +36,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
import io.onedev.server.web.resource.ArtifactResource;
@@ -136,7 +137,9 @@ public class BuildArtifactsPage extends BuildDetailPage {
protected void onInitialize() {
super.onInitialize();
getTable().addTopToolbar(new HeadersToolbar<Void>(getTable(), null));
- getTable().addBottomToolbar(new NoRecordsToolbar(getTable()));
+ getTable().addBottomToolbar(new NoRecordsToolbar(getTable()));
+ getTable().add(new NoRecordsBehavior());
+ getTable().add(AttributeAppender.append("class", "table"));
add(new HumanTheme());
expand(getBuild().getArtifactsDir());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/build-artifacts.css b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/build-artifacts.css
index 344b944f6e..4f2bb25cea 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/build-artifacts.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/build-artifacts.css
@@ -1,20 +1,9 @@
.build-artifacts>table th, .build-artifacts>table td {
- padding: 8px;
-}
-.build-artifacts>table>thead>tr>th {
- border-bottom: 2px solid #DDD;
- border-top: none;
-}
-.build-artifacts>table>tbody>tr>td {
- border-top: 1px solid #DDD;
+ padding: 0.6rem;
}
.build-artifacts>table th.tree {
- padding-left: 18px;
+ padding-left: 1.2rem;
}
.build-artifacts>table td.tree {
padding-left: 0px;
}
-
-.build-artifacts>table td span.tree-content>a {
- color: #1f3b7b;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
index 2088617c89..766c99e6bf 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
@@ -1,82 +1,14 @@
-body.BuildDetailPage #layout>.body {
- padding: 59px 0 0 0;
+.build-detail>.card-header>.card-title>.status>svg {
+ width: 20px;
+ height: 20px;
}
-#build-detail>.main {
- overflow: auto;
- position: relative;
- padding: 20px;
+.build-detail .issue-list .add-new {
+ display: none;
}
-#build-detail>.main>div {
- margin-bottom: 20px;
+.build-detail>.card-body>.main>.error-message {
+ max-height: 100px;
}
-#build-detail>.main>div:last-child {
- margin-bottom: 0;
+.build-detail>.card-body>.main>.error-message.ps.ps-scroll>.ps__rail-x>.ps__thumb-x,
+.build-detail>.card-body>.main>.error-message.ps.ps-scroll>.ps__rail-y>.ps__thumb-y {
+ background: var(--light-danger);
}
-#build-detail>.main>.summary {
- position: relative;
- font-size: 24px;
-}
-#build-detail>.main>.summary .status svg {
- width: 24px;
- height: 24px;
- margin-right: 8px;
-}
-
-#build-detail>.main>.summary>* {
- margin-right: 20px;
-}
-#build-detail>.main>.summary .btn {
- margin-top: -4px;
-}
-#build-detail>.main>.summary .more-info {
- position: absolute;
- right: 0;
- font-size: 24px;
- margin: 0;
- color: #666;
- transform: rotate(-90deg);
-}
-
-#build-detail>.main>.error-message {
- font-size: 13px;
- max-height: 100px;
- position: relative;
-}
-#build-detail .build-side>.nav {
- padding-right: 20px;
- border-right: 1px solid #D8D8D8;
- margin-right: 30px;
- display: block;
-}
-
-@media(min-height: 800px) {
- #build-detail>.main>.commit-info {
- display: block;
- }
- #build-detail .side-info .commit {
- display: none;
- }
-}
-@media(min-width: 1150px) {
- #build-detail>.main {
- margin-right: 360px;
- }
- #build-detail .side-info {
- box-shadow: none;
- border-left-width: 4px;
- border-color: #EEE;
- display: block !important;
- }
- #build-detail a.more-info, #build-detail .side-info>a.close {
- display: none;
- }
- #build-detail .build-side .nav {
- padding-right: 0;
- border-right: none;
- margin-right: 0;
- }
-}
-
-#build-detail>.main>.changes .help-block {
- margin-top: 16px;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.js
deleted file mode 100644
index 2cf80eb0d7..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.js
+++ /dev/null
@@ -1,27 +0,0 @@
-onedev.server.buildDetail = {
- onErrorMessageDomReady: function() {
- var ps = new PerfectScrollbar($("#build-detail>.main>.error-message")[0]);
- $(window).resize(function() {
- ps.update();
- });
- },
- onDomReady: function() {
- $("body").css("overflow", "hidden");
- var $main = $("#build-detail>.main");
- function adjustHeight() {
- $main.outerHeight($(window).height() - $main.offset().top);
- }
- adjustHeight();
- $main.addClass("resize-aware").on("resized", adjustHeight);
- },
- onLogDomReady: function() {
- var $main = $("#build-detail>.main");
- $main.css("overflow", "hidden");
- var $log = $main.find(">div>.build-log");
- function setLogHeight() {
- $log.height($(window).height() - $log.offset().top - 40);
- }
- $(window).resize(setLogHeight);
- setLogHeight();
- }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html
index f90bfcb210..965a4ccf49 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div class="changes">
<div wicket:id="commits"></div>
- <div class="help-block"><wicket:svg href="info-circle" class="icon"/> This page lists changes since previous build on <a wicket:id="buildStreamHelpUrl" target="_blank">same stream</a></div>
+ <div class="font-size-sm text-muted mt-4"><wicket:svg href="bulb" class="icon mr-1 mt-n1"/> This page lists changes since previous build on <a wicket:id="buildStreamHelpUrl" class="link-primary" target="_blank">same stream</a></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/invalid-build.css b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/invalid-build.css
deleted file mode 100644
index a31239ed05..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/invalid-build.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.invalid-build>.head {
- font-size: 18px;
- font-weight: bold;
- margin-bottom: 20px;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html
index 39f1bc3deb..4352593fa1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div class="issues">
<div wicket:id="issues"></div>
- <div class="help-block"><wicket:svg href="info-circle" class="icon"/> This page lists fixed issues since previous build on <a wicket:id="buildStreamHelpUrl" target="_blank">same stream</a></div>
+ <div class="font-size-sm text-muted mt-4"><wicket:svg href="bulb" class="icon mt-n1 mr-1"/> This page lists fixed issues since previous build on <a wicket:id="buildStreamHelpUrl" class="link-primary" target="_blank">same stream</a></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.html
index 898e4b3076..60cac14018 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.html
@@ -1,8 +1,8 @@
<wicket:extend>
- <div wicket:id="log"></div>
+ <div wicket:id="log" class="d-flex flex-grow-1"></div>
<wicket:fragment wicket:id="optionsFrag">
<div>
- <a wicket:id="download" class="btn btn-outline-secondary btn-sm" title="Download full log"><wicket:svg href="download" class="icon"/></a>
+ <a wicket:id="download" class="btn btn-light btn-hover-primary btn-icon btn-sm btn-xs" title="Download full log"><wicket:svg href="download" class="icon"/></a>
</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java
index 94139ee48f..73fc1428b1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java
@@ -1,8 +1,6 @@
package io.onedev.server.web.page.project.builds.detail.log;
import org.apache.wicket.Component;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -27,12 +25,6 @@ public class BuildLogPage extends BuildDetailPage {
add(new BuildLogPanel("log", buildModel));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildDetail.onLogDomReady();"));
- }
-
@Override
protected boolean isPermitted() {
return SecurityUtils.canAccessLog(getBuild());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.html
index dff1c56b3e..c07345b67a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.html
@@ -1,19 +1,29 @@
<wicket:extend>
- <div class="invalid-code-comment alert alert-danger">
- <div class="head">
- Unable to show code comment as associated commit no longer exists in the underlying git repository
- </div>
- <div class="body">
- This might happen for two reasons:
- <ul>
- <li> The project points to a wrong git repository. In this case, you will need to copy over the correct repository,
- or make sure that the correct global storage directory is specified.</li>
- <li> The commit is no longer needed and has been garbage collected.
- <wicket:enclosure child="delete">
- In this case, you may also <a wicket:id="delete">delete the code comment</a>
- </wicket:enclosure>
- </li>
- </ul>
+ <div class="card m-5">
+ <div class="card-body">
+ <div class="d-flex">
+ <wicket:svg href="sad-panda" class="icon icon-hero flex-shrink-0 ml-n4"/>
+ <div>
+ <h4 class="mb-3">
+ Unable to show code comment as associated commit no longer exists in the underlying git repository
+ </h4>
+ This might happen for two reasons:
+ <ul>
+ <li> The project points to a wrong git repository. In this case, you will need to copy over the correct repository,
+ or make sure that the correct global storage directory is specified.</li>
+ <li> The commit is no longer needed and has been garbage collected.
+ <wicket:enclosure child="delete">
+ In this case, you may also <a wicket:id="delete" class="link-primary">delete the code comment</a>
+ </wicket:enclosure>
+ </li>
+ </ul>
+ </div>
+ </div>
</div>
</div>
+ <wicket:fragment wicket:id="projectTitleFrag">
+ <a wicket:id="codeComments" class="text-nowrap">Code Comments</a>
+ <span class="dot"></span>
+ <span wicket:id="codeCommentNumber"></span>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java
index 9a410d04e7..89a028bfe2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java
@@ -1,9 +1,13 @@
package io.onedev.server.web.page.project.codecomments;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.flow.RedirectToUrlException;
@@ -96,5 +100,14 @@ public class InvalidCodeCommentPage extends ProjectPage {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new ProjectCodeCommentsCssResourceReference()));
}
-
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("codeComments", ProjectCodeCommentsPage.class,
+ ProjectCodeCommentsPage.paramsOf(getProject())));
+ fragment.add(new Label("codeCommentNumber", "#" + getCodeComment().getId()));
+ return fragment;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.html
index 3b0b1e41e5..fbb2b483f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.html
@@ -1,7 +1,6 @@
<wicket:extend>
- <div class="page-title">Code Comments</div>
- <div id="project-code-comments" class="query-save-support">
- <div wicket:id="side" class="side"></div>
- <div wicket:id="main" class="main"></div>
+ <div class="side-main side-main-wrap p-5">
+ <div wicket:id="savedQueries" class="side"></div>
+ <div wicket:id="comments" class="main"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
index 544b6fad69..dd57559081 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
@@ -64,7 +65,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
protected void onInitialize() {
super.onInitialize();
- add(savedQueries = new SavedQueriesPanel<NamedCodeCommentQuery>("side") {
+ add(savedQueries = new SavedQueriesPanel<NamedCodeCommentQuery>("savedQueries") {
@Override
protected NamedQueriesBean<NamedCodeCommentQuery> newNamedQueriesBean() {
@@ -100,7 +101,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
});
- add(commentList = new CodeCommentListPanel("main", new IModel<String>() {
+ add(commentList = new CodeCommentListPanel("comments", new IModel<String>() {
@Override
public void detach() {
@@ -233,5 +234,10 @@ public class ProjectCodeCommentsPage extends ProjectPage {
}
return paramsOf(project, query, page);
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "<span class='text-truncate'>Code Comments</span>").setEscapeModelStrings(false);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
index ca4351c8f4..05cf6139b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
@@ -1,55 +1,61 @@
<wicket:extend>
- <div id="commit-detail" class="resize-aware">
- <div class="info">
- <div class="message">
- <div class="subject clearfix">
- <div wicket:id="title" class="float-left"></div>
- <div class="btn-group float-right">
- <a wicket:id="browseCode" title="browse code" class="btn btn-outline-secondary btn-sm"><wicket:svg href="files" class="icon"></wicket:svg></a>
- <a wicket:id="createBranch" title="Branch from this commit" class="btn btn-outline-secondary btn-sm"><wicket:svg href="branch" class="icon"></wicket:svg></a>
- <a wicket:id="createTag" title="Tag this commit" class="btn btn-outline-secondary btn-sm"><wicket:svg href="tag" class="icon"></wicket:svg></a>
+ <div class="commit-detail m-5">
+ <div class="card info mb-5">
+ <ul class="list-group list-group-flush">
+ <li class="list-group-item message">
+ <div class="subject d-flex flex-wrap align-items-center">
+ <h4 wicket:id="title" class="mr-3 mb-0"></h4>
+ <div class="ml-auto">
+ <a wicket:id="browseCode" title="browse code" class="btn btn-light btn-hover-primary btn-xs btn-icon"><wicket:svg href="files" class="icon"></wicket:svg></a>
+ <a wicket:id="createBranch" title="Branch from this commit" class="btn btn-light btn-hover-primary btn-xs btn-icon ml-1"><wicket:svg href="branch" class="icon"></wicket:svg></a>
+ <a wicket:id="createTag" title="Tag this commit" class="btn btn-light btn-hover-primary btn-xs btn-icon ml-1"><wicket:svg href="tag" class="icon"></wicket:svg></a>
+ </div>
</div>
- </div>
- <pre wicket:id="detail" class="detail"></pre>
- </div>
- <div wicket:id="refs" class="refs"></div>
- <div class="contribution-and-parents clearfix">
- <div class="contribution float-left">
- <span wicket:id="contributorAvatars" class="avatars"></span>
- <span wicket:id="contribution" class="name"></span>
- </div>
- <div class="commit float-left">
- <span wicket:id="hash" class="hash"></span>
- <a wicket:id="copyHash" class="copy"><wicket:svg href="copy" class="icon"></wicket:svg></a>
- </div>
- <div wicket:id="parents" class="parents float-left"></div>
- </div>
- </div>
- <wicket:enclosure child="jobs">
- <div class="jobs clearfix">
- <div wicket:id="jobs" class="job float-left">
- <span class="btn-group">
- <a wicket:id="detail" class="btn btn-outline-secondary">
- <span wicket:id="status" class="status"></span>
- <b wicket:id="name" class="name"></b>
- <wicket:svg href="arrow" class="icon rotate-90 icon-sm"></wicket:svg>
- </a>
- <a wicket:id="run" class="run btn btn-outline-secondary" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>
- </span>
- </div>
- </div>
- </wicket:enclosure>
- <div wicket:id="revisionDiff"></div>
+ <pre wicket:id="detail" class="detail mb-0 mt-3"></pre>
+ </li>
+ <li wicket:id="refs" class="list-group-item refs"></li>
+ <li class="list-group-item contribution-and-parents d-flex flex-wrap align-items-center">
+ <div class="contribution mr-5">
+ <span wicket:id="contributorAvatars" class="avatars mr-2"></span>
+ <span wicket:id="contribution" class="name"></span>
+ </div>
+ <div class="commit mr-4">
+ <span wicket:id="hash" class="hash"></span>
+ <a wicket:id="copyHash" class="copy"><wicket:svg href="copy" class="icon"></wicket:svg></a>
+ </div>
+ <div wicket:id="parents" class="parents"></div>
+ </li>
+ <wicket:enclosure child="jobs">
+ <li class="list-group-item refs d-flex flex-wrap">
+ <div wicket:id="jobs" class="job mr-3">
+ <span class="btn-group">
+ <a wicket:id="detail" class="btn btn-outline-secondary">
+ <svg wicket:id="status" class="status mr-2"></svg>
+ <b wicket:id="name" class="name"></b>
+ <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>
+ </a>
+ <a wicket:id="run" class="run btn btn-outline-secondary btn-icon" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>
+ </span>
+ </div>
+ </li>
+ </wicket:enclosure>
+ </ul>
+ </div>
+
+ <div class="card changes">
+ <li wicket:id="revisionDiff" class="list-group-item"></li>
+ </div>
</div>
+
<wicket:fragment wicket:id="refsFrag">
<span wicket:id="refs">
- <a wicket:id="link"><svg wicket:id="icon" class="icon"/><span wicket:id="label"></span></a>
+ <a wicket:id="link" class="mr-2"><svg wicket:id="icon" class="icon mr-1"/><span wicket:id="label"></span></a>
</span>
</wicket:fragment>
<wicket:fragment wicket:id="multiParentsFrag">
<div class="multiple">
- <span wicket:id="count"></span>
- <div wicket:id="parents" class="parent btn-group">
+ <span wicket:id="count" class="mr-2"></span>
+ <div wicket:id="parents" class="parent btn-group mr-2">
<a wicket:id="link" title="Show commit of this parent" class="commit btn btn-outline-secondary btn-sm"><span wicket:id="label"></span></a>
<a wicket:id="diff" title="Compare with this parent" class="diff btn btn-outline-secondary btn-sm"><wicket:svg href="diff" class="icon"></wicket:svg></a>
</div>
@@ -61,4 +67,9 @@
<a wicket:id="parent" class="parent hash"><span wicket:id="label"></span></a>
</div>
</wicket:fragment>
+ <wicket:fragment wicket:id="projectTitleFrag">
+ <a wicket:id="commits">Commits</a>
+ <span class="dot"></span>
+ <span wicket:id="commitHash"></span>
+ </wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 7742c49797..0738f4e42e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -81,9 +81,7 @@ import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
-import io.onedev.server.web.page.project.tags.ProjectTagsPage;
import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
@@ -124,6 +122,8 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
};
+ private WebMarkupContainer refsContainer;
+
private WebMarkupContainer revisionDiff;
public CommitDetailPage(PageParameters params) {
@@ -188,8 +188,8 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
add(new CreateBranchLink("createBranch", projectModel, state.revision) {
@Override
- protected void onCreate(AjaxRequestTarget target, String branch) {
- setResponsePage(ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject()));
+ protected void onCreated(AjaxRequestTarget target, String branch) {
+ target.add(refsContainer);
}
});
@@ -197,8 +197,8 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
add(new CreateTagLink("createTag", projectModel, state.revision) {
@Override
- protected void onCreate(AjaxRequestTarget target, String tag) {
- setResponsePage(ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject()));
+ protected void onCreated(AjaxRequestTarget target, String tag) {
+ target.add(refsContainer);
}
});
@@ -209,7 +209,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
else
add(new WebMarkupContainer("detail").setVisible(false));
- add(new AjaxLazyLoadPanel("refs") {
+ add(refsContainer = new AjaxLazyLoadPanel("refs") {
@Override
public Component getLazyLoadComponent(String markupId) {
@@ -251,7 +251,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
link.add(new SpriteImage("icon", "branch"));
link.add(new Label("label", branch));
item.add(link);
- item.add(AttributeAppender.append("class", "branch"));
+ item.add(AttributeAppender.append("class", "branch ref"));
} else {
String tag = Preconditions.checkNotNull(GitUtils.ref2tag(ref));
BlobIdent blobIdent = new BlobIdent(tag, null, FileMode.TREE.getBits());
@@ -261,7 +261,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
link.add(new SpriteImage("icon", "tag"));
link.add(new Label("label", tag));
item.add(link);
- item.add(AttributeAppender.append("class", "tag"));
+ item.add(AttributeAppender.append("class", "tag ref"));
}
}
@@ -575,7 +575,6 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new CommitDetailResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.commitDetail.onDomReady();"));
}
public static PageParameters paramsOf(Project project, State state) {
@@ -731,5 +730,14 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
public void onSaveCommentReply(CodeCommentReply reply) {
OneDev.getInstance(CodeCommentReplyManager.class).save(reply);
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("commits", ProjectCommitsPage.class,
+ ProjectCommitsPage.paramsOf(getProject())));
+ fragment.add(new Label("commitHash", GitUtils.abbreviateSHA(getCommit().name())));
+ return fragment;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
index fd485a474c..92fdf8061e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
@@ -1,7 +1,6 @@
<wicket:extend>
- <div class="page-title">Commits</div>
- <div id="project-commits" class="query-save-support">
- <div wicket:id="side" class="side"></div>
- <div wicket:id="main" class="main"></div>
+ <div class="side-main side-main-wrap p-5">
+ <div wicket:id="savedQueries" class="side"></div>
+ <div wicket:id="commits" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index 65786ee746..e7cecc65ab 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
@@ -66,7 +67,7 @@ public class ProjectCommitsPage extends ProjectPage {
protected void onInitialize() {
super.onInitialize();
- add(savedQueries = new SavedQueriesPanel<NamedCommitQuery>("side") {
+ add(savedQueries = new SavedQueriesPanel<NamedCommitQuery>("savedQueries") {
@Override
protected NamedQueriesBean<NamedCommitQuery> newNamedQueriesBean() {
@@ -102,7 +103,7 @@ public class ProjectCommitsPage extends ProjectPage {
});
- add(commitList = new CommitListPanel("main", new IModel<String>() {
+ add(commitList = new CommitListPanel("commits", new IModel<String>() {
@Override
public void detach() {
@@ -227,5 +228,10 @@ public class ProjectCommitsPage extends ProjectPage {
protected boolean isPermitted() {
return SecurityUtils.canReadCode(getProject());
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Commits");
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
index 64fab04625..0985ddbdf0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
@@ -1,82 +1,7 @@
-body.CommitDetailPage #layout>.body {
- padding: 59px 0 0 0;
-}
-#commit-detail {
- position: relative;
- overflow: auto;
- padding: 20px;
-}
-#commit-detail>div {
- margin-bottom: 20px;
-}
-#commit-detail>.info {
- border: 4px solid #EEE;
- border-radius: 4px;
-}
-
-#commit-detail>.info>.message {
- background: #F9F9F9;
- border-bottom: 2px solid #EEE;
- padding: 8px 12px 0 12px;
- border-radius: 4px 4px 0 0;
-}
-#commit-detail>.info>.message>.subject>.float-left {
- font-size: 17px;
- font-weight: bold;
- padding-top: 2px;
- color: #555;
- margin-bottom: 8px;
- word-break: break-word;
-}
-#commit-detail>.info>.message>.subject>.float-right {
- margin-left: 8px;
- margin-bottom: 8px;
-}
-#commit-detail>.info>.message>.detail {
- color: #666;
- padding: 0 0 12px 0;
- font-size: 13px;
- border: none;
- background: none;
- margin-bottom: 0;
-}
-#commit-detail>.info>.refs {
- padding: 12px;
- background: #F9F9F9;
- border-bottom: 2px solid #EEE;
-}
-#commit-detail>.info>.refs>div>span {
- margin-right: 8px;
-}
-#commit-detail>.info>.refs>div>span svg {
- margin-right: 4px;
-}
-#commit-detail>.info>.contribution-and-parents {
- padding: 16px 12px 0 54px;
- position: relative;
-}
-#commit-detail>.info>.contribution-and-parents>* {
- margin-bottom: 16px;
- margin-right: 20px;
-}
-#commit-detail>.info>.contribution-and-parents>*:last-child {
- margin-right: 0;
-}
-#commit-detail>.info>.contribution-and-parents .avatars {
- position: absolute;
- left: 12px;
- top: 10px;
-}
-#commit-detail>.info>.contribution-and-parents .parents>div>* {
- margin-right: 4px;
-}
-#commit-detail>.info>.contribution-and-parents .parents>div>*:last-child {
- margin-right: 0;
-}
-#commit-detail>.jobs {
- margin-bottom: 10px;
-}
-#commit-detail>.jobs>.job {
- margin-right: 20px;
- margin-bottom: 10px;
+.commit-detail .list-group-item {
+ padding: 1.25rem 1.5rem;
}
+.commit-detail .contribution-and-parents .avatar {
+ width: 32px;
+ height: 32px;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.js
index 3410f62af5..27829a0e2a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.js
@@ -1,20 +1,8 @@
onedev.server.commitDetail = {
- onDomReady: function() {
- $("body").css("overflow", "hidden");
- var $commitDetail = $("#commit-detail");
- function adjustHeight() {
- $commitDetail.outerHeight($(window).height() - $commitDetail.offset().top);
- }
- adjustHeight();
- $commitDetail.on("resized", adjustHeight);
- $commitDetail.scroll(function() {
- $commitDetail.find(".scroll-aware").addBack(".scroll-aware").trigger("scrolled");
- });
- },
initRefs: function(refsId) {
var $refs = $("#" + refsId);
if ($refs.children().length != 0)
- $refs.oneline("<a class='ellipsis-expander'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#ellipsis'/></svg></a>", 10, 120);
+ $refs.oneline("<a class='ellipsis-expander'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#ellipsis'/></svg></a>", 10, 60);
else
$refs.parent().remove();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
index f37306ab11..467fa3eeb6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
@@ -1,55 +1,52 @@
<wicket:extend>
- <div id="revision-compare" class="resize-aware">
- <div class="page-title">Revision Compare</div>
- <div class="page-content">
- <table class="revision-compare">
- <tr>
- <td class="left revision">
- <div class="title clearfix">
- <label class="float-left">Base</label>
- <wicket:enclosure child="compareWithMergeBase">
- <div class="float-left checkbox">
- <label>
- <input wicket:id="compareWithMergeBase" type="checkbox">
- common ancestor
- <span wicket:id="mergeBaseTooltip"><wicket:svg href="question-circle" class="icon"></wicket:svg></span>
- </label>
- </div>
- </wicket:enclosure>
- </div>
- <div wicket:id="leftRevSelector" class="selector"></div>
- <div class="message">
- <a wicket:id="leftCommitLink"><span wicket:id="message"></span></a>
- </div>
- </td>
- <td class="action">
- <a wicket:id="swap" class="swap btn btn-outline-secondary" title="Swap"><wicket:svg href="swap" class="icon"></wicket:svg></a>
- </td>
- <td class="right revision">
- <div class="title">
- <label>Compare</label>
- </div>
- <div wicket:id="rightRevSelector" class="selector"></div>
- <div class="message">
- <a wicket:id="rightCommitLink"><span wicket:id="message"></span></a>
- </div>
- </td>
- </tr>
- </table>
- <div wicket:id="effectiveRequest" class="alert alert-info">
- <span wicket:id="description"></span> <a wicket:id="link"><span wicket:id="label"></span></a>
+ <div class="p-5">
+ <div class="revision-compare mb-5">
+ <div class="base revision card">
+ <div class="card-body">
+ <div class="head">
+ <div class="title">Base</div>
+ <wicket:enclosure child="compareWithMergeBase">
+ <label class="checkbox">
+ <input wicket:id="compareWithMergeBase" type="checkbox">
+ common ancestor
+ </label>
+ <span wicket:id="mergeBaseTooltip" class="help"><wicket:svg href="question-o" class="icon"></wicket:svg></span>
+ </wicket:enclosure>
+ </div>
+ <div wicket:id="leftRevSelector" class="selector"></div>
+ <a wicket:id="leftCommitLink" class="message"><span wicket:id="message"></span></a>
+ </div>
</div>
- <div>
- <a wicket:id="createRequest" class="btn btn-primary">Create Pull Request</a>
+ <div class="swap">
+ <a wicket:id="swap" class="btn btn-primary btn-icon" title="Swap"><wicket:svg href="swap" class="icon"></wicket:svg></a>
</div>
- <div wicket:id="revisionNotSpecified" class="alert alert-warning">
- <span>Please select revisions to compare</span>
+ <div class="compare revision card">
+ <div class="card-body">
+ <div class="title">Compare</div>
+ <div wicket:id="rightRevSelector" class="selector"></div>
+ <a wicket:id="rightCommitLink" class="message"><span wicket:id="message"></span></a>
+ </div>
</div>
- <div wicket:id="unrelatedHistory" class="alert alert-warning">
- <span>History of comparing revisions is unrelated</span>
+ </div>
+ <div wicket:id="effectiveRequest" class="alert alert-info mb-5">
+ <span wicket:id="description"></span> <a wicket:id="link" class="alert-link"><span wicket:id="label"></span></a>
+ </div>
+ <div>
+ <a wicket:id="createRequest" class="btn btn-primary btn-block mb-5"><wicket:svg href="plus" class="icon mr-2"/> Create Pull Request for This Change</a>
+ </div>
+ <div wicket:id="revisionNotSpecified" class="alert alert-warning mb-5">
+ <span>Please select revisions to compare</span>
+ </div>
+ <div wicket:id="unrelatedHistory" class="alert alert-warning mb-5">
+ <span>History of comparing revisions is unrelated</span>
+ </div>
+ <wicket:enclosure child="tabs">
+ <div class="card compare-result">
+ <div class="card-body">
+ <ul wicket:id="tabs" class="nav nav-tabs nav-tabs-line nav-bolder mb-5"></ul>
+ <div wicket:id="tabPanel" class="tab-panel"></div>
</div>
- <ul wicket:id="tabs" class="nav nav-tabs"></ul>
- <div wicket:id="tabPanel" class="tab-panel"></div>
</div>
+ </wicket:enclosure>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index e608db5a72..bd6dff486f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -11,9 +11,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -46,6 +45,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectAndRevision;
import io.onedev.server.util.diff.WhitespaceOption;
+import io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference;
import io.onedev.server.web.component.commit.list.CommitListPanel;
import io.onedev.server.web.component.diff.revision.CommentSupport;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
@@ -506,6 +506,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,
state.tabPanel = TabPanel.COMMITS;
newTabPanel(target);
pushState(target);
+ resizeWindow(target);
}
});
@@ -522,6 +523,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,
state.tabPanel = TabPanel.FILE_CHANGES;
newTabPanel(target);
pushState(target);
+ resizeWindow(target);
}
});
@@ -540,8 +542,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new RevisionCompareResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.revisionCompare.onDomReady();"));
+ response.render(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));
}
private void newTabPanel(@Nullable AjaxRequestTarget target) {
@@ -843,4 +844,9 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,
return paramsOf(getProject(), state);
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Code Compare");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java
deleted file mode 100644
index 1cd434a007..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.onedev.server.web.page.project.compare;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-
-import io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class RevisionCompareResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public RevisionCompareResourceReference() {
- super(RevisionCompareResourceReference.class, "revision-compare.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- RevisionCompareResourceReference.class, "revision-compare.css")));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
deleted file mode 100644
index 2a96963bab..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
+++ /dev/null
@@ -1,11 +0,0 @@
-body.RevisionComparePage #layout>.body {
- padding: 50px 0 0 0;
-}
-#revision-compare {
- position: relative;
- overflow: auto;
- padding: 20px;
-}
-#revision-compare>.page-content>* {
- margin-bottom: 20px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.js b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.js
deleted file mode 100644
index fff03aae98..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.js
+++ /dev/null
@@ -1,14 +0,0 @@
-onedev.server.revisionCompare = {
- onDomReady: function() {
- $("body").css("overflow", "hidden");
- var $revisionCompare = $("#revision-compare");
- function adjustHeight() {
- $revisionCompare.outerHeight($(window).height() - $revisionCompare.offset().top);
- }
- adjustHeight();
- $revisionCompare.on("resized", adjustHeight);
- $revisionCompare.scroll(function() {
- $revisionCompare.find(".scroll-aware").addBack(".scroll-aware").trigger("scrolled");
- });
- }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java
index 462d12e117..dd317dec90 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java
@@ -1,6 +1,8 @@
package io.onedev.server.web.page.project.dashboard;
+import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.security.SecurityUtils;
@@ -21,4 +23,9 @@ public class ProjectDashboardPage extends ProjectPage {
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Dashboard");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
deleted file mode 100644
index 208453a5fa..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<wicket:panel>
- <div class="project-info" id="project-info">
- <div wicket:id="name" class="name"></div>
- <wicket:enclosure child="forkedFrom">
- <div class="forked-from">
- forked from <a wicket:id="forkedFrom"><span wicket:id="label"></span></a>
- </div>
- </wicket:enclosure>
- <div class="forks">
- <a wicket:id="forks" class="forks"><span wicket:id="label"></span></a>
- <a wicket:id="forkNow" class="fork-now">fork now</a>
- </div>
- <div wicket:id="description" class="description"></div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css b/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css
deleted file mode 100644
index bab008b271..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.project-info {
- padding: 12px;
- width: 360px;
-}
-.project-info>div {
- margin-bottom: 12px;
-}
-.project-info>div:last-child {
- margin-bottom: 0;
-}
-.project-info>.name {
- font-weight: bold;
- font-size: 16px;
-}
-.project-info>.forks>.forks {
- margin-right: 8px;
-}
-.project-info>.description {
- border: 1px dashed #BBB;
- padding: 20px 20px 10px 20px;
- border-radius: 4px;
- background: #F5F5F5;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesCssResourceReference.java
deleted file mode 100644
index e75de14db4..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.issues;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class ProjectIssuesCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ProjectIssuesCssResourceReference() {
- super(ProjectIssuesCssResourceReference.class, "project-issues.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.html
index abfbafd263..9017aa5b75 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.html
@@ -1,7 +1,6 @@
<wicket:extend>
- <div id="project-issues">
- <div wicket:id="workflowChangeAlert"></div>
- <ul wicket:id="issuesTabs" class="nav nav-tabs"></ul>
+ <div class="project-issues d-flex flex-column flex-grow-1 p-5">
+ <div wicket:id="workflowChangeAlert" class="mb-3 flex-shrink-0"></div>
<wicket:child></wicket:child>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java
index 1ba3d5f132..8bd87f4c8e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java
@@ -1,15 +1,6 @@
package io.onedev.server.web.page.project.issues;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -19,18 +10,7 @@ import io.onedev.server.util.script.identity.ScriptIdentity;
import io.onedev.server.util.script.identity.ScriptIdentityAware;
import io.onedev.server.util.script.identity.SiteAdministrator;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.tabbable.PageTab;
-import io.onedev.server.web.component.tabbable.PageTabHead;
-import io.onedev.server.web.component.tabbable.Tab;
-import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
-import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
-import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
-import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;
-import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;
-import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;
@SuppressWarnings("serial")
public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIdentityAware {
@@ -55,63 +35,6 @@ public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIde
}
});
-
- List<Tab> tabs = new ArrayList<>();
- tabs.add(new IssuesTab("Issue List", ProjectIssueListPage.class) {
-
- @Override
- public Component render(String componentId) {
- return new PageTabHead(componentId, this) {
-
- @Override
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>(linkId,
- pageClass, ProjectIssueListPage.paramsOf(getProject(), 0));
- }
-
- };
- }
-
- });
- tabs.add(new IssuesTab("Issue Boards", IssueBoardsPage.class));
- tabs.add(new IssuesTab("Milestones", MilestoneListPage.class, NewMilestonePage.class,
- MilestoneDetailPage.class, MilestoneEditPage.class));
-
- add(new Tabbable("issuesTabs", tabs));
- }
-
- private class IssuesTab extends PageTab {
-
- public IssuesTab(String title, Class<? extends Page> pageClass) {
- super(Model.of(title), pageClass);
- }
-
- public IssuesTab(String title, Class<? extends Page> pageClass, Class<? extends Page> additionalPageClass1) {
- super(Model.of(title), pageClass, additionalPageClass1);
- }
-
- public IssuesTab(String title, Class<? extends Page> pageClass, Class<? extends Page> additionalPageClass1,
- Class<? extends Page> additionalPageClass2) {
- super(Model.of(title), pageClass, additionalPageClass1, additionalPageClass2);
- }
-
- public IssuesTab(String title, Class<? extends Page> pageClass, Class<? extends Page> additionalPageClass1,
- Class<? extends Page> additionalPageClass2, Class<? extends Page> additionalPageClass3) {
- super(Model.of(title), pageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);
- }
-
- @Override
- public Component render(String componentId) {
- return new PageTabHead(componentId, this) {
-
- @Override
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getProject()));
- }
-
- };
- }
-
}
@Override
@@ -119,10 +42,4 @@ public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIde
return new SiteAdministrator();
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectIssuesCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
index d758f5af0e..56de785d9e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
@@ -1,11 +1,13 @@
<wicket:panel>
- <div class="content">
- <div class="head clearfix">
- <span class="float-left">Backlog</span>
- <span wicket:id="count" class="float-left badge badge-secondary"></span>
- <a wicket:id="addCard" title="Add new card to this column" class="add-card float-right"><wicket:svg href="plus" class="icon"></wicket:svg></a>
- <a wicket:id="viewAsList" title="Show issues in list" class="view-list float-right"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
+ <div class="content d-flex flex-column flex-grow-1 overflow-hidden">
+ <div class="head d-flex align-items-center">
+ <span class="mr-2">Backlog</span>
+ <span wicket:id="count" class="badge badge-secondary badge-sm mr-2"></span>
+ <div class="ml-auto">
+ <a wicket:id="addCard" title="Add new card to this column" class="add-card"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <a wicket:id="viewAsList" title="Show issues in list" class="view-list ml-1"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
+ </div>
</div>
- <div wicket:id="body" class="body"></div>
+ <div wicket:id="body" class="body flex-grow-1 d-flex flex-column ps ps-scroll px-4 pt-4"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
index e8313b3f92..8343e66e29 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
@@ -12,7 +12,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.CallbackParameter;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Panel;
@@ -22,8 +22,8 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.model.Issue;
@@ -87,6 +87,11 @@ abstract class BacklogColumnPanel extends Panel {
add(new ModalLink("addCard") {
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
@Override
protected Component newContent(String id, ModalPanel modal) {
return new NewCardPanel(id) {
@@ -181,10 +186,10 @@ abstract class BacklogColumnPanel extends Panel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
CharSequence callback = ajaxBehavior.getCallbackFunction(CallbackParameter.explicit("issue"));
- String script = String.format("onedev.server.issueBoards.onColumnLoad('%s', %s);",
+ String script = String.format("onedev.server.issueBoards.onColumnDomReady('%s', %s);",
getMarkupId(), getQuery()!=null?callback:"undefined");
// Use OnLoad instead of OnDomReady as otherwise perfect scrollbar is not shown unless resized
- response.render(OnLoadHeaderItem.forScript(script));
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
index a0c659c5a7..009832c751 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
@@ -1,18 +1,18 @@
<wicket:panel>
- <div class="head clearfix">
+ <div class="head d-flex flex-wrap align-items-center mb-2">
<wicket:enclosure child="state">
- <div class="state float-left">
+ <div class="state mb-2 mr-2">
<span wicket:id="state"></span>
</div>
</wicket:enclosure>
- <div wicket:id="fields" class="field float-left"></div>
- <a wicket:id="detail" class="detail float-left" title="Click to show issue details"><wicket:svg href="detail" class="icon"/></a>
- <div class="float-right avatars">
- <a wicket:id="avatars" class="avatar"></a>
+ <div wicket:id="fields" class="field"></div>
+ <div class="avatars ml-auto">
+ <a wicket:id="avatars" class="avatar ml-2 mb-2"></a>
</div>
</div>
- <div class="body">
- <a wicket:id="number"></a>
- <span wicket:id="title"></span>
+ <div class="body font-weight-bold d-flex flex-wrap">
+ <a wicket:id="number" class="mr-2"></a>
+ <span wicket:id="title" class="mr-4"></span>
+ <a wicket:id="detail" class="ml-auto" title="Click to show issue details"><wicket:svg href="ellipsis" class="icon"/></a>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index dbe019caaa..cae7e6e5c0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -34,7 +34,7 @@ import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.component.user.UserAvatar;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
@@ -126,7 +126,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
protected String getModalCssClass() {
- return "modal-lg";
+ return "modal-xl";
}
private Component newCardDetail(String id, ModalPanel modal, IModel<Issue> issueModel, Cursor cursor) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
index e59b4d3237..3c33f14143 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
@@ -1,12 +1,14 @@
<wicket:panel>
- <div wicket:id="content" class="content">
- <div wicket:id="head" class="head clearfix">
- <a wicket:id="userIdent" class="float-left"></a>
- <span wicket:id="title" class="float-left"></span>
- <span wicket:id="count" class="badge badge-secondary float-left"></span>
- <a wicket:id="addCard" title="Add new card to this column" class="add-card float-right"><wicket:svg href="plus" class="icon"></wicket:svg></a>
- <a wicket:id="viewAsList" title="Show issues in list" class="show-list float-right"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
+ <div wicket:id="content" class="content d-flex flex-column flex-grow-1 overflow-hidden">
+ <div wicket:id="head" class="head d-flex flex-shrink-0 align-items-center">
+ <a wicket:id="userIdent" class="mr-2"></a>
+ <span wicket:id="title" class="mr-2"></span>
+ <span wicket:id="count" class="badge badge-secondary badge-sm mr-3"></span>
+ <div class="ml-auto">
+ <a wicket:id="addCard" title="Add new card to this column" class="add-card"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <a wicket:id="viewAsList" title="Show issues in list" class="show-list ml-1"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
+ </div>
</div>
- <div wicket:id="body" class="body"></div>
+ <div wicket:id="body" class="body flex-grow-1 ps ps-scroll px-4 pt-4"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index cd9d4c151b..adef750cec 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -17,7 +17,7 @@ import org.apache.wicket.ajax.attributes.CallbackParameter;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -29,8 +29,8 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.unbescape.html.HtmlEscape;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -185,10 +185,10 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
CharSequence callback = ajaxBehavior.getCallbackFunction(CallbackParameter.explicit("issue"));
- String script = String.format("onedev.server.issueBoards.onColumnLoad('%s', %s);",
+ String script = String.format("onedev.server.issueBoards.onColumnDomReady('%s', %s);",
getMarkupId(), getQuery()!=null?callback:"undefined");
// Use OnLoad instead of OnDomReady as otherwise perfect scrollbar is not shown unless resized
- response.render(OnLoadHeaderItem.forScript(script));
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
@Override
@@ -271,6 +271,11 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
head.add(new ModalLink("addCard") {
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
@Override
protected Component newContent(String id, ModalPanel modal) {
return new NewCardPanel(id) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
index bded7f1ba8..559f28e4fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
@@ -1,13 +1,14 @@
<wicket:panel>
<div class="board-card-detail">
- <div class="modal-header">
+ <div class="modal-header d-flex align-items-center">
<h5 wicket:id="title"></h5>
- <button wicket:id="close" type="button" class="close">&times</button>
+ <a wicket:id="moreInfoTrigger" class="more-info side-info flex-shrink-0 ml-auto mr-5" title="More info"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
- <div class="body">
- <div class="main">
+ <div class="modal-body d-flex position-relative overflow-hidden">
+ <div class="main flex-grow-1">
<div wicket:id="operations"></div>
- <ul wicket:id="tabs" class="tabs nav nav-tabs"></ul>
+ <ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>
<div wicket:id="tabContent"></div>
</div>
<div wicket:id="moreInfo"></div>
@@ -15,6 +16,6 @@
</div>
<wicket:fragment wicket:id="commitsFrag">
<div wicket:id="commits" class="commits"></div>
- <div class="help-block"><wicket:svg href="info-circle" class="icon"/> This page lists recent commits fixing the issue</div>
+ <div class="font-size-sm text-muted"><wicket:svg href="info-circle" class="icon"/> This page lists recent commits fixing the issue</div>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
index 7c3908121d..dbb501c0c0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
@@ -26,18 +26,22 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.inputspec.InputContext;
import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.search.entity.build.FixedIssueCriteria;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.component.build.list.BuildListPanel;
+import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;
import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;
import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;
import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;
import io.onedev.server.web.component.issue.side.IssueSidePanel;
import io.onedev.server.web.component.issue.title.IssueTitlePanel;
+import io.onedev.server.web.component.sideinfo.SideInfoLink;
import io.onedev.server.web.component.sideinfo.SideInfoPanel;
import io.onedev.server.web.component.tabbable.AjaxActionTab;
import io.onedev.server.web.component.tabbable.Tab;
@@ -80,7 +84,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
protected void onInitialize() {
super.onInitialize();
- add(new IssueTitlePanel("title", false) {
+ add(new IssueTitlePanel("title") {
@Override
protected Issue getIssue() {
@@ -89,6 +93,8 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
});
+ add(new SideInfoLink("moreInfoTrigger"));
+
add(new IssueOperationsPanel("operations") {
@Override
@@ -179,7 +185,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
add(new SideInfoPanel("moreInfo") {
@Override
- protected Component newContent(String componentId) {
+ protected Component newBody(String componentId) {
return new IssueSidePanel(componentId) {
@Override
@@ -187,14 +193,9 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
return CardDetailPanel.this.getIssue();
}
- @Override
- protected CursorSupport<Issue> getCursorSupport() {
- return CardDetailPanel.this.getCursorSupport();
- }
-
@Override
protected Component newDeleteLink(String componentId) {
- AjaxLink<Void> deleteLink = new AjaxLink<Void>(componentId) {
+ return new AjaxLink<Void>(componentId) {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
@@ -209,14 +210,42 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
}
};
- deleteLink.setVisible(SecurityUtils.canManageIssues(getIssue().getProject()));
- return deleteLink;
+ }
+
+ };
+ }
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new EntityNavPanel<Issue>(componentId) {
+
+ @Override
+ protected EntityQuery<Issue> parse(String queryString, boolean inProject) {
+ return IssueQuery.parse(inProject?getProject():null, queryString, true, true, false, false, false);
+ }
+
+ @Override
+ protected Issue getEntity() {
+ return getIssue();
+ }
+
+ @Override
+ protected List<Issue> query(EntityQuery<Issue> query, int offset, int count, boolean inProject) {
+ IssueManager issueManager = OneDev.getInstance(IssueManager.class);
+ return issueManager.query(inProject?getProject():null, query, offset, count, false);
+ }
+
+ @Override
+ protected CursorSupport<Issue> getCursorSupport() {
+ return CardDetailPanel.this.getCursorSupport();
}
};
+
}
});
+
add(activities = newActivitiesPanel());
add(new AjaxLink<Void>("close") {
@@ -279,7 +308,8 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
setOutputMarkupId(true);
}
-
+
+ @Override
public List<String> getInputNames() {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html
index 03af5a0373..689027ff0f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html
@@ -1,4 +1,4 @@
<wicket:panel>
<div wicket:id="feedback"></div>
- <div wicket:id="cards" class="card"></div>
+ <div wicket:id="cards" class="board-card mb-4 rounded p-3 bg-white"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
index d1ee4d6536..f934d8f70d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
@@ -79,7 +79,7 @@ abstract class CardListPanel extends Panel {
@Override
protected String getItemSelector() {
- return ">.card";
+ return ">.board-card";
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
index 040348e26b..033cd37aca 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
@@ -1,67 +1,70 @@
<wicket:extend>
- <div wicket:id="content" id="issue-boards"></div>
+ <div wicket:id="content" class="issue-boards flex-grow-1 d-flex flex-column"></div>
<wicket:fragment wicket:id="hasBoardsFrag">
- <div class="head">
+ <div class="head flex-shrink-0 bg-white rounded">
<form wicket:id="query" class="clearable-wrapper">
<div class="input-group">
<span class="input-group-prepend">
- <a wicket:id="board" title="Board" class="board-selector btn btn-outline-secondary">
- <wicket:svg href="split" class="icon"></wicket:svg>
+ <a wicket:id="board" title="Board" class="board-selector btn btn-outline-secondary btn-hover-primary">
+ <wicket:svg href="split" class="icon mr-2"></wicket:svg>
<span wicket:id="label"></span>
- <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>
+ <wicket:svg href="arrow" class="icon rotate-90 ml-1"></wicket:svg>
</a>
- <a wicket:id="backlog" class="backlog btn btn-outline-secondary"><wicket:svg href="inbox" class="icon"></wicket:svg> Backlog</a>
+ <a wicket:id="backlog" class="backlog btn btn-outline-secondary btn-hover-primary"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> Backlog</a>
<a wicket:id="milestone"></a>
</span>
<input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control">
<span class="input-group-append">
- <button wicket:id="submit" type="submit" class="btn btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
- <button wicket:id="orderBy" class="btn btn-outline-secondary" title="Order by"><wicket:svg href="sort" class="icon"></wicket:svg></button>
+ <button wicket:id="submit" type="submit" class="btn btn-icon btn-outline-secondary btn-hover-primary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ <button wicket:id="orderBy" class="btn btn-icon btn-outline-secondary btn-hover-primary" title="Order by"><wicket:svg href="sort" class="icon"></wicket:svg></button>
</span>
</div>
</form>
</div>
- <div wicket:id="body" class="body">
- <div wicket:id="feedback" class="feedback"></div>
- <div class="columns">
- <div wicket:id="columns" class="column"></div>
+ <div wicket:id="body" class="body flex-grow-1 d-flex flex-column">
+ <div wicket:id="feedback" class="feedback flex-shrink-0"></div>
+ <div class="columns flex-grow-1 d-flex mt-5 autofit ps ps-scroll pb-5">
+ <div wicket:id="columns" class="column d-flex flex-column overflow-hidden"></div>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="noBoardsFrag">
- <div class="alert alert-info no-boards">No issue boards defined
- <a wicket:id="newBoard"><wicket:svg href="plus" class="icon"></wicket:svg> Add New</a>
- <a wicket:id="useDefault"><wicket:svg href="undo" class="icon"></wicket:svg> Use Default</a>
+ <div class="alert alert-info no-boards">
+ <span class="mr-3">No issue boards defined</span>
+ <a wicket:id="newBoard" class="alert-link mr-3"><wicket:svg href="plus" class="icon mr-1"></wicket:svg>Add New</a>
+ <a wicket:id="useDefault" class="alert-link"><wicket:svg href="undo" class="icon mr-1"></wicket:svg>Use Default</a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="hasMilestoneFrag">
<a wicket:id="link" title="Milestone" class="milestone-selector btn">
- <wicket:svg href="milestone" class="icon"></wicket:svg>
+ <wicket:svg href="milestone" class="icon mr-2"></wicket:svg>
<span wicket:id="label"></span>
- <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>
+ <wicket:svg href="arrow" class="icon rotate-90 ml-1"></wicket:svg>
</a>
</wicket:fragment>
<wicket:fragment wicket:id="boardMenuFrag">
- <div class="board-menu">
+ <div class="board-menu p-4">
+ <div class="text-muted mb-3"><wicket:svg href="bulb" class="icon"/> The first board will be the primary board</div>
<table class="boards table">
<tr wicket:id="boards" class="board">
<td class="name">
<span wicket:id="dragIndicator" class="drag-indicator"><wicket:svg href="grip" class="icon"/></span>
<a wicket:id="select" class="select"><span wicket:id="name"></span></a>
+ <span wicket:id="primary" class="badge badge-sm badge-light-info ml-2">Primary</span>
</td>
- <td wicket:id="actions" class="actions">
- <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <td wicket:id="actions" class="actions text-right">
+ <a wicket:id="edit" title="Edit"><wicket:svg href="edit" class="icon mr-2"></wicket:svg></a>
<a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</td>
</tr>
</table>
- <a wicket:id="newBoard" class="btn btn-outline-secondary btn-sm btn-block new-board"><wicket:svg href="plus" class="icon"></wicket:svg> Add New Board</a>
- <a wicket:id="useDefault" class="btn btn-outline-secondary btn-sm btn-block use-global"><wicket:svg href="undo" class="icon"></wicket:svg> Use Default Boards</a>
+ <a wicket:id="newBoard" class="btn btn-outline-secondary btn-sm btn-block new-board"><wicket:svg href="plus" class="icon mr-2"></wicket:svg> Add New Board</a>
+ <a wicket:id="useDefault" class="btn btn-outline-secondary btn-sm btn-block use-global"><wicket:svg href="undo" class="icon mr-2"></wicket:svg> Use Default Boards</a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="milestoneMenuFrag">
- <div class="milestone-menu">
- <table class="milestones">
+ <div class="milestone-menu p-4">
+ <table class="milestones table">
<tr wicket:id="milestones" class="milestone">
<td class="name">
<a wicket:id="select"><span wicket:id="name"></span></a>
@@ -72,16 +75,16 @@
<td class="due-date">
<span wicket:id="dueDate"></span>
</td>
- <td wicket:id="actions" class="actions">
+ <td wicket:id="actions" class="actions text-right">
<a wicket:id="close" class="action">close</a>
- <a wicket:id="reopen" class="action">reopen</a>
- <a wicket:id="edit" class="action">edit</a>
- <a wicket:id="delete" class="action">delete</a>
+ <a wicket:id="reopen" class="action ml-2">reopen</a>
+ <a wicket:id="edit" class="action ml-2">edit</a>
+ <a wicket:id="delete" class="action ml-2">delete</a>
</td>
</tr>
</table>
- <a wicket:id="showClosed" class="show-closed btn btn-block btn-outline-secondary btn-sm"><wicket:svg href="arrow-double" class="icon rotate-90"></wicket:svg> Show Closed</a>
- <a wicket:id="newMilestone" class="new-milestone btn btn-block btn-outline-secondary btn-sm"><wicket:svg href="plus" class="icon"></wicket:svg> Add New Milestone</a>
+ <a wicket:id="showClosed" class="show-closed btn btn-block btn-outline-secondary btn-sm"><wicket:svg href="double-arrow" class="icon rotate-90 mr-2"></wicket:svg> Show Closed</a>
+ <a wicket:id="newMilestone" class="new-milestone btn btn-block btn-outline-secondary btn-sm"><wicket:svg href="plus" class="icon mr-2"></wicket:svg> Add New Milestone</a>
</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index 3a23726e3a..d936cc0947 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -22,7 +22,6 @@ import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.feedback.IFeedbackMessageFilter;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -40,8 +39,8 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Issue;
@@ -257,7 +256,6 @@ public class IssueBoardsPage extends ProjectIssuesPage {
pushState(target, url.toString(), queryInput.getModelObject());
target.add(body);
- target.appendJavaScript("$(window).resize();");
}
@Override
@@ -266,10 +264,9 @@ public class IssueBoardsPage extends ProjectIssuesPage {
if (getBoard() != null) {
contentFrag = new Fragment("content", "hasBoardsFrag", this);
-
+ contentFrag.add(AttributeAppender.append("class", "mb-n5"));
+
Form<?> form = new Form<Void>("query");
- if (!SecurityUtils.canManageIssues(getProject()))
- form.add(AttributeAppender.append("style", "margin-right: 0;"));
form.add(new DropdownLink("board") {
@@ -314,6 +311,8 @@ public class IssueBoardsPage extends ProjectIssuesPage {
Link<Void> link = new BookmarkablePageLink<Void>("select", IssueBoardsPage.class, params);
link.add(new Label("name", item.getModelObject().getName()));
item.add(link);
+
+ item.add(new WebMarkupContainer("primary").setVisible(item.getIndex() == 0));
WebMarkupContainer actions = new WebMarkupContainer("actions") {
@@ -446,7 +445,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
add(AttributeAppender.append("class", "btn-danger"));
add(AttributeAppender.replace("title", "Milestone is due"));
} else {
- add(AttributeAppender.append("class", "btn-outline-secondary"));
+ add(AttributeAppender.append("class", "btn-outline-secondary btn-hover-primary"));
}
}
@@ -613,11 +612,11 @@ public class IssueBoardsPage extends ProjectIssuesPage {
@Override
public IModel<?> getBody() {
- return Model.of(String.format("<svg class='icon'><use xlink:href='%s'/></svg> Add Milestone",
+ return Model.of(String.format("<svg class='icon mr-2'><use xlink:href='%s'/></svg>Add Milestone",
SpriteImage.getVersionedHref(IconScope.class, "plus")));
}
- }.setEscapeModelStrings(false).add(AttributeAppender.append("class", "btn btn-outline-secondary")));
+ }.setEscapeModelStrings(false).add(AttributeAppender.append("class", "btn btn-outline-secondary btn-hover-primary")));
} else {
form.add(new WebMarkupContainer("milestone").setVisible(false));
}
@@ -712,12 +711,8 @@ public class IssueBoardsPage extends ProjectIssuesPage {
if (backlog) {
backlogQueryString = query.toString();
- if (backlogQueryString.length() == 0)
- backlogQueryString = null;
} else {
queryString = query.toString();
- if (queryString.length() == 0)
- queryString = null;
}
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
@@ -743,15 +738,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
contentFrag.add(form);
- body = new WebMarkupContainer("body") {
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.issueBoards.onBodyDomReady();"));
- }
-
- };
+ body = new WebMarkupContainer("body");
body.setOutputMarkupId(true);
body.add(new FencedFeedbackPanel("feedback", contentFrag));
contentFrag.add(body);
@@ -841,7 +828,6 @@ public class IssueBoardsPage extends ProjectIssuesPage {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new IssueBoardsResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.issueBoards.onDomReady();"));
}
@Override
@@ -855,7 +841,6 @@ public class IssueBoardsPage extends ProjectIssuesPage {
}
target.add(contentFrag);
- target.appendJavaScript("$(window).resize();");
}
public static PageParameters paramsOf(Project project, @Nullable BoardSpec board,
@@ -980,7 +965,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
return new BoardEditPanel(id, boards, boardIndex) {
@Override
- protected void onBoardSaved(AjaxRequestTarget target, BoardSpec board) {
+ protected void onSave(AjaxRequestTarget target, BoardSpec board) {
getProject().getIssueSetting().setBoardSpecs(boards);
OneDev.getInstance(ProjectManager.class).save(getProject());
setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(
@@ -1013,4 +998,10 @@ public class IssueBoardsPage extends ProjectIssuesPage {
}
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Issue Boards");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsResourceReference.java
index 57c1c1c02e..8511e28234 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsResourceReference.java
@@ -7,7 +7,6 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
-import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -22,7 +21,6 @@ public class IssueBoardsResourceReference extends BaseDependentResourceReference
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
IssueBoardsResourceReference.class, "issue-boards.css")));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.html
index 6daffa00bf..34b41c8ba6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="leave-confirm milestone-edit">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Edit Milestone</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.html
index 75f23355f1..8537841b19 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="leave-confirm new-board">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">New Board</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.html
index 96d6d914a2..1ee2747fc7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="new-board-card leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">New Issue</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.html
index fe9eb405b8..7163efed40 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="leave-confirm new-milestone">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">New Milestone</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.html
index 0ec14ba5b3..a559ea28d3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="board-state-transition">
<div class="modal-header">
<h5 id="modal-title" class="modal-title"><span wicket:id="state"></span></h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
index 4530f2ebcf..6e66e6324c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
@@ -1,221 +1,59 @@
-/* Make sure we have enough room for query input in mobile devices */
-.IssueBoardsPage {
- min-width: 570px;
-}
-#issue-boards>.head {
- margin-bottom: 20px;
-}
-#issue-boards .no-boards {
- font-size: 16px;
-}
-#issue-boards .no-boards a {
- margin-left: 12px;
-}
-
-.board-menu {
- padding: 20px;
+.issue-boards>.body>.feedback>.feedbackPanel {
+ margin-bottom: 0;
}
-.milestone-menu {
- padding: 8px 12px;
+.issue-boards>.body>.columns>.column {
+ flex: 1;
}
-.board-menu table {
+.issue-boards>.body>.feedback>.feedbackPanel {
margin-bottom: 0;
+ margin-top: 1rem;
}
-.board-menu table td, .milestone-menu table td {
- padding: 4px 0;
- white-space: nowrap;
+.issue-boards>.body>.columns>.column>.content {
+ border: 1px solid var(--secondary);
+ border-radius: 0.42rem;
+ background: white;
}
-.board-menu table td.actions, .milestone-menu table td.actions,
-.milestone-menu table td.status, .milestone-menu table td.due-date {
- padding-left: 12px;
+.issue-boards>.body>.columns>.column>.content>.head {
+ font-weight: 600;
+ padding: 0.5rem 1rem;
+ font-size: 1.1rem;
+ border-bottom: 1px solid var(--light-gray);
+ border-top: 3px solid var(--secondary);
}
-
-.administrative .board-menu, .administrative .milestone-menu {
+.issue-boards>.body>.columns>.column {
+ margin-left: 2rem;
min-width: 300px;
- padding: 20px;
-}
-
-.board-menu>a, .milestone-menu>a {
- margin-top: 10px !important;
-}
-.milestone-menu .actions a {
- color: #1f3b7b;
-}
-
-#issue-boards>.body>.columns {
- position: relative;
- margin: 0 -20px;
- /* hack to makes all column of same width and same space */
- padding: 0 0 20px 20px;
- display: flex;
}
-#issue-boards>.body>.columns>.column {
- flex: 1 1 0;
- min-width: 360px;
- height: 100%;
- /* hack to makes all column of same width and same space */
- padding-right: 20px;
+.issue-boards>.body>.columns .column:first-child {
+ margin-left: 0;
}
-#issue-boards>.body>.columns>.column>.content {
- border: 1px solid #E0E0E0;
- border-radius: 4px;
- height: 100%;
- display: flex;
- flex-direction: column;
- background: #F9F9F9;
-}
-#issue-boards>.body>.columns>.column>.content>.head {
- font-weight: bold;
- padding: 6px 12px;
- font-size: 15px;
- border-bottom: 1px solid #E0E0E0;
- border-top: 3px solid #E0E0E0;
-}
-#issue-boards>.body>.columns>.column>.content>.head .badge {
- margin-left: 8px;
- margin-top: 3px;
-}
-#issue-boards>.body>.columns>.column>.content>.head a {
- color: #666;
- margin-left: 8px;
-}
-
-#issue-boards>.body>.columns>.column>.content>.body {
- position: relative;
- padding: 16px 16px 0 16px;
- height: 100%;
- overflow: auto;
-}
-#issue-boards>.body>.columns>.column>.content>.body.issue-droppable.ui-droppable-active {
+.issue-boards>.body>.columns>.column>.content>.body.issue-droppable.ui-droppable-active {
background: #FDF2C5;
}
-#issue-boards>.body>.columns>.column>.content>.body.issue-droppable.ui-droppable-hover {
+.issue-boards>.body>.columns>.column>.content>.body.issue-droppable.ui-droppable-hover {
background: #FAE280;
-}
-#issue-boards>.body>.columns>.column>.content>.body>.loading-indicator {
- margin-top: 8px;
}
-#issue-boards>.body>.columns>.column>.content>.body>.card {
- margin-bottom: 16px;
-}
-#issue-boards>.body .card {
- border-radius: 4px;
- padding: 8px;
- background: white;
- position: relative;
- box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
-}
-#issue-boards>.body .card.issue-dragging {
- visibility: hidden;
-}
-#issue-boards>.body .card.ui-draggable-dragging {
- box-shadow: 2px 2px 6px 2px rgba(0, 0, 0, 0.3);
- border-width: 1px;
- font-weight: normal;
- white-space: normal;
+.floating>.content>.milestone-menu>table>tbody>tr:first-child>td {
+ border-top: none;
}
-#issue-boards>.body .card {
- font-size: 13px;
-}
-#issue-boards>.body .card .head>* {
- margin: 0 8px 8px 0;
-}
-#issue-boards>.body .card .head .issue-state {
- font-size: 11px;
-}
-#issue-boards>.body .card .head .field-values .value span {
- background: #EEE;
- padding: .2em .6em .3em;
- border-radius: .25em;
- font-size: 11px;
- line-height: 1;
- white-space: nowrap;
- vertical-align: baseline;
-}
-
-#issue-boards>.body .card .head>.avatars {
- margin-right: 0;
-}
-#issue-boards>.body .card .avatars>.avatar {
- margin-right: 6px;
-}
-#issue-boards>.body .card .avatars>.avatar:last-child {
- margin-right: 0;
-}
-#issue-boards>.body .card a {
- color: #666;
-}
-#issue-boards>.body .card .field-values>.value:last-child {
- margin-right: 0;
-}
-#issue-boards>.body .card .field-values>.value {
- display: inline-block;
- margin-right: 8px;
-}
-#issue-boards>.body .card .field-values>.value:last-child {
- margin-right: 0;
-}
-#issue-boards>.body .card .state,
-#issue-boards>.body .card .field-values,
-#issue-boards>.body .card .field-values a {
- font-size: 12px;
-}
-#issue-boards>.body>.columns>.column>.content>.body .loading-indicator {
- margin-bottom: 16px;
-}
-#issue-boards>.body .card .detail {
- color: #666;
- text-decoration: none;
-}
-#issue-boards>.body .card .detail svg {
- width: 16px;
- height: 16px;
-}
-.board-card-detail>.modal-header {
- padding-right: 30px;
- position: relative;
-}
-.board-card-detail>.modal-header>.close {
- position: absolute;
- right: 10px;
- top: 20px;
-}
-.board-card-detail>.body {
+.issue-boards>.body .board-card {
+ box-shadow: 0px 0px 3px 1px rgba(0, 0, 0, 0.15);
position: relative;
- min-height: 600px;
}
-.board-card-detail>.body>.main {
- padding: 20px;
-}
-.board-card-detail>.body>.main>div {
- margin-bottom: 20px;
-}
-.board-card-detail>.body>.main>div:last-child {
- margin-bottom: 0;
-}
-.board-card-detail>.body>.main .commits {
- margin-bottom: 20px;
+.issue-boards>.body .board-card.issue-dragging {
+ visibility: hidden;
}
-.board-card-detail>.body>.side-info {
- position: absolute;
- top: 0;
- width: 320px;
- border-radius: 0 0 4px 0;
+.issue-boards>.body .board-card.ui-draggable-dragging {
+ box-shadow: 0px 0px 6px 2px rgba(0, 0, 0, 0.3);
}
-.board-card-detail>.body .issue-side>.nav {
- padding-right: 20px;
- border-right: 1px solid #D8D8D8;
- margin-right: 30px;
- display: block;
+
+.board-card-detail .modal-header h5 {
+ width: 100%;
+ margin-right: 36px;
}
-@media (max-width: 992px) {
- .board-card-detail>.body>.main {
- margin-right: 0;
- }
- .board-card-detail>.body>.side {
- display: none;
- }
+.board-card-detail .issue-operations .new-issue {
+ display: none;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js
index 87f999983e..68124a51df 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js
@@ -1,39 +1,11 @@
onedev.server.issueBoards = {
- onDomReady: function() {
- $("body").css("overflow-y", "hidden");
- },
- onBodyDomReady: function() {
- var $columns = $("#issue-boards>.body>.columns");
- if ($columns.length != 0) {
- // Do not use perfect scroll on Device as it may cause scroll issue
- if (onedev.server.util.isDevice()) {
- $columns.addClass("resize-aware").on("resized", function() {
- $columns.outerHeight($(window).height()-$columns.offset().top);
- });
- } else {
- var ps = new PerfectScrollbar($columns[0]);
- $columns.addClass("resize-aware").on("resized", function() {
- $columns.outerHeight($(window).height()-$columns.offset().top);
- ps.update();
- });
- }
- }
- },
- onColumnLoad: function(containerId, callback) {
+ onColumnDomReady: function(containerId, callback) {
var $body = $("#" + containerId);
-
- // Do not use perfect scroll on Device as it may cause scroll issue
- if (!onedev.server.util.isDevice()) {
- var ps = new PerfectScrollbar($body[0]);
- $body.addClass("resize-aware").on("resized", function() {
- ps.update();
- });
- }
if (callback) {
$body.droppable({
accept: function($draggable) {
- return $draggable.is("#issue-boards .card") && !$draggable.is("#"+containerId + " .card");
+ return $draggable.is(".issue-boards .board-card") && !$draggable.is("#"+containerId + " .board-card");
},
drop: function(event, ui) {
if ($body.hasClass("issue-droppable")) {
@@ -48,7 +20,6 @@ onedev.server.issueBoards = {
},
onCardDomReady: function(cardId, callback) {
var $card = $("#" + cardId);
- var $body = $card.closest(".body");
var $container = $card.closest(".columns");
var containerContentWidth;
if (callback) {
@@ -105,13 +76,13 @@ onedev.server.issueBoards = {
onedev.server.ajaxRequests.count--;
}
$card.removeData("droppedTo");
- $("#issue-boards .body .body").removeClass("issue-droppable");
+ $(".issue-boards .body .body").removeClass("issue-droppable");
}
});
}
},
markAccepted: function(issueId, accepted) {
- var $card = $("#issue-boards .column .body .ui-draggable.issue-dragging[data-issue='" + issueId + "']");
+ var $card = $(".issue-boards .column .body .ui-draggable.issue-dragging[data-issue='" + issueId + "']");
$card.data("accepted", accepted);
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html
index 0142c2db84..4509e59821 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html
@@ -1,10 +1,13 @@
<wicket:extend>
- <div wicket:id="workflowChangeAlert"></div>
- <div class="page-title">New Issue</div>
- <div id="new-issue">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="newIssue"></div>
- <button type="submit" class="btn btn-primary dirty-aware">Save</button>
- </form>
+ <div class="p-5">
+ <div wicket:id="workflowChangeAlert" class="mb-5"></div>
+ <div class="card">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="newIssue"></div>
+ <button type="submit" class="btn btn-primary dirty-aware">Save</button>
+ </form>
+ </div>
+ </div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index 04ee5a3d5d..6fa06bed06 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -2,8 +2,10 @@ package io.onedev.server.web.page.project.issues.create;
import java.util.List;
+import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -27,7 +29,7 @@ import io.onedev.server.web.component.issue.create.NewIssueEditor;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
-import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.page.simple.security.LoginPage;
@SuppressWarnings("serial")
public class NewIssuePage extends ProjectPage implements InputContext, ScriptIdentityAware {
@@ -131,5 +133,10 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIde
params.add(PARAM_TEMPLATE, template);
return params;
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "<span class='text-nowrap'>Create Issue</span>").setEscapeModelStrings(false);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
index eb55d232ab..2d6dd75d9d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
@@ -1,12 +1,21 @@
<wicket:extend>
- <div id="issue-detail">
- <div class="main">
- <div wicket:id="workflowChangeAlert"></div>
- <div wicket:id="title"></div>
- <div wicket:id="operations"></div>
- <ul wicket:id="issueTabs" class="tabs nav nav-tabs"></ul>
- <wicket:child></wicket:child>
+ <div class="card position-relative overflow-hidden issue-detail">
+ <div class="card-header d-flex align-items-center flex-nowrap">
+ <div wicket:id="title" class="card-title flex-grow-1 mx-0"></div>
+ <a wicket:id="moreInfo" class="more-info side-info flex-shrink-0" title="More info"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>
+ </div>
+ <div class="card-body d-flex position-relative overflow-hidden">
+ <div class="main flex-grow-1">
+ <div wicket:id="operations"></div>
+ <ul wicket:id="issueTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>
+ <wicket:child></wicket:child>
+ </div>
+ <div wicket:id="side"></div>
</div>
- <div wicket:id="moreInfo"></div>
</div>
+ <wicket:fragment wicket:id="projectTitleFrag">
+ <a wicket:id="issues">Issues</a>
+ <span class="dot"></span>
+ <span wicket:id="issueNumber"></span>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index 5cd07518e7..f492eddf4c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -11,10 +11,10 @@ import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
@@ -32,30 +32,31 @@ import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.inputspec.InputContext;
import io.onedev.server.model.support.issue.fieldspec.FieldSpec;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScopedNumber;
-import io.onedev.server.util.script.identity.ScriptIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentityAware;
-import io.onedev.server.util.script.identity.SiteAdministrator;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;
import io.onedev.server.web.component.issue.side.IssueSidePanel;
import io.onedev.server.web.component.issue.title.IssueTitlePanel;
-import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.sideinfo.SideInfoLink;
import io.onedev.server.web.component.sideinfo.SideInfoPanel;
import io.onedev.server.web.component.tabbable.PageTab;
import io.onedev.server.web.component.tabbable.PageTabHead;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.util.ConfirmClickModifier;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
@SuppressWarnings("serial")
-public abstract class IssueDetailPage extends ProjectPage implements InputContext, ScriptIdentityAware {
+public abstract class IssueDetailPage extends ProjectIssuesPage implements InputContext {
public static final String PARAM_ISSUE = "issue";
@@ -93,15 +94,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
protected void onInitialize() {
super.onInitialize();
- add(new WorkflowChangeAlertPanel("workflowChangeAlert") {
-
- @Override
- protected void onCompleted(AjaxRequestTarget target) {
- setResponsePage(getPageClass(), getPageParameters());
- }
-
- });
- add(new IssueTitlePanel("title", true) {
+ add(new IssueTitlePanel("title") {
@Override
protected Issue getIssue() {
@@ -110,6 +103,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
});
+ add(new SideInfoLink("moreInfo"));
+
add(new IssueOperationsPanel("operations") {
@Override
@@ -142,10 +137,10 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
add(new Tabbable("issueTabs", tabs).setOutputMarkupId(true));
- add(new SideInfoPanel("moreInfo") {
+ add(new SideInfoPanel("side") {
@Override
- protected Component newContent(String componentId) {
+ protected Component newBody(String componentId) {
return new IssueSidePanel(componentId) {
@Override
@@ -153,27 +148,9 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
return IssueDetailPage.this.getIssue();
}
- @Override
- protected CursorSupport<Issue> getCursorSupport() {
- return new CursorSupport<Issue>() {
-
- @Override
- public Cursor getCursor() {
- return WebSession.get().getIssueCursor();
- }
-
- @Override
- public void navTo(AjaxRequestTarget target, Issue entity, Cursor cursor) {
- WebSession.get().setIssueCursor(cursor);
- setResponsePage(getPageClass(), paramsOf(entity));
- }
-
- };
- }
-
@Override
protected Component newDeleteLink(String componentId) {
- Link<Void> deleteLink = new Link<Void>(componentId) {
+ return new Link<Void>(componentId) {
@Override
public void onClick() {
@@ -187,10 +164,48 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
setResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(getProject()));
}
+ }.add(new ConfirmClickModifier("Do you really want to delete this issue?"));
+ }
+
+ };
+ }
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new EntityNavPanel<Issue>(componentId) {
+
+ @Override
+ protected EntityQuery<Issue> parse(String queryString, boolean inProject) {
+ return IssueQuery.parse(inProject?getProject():null, queryString, true, true, false, false, false);
+ }
+
+ @Override
+ protected Issue getEntity() {
+ return getIssue();
+ }
+
+ @Override
+ protected List<Issue> query(EntityQuery<Issue> query, int offset, int count, boolean inProject) {
+ IssueManager issueManager = OneDev.getInstance(IssueManager.class);
+ return issueManager.query(inProject?getProject():null, query, offset, count, false);
+ }
+
+ @Override
+ protected CursorSupport<Issue> getCursorSupport() {
+ return new CursorSupport<Issue>() {
+
+ @Override
+ public Cursor getCursor() {
+ return WebSession.get().getIssueCursor();
+ }
+
+ @Override
+ public void navTo(AjaxRequestTarget target, Issue entity, Cursor cursor) {
+ WebSession.get().setIssueCursor(cursor);
+ setResponsePage(getPageClass(), paramsOf(entity));
+ }
+
};
- deleteLink.add(new ConfirmClickModifier("Do you really want to delete this issue?"));
- deleteLink.setVisible(SecurityUtils.canManageIssues(getIssue().getProject()));
- return deleteLink;
}
};
@@ -243,13 +258,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new IssueDetailResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.issueDetail.onDomReady();"));
- }
-
@Override
protected void onDetach() {
issueModel.detach();
@@ -275,11 +283,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
public FieldSpec getInputSpec(String inputName) {
return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(inputName);
}
-
- @Override
- public ScriptIdentity getScriptIdentity() {
- return new SiteAdministrator();
- }
private class IssueTab extends PageTab {
@@ -301,4 +304,13 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("issues", ProjectIssueListPage.class,
+ ProjectIssueListPage.paramsOf(getProject())));
+ fragment.add(new Label("issueNumber", "#" + getIssue().getNumber()));
+ return fragment;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
deleted file mode 100644
index 6083b768e9..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
+++ /dev/null
@@ -1,37 +0,0 @@
-body.IssueDetailPage #layout>.body {
- padding: 59px 0 0 0;
-}
-#issue-detail>.main {
- overflow: auto;
- position: relative;
- padding: 20px;
-}
-#issue-detail>.main>div {
- margin-bottom: 20px;
-}
-#issue-detail .issue-side>.nav {
- padding-right: 20px;
- border-right: 1px solid #D8D8D8;
- margin-right: 30px;
- display: block;
-}
-
-@media(min-width: 1150px) {
- #issue-detail>.main {
- margin-right: 360px;
- }
- #issue-detail .side-info {
- box-shadow: none;
- border-left-width: 4px;
- border-color: #EEE;
- display: block !important;
- }
- #issue-detail .issue-operations a.more-info, #issue-detail .side-info>a.close {
- display: none !important;
- }
- #issue-detail .issue-side .nav {
- padding-right: 0;
- border-right: none;
- margin-right: 0;
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js
deleted file mode 100644
index 4b7faf0dee..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js
+++ /dev/null
@@ -1,11 +0,0 @@
-onedev.server.issueDetail = {
- onDomReady: function() {
- $("body").css("overflow", "hidden");
- var $main = $("#issue-detail>.main");
- function adjustHeight() {
- $main.outerHeight($(window).height() - $main.offset().top);
- }
- adjustHeight();
- $main.addClass("resize-aware").on("resized", adjustHeight);
- }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html
index 0d13ff952a..fa3293054d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div id="issue-list" class="query-save-support">
- <div wicket:id="side" class="side"></div>
- <div wicket:id="main" class="main"></div>
+ <div class="side-main side-main-wrap">
+ <div wicket:id="savedQueries" class="side"></div>
+ <div wicket:id="issues" class="main"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
index c06b1b3f3f..2c3c9eead6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
@@ -58,7 +59,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
protected void onInitialize() {
super.onInitialize();
- add(savedQueries = new SavedQueriesPanel<NamedIssueQuery>("side") {
+ add(savedQueries = new SavedQueriesPanel<NamedIssueQuery>("savedQueries") {
@Override
protected NamedQueriesBean<NamedIssueQuery> newNamedQueriesBean() {
@@ -99,7 +100,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
});
- add(issueList = new IssueListPanel("main", new IModel<String>() {
+ add(issueList = new IssueListPanel("issues", new IModel<String>() {
@Override
public void detach() {
@@ -239,5 +240,10 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
}
return paramsOf(project, query, page);
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Issues");
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html
index 0834ab5b2a..d1e537bf33 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
- <span class="actions">
- <a wicket:id="reopen" title="Reopen this milestone">reopen</a>
- <a wicket:id="close" title="Close this milestone">close</a>
- <a wicket:id="edit" title="Edit this milestone">edit</a>
- <a wicket:id="delete" title="Delete this milestone">delete</a>
- <a wicket:id="create" title="Create new milestone">create</a>
+ <span class="actions btn-group">
+ <a wicket:id="reopen" title="Reopen this milestone" class="btn btn-light btn-sm">reopen</a>
+ <a wicket:id="close" title="Close this milestone" class="btn btn-light btn-sm">close</a>
+ <a wicket:id="edit" title="Edit this milestone" class="btn btn-light btn-sm">edit</a>
+ <a wicket:id="delete" title="Delete this milestone" class="btn btn-light btn-sm">delete</a>
+ <a wicket:id="create" title="Create new milestone" class="btn btn-light btn-sm">create</a>
</span>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html
index 2e20998dc0..3e40188e3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html
@@ -1,13 +1,22 @@
<wicket:extend>
- <div id="milestone-detail">
- <h4 class="title clearfix">
- <div wicket:id="name" class="name float-left"></div>
- <div wicket:id="status" class="status float-left"></div>
- <div wicket:id="due" class="due float-left"></div>
- <div wicket:id="issueStats" class="issue-stats float-left"></div>
- <div wicket:id="actions" class="actions float-left"></div>
- </h4>
- <div wicket:id="description" class="description"></div>
+ <div class="p-5">
+ <div class="card mb-5">
+ <div class="card-body">
+ <div class="d-flex align-items-center flex-wrap">
+ <div wicket:id="name" class="name mr-4 mb-4 font-weight-bold font-size-h6"></div>
+ <div wicket:id="status" class="status mr-4 mb-4"></div>
+ <div wicket:id="due" class="due mr-4 mb-4"></div>
+ <div wicket:id="actions" class="actions mb-4"></div>
+ </div>
+ <div wicket:id="issueStats" class="issue-stats"></div>
+ <div wicket:id="description" class="mt-4"></div>
+ </div>
+ </div>
<div wicket:id="issues" class="issues"></div>
</div>
+ <wicket:fragment wicket:id="projectTitleFrag">
+ <a wicket:id="milestones">Milestones</a>
+ <span class="dot"></span>
+ <span wicket:id="milestoneName" class="text-truncated"></span>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
index 7394341433..aed5614eaf 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
@@ -7,12 +7,13 @@ import java.util.Map;
import javax.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -27,6 +28,9 @@ import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.MilestoneCriteria;
import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.script.identity.ScriptIdentity;
+import io.onedev.server.util.script.identity.ScriptIdentityAware;
+import io.onedev.server.util.script.identity.SiteAdministrator;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.issue.list.IssueListPanel;
@@ -34,11 +38,11 @@ import io.onedev.server.web.component.issue.statestats.StateStatsBar;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.milestone.MilestoneDueLabel;
import io.onedev.server.web.component.milestone.MilestoneStatusLabel;
-import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
+import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.PagingHistorySupport;
@SuppressWarnings("serial")
-public class MilestoneDetailPage extends ProjectIssuesPage {
+public class MilestoneDetailPage extends ProjectPage implements ScriptIdentityAware {
private static final String PARAM_MILESTONE = "milestone";
@@ -207,11 +211,10 @@ public class MilestoneDetailPage extends ProjectIssuesPage {
}
@Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MilestonesResourceReference()));
+ public ScriptIdentity getScriptIdentity() {
+ return new SiteAdministrator();
}
-
+
public static PageParameters paramsOf(Milestone milestone, @Nullable String query) {
PageParameters params = paramsOf(milestone.getProject());
params.add(PARAM_MILESTONE, milestone.getId());
@@ -219,5 +222,14 @@ public class MilestoneDetailPage extends ProjectIssuesPage {
params.add(PARAM_QUERY, query);
return params;
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("milestones", MilestoneListPage.class,
+ MilestoneListPage.paramsOf(getProject())));
+ fragment.add(new Label("milestoneName", getMilestone().getName()));
+ return fragment;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.html
index 64f9cb0a2b..68a4aff03e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.html
@@ -1,11 +1,19 @@
<wicket:extend>
- <div id="milestone-edit">
- <div class="head"><h4>Edit Milestone</h4></div>
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions">
- <input type="submit" value="Ok" class="btn btn-primary dirty-aware"></input>
- </div>
- </form>
+ <div class="card m-5">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor"></div>
+ <div class="actions">
+ <input type="submit" value="Ok" class="btn btn-primary dirty-aware"></input>
+ </div>
+ </form>
+ </div>
</div>
+ <wicket:fragment wicket:id="projectTitleFrag">
+ <a wicket:id="milestones">Milestones</a>
+ <span class="dot"></span>
+ <a wicket:id="milestone"><span wicket:id="name" class="text-truncated"></span></a>
+ <span class="dot"></span>
+ Edit
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
index 92ff69b60a..8d00bd0f36 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
@@ -1,9 +1,12 @@
package io.onedev.server.web.page.project.issues.milestones;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -16,10 +19,10 @@ import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
-import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
+import io.onedev.server.web.page.project.ProjectPage;
@SuppressWarnings("serial")
-public class MilestoneEditPage extends ProjectIssuesPage {
+public class MilestoneEditPage extends ProjectPage {
private static final String PARAM_MILESTONE = "milestone";
@@ -39,11 +42,15 @@ public class MilestoneEditPage extends ProjectIssuesPage {
};
}
+ private Milestone getMilestone() {
+ return milestoneModel.getObject();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
- Milestone milestone = milestoneModel.getObject();
+ Milestone milestone = getMilestone();
BeanEditor editor = BeanContext.edit("editor", milestone);
Form<?> form = new Form<Void>("form") {
@@ -58,10 +65,10 @@ public class MilestoneEditPage extends ProjectIssuesPage {
"This name has already been used by another milestone in the project");
}
if (editor.isValid()){
- editor.getDescriptor().copyProperties(milestone, milestoneModel.getObject());
- milestoneManager.save(milestoneModel.getObject());
+ editor.getDescriptor().copyProperties(milestone, getMilestone());
+ milestoneManager.save(getMilestone());
Session.get().success("Milestone saved");
- setResponsePage(MilestoneDetailPage.class, MilestoneDetailPage.paramsOf(milestoneModel.getObject(), null));
+ setResponsePage(MilestoneDetailPage.class, MilestoneDetailPage.paramsOf(getMilestone(), null));
}
}
@@ -77,12 +84,6 @@ public class MilestoneEditPage extends ProjectIssuesPage {
super.onDetach();
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MilestonesResourceReference()));
- }
-
public static PageParameters paramsOf(Milestone milestone) {
PageParameters params = paramsOf(milestone.getProject());
params.add(PARAM_MILESTONE, milestone.getId());
@@ -93,5 +94,17 @@ public class MilestoneEditPage extends ProjectIssuesPage {
protected boolean isPermitted() {
return SecurityUtils.canManageIssues(getProject());
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("milestones", MilestoneListPage.class,
+ MilestoneListPage.paramsOf(getProject())));
+ Link<Void> link = new BookmarkablePageLink<Void>("milestone", MilestoneDetailPage.class,
+ MilestoneDetailPage.paramsOf(getMilestone(), null));
+ link.add(new Label("name", getMilestone().getName()));
+ fragment.add(link);
+ return fragment;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html
index 4a24d23abc..9de849b833 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html
@@ -1,20 +1,16 @@
<wicket:extend>
- <div id="milestone-list">
- <div class="head clearfix">
- <div class="float-left">
- <span class="btn-group">
+ <div class="card m-5 milestone-list">
+ <div class="card-body">
+ <div class="d-flex align-items-center flex-wrap">
+ <span class="btn-group mr-4 mb-4">
<a wicket:id="open" class="btn btn-outline-secondary">Open</a>
<a wicket:id="closed" class="btn btn-outline-secondary">Closed</a>
</span>
+ <div class="mr-4 mb-4">
+ <a wicket:id="sort" class="btn btn-outline-secondary">Sort <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>
+ </div>
+ <a wicket:id="newMilestone" class="btn btn-primary btn-icon mb-4"><wicket:svg href="plus" class="icon mr-1"></wicket:svg></a>
</div>
- <div class="float-left">
- <a wicket:id="sort" class="btn btn-outline-secondary">Sort <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>
- </div>
- <div class="float-right">
- <a wicket:id="newMilestone" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> New</a>
- </div>
- </div>
- <div class="body">
<table wicket:id="milestones" class="table"></table>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
index e794780f0f..ffcfe2d1ec 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
@@ -17,8 +17,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColu
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -54,12 +52,12 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.milestone.MilestoneDueLabel;
-import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
+import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
import io.onedev.server.web.util.PagingHistorySupport;
@SuppressWarnings("serial")
-public class MilestoneListPage extends ProjectIssuesPage {
+public class MilestoneListPage extends ProjectPage {
private static final String PARAM_STATE = "state";
@@ -183,7 +181,7 @@ public class MilestoneListPage extends ProjectIssuesPage {
@Override
public String getCssClass() {
- return "name";
+ return "name align-middle";
}
@Override
@@ -213,7 +211,7 @@ public class MilestoneListPage extends ProjectIssuesPage {
@Override
public String getCssClass() {
- return "due-date";
+ return "due-date d-none d-lg-table-cell align-middle";
}
@Override
@@ -228,7 +226,7 @@ public class MilestoneListPage extends ProjectIssuesPage {
@Override
public String getCssClass() {
- return "issue-stats";
+ return "issue-stats align-middle";
}
@Override
@@ -284,7 +282,7 @@ public class MilestoneListPage extends ProjectIssuesPage {
@Override
public String getCssClass() {
- return "expanded actions";
+ return "d-none d-lg-table-cell actions align-middle";
}
@Override
@@ -363,12 +361,6 @@ public class MilestoneListPage extends ProjectIssuesPage {
super.onDetach();
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MilestonesResourceReference()));
- }
-
public static PageParameters paramsOf(Project project, boolean closed, @Nullable MilestoneSort sort) {
PageParameters params = paramsOf(project);
if (closed)
@@ -380,5 +372,10 @@ public class MilestoneListPage extends ProjectIssuesPage {
params.add(PARAM_SORT, sort.name().toLowerCase());
return params;
}
-
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Milestones");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestonesResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestonesResourceReference.java
deleted file mode 100644
index 191201e910..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestonesResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.issues.milestones;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class MilestonesResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public MilestonesResourceReference() {
- super(MilestonesResourceReference.class, "milestones.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.html
index 2898a0b6e4..719ce5dce2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.html
@@ -1,7 +1,6 @@
<wicket:extend>
- <div id="new-milestone">
- <div class="head"><h4>New Milestone</h4></div>
- <div class="body">
+ <div class="card m-5">
+ <div class="card-body">
<form wicket:id="form" class="leave-confirm">
<div wicket:id="editor"></div>
<div class="actions">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java
index efe0c24979..976f478e8d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java
@@ -1,8 +1,8 @@
package io.onedev.server.web.page.project.issues.milestones;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -16,10 +16,9 @@ import io.onedev.server.util.PathNode;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
@SuppressWarnings("serial")
-public class NewMilestonePage extends ProjectIssuesPage {
+public class NewMilestonePage extends ProjectPage {
public NewMilestonePage(PageParameters params) {
super(params);
@@ -58,12 +57,6 @@ public class NewMilestonePage extends ProjectIssuesPage {
add(form);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MilestonesResourceReference()));
- }
-
public static PageParameters paramsOf(Project project) {
return ProjectPage.paramsOf(project);
}
@@ -73,4 +66,9 @@ public class NewMilestonePage extends ProjectIssuesPage {
return SecurityUtils.canManageIssues(getProject());
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Create Milestone");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css
deleted file mode 100644
index d2fbd51dc2..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css
+++ /dev/null
@@ -1,47 +0,0 @@
-#milestone-list>.head {
- margin-bottom: 20px;
-}
-#milestone-list>.head>.float-left {
- margin-right: 20px;
-}
-
-#milestone-list>.body>table {
- table-layout: fixed;
-}
-
-#milestone-list>.body tbody td.actions {
- white-space: nowrap;
-}
-
-#new-milestone>.head, #milestone-edit>.head {
- margin-bottom: 20px;
-}
-#milestone-detail>* {
- margin-bottom: 20px;
-}
-#milestone-detail>.title {
- margin-bottom: 12px;
-}
-#milestone-detail>.title>* {
- margin-right: 20px;
- margin-bottom: 8px;
-}
-#milestone-detail>.title>.name {
- margin-right: 10px;
-}
-#milestone-detail>.title .state-stats {
- width: 300px;
-}
-#milestone-detail>.title .due, #milestone-detail>.title a {
- font-weight: normal;
-}
-#milestone-detail .description {
- background: #F5F5F5;
- border-radius: 4px;
- padding: 20px;
-}
-@media(max-width: 767px) {
- #milestone-list>.body .expanded {
- display: none;
- }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/project-issues.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/project-issues.css
deleted file mode 100644
index 7a095a4487..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/project-issues.css
+++ /dev/null
@@ -1,8 +0,0 @@
-@media(min-width: 360px) {
- #project-issues>ul.nav-tabs>li.collapsed {
- display: none;
- }
- #project-issues>ul.nav-tabs>li.expanded {
- display: block;
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/project.css b/server-core/src/main/java/io/onedev/server/web/page/project/project.css
deleted file mode 100644
index 96434ee38a..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/project.css
+++ /dev/null
@@ -1,77 +0,0 @@
-@media(max-width: 767px) {
- #project>.sidebar {
- display: none;
- }
- #project>.sidebar+.content {
- padding-left: 0;
- }
-}
-#project>.sidebar>.head a {
- display: block;
- border-bottom: 1px solid #E0E0E0;
- padding: 10px 22px 10px 4px;
- font-size: 16px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- text-decoration: none;
- color: #444;
- height: 50px;
- position: relative;
-}
-#project>.sidebar>.head a:hover {
- background: #EEE;
-}
-#project>.sidebar>.head img {
- width: 32px;
- height: 32px;
- margin-right: 8px;
-}
-#project>.sidebar>.head svg {
- position: absolute;
- right: 8px;
- top: 18px;
- transform: rotate(90deg);
-}
-#project>.minimized.sidebar>.head svg {
- right: 14px;
- top: 48px;
- transform: rotate(0);
-}
-
-#project>.sidebar>.tabs {
- top: 50px;
-}
-#project>.minimized.sidebar>.head a {
- height: 64px;
-}
-#project>.minimized.sidebar>.head span {
- display: none;
-}
-
-#project>.minimized.sidebar>.tabs {
- top: 64px;
-}
-
-.project-nav-context-dropdown .info {
- margin: -20px -20px 0 -20px;
-}
-.project-nav-context-dropdown .setting ul {
- display: none;
- padding-left: 10px;
-}
-.project-nav-context-dropdown .setting.expanded ul {
- display: block;
-}
-.project-nav-context-dropdown .setting li a {
- background: white !important;
- font-weight: normal !important;
- color: #666 !important;
-}
-.project-nav-context-dropdown .setting li:hover a {
- background: #EEE !important;
-}
-.project-nav-context-dropdown .setting li.active a {
- font-weight: bold !important;
- color: black !important;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html
index 1e52bd5535..ba2493dc6a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html
@@ -1,19 +1,29 @@
<wicket:extend>
- <div class="invalid-pullrequest alert alert-danger">
- <div class="head">
- Unable to show pull request as some commits no longer exist in the underlying git repository
- </div>
- <div class="body">
- This might happen for two reasons:
- <ul>
- <li> The project points to a wrong git repository. In this case, you will need to copy over the correct repository,
- or make sure that the correct global storage directory is specified.</li>
- <li> Those commits are no longer needed and have been garbage collected.
- <wicket:enclosure child="delete">
- In this case, you may also <a wicket:id="delete">delete the pull request</a>
- </wicket:enclosure>
- </li>
- </ul>
+ <div class="card m-5">
+ <div class="card-body">
+ <div class="d-flex">
+ <wicket:svg href="sad-panda" class="icon icon-hero flex-shrink-0 ml-n4"/>
+ <div>
+ <h4 class="mb-3">
+ Unable to show pull request as some commits no longer exist in git repository
+ </h4>
+ This might happen for two reasons:
+ <ul>
+ <li> The project points to a wrong git repository. In this case, you will need to copy over the correct repository,
+ or make sure that the correct global storage directory is specified.</li>
+ <li> Those commits are no longer needed and have been garbage collected.
+ <wicket:enclosure child="delete">
+ In this case, you may also <a wicket:id="delete" class="link-primary">delete the pull request</a>
+ </wicket:enclosure>
+ </li>
+ </ul>
+ </div>
+ </div>
</div>
</div>
+ <wicket:fragment wicket:id="projectTitleFrag">
+ <a wicket:id="pullRequests" class="text-nowrap">Pull Requests</a>
+ <span class="dot"></span>
+ <span wicket:id="pullRequestNumber"></span>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
index 828212b526..57750ec302 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
@@ -2,10 +2,12 @@ package io.onedev.server.web.page.project.pullrequests;
import javax.persistence.EntityNotFoundException;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.flow.RedirectToUrlException;
@@ -53,10 +55,9 @@ public class InvalidPullRequestPage extends ProjectPage {
@Override
public void onClick() {
- PullRequest request = requestModel.getObject();
- OneDev.getInstance(PullRequestManager.class).delete(request);
+ OneDev.getInstance(PullRequestManager.class).delete(getPullRequest());
- Session.get().success("Pull request #" + request.getNumber() + " deleted");
+ Session.get().success("Pull request #" + getPullRequest().getNumber() + " deleted");
String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(PullRequest.class);
if (redirectUrlAfterDelete != null)
@@ -68,10 +69,10 @@ public class InvalidPullRequestPage extends ProjectPage {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.canManage(requestModel.getObject().getTargetProject()));
+ setVisible(SecurityUtils.canManage(getPullRequest().getTargetProject()));
}
- }.add(new ConfirmClickModifier("Do you really want to delete pull request #" + requestModel.getObject().getNumber() + "?")));
+ }.add(new ConfirmClickModifier("Do you really want to delete pull request #" + getPullRequest().getNumber() + "?")));
}
public static PageParameters paramsOf(PullRequest request) {
@@ -80,6 +81,10 @@ public class InvalidPullRequestPage extends ProjectPage {
return params;
}
+ private PullRequest getPullRequest() {
+ return requestModel.getObject();
+ }
+
@Override
protected void onDetach() {
requestModel.detach();
@@ -92,9 +97,12 @@ public class InvalidPullRequestPage extends ProjectPage {
}
@Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectPullRequestsCssResourceReference()));
+ protected Component newProjectTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("pullRequests", ProjectPullRequestsPage.class,
+ ProjectPullRequestsPage.paramsOf(getProject())));
+ fragment.add(new Label("pullRequestNumber", "#" + getPullRequest().getNumber()));
+ return fragment;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsCssResourceReference.java
deleted file mode 100644
index 46f8b7f7f1..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.pullrequests;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class ProjectPullRequestsCssResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ProjectPullRequestsCssResourceReference() {
- super(ProjectPullRequestsCssResourceReference.class, "project-pull-requests.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html
index be66bba036..932d02800b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html
@@ -1,7 +1,6 @@
<wicket:extend>
- <div class="page-title">Pull Requests</div>
- <div id="project-pull-requests" class="query-save-support">
- <div wicket:id="side" class="side"></div>
- <div wicket:id="main" class="main"></div>
+ <div class="side-main side-main-wrap p-5">
+ <div wicket:id="savedQueries" class="side"></div>
+ <div wicket:id="pullRequests" class="main"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
index a7a6c82139..883bbc48fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
@@ -7,8 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
@@ -67,7 +66,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
protected void onInitialize() {
super.onInitialize();
- add(savedQueries = new SavedQueriesPanel<NamedPullRequestQuery>("side") {
+ add(savedQueries = new SavedQueriesPanel<NamedPullRequestQuery>("savedQueries") {
@Override
protected NamedQueriesBean<NamedPullRequestQuery> newNamedQueriesBean() {
@@ -108,7 +107,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
});
- add(requestList = new PullRequestListPanel("main", new IModel<String>() {
+ add(requestList = new PullRequestListPanel("pullRequests", new IModel<String>() {
@Override
public void detach() {
@@ -229,12 +228,6 @@ public class ProjectPullRequestsPage extends ProjectPage {
target.add(requestList);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectPullRequestsCssResourceReference()));
- }
-
@Override
protected boolean isPermitted() {
return SecurityUtils.canReadCode(getProject());
@@ -259,5 +252,10 @@ public class ProjectPullRequestsPage extends ProjectPage {
}
return paramsOf(project, query, page);
}
-
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "<span class='text-nowrap'>Pull Requests</span>").setEscapeModelStrings(false);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestCssResourceReference.java
similarity index 60%
rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestCssResourceReference.java
index d2eb8e5690..a4f069f55a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestCssResourceReference.java
@@ -7,22 +7,19 @@ import org.apache.wicket.markup.head.HeaderItem;
import io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-public class NewPullRequestResourceReference extends BaseDependentResourceReference {
+public class NewPullRequestCssResourceReference extends BaseDependentCssResourceReference {
private static final long serialVersionUID = 1L;
- public NewPullRequestResourceReference() {
- super(NewPullRequestResourceReference.class, "new-pull-request.js");
+ public NewPullRequestCssResourceReference() {
+ super(NewPullRequestCssResourceReference.class, "new-pull-request.css");
}
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- NewPullRequestResourceReference.class, "new-pull-request.css")));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
index 416d15bbdd..1c95ceb12b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
@@ -1,114 +1,102 @@
<wicket:extend>
- <div id="new-pull-request" class="resize-aware">
- <div class="page-title">New Pull Request</div>
- <div class="page-content">
- <table class="branches revision-compare">
- <tr>
- <td class="target branch revision">
- <div class="title clearfix">
- <label class="float-left">Target</label>
- </div>
- <div wicket:id="target" class="selector"></div>
- <div class="message">
- <a wicket:id="targetCommitLink"><span wicket:id="message"></span></a>
- </div>
- </td>
- <td class="action">
- <a wicket:id="swap" class="swap btn btn-outline-secondary" title="Swap"><wicket:svg href="swap" class="icon"></wicket:svg></a>
- </td>
- <td class="source branch revision">
- <div class="title">
- <label>Source</label>
- </div>
- <div wicket:id="source" class="selector"></div>
- <div class="message">
- <a wicket:id="sourceCommitLink"><span wicket:id="message"></span></a>
- </div>
- </td>
- </tr>
- </table>
- <div wicket:id="status" class="status"></div>
- <ul wicket:id="tabs" class="nav nav-tabs"></ul>
- <div wicket:id="tabPanel" class="tab-panel"></div>
+ <div class="p-5 new-pull-request">
+ <div class="revision-compare mb-5">
+ <div class="base revision card">
+ <div class="card-body">
+ <div class="title">Target</div>
+ <div wicket:id="target" class="selector"></div>
+ <a wicket:id="targetCommitLink" class="message"><span wicket:id="message"></span></a>
+ </div>
+ </div>
+ <div class="swap">
+ <a wicket:id="swap" class="btn btn-primary btn-icon" title="Swap"><wicket:svg href="swap" class="icon"></wicket:svg></a>
+ </div>
+ <div class="compare revision card">
+ <div class="card-body">
+ <div class="title">Source</div>
+ <div wicket:id="source" class="selector"></div>
+ <a wicket:id="sourceCommitLink" class="message"><span wicket:id="message"></span></a>
+ </div>
+ </div>
</div>
+ <div wicket:id="status" class="status"></div>
+ <wicket:enclosure child="tabs">
+ <div class="card">
+ <div class="card-body">
+ <ul wicket:id="tabs" class="nav nav-tabs nav-tabs-line nav-bolder mb-5"></ul>
+ <div wicket:id="tabPanel" class="tab-panel"></div>
+ </div>
+ </div>
+ </wicket:enclosure>
</div>
<wicket:fragment wicket:id="effectiveFrag">
- <div class="alert alert-info">
- <span wicket:id="description"></span> <a wicket:id="link"><b wicket:id="label"></b></a>
+ <div class="alert alert-info mb-5">
+ <span wicket:id="description"></span> <a wicket:id="link" class="alert-link"><span wicket:id="label"></span></a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="sameBranchFrag">
- <div class="alert alert-warning">
+ <div class="alert alert-warning mb-5">
<div class="summary">
- <span>Please select different branches to merge.</span>
+ <span>Please select different branches</span>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="mergedFrag">
- <div class="alert alert-success">
+ <div class="alert alert-success mb-5">
<div class="summary">
- <a wicket:id="targetBranch"></a> is up to date with all commits from <a wicket:id="sourceBranch"></a>.
- Try <a wicket:id="swapBranches">swap source and target</a> for the comparison.
+ Branch <a wicket:id="targetBranch" class="alert-link"></a> is up to date with all commits from <a wicket:id="sourceBranch" class="alert-link"></a>.
+ Try <a wicket:id="swapBranches" class="alert-link">swap source and target</a> for the comparison.
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="unrelatedHistoryFrag">
- <div class="alert alert-warning">
+ <div class="alert alert-warning mb-5">
<div class="summary">
<span>History of target branch and source branch is unrelated</span>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="branchNotSpecifiedFrag">
- <div class="alert alert-warning">
+ <div class="alert alert-warning mb-5">
<div class="summary">
<span>Please select branches to create pull request</span>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="canSendFrag">
- <div class="can-send">
- <form wicket:id="form" class="leave-confirm">
- <table>
- <tr class="title">
- <td class="name">Title <span class="required"></span></td>
- <td wicket:id="title" class="value">
- <input wicket:id="title" type="text" class="form-control" placeholder="Input title here">
- <div wicket:id="feedback"></div>
- </td>
- </tr>
- <tr class="description">
- <td class="name">Description</td>
- <td class="value"><div wicket:id="comment"></div></td>
- </tr>
- <tr class="merge-strategy">
- <td class="name">Merge Strategy</td>
- <td wicket:id="mergeStrategy" class="merge-strategy value">
+ <div class="card can-send mb-5">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div class="form-group">
+ <label>Title <span class="text-danger"></span></label>
+ <input wicket:id="title" type="text" class="form-control" placeholder="Input title here">
+ <div wicket:id="titleFeedback" class="mt-2"></div>
+ </div>
+ <div class="form-group">
+ <label>Description</label>
+ <div wicket:id="comment"></div>
+ </div>
+ <div class="form-group merge-strategy">
+ <label>Merge Strategy</label>
+ <div wicket:id="mergeStrategy">
<select wicket:id="select" class="form-control"></select>
- <div wicket:id="help" class="help-block"></div>
+ <div wicket:id="help" class="form-text text-muted"></div>
<div wicket:id="status" class="status"></div>
- </td>
- </tr>
- <tr class="reviewers">
- <td class="name">Reviewers</td>
- <td class="value">
- <div wicket:id="reviewers"></div>
- <div class="help-block">Pull request can only be merged after getting approvals from all reviewers</div>
- </td>
- </tr>
- <tr class="assignees">
- <td class="name">Assignees</td>
- <td class="value">
- <div wicket:id="assignees"></div>
- <div class="help-block">Assignees have code write permission and will be responsible
- for merging the pull request</div>
- </td>
- </tr>
- </table>
- <div class="clearfix">
- <input wicket:id="send" type="submit" class="btn btn-primary float-left" value="Create Pull Request">
- </div>
- </form>
+ </div>
+ </div>
+ <div class="form-group">
+ <label>Reviewers</label>
+ <div wicket:id="reviewers"></div>
+ <div class="text-muted form-text">Pull request can only be merged after getting approvals from all reviewers</div>
+ </div>
+ <div class="form-group">
+ <label>Assignees</label>
+ <div wicket:id="assignees"></div>
+ <div class="text-muted form-text">Assignees have code write permission and will be responsible for merging the pull request</div>
+ </div>
+ <button wicket:id="send" type="submit" class="btn btn-primary">Send Pull Request</button>
+ </form>
+ </div>
</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 3b6634840b..d948f429fc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -17,9 +17,8 @@ import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
@@ -89,7 +88,7 @@ import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
-import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.page.simple.security.LoginPage;
import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
@@ -225,7 +224,8 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
PullRequestUpdate update = new PullRequestUpdate();
update.setDate(new DateTime(request.getSubmitDate()).plusSeconds(1).toDate());
- request.addUpdate(update);
+ request.getUpdates().add(update);
+ request.setUpdates(request.getUpdates());
update.setRequest(request);
update.setHeadCommitHash(source.getObjectName());
update.setTargetHeadCommitHash(request.getTarget().getObjectName());
@@ -288,8 +288,6 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
protected void onInitialize() {
super.onInitialize();
- setOutputMarkupId(true);
-
add(new AffinalBranchPicker("target", target.getProjectId(), target.getBranch()) {
@Override
@@ -382,6 +380,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
Component panel = newCommitsPanel();
getPage().replace(panel);
target.add(panel);
+ resizeWindow(target);
}
});
@@ -393,6 +392,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
Component panel = newRevisionDiffPanel();
getPage().replace(panel);
target.add(panel);
+ resizeWindow(target);
}
});
@@ -412,6 +412,8 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
add(new WebMarkupContainer(TABS_ID).setVisible(false));
add(new WebMarkupContainer(TAB_PANEL_ID).setVisible(false));
}
+
+ setOutputMarkupId(true);
}
private Component newCommitsPanel() {
@@ -536,9 +538,9 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
public String getObject() {
if (requestModel.getObject().isOpen())
- return "This change is already opened for merge by pull request";
+ return "This change is already opened for merge by ";
else
- return "This change is squashed/rebased onto base branch via pull request";
+ return "This change is squashed/rebased onto base branch via ";
}
}).setEscapeModelStrings(false));
@@ -552,7 +554,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
public String getObject() {
- return "#" + getPullRequest().getNumber();
+ return "pull request #" + getPullRequest().getNumber();
}
}));
@@ -635,8 +637,6 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
}
});
- WebMarkupContainer titleContainer = new WebMarkupContainer("title");
- form.add(titleContainer);
TextField<String> titleInput = new TextField<String>("title", new IModel<String>() {
@Override
@@ -663,11 +663,10 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
});
titleInput.setRequired(true).setLabel(Model.of("Title"));
- titleContainer.add(titleInput);
- titleContainer.add(new FencedFeedbackPanel("feedback", titleInput));
+ form.add(new FencedFeedbackPanel("titleFeedback", titleInput));
- titleContainer.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+ titleInput.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
@@ -675,6 +674,8 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
}
}));
+
+ form.add(titleInput);
form.add(new CommentInput("comment", new IModel<String>() {
@@ -793,14 +794,14 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
request.setLastMergePreview(mergePreview);
if (merged != null) {
- String html = String.format("<svg class='icon'><use xlink:href='%s'/></svg> Able to merge without conflicts",
+ String html = String.format("<svg class='icon mt-n1 mr-1'><use xlink:href='%s'/></svg> Able to merge without conflicts",
SpriteImage.getVersionedHref("tick-circle-o"));
Component result = new Label(componentId, html);
result.add(AttributeAppender.append("class", "no-conflict"));
result.setEscapeModelStrings(false);
return result;
} else {
- String html = String.format("<svg class='icon'><use xlink:href='%s'/></svg> There are merge conflicts. "
+ String html = String.format("<svg class='icon mt-n1 mr-1'><use xlink:href='%s'/></svg> There are merge conflicts. "
+ "You can still create the pull request though", SpriteImage.getVersionedHref("warning-o"));
Component result = new Label(componentId, html);
result.add(AttributeAppender.append("class", "conflict"));
@@ -811,7 +812,9 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
public Component getLoadingComponent(String markupId) {
- Component component = new Label(markupId, "<img src='/img/ajax-indicator-big.gif'></img> Calculating merge preview...");
+ String html = String.format("<svg class='icon spin mt-n1 mr-1'><use xlink:href='%s'/></svg> Calculating merge preview...",
+ SpriteImage.getVersionedHref("loading"));
+ Component component = new Label(markupId, html);
component.add(AttributeAppender.append("class", "calculating"));
component.setEscapeModelStrings(false);
return component;
@@ -827,8 +830,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new NewPullRequestResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.newPullRequest.onDomReady();"));
+ response.render(CssHeaderItem.forReference(new NewPullRequestCssResourceReference()));
}
@Override
@@ -911,5 +913,10 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
protected boolean isPermitted() {
return SecurityUtils.canReadCode(target.getProject()) && SecurityUtils.canReadCode(source.getProject());
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "<span class='text-nowrap'>Create Pull Request</span>").setEscapeModelStrings(false);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
index 54f61ff853..5b21a8c349 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
@@ -1,97 +1,31 @@
-@media(min-width: 360px) {
- #new-pull-request>.page-content>ul.nav-tabs>li.collapsed {
- display: none;
- }
- #new-pull-request>ul.nav-tabs>li.expanded {
- display: block;
- }
+.new-pull-request .can-send label {
+ font-size: 1.1rem;
+ font-weight: 600;
+ margin-bottom: 1rem;
}
-body.NewPullRequestPage #layout>.body {
- padding: 50px 0 0 0;
+.new-pull-request .can-send .select2-container {
+ width: 360px;
}
-#new-pull-request {
- position: relative;
- overflow: auto;
- padding: 20px;
-}
-#new-pull-request>.page-content>* {
- margin-bottom: 20px;
-}
-#new-pull-request>.page-content>.status .summary {
- font-size: 16px;
- padding: 0;
- margin-bottom: 8px;
+.new-pull-request .form-group {
+ margin-bottom: 2rem;
}
-#new-pull-request>.page-content>.status>.can-send form>table>tbody>tr>td {
- padding: 16px 0;
- border-top: 1px dashed #BBB;
- border-bottom: 1px dashed #BBB;
-}
-#new-pull-request>.page-content>.status>.can-send form>table>tbody>tr>td.name {
- width: 200px;
- font-size: 18px;
- padding-right: 8px;
-}
-#new-pull-request>.page-content>.status>.can-send form>table>tbody>tr>td.value {
- padding-left: 8px;
-}
-#new-pull-request>.page-content>.status>.can-send form>table {
- margin-bottom: 16px;
-}
-#new-pull-request>.page-content>.status>.can-send form>table>tbody>tr>td.name .required:BEFORE {
- content: "*";
- color: red;
-}
-#new-pull-request>.page-content table.reviews {
- width: auto;
- min-width: 250px;
-}
-#new-pull-request>.page-content table.assignments {
- width: auto;
- min-width: 250px;
-}
-
-#new-pull-request>.page-content>.status>.can-send form .alert-danger {
- margin-bottom: 0;
- margin-top: 16px;
-}
-#new-pull-request>.page-content>.status>.can-send form .help-block {
- margin-bottom: 0;
-}
-#new-pull-request>.page-content>.status>.can-send form select {
- width: auto;
-}
-#new-pull-request>.page-content>.status>.can-send table.reviews td.result {
- display: none;
-}
-#new-pull-request>.page-content>.nav-tabs {
- margin-bottom: 20px;
-}
-#new-pull-request>.page-content>.tab-panel>.diff-option {
- padding: 8px;
- background: #F2F2F2;
- border: 1px solid #DDD;
- z-index: 200;
- margin-bottom: 16px;
-}
-#new-pull-request>.page-content>.status>.can-send .merge-strategy .status {
- margin-top: 10px;
- font-size: 16px;
+.new-pull-request .can-send .merge-strategy .status {
+ margin-top: 0.6rem;
+ font-size: 1.2rem;
font-weight: bold;
}
-#new-pull-request>.page-content>.status>.can-send .merge-strategy .status svg,
-#new-pull-request>.page-content>.status>.can-send .merge-strategy .status img {
- margin: -4px 8px 0 0;
+.new-pull-request .can-send .merge-strategy .status svg,
+.new-pull-request .can-send .merge-strategy .status img {
width: 18px;
height: 18px;
}
-#new-pull-request>.page-content>.status>.can-send .merge-strategy .status .no-conflict {
- color: #399529;
+.new-pull-request .can-send .merge-strategy .status .no-conflict {
+ color: var(--success);
}
-#new-pull-request>.page-content>.status>.can-send .merge-strategy .status .conflict {
- color: #DD4B4B;
+.new-pull-request .can-send .merge-strategy .status .conflict {
+ color: var(--danger);
}
-#new-pull-request>.page-content>.status>.can-send .merge-strategy .status .calculating {
- color: #BC7E12;
-}
+.new-pull-request .can-send .merge-strategy .status .calculating {
+ color: var(--warning);
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.js
deleted file mode 100644
index 502a87c988..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.js
+++ /dev/null
@@ -1,14 +0,0 @@
-onedev.server.newPullRequest = {
- onDomReady: function() {
- $("body").css("overflow", "hidden");
- var $newPullRequest = $("#new-pull-request");
- function adjustHeight() {
- $newPullRequest.outerHeight($(window).height() - $newPullRequest.offset().top);
- }
- adjustHeight();
- $newPullRequest.on("resized", adjustHeight);
- $newPullRequest.scroll(function() {
- $newPullRequest.find(".scroll-aware").addBack(".scroll-aware").trigger("scrolled");
- });
- }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.html
index 7b3ff18e2e..92007318f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.html
@@ -1,11 +1,12 @@
<wicket:panel>
- <div class="title">Conflict Resolve Instruction</div>
- <div wicket:id="body" class="body"></div>
+ <div class="card">
+ <div wicket:id="body" class="card-body"></div>
+ </div>
<wicket:fragment wicket:id="mergeFrag">
- <ul>
- <li>
- <div class="text">From working directory of project <em wicket:id="srcRepoName"></em>,
+ <ul class="list-unstyled">
+ <li class="mb-4">
+ <div class="mb-2">From working directory of project <em wicket:id="srcRepoName"></em>,
check out source branch and merge with target branch</div>
<div class="code">
<div>git checkout <span wicket:id="srcBranchNameForCheckout"></span></div>
@@ -19,7 +20,7 @@
</div>
</li>
<li>
- <div class="text">Resolve merge conflicts, test changes and push result commit to OneDev</div>
+ <div class="mb-2">Resolve merge conflicts, test changes and push result commit to OneDev</div>
<div class="code">
git push origin <span wicket:id="srcBranchNameForPush"></span>
</div>
@@ -27,9 +28,9 @@
</ul>
</wicket:fragment>
<wicket:fragment wicket:id="rebaseFrag">
- <ul>
- <li>
- <div class="text">From working directory of project <em wicket:id="srcRepoName"></em>,
+ <ul class="list-unstyled">
+ <li class="mb-4">
+ <div class="mb-2">From working directory of project <em wicket:id="srcRepoName"></em>,
check out source branch and rebase to destination branch</div>
<div class="code">
<div>git checkout <span wicket:id="srcBranchNameForCheckout"></span></div>
@@ -43,7 +44,7 @@
</div>
</li>
<li>
- <div class="text">Resolve rebase conflicts, test changes and force push result commit to OneDev</div>
+ <div class="mb-2">Resolve rebase conflicts, test changes and force push result commit to OneDev</div>
<div class="code">
git push -f origin <span wicket:id="srcBranchNameForPush"></span>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index f0b9ce6b47..bdb4362f4e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -1,146 +1,154 @@
<wicket:extend>
- <div id="request-detail">
- <div class="main resize-aware">
- <div wicket:id="requestHead" class="title clearfix">
- <span class="float-left">
- <span wicket:id="title" class="title"></span>
- <a wicket:id="edit" title="Edit title" class="edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- </span>
- <a wicket:id="create" class="create btn btn-success btn-sm float-right"><wicket:svg href="plus" class="icon"></wicket:svg> New</a>
- <form wicket:id="editForm" class="form">
- <div class="clearable-wrapper">
+ <div class="pull-request-detail card position-relative overflow-hidden m-5">
+ <div wicket:id="requestHeader" class="card-header align-items-center justify-content-start flex-nowrap">
+ <div class="d-flex align-items-center flex-grow-1 mr-4">
+ <div wicket:id="title" class="card-title mr-3"></div>
+ <a wicket:id="edit" title="Edit title" class="btn btn-xs btn-icon btn-light btn-hover-primary edit mr-3"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <form wicket:id="editForm" class="form flex-grow-1 d-flex align-items-center">
+ <div class="clearable-wrapper mr-3 flex-grow-1">
<input wicket:id="title" type="text" placeholder="Input title" class="form-control">
</div>
- <div class="actions">
- <button wicket:id="save" title="Save" value="Save" class="btn btn-success" type="submit"><wicket:svg href="tick" class="icon"></wicket:svg></button>
- <a wicket:id="cancel" title="Cancel" type="button" value="Cancel" class="btn btn-danger"><wicket:svg href="times" class="icon"></wicket:svg></a>
+ <div class="flex-shrink-0 text-nowrap">
+ <button wicket:id="save" title="Save" value="Save" class="btn btn-primary btn-icon mr-1" type="submit"><wicket:svg href="tick" class="icon"></wicket:svg></button>
+ <a wicket:id="cancel" title="Cancel" type="button" value="Cancel" class="btn btn-danger btn-icon"><wicket:svg href="times" class="icon"></wicket:svg></a>
</div>
</form>
</div>
- <div wicket:id="statusAndBranches" class="status-and-branches clearfix">
- <div wicket:id="status" class="badge float-left status"></div>
- <div class="float-left branches">
- <a wicket:id="user"></a> wants to merge into <a wicket:id="target" class="branch"></a>
- from <a wicket:id="source" class="branch"></a> <span wicket:id="date"></span>
- </div>
- <a wicket:id="moreInfo" class="more-info" title="More info"><wicket:svg href="ellipsis" class="icon rotate-90"></wicket:svg></a>
- </div>
- <div wicket:id="requestSummary" class="summary resize-aware">
- <wicket:enclosure>
- <div class="alert alert-danger">
- <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> <span wicket:id="checkError"></span>
- </div>
- </wicket:enclosure>
- <div wicket:id="discarded" class="discarded alert alert-danger">
- <wicket:svg href="exclamation-circle-o" class="icon"></wicket:svg> This pull request has been discarded
- </div>
- <div wicket:id="fastForwarded" class="fast-forwarded alert alert-success">
- <wicket:svg href="tick-circle-o" class="icon"></wicket:svg> Target branch was fast-forwarded to source branch
- </div>
- <div wicket:id="merged" class="merged alert alert-success">
- <wicket:svg href="tick-circle-o" class="icon"></wicket:svg> Commits were merged into target branch
- </div>
- <div wicket:id="mergedOutside" class="merged-outside alert alert-success">
- <wicket:svg href="tick-circle-o" class="icon"></wicket:svg> Commits were merged into target branch by someone outside of this pull request
- </div>
- <div wicket:id="squashed" class="squashed alert alert-success">
- <wicket:svg href="tick-circle-o" class="icon"></wicket:svg> Commits were squashed into a single commit on target branch
- </div>
- <div wicket:id="rebased" class="rebased alert alert-success">
- <wicket:svg href="tick-circle-o" class="icon"></wicket:svg> Commits were rebased onto target branch
- </div>
- <div wicket:id="calculatingMergePreview" class="calculating-merge-preview alert alert-warning">
- <img src="/img/ajax-indicator-big.gif"> Calculating merge preview...
- </div>
- <div wicket:id="calculatedMergePreview" class="calculated-merge-preview alert alert-success">
- <wicket:svg href="tick-circle-o" class="icon"></wicket:svg> Able to merge without conflicts
+ <a wicket:id="moreInfo" class="side-info flex-shrink-0" title="More info"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>
+ </div>
+ <div class="card-body d-flex position-relative overflow-hidden">
+ <div class="main flex-grow-1">
+ <div wicket:id="statusAndBranches" class="status-and-branches d-flex mb-4">
+ <div wicket:id="status" class="badge status mr-3 font-size-h6"></div>
+ <div class="branches font-size-lg mr-3 d-flex align-items-center">
+ <div class="text-muted">
+ <a wicket:id="user" class="text-muted"></a> wants to merge into <a wicket:id="target" class="branch link-primary"></a>
+ from <a wicket:id="source" class="branch link-primary"></a> <span wicket:id="date"></span>
+ </div>
+ </div>
+ <a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-auto" title="Open new pull request"><wicket:svg href="plus" class="icon"/></a>
</div>
- <div wicket:id="hasMergeConflict" class="has-merge-conflict alert alert-danger">
- <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> There are merge conflicts.
- <wicket:enclosure child="resolveInstructions">
- Please follow <a wicket:id="resolveInstructions" href="javascript:void(0);">this instruction</a> to resolve the conflicts
+ <div wicket:id="requestSummary" class="summary mb-4 font-size-h6">
+ <wicket:enclosure>
+ <div class="text-danger">
+ <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> <span wicket:id="checkError"></span>
+ </div>
</wicket:enclosure>
+ <div wicket:id="discarded" class="discarded text-danger">
+ <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> This pull request has been discarded
+ </div>
+ <div wicket:id="fastForwarded" class="fast-forwarded text-success">
+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Target branch was fast-forwarded to source branch
+ </div>
+ <div wicket:id="merged" class="merged text-success">
+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were merged into target branch
+ </div>
+ <div wicket:id="mergedOutside" class="merged-outside text-success">
+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were merged into target branch by someone outside of this pull request
+ </div>
+ <div wicket:id="squashed" class="squashed text-success">
+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were squashed into a single commit on target branch
+ </div>
+ <div wicket:id="rebased" class="rebased text-success">
+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were rebased onto target branch
+ </div>
+ <div wicket:id="calculatingMergePreview" class="calculating-merge-preview text-warning">
+ <wicket:svg href="loading" class="icon spin"></wicket:svg> Calculating merge preview...
+ </div>
+ <div wicket:id="calculatedMergePreview" class="calculated-merge-preview text-success">
+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Able to merge without conflicts
+ </div>
+ <div wicket:id="hasMergeConflict" class="has-merge-conflict text-danger">
+ <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> There are merge conflicts.
+ <wicket:enclosure child="resolveInstructions">
+ Please follow <a wicket:id="resolveInstructions" href="javascript:void(0);">this instruction</a> to resolve the conflicts
+ </wicket:enclosure>
+ </div>
+ <div wicket:id="requestedForChanges" class="requested-for-changes text-danger">
+ <wicket:svg href="times-circle-o" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline">requested for changes</a>
+ </div>
+ <div wicket:id="waitingForReviews" class="waiting-for-reviews text-warning">
+ <wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as it is <a class="more-info d-inline">pending review</a>
+ </div>
+ <div wicket:id="unsuccessfulBuilds" class="unsuccessful-builds text-danger">
+ <wicket:svg href="times-circle-o" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline">required builds</a> are not successful
+ </div>
+ <div wicket:id="unfinishedBuilds" class="unfinished-builds text-warning">
+ <wicket:svg href="clock-o" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline">required builds</a> are not finished yet
+ </div>
+ <div wicket:id="mergeableByCodeWriters" class="mergeable-by-code-writers text-info">
+ <wicket:svg href="info-circle-o" class="icon"></wicket:svg> Pull request can only be merged by users with code write permission
+ </div>
</div>
- <div wicket:id="requestedForChanges" class="requested-for-changes alert alert-danger">
- <wicket:svg href="times-circle-o" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info">requested for changes</a>
- </div>
- <div wicket:id="waitingForReviews" class="waiting-for-reviews alert alert-warning">
- <wicket:svg href="clock-o" class="icon"></wicket:svg> Pull request can not be merged now as it is <a class="more-info">pending review</a>
- </div>
- <div wicket:id="unsuccessfulBuilds" class="unsuccessful-builds alert alert-danger">
- <wicket:svg href="times-circle-o" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info">required builds</a> are not successful
- </div>
- <div wicket:id="unfinishedBuilds" class="unfinished-builds alert alert-warning">
- <wicket:svg href="clock-o" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info">required builds</a> are not finished yet
- </div>
- <div wicket:id="mergeableByCodeWriters" class="mergeable-by-code-writers alert alert-info">
- <wicket:svg href="info-circle-o" class="icon"></wicket:svg> Pull request can only be merged by users with code write permission
+ <div wicket:id="requestOperations" class="operations">
+ <a wicket:id="merge" class="btn btn-sm btn-success">Merge</a>
+ <a wicket:id="discard" class="btn btn-sm btn-danger">Discard</a>
+ <a wicket:id="approve" class="btn btn-sm btn-primary">Approve</a>
+ <a wicket:id="requestForChanges" class="btn btn-sm btn-primary">Request for changes</a>
+ <a wicket:id="reopen" class="btn btn-sm btn-primary">Reopen</a>
+ <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-primary">Delete source branch</a>
+ <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-primary">Restore source branch</a>
</div>
+ <ul wicket:id="requestTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5 mt-3 align-items-center"></ul>
+ <wicket:child></wicket:child>
</div>
- <div wicket:id="requestOperations" class="operations">
- <a wicket:id="merge" class="btn btn-sm btn-success">Merge</a>
- <a wicket:id="discard" class="btn btn-sm btn-danger">Discard</a>
- <a wicket:id="approve" class="btn btn-sm btn-primary">Approve</a>
- <a wicket:id="requestForChanges" class="btn btn-sm btn-primary">Request for changes</a>
- <a wicket:id="reopen" class="btn btn-sm btn-primary">Reopen</a>
- <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-primary">Delete source branch</a>
- <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-primary">Restore source branch</a>
- </div>
- <ul wicket:id="requestTabs" class="tabs nav nav-tabs"></ul>
- <wicket:child></wicket:child>
+ <div wicket:id="moreInfo" class="more-info"></div>
</div>
- <div wicket:id="moreInfo"></div>
</div>
<wicket:fragment wicket:id="codeCommentsTabLinkFrag">
- <a wicket:id="link" class="code-comments nav-link">Code Comments <wicket:svg href="dot" class="icon"></wicket:svg></a>
+ <a wicket:id="link" class="code-comments nav-link d-flex align-items-center">Code Comments <wicket:svg href="dot" class="icon ml-2 d-none"></wicket:svg></a>
</wicket:fragment>
<wicket:fragment wicket:id="moreInfoFrag">
- <div wicket:id="requestNav" class="nav"></div>
<wicket:enclosure child="reviews">
<div class="reviews">
<div class="head">Reviewers</div>
<div wicket:id="reviews" class="body"></div>
- <div wicket:id="reviewerHelp" class="help-block">Pull request can only be merged after getting approvals from all reviewers</div>
+ <div wicket:id="reviewerHelp" class="font-size-sm text-muted form-text">Pull request can only be merged after getting approvals from all reviewers</div>
</div>
</wicket:enclosure>
<wicket:enclosure child="jobs">
<div class="jobs">
<div class="head">
Jobs
- <span wicket:id="hiddenJobsNote" class="warning" title="Some jobs are hidden due to permission policy">
+ <span wicket:id="hiddenJobsNote" class="warning ml-2" title="Some jobs are hidden due to permission policy">
<wicket:svg href="exclamation-circle-o" class="icon"/>
</span>
</div>
<div wicket:id="jobs" class="body"></div>
- <div wicket:id="jobsHelp" class="help-block">Jobs marked with &lowast; are required to be successful</div>
+ <div wicket:id="jobsHelp" class="font-size-sm text-muted form-text">Jobs marked with &lowast; are required to be successful</div>
</div>
</wicket:enclosure>
<wicket:enclosure child="assignments">
<div class="assignments">
<div class="head">Assignees</div>
<div wicket:id="assignments" class="body"></div>
- <div wicket:id="assigneeHelp" class="help-block">Assignees are expected to merge the pull request</div>
+ <div wicket:id="assigneeHelp" class="font-size-sm text-muted form-text">Assignees are expected to merge the pull request</div>
</div>
</wicket:enclosure>
<div wicket:id="mergeStrategy" class="merge-strategy">
<div class="head">Merge Strategy</div>
<div class="body">
- <select wicket:id="editor" class="form-control"></select>
+ <select wicket:id="editor" class="form-control custom-select"></select>
<span wicket:id="viewer"></span>
- <div wicket:id="help" class="help-block"></div>
+ <div wicket:id="help" class="font-size-sm text-muted form-text"></div>
</div>
</div>
<div wicket:id="watches" class="watches"></div>
- <div wicket:id="manage" class="manage clearfix">
- <a wicket:id="delete" class="delete btn btn-danger float-left">Delete</a>
+ <div wicket:id="actions" class="d-flex align-items-center">
<wicket:enclosure child="synchronize">
- <div class="float-right synchronize">
- <a wicket:id="synchronize" class="btn btn-outline-secondary">Synchronize</a>
- <a href="javascript:void(0)" class="help" title="In case the pull request status is out of sync with underlying repository, you may synchronize them manually here">
- <wicket:svg href="question-circle" class="icon"/>
+ <div class="synchronize d-flex align-items-center mr-3">
+ <a wicket:id="synchronize" class="btn btn-light-primary mr-2">Synchronize</a>
+ <a href="javascript:void(0)" class="help text-muted text-hover-primary" title="In case the pull request status is out of sync with underlying repository, you may synchronize them manually here">
+ <wicket:svg href="question-o" class="icon"/>
</a>
</div>
</wicket:enclosure>
+ <a wicket:id="delete" class="delete btn btn-light-danger ml-auto">Delete</a>
</div>
</wicket:fragment>
+ <wicket:fragment wicket:id="projectTitleFrag">
+ <a wicket:id="pullRequests" class="text-nowrap">Pull Requests</a>
+ <span class="dot"></span>
+ <span wicket:id="pullRequestNumber"></span>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 4eb95641f0..1e2522fb34 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -168,7 +168,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
private WebMarkupContainer newRequestHead() {
- WebMarkupContainer requestHead = new WebMarkupContainer("requestHead");
+ WebMarkupContainer requestHead = new WebMarkupContainer("requestHeader");
requestHead.setOutputMarkupId(true);
add(requestHead);
@@ -209,17 +209,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
});
-
- requestHead.add(new BookmarkablePageLink<Void>("create",
- NewPullRequestPage.class, NewPullRequestPage.paramsOf(getProject())) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!isEditingTitle);
- }
-
- });
Form<?> form = new Form<Void>("editForm") {
@@ -230,6 +219,17 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
};
+ form.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (form.hasError())
+ return "is-invalid";
+ else
+ return "";
+ }
+
+ }));
requestHead.add(form);
title = getPullRequest().getTitle();
@@ -249,7 +249,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
title = object;
}
- }).add(new ReferenceInputBehavior(false) {
+ }).setRequired(true).add(new ReferenceInputBehavior(false) {
@Override
protected Project getProject() {
@@ -264,13 +264,17 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- if (StringUtils.isNotBlank(title)) {
- OneDev.getInstance(PullRequestChangeManager.class).changeTitle(getPullRequest(), title);
- isEditingTitle = false;
- }
+ OneDev.getInstance(PullRequestChangeManager.class).changeTitle(getPullRequest(), title);
+ isEditingTitle = false;
+
+ target.add(requestHead);
+ resizeWindow(target);
+ }
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
target.add(requestHead);
- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
}
});
@@ -281,11 +285,13 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
public void onClick(AjaxRequestTarget target) {
isEditingTitle = false;
target.add(requestHead);
- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
+ resizeWindow(target);
}
});
+ requestHead.add(new SideInfoLink("moreInfo"));
+
return requestHead;
}
@@ -295,15 +301,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
add(newRequestHead());
add(newStatusAndBranchesContainer());
- WebMarkupContainer summaryContainer = new WebMarkupContainer("requestSummary") {
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.pullRequestDetail.onSummaryDomReady();"));
- }
-
- };
+ WebMarkupContainer summaryContainer = new WebMarkupContainer("requestSummary");
summaryContainer.add(new WebSocketObserver() {
@@ -315,7 +313,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
handler.add(component);
- handler.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
}
});
@@ -560,7 +557,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
List<Tab> tabs = new ArrayList<>();
- tabs.add(new RequestTab("Activities", PullRequestActivitiesPage.class) {
+ tabs.add(new PullRequestTab("Activities", PullRequestActivitiesPage.class) {
@Override
protected Component renderOptions(String componentId) {
@@ -569,10 +566,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
});
- tabs.add(new RequestTab("File Changes", PullRequestChangesPage.class));
- tabs.add(new RequestTab("Code Comments", PullRequestCodeCommentsPage.class));
+ tabs.add(new PullRequestTab("File Changes", PullRequestChangesPage.class));
+ tabs.add(new PullRequestTab("Code Comments", PullRequestCodeCommentsPage.class));
if (getPullRequest().isOpen())
- tabs.add(new RequestTab("Merge Preview", MergePreviewPage.class));
+ tabs.add(new PullRequestTab("Merge Preview", MergePreviewPage.class));
add(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));
@@ -634,45 +631,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return new SideInfoPanel("moreInfo") {
@Override
- protected Component newContent(String componentId) {
+ protected Component newBody(String componentId) {
Fragment fragment = new Fragment(componentId, "moreInfoFrag", PullRequestDetailPage.this);
- fragment.add(new EntityNavPanel<PullRequest>("requestNav") {
-
- @Override
- protected EntityQuery<PullRequest> parse(String queryString, boolean inProject) {
- return PullRequestQuery.parse(inProject?getProject():null, queryString);
- }
-
- @Override
- protected PullRequest getEntity() {
- return getPullRequest();
- }
-
- @Override
- protected List<PullRequest> query(EntityQuery<PullRequest> query, int offset, int count, boolean inProject) {
- return getPullRequestManager().query(inProject?getProject():null, query, offset, count, false, false);
- }
-
- @Override
- protected CursorSupport<PullRequest> getCursorSupport() {
- return new CursorSupport<PullRequest>() {
-
- @Override
- public Cursor getCursor() {
- return WebSession.get().getPullRequestCursor();
- }
-
- @Override
- public void navTo(AjaxRequestTarget target, PullRequest entity, Cursor cursor) {
- WebSession.get().setPullRequestCursor(cursor);
- setResponsePage(getPageClass(), paramsOf(entity));
- }
-
- };
- }
-
- });
-
fragment.add(newMergeStrategyContainer());
fragment.add(new ReviewListPanel("reviews") {
@@ -780,7 +740,46 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
});
- fragment.add(newManageContainer());
+ WebMarkupContainer actions = new WebMarkupContainer("actions");
+ fragment.add(actions);
+ if (SecurityUtils.canManage(getPullRequest().getTargetProject())) {
+ actions.add(new Link<Void>("synchronize") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getPullRequest().isOpen());
+ }
+
+ @Override
+ public void onClick() {
+ getPullRequestManager().check(getPullRequest());
+ if (getPullRequest().getCheckError() == null)
+ Session.get().success("Pull request is synchronized");
+ }
+
+ });
+ actions.add(new Link<Void>("delete") {
+
+ @Override
+ public void onClick() {
+ PullRequest request = getPullRequest();
+ getPullRequestManager().delete(request);
+ Session.get().success("Pull request #" + request.getNumber() + " deleted");
+
+ String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(PullRequest.class);
+ if (redirectUrlAfterDelete != null)
+ throw new RedirectToUrlException(redirectUrlAfterDelete);
+ else
+ setResponsePage(ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(getProject()));
+ }
+
+ }.add(new ConfirmClickModifier("Do you really want to delete this pull request?")));
+ } else {
+ actions.add(new WebMarkupContainer("synchronize"));
+ actions.add(new WebMarkupContainer("delete"));
+ fragment.add(actions);
+ }
fragment.add(new WebSocketObserver() {
@@ -800,45 +799,47 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return fragment;
}
- };
- }
-
- private WebMarkupContainer newManageContainer() {
- WebMarkupContainer container = new WebMarkupContainer("manage");
- container.setVisible(SecurityUtils.canManage(getPullRequest().getTargetProject()));
- container.add(new Link<Void>("synchronize") {
-
@Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getPullRequest().isOpen());
- }
+ protected Component newTitle(String componentId) {
+ return new EntityNavPanel<PullRequest>(componentId) {
- @Override
- public void onClick() {
- getPullRequestManager().check(getPullRequest());
- if (getPullRequest().getCheckError() == null)
- Session.get().success("Pull request is synchronized");
- }
-
- });
- container.add(new Link<Void>("delete") {
+ @Override
+ protected EntityQuery<PullRequest> parse(String queryString, boolean inProject) {
+ return PullRequestQuery.parse(inProject?getProject():null, queryString);
+ }
- @Override
- public void onClick() {
- PullRequest request = getPullRequest();
- getPullRequestManager().delete(request);
- Session.get().success("Pull request #" + request.getNumber() + " deleted");
-
- String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(PullRequest.class);
- if (redirectUrlAfterDelete != null)
- throw new RedirectToUrlException(redirectUrlAfterDelete);
- else
- setResponsePage(ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(getProject()));
+ @Override
+ protected PullRequest getEntity() {
+ return getPullRequest();
+ }
+
+ @Override
+ protected List<PullRequest> query(EntityQuery<PullRequest> query, int offset, int count, boolean inProject) {
+ return getPullRequestManager().query(inProject?getProject():null, query, offset, count, false, false);
+ }
+
+ @Override
+ protected CursorSupport<PullRequest> getCursorSupport() {
+ return new CursorSupport<PullRequest>() {
+
+ @Override
+ public Cursor getCursor() {
+ return WebSession.get().getPullRequestCursor();
+ }
+
+ @Override
+ public void navTo(AjaxRequestTarget target, PullRequest entity, Cursor cursor) {
+ WebSession.get().setPullRequestCursor(cursor);
+ setResponsePage(getPageClass(), paramsOf(entity));
+ }
+
+ };
+ }
+
+ };
}
-
- }.add(new ConfirmClickModifier("Do you really want to delete this pull request?")));
- return container;
+
+ };
}
private WebMarkupContainer newMergeStrategyContainer() {
@@ -984,7 +985,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
});
}
- statusAndBranchesContainer.add(new SideInfoLink("moreInfo"));
+ statusAndBranchesContainer.add(new BookmarkablePageLink<Void>("newPullRequest", NewPullRequestPage.class,
+ NewPullRequestPage.paramsOf(getProject())));
return statusAndBranchesContainer;
}
@@ -1383,7 +1385,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
-
response.render(JavaScriptHeaderItem.forReference(new PullRequestDetailResourceReference()));
response.render(OnDomReadyHeaderItem.forScript("onedev.server.pullRequestDetail.onDomReady();"));
}
@@ -1393,9 +1394,9 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return SecurityUtils.canReadCode(getProject());
}
- private class RequestTab extends PageTab {
+ private class PullRequestTab extends PageTab {
- public RequestTab(String title, Class<? extends Page> pageClass) {
+ public PullRequestTab(String title, Class<? extends Page> pageClass) {
super(Model.of(title), pageClass);
}
@@ -1449,4 +1450,13 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
+ fragment.add(new BookmarkablePageLink<Void>("pullRequests", ProjectPullRequestsPage.class,
+ ProjectPullRequestsPage.paramsOf(getProject())));
+ fragment.add(new Label("pullRequestNumber", "#" + getPullRequest().getNumber()));
+ return fragment;
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
index 954693cd86..7121b24b38 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
@@ -1,15 +1,15 @@
<wicket:extend>
<div wicket:id="activities" class="activities">
- <table>
+ <table class="w-100">
<tr wicket:id="activities" class="activity">
<td class="avatar"><a wicket:id="avatar"></a></td>
<td wicket:id="content" class="content"></td>
</tr>
</table>
- <div wicket:id="addComment"></div>
+ <div wicket:id="addComment" class="mt-4"></div>
</div>
<wicket:fragment wicket:id="loginToCommentFrag">
- <div class="login-to-comment">
+ <div class="login-to-comment alert alert-light-info text-center font-size-h6">
<a wicket:id="login">Login to comment</a>
</div>
</wicket:fragment>
@@ -17,23 +17,20 @@
<form wicket:id="form" class="add-comment leave-confirm no-autofocus">
<div wicket:id="feedback"></div>
<div wicket:id="input" placeholder="Leave a comment"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-primary dirty-aware">Comment</button>
- </div>
+ <button wicket:id="save" class="btn btn-primary dirty-aware mt-3">Comment</button>
</form>
</wicket:fragment>
+ <wicket:fragment wicket:id="sinceChangesRowAvatarFrag">
+ <wicket:svg href="diff" class="icon"/>
+ </wicket:fragment>
<wicket:fragment wicket:id="sinceChangesRowContentFrag">
- <div>
- <wicket:svg href="diff" class="icon"></wicket:svg> <a wicket:id="sinceChanges">Changes since last visit</a>
- </div>
+ <a wicket:id="sinceChanges" class="link-primary font-size-h6">Changes since last visit</a>
</wicket:fragment>
<wicket:fragment wicket:id="optionsFrag">
- <div class="request-activity-options">
- <span class="btn-group">
- <a wicket:id="showComments" class="btn btn-sm btn-outline-secondary" title="Show comments"><wicket:svg href="comments" class="icon"></wicket:svg></a>
- <a wicket:id="showCommits" class="btn btn-sm btn-outline-secondary" title="Show commits"><wicket:svg href="commit" class="icon"></wicket:svg></a>
- <a wicket:id="showChangeHistory" class="btn btn-sm btn-outline-secondary" title="Show change history"><wicket:svg href="history" class="icon"></wicket:svg></a>
- </span>
+ <div class="pull-request-activity-options">
+ <a wicket:id="showComments" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Show comments"><wicket:svg href="comments" class="icon"></wicket:svg></a>
+ <a wicket:id="showCommits" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Show commits"><wicket:svg href="commit" class="icon"></wicket:svg></a>
+ <a wicket:id="showChangeHistory" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Show change history"><wicket:svg href="history" class="icon"></wicket:svg></a>
</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 8364b25e8a..18ef3b82a2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -18,9 +18,11 @@ import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -59,6 +61,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
+import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
@@ -66,7 +69,7 @@ import io.onedev.server.web.page.project.pullrequests.detail.activities.activity
import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestCommentedActivity;
import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestOpenedActivity;
import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestUpdatedActivity;
-import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.page.simple.security.LoginPage;
import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
@@ -197,9 +200,18 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
WebMarkupContainer row = new WebMarkupContainer(id);
row.setOutputMarkupId(true);
- row.add(new WebMarkupContainer("avatar"));
+ String avatarHtml = String.format("<svg class='icon'><use xlink:href='%s'/></svg>", SpriteImage.getVersionedHref("diff"));
+ row.add(new Label("avatar", avatarHtml) {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("div");
+ }
+
+ }.setEscapeModelStrings(false));
+
WebMarkupContainer contentColumn = new Fragment("content", "sinceChangesRowContentFrag", this);
- contentColumn.add(AttributeAppender.append("colspan", "2"));
contentColumn.add(new SinceChangesLink("sinceChanges", requestModel, sinceDate));
row.add(contentColumn);
@@ -239,12 +251,12 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
List<PullRequestActivity> oldActivities = new ArrayList<>();
List<PullRequestActivity> newActivities = new ArrayList<>();
+
for (PullRequestActivity activity: activities) {
- if (request.isVisitedAfter(activity.getDate())) {
+ if (request.isVisitedAfter(activity.getDate()))
oldActivities.add(activity);
- } else {
+ else
newActivities.add(activity);
- }
}
for (PullRequestActivity activity: oldActivities) {
@@ -253,14 +265,8 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
if (!oldActivities.isEmpty() && !newActivities.isEmpty()) {
Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();
- Component row = newSinceChangesRow(activitiesView.newChildId(), sinceDate);
- for (PullRequestActivity activity: newActivities) {
- if (activity instanceof PullRequestUpdatedActivity) {
- row.add(AttributeAppender.append("class", "visible"));
- break;
- }
- }
- activitiesView.add(row);
+ if (newActivities.stream().anyMatch(it -> it instanceof PullRequestUpdatedActivity))
+ activitiesView.add(newSinceChangesRow(activitiesView.newChildId(), sinceDate));
}
for (PullRequestActivity activity: newActivities) {
@@ -390,7 +396,8 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
}
}
- if (sinceChangesRow == null && !newActivities.isEmpty()) {
+ if (sinceChangesRow == null && !newActivities.isEmpty()
+ && newActivities.stream().anyMatch(it -> it instanceof PullRequestUpdatedActivity)) {
Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();
sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);
activitiesView.add(sinceChangesRow);
@@ -438,7 +445,6 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
public Component renderOptions(String componentId) {
Fragment fragment = new Fragment(componentId, "optionsFrag", this);
-
fragment.add(new AjaxLink<Void>("showComments") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
index 78c44e1f22..354627beef 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
@@ -3,21 +3,21 @@
New commits added <span wicket:id="age"></span>
</div>
<div class="body">
- <div wicket:id="tooManyCommits" class="alert alert-warning"></div>
- <div wicket:id="commits">
- <wicket:svg href="commit" class="icon"></wicket:svg>
- <div class="author"><span wicket:id="author"></span></div>
- <div class="message">
+ <div wicket:id="tooManyCommits" class="alert alert-light-warning"></div>
+ <div wicket:id="commits" class="commit d-flex align-items-center">
+ <wicket:svg href="commit" class="icon flex-shrink-0 mr-2"></wicket:svg>
+ <div class="author flex-shrink-0 mr-2"><span wicket:id="author"></span></div>
+ <div class="message mr-3">
<div wicket:id="message"></div>
</div>
- <div class="actions">
- <span wicket:id="buildStatus" class="build-status"></span>
- <span class="btn-group hash">
+ <div class="actions flex-shrink-0 ml-auto d-none d-lg-block">
+ <span wicket:id="buildStatus" class="build-status mr-1"></span>
+ <span class="btn-group hash mr-1">
<a wicket:id="hashLink" class="hash btn btn-sm btn-outline-secondary"><span wicket:id="hash"></span></a>
- <a wicket:id="copyHash" class="btn btn-sm btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
+ <a wicket:id="copyHash" class="btn btn-sm btn-outline-secondary btn-icon"><wicket:svg href="copy" class="icon"></wicket:svg></a>
</span>
<span class="btn-group browse">
- <a wicket:id="browseCode" title="Browse code" class="btn btn-outline-secondary btn-sm"><wicket:svg href="files" class="icon"></wicket:svg></a>
+ <a wicket:id="browseCode" title="Browse code" class="btn btn-outline-secondary btn-sm btn-icon"><wicket:svg href="files" class="icon"></wicket:svg></a>
</span>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
index e49738d1e2..a5d1db0e02 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
@@ -119,20 +119,6 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
browseState.requestId = getUpdate().getRequest().getId();
params = ProjectBlobPage.paramsOf(project, browseState);
item.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));
-
- item.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- commitStatus.configure();
- if (commitStatus.isVisible())
- return "commit with-status";
- else
- return "commit";
- }
-
- }));
-
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
index 4a0fb20c38..e80b7b9a4f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
@@ -1,155 +1,78 @@
-.request-activity-options {
- text-align: right;
+.pull-request-detail>.card-body>.main>.activities .activity.new>.avatar {
+ border-left-color: var(--primary);
}
-.request-activity-options>div {
- padding-left: 12px;
- display: inline-block;
-}
-#request-detail>.main>.activities .activity.new>.avatar {
- border-left-color: #4667EE;
-}
-#request-detail>.main>.activities>table {
+.pull-request-detail>.card-body>.main>.activities>table {
table-layout: fixed;
}
-#request-detail>.main>.activities .activity>td {
- border-bottom: 1px solid #EEE;
- padding: 16px 0;
+.pull-request-detail>.card-body>.main>.activities .activity>td {
+ border-top: 1px solid var(--light-gray);
+ padding: 1.25rem 0;
+ vertical-align: top;
}
-#request-detail>.main>.activities .activity:last-child>td {
- border-bottom: none;
+.pull-request-detail>.card-body>.main>.activities .activity:first-child>td {
+ border-top: none;
}
-#request-detail>.main>.activities .activity>td.avatar {
+.pull-request-detail>.card-body>.main>.activities .activity>td.avatar {
width: 48px;
border-left: 4px solid white;
padding-left: 8px;
}
-#request-detail>.main>.activities .activity>td.avatar .avatar {
+.pull-request-detail>.card-body>.main>.activities .activity>td.avatar .avatar {
width: 40px;
height: 40px;
}
-#request-detail>.main>.activities .activity>td.content {
- padding-left: 16px;
-}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content .alert {
- margin: 16px 0;
+.pull-request-detail>.card-body>.main>.activities .activity>td.content {
+ padding-left: 1.25rem;
}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased,
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased a,
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased span,
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased:before {
- color: #aaa;
+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased,
+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased a,
+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased span,
+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased:before {
+ color: var(--muted);
}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased img {
+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased img {
opacity: 36%;
}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit {
- position: relative;
- margin: 8px 0;
- padding: 4px;
-}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit:hover {
- background: #F7ECB9;
-}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.author {
- position: absolute;
- left:32px;
- top: 2px;
-}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.message {
- padding: 0 130px 0 60px;
+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content {
+ padding-top: 0;
+ padding-bottom: 0;
}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.with-status>.message {
- padding-right: 175px;
+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit {
+ padding: 0.5rem 0;
}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.actions {
- position: absolute;
- top: 4px;
- right: 4px;
-}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.icon {
- position: absolute;
- left: 4px;
- top: 10px;
-}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content {
- padding: 0 0 0 10px;
-}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.head {
+
+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.head {
display: none;
}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body {
+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body {
margin: 0;
}
-
-#request-detail>.main>.activities .activity>td>.content {
- padding-top: 8px;
-}
-#request-detail>.main>.activities .activity>td>.head,
-#request-detail>.main>.activities .activity>td>.content {
- color: #999;
-}
-#request-detail>.main>.activities .activity>td>.head a,
-#request-detail>.main>.activities .activity>td>.content a {
- color: #666;
-}
-#request-detail>.main>.activities .activity>td>.head a.changes,
-#request-detail>.main>.activities .activity>td>.content a.changes {
- margin-left: 8px;
- color: #999;
-}
-#request-detail>.main>.activities .activity>td>.body {
- margin-top: 8px;
-}
-#request-detail>.main>.activities .activity>td.no-body>.head {
- margin-top: 10px;
+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity+.PullRequestUpdatedActivity td {
+ border-top: none;
}
-#request-detail>.main>.activities .add-comment {
- margin-top: 16px;
-}
-#request-detail>.main>.activities .login-to-comment {
- border: 1px solid #EEE;
- vertical-align: center;
- text-align: center;
- padding: 20px;
- font-size: 20px;
- background: #F9F9F9;
- border-radius: 4px;
+.pull-request-detail>.card-body>.main>.activities .activity>td>.body {
+ margin-top: 1rem;
}
-
-#request-detail>.main>.activities .activity.since-changes,
-#request-detail>.main>.activities .activity.since-changes>.avatar {
- display: none;
+.pull-request-detail>.card-body>.main>.activities .activity>td.no-body {
+ vertical-align: middle;
}
-#request-detail>.main>.activities .activity.since-changes.visible {
- display: table-row;
-}
-#request-detail>.main>.activities .activity.since-changes td.content {
- font-size: 16px;
+
+.pull-request-detail>.card-body>.main>.activities .activity.since-changes .avatar div {
+ border-radius: 20px;
+ background: var(--primary);
+ width: 40px;
+ height: 40px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
-#request-detail>.main>.activities .activity.since-changes .icon {
- border-radius: 13px;
- background: #5CA7F8;
- width: 26px;
- height: 26px;
+.pull-request-detail>.card-body>.main>.activities .activity.since-changes .avatar .icon {
+ width: 20px;
+ height: 20px;
color: white;
- padding: 6px;
- margin-right: 4px;
}
-#request-detail>.main>.activities .activity>td.content .plain.diff {
- margin-bottom: 12px;
+.pull-request-detail>.card-body>.main>.activities .activity.since-changes td {
+ vertical-align: middle;
}
-
-@media(max-width: 991px) {
- #request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit .hash,
- #request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit .browse {
- display: none;
- }
- #request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.message {
- padding-right: 0;
- }
- #request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.with-status>.message {
- padding-right: 45px;
- }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html
index aea34ea1d1..0071c18eac 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html
@@ -1,30 +1,30 @@
<wicket:extend>
<div class="changes">
- <div wicket:id="changesHead" class="head clearfix">
- <div class="float-left btn-group">
- <button wicket:id="prevCommitLink" class="btn btn-outline-secondary" title="Previous commit"><wicket:svg href="arrow2" class="icon rotate-180"></wicket:svg></button>
- <button wicket:id="comparingCommits" class="btn btn-outline-secondary"><span wicket:id="label"></span> <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></button>
- <button wicket:id="nextCommitLink" class="btn btn-outline-secondary" title="Next commit"><wicket:svg href="arrow2" class="icon"></wicket:svg></button>
+ <div wicket:id="changesHead" class="head">
+ <div class="btn-group btn-block mb-4">
+ <button wicket:id="prevCommitLink" class="btn btn-light-info btn-icon flex-grow-0 flex-shrink-0" title="Previous commit"><wicket:svg href="arrow" class="icon rotate-180"></wicket:svg></button>
+ <button wicket:id="comparingCommits" class="btn btn-light-info"><span wicket:id="label"></span> <wicket:svg href="arrow" class="ml-1 icon rotate-90"></wicket:svg></button>
+ <button wicket:id="nextCommitLink" class="btn btn-light-info btn-icon flex-grow-0 flex-shrink-0" title="Next commit"><wicket:svg href="arrow" class="icon"></wicket:svg></button>
</div>
<wicket:enclosure child="fullChanges">
- <div class="full-changes float-left">
- <a wicket:id="fullChanges" class="float-left"><wicket:svg href="warning-o" class="icon"></wicket:svg> You are viewing a subset of all changes, click to show all changes</a>
- </div>
+ <div class="alert alert-light-info mb-4">
+ You are viewing a subset of all changes. <a wicket:id="fullChanges">show all changes</a>
+ </div>
</wicket:enclosure>
</div>
<div wicket:id="revisionDiff" class="body"></div>
</div>
<wicket:fragment wicket:id="commitsFrag">
- <div class="commits-selector noselect">
- <div class="short-cuts">
- <a wicket:id="allChanges">All Changes</a>
- <a wicket:id="changesSinceLastReview">Changes Since Last Review</a>
- </div>
- <div class="head clearfix">
- <div class="title float-left">Click to select a commit, or shift-click to select multiple commits</div>
- <a disabled="disabled">show changes</a>
+ <div class="commits-selector noselect p-4">
+ <div class="head">
+ <h6 class="mb-4">Click to select a commit, or shift-click to select multiple commits</h6>
+ <div class="links mb-4">
+ <a wicket:id="allChanges" class="btn btn-light btn-sm mr-2">All changes</a>
+ <a wicket:id="changesSinceLastReview" class="btn btn-light btn-sm mr-2">Changes since last review</a>
+ <a class="btn btn-light btn-sm selected-changes disabled">Show selected changes</a>
+ </div>
</div>
- <ul class="body list-unstyled autosize">
+ <ul class="body list-unstyled autosuit mb-0">
<li wicket:id="commits">
<a unselectable="on">
<wicket:svg href="commit" class="icon" unselectable="on"></wicket:svg>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css
index 16116510c5..31414d7771 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css
@@ -1,61 +1,14 @@
-#request-detail>.main>.changes>.head {
- padding-bottom: 20px;
- border-bottom: 1px dotted #BBB;
- margin-bottom: 20px;
- font-size: 16px;
-}
-#request-detail>.main>.changes>.head .btn {
- font-size: 16px;
-}
-#request-detail>.main>.changes>.head .full-changes {
- margin: 6px 0 0 20px;
-}
-#request-detail>.main>.changes>.head .full-changes a {
- color: #666;
-}
-
-.commits-selector>.short-cuts {
- padding: 8px;
-}
-.commits-selector>.short-cuts>a {
- margin-right: 8px;
- font-size: 16px;
-}
-.commits-selector>.head {
- padding: 8px;
- border-bottom: 1px solid #DDD;
- background: #F5F5F5;
- font-size: 16px;
-}
-.commits-selector>.head>a {
- margin-left: 8px;
-}
-.commits-selector ul {
- margin-bottom: 0;
- padding: 8px;
- overflow-y: auto;
-}
-.commits-selector ul li.rebased a,
-.commits-selector ul li.rebased a span {
- color: #aaa;
-}
.commits-selector ul a {
text-decoration: none;
display: block;
- color: #333;
- padding: 4px 8px;
+ padding: 0.5rem 1rem;
white-space: nowrap;
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
}
.commits-selector ul a:hover {
- background: #F2F2F2;
-}
-.commits-selector ul a.selected {
- background: #FDF2C5;
-}
-.commits-selector ul a.selected:hover {
- background: #FDF2C5;
+ background: var(--light);
+ color: var(--gray-dark);
}
-.commits-selector ul .hash, .commits-selector ul .icon {
- color: #666;
+.commits-selector ul a.selected, .commits-selector ul a.selected:hover {
+ background: var(--light-warning);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.js
index 5cdea025f0..e2ec8da187 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.js
@@ -8,9 +8,9 @@ onedev.server.requestChanges = {
var toIndexToApply = toIndex;
function onIndexChanged() {
- var $apply = $(".commits-selector>.head a");
+ var $apply = $(".commits-selector>.head a.selected-changes");
if (fromIndexToApply != fromIndex || toIndexToApply != toIndex) {
- $apply.removeAttr("disabled").off("click").click(function() {
+ $apply.removeClass("disabled").off("click").click(function() {
var oldCommit;
if (fromIndexToApply == 0)
oldCommit = baseCommit;
@@ -20,7 +20,7 @@ onedev.server.requestChanges = {
callback(oldCommit, newCommit);
});
} else {
- $apply.attr("disabled", "disabled");
+ $apply.addClass("disabled");
}
$commits.removeClass("selected").slice(fromIndexToApply, toIndexToApply+1).addClass("selected");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html
index b207229aee..b9a275b62a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html
@@ -2,33 +2,16 @@
<div wicket:id="content" class="merge-preview"></div>
<wicket:fragment wicket:id="availableFrag">
<div class="available">
- <div class="commits clearfix">
- <div class="commit float-left">
- <div class="title">Base</div>
- <span class="btn-group">
- <a wicket:id="targetHead" class="hash btn btn-sm btn-outline-secondary"><span wicket:id="hash"></span></a>
- <a wicket:id="copyTargetHead" class="btn btn-sm btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
- </span>
- <div class="description">Head of target branch</div>
- </div>
- <div class="vs float-left">VS</div>
- <div class="commit float-left">
- <div class="title">Compare</div>
- <span class="btn-group">
- <a wicket:id="mergedCommit" class="hash btn btn-sm btn-outline-secondary"><span wicket:id="hash"></span></a>
- <a wicket:id="copyMergedCommit" class="btn btn-sm btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
- </span>
- <span wicket:id="buildStatus" class="build-status"></span>
- <div class="description">Merge preview commit</div>
- </div>
+ <div class="alert alert-light-info mb-4">
+ Comparing <a wicket:id="targetHead" class="link-primary">target branch</a> and <a wicket:id="mergedCommit" class="link-primary mr-1">merge preview commit</a> <span wicket:id="buildStatus" class="build-status"></span>
</div>
- <div wicket:id="outDated" class="out-dated alert alert-warning">
- <a wicket:id="link"><wicket:svg href="warning-o" class="icon"></wicket:svg> Merge preview is outdated, click to refresh</a>
+ <div wicket:id="outDated" class="out-dated alert alert-light-warning mb-4">
+ Merge preview is outdated. <a wicket:id="link">Click to refresh</a>
</div>
<div wicket:id="revisionDiff" class="body"></div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="notAvailableFrag">
- <div class="not-available alert alert-warning"><wicket:svg href="info-circle" class="icon"></wicket:svg> Merge preview not available</div>
+ <div class="not-available alert alert-light-warning">Merge preview not available</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
index d287ee60ec..f29aa52d91 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
@@ -9,21 +9,15 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
import com.google.common.collect.Sets;
-import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergePreview;
@@ -32,7 +26,6 @@ import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.util.EditParamsAware;
@@ -99,25 +92,15 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam
CommitDetailPage.State commitState = new CommitDetailPage.State();
commitState.revision = preview.getTargetHeadCommitHash();
PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);
- Link<Void> hashLink = new ViewStateAwarePageLink<Void>("targetHead", CommitDetailPage.class, params);
- fragment.add(hashLink);
- hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getTargetHeadCommitHash())));
- fragment.add(new CopyToClipboardLink("copyTargetHead", Model.of(preview.getTargetHeadCommitHash())));
+ fragment.add(new ViewStateAwarePageLink<Void>("targetHead", CommitDetailPage.class, params));
commitState = new CommitDetailPage.State();
commitState.revision = preview.getMergeCommitHash();
params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);
- hashLink = new ViewStateAwarePageLink<Void>("mergedCommit", CommitDetailPage.class, params);
- fragment.add(hashLink);
- hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getMergeCommitHash())));
- fragment.add(new CopyToClipboardLink("copyMergedCommit", Model.of(preview.getMergeCommitHash())));
+ fragment.add(new ViewStateAwarePageLink<Void>("mergedCommit", CommitDetailPage.class, params));
+
fragment.add(new CommitStatusPanel("buildStatus", ObjectId.fromString(preview.getMergeCommitHash())) {
- @Override
- protected String getCssClasses() {
- return "btn btn-outline-secondary btn-sm";
- }
-
@Override
protected Project getProject() {
return MergePreviewPage.this.getProject();
@@ -263,12 +246,6 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam
pushState(partialPageRequestHandler, url.toString(), state);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MergePreviewResourceReference()));
- }
-
@Override
public PageParameters getParamsBeforeEdit() {
return paramsOf(getPullRequest(), state);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/merge-preview.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/merge-preview.css
deleted file mode 100644
index ebd0cf98f0..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/merge-preview.css
+++ /dev/null
@@ -1,32 +0,0 @@
-#request-detail>.main>.merge-preview>.available>.commits {
- margin-bottom: 20px;
-}
-#request-detail>.main>.merge-preview>.available>.commits>.commit {
- background: #FAFAFA;
- border: 2px solid #E0E0E0;
- padding: 20px;
-}
-#request-detail>.main>.merge-preview>.available>.commits>.vs {
- margin: 55px 20px 0 20px;
- color: #999;
-}
-#request-detail>.main>.merge-preview>.available>.commits>.commit>.title {
- font-size: 16px;
- color: #666;
- margin-bottom: 6px;
-}
-#request-detail>.main>.merge-preview>.available>.commits>.commit>.description {
- font-size: 13px;
- color: #999;
- margin-top: 8px;
-}
-#request-detail>.main>.merge-preview>.available>.commits>.commit span.build-status {
- margin-left: 4px;
-}
-
-#request-detail>.main>.merge-preview>.available>.out-dated a {
- color: #836A05;
-}
-#request-detail>.main>.merge-preview>.not-available {
- font-size: 16px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.html
index 74a9817a21..ddfcba0425 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.html
@@ -3,7 +3,7 @@
<form wicket:id="form" class="leave-confirm">
<div class="modal-header">
<h5 wicket:id="title" id="modal-title" class="modal-title">Please Confirm</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index b1849e911f..647bcac1a3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -1,235 +1,71 @@
-@media(max-width: 1270px) {
- #request-detail>.main ul.nav-tabs>li.collapsed {
- display: block;
- }
- #request-detail>.main ul.nav-tabs>li.expanded {
- display: none;
- }
+.pull-request-detail>.card-body>.main>.summary {
+ border: 2px dashed var(--light-gray);
+ padding: 1.2rem 1.5rem;
+ border-radius: 0.42rem;
}
-
-body.PullRequestDetailPage #layout>.body {
- padding: 59px 0 0 0;
-}
-#request-detail>.main {
- overflow: auto;
- position: relative;
- padding: 20px;
-}
-
-#request-detail>.main>div {
- margin-bottom: 20px;
-}
-#request-detail>.main>.title {
- font-size: 20px;
- font-weight: bold;
- position: relative;
-}
-#request-detail>.main>.title .create {
- margin-left: 8px;
-}
-#request-detail>.main>.title form {
- position: relative;
- padding-right: 100px;
-}
-#request-detail>.main>.title form .actions {
- position: absolute;
- top: 0;
- right: 0;
- margin: 0;
-}
-#request-detail>.main>.title form .actions>:first-child {
- margin-right: 0;
-}
-
-#request-detail>.main>.title a.edit {
- color: #666;
- margin-left: 8px;
-}
-#request-detail>.main>.title input[type=text] {
- font-weight: normal;
-}
-#request-detail>.main>.title .alert {
- font-weight: normal;
- font-size: 14px;
-}
-#request-detail>.main>.status-and-branches {
- position: relative;
- font-size: 16px;
- line-height: 20px;
- margin-bottom: 12px;
- padding-right: 30px;
+.pull-request-detail>.card-body>.main>.summary>div {
+ margin-bottom: 1rem;
}
-#request-detail>.main>.status-and-branches>* {
- margin-bottom: 8px;
-}
-#request-detail>.main>.status-and-branches>.status {
- width: 100px;
- padding: 6px 8px;
- text-overflow: ellipsis;
- overflow: hidden;
- font-size: 16px;
- margin-right: 8px;
- margin-top: -4px;
-}
-
-#request-detail>.main>.status-and-branches>.more-info {
- position: absolute;
- right: 0;
- top: -3px;
- font-size: 24px;
- margin: 0;
- color: #666;
-}
-
-#request-detail>.main>.summary .alert {
+.pull-request-detail>.card-body>.main>.summary>div:last-child {
margin-bottom: 0;
- border-radius: 0;
- border-bottom: 1px dotted #888;
-}
-#request-detail>.main>.summary .alert svg {
- margin-right: 8px;
-}
-#request-detail>.main>.summary>.alert:first-child {
- border-radius: 4px 4px 0 0;
}
-#request-detail>.main>.summary>.alert:last-child {
- border-radius: 0 0 4px 4px;
- border-bottom: none;
+.pull-request-detail>.card-body>.main>.operations>a {
+ margin-bottom: 1.2rem;
+ margin-right: 0.5rem;
}
-#request-detail>.main>.summary>.alert:first-child:last-child {
- border-radius: 4px;
+.pull-request-detail>.card-body>.main>.summary .icon {
+ width: 20px;
+ height: 20px;
+ margin-right: 6px;
+ flex-shrink: 0;
}
-
-#request-detail>.main>.summary>.calculating-merge-preview img {
- width: 18px;
- height: 18px;
- margin: -4px 8px 0 0;
-}
-#request-detail>.main>.summary .more-info.not-link {
- color: inherit;
- cursor: inherit;
-}
-#request-detail>.main>.summary .more-info.not-link:hover {
- text-decoration: inherit;
-}
-
-#request-detail>.main>.operations {
- margin-bottom: 12px;
-}
-#request-detail>.main>.operations>a {
- margin-right: 8px;
- margin-bottom: 8px;
-}
-
-ul>li>a.code-comments .icon {
- display: none;
- fill: #4667EE;
- margin: 0 0 0 4px;
- width: 12px;
- height: 12px;
+.pull-request-detail>.card-body>.main>.summary .icon.spin {
+ width: 24px;
+ height: 24px;
+ margin-left: -2px;
+ margin-right: 4px;
}
ul>li>a.code-comments.new .icon {
- display: inline;
+ width: 0.9rem;
+ height: 0.9rem;
+ fill: var(--primary);
+ display: inline-block !important;
}
-#request-detail>.side-info>.content>.nav {
- font-size: 16px;
- position: relative;
- text-align: center;
- padding-right: 20px;
- border-right: 1px solid #D8D8D8;
- margin-right: 30px;
- display: block;
-}
-#request-detail>.side-info>.content>.nav a {
- position: absolute;
- color: #666;
- top: 0;
-}
-
-#request-detail>.side-info>.content>.nav .prev {
- left: 0;
+.conflict-resolve-instruction {
+ max-width: 480px;
}
-#request-detail>.side-info>.content>.nav .next {
- right: 0;
+.conflict-resolve-instruction ul {
+ padding-left: 0.9rem;
+ list-style: decimal;
+ margin-bottom: 0;
}
-#request-detail>.side-info>.content>div>.head {
- font-weight: bold;
- margin-bottom: 12px;
-}
-#request-detail>.side-info>.content>div>.head>.warning {
- color: #D09022;
-}
-#request-detail>.side-info .pull-request-jobs>.job {
- margin-right: 12px;
- line-height: 24px;
+@media(min-width: 1200px) {
+ .pull-request-detail>.card-body>.main>.summary .more-info,
+ .pull-request-detail>.card-body>.main>.summary .more-info:hover,
+ .pull-request-detail>.card-body>.main>.summary .more-info:focus {
+ color: inherit !important;
+ cursor: inherit !important;
+ }
}
-#request-detail>.side-info {
- width: 360px;
- padding: 20px;
- background: #F9F9F9;
+.pull-request-detail>.card-body>.more-info>.body>* {
+ margin-bottom: 1.5rem;
+ border-top: 1px dashed var(--secondary);
+ padding-top: 1.5rem;
}
-#request-detail>.side-info>.content>* {
- margin-bottom: 20px;
- border-top: 1px solid #E8E8E8;
- padding-top: 20px;
-}
-#request-detail>.side-info>.content>div:first-child {
+.pull-request-detail>.card-body>.more-info>.body>:first-child {
border-top: none;
padding-top: 0;
}
-#request-detail>.side-info>.content .manage .synchronize>.help {
- margin-left: 4px;
- font-size: 16px;
-}
-.conflict-resolve-instruction {
- padding: 12px;
-}
-.conflict-resolve-instruction .title {
- font-weight: bold;
- font-size: 16px;
- text-align: center;
- margin-bottom: 8px;
+.pull-request-detail>.card-body>.more-info>.body>*>.head {
+ font-weight: 600;
+ margin-bottom: 0.8rem;
}
-.conflict-resolve-instruction .body>ul {
- padding-left: 20px;
- margin-bottom: 0;
-}
-.conflict-resolve-instruction .body>ul>li {
- list-style: decimal;
- margin-bottom: 12px;
-}
-.conflict-resolve-instruction .body>ul>li:last-child {
- margin-bottom: 0;
-}
-
-.conflict-resolve-instruction .body>ul>li>.code {
- margin-top: 8px;
-}
-
-@media(min-width: 1150px) {
- #request-detail>.main {
- margin-right: 360px;
- }
- #request-detail .side-info {
- box-shadow: none;
- border-left-width: 4px;
- border-color: #EEE;
- display: block !important;
- }
- #request-detail .side-info.closed {
- display: block;
- }
- #request-detail .status-and-branches a.more-info, #request-detail .side-info>a.close {
- display: none;
- }
- #request-detail>.side-info>.content>.nav {
- padding-right: 0;
- border-right: none;
- margin-right: 0;
- }
+.pull-request-detail>.card-body>.more-info>.body>.reviews>.body>.reviews,
+.pull-request-detail>.card-body>.more-info>.body>.assignments>.body>.assignments {
+ width: 100%;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js
index aa2c831e37..53a6eb57fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js
@@ -1,32 +1,8 @@
onedev.server.pullRequestDetail = {
onDomReady: function() {
- $("body").css("overflow", "hidden");
- var $main = $("#request-detail>.main");
- function adjustHeight() {
- $main.outerHeight($(window).height() - $main.offset().top);
- }
- adjustHeight();
- $main.on("resized", adjustHeight);
- $main.scroll(function() {
- $main.find(".scroll-aware").addBack(".scroll-aware").trigger("scrolled");
+ var $main = $(".pull-request-detail>.card-body>.main");
+ $main.find(">.summary .more-info").click(function() {
+ $main.find(">.status-and-branches .side-info").click();
});
- },
- onSummaryDomReady: function() {
- var $summary = $("#request-detail>.main>.summary");
-
- $summary.find(".more-info").click(function() {
- $("#request-detail>.main>.status-and-branches .more-info").trigger("click");
- });
-
- function modifyMoreInfoLink() {
- $summary.find(".more-info").each(function() {
- if ($("#request-detail>.main>.status-and-branches .more-info").is(":visible"))
- $(this).removeClass("not-link");
- else
- $(this).addClass("not-link");
- });
- }
- modifyMoreInfoLink();
- $summary.on("resized", modifyMoreInfoLink);
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pull-requests.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pull-requests.css
deleted file mode 100644
index 4c9b709e9d..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pull-requests.css
+++ /dev/null
@@ -1,8 +0,0 @@
-#project-pull-requests>.main {
- min-width: 330px;
-}
-.invalid-pullrequest>.head {
- font-size: 18px;
- font-weight: bold;
- margin-bottom: 20px;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.html
index 5c1ff86f8c..b4714581cf 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.html
@@ -1,8 +1,5 @@
<wicket:extend>
- <div id="project-setting">
- <div wicket:id="projectSettingSidebar"></div>
- <div class="content">
- <wicket:child></wicket:child>
- </div>
+ <div class="project-setting p-5">
+ <wicket:child></wicket:child>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
index 814654b910..74ebacb9f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
@@ -1,15 +1,10 @@
package io.onedev.server.web.page.project.setting;
-import java.util.List;
-
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.sidebar.SideBar;
-import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.page.project.ProjectPage;
@SuppressWarnings("serial")
@@ -24,29 +19,11 @@ public abstract class ProjectSettingPage extends ProjectPage {
return SecurityUtils.canManage(getProject());
}
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new SideBar("projectSettingSidebar", null) {
-
- @Override
- protected List<? extends Tab> newTabs() {
- return newSettingTabs();
- }
-
- });
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new ProjectSettingResourceReference()));
- String script = String.format(""
- + "var $projectSetting = $('#project-setting');"
- + "$projectSetting.find('>table').height($projectSetting.parent().outerHeight());");
- response.render(OnDomReadyHeaderItem.forScript(script));
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTab.java
deleted file mode 100644
index 8b7255ecce..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTab.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package io.onedev.server.web.page.project.setting;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.web.component.tabbable.PageTab;
-
-@SuppressWarnings("serial")
-public class ProjectSettingTab extends PageTab {
-
- private final String iconHref;
-
- public ProjectSettingTab(String title, String iconHref,
- Class<? extends ProjectSettingPage> mainPageClass) {
- super(Model.of(title), mainPageClass);
- this.iconHref = iconHref;
- }
-
- public ProjectSettingTab(String title, String iconHref,
- Class<? extends ProjectSettingPage> mainPageClass,
- Class<? extends ProjectSettingPage> additionalPageClass1) {
- super(Model.of(title), mainPageClass, additionalPageClass1);
- this.iconHref = iconHref;
- }
-
- public ProjectSettingTab(String title, String iconHref,
- Class<? extends ProjectSettingPage> mainPageClass,
- Class<? extends ProjectSettingPage> additionalPageClass1,
- Class<? extends ProjectSettingPage> additionalPageClass2) {
- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);
- this.iconHref = iconHref;
- }
-
- public ProjectSettingTab(String title, String iconHref,
- Class<? extends ProjectSettingPage> mainPageClass,
- Class<? extends ProjectSettingPage> additionalPageClass1,
- Class<? extends ProjectSettingPage> additionalPageClass2,
- Class<? extends ProjectSettingPage> additionalPageClass3) {
- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);
- this.iconHref = iconHref;
- }
-
- public ProjectSettingTab(String title, String iconHref,
- Class<? extends ProjectSettingPage> mainPageClass,
- Class<? extends ProjectSettingPage> additionalPageClass1,
- Class<? extends ProjectSettingPage> additionalPageClass2,
- Class<? extends ProjectSettingPage> additionalPageClass3,
- Class<? extends ProjectSettingPage> additionalPageClass4) {
- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,
- additionalPageClass3, additionalPageClass4);
- this.iconHref = iconHref;
- }
-
- public ProjectSettingTab(String title, String iconHref,
- Class<? extends ProjectSettingPage> mainPageClass,
- Class<? extends ProjectSettingPage> additionalPageClass1,
- Class<? extends ProjectSettingPage> additionalPageClass2,
- Class<? extends ProjectSettingPage> additionalPageClass3,
- Class<? extends ProjectSettingPage> additionalPageClass4,
- Class<? extends ProjectSettingPage> additionalPageClass5) {
- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,
- additionalPageClass3, additionalPageClass4, additionalPageClass5);
- this.iconHref = iconHref;
- }
-
- @Override
- public Component render(String componentId) {
- return new ProjectSettingTabHead(componentId, this);
- }
-
- public String getIconHref() {
- return iconHref;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabHead.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabHead.html
deleted file mode 100644
index f2ef7cdc99..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabHead.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<wicket:panel>
- <a wicket:id="link">
- <svg wicket:id="icon" class="icon"></svg>
- <span wicket:id="label" class="text"></span>
- </a>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabHead.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabHead.java
deleted file mode 100644
index 3b6d046a27..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabHead.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.onedev.server.web.page.project.setting;
-
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.page.project.ProjectPage;
-
-@SuppressWarnings("serial")
-public class ProjectSettingTabHead extends Panel {
-
- private final ProjectSettingTab tab;
-
- public ProjectSettingTabHead(String id, ProjectSettingTab tab) {
- super(id);
- this.tab = tab;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- ProjectPage page = (ProjectPage) getPage();
- Link<Void> link = new ViewStateAwarePageLink<Void>("link",
- tab.getMainPageClass(), ProjectPage.paramsOf(page.getProject()));
- link.add(new SpriteImage("icon", tab.getIconHref()));
- link.add(new Label("label", tab.getTitleModel()));
- add(link);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html
index a993dae695..e56cc10bc4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html
@@ -1,10 +1,11 @@
<wicket:extend>
- <div class="page-title">User Authorizations</div>
- <form wicket:id="form" class="authorization-list list">
- <div wicket:id="feedback"></div>
- <div wicket:id="editor"></div>
- <div class="actions">
- <input type="submit" class="btn btn-primary" value="Save">
+ <div class="card">
+ <div class="card-body">
+ <form wicket:id="form" class="authorization-list leave-confirm">
+ <div wicket:id="feedback" class="mb-4"></div>
+ <div wicket:id="editor"></div>
+ <input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">
+ </form>
</div>
- </form>
+ </div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
index c44fc1af6c..b55cf7fd79 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
@@ -5,8 +5,10 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -107,4 +109,10 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {
form.add(PropertyContext.edit("editor", authorizationsBean, "authorizations"));
add(form);
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Project Authorizations");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.html
index 04197a7cd2..932228e1ad 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.html
@@ -1,16 +1,18 @@
<wicket:extend>
- <div class="avatar-edit">
- <div class="current">
- <div class="title">Current avatar</div>
- <img wicket:id="avatar"/>
- <a wicket:id="useDefault" class="btn btn-primary"><wicket:svg href="undo" class="icon"/> Use Default</a>
- </div>
- <div class="use-uploaded">
- <div class="title">Upload avatar</div>
- <form wicket:id="form">
- <div wicket:id="avatar"></div>
- <button wicket:id="upload" type="submit" class="btn btn-primary"><wicket:svg href="upload" class="icon"/> Upload</button>
- </form>
+ <div class="avatar-edit card">
+ <div class="card-body">
+ <div class="current border-bottom pb-5 mb-5">
+ <h6 class="title mb-4">Current avatar</h6>
+ <img wicket:id="avatar"/>
+ <a wicket:id="useDefault" class="btn btn-primary mt-4"><wicket:svg href="undo" class="icon mr-2"/> Use Default</a>
+ </div>
+ <div class="use-uploaded">
+ <h6 class="title mb-4">Upload avatar</h6>
+ <form wicket:id="form">
+ <div wicket:id="avatar"></div>
+ <button wicket:id="upload" type="submit" class="btn btn-primary mt-4"><wicket:svg href="upload" class="icon mr-2"/> Upload</button>
+ </form>
+ </div>
</div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java
index 8797ad768f..0cad9affbe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java
@@ -1,6 +1,8 @@
package io.onedev.server.web.page.project.setting.avatar;
+import org.apache.wicket.Component;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.Link;
@@ -79,5 +81,10 @@ public class AvatarEditPage extends ProjectSettingPage {
add(form);
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Edit Avatar");
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html
index 070576ace9..3f3656d571 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html
@@ -1,12 +1,17 @@
<wicket:panel>
<div class="branch-protection card">
<div class="card-header">
- <span class="drag-indicator"><wicket:svg href="grip" class="icon"/></span>
- <a wicket:id="edit" title="Edit this rule"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete this rule"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- <div class="form-check-inline">
- <input wicket:id="enable" type="checkbox" class="form-check-input">
- <label wicket:id="enableLabel" class="form-check-label">Enable</label>
+ <div class="card-title">
+ <span class="drag-indicator"><wicket:svg href="grip" class="icon mr-4"/></span>
+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-2" title="Edit this rule"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger mr-4" title="Delete this rule"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </div>
+ <div class="card-toolbar">
+ <span class="switch switch-sm switch-primary">
+ <label>
+ <input wicket:id="enable" type="checkbox">
+ </label>
+ </span>
</div>
</div>
<div class="card-body">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
index ef17eb557f..66ed03c991 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
@@ -6,7 +6,6 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
@@ -73,8 +72,7 @@ abstract class BranchProtectionPanel extends Panel {
});
- AjaxCheckBox checkbox;
- add(checkbox = new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
+ add(new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -84,7 +82,6 @@ abstract class BranchProtectionPanel extends Panel {
}
});
- add(new WebMarkupContainer("enableLabel").add(AttributeAppender.append("for", checkbox.getMarkupId())));
add(BeanContext.view("protection", protection).setOutputMarkupId(true));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html
index d515f4e542..fcdfdc970c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html
@@ -1,23 +1,36 @@
<wicket:extend>
- <div class="page-title">Branch Protection</div>
- <div class="help-block">
- Define branch protection rules
- </div>
- <div wicket:id="branchProtectionSetting" class="card-list">
- <ul class="list-unstyled protections">
- <li wicket:id="protections" class="protection"><div wicket:id="protection"></div></li>
- </ul>
- <div wicket:id="newProtection"></div>
+ <div class="branch-protections">
+ <div class="alert alert-info mb-5">
+ <wicket:svg href="bulb" class="icon"></wicket:svg>
+ Define branch protection rules. The first matching rule will take effect
+ </div>
+
+ <div class="body">
+ <div wicket:id="branchProtectionSetting">
+ <ul class="list-unstyled">
+ <li wicket:id="protections" class="protection mb-5"><div wicket:id="protection"></div></li>
+ </ul>
+ <div wicket:id="newProtection"></div>
+ </div>
+ </div>
</div>
<wicket:fragment wicket:id="editNewFrag">
<div class="protection card">
- <div class="card-header">Edit Rule</div>
+ <div class="card-header">
+ <div class="card-title">Edit Rule</div>
+ </div>
<div class="card-body">
<div wicket:id="editor"></div>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="addNewLinkFrag">
- <a wicket:id="link" class="add-new"><wicket:svg href="plus-circle-o" class="icon"></wicket:svg> Add Rule</a>
+ <div class="card">
+ <div class="card-header">
+ <div class="card-title">
+ <a wicket:id="link" class="add-new"><wicket:svg href="plus-circle-o" class="icon align-middle mr-1"></wicket:svg> <span>Add Rule</span></a>
+ </div>
+ </div>
+ </div>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.java
index 11afecbc71..53954de10a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.java
@@ -6,6 +6,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -116,5 +117,10 @@ public class BranchProtectionsPage extends ProjectSettingPage {
fragment.setOutputMarkupId(true);
return fragment;
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Branch Protection");
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.html
index c80f34c474..5ed8142a20 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.html
@@ -3,7 +3,7 @@
<form wicket:id="form" class="leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Edit Action Authorization</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html
index e6b390c4ff..4c9b68e921 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html
@@ -1,18 +1,15 @@
<wicket:extend>
- <div class="action-authorization-list list">
- <div class="help-block">Define rules to authorize build actions. A build action will be allowed
- as long as one rule allows it</div>
- <div class="head clearfix">
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New</a>
- </div>
- </div>
- <div class="body">
- <table wicket:id="authorizations" class="authorizations table table-hover"></table>
+ <div class="alert alert-info mb-5">
+ <wicket:svg href="bulb" class="icon mr-1"/> Define rules to authorize build actions. A build action will be allowed as long as one rule allows it
+ </div>
+ <div class="card">
+ <div class="card-body">
+ <a wicket:id="addNew" class="btn btn-primary btn-icon mb-4" title="Add new action authorzation"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <table wicket:id="authorizations" class="authorizations table"></table>
</div>
</div>
<wicket:fragment wicket:id="actionFrag">
- <a wicket:id="edit" title="Edit this authorization"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete this authorization"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit this authorization"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete this authorization"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
index 6e9d9e8edd..4f9a507604 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
@@ -196,4 +196,9 @@ public class ActionAuthorizationsPage extends BuildSettingPage {
authorizationsTable.setOutputMarkupId(true);
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Action Authorizations");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html
index 559c0e2c27..4869a144c2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html
@@ -1,13 +1,16 @@
<wicket:extend>
- <div class="help-block">Define rules to preserve builds. A build will be preserved as long as one rule preserves it.
- All builds will be preserved if no rules are defined</div>
- <div class="build-preservation-list list">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="feedback"></div>
- <div wicket:id="editor"></div>
- <div class="actions">
- <input type="submit" value="Save" class="dirty-aware btn btn-primary">
- </div>
- </form>
+ <div class="alert alert-info mb-5">
+ <wicket:svg href="bulb" class="icon mr-1"/>
+ Define rules to preserve builds. A build will be preserved as long as one rule preserves it.
+ All builds will be preserved if no rules are defined
+ </div>
+ <div class="card">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="feedback" class="mb-4"></div>
+ <div wicket:id="editor"></div>
+ <input type="submit" value="Save" class="dirty-aware btn btn-primary mt-4">
+ </form>
+ </div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java
index 6822cf0897..6a9b508eb9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java
@@ -2,7 +2,9 @@ package io.onedev.server.web.page.project.setting.build;
import java.io.Serializable;
+import org.apache.wicket.Component;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -45,4 +47,9 @@ public class BuildPreservationsPage extends BuildSettingPage {
add(form);
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Build Preserve Rules");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.html
index 7d7d288e62..ca6ca78725 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.html
@@ -1,7 +1,5 @@
<wicket:extend>
- <div class="page-title">Build Setting</div>
<div class="build-setting">
- <ul wicket:id="buildSettingTabs" class="nav nav-tabs"></ul>
<wicket:child></wicket:child>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java
index dba4fbee3c..41176b109e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java
@@ -1,20 +1,7 @@
package io.onedev.server.web.page.project.setting.build;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.Page;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.web.component.tabbable.PageTab;
-import io.onedev.server.web.component.tabbable.PageTabHead;
-import io.onedev.server.web.component.tabbable.Tab;
-import io.onedev.server.web.component.tabbable.Tabbable;
-import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
@SuppressWarnings("serial")
@@ -24,48 +11,4 @@ public abstract class BuildSettingPage extends ProjectSettingPage {
super(params);
}
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- List<Tab> tabs = new ArrayList<>();
- tabs.add(new PageTab(Model.of("Job Secrets"), JobSecretsPage.class) {
-
- @Override
- public Component render(String componentId) {
- return new TabLink(componentId, this);
- }
-
- });
- tabs.add(new PageTab(Model.of("Action Authorizations"), ActionAuthorizationsPage.class) {
-
- @Override
- public Component render(String componentId) {
- return new TabLink(componentId, this);
- }
-
- });
- tabs.add(new PageTab(Model.of("Build Preserve Rules"), BuildPreservationsPage.class) {
-
- @Override
- public Component render(String componentId) {
- return new TabLink(componentId, this);
- }
-
- });
- add(new Tabbable("buildSettingTabs", tabs));
- }
-
- private class TabLink extends PageTabHead {
-
- public TabLink(String id, PageTab tab) {
- super(id, tab);
- }
-
- @Override
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new BookmarkablePageLink<Void>(linkId, pageClass, ProjectPage.paramsOf(getProject()));
- }
-
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.html
index b6fa546585..72a7bd7a64 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.html
@@ -3,7 +3,7 @@
<form wicket:id="form" class="leave-confirm">
<div class="modal-header">
<h5 id="modal-title" class="modal-title">Edit Job Secret</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="editor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html
index 56450e9dee..d6dfa44645 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html
@@ -1,17 +1,13 @@
<wicket:extend>
- <div class="job-secret-list list">
- <div wicket:id="secretsNote" class="help-block"></div>
- <div class="head clearfix">
- <div class="float-left">
- <a wicket:id="addNew" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> Add New</a>
- </div>
- </div>
- <div class="body">
- <table wicket:id="secrets" class="secrets table table-hover"></table>
+ <div wicket:id="secretsNote" class="alert alert-info mb-5"></div>
+ <div class="card">
+ <div class="card-body">
+ <a wicket:id="addNew" class="btn btn-primary btn-icon mb-4" title="Add new secret"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <table wicket:id="secrets" class="table"></table>
</div>
</div>
<wicket:fragment wicket:id="actionFrag">
- <a wicket:id="edit" title="Edit this secret"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete this secret"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit this secret"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete this secret"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
index 6063f067ad..a9bd6b4312 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
@@ -29,6 +29,7 @@ import io.onedev.server.model.support.inputspec.SecretInput;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
@SuppressWarnings("serial")
public class JobSecretsPage extends BuildSettingPage {
@@ -43,8 +44,10 @@ public class JobSecretsPage extends BuildSettingPage {
protected void onInitialize() {
super.onInitialize();
- String note = String.format("Define job secrets to be used in build spec. Secret value less "
- + "than %d characters will not be masked in build log", SecretInput.MASK.length());
+ String note = String.format("<svg class='icon mr-1'><use xlink:href='%s'/></svg> "
+ + "Define job secrets to be used in build spec. Secret value less "
+ + "than %d characters will not be masked in build log",
+ SpriteImage.getVersionedHref("bulb"), SecretInput.MASK.length());
add(new Label("secretsNote", note).setEscapeModelStrings(false));
add(new AjaxLink<Void>("addNew") {
@@ -210,4 +213,9 @@ public class JobSecretsPage extends BuildSettingPage {
secretsTable.setOutputMarkupId(true);
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Job Secrets");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html
new file mode 100644
index 0000000000..7bfa8974a7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html
@@ -0,0 +1,16 @@
+<wicket:extend>
+ <div class="card">
+ <div class="card-body">
+ <div class="alert alert-light-info">
+ <wicket:svg href="bulb" class="icon"/> <span wicket:id="help"></span>
+ </div>
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor" class="mb-4"></div>
+ <div class="d-flex">
+ <input class="btn btn-primary dirty-aware mr-1" value="Update" type="submit">
+ <a wicket:id="delete" class="delete btn btn-danger ml-auto">Delete</a>
+ </div>
+ </form>
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
index 16d410e3fa..27e4d9110e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.setting.general;
import java.io.Serializable;
import java.util.Collection;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -27,13 +28,13 @@ import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
@SuppressWarnings("serial")
-public class GeneralSettingPage extends ProjectSettingPage {
+public class GeneralProjectSettingPage extends ProjectSettingPage {
private String oldName;
private BeanEditor editor;
- public GeneralSettingPage(PageParameters params) {
+ public GeneralProjectSettingPage(PageParameters params) {
super(params);
}
@@ -85,7 +86,7 @@ public class GeneralSettingPage extends ProjectSettingPage {
} else {
projectManager.save(project, oldName);
Session.get().success("General setting has been updated");
- setResponsePage(GeneralSettingPage.class, paramsOf(project));
+ setResponsePage(GeneralProjectSettingPage.class, paramsOf(project));
}
}
@@ -109,7 +110,7 @@ public class GeneralSettingPage extends ProjectSettingPage {
@Override
protected Project getProject() {
- return GeneralSettingPage.this.getProject();
+ return GeneralProjectSettingPage.this.getProject();
}
};
@@ -120,4 +121,9 @@ public class GeneralSettingPage extends ProjectSettingPage {
add(form);
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "General Setting");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html
deleted file mode 100644
index e6753ba5a2..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<wicket:extend>
- <div class="page-title">General Setting</div>
- <div class="general-setting">
- <p wicket:id="help" class="help-block"></p>
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions">
- <input class="btn btn-primary dirty-aware" value="Update" type="submit">
- <a wicket:id="delete" class="delete btn btn-danger float-right">Delete</a>
- </div>
- </form>
- </div>
-</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
index 86776d0e39..41fe72e3f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
@@ -1,92 +1,23 @@
-body.BranchProtectionsPage, body.TagProtectionsPage, body.WebHooksPage {
- min-width: 768px;
-}
-@media(max-width: 767px) {
- #project-setting>.sidebar {
- display: none;
- }
- #project-setting>.sidebar+.content {
- padding-left: 0 !important;
- }
-}
-@media(max-width: 991px) {
- #project-setting .issue-setting ul.nav-tabs>li.collapsed {
- display: block;
- }
- #project-setting .issue-setting ul.nav-tabs>li.expanded {
- display: none;
- }
-}
-#project-setting>.sidebar {
- left: 240px;
- background: white;
- border-left: none;
- /* make it absolute as we do not want to make it stay fixed to occupy screen space on mobile screen */
- position: absolute;
- z-index: 0;
- /* use hacks below to make the sidebar extend to the screen bottom even if body does not reach to the bottom */
- margin-bottom: -10000px;
- padding-bottom: 10000px;
- width: 260px;
-}
-#project-setting>.sidebar>.tabs>li>a {
- border-left: none;
- padding: 12px 14px;
-}
-#project>.minimized.sidebar+.content>#project-setting>.sidebar {
- left: 44px;
-}
-#project-setting>.sidebar+.content {
- padding-left: 260px;
-}
-#project-setting .general-setting form .delete {
- margin-right: 0;
-}
-
-#project-setting .authorization-list .head .select2-container {
- width: 240px;
-}
-#project-setting .avatar-edit .title {
- font-size: 18px;
- font-weight: bold;
- margin-bottom: 20px;
-}
-#project-setting .avatar-edit>.current {
- margin-bottom: 20px;
- padding-bottom: 20px;
- border-bottom: 1px solid #E8E8E8;
-}
-#project-setting .avatar-edit .current img {
+.project-setting .avatar-edit .current img {
height: 240px;
width: 240px;
display: block;
}
-#project-setting .avatar-edit .current a {
- margin-top: 20px;
-}
-#project-setting .avatar-edit form>button {
- margin-top: 20px;
-}
-#project-setting .authorization-list .select2-container,
-#project-setting .authorization-list .property-roleName .select2-container {
- width: 360px;
+
+.project-setting .authorization-list .select2-container {
+ width: 100%;
}
-#project-setting .web-hook-list table thead th {
+.project-setting .web-hook-list table thead th {
font-weight: bold !important;
}
-#project-setting .web-hook-list table thead th.property-eventTypes {
+.project-setting .web-hook-list table thead th.property-eventTypes {
width: 25%;
}
-#project-setting .web-hook-list table .select2-container {
+.project-setting .web-hook-list table .select2-container {
width: 100%;
}
-body.SecretListPage .help-block {
- margin: 0 0 16px 0;
-}
-
.job-secret-edit textarea {
font-family: monospace;
- height: 200px !important;
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html
index 9b90340e3e..b57ba5740b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html
@@ -1,12 +1,17 @@
<wicket:panel>
<div class="tag-protection card card-default">
<div class="card-header">
- <span class="drag-indicator"><wicket:svg href="grip" class="icon"/></span>
- <a wicket:id="edit" title="Edit this rule"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" title="Delete this rule"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- <div class="form-check-inline">
- <input wicket:id="enable" class="form-check-input" type="checkbox">
- <label wicket:id="enableLabel" class="form-check-label">Enable</label>
+ <div class="card-title">
+ <span class="drag-indicator"><wicket:svg href="grip" class="icon mr-4"/></span>
+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-2" title="Edit this rule"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger mr-4" title="Delete this rule"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </div>
+ <div class="card-toolbar">
+ <span class="switch switch-sm switch-primary">
+ <label>
+ <input wicket:id="enable" type="checkbox">
+ </label>
+ </span>
</div>
</div>
<div class="card-body">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
index dfecd5add1..88e4462570 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
@@ -6,7 +6,6 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
@@ -73,8 +72,7 @@ abstract class TagProtectionPanel extends Panel {
});
- AjaxCheckBox checkbox;
- add(checkbox = new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
+ add(new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -84,7 +82,6 @@ abstract class TagProtectionPanel extends Panel {
}
});
- add(new WebMarkupContainer("enableLabel").add(AttributeAppender.append("for", checkbox.getMarkupId())));
add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html
index e65aa9ea10..f232ca1a5a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html
@@ -1,21 +1,36 @@
<wicket:extend>
- <div class="page-title">Tag Protection</div>
- <div class="help-block">Define tag protection rules</div>
- <div wicket:id="tagProtectionSetting" class="card-list">
- <ul class="list-unstyled protections">
- <li wicket:id="protections" class="protection"><div wicket:id="protection"></div></li>
- </ul>
- <div wicket:id="newProtection"></div>
+ <div class="tag-protections">
+ <div class="alert alert-info mb-5">
+ <wicket:svg href="bulb" class="icon"></wicket:svg>
+ Define tag protection rules. The first matching rule will take effect
+ </div>
+
+ <div class="body">
+ <div wicket:id="tagProtectionSetting">
+ <ul class="list-unstyled">
+ <li wicket:id="protections" class="protection mb-5"><div wicket:id="protection"></div></li>
+ </ul>
+ <div wicket:id="newProtection"></div>
+ </div>
+ </div>
</div>
<wicket:fragment wicket:id="editNewFrag">
<div class="protection card">
- <div class="card-header">Edit Rule</div>
+ <div class="card-header">
+ <div class="card-title">Edit Rule</div>
+ </div>
<div class="card-body">
<div wicket:id="editor"></div>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="addNewLinkFrag">
- <a wicket:id="link" class="add-new"><wicket:svg href="plus-circle-o" class="icon"></wicket:svg> Add Rule</a>
+ <div class="card">
+ <div class="card-header">
+ <div class="card-title">
+ <a wicket:id="link" class="add-new"><wicket:svg href="plus-circle-o" class="icon align-middle mr-1"></wicket:svg> <span>Add Rule</span></a>
+ </div>
+ </div>
+ </div>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.java
index d58c2e7312..17896eb96d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.java
@@ -6,6 +6,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -116,5 +117,10 @@ public class TagProtectionsPage extends ProjectSettingPage {
fragment.setOutputMarkupId(true);
return fragment;
}
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Tag Protection");
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
index b587d56f22..5846db735f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
@@ -1,15 +1,15 @@
<wicket:extend>
- <div class="page-title">Web Hooks</div>
- <div class="help-block">
+ <div class="alert alert-info mb-5">
+ <wicket:svg href="bulb" class="icon mr-1"/>
OneDev will post event data in JSON format to specified URLs when subscribed events happen
</div>
- <div class="web-hook-list list">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="feedback"></div>
- <div wicket:id="editor"></div>
- <div class="actions">
- <input type="submit" value="Save" class="dirty-aware btn btn-primary">
- </div>
- </form>
+ <div class="card">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="feedback" class="mb-4"></div>
+ <div wicket:id="editor"></div>
+ <input type="submit" value="Save" class="dirty-aware btn btn-primary mt-4">
+ </form>
+ </div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java
index a9b494eb29..18d58a1796 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java
@@ -2,7 +2,9 @@ package io.onedev.server.web.page.project.setting.webhook;
import java.io.Serializable;
+import org.apache.wicket.Component;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -45,4 +47,9 @@ public class WebHooksPage extends ProjectSettingPage {
add(form);
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Web Hooks");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
index 3ce7e85d59..0bcea31d84 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
@@ -1,16 +1,20 @@
<wicket:extend>
- <div id="project-contribs">
- <div class="options clearfix">
- <span class="date-range float-left clearfix"></span>
- <select class="contrib-type float-right form-control">
- <option>Commits</option>
- <option>Additions</option>
- <option>Deletions</option>
- </select>
+ <div class="project-contribs p-5">
+ <div wicket:id="note" class="alert alert-info mb-5"></div>
+ <div class="card mb-5">
+ <div class="card-body">
+ <div class="d-flex align-items-center">
+ <span class="date-range mr-3 font-size-h5"></span>
+ <select class="contrib-type custom-select form-control ml-auto">
+ <option>Commits</option>
+ <option>Additions</option>
+ <option>Deletions</option>
+ </select>
+ </div>
+ <div class="overall chart"></div>
+ </div>
</div>
- <div wicket:id="note" class="note"></div>
- <div class="overall chart"></div>
- <div class="top-contributors container-fluid"></div>
+ <div class="top-contributors"></div>
</div>
<div wicket:id="userCard" class="user-card-content"></div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
index 0600d7755d..3d58f27a86 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
@@ -97,4 +97,9 @@ public class ProjectContribsPage extends ProjectStatsPage {
response.render(OnDomReadyHeaderItem.forScript(script));
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Contribution Statistics");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.html
index efd2a2185f..1b617882a4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.html
@@ -1,6 +1,5 @@
<wicket:extend>
- <div id="project-stats">
- <ul wicket:id="statsTabs" class="tabs nav nav-tabs"></ul>
+ <div class="project-stats d-flex flex-column flex-grow-1">
<wicket:child></wicket:child>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java
index 7b5cd3d7ff..a10b653f09 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java
@@ -1,22 +1,10 @@
package io.onedev.server.web.page.project.stats;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.Page;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.tabbable.PageTab;
-import io.onedev.server.web.component.tabbable.PageTabHead;
-import io.onedev.server.web.component.tabbable.Tab;
-import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.ProjectPage;
@SuppressWarnings("serial")
@@ -29,43 +17,6 @@ public abstract class ProjectStatsPage extends ProjectPage {
@Override
protected void onInitialize() {
super.onInitialize();
-
- List<Tab> tabs = new ArrayList<>();
-
- tabs.add(new PageTab(Model.of("Contributions"), ProjectContribsPage.class) {
-
- @Override
- public Component render(String componentId) {
- return new PageTabHead(componentId, this) {
-
- @Override
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<>(linkId, ProjectContribsPage.class,
- ProjectContribsPage.paramsOf(getProject()));
- }
-
- };
- }
-
- });
- tabs.add(new PageTab(Model.of("Source Lines"), SourceLinesPage.class) {
-
- @Override
- public Component render(String componentId) {
- return new PageTabHead(componentId, this) {
-
- @Override
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<>(linkId, SourceLinesPage.class,
- SourceLinesPage.paramsOf(getProject()));
- }
-
- };
- }
-
- });
-
- add(new Tabbable("statsTabs", tabs).setOutputMarkupId(true));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html
index 4c23069eb8..63e930acb0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html
@@ -1,5 +1,7 @@
<wicket:extend>
- <div id="source-lines">
- <div class="chart"></div>
+ <div class="source-lines card m-5 d-flex flex-column flex-grow-1">
+ <div class="card-body d-flex flex-column flex-grow-1 overflow-auto">
+ <div class="chart resize-aware flex-grow-1"></div>
+ </div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
index b2541feeac..af765e558c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
@@ -3,8 +3,10 @@ package io.onedev.server.web.page.project.stats;
import java.util.HashMap;
import java.util.Map;
+import org.apache.wicket.Component;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -41,4 +43,9 @@ public class SourceLinesPage extends ProjectStatsPage {
}
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Line Statistics");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
index 3c22065db3..4b0d515325 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
@@ -1,85 +1,46 @@
-body.SourceLinesPage {
- min-width: 300px;
-}
-#project-contribs .options {
- margin-bottom: 20px;
-}
-#project-stats .note {
- border-top: 1px solid #EEE;
- padding: 20px 0;
- color: #666;
- font-size: 16px;
-}
-#project-contribs .options>.date-range {
- font-size: 20px;
-}
-#project-contribs .options select {
+.project-contribs select {
width: 120px;
}
-#project-contribs .overall {
+.project-contribs .overall {
height: 360px;
- background: #F9F9F9;
- margin-bottom: 20px;
- border: 1px solid #EEE;
}
-#project-contribs .overall .no-data {
+.project-contribs .overall .no-data {
text-align: center;
- font-size: 24px;
- margin-top: 20px;
+ font-size: 2rem;
+ margin-top: 2rem;
font-weight: bold;
}
-#project-contribs .top-contributors .loading {
+
+.project-contribs .top-contributors .loading {
text-align: center;
}
-#project-contribs .top-contributors .head .float-left {
- padding-left: 48px;
- position: relative;
-}
-#project-contribs .top-contributors .head .float-left .avatar {
- position: absolute;
- left: 0;
- top: 0;
- width: 40px;
- height: 40px;
- border-radius: 1000px;
-}
-#project-contribs .top-contributors .row>div {
- padding: 0;
-}
-#project-contribs .top-contributors .row>div>.content {
- border: 1px solid #DDD;
-}
-#project-contribs .top-contributors .head {
- padding: 12px;
-}
-#project-contribs .top-contributors .head .name {
- margin-left: 0 !important;
-}
-#project-contribs .top-contributors .head .total-contribution span {
- margin-right: 12px;
- font-size: 12px;
-}
-#project-contribs .top-contributors .head .total-contribution span.additions {
+.project-contribs .top-contributors .head .total-contribution span.additions {
color: green;
}
-#project-contribs .top-contributors .head .total-contribution span.deletions {
+.project-contribs .top-contributors .head .total-contribution span.deletions {
color: red;
}
-#project-contribs .top-contributors .head .float-right {
- font-size: 20px;
+
+.project-contribs .top-contributors .avatar {
+ width: 36px;
+ height: 36px;
}
-#project-contribs .top-contributors .body {
- background: #F9F9F9;
+.project-contribs .top-contributors .body {
height: 300px;
}
-#source-lines>.chart {
- height: 600px;
- background: #F9F9F9;
- border: 1px solid #EEE;
+.project-contribs .top-contributors .col-xl-6.left {
+ padding-right: 1rem;
+}
+.project-contribs .top-contributors .col-xl-6.right {
+ padding-left: 1rem;
+}
+
+.source-lines .chart {
+ min-height: 400px;
}
-#source-lines .no-data {
+.source-lines .no-data {
text-align: center;
- font-size: 36px;
+ font-size: 3rem;
font-style: italic;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
index af0ce005db..378b6993a1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
@@ -12,7 +12,7 @@ onedev.server.stats = {
contribs: {
onDomReady : function(overallContributions, topContributorsDataUrl, userCardCallback) {
- var $contribs = $("#project-contribs");
+ var $contribs = $(".project-contribs");
var $overall = $contribs.find(".overall");
if (Object.keys(overallContributions).length === 0) {
$overall.html("<div class='no-data'>No data</div>");
@@ -108,17 +108,21 @@ onedev.server.stats = {
brushLink: 'all',
outOfBrush: {
colorAlpha: 0.1
- }
+ },
+ brushStyle: {
+ color: 'rgba(225, 240, 255, 0.5)',
+ borderColor: 'rgba(54, 153, 255, 0.8)'
+ }
},
series: [ {
type: 'line',
symbol: 'none',
smooth: true,
- color: "#19A519",
+ color: "#1BC5BD",
animation: false,
data: getOverallSeriesData(),
areaStyle: {
- color: "#19A519"
+ color: "#1BC5BD"
}
} ]
};
@@ -179,13 +183,13 @@ onedev.server.stats = {
}
function renderContributor($container, contributor, index) {
- var $content = $("<div class='content'></div>");
- $container.append($content);
- var $head = $("<div class='head clearfix'></div>");
- $content.append($head);
- var $left = $("<div class='float-left'></div>");
+ var $contrib = $("<div class='card contrib mb-5'><div class='card-body'></div></div>");
+ $container.append($contrib);
+ var $head = $("<div class='head d-flex align-items-center'></div>");
+ $contrib.children().append($head);
+ var $left = $("<div class='mr-3 d-flex align-items-center'></div>");
$head.append($left);
- $left.append("<a class='user'><img class='avatar' src='" + contributor.authorAvatarUrl + "'></img></a>");
+ $left.append("<a class='user mr-2'><img class='avatar' src='" + contributor.authorAvatarUrl + "'></img></a>");
var alignment = {targetX: 0, targetY: 0, x: 0, y: 100, offset: 8};
$left.find("a.user").hover(function() {
@@ -198,17 +202,19 @@ onedev.server.stats = {
return $card;
}, alignment);
- var nameSpan = "<span class='name'>" + contributor.authorName + "</span>";
- $left.append(nameSpan);
- var $totalContribution = $("<div class='total-contribution'></div>");
- $left.append($totalContribution);
- $totalContribution.append("<span class='commits'>" + contributor.totalCommits + " commits</span>");
- $totalContribution.append("<span class='additions'>" + contributor.totalAdditions + " ++</span>");
+ var $userInfo = $("<div></div>");
+ $left.append($userInfo);
+
+ $userInfo.append("<div class='font-weight-bold'>" + contributor.authorName + "</div>");
+ var $totalContribution = $("<div class='total-contribution font-size-sm'></div>");
+ $userInfo.append($totalContribution);
+ $totalContribution.append("<span class='commits mr-2'>" + contributor.totalCommits + " commits</span>");
+ $totalContribution.append("<span class='additions mr-2'>" + contributor.totalAdditions + " ++</span>");
$totalContribution.append("<span class='deletions'>" + contributor.totalDeletions + " --</span>");
- $head.append("<div class='float-right'>#" + (index + 1) + "</div>");
+ $head.append("<div class='ml-auto font-size-h6 font-weight-bold'>#" + (index + 1) + "</div>");
var $body = $("<div class='body chart'></div>");
- $content.append($body);
+ $contrib.children().append($body);
var chart = echarts.init($body[0]);
$body.data("chart", chart);
@@ -252,13 +258,13 @@ onedev.server.stats = {
},
series: [ {
type: 'line',
- color: "#EEAD08",
+ color: "#FFA800",
symbol: 'none',
smooth: true,
sampling: 'average',
animation: false,
areaStyle: {
- color: "#EEAD08"
+ color: "#FFA800"
},
data: seriesData,
} ]
@@ -269,7 +275,7 @@ onedev.server.stats = {
$topContributors.empty();
var rows = Math.trunc(topContributors.length/2);
for (var i=0; i<rows; i++) {
- var $row = $("<div class='row'><div class='col-md-6 left'></div><div class='col-md-6 right'></div>");
+ var $row = $("<div class='row'><div class='col-xl-6 left'></div><div class='col-xl-6 right'></div>");
$topContributors.append($row);
renderContributor($row.children(".left"), topContributors[i*2], i*2);
renderContributor($row.children(".right"), topContributors[i*2+1], i*2+1);
@@ -314,7 +320,7 @@ onedev.server.stats = {
onDomReady: function(lineIncrements, defaultBranch) {
var numOfTopLanguages = 10;
- var $chart = $("#source-lines>.chart");
+ var $chart = $(".source-lines>div>.chart");
if (lineIncrements.length == 0) {
$chart.append("<div class='no-data'>No data</div>");
return;
@@ -444,7 +450,7 @@ onedev.server.stats = {
}
chart.setOption(option);
- $(window).resize(function() {
+ $chart.on("resized", function() {
chart.resize();
});
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
index eb4305edee..74931ef7df 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
@@ -1,50 +1,48 @@
-<html xmlns:wicket>
<wicket:extend>
- <div class="page-title">Tags</div>
- <div id="project-tags">
- <div class="list">
- <div class="head clearfix">
- <div class="float-left clearable-wrapper">
- <input wicket:id="filterTags" class="form-control search" placeholder="Filter tags">
+ <div class="project-tags card m-5">
+ <div class="card-body">
+ <div class="head d-flex align-items-center flex-wrap">
+ <div class="clearable-wrapper mr-3 mb-4">
+ <input wicket:id="filterTags" class="form-control search" placeholder="Filter tags...">
</div>
- <div class="float-left">
- <a wicket:id="createTag" class="btn btn-success"><wicket:svg href="plus" class="icon"></wicket:svg> New</a>
+ <div class="mb-4 mr-3">
+ <a wicket:id="createTag" class="btn btn-primary btn-icon" title="Create tag"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
- </div>
+ </div>
<div class="body">
- <table wicket:id="tags" class="table table-hover tags"></table>
+ <table wicket:id="tags" class="table tags"></table>
</div>
</div>
</div>
<wicket:fragment wicket:id="tagFrag">
- <div class="title">
- <a wicket:id="tagLink" class="name"><span wicket:id="name"></span></a>
- <span wicket:id="buildStatus" class="build-status"></span>
+ <div class="title my-2">
+ <a wicket:id="tagLink" class="name mr-2"><span wicket:id="name"></span></a>
+ <span wicket:id="buildStatus" class="build-status mr-2"></span>
<span wicket:id="annotated" class="annotated"></span>
</div>
- <div class="commit-message">
- <a wicket:id="messageLink"><span wicket:id="message"></span></a>
+ <div class="commit-message mb-2">
+ <span wicket:id="message"></span>
</div>
- <div class="commit-contributor">
+ <div class="commit-contributor mb-2">
<span wicket:id="contributor" class="contributor"></span>
</div>
- <div class="actions">
- <a wicket:id="download" title="Download tag archive"><wicket:svg href="download" class="icon"/> Download <wicket:svg href="arrow" class="icon icon-sm rotate-90"/></a>
- <a wicket:id="delete" title="Delete this tag"><wicket:svg href="trash" class="icon"></wicket:svg> Delete</a>
+ <div class="actions mb-2">
+ <a wicket:id="download" class="btn btn-light btn-hover-primary btn-sm btn-icon mr-2" title="Download tag archive"><wicket:svg href="download" class="icon"/></a>
+ <a wicket:id="delete" class="btn btn-light btn-hover-danger btn-sm btn-icon" title="Delete this tag"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="annotatedFrag">
<wicket:enclosure child="author">
By <a wicket:id="author"></a>
</wicket:enclosure>
- <a wicket:id="messageToggle" class="ellipsis-expander"><wicket:svg href="ellipsis" class="icon"/></a>
- <pre wicket:id="message" class="message"></pre>
+ <a wicket:id="messageToggle" class="btn btn-xs h-75 btn-secondary btn-icon ml-1"><wicket:svg href="ellipsis" class="icon"/></a>
+ <pre wicket:id="message" class="message text-break"></pre>
</wicket:fragment>
<wicket:fragment wicket:id="createTagFrag">
<form wicket:id="form" class="create-tag">
<div class="modal-header">
<h5 class="modal-title">Create Tag</h5>
- <button wicket:id="close" type="button" class="close">&times;</button>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
@@ -57,4 +55,3 @@
</form>
</wicket:fragment>
</wicket:extend>
-</html>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
index 6a31746af0..cada2c134e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
@@ -75,6 +75,7 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
public class ProjectTagsPage extends ProjectPage {
@@ -327,12 +328,20 @@ public class ProjectTagsPage extends ProjectPage {
fragment.add(new WebMarkupContainer("annotated").setVisible(false));
}
- RevCommit commit = (RevCommit) ref.getPeeledObj();
- PageParameters params = CommitDetailPage.paramsOf(getProject(), commit.name());
+ fragment.add(new Label("message", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ RevCommit commit = (RevCommit) rowModel.getObject().getPeeledObj();
+ PageParameters params = CommitDetailPage.paramsOf(getProject(), commit.name());
+ String commitUrl = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
+ ReferenceTransformer transformer = new ReferenceTransformer(getProject(), commitUrl);
+ return transformer.apply(commit.getShortMessage());
+ }
+
+ }).setEscapeModelStrings(false));
- link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);
- link.add(new Label("message", commit.getShortMessage()));
- fragment.add(link);
+ RevCommit commit = (RevCommit) ref.getPeeledObj();
fragment.add(new ContributorPanel("contributor", commit.getAuthorIdent(), commit.getCommitterIdent()));
@@ -460,4 +469,9 @@ public class ProjectTagsPage extends ProjectPage {
return SecurityUtils.canReadCode(getProject());
}
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Tags");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/project-tags.css b/server-core/src/main/java/io/onedev/server/web/page/project/tags/project-tags.css
index 24706e1043..96a9055b79 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/project-tags.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/project-tags.css
@@ -1,42 +1,21 @@
-#project-tags>.list>.body>table>thead {
+.project-tags .body>table>thead {
display: none;
}
-#project-tags .tag {
- padding: 8px;
+.project-tags .body>table td {
+ padding-left: 0;
+ padding-right: 0;
}
-#project-tags .tag .title>a.name {
+.project-tags .body>table td.tag>.title>.name {
font-weight: bold;
-}
-#project-tags .tag .title>* {
- margin-right: 8px;
-}
-#project-tags .tag .title svg {
- margin: 0;
-}
-
-#project-tags .tag .actions a {
- color: #444;
-}
-#project-tags .annotated {
- color: #999;
- font-size: 12px;
- margin-left: 8px;
-}
-#project-tags .annotated .ellipsis-expander {
- margin-left: 4px;
-}
-#project-tags .annotated .message {
- display: none;
- border: none;
- font-size: 12px;
- background: none;
-}
-#project-tags .annotated>pre {
- margin-bottom: 0;
- padding-bottom: 0
-}
-
-#project-tags .tag>div {
- margin: 8px 0;
+ font-size: 1.1rem;
+}
+.project-tags .annotated .message {
+ display: none;
+ font-size: 0.9rem;
+ border-left: 4px solid var(--secondary);
+ margin: 1rem 0;
+ padding: 0 0 0 1rem;
+ border-radius: 0;
+ white-space: pre-wrap;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListCssResourceReference.java
deleted file mode 100644
index d3e99f7740..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.pullrequests;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class PullRequestListCssResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public PullRequestListCssResourceReference() {
- super(PullRequestListCssResourceReference.class, "pull-request-list.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.html b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.html
index 4b36365d29..932d02800b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.html
@@ -1,7 +1,6 @@
<wicket:extend>
- <div class="page-title">Pull Requests</div>
- <div id="pull-request-list" class="query-save-support">
- <div wicket:id="side" class="side"></div>
- <div wicket:id="main" class="main"></div>
+ <div class="side-main side-main-wrap p-5">
+ <div wicket:id="savedQueries" class="side"></div>
+ <div wicket:id="pullRequests" class="main"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
index 0b65f161e9..7aecb02a9f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
@@ -7,8 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
@@ -61,7 +60,7 @@ public class PullRequestListPage extends LayoutPage {
protected void onInitialize() {
super.onInitialize();
- add(savedQueries = new SavedQueriesPanel<NamedPullRequestQuery>("side") {
+ add(savedQueries = new SavedQueriesPanel<NamedPullRequestQuery>("savedQueries") {
@Override
protected NamedQueriesBean<NamedPullRequestQuery> newNamedQueriesBean() {
@@ -99,8 +98,8 @@ public class PullRequestListPage extends LayoutPage {
}
});
-
- add(requestList = new PullRequestListPanel("main", new IModel<String>() {
+
+ add(requestList = new PullRequestListPanel("pullRequests", new IModel<String>() {
@Override
public void detach() {
@@ -219,12 +218,6 @@ public class PullRequestListPage extends LayoutPage {
target.add(requestList);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new PullRequestListCssResourceReference()));
- }
-
public static PageParameters paramsOf(@Nullable String query, int page) {
PageParameters params = new PageParameters();
if (query != null)
@@ -243,4 +236,10 @@ public class PullRequestListPage extends LayoutPage {
query = getPullRequestSetting().getNamedQueries().iterator().next().getQuery();
return paramsOf(query, page);
}
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Pull Requests");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/pull-request-list.css
deleted file mode 100644
index 2e3c961671..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/pull-request-list.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#pull-request-list>.main {
- min-width: 360px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.html b/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.html
deleted file mode 100644
index 796641e296..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<wicket:extend>
- <div id="forget" class="center-box">
- <h1><wicket:svg href="logo" class="icon logo"></wicket:svg> Reset Password</h1>
- <form wicket:id="form">
- <div wicket:id="feedback"></div>
- <div wicket:id="editor"></div>
- <div class="actions">
- <input wicket:id="resettingPassword" type="submit" value="Reset password" class="btn btn-primary">
- </div>
- </form>
- </div>
-</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.html b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.html
deleted file mode 100644
index 93ba7f3da5..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<wicket:extend>
- <div id="login" class="center-box">
- <h1><wicket:svg href="logo" class="logo icon"></wicket:svg> OneDev Login</h1>
- <div wicket:id="feedback"></div>
- <form wicket:id="form" method="post">
- <div class="input-group username">
- <span class="input-group-prepend"><span class="input-group-text"><wicket:svg href="user" class="icon"></wicket:svg></span></span>
- <input wicket:id="userName" autocomplete="username" type="text" class="form-control input-lg" placeholder="User name" />
- </div>
- <div class="input-group password">
- <span class="input-group-prepend"><span class="input-group-text"><wicket:svg href="key" class="icon"></wicket:svg></span></span>
- <input wicket:id="password" autocomplete="current-password" type="password" class="form-control input-lg" placeholder="Password" />
- </div>
- <div class="row">
- <div class="col-sm-6">
- <div class="form-check form-group">
- <input wicket:id="rememberMe" id="rememberMe" type="checkbox" class="form-check-input">
- <label class="form-check-label" for="rememberMe">Remember Me</label>
- </div>
- </div>
- <div class="col-sm-6">
- <button class="btn btn-primary btn-block" type="submit">Sign in</button>
- </div>
- </div>
- </form>
- <div class="forget-register">
- <a wicket:id="forgetPassword">Forgot your password?</a>
- <a wicket:id="registerUser">Register a user</a>
- </div>
- <wicket:enclosure child="ssoButtons">
- <div class="sso">
- <a wicket:id="ssoButtons" class="btn btn-secondary"><img wicket:id="image"> <span wicket:id="label"></span></a>
- </div>
- </wicket:enclosure>
- </div>
-</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LoginResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/security/LoginResourceReference.java
deleted file mode 100644
index 3d7af853bd..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/security/LoginResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.security;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class LoginResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public LoginResourceReference() {
- super(LoginResourceReference.class, "login.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.html b/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.html
deleted file mode 100644
index 3bc305d5d3..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<wicket:extend>
- <div id="register" class="center-box">
- <h1><wicket:svg href="logo" class="icon logo"></wicket:svg> Register User</h1>
- <form wicket:id="form">
- <div wicket:id="editor"></div>
- <div class="actions">
- <input wicket:id="save" class="btn btn-primary" value="Register" type="submit">
- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
- </div>
- </form>
- </div>
-</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/login.css b/server-core/src/main/java/io/onedev/server/web/page/security/login.css
deleted file mode 100644
index c15d229da2..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/security/login.css
+++ /dev/null
@@ -1,29 +0,0 @@
-#login .username, #login .password {
- margin-bottom: 20px;
-}
-#login .forget-register:not(:empty) {
- margin-top: 20px;
- padding-top: 10px;
- border-top: 1px solid #EEE;
- text-align: right;
-}
-#login .forget-register>a {
- font-size: 16px;
- margin-left: 20px;
-}
-
-#login .sso {
- text-align: right;
- border-top: 2px solid #EEE;
- margin-top: 20px;
- padding-top: 20px;
-}
-#login .sso .btn {
- width: auto;
- margin: 0 0 20px 20px;
-}
-#login .sso img {
- width: 24px;
- height: 24px;
- margin-right: 8px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/SimpleCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/simple/SimpleCssResourceReference.java
new file mode 100644
index 0000000000..f01640ece0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/SimpleCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.simple;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class SimpleCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public SimpleCssResourceReference() {
+ super(SimpleCssResourceReference.class, "simple.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.html
new file mode 100644
index 0000000000..cec6481bd3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.html
@@ -0,0 +1,12 @@
+<wicket:extend>
+ <div class="main text-center">
+ <div class="d-flex justify-content-center">
+ <svg wicket:id="logo" class="logo icon icon-hero"/>
+ </div>
+ <div class="title">
+ <h3 wicket:id="title"></h3>
+ <div wicket:id="subTitle" class="text-muted font-weight-bold sub-title"></div>
+ </div>
+ <wicket:child></wicket:child>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java
new file mode 100644
index 0000000000..2cc175f198
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java
@@ -0,0 +1,47 @@
+package io.onedev.server.web.page.simple;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.page.base.BasePage;
+
+@SuppressWarnings("serial")
+public abstract class SimplePage extends BasePage {
+
+ public SimplePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new SpriteImage("logo", getLogoHref()));
+ add(new Label("title", getTitle()));
+ if (getSubTitle() != null)
+ add(new Label("subTitle", getSubTitle()));
+ else
+ add(new WebMarkupContainer("subTitle").setVisible(false));
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new SimpleCssResourceReference()));
+ }
+
+ protected abstract String getTitle();
+
+ @Nullable
+ protected abstract String getSubTitle();
+
+ protected String getLogoHref() {
+ return "logo";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.html
new file mode 100644
index 0000000000..b4f4c4e9c4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.html
@@ -0,0 +1,9 @@
+<wicket:extend>
+ <div wicket:id="error">
+ <div class="actions">
+ <a wicket:id="home" class="btn btn-light-primary">Back To Home</a>
+ <a wicket:id="showDetail" class="btn btn-primary">Show Error Detail</a>
+ </div>
+ <div wicket:id="errorDetail" class="error-detail alert alert-light"></div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
similarity index 68%
rename from server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
index 65e1dd405c..3b5531690d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
@@ -1,16 +1,11 @@
-package io.onedev.server.web.page.error;
+package io.onedev.server.web.page.simple.error;
import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Throwables;
@@ -20,11 +15,11 @@ import io.onedev.server.OneDev;
import io.onedev.server.web.ExpectedExceptionContribution;
import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.ProjectListPage;
+import io.onedev.server.web.page.simple.SimplePage;
@SuppressWarnings("serial")
-public class GeneralErrorPage extends BasePage {
+public class GeneralErrorPage extends SimplePage {
private static final int MAX_TITLE_LEN = 240;
@@ -57,23 +52,19 @@ public class GeneralErrorPage extends BasePage {
container.setOutputMarkupId(true);
add(container);
- container.add(new Label("title", StringUtils.abbreviate(title, MAX_TITLE_LEN)));
-
container.add(new ViewStateAwarePageLink<Void>("home", ProjectListPage.class));
container.add(new AjaxLink<Void>("showDetail") {
@Override
public void onClick(AjaxRequestTarget target) {
- Fragment fragment = new Fragment("detail", "detailFrag", GeneralErrorPage.this);
- fragment.add(new MultilineLabel("body", detailMessage));
- container.replace(fragment);
+ container.replace(new MultilineLabel("errorDetail", detailMessage));
target.add(container);
setVisible(false);
}
});
- container.add(new WebMarkupContainer("detail"));
+ container.add(new WebMarkupContainer("errorDetail").setVisible(false));
}
@Override
@@ -88,10 +79,18 @@ public class GeneralErrorPage extends BasePage {
}
@Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ErrorPageResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("$('html,body').addClass('error');"));
+ protected String getTitle() {
+ return "OOPS! There Is An Error";
+ }
+
+ @Override
+ protected String getSubTitle() {
+ return StringUtils.abbreviate(title, MAX_TITLE_LEN);
+ }
+
+ @Override
+ protected String getLogoHref() {
+ return "sad-panda";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.html
new file mode 100644
index 0000000000..d77a0b2026
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.html
@@ -0,0 +1,4 @@
+<wicket:extend>
+ <div wicket:id="inUseDetail" class="mb-5 text-left alert alert-light"></div>
+ <a class="btn btn-primary" href="javascript:window.history.back();">Go Back</a>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.java
similarity index 62%
rename from server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.java
index 958a729bac..e48ee56d79 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.java
@@ -1,20 +1,17 @@
-package io.onedev.server.web.page.error;
+package io.onedev.server.web.page.simple.error;
import java.io.Serializable;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.commons.utils.HtmlUtils;
import io.onedev.server.util.usage.InUseException;
-import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.page.simple.SimplePage;
@SuppressWarnings("serial")
-public class InUseErrorPage extends BasePage {
+public class InUseErrorPage extends SimplePage {
private final InUseException exception;
@@ -42,10 +39,18 @@ public class InUseErrorPage extends BasePage {
}
@Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ErrorPageResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("$('html,body').addClass('error');"));
+ protected String getTitle() {
+ return "Unable To Delete Right Now";
}
-
+
+ @Override
+ protected String getSubTitle() {
+ return "The object you are deleting is still being used";
+ }
+
+ @Override
+ protected String getLogoHref() {
+ return "sad-panda";
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/PageNotFoundErrorPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/error/PageNotFoundErrorPage.html
new file mode 100644
index 0000000000..c91a6bc596
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/PageNotFoundErrorPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <a wicket:id="goHome" class="btn btn-primary">Back To Home</a>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/PageNotFoundErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/PageNotFoundErrorPage.java
new file mode 100644
index 0000000000..092f7d26b6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/PageNotFoundErrorPage.java
@@ -0,0 +1,36 @@
+package io.onedev.server.web.page.simple.error;
+
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.web.page.simple.SimplePage;
+
+@SuppressWarnings("serial")
+public class PageNotFoundErrorPage extends SimplePage {
+
+ public PageNotFoundErrorPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new BookmarkablePageLink<Void>("goHome", getApplication().getHomePage()));
+ }
+
+ @Override
+ protected String getLogoHref() {
+ return "sad-panda";
+ }
+
+ @Override
+ protected String getTitle() {
+ return "Page Not Found";
+ }
+
+ @Override
+ protected String getSubTitle() {
+ return "I didn't eat it. I swear!";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html
new file mode 100644
index 0000000000..1c2a9b2773
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html
@@ -0,0 +1,31 @@
+<wicket:extend>
+ <form wicket:id="form" method="post">
+ <div wicket:id="feedback"></div>
+ <div class="form-group">
+ <input wicket:id="userName" autocomplete="username" type="text" class="form-control" placeholder="Login name">
+ </div>
+ <div class="form-group">
+ <input wicket:id="password" autocomplete="current-password" type="password" class="form-control" placeholder="Password">
+ </div>
+ <div class="form-group d-flex flex-wrap justify-content-between">
+ <div class="checkbox-inline">
+ <label class="checkbox text-muted">
+ <input wicket:id="rememberMe" id="rememberMe" type="checkbox" class="form-check-input">
+ Remember Me
+ </label>
+ </div>
+ <a wicket:id="forgetPassword" class="text-muted text-hover-primary">Forgot Password?</a>
+ </div>
+ <button class="btn btn-primary font-weight-bold" type="submit">Sign in</button>
+ </form>
+ <wicket:enclosure child="registerUser">
+ <div class="signup">
+ <span class="opacity-50 mr-3">Don't have an account yet?</span> <a wicket:id="registerUser" class="text-muted text-hover-primary font-weight-bold">Sign Up!</a>
+ </div>
+ </wicket:enclosure>
+ <wicket:enclosure child="ssoButtons">
+ <div class="sso">
+ <a wicket:id="ssoButtons" class="btn btn-light btn-block mb-3"><img wicket:id="image" class="mr-3"> <span wicket:id="label"></span></a>
+ </div>
+ </wicket:enclosure>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java
similarity index 84%
rename from server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java
index 576226d3bc..8398c20787 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.security;
+package io.onedev.server.web.page.simple.security;
import static io.onedev.server.web.page.admin.sso.SsoProcessPage.MOUNT_PATH;
import static io.onedev.server.web.page.admin.sso.SsoProcessPage.STAGE_INITIATE;
@@ -31,10 +31,11 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.page.simple.SimpleCssResourceReference;
+import io.onedev.server.web.page.simple.SimplePage;
@SuppressWarnings("serial")
-public class LoginPage extends BasePage {
+public class LoginPage extends SimplePage {
private String userName;
@@ -60,8 +61,6 @@ public class LoginPage extends BasePage {
protected void onInitialize() {
super.onInitialize();
- add(new FencedFeedbackPanel("feedback"));
-
StatelessForm<?> form = new StatelessForm<Void>("form") {
@Override
@@ -82,6 +81,8 @@ public class LoginPage extends BasePage {
};
+ form.add(new FencedFeedbackPanel("feedback"));
+
if (errorMessage != null)
form.error(errorMessage);
@@ -101,7 +102,8 @@ public class LoginPage extends BasePage {
userName = object;
}
- }));
+ }).setLabel(Model.of("User name")).setRequired(true));
+
form.add(new PasswordTextField("password", new IModel<String>() {
@Override
@@ -118,7 +120,8 @@ public class LoginPage extends BasePage {
password = object;
}
- }));
+ }).setLabel(Model.of("Password")).setRequired(true));
+
form.add(new CheckBox("rememberMe", new IModel<Boolean>() {
@Override
@@ -137,9 +140,7 @@ public class LoginPage extends BasePage {
}));
- add(form);
-
- add(new ViewStateAwarePageLink<Void>("forgetPassword", ForgetPage.class) {
+ form.add(new ViewStateAwarePageLink<Void>("forgetPassword", PasswordResetPage.class) {
@Override
protected void onConfigure() {
@@ -149,10 +150,12 @@ public class LoginPage extends BasePage {
});
+ add(form);
+
SettingManager settingManager = OneDev.getInstance(SettingManager.class);
boolean enableSelfRegister = settingManager.getSecuritySetting().isEnableSelfRegister();
- add(new ViewStateAwarePageLink<Void>("registerUser", RegisterPage.class).setVisible(enableSelfRegister));
+ add(new ViewStateAwarePageLink<Void>("registerUser", SignUpPage.class).setVisible(enableSelfRegister));
String serverUrl = settingManager.getSystemSetting().getServerUrl();
@@ -171,7 +174,17 @@ public class LoginPage extends BasePage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new LoginResourceReference()));
+ response.render(CssHeaderItem.forReference(new SimpleCssResourceReference()));
+ }
+
+ @Override
+ protected String getTitle() {
+ return "Sign In To OneDev";
+ }
+
+ @Override
+ protected String getSubTitle() {
+ return "Enter your details to login to your account";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LogoutPage.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/simple/security/LogoutPage.java
index 164747e051..7a7f74efe5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LogoutPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.security;
+package io.onedev.server.web.page.simple.security;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.html
new file mode 100644
index 0000000000..a3ca61a95a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.html
@@ -0,0 +1,10 @@
+<wicket:extend>
+ <form wicket:id="form" method="post">
+ <div wicket:id="feedback"></div>
+ <div class="form-group">
+ <input wicket:id="loginNameOrEmail" autocomplete="username" type="text" class="form-control" placeholder="Login name or email">
+ </div>
+ <button wicket:id="resettingPassword" class="btn btn-primary font-weight-bold mr-1" type="submit">Reset</button>
+ <button wicket:id="cancel" class="btn btn-light-primary font-weight-bold">Cancel</button>
+ </form>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
similarity index 61%
rename from server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
index ff5e00a008..ad4a88bd3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
@@ -1,32 +1,35 @@
-package io.onedev.server.web.page.security;
+package io.onedev.server.web.page.simple.security;
-import java.io.Serializable;
import java.util.Arrays;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.wicket.Application;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.launcher.loader.AppLoader;
-import io.onedev.server.OneDev;
import io.onedev.server.GeneralException;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.notification.MailManager;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.component.taskbutton.TaskButton;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.page.simple.SimplePage;
@SuppressWarnings("serial")
-public class ForgetPage extends BasePage {
+public class PasswordResetPage extends SimplePage {
- public ForgetPage(PageParameters params) {
+ private String loginNameOrEmail;
+
+ public PasswordResetPage(PageParameters params) {
super(params);
}
@@ -34,22 +37,36 @@ public class ForgetPage extends BasePage {
protected void onInitialize() {
super.onInitialize();
- HelperBean bean = new HelperBean();
Form<?> form = new Form<Void>("form");
form.add(new FencedFeedbackPanel("feedback", form));
- form.add(BeanContext.edit("editor", bean));
+ form.add(new TextField<String>("loginNameOrEmail", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return loginNameOrEmail;
+ }
+
+ @Override
+ public void setObject(String object) {
+ loginNameOrEmail = object;
+ }
+
+ }).setLabel(Model.of("Login name or email")).setRequired(true));
form.add(new TaskButton("resettingPassword") {
@Override
- protected String runTask(JobLogger logger) {
+ protected String runTask(SimpleLogger logger) {
UserManager userManager = OneDev.getInstance(UserManager.class);
- User user = userManager.findByName(bean.getUserNameOrEmailAddress());
- if (user == null) {
- user = userManager.findByEmail(bean.getUserNameOrEmailAddress());
- }
+ User user = userManager.findByName(loginNameOrEmail);
+ if (user == null)
+ user = userManager.findByEmail(loginNameOrEmail);
if (user == null) {
- throw new GeneralException("No user found with name or email: " + bean.getUserNameOrEmailAddress());
+ throw new GeneralException("No user found with login name or email: " + loginNameOrEmail);
} else {
SettingManager settingManager = OneDev.getInstance(SettingManager.class);
if (settingManager.getMailSetting() != null) {
@@ -69,9 +86,8 @@ public class ForgetPage extends BasePage {
user.getDisplayName(), user.getName(), serverUrl, serverUrl, password);
String textBody = String.format("Dear %s,\n\n"
- + "Per your request, password of your login \"%s\" at %s has been reset to:\n"
- + "%s\n\n"
- + "Please login and change the password in your earliest convenience.",
+ + "Per your request, password of account \"%s\" at %s has been reset to:\n"
+ + "%s",
user.getDisplayName(), user.getName(), serverUrl, password);
mailManager.sendMail(settingManager.getMailSetting(), Arrays.asList(user.getEmail()),
@@ -85,23 +101,26 @@ public class ForgetPage extends BasePage {
});
- add(form);
- }
+ form.add(new Link<Void>("cancel") {
- @Editable
- public static class HelperBean implements Serializable {
+ @Override
+ public void onClick() {
+ setResponsePage(Application.get().getHomePage());
+ }
+
+ });
- private String userNameOrEmailAddress;
-
- @Editable(name="Please specify your user name or email address")
- @NotEmpty
- public String getUserNameOrEmailAddress() {
- return userNameOrEmailAddress;
- }
+ add(form);
+ }
+
+ @Override
+ protected String getTitle() {
+ return "Forgotten Password?";
+ }
- public void setUserNameOrEmailAddress(String userNameOrEmailAddress) {
- this.userNameOrEmailAddress = userNameOrEmailAddress;
- }
-
+ @Override
+ protected String getSubTitle() {
+ return "Enter your user name or email to reset password";
}
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.html
new file mode 100644
index 0000000000..22d013d782
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.html
@@ -0,0 +1,7 @@
+<wicket:extend>
+ <form wicket:id="form">
+ <div wicket:id="editor"></div>
+ <input wicket:id="save" class="btn btn-primary" value="Sign Up" type="submit">
+ <a wicket:id="cancel" class="btn btn-light-primary">Cancel</a>
+ </form>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
similarity index 80%
rename from server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
index a72b090115..a96e77f528 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.security;
+package io.onedev.server.web.page.simple.security;
import org.apache.shiro.authc.credential.PasswordService;
import org.apache.shiro.authz.UnauthenticatedException;
@@ -18,18 +18,18 @@ import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
-import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.my.avatar.MyAvatarPage;
import io.onedev.server.web.page.project.ProjectListPage;
+import io.onedev.server.web.page.simple.SimplePage;
@SuppressWarnings("serial")
-public class RegisterPage extends BasePage {
+public class SignUpPage extends SimplePage {
- public RegisterPage(PageParameters params) {
+ public SignUpPage(PageParameters params) {
super(params);
if (!OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfRegister())
- throw new UnauthenticatedException("User self-register is disabled");
+ throw new UnauthenticatedException("User sign-up is disabled");
if (getLoginUser() != null)
throw new IllegalStateException("Can not sign up a user while signed in");
}
@@ -38,8 +38,8 @@ public class RegisterPage extends BasePage {
protected void onInitialize() {
super.onInitialize();
- final User user = new User();
- final BeanEditor editor = BeanContext.edit("editor", user);
+ User user = new User();
+ BeanEditor editor = BeanContext.edit("editor", user);
Form<?> form = new Form<Void>("form") {
@@ -59,9 +59,10 @@ public class RegisterPage extends BasePage {
"This email has already been used by another user.");
}
if (editor.isValid()) {
+ User user = new User();
user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(user.getPassword()));
userManager.save(user, null);
- Session.get().success("New user registered");
+ Session.get().success("Welcome to OneDev");
SecurityUtils.getSubject().runAs(user.getPrincipals());
setResponsePage(MyAvatarPage.class);
}
@@ -82,4 +83,14 @@ public class RegisterPage extends BasePage {
add(form);
}
+ @Override
+ protected String getTitle() {
+ return "Sign Up";
+ }
+
+ @Override
+ protected String getSubTitle() {
+ return "Enter your details to create your account";
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.html
new file mode 100644
index 0000000000..385d97eb8e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.html
@@ -0,0 +1,5 @@
+<wicket:extend>
+ <div class="main server-init">
+ <div wicket:id="wizard"></div>
+ </div>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.java
index fa7b4cbbc6..50e79f0b82 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.java
@@ -1,15 +1,13 @@
-package io.onedev.server.web.page.init;
+package io.onedev.server.web.page.simple.serverinit;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -22,11 +20,11 @@ import io.onedev.server.util.init.Skippable;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.component.wizard.ManualConfigStep;
import io.onedev.server.web.component.wizard.Wizard;
-import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.ProjectListPage;
+import io.onedev.server.web.page.simple.SimplePage;
@SuppressWarnings("serial")
-public class ServerInitPage extends BasePage {
+public class ServerInitPage extends SimplePage {
private InitStage initStage;
@@ -90,8 +88,6 @@ public class ServerInitPage extends BasePage {
protected void onInitialize() {
super.onInitialize();
- add(new Label("title", initStage.getMessage()));
-
if (!initStage.getManualConfigs().isEmpty()) {
List<ManualConfigStep> configSteps = new ArrayList<ManualConfigStep>();
for (ManualConfig each: initStage.getManualConfigs())
@@ -115,10 +111,8 @@ public class ServerInitPage extends BasePage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ServerInitResourceReference()));
-
if (initStage.getManualConfigs().isEmpty())
- response.render(OnDomReadyHeaderItem.forScript("$('#server-init').addClass('inited');"));
+ response.render(OnDomReadyHeaderItem.forScript("$('.server-init').addClass('inited');"));
}
@Override
@@ -129,4 +123,14 @@ public class ServerInitPage extends BasePage {
return 0;
}
+ @Override
+ protected String getTitle() {
+ return initStage.getMessage();
+ }
+
+ @Override
+ protected String getSubTitle() {
+ return null;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
new file mode 100644
index 0000000000..7a0b1182e3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
@@ -0,0 +1,77 @@
+html {
+ background: url(/img/mesh.jpg) no-repeat left top fixed;
+ background-size: cover;
+}
+body {
+ background: transparent;
+ display: flex;
+}
+.main {
+ padding: 1.75rem;
+ max-width: 500px;
+ width: 100%;
+ margin: auto;
+}
+.GeneralErrorPage .main {
+ max-width: 900px;
+}
+
+.main .logo.icon {
+ color: var(--primary);
+ margin-bottom: 3rem;
+}
+.main .title {
+ margin-bottom: 5rem;
+}
+.main .btn {
+ padding: 1rem 2.25rem;
+ margin: 0.75rem 1rem;
+}
+.main .signup {
+ margin-top: 2.5rem;
+}
+.main .sso {
+ margin-top: 6rem;
+}
+.main .sso img {
+ width: 24px;
+ height: 24px;
+}
+.main .feedbackPanel {
+ text-align: left;
+ margin-bottom: 1.5rem;
+}
+.main .form-group {
+ margin-bottom: 1.5rem;
+ text-align: left;
+}
+.main .form-control {
+ padding: 1rem 2rem;
+ background-color: var(--light);
+ border-color: var(--light);
+ color: var(--gray-dark);
+ height: auto;
+}
+.main .form-control:focus {
+ background-color: var(--light-gray);
+ border-color: var(--light-gray);
+}
+.main .wizard .title {
+ margin-top: -6rem;
+ color: var(--muted);
+}
+
+.main .error-detail {
+ margin-top: 2rem;
+ text-align: left;
+ white-space: pre-wrap;
+ word-wrap: break-word;
+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+}
+
+.PageNotFoundErrorPage h3 {
+ font-size: 3rem;
+}
+.PageNotFoundErrorPage .sub-title {
+ font-size: 1.5rem !important;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 066be5dd6a..ed02a2ced3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -18,7 +18,7 @@ public class TestPage extends BasePage {
protected void onInitialize() {
super.onInitialize();
}
-
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
index 9e09bfee54..589f5d4db1 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
@@ -45,7 +45,7 @@ public class ReferenceTransformer implements Function<String, String> {
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
- return "<a class='embedded-reference' href='" + RequestCycle.get().urlFor(IssueActivitiesPage.class,
+ return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(IssueActivitiesPage.class,
IssueActivitiesPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";
}
@@ -55,7 +55,7 @@ public class ReferenceTransformer implements Function<String, String> {
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
- return "<a class='embedded-reference' href='" + RequestCycle.get().urlFor(PullRequestActivitiesPage.class,
+ return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(PullRequestActivitiesPage.class,
PullRequestActivitiesPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";
}
@@ -65,7 +65,7 @@ public class ReferenceTransformer implements Function<String, String> {
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
- return "<a class='embedded-reference' href='" + RequestCycle.get().urlFor(BuildDashboardPage.class,
+ return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(BuildDashboardPage.class,
BuildDashboardPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/Testable.java b/server-core/src/main/java/io/onedev/server/web/util/Testable.java
index 7f809af429..ab1dd45149 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/Testable.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/Testable.java
@@ -2,10 +2,10 @@ package io.onedev.server.web.util;
import java.io.Serializable;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
public interface Testable<T extends Serializable> {
- void test(T data, JobLogger logger);
+ void test(T data, SimpleLogger logger);
}
diff --git a/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java b/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
index 047bf9cb33..f104152e5b 100644
--- a/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
+++ b/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
@@ -290,7 +290,6 @@ public class ServletWebResponse extends WebResponse
String script = String.format(""
+ "<script type='application/javascript'>"
- + " console.log('shit');"
+ " function getKey(url) {"
+ " var key = url;"
+ " if (key.indexOf('#') != -1)"
diff --git a/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java b/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java
new file mode 100644
index 0000000000..77a8be762c
--- /dev/null
+++ b/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java
@@ -0,0 +1,1817 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.internal.engine;
+
+import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashMap;
+import static org.hibernate.validator.internal.util.logging.Messages.MESSAGES;
+
+import java.lang.annotation.ElementType;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+
+import javax.validation.ConstraintValidatorFactory;
+import javax.validation.ConstraintViolation;
+import javax.validation.ElementKind;
+import javax.validation.MessageInterpolator;
+import javax.validation.ParameterNameProvider;
+import javax.validation.Path;
+import javax.validation.TraversableResolver;
+import javax.validation.Validator;
+import javax.validation.executable.ExecutableValidator;
+import javax.validation.groups.Default;
+import javax.validation.metadata.BeanDescriptor;
+
+import org.hibernate.validator.HibernateValidatorPermission;
+import org.hibernate.validator.internal.engine.ValidationContext.ValidationContextBuilder;
+import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;
+import org.hibernate.validator.internal.engine.groups.Group;
+import org.hibernate.validator.internal.engine.groups.GroupWithInheritance;
+import org.hibernate.validator.internal.engine.groups.Sequence;
+import org.hibernate.validator.internal.engine.groups.ValidationOrder;
+import org.hibernate.validator.internal.engine.groups.ValidationOrderGenerator;
+import org.hibernate.validator.internal.engine.path.NodeImpl;
+import org.hibernate.validator.internal.engine.path.PathImpl;
+import org.hibernate.validator.internal.engine.resolver.CachingTraversableResolverForSingleValidation;
+import org.hibernate.validator.internal.engine.valuehandling.UnwrapMode;
+import org.hibernate.validator.internal.metadata.BeanMetaDataManager;
+import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;
+import org.hibernate.validator.internal.metadata.aggregated.ExecutableMetaData;
+import org.hibernate.validator.internal.metadata.aggregated.ParameterMetaData;
+import org.hibernate.validator.internal.metadata.aggregated.PropertyMetaData;
+import org.hibernate.validator.internal.metadata.aggregated.ReturnValueMetaData;
+import org.hibernate.validator.internal.metadata.core.MetaConstraint;
+import org.hibernate.validator.internal.metadata.facets.Cascadable;
+import org.hibernate.validator.internal.metadata.facets.Validatable;
+import org.hibernate.validator.internal.metadata.raw.ExecutableElement;
+import org.hibernate.validator.internal.util.ConcurrentReferenceHashMap;
+import org.hibernate.validator.internal.util.ConcurrentReferenceHashMap.ReferenceType;
+import org.hibernate.validator.internal.util.Contracts;
+import org.hibernate.validator.internal.util.ReflectionHelper;
+import org.hibernate.validator.internal.util.TypeHelper;
+import org.hibernate.validator.internal.util.TypeResolutionHelper;
+import org.hibernate.validator.internal.util.logging.Log;
+import org.hibernate.validator.internal.util.logging.LoggerFactory;
+import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredField;
+import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredMethod;
+import org.hibernate.validator.internal.util.privilegedactions.SetAccessibility;
+import org.hibernate.validator.spi.time.TimeProvider;
+import org.hibernate.validator.spi.valuehandling.ValidatedValueUnwrapper;
+
+/**
+ * The main Bean Validation class. This is the core processing class of Hibernate Validator.
+ *
+ * @author Emmanuel Bernard
+ * @author Hardy Ferentschik
+ * @author Gunnar Morling
+ * @author Kevin Pollet &lt;[email protected]&gt; (C) 2011 SERLI
+ * @author Guillaume Smet
+ */
+public class ValidatorImpl implements Validator, ExecutableValidator {
+
+ /**
+ * For compatibility with JDK 7 we cannot use ElementType#TYPE_USE
+ */
+ private static final String TYPE_USE = "TYPE_USE";
+
+ private static final Log log = LoggerFactory.make();
+
+ /**
+ * The default group array used in case any of the validate methods is called without a group.
+ */
+ private static final Collection<Class<?>> DEFAULT_GROUPS = Collections.<Class<?>>singletonList( Default.class );
+
+ /**
+ * Used to resolve the group execution order for a validate call.
+ */
+ private final transient ValidationOrderGenerator validationOrderGenerator;
+
+ /**
+ * Reference to shared {@code ConstraintValidatorFactory}.
+ */
+ private final ConstraintValidatorFactory constraintValidatorFactory;
+
+ /**
+ * {@link MessageInterpolator} as passed to the constructor of this instance.
+ */
+ private final MessageInterpolator messageInterpolator;
+
+ /**
+ * {@link TraversableResolver} as passed to the constructor of this instance.
+ * Never use it directly, always use {@link #getCachingTraversableResolver()} to retrieved the single threaded caching wrapper.
+ */
+ private final TraversableResolver traversableResolver;
+
+ /**
+ * Used to get access to the bean meta data. Used to avoid to parsing the constraint configuration for each call
+ * of a given entity.
+ */
+ private final BeanMetaDataManager beanMetaDataManager;
+
+ /**
+ * Manages the life cycle of constraint validator instances
+ */
+ private final ConstraintValidatorManager constraintValidatorManager;
+
+ /**
+ * Used for retrieving parameter names to be used in constraint violations or node names.
+ */
+ private final ParameterNameProvider parameterNameProvider;
+
+ private final TimeProvider timeProvider;
+
+ /**
+ * Indicates if validation has to be stopped on first constraint violation.
+ */
+ private final boolean failFast;
+
+ /**
+ * Used for resolving generic type information.
+ */
+ private final TypeResolutionHelper typeResolutionHelper;
+
+ /**
+ * Contains handlers to be applied prior to validation when validating elements.
+ */
+ private final List<ValidatedValueUnwrapper<?>> validatedValueHandlers;
+
+ /**
+ * Keeps an accessible version for each non-accessible member whose value needs to be accessed during validation.
+ */
+ private final ConcurrentMap<Member, Member> accessibleMembers;
+
+ public ValidatorImpl(ConstraintValidatorFactory constraintValidatorFactory,
+ MessageInterpolator messageInterpolator,
+ TraversableResolver traversableResolver,
+ BeanMetaDataManager beanMetaDataManager,
+ ParameterNameProvider parameterNameProvider,
+ TimeProvider timeProvider,
+ TypeResolutionHelper typeResolutionHelper,
+ List<ValidatedValueUnwrapper<?>> validatedValueHandlers,
+ ConstraintValidatorManager constraintValidatorManager,
+ boolean failFast) {
+ this.constraintValidatorFactory = constraintValidatorFactory;
+ this.messageInterpolator = messageInterpolator;
+ this.traversableResolver = traversableResolver;
+ this.beanMetaDataManager = beanMetaDataManager;
+ this.parameterNameProvider = parameterNameProvider;
+ this.timeProvider = timeProvider;
+ this.typeResolutionHelper = typeResolutionHelper;
+ this.validatedValueHandlers = validatedValueHandlers;
+ this.constraintValidatorManager = constraintValidatorManager;
+ this.failFast = failFast;
+
+ validationOrderGenerator = new ValidationOrderGenerator();
+
+ this.accessibleMembers = new ConcurrentReferenceHashMap<Member, Member>(
+ 100,
+ ReferenceType.SOFT,
+ ReferenceType.SOFT
+ );
+ }
+
+ @Override
+ public final <T> Set<ConstraintViolation<T>> validate(T object, Class<?>... groups) {
+ Contracts.assertNotNull( object, MESSAGES.validatedObjectMustNotBeNull() );
+
+ if ( !beanMetaDataManager.isConstrained( object.getClass() ) ) {
+ return Collections.emptySet();
+ }
+
+ ValidationOrder validationOrder = determineGroupValidationOrder( groups );
+ ValidationContext<T> validationContext = getValidationContext().forValidate( object );
+
+ ValueContext<?, Object> valueContext = ValueContext.getLocalExecutionContext(
+ object,
+ beanMetaDataManager.getBeanMetaData( object.getClass() ),
+ PathImpl.createRootPath()
+ );
+
+ return validateInContext( valueContext, validationContext, validationOrder );
+ }
+
+ @Override
+ public final <T> Set<ConstraintViolation<T>> validateProperty(T object, String propertyName, Class<?>... groups) {
+ Contracts.assertNotNull( object, MESSAGES.validatedObjectMustNotBeNull() );
+
+ sanityCheckPropertyPath( propertyName );
+ ValidationOrder validationOrder = determineGroupValidationOrder( groups );
+ ValidationContext<T> context = getValidationContext().forValidateProperty( object );
+
+ if ( !beanMetaDataManager.isConstrained( context.getRootBeanClass() ) ) {
+ return Collections.emptySet();
+ }
+
+ return validatePropertyInContext(
+ context,
+ PathImpl.createPathFromString( propertyName ),
+ validationOrder
+ );
+ }
+
+ @Override
+ public final <T> Set<ConstraintViolation<T>> validateValue(Class<T> beanType, String propertyName, Object value, Class<?>... groups) {
+ Contracts.assertNotNull( beanType, MESSAGES.beanTypeCannotBeNull() );
+
+ if ( !beanMetaDataManager.isConstrained( beanType ) ) {
+ return Collections.emptySet();
+ }
+
+ sanityCheckPropertyPath( propertyName );
+ ValidationOrder validationOrder = determineGroupValidationOrder( groups );
+ ValidationContext<T> context = getValidationContext().forValidateValue( beanType );
+
+ return validateValueInContext(
+ context,
+ value,
+ PathImpl.createPathFromString( propertyName ),
+ validationOrder
+ );
+ }
+
+ @Override
+ public <T> Set<ConstraintViolation<T>> validateParameters(T object, Method method, Object[] parameterValues, Class<?>... groups) {
+ Contracts.assertNotNull( object, MESSAGES.validatedObjectMustNotBeNull() );
+ Contracts.assertNotNull( method, MESSAGES.validatedMethodMustNotBeNull() );
+ Contracts.assertNotNull( parameterValues, MESSAGES.validatedParameterArrayMustNotBeNull() );
+
+ return validateParameters( object, ExecutableElement.forMethod( method ), parameterValues, groups );
+ }
+
+ @Override
+ public <T> Set<ConstraintViolation<T>> validateConstructorParameters(Constructor<? extends T> constructor, Object[] parameterValues, Class<?>... groups) {
+ Contracts.assertNotNull( constructor, MESSAGES.validatedConstructorMustNotBeNull() );
+ Contracts.assertNotNull( parameterValues, MESSAGES.validatedParameterArrayMustNotBeNull() );
+
+ return validateParameters( null, ExecutableElement.forConstructor( constructor ), parameterValues, groups );
+ }
+
+ @Override
+ public <T> Set<ConstraintViolation<T>> validateConstructorReturnValue(Constructor<? extends T> constructor, T createdObject, Class<?>... groups) {
+ Contracts.assertNotNull( constructor, MESSAGES.validatedConstructorMustNotBeNull() );
+ Contracts.assertNotNull( createdObject, MESSAGES.validatedConstructorCreatedInstanceMustNotBeNull() );
+
+ return validateReturnValue( null, ExecutableElement.forConstructor( constructor ), createdObject, groups );
+ }
+
+ @Override
+ public <T> Set<ConstraintViolation<T>> validateReturnValue(T object, Method method, Object returnValue, Class<?>... groups) {
+ Contracts.assertNotNull( object, MESSAGES.validatedObjectMustNotBeNull() );
+ Contracts.assertNotNull( method, MESSAGES.validatedMethodMustNotBeNull() );
+
+ return validateReturnValue( object, ExecutableElement.forMethod( method ), returnValue, groups );
+ }
+
+ private <T> Set<ConstraintViolation<T>> validateParameters(T object, ExecutableElement executable, Object[] parameterValues, Class<?>... groups) {
+ //this might be the case for parameterless methods
+ if ( parameterValues == null ) {
+ return Collections.emptySet();
+ }
+
+ ValidationOrder validationOrder = determineGroupValidationOrder( groups );
+
+ ValidationContext<T> context = getValidationContext().forValidateParameters(
+ parameterNameProvider,
+ object,
+ executable,
+ parameterValues
+ );
+
+ if ( !beanMetaDataManager.isConstrained( context.getRootBeanClass() ) ) {
+ return Collections.emptySet();
+ }
+
+ validateParametersInContext( context, parameterValues, validationOrder );
+
+ return context.getFailingConstraints();
+ }
+
+ private <T> Set<ConstraintViolation<T>> validateReturnValue(T object, ExecutableElement executable, Object returnValue, Class<?>... groups) {
+ ValidationOrder validationOrder = determineGroupValidationOrder( groups );
+
+ ValidationContext<T> context = getValidationContext().forValidateReturnValue(
+ object,
+ executable,
+ returnValue
+ );
+
+ if ( !beanMetaDataManager.isConstrained( context.getRootBeanClass() ) ) {
+ return Collections.emptySet();
+ }
+
+ validateReturnValueInContext( context, object, returnValue, validationOrder );
+
+ return context.getFailingConstraints();
+ }
+
+ @Override
+ public final BeanDescriptor getConstraintsForClass(Class<?> clazz) {
+ return beanMetaDataManager.getBeanMetaData( clazz ).getBeanDescriptor();
+ }
+
+ @Override
+ public final <T> T unwrap(Class<T> type) {
+ //allow unwrapping into public super types; intentionally not exposing the
+ //fact that ExecutableValidator is implemented by this class as well as this
+ //might change
+ if ( type.isAssignableFrom( Validator.class ) ) {
+ return type.cast( this );
+ }
+
+ throw log.getTypeNotSupportedForUnwrappingException( type );
+ }
+
+ @Override
+ public ExecutableValidator forExecutables() {
+ return this;
+ }
+
+ private ValidationContextBuilder getValidationContext() {
+ return ValidationContext.getValidationContext(
+ constraintValidatorManager,
+ messageInterpolator,
+ constraintValidatorFactory,
+ getCachingTraversableResolver(),
+ timeProvider,
+ validatedValueHandlers,
+ typeResolutionHelper,
+ failFast
+ );
+ }
+
+ private void sanityCheckPropertyPath(String propertyName) {
+ if ( propertyName == null || propertyName.length() == 0 ) {
+ throw log.getInvalidPropertyPathException();
+ }
+ }
+
+ private ValidationOrder determineGroupValidationOrder(Class<?>[] groups) {
+ Contracts.assertNotNull( groups, MESSAGES.groupMustNotBeNull() );
+ for ( Class<?> clazz : groups ) {
+ if ( clazz == null ) {
+ throw new IllegalArgumentException( MESSAGES.groupMustNotBeNull() );
+ }
+ }
+
+ Collection<Class<?>> resultGroups;
+ // if no groups is specified use the default
+ if ( groups.length == 0 ) {
+ resultGroups = DEFAULT_GROUPS;
+ }
+ else {
+ resultGroups = Arrays.asList( groups );
+ }
+ return validationOrderGenerator.getValidationOrder( resultGroups );
+ }
+
+ /**
+ * Validates the given object using the available context information.
+ *
+ * @param valueContext the current validation context
+ * @param context the global validation context
+ * @param validationOrder Contains the information which and in which order groups have to be executed
+ * @param <T> The root bean type
+ *
+ * @return Set of constraint violations or the empty set if there were no violations.
+ */
+ private <T, U> Set<ConstraintViolation<T>> validateInContext(ValueContext<U, Object> valueContext, ValidationContext<T> context, ValidationOrder validationOrder) {
+ if ( valueContext.getCurrentBean() == null ) {
+ return Collections.emptySet();
+ }
+
+ BeanMetaData<U> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );
+ if ( beanMetaData.defaultGroupSequenceIsRedefined() ) {
+ validationOrder.assertDefaultGroupSequenceIsExpandable( beanMetaData.getDefaultGroupSequence( valueContext.getCurrentBean() ) );
+ }
+
+ // process first single groups. For these we can optimise object traversal by first running all validations on the current bean
+ // before traversing the object.
+ Iterator<Group> groupIterator = validationOrder.getGroupIterator();
+ while ( groupIterator.hasNext() ) {
+ Group group = groupIterator.next();
+ valueContext.setCurrentGroup( group.getDefiningClass() );
+ validateConstraintsForCurrentGroup( context, valueContext );
+ if ( shouldFailFast( context ) ) {
+ return context.getFailingConstraints();
+ }
+ }
+ groupIterator = validationOrder.getGroupIterator();
+ while ( groupIterator.hasNext() ) {
+ Group group = groupIterator.next();
+ valueContext.setCurrentGroup( group.getDefiningClass() );
+ validateCascadedConstraints( context, valueContext );
+ if ( shouldFailFast( context ) ) {
+ return context.getFailingConstraints();
+ }
+ }
+
+ // now we process sequences. For sequences I have to traverse the object graph since I have to stop processing when an error occurs.
+ Iterator<Sequence> sequenceIterator = validationOrder.getSequenceIterator();
+ while ( sequenceIterator.hasNext() ) {
+ Sequence sequence = sequenceIterator.next();
+ for ( GroupWithInheritance groupOfGroups : sequence ) {
+ int numberOfViolations = context.getFailingConstraints().size();
+
+ for ( Group group : groupOfGroups ) {
+ valueContext.setCurrentGroup( group.getDefiningClass() );
+
+ validateConstraintsForCurrentGroup( context, valueContext );
+ if ( shouldFailFast( context ) ) {
+ return context.getFailingConstraints();
+ }
+
+ validateCascadedConstraints( context, valueContext );
+ if ( shouldFailFast( context ) ) {
+ return context.getFailingConstraints();
+ }
+ }
+ if ( context.getFailingConstraints().size() > numberOfViolations ) {
+ break;
+ }
+ }
+ }
+ return context.getFailingConstraints();
+ }
+
+ private void validateConstraintsForCurrentGroup(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext) {
+ // we are not validating the default group there is nothing special to consider. If we are validating the default
+ // group sequence we have to consider that a class in the hierarchy could redefine the default group sequence.
+ /*
+ if ( !valueContext.validatingDefault() ) {
+ validateConstraintsForNonDefaultGroup( validationContext, valueContext );
+ }
+ else {
+ validateConstraintsForDefaultGroup( validationContext, valueContext );
+ }
+ */
+
+ /*
+ * Make sure child annotation can override parent annotation with same type. To make
+ * this possible, we discard the group sequence definition feature which is rarely used
+ */
+ validateConstraintsForNonDefaultGroup( validationContext, valueContext );
+ }
+
+ @SuppressWarnings("unused")
+ private <U> void validateConstraintsForDefaultGroup(ValidationContext<?> validationContext, ValueContext<U, Object> valueContext) {
+ final BeanMetaData<U> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );
+ final Map<Class<?>, Class<?>> validatedInterfaces = newHashMap();
+
+ // evaluating the constraints of a bean per class in hierarchy, this is necessary to detect potential default group re-definitions
+ for ( Class<? super U> clazz : beanMetaData.getClassHierarchy() ) {
+ BeanMetaData<? super U> hostingBeanMetaData = beanMetaDataManager.getBeanMetaData( clazz );
+ boolean defaultGroupSequenceIsRedefined = hostingBeanMetaData.defaultGroupSequenceIsRedefined();
+
+ // if the current class redefined the default group sequence, this sequence has to be applied to all the class hierarchy.
+ if ( defaultGroupSequenceIsRedefined ) {
+ Iterator<Sequence> defaultGroupSequence = hostingBeanMetaData.getDefaultValidationSequence( valueContext.getCurrentBean() );
+ Set<MetaConstraint<?>> metaConstraints = hostingBeanMetaData.getMetaConstraints();
+
+ while ( defaultGroupSequence.hasNext() ) {
+ for ( GroupWithInheritance groupOfGroups : defaultGroupSequence.next() ) {
+ boolean validationSuccessful = true;
+
+ for ( Group defaultSequenceMember : groupOfGroups ) {
+ validationSuccessful = validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz,
+ metaConstraints, defaultSequenceMember );
+ }
+ if ( !validationSuccessful ) {
+ break;
+ }
+ }
+ }
+ }
+ // fast path in case the default group sequence hasn't been redefined
+ else {
+ Set<MetaConstraint<?>> metaConstraints = hostingBeanMetaData.getDirectMetaConstraints();
+ validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz, metaConstraints,
+ Group.DEFAULT_GROUP );
+ }
+
+ validationContext.markCurrentBeanAsProcessed( valueContext );
+
+ // all constraints in the hierarchy has been validated, stop validation.
+ if ( defaultGroupSequenceIsRedefined ) {
+ break;
+ }
+ }
+ }
+
+ private <U> boolean validateConstraintsForSingleDefaultGroupElement(ValidationContext<?> validationContext, ValueContext<U, Object> valueContext, final Map<Class<?>, Class<?>> validatedInterfaces,
+ Class<? super U> clazz, Set<MetaConstraint<?>> metaConstraints, Group defaultSequenceMember) {
+ boolean validationSuccessful = true;
+
+ valueContext.setCurrentGroup( defaultSequenceMember.getDefiningClass() );
+ PathImpl currentPath = valueContext.getPropertyPath();
+
+ for ( MetaConstraint<?> metaConstraint : metaConstraints ) {
+ // HV-466, an interface implemented more than one time in the hierarchy has to be validated only one
+ // time. An interface can define more than one constraint, we have to check the class we are validating.
+ final Class<?> declaringClass = metaConstraint.getLocation().getDeclaringClass();
+ if ( declaringClass.isInterface() ) {
+ Class<?> validatedForClass = validatedInterfaces.get( declaringClass );
+ if ( validatedForClass != null && !validatedForClass.equals( clazz ) ) {
+ continue;
+ }
+ validatedInterfaces.put( declaringClass, clazz );
+ }
+
+ boolean tmp = validateConstraint( validationContext, valueContext, false, metaConstraint );
+ if ( shouldFailFast( validationContext ) ) {
+ return false;
+ }
+
+ validationSuccessful = validationSuccessful && tmp;
+ // reset property path
+ valueContext.setPropertyPath( currentPath );
+ }
+ return validationSuccessful;
+ }
+
+ private void validateConstraintsForNonDefaultGroup(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext) {
+ BeanMetaData<?> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );
+ PathImpl currentPath = valueContext.getPropertyPath();
+ for ( MetaConstraint<?> metaConstraint : beanMetaData.getMetaConstraints() ) {
+ validateConstraint( validationContext, valueContext, false, metaConstraint );
+ if ( shouldFailFast( validationContext ) ) {
+ return;
+ }
+ // reset the path to the state before this call
+ valueContext.setPropertyPath( currentPath );
+ }
+ validationContext.markCurrentBeanAsProcessed( valueContext );
+ }
+
+ private boolean validateConstraint(ValidationContext<?> validationContext,
+ ValueContext<?, Object> valueContext,
+ boolean propertyPathComplete,
+ MetaConstraint<?> metaConstraint) {
+
+ boolean validationSuccessful;
+
+ if ( metaConstraint.getElementType() != ElementType.TYPE ) {
+ PropertyMetaData propertyMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() )
+ .getMetaDataFor(
+ ReflectionHelper.getPropertyName( metaConstraint.getLocation().getMember() )
+ );
+
+ if ( !propertyPathComplete ) {
+ valueContext.appendNode( propertyMetaData );
+ }
+
+ if ( TYPE_USE.equals( metaConstraint.getElementType().name() ) ) {
+ // TYPE_USE constraints always require UNWRAP
+ valueContext.setUnwrapMode( UnwrapMode.UNWRAP );
+ }
+ else {
+ // set the unwrapping mode for this validation
+ valueContext.setUnwrapMode( propertyMetaData.unwrapMode() );
+ }
+ }
+ else {
+ valueContext.appendBeanNode();
+ }
+
+ validationSuccessful = validateMetaConstraint( validationContext, valueContext, metaConstraint );
+
+ // reset the unwrapping mode
+ valueContext.setUnwrapMode( UnwrapMode.AUTOMATIC );
+ return validationSuccessful;
+ }
+
+ private boolean validatePropertyTypeConstraint(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext, boolean propertyPathComplete,
+ MetaConstraint<?> metaConstraint) {
+
+ boolean validationSuccessful;
+
+ PropertyMetaData propertyMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() )
+ .getMetaDataFor(
+ ReflectionHelper.getPropertyName( metaConstraint.getLocation().getMember() )
+ );
+
+ if ( !propertyPathComplete ) {
+ valueContext.appendNode( propertyMetaData );
+ }
+
+ valueContext.setUnwrapMode( UnwrapMode.UNWRAP );
+ validationSuccessful = validateMetaConstraint( validationContext, valueContext, metaConstraint );
+ valueContext.setUnwrapMode( UnwrapMode.AUTOMATIC );
+
+ return validationSuccessful;
+ }
+
+ private boolean validateMetaConstraint(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext, MetaConstraint<?> metaConstraint) {
+ if ( isValidationRequired( validationContext, valueContext, metaConstraint ) ) {
+ if ( valueContext.getCurrentBean() != null ) {
+ Object valueToValidate = getBeanMemberValue(
+ valueContext.getCurrentBean(),
+ metaConstraint.getLocation().getMember()
+ );
+ valueContext.setCurrentValidatedValue( valueToValidate );
+ }
+ return metaConstraint.validateConstraint( validationContext, valueContext );
+ }
+ return true;
+ }
+
+ /**
+ * Validates all cascaded constraints for the given bean using the current group set in the execution context.
+ * This method must always be called after validateConstraints for the same context.
+ *
+ * @param validationContext The execution context
+ * @param valueContext Collected information for single validation
+ */
+ private void validateCascadedConstraints(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext) {
+ Validatable validatable = valueContext.getCurrentValidatable();
+ PathImpl originalPath = valueContext.getPropertyPath();
+ Class<?> originalGroup = valueContext.getCurrentGroup();
+
+ for ( Cascadable cascadable : validatable.getCascadables() ) {
+ valueContext.appendNode( cascadable );
+ Class<?> group = cascadable.convertGroup( originalGroup );
+ valueContext.setCurrentGroup( group );
+
+ ElementType elementType = cascadable.getElementType();
+ if ( isCascadeRequired(
+ validationContext,
+ valueContext.getCurrentBean(),
+ valueContext.getPropertyPath(),
+ elementType
+ ) ) {
+
+ Object value = getBeanPropertyValue( validationContext, valueContext.getCurrentBean(), cascadable );
+
+ if ( value != null ) {
+
+ // expand the group only if was created by group conversion;
+ // otherwise we're looping through the right validation order
+ // already and need only to pass the current element
+ ValidationOrder validationOrder = validationOrderGenerator.getValidationOrder(
+ group,
+ group != originalGroup
+ );
+
+ Type type = value.getClass();
+
+ // HV-902: First, validate the properties for beans that implements Iterable and Map
+ if ( ReflectionHelper.isIterable( type ) || ReflectionHelper.isMap( type ) ) {
+ Iterator<?> valueIter = Collections.singletonList( value ).iterator();
+ validateCascadedConstraint(
+ validationContext,
+ valueIter,
+ false,
+ valueContext,
+ validationOrder,
+ Collections.<MetaConstraint<?>>emptySet()
+ );
+ if ( shouldFailFast( validationContext ) ) {
+ return;
+ }
+ }
+
+ // Second, validate the content of the value
+ Iterator<?> elementsIter = createIteratorForCascadedValue( type, value, valueContext );
+ boolean isIndexable = ReflectionHelper.isIndexable( type );
+
+ validateCascadedConstraint(
+ validationContext,
+ elementsIter,
+ isIndexable,
+ valueContext,
+ validationOrder,
+ cascadable.getTypeArgumentsConstraints()
+ );
+ if ( shouldFailFast( validationContext ) ) {
+ return;
+ }
+ }
+ }
+
+ // reset the path
+ valueContext.setPropertyPath( originalPath );
+ valueContext.setCurrentGroup( originalGroup );
+ }
+ }
+
+ /**
+ * Called when processing cascaded constraints. This methods inspects the type of the cascaded constraints and in case
+ * of a list or array creates an iterator in order to validate each element.
+ *
+ * @param type the type of the cascaded field or property.
+ * @param value the actual value.
+ * @param valueContext context object containing state about the currently validated instance
+ *
+ * @return An iterator over the value of a cascaded property.
+ */
+ private Iterator<?> createIteratorForCascadedValue(Type type, Object value, ValueContext<?, ?> valueContext) {
+ Iterator<?> iter;
+ if ( ReflectionHelper.isIterable( type ) ) {
+ iter = ( (Iterable<?>) value ).iterator();
+ valueContext.markCurrentPropertyAsIterable();
+ }
+ else if ( ReflectionHelper.isMap( type ) ) {
+ Map<?, ?> map = (Map<?, ?>) value;
+ iter = map.entrySet().iterator();
+ valueContext.markCurrentPropertyAsIterable();
+ }
+ else if ( TypeHelper.isArray( type ) ) {
+ List<?> arrayList = Arrays.asList( (Object[]) value );
+ iter = arrayList.iterator();
+ valueContext.markCurrentPropertyAsIterable();
+ }
+ else {
+ iter = Collections.singletonList( value ).iterator();
+ }
+ return iter;
+ }
+
+ private void validateCascadedConstraint(ValidationContext<?> context, Iterator<?> iter, boolean isIndexable, ValueContext<?,
+ Object> valueContext, ValidationOrder validationOrder, Set<MetaConstraint<?>> typeArgumentsConstraint) {
+ Object value;
+ Object mapKey;
+ int i = 0;
+ while ( iter.hasNext() ) {
+ value = iter.next();
+ if ( value instanceof Map.Entry ) {
+ mapKey = ( (Map.Entry<?, ?>) value ).getKey();
+ valueContext.setKey( mapKey );
+ value = ( (Map.Entry<?, ?>) value ).getValue();
+ }
+ else if ( isIndexable ) {
+ valueContext.setIndex( i );
+ }
+
+ if ( !context.isBeanAlreadyValidated(
+ value,
+ valueContext.getCurrentGroup(),
+ valueContext.getPropertyPath()
+ ) ) {
+ // Type arguments
+ validateTypeArgumentConstraints( context, buildNewLocalExecutionContext( valueContext, value ), value, typeArgumentsConstraint );
+
+ // Cascade validation
+ validateInContext( buildNewLocalExecutionContext( valueContext, value ), context, validationOrder );
+ if ( shouldFailFast( context ) ) {
+ return;
+ }
+ }
+ i++;
+ }
+ }
+
+ private ValueContext<?, Object> buildNewLocalExecutionContext(ValueContext<?, Object> valueContext, Object value) {
+ ValueContext<?, Object> newValueContext;
+ if ( value != null ) {
+ newValueContext = ValueContext.getLocalExecutionContext(
+ value,
+ beanMetaDataManager.getBeanMetaData( value.getClass() ),
+ valueContext.getPropertyPath()
+ );
+ }
+ else {
+ newValueContext = ValueContext.getLocalExecutionContext(
+ valueContext.getCurrentBeanType(),
+ beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() ),
+ valueContext.getPropertyPath()
+ );
+ }
+ return newValueContext;
+ }
+
+ private void validateTypeArgumentConstraints(ValidationContext<?> context,
+ ValueContext<?, Object> valueContext,
+ Object value,
+ Set<MetaConstraint<?>> typeArgumentsConstraints) {
+ valueContext.setCurrentValidatedValue( value );
+ valueContext.appendCollectionElementNode();
+ for ( MetaConstraint<?> metaConstraint : typeArgumentsConstraints ) {
+ metaConstraint.validateConstraint( context, valueContext );
+ if ( shouldFailFast( context ) ) {
+ return;
+ }
+ }
+ }
+
+ private <T> Set<ConstraintViolation<T>> validatePropertyInContext(ValidationContext<T> context, PathImpl propertyPath, ValidationOrder validationOrder) {
+ List<MetaConstraint<?>> metaConstraints = newArrayList();
+ List<MetaConstraint<?>> typeUseConstraints = newArrayList();
+ ValueContext<?, Object> valueContext = collectMetaConstraintsForPathWithValue(
+ context,
+ propertyPath,
+ metaConstraints,
+ typeUseConstraints
+ );
+
+ if ( valueContext.getCurrentBean() == null ) {
+ throw log.getUnableToReachPropertyToValidateException( context.getRootBean(), propertyPath );
+ }
+
+ if ( metaConstraints.size() == 0 && typeUseConstraints.size() == 0 ) {
+ return context.getFailingConstraints();
+ }
+
+ assertDefaultGroupSequenceIsExpandable( valueContext, validationOrder );
+
+ // process first single groups
+ Iterator<Group> groupIterator = validationOrder.getGroupIterator();
+ while ( groupIterator.hasNext() ) {
+ Group group = groupIterator.next();
+ valueContext.setCurrentGroup( group.getDefiningClass() );
+ validatePropertyForCurrentGroup( valueContext, context, metaConstraints, typeUseConstraints );
+ if ( shouldFailFast( context ) ) {
+ return context.getFailingConstraints();
+ }
+ }
+
+ // now process sequences, stop after the first erroneous group
+ Iterator<Sequence> sequenceIterator = validationOrder.getSequenceIterator();
+ while ( sequenceIterator.hasNext() ) {
+ Sequence sequence = sequenceIterator.next();
+
+ for ( GroupWithInheritance groupOfGroups : sequence ) {
+ int numberOfConstraintViolations = 0;
+
+ for ( Group group : groupOfGroups ) {
+ valueContext.setCurrentGroup( group.getDefiningClass() );
+ numberOfConstraintViolations += validatePropertyForCurrentGroup(
+ valueContext, context, metaConstraints, typeUseConstraints
+ );
+ if ( shouldFailFast( context ) ) {
+ return context.getFailingConstraints();
+ }
+ }
+ if ( numberOfConstraintViolations > 0 ) {
+ break;
+ }
+ }
+ }
+
+ return context.getFailingConstraints();
+ }
+
+ private <T> void assertDefaultGroupSequenceIsExpandable(ValueContext<T, ?> valueContext, ValidationOrder validationOrder) {
+ BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );
+ if ( beanMetaData.defaultGroupSequenceIsRedefined() ) {
+ validationOrder.assertDefaultGroupSequenceIsExpandable( beanMetaData.getDefaultGroupSequence( valueContext.getCurrentBean() ) );
+ }
+ }
+
+ private <T> Set<ConstraintViolation<T>> validateValueInContext(ValidationContext<T> context, Object value, PathImpl propertyPath, ValidationOrder validationOrder) {
+ List<MetaConstraint<?>> metaConstraints = newArrayList();
+ List<MetaConstraint<?>> typeArgumentConstraints = newArrayList();
+ ValueContext<?, Object> valueContext = collectMetaConstraintsForPathWithoutValue(
+ context, propertyPath, metaConstraints, typeArgumentConstraints
+ );
+ valueContext.setCurrentValidatedValue( value );
+
+ if ( metaConstraints.size() == 0 && typeArgumentConstraints.size() == 0 ) {
+ return context.getFailingConstraints();
+ }
+
+ BeanMetaData<?> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );
+ if ( beanMetaData.defaultGroupSequenceIsRedefined() ) {
+ validationOrder.assertDefaultGroupSequenceIsExpandable( beanMetaData.getDefaultGroupSequence( null ) );
+ }
+
+ // process first single groups
+ Iterator<Group> groupIterator = validationOrder.getGroupIterator();
+ while ( groupIterator.hasNext() ) {
+ Group group = groupIterator.next();
+ valueContext.setCurrentGroup( group.getDefiningClass() );
+ validatePropertyForCurrentGroup( valueContext, context, metaConstraints, typeArgumentConstraints );
+ if ( shouldFailFast( context ) ) {
+ return context.getFailingConstraints();
+ }
+ }
+
+ // now process sequences, stop after the first erroneous group
+ Iterator<Sequence> sequenceIterator = validationOrder.getSequenceIterator();
+ while ( sequenceIterator.hasNext() ) {
+ Sequence sequence = sequenceIterator.next();
+ for ( GroupWithInheritance groupOfGroups : sequence ) {
+ int numberOfConstraintViolations = 0;
+ for ( Group group : groupOfGroups ) {
+ valueContext.setCurrentGroup( group.getDefiningClass() );
+ numberOfConstraintViolations += validatePropertyForCurrentGroup(
+ valueContext, context, metaConstraints, typeArgumentConstraints
+ );
+ if ( shouldFailFast( context ) ) {
+ return context.getFailingConstraints();
+ }
+ }
+ if ( numberOfConstraintViolations > 0 ) {
+ break;
+ }
+ }
+ }
+
+ return context.getFailingConstraints();
+ }
+
+ /**
+ * Validates the property constraints associated to the current {@code ValueContext} group.
+ *
+ * @param valueContext The current validation context.
+ * @param validationContext The global validation context.
+ * @param metaConstraints All constraints associated to the property.
+ * @param typeUseConstraints Type constraints associated to the property
+ *
+ * @return The number of constraint violations raised when validating the {@code ValueContext} current group.
+ */
+ private int validatePropertyForCurrentGroup(ValueContext<?, Object> valueContext, ValidationContext<?> validationContext, List<MetaConstraint<?>> metaConstraints, List<MetaConstraint<?>> typeUseConstraints) {
+ // we do not validate the default group, nothing special to do
+ if ( !valueContext.validatingDefault() ) {
+ return validatePropertyForNonDefaultGroup(
+ valueContext,
+ validationContext,
+ metaConstraints,
+ typeUseConstraints
+ );
+ }
+
+ // we are validating the default group, we have to consider that a class in the hierarchy could redefine the default group sequence
+ return validatePropertyForDefaultGroup( valueContext, validationContext, metaConstraints, typeUseConstraints );
+ }
+
+ /**
+ * Validates the property constraints for the current {@code ValueContext} group.
+ * <p>
+ * The current {@code ValueContext} group is not the default group.
+ * </p>
+ *
+ * @param valueContext The current validation context.
+ * @param validationContext The global validation context.
+ * @param metaConstraints All constraints associated to the property.
+ * @param typeArgumentConstraints All type argument constraints associated to the property
+ *
+ * @return The number of constraint violations raised when validating the {@code ValueContext} current group.
+ */
+ private int validatePropertyForNonDefaultGroup(ValueContext<?, Object> valueContext, ValidationContext<?> validationContext, List<MetaConstraint<?>> metaConstraints,
+ List<MetaConstraint<?>> typeArgumentConstraints) {
+ int numberOfConstraintViolationsBefore = validationContext.getFailingConstraints().size();
+ for ( MetaConstraint<?> metaConstraint : metaConstraints ) {
+ validateConstraint( validationContext, valueContext, true, metaConstraint );
+ if ( shouldFailFast( validationContext ) ) {
+ return validationContext.getFailingConstraints()
+ .size() - numberOfConstraintViolationsBefore;
+ }
+ }
+ for ( MetaConstraint<?> metaConstraint : typeArgumentConstraints ) {
+ validatePropertyTypeConstraint( validationContext, valueContext, true, metaConstraint );
+ if ( shouldFailFast( validationContext ) ) {
+ return validationContext.getFailingConstraints()
+ .size() - numberOfConstraintViolationsBefore;
+ }
+ }
+ return validationContext.getFailingConstraints().size() - numberOfConstraintViolationsBefore;
+ }
+
+ /**
+ * Validates the property for the default group.
+ * <p>
+ * This method checks that the default group sequence is not redefined in the class hierarchy for a superclass
+ * hosting constraints for the property to validate.
+ * </p>
+ *
+ * @param valueContext The current validation context.
+ * @param validationContext The global validation context.
+ * @param constraintList All constraints associated to the property to check.
+ *
+ * @return The number of constraint violations raised when validating the default group.
+ */
+ private <U> int validatePropertyForDefaultGroup(ValueContext<U, Object> valueContext,
+ ValidationContext<?> validationContext,
+ List<MetaConstraint<?>> constraintList,
+ List<MetaConstraint<?>> typeUseConstraints) {
+ final int numberOfConstraintViolationsBefore = validationContext.getFailingConstraints().size();
+ final BeanMetaData<U> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );
+ final Map<Class<?>, Class<?>> validatedInterfaces = newHashMap();
+
+ // evaluating the constraints of a bean per class in hierarchy. this is necessary to detect potential default group re-definitions
+ for ( Class<? super U> clazz : beanMetaData.getClassHierarchy() ) {
+ BeanMetaData<? super U> hostingBeanMetaData = beanMetaDataManager.getBeanMetaData( clazz );
+ boolean defaultGroupSequenceIsRedefined = hostingBeanMetaData.defaultGroupSequenceIsRedefined();
+
+ if ( defaultGroupSequenceIsRedefined ) {
+ Iterator<Sequence> defaultGroupSequence = hostingBeanMetaData.getDefaultValidationSequence( valueContext.getCurrentBean() );
+ Set<MetaConstraint<?>> metaConstraints = hostingBeanMetaData.getMetaConstraints();
+
+ while ( defaultGroupSequence.hasNext() ) {
+ for ( GroupWithInheritance groupOfGroups : defaultGroupSequence.next() ) {
+ boolean validationSuccessful = true;
+
+ for ( Group groupClass : groupOfGroups ) {
+ validationSuccessful = validatePropertyForSingleDefaultGroupElement( valueContext, validationContext, constraintList,
+ typeUseConstraints, validatedInterfaces, clazz, metaConstraints, groupClass );
+ }
+
+ if ( !validationSuccessful ) {
+ break;
+ }
+ }
+ }
+ }
+ // fast path in case the default group sequence hasn't been redefined
+ else {
+ Set<MetaConstraint<?>> metaConstraints = hostingBeanMetaData.getDirectMetaConstraints();
+
+ validatePropertyForSingleDefaultGroupElement( valueContext, validationContext, constraintList,
+ typeUseConstraints, validatedInterfaces, clazz, metaConstraints, Group.DEFAULT_GROUP );
+ }
+
+ // all the hierarchy has been validated, stop validation.
+ if ( defaultGroupSequenceIsRedefined ) {
+ break;
+ }
+ }
+ return validationContext.getFailingConstraints().size() - numberOfConstraintViolationsBefore;
+ }
+
+ private <U> boolean validatePropertyForSingleDefaultGroupElement(ValueContext<U, Object> valueContext, ValidationContext<?> validationContext,
+ List<MetaConstraint<?>> constraintList, List<MetaConstraint<?>> typeUseConstraints,
+ final Map<Class<?>, Class<?>> validatedInterfaces, Class<? super U> clazz, Set<MetaConstraint<?>> metaConstraints,
+ Group groupClass) {
+ valueContext.setCurrentGroup( groupClass.getDefiningClass() );
+ boolean validationSuccessful = true;
+
+ for ( MetaConstraint<?> metaConstraint : metaConstraints ) {
+ // HV-466, an interface implemented more than one time in the hierarchy has to be validated only one
+ // time. An interface can define more than one constraint, we have to check the class we are validating.
+ final Class<?> declaringClass = metaConstraint.getLocation().getDeclaringClass();
+ if ( declaringClass.isInterface() ) {
+ Class<?> validatedForClass = validatedInterfaces.get( declaringClass );
+ if ( validatedForClass != null && !validatedForClass.equals( clazz ) ) {
+ continue;
+ }
+ validatedInterfaces.put( declaringClass, clazz );
+ }
+
+ if ( constraintList.contains( metaConstraint ) ) {
+ boolean tmp = validateConstraint( validationContext, valueContext, true, metaConstraint );
+
+ validationSuccessful = validationSuccessful && tmp;
+ if ( shouldFailFast( validationContext ) ) {
+ return false;
+ }
+ }
+
+ if ( typeUseConstraints.contains( metaConstraint ) ) {
+ boolean tmp = validatePropertyTypeConstraint(
+ validationContext,
+ valueContext,
+ true,
+ metaConstraint
+ );
+ validationSuccessful = validationSuccessful && tmp;
+ if ( shouldFailFast( validationContext ) ) {
+ return false;
+ }
+ }
+ }
+
+ return validationSuccessful;
+ }
+
+ private <T> void validateParametersInContext(ValidationContext<T> validationContext,
+ Object[] parameterValues,
+ ValidationOrder validationOrder) {
+ BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( validationContext.getRootBeanClass() );
+ ExecutableMetaData executableMetaData = beanMetaData.getMetaDataFor( validationContext.getExecutable() );
+
+ if ( executableMetaData == null ) {
+ // there is no executable metadata - specified object and method do not match
+ throw log.getMethodOrConstructorNotDefinedByValidatedTypeException(
+ beanMetaData.getBeanClass().getName(),
+ validationContext.getExecutable().getMember()
+ );
+ }
+
+ if ( beanMetaData.defaultGroupSequenceIsRedefined() ) {
+ validationOrder.assertDefaultGroupSequenceIsExpandable(
+ beanMetaData.getDefaultGroupSequence(
+ validationContext.getRootBean()
+ )
+ );
+ }
+
+ // process first single groups
+ Iterator<Group> groupIterator = validationOrder.getGroupIterator();
+ while ( groupIterator.hasNext() ) {
+ validateParametersForGroup( validationContext, parameterValues, groupIterator.next() );
+ if ( shouldFailFast( validationContext ) ) {
+ return;
+ }
+ }
+
+ ValueContext<Object[], Object> cascadingValueContext = ValueContext.getLocalExecutionContext(
+ parameterValues,
+ executableMetaData.getValidatableParametersMetaData(),
+ PathImpl.createPathForExecutable( executableMetaData )
+ );
+ cascadingValueContext.setUnwrapMode( executableMetaData.unwrapMode() );
+
+ groupIterator = validationOrder.getGroupIterator();
+ while ( groupIterator.hasNext() ) {
+ Group group = groupIterator.next();
+ cascadingValueContext.setCurrentGroup( group.getDefiningClass() );
+ validateCascadedConstraints( validationContext, cascadingValueContext );
+ if ( shouldFailFast( validationContext ) ) {
+ return;
+ }
+ }
+
+ // now process sequences, stop after the first erroneous group
+ Iterator<Sequence> sequenceIterator = validationOrder.getSequenceIterator();
+ while ( sequenceIterator.hasNext() ) {
+ Sequence sequence = sequenceIterator.next();
+ for ( GroupWithInheritance groupOfGroups : sequence ) {
+ int numberOfViolations = validationContext.getFailingConstraints().size();
+
+ for ( Group group : groupOfGroups ) {
+ validateParametersForGroup( validationContext, parameterValues, group );
+ if ( shouldFailFast( validationContext ) ) {
+ return;
+ }
+
+ cascadingValueContext.setCurrentGroup( group.getDefiningClass() );
+ validateCascadedConstraints( validationContext, cascadingValueContext );
+
+ if ( shouldFailFast( validationContext ) ) {
+ return;
+ }
+ }
+
+ if ( validationContext.getFailingConstraints().size() > numberOfViolations ) {
+ break;
+ }
+ }
+ }
+ }
+
+ private <T> int validateParametersForGroup(ValidationContext<T> validationContext, Object[] parameterValues, Group group) {
+ int numberOfViolationsBefore = validationContext.getFailingConstraints().size();
+
+ BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( validationContext.getRootBeanClass() );
+ ExecutableMetaData executableMetaData = beanMetaData.getMetaDataFor( validationContext.getExecutable() );
+
+ if ( parameterValues.length != executableMetaData.getParameterTypes().length ) {
+ throw log.getInvalidParameterCountForExecutableException(
+ ExecutableElement.getExecutableAsString(
+ executableMetaData.getType().toString() + "#" + executableMetaData.getName(),
+ executableMetaData.getParameterTypes()
+ ), parameterValues.length, executableMetaData.getParameterTypes().length
+ );
+ }
+
+ // TODO GM: define behavior with respect to redefined default sequences. Should only the
+ // sequence from the validated bean be honored or also default sequence definitions up in
+ // the inheritance tree?
+ // For now a redefined default sequence will only be considered if specified at the bean
+ // hosting the validated itself, but no other default sequence from parent types
+ if ( group.isDefaultGroup() ) {
+ Iterator<Sequence> defaultGroupSequence = beanMetaData.getDefaultValidationSequence( validationContext.getRootBean() );
+
+ while ( defaultGroupSequence.hasNext() ) {
+ Sequence sequence = defaultGroupSequence.next();
+ for ( GroupWithInheritance expandedGroup : sequence ) {
+ int numberOfViolationsOfCurrentGroup = 0;
+
+ for ( Group defaultGroupSequenceElement : expandedGroup ) {
+ numberOfViolationsOfCurrentGroup += validateParametersForSingleGroup( validationContext, parameterValues, executableMetaData, defaultGroupSequenceElement.getDefiningClass() );
+
+ if ( shouldFailFast( validationContext ) ) {
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+ }
+
+ if ( numberOfViolationsOfCurrentGroup > 0 ) {
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+ }
+ }
+ }
+ else {
+ validateParametersForSingleGroup( validationContext, parameterValues, executableMetaData, group.getDefiningClass() );
+ }
+
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+
+ private <T> int validateParametersForSingleGroup(ValidationContext<T> validationContext, Object[] parameterValues, ExecutableMetaData executableMetaData, Class<?> currentValidatedGroup) {
+ int numberOfViolationsBefore = validationContext.getFailingConstraints().size();
+
+ ValueContext<T, Object> valueContext = getExecutableValueContext(
+ validationContext.getRootBean(), executableMetaData, currentValidatedGroup
+ );
+ valueContext.appendCrossParameterNode();
+ valueContext.setCurrentValidatedValue( parameterValues );
+
+ // 1. validate cross-parameter constraints
+ validateConstraintsForGroup(
+ validationContext, valueContext, executableMetaData.getCrossParameterConstraints()
+ );
+ if ( shouldFailFast( validationContext ) ) {
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+
+ valueContext = getExecutableValueContext(
+ validationContext.getRootBean(), executableMetaData, currentValidatedGroup
+ );
+ valueContext.setCurrentValidatedValue( parameterValues );
+
+ // 2. validate parameter constraints
+ for ( int i = 0; i < parameterValues.length; i++ ) {
+ PathImpl originalPath = valueContext.getPropertyPath();
+
+ ParameterMetaData parameterMetaData = executableMetaData.getParameterMetaData( i );
+ Object value = parameterValues[i];
+
+ if ( value != null ) {
+ Class<?> valueType = value.getClass();
+ if ( parameterMetaData.getType() instanceof Class && ( (Class<?>) parameterMetaData.getType() ).isPrimitive() ) {
+ valueType = ReflectionHelper.unBoxedType( valueType );
+ }
+ if ( !TypeHelper.isAssignable(
+ TypeHelper.getErasedType( parameterMetaData.getType() ),
+ valueType
+ ) ) {
+ throw log.getParameterTypesDoNotMatchException(
+ valueType.getName(),
+ parameterMetaData.getType().toString(),
+ i,
+ validationContext.getExecutable().getMember()
+ );
+ }
+ }
+
+ valueContext.appendNode( parameterMetaData );
+ valueContext.setUnwrapMode( parameterMetaData.unwrapMode() );
+ valueContext.setCurrentValidatedValue( value );
+
+ validateConstraintsForGroup(
+ validationContext, valueContext, parameterMetaData
+ );
+ if ( shouldFailFast( validationContext ) ) {
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+
+ if ( !parameterMetaData.isCascading() ) {
+ validateConstraintsForGroup(
+ validationContext, valueContext, parameterMetaData.getTypeArgumentsConstraints()
+ );
+ if ( shouldFailFast( validationContext ) ) {
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+ }
+
+ valueContext.setPropertyPath( originalPath );
+ }
+
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+
+ private <T> ValueContext<T, Object> getExecutableValueContext(T object, ExecutableMetaData executableMetaData, Class<?> group) {
+ ValueContext<T, Object> valueContext;
+
+ if ( object != null ) {
+ valueContext = ValueContext.getLocalExecutionContext(
+ object,
+ null,
+ PathImpl.createPathForExecutable( executableMetaData )
+ );
+ }
+ else {
+ valueContext = ValueContext.getLocalExecutionContext(
+ (Class<T>) null, //the type is not required in this case (only for cascaded validation)
+ null,
+ PathImpl.createPathForExecutable( executableMetaData )
+ );
+ }
+
+ valueContext.setCurrentGroup( group );
+
+ return valueContext;
+ }
+
+ private <V, T> void validateReturnValueInContext(ValidationContext<T> context, T bean, V value, ValidationOrder validationOrder) {
+ BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( context.getRootBeanClass() );
+ ExecutableMetaData executableMetaData = beanMetaData.getMetaDataFor( context.getExecutable() );
+
+ if ( executableMetaData == null ) {
+ return;
+ }
+
+ if ( beanMetaData.defaultGroupSequenceIsRedefined() ) {
+ validationOrder.assertDefaultGroupSequenceIsExpandable( beanMetaData.getDefaultGroupSequence( bean ) );
+ }
+
+ Iterator<Group> groupIterator = validationOrder.getGroupIterator();
+
+ // process first single groups
+ while ( groupIterator.hasNext() ) {
+ validateReturnValueForGroup( context, bean, value, groupIterator.next() );
+ if ( shouldFailFast( context ) ) {
+ return;
+ }
+ }
+
+ ValueContext<V, Object> cascadingValueContext = null;
+
+ if ( value != null ) {
+ cascadingValueContext = ValueContext.getLocalExecutionContext(
+ value,
+ executableMetaData.getReturnValueMetaData(),
+ PathImpl.createPathForExecutable( executableMetaData )
+ );
+
+ groupIterator = validationOrder.getGroupIterator();
+ while ( groupIterator.hasNext() ) {
+ Group group = groupIterator.next();
+ cascadingValueContext.setCurrentGroup( group.getDefiningClass() );
+ validateCascadedConstraints( context, cascadingValueContext );
+ if ( shouldFailFast( context ) ) {
+ return;
+ }
+ }
+ }
+
+ // now process sequences, stop after the first erroneous group
+ Iterator<Sequence> sequenceIterator = validationOrder.getSequenceIterator();
+ while ( sequenceIterator.hasNext() ) {
+ Sequence sequence = sequenceIterator.next();
+ for ( GroupWithInheritance groupOfGroups : sequence ) {
+ int numberOfFailingConstraintsBeforeGroup = context.getFailingConstraints().size();
+ for ( Group group : groupOfGroups ) {
+ validateReturnValueForGroup( context, bean, value, group );
+ if ( shouldFailFast( context ) ) {
+ return;
+ }
+
+ if ( value != null ) {
+ cascadingValueContext.setCurrentGroup( group.getDefiningClass() );
+ validateCascadedConstraints( context, cascadingValueContext );
+
+ if ( shouldFailFast( context ) ) {
+ return;
+ }
+ }
+ }
+
+ if ( context.getFailingConstraints().size() > numberOfFailingConstraintsBeforeGroup ) {
+ break;
+ }
+ }
+ }
+ }
+
+ //TODO GM: if possible integrate with validateParameterForGroup()
+ private <T> int validateReturnValueForGroup(ValidationContext<T> validationContext, T bean, Object value, Group group) {
+ int numberOfViolationsBefore = validationContext.getFailingConstraints().size();
+
+ BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( validationContext.getRootBeanClass() );
+ ExecutableMetaData executableMetaData = beanMetaData.getMetaDataFor( validationContext.getExecutable() );
+
+ if ( executableMetaData == null ) {
+ // nothing to validate
+ return 0;
+ }
+
+ // TODO GM: define behavior with respect to redefined default sequences. Should only the
+ // sequence from the validated bean be honored or also default sequence definitions up in
+ // the inheritance tree?
+ // For now a redefined default sequence will only be considered if specified at the bean
+ // hosting the validated itself, but no other default sequence from parent types
+
+ if ( group.isDefaultGroup() ) {
+ Iterator<Sequence> defaultGroupSequence = beanMetaData.getDefaultValidationSequence( bean );
+
+ while ( defaultGroupSequence.hasNext() ) {
+ Sequence sequence = defaultGroupSequence.next();
+ for ( GroupWithInheritance expandedGroup : sequence ) {
+ int numberOfViolationsOfCurrentGroup = 0;
+
+ for ( Group defaultGroupSequenceElement : expandedGroup ) {
+ numberOfViolationsOfCurrentGroup += validateReturnValueForSingleGroup( validationContext, executableMetaData, bean, value, defaultGroupSequenceElement.getDefiningClass() );
+
+ if ( shouldFailFast( validationContext ) ) {
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+ }
+
+ //stop processing after first group with errors occurred
+ if ( numberOfViolationsOfCurrentGroup > 0 ) {
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+ }
+ }
+ }
+ else {
+ validateReturnValueForSingleGroup( validationContext, executableMetaData, bean, value, group.getDefiningClass() );
+ }
+
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+
+ private <T> int validateReturnValueForSingleGroup(ValidationContext<T> validationContext, ExecutableMetaData executableMetaData, T bean, Object value, Class<?> oneGroup) {
+ int numberOfViolationsBefore = validationContext.getFailingConstraints().size();
+
+ // validate constraints at return value itself
+ ValueContext<?, Object> valueContext = getExecutableValueContext(
+ executableMetaData.getKind() == ElementKind.CONSTRUCTOR ? value : bean,
+ executableMetaData,
+ oneGroup
+ );
+
+ valueContext.setCurrentValidatedValue( value );
+ ReturnValueMetaData returnValueMetaData = executableMetaData.getReturnValueMetaData();
+ valueContext.appendNode( returnValueMetaData );
+ valueContext.setUnwrapMode( returnValueMetaData.unwrapMode() );
+
+ int numberOfViolationsOfCurrentGroup =
+ validateConstraintsForGroup(
+ validationContext, valueContext, returnValueMetaData
+ );
+ if ( shouldFailFast( validationContext ) ) {
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+
+ if ( !returnValueMetaData.isCascading() ) {
+ numberOfViolationsOfCurrentGroup += validateConstraintsForGroup(
+ validationContext, valueContext, returnValueMetaData.getTypeArgumentsConstraints()
+ );
+ if ( shouldFailFast( validationContext ) ) {
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+ }
+
+ return numberOfViolationsOfCurrentGroup;
+ }
+
+ private int validateConstraintsForGroup(ValidationContext<?> validationContext,
+ ValueContext<?, ?> valueContext,
+ Iterable<MetaConstraint<?>> constraints) {
+ int numberOfViolationsBefore = validationContext.getFailingConstraints().size();
+
+ for ( MetaConstraint<?> metaConstraint : constraints ) {
+ if ( !isValidationRequired( validationContext, valueContext, metaConstraint ) ) {
+ continue;
+ }
+
+ metaConstraint.validateConstraint( validationContext, valueContext );
+ if ( shouldFailFast( validationContext ) ) {
+ break;
+ }
+ }
+
+ return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;
+ }
+
+ /**
+ * Collects all {@code MetaConstraint}s which match the given property path relative to the specified root class for a given value.
+ *
+ * @param validationContext The validation context.
+ * @param propertyPath The property path for which constraints have to be collected.
+ * @param metaConstraints A list where {@code MetaConstraint}s which match the given path are saved.
+ * @param typeArgumentConstraints A list where type arguments {@code MetaConstraint}s which match the given path are saved.
+ *
+ * @return Returns an instance of {@code ValueContext} which describes the local validation context associated to the given property path.
+ */
+ private <V> ValueContext<?, V> collectMetaConstraintsForPathWithValue(ValidationContext<?> validationContext,
+ PathImpl propertyPath,
+ List<MetaConstraint<?>> metaConstraints,
+ List<MetaConstraint<?>> typeArgumentConstraints) {
+ Class<?> clazz = validationContext.getRootBeanClass();
+ Object value = validationContext.getRootBean();
+ PropertyMetaData propertyMetaData = null;
+
+ Iterator<Path.Node> propertyPathIter = propertyPath.iterator();
+
+ while ( propertyPathIter.hasNext() ) {
+ // cast is ok, since we are dealing with engine internal classes
+ NodeImpl propertyPathNode = (NodeImpl) propertyPathIter.next();
+ propertyMetaData = getBeanPropertyMetaData( clazz, propertyPathNode );
+
+ // if the property is not the leaf property, we set up the context for the next iteration
+ if ( propertyPathIter.hasNext() ) {
+ if ( !propertyMetaData.isCascading() ) {
+ throw log.getInvalidPropertyPathException( validationContext.getRootBeanClass().getName(), propertyPath.asString() );
+ }
+
+ value = getBeanPropertyValue( validationContext, value, propertyMetaData );
+ if ( value == null ) {
+ throw log.getUnableToReachPropertyToValidateException( validationContext.getRootBean(), propertyPath );
+ }
+ clazz = value.getClass();
+
+ // if we are in the case of an iterable and we want to validate an element of this iterable, we have to get the
+ // element value
+ if ( propertyPathNode.isIterable() ) {
+ propertyPathNode = (NodeImpl) propertyPathIter.next();
+
+ if ( propertyPathNode.getIndex() != null ) {
+ value = ReflectionHelper.getIndexedValue( value, propertyPathNode.getIndex() );
+ }
+ else if ( propertyPathNode.getKey() != null ) {
+ value = ReflectionHelper.getMappedValue( value, propertyPathNode.getKey() );
+ }
+ else {
+ throw log.getPropertyPathMustProvideIndexOrMapKeyException();
+ }
+
+ if ( value == null ) {
+ throw log.getUnableToReachPropertyToValidateException( validationContext.getRootBean(), propertyPath );
+ }
+
+ clazz = value.getClass();
+ propertyMetaData = getBeanPropertyMetaData( clazz, propertyPathNode );
+ }
+ }
+ }
+
+ if ( propertyMetaData == null ) {
+ // should only happen if the property path is empty, which should never happen
+ throw log.getInvalidPropertyPathException( clazz.getName(), propertyPath.asString() );
+ }
+
+ metaConstraints.addAll( propertyMetaData.getConstraints() );
+ typeArgumentConstraints.addAll( propertyMetaData.getTypeArgumentsConstraints() );
+
+ return ValueContext.getLocalExecutionContext( value, null, propertyPath );
+ }
+
+ /**
+ * Collects all {@code MetaConstraint}s which match the given property path relative to the specified root class without a value.
+ * <p>
+ * We are only able to use the static types as we don't have the value.
+ * </p>
+ *
+ * @param validationContext The validation context.
+ * @param propertyPath The property path for which constraints have to be collected.
+ * @param metaConstraints A list where {@code MetaConstraint}s which match the given path are saved.
+ * @param typeArgumentConstraints A list where type arguments {@code MetaConstraint}s which match the given path are saved.
+ *
+ * @return Returns an instance of {@code ValueContext} which describes the local validation context associated to the given property path.
+ */
+ private <V> ValueContext<?, V> collectMetaConstraintsForPathWithoutValue(ValidationContext<?> validationContext,
+ PathImpl propertyPath,
+ List<MetaConstraint<?>> metaConstraints,
+ List<MetaConstraint<?>> typeArgumentConstraints) {
+ Class<?> clazz = validationContext.getRootBeanClass();
+ PropertyMetaData propertyMetaData = null;
+
+ Iterator<Path.Node> propertyPathIter = propertyPath.iterator();
+
+ while ( propertyPathIter.hasNext() ) {
+ // cast is ok, since we are dealing with engine internal classes
+ NodeImpl propertyPathNode = (NodeImpl) propertyPathIter.next();
+ propertyMetaData = getBeanPropertyMetaData( clazz, propertyPathNode );
+
+ // if the property is not the leaf property, we set up the context for the next iteration
+ if ( propertyPathIter.hasNext() ) {
+ // if we are in the case of an iterable and we want to validate an element of this iterable, we have to get the
+ // type from the parameterized type
+ if ( propertyPathNode.isIterable() ) {
+ propertyPathNode = (NodeImpl) propertyPathIter.next();
+
+ clazz = ReflectionHelper.getClassFromType( ReflectionHelper.getCollectionElementType( propertyMetaData.getType() ) );
+ propertyMetaData = getBeanPropertyMetaData( clazz, propertyPathNode );
+ }
+ else {
+ clazz = ReflectionHelper.getClassFromType( propertyMetaData.getType() );
+ }
+ }
+ }
+
+ if ( propertyMetaData == null ) {
+ // should only happen if the property path is empty, which should never happen
+ throw log.getInvalidPropertyPathException( clazz.getName(), propertyPath.asString() );
+ }
+
+ metaConstraints.addAll( propertyMetaData.getConstraints() );
+ typeArgumentConstraints.addAll( propertyMetaData.getTypeArgumentsConstraints() );
+
+ return ValueContext.getLocalExecutionContext( clazz, null, propertyPath );
+ }
+
+ /**
+ * Must be called and stored for the duration of the stack call
+ * A new instance is returned each time
+ *
+ * @return The resolver for the duration of a full validation.
+ */
+ private TraversableResolver getCachingTraversableResolver() {
+ return new CachingTraversableResolverForSingleValidation( traversableResolver );
+ }
+
+ private boolean isValidationRequired(ValidationContext<?> validationContext,
+ ValueContext<?, ?> valueContext,
+ MetaConstraint<?> metaConstraint) {
+ if ( validationContext.hasMetaConstraintBeenProcessed(
+ valueContext.getCurrentBean(),
+ valueContext.getPropertyPath(),
+ metaConstraint
+ ) ) {
+ return false;
+ }
+
+ if ( !metaConstraint.getGroupList().contains( valueContext.getCurrentGroup() ) ) {
+ return false;
+ }
+ return isReachable(
+ validationContext,
+ valueContext.getCurrentBean(),
+ valueContext.getPropertyPath(),
+ metaConstraint.getElementType()
+ );
+ }
+
+ private boolean isReachable(ValidationContext<?> validationContext, Object traversableObject, PathImpl path, ElementType type) {
+ if ( needToCallTraversableResolver( path, type ) ) {
+ return true;
+ }
+
+ Path pathToObject = path.getPathWithoutLeafNode();
+ try {
+ return validationContext.getTraversableResolver().isReachable(
+ traversableObject,
+ path.getLeafNode(),
+ validationContext.getRootBeanClass(),
+ pathToObject,
+ type
+ );
+ }
+ catch (RuntimeException e) {
+ throw log.getErrorDuringCallOfTraversableResolverIsReachableException( e );
+ }
+ }
+
+ private boolean needToCallTraversableResolver(PathImpl path, ElementType type) {
+ // as the TraversableResolver interface is designed right now it does not make sense to call it when
+ // there is no traversable object hosting the property to be accessed. For this reason we don't call the resolver
+ // for class level constraints (ElementType.TYPE) or top level method parameters or return values.
+ // see also BV expert group discussion - http://lists.jboss.org/pipermail/beanvalidation-dev/2013-January/000722.html
+ return isClassLevelConstraint( type )
+ || isCrossParameterValidation( path )
+ || isParameterValidation( path )
+ || isReturnValueValidation( path );
+ }
+
+ private boolean isCascadeRequired(ValidationContext<?> validationContext, Object traversableObject, PathImpl path, ElementType type) {
+ if ( needToCallTraversableResolver( path, type ) ) {
+ return true;
+ }
+
+ boolean isReachable = isReachable( validationContext, traversableObject, path, type );
+ if ( !isReachable ) {
+ return false;
+ }
+
+ Path pathToObject = path.getPathWithoutLeafNode();
+ try {
+ return validationContext.getTraversableResolver().isCascadable(
+ traversableObject,
+ path.getLeafNode(),
+ validationContext.getRootBeanClass(),
+ pathToObject,
+ type
+ );
+ }
+ catch (RuntimeException e) {
+ throw log.getErrorDuringCallOfTraversableResolverIsCascadableException( e );
+ }
+ }
+
+ private boolean isClassLevelConstraint(ElementType type) {
+ return ElementType.TYPE.equals( type );
+ }
+
+ private boolean isCrossParameterValidation(PathImpl path) {
+ return path.getLeafNode().getKind() == ElementKind.CROSS_PARAMETER;
+ }
+
+ private boolean isParameterValidation(PathImpl path) {
+ return path.getLeafNode().getKind() == ElementKind.PARAMETER;
+ }
+
+ private boolean isReturnValueValidation(PathImpl path) {
+ return path.getLeafNode().getKind() == ElementKind.RETURN_VALUE;
+ }
+
+ private boolean shouldFailFast(ValidationContext<?> context) {
+ return context.isFailFastModeEnabled() && !context.getFailingConstraints().isEmpty();
+ }
+
+ private PropertyMetaData getBeanPropertyMetaData( Class<?> beanClass, Path.Node propertyNode ) {
+ if ( !ElementKind.PROPERTY.equals( propertyNode.getKind() ) ) {
+ throw log.getInvalidPropertyPathException( beanClass.getName(), propertyNode.getName() );
+ }
+
+ BeanMetaData<?> beanMetaData = beanMetaDataManager.getBeanMetaData( beanClass );
+ PropertyMetaData propertyMetaData = beanMetaData.getMetaDataFor( propertyNode.getName() );
+
+ if ( propertyMetaData == null ) {
+ throw log.getInvalidPropertyPathException( beanClass.getName(), propertyNode.getName() );
+ }
+ return propertyMetaData;
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ private Object getBeanPropertyValue(ValidationContext<?> validationContext, Object object, Cascadable cascadable) {
+ Object value = cascadable.getValue( object );
+
+ // Value can be wrapped (e.g. Optional<Address>). Try to unwrap it
+ UnwrapMode unwrapMode = cascadable.unwrapMode();
+ if ( UnwrapMode.UNWRAP.equals( unwrapMode ) || UnwrapMode.AUTOMATIC.equals( unwrapMode ) ) {
+ ValidatedValueUnwrapper valueHandler = validationContext.getValidatedValueUnwrapper( cascadable.getCascadableType() );
+ if ( valueHandler != null ) {
+ value = valueHandler.handleValidatedValue( value );
+ }
+ }
+
+ return value;
+ }
+
+ private Object getBeanMemberValue(Object object, Member member) {
+ if ( member == null ) {
+ return object;
+ }
+
+ member = getAccessible( member );
+
+ if ( member instanceof Method ) {
+ return ReflectionHelper.getValue( (Method) member, object );
+ }
+ else if ( member instanceof Field ) {
+ return ReflectionHelper.getValue( (Field) member, object );
+ }
+ return null;
+ }
+
+ /**
+ * Returns an accessible version of the given member. Will be the given member itself in case it is accessible,
+ * otherwise a copy which is set accessible. These copies are maintained in the
+ * {@link ValidatorImpl#accessibleMembers} cache.
+ */
+ private Member getAccessible(Member original) {
+ if ( ( (AccessibleObject) original ).isAccessible() ) {
+ return original;
+ }
+
+ Member member = accessibleMembers.get( original );
+
+ if ( member != null ) {
+ return member;
+ }
+
+ SecurityManager sm = System.getSecurityManager();
+ if ( sm != null ) {
+ sm.checkPermission( HibernateValidatorPermission.ACCESS_PRIVATE_MEMBERS );
+ }
+
+ Class<?> clazz = original.getDeclaringClass();
+
+ if ( original instanceof Field ) {
+ member = run( GetDeclaredField.action( clazz, original.getName() ) );
+ }
+ else {
+ member = run( GetDeclaredMethod.action( clazz, original.getName() ) );
+ }
+
+ run( SetAccessibility.action( member ) );
+
+ Member cached = accessibleMembers.putIfAbsent( original, member );
+ if ( cached != null ) {
+ member = cached;
+ }
+
+ return member;
+ }
+
+ /**
+ * Runs the given privileged action, using a privileged block if required.
+ * <p>
+ * <b>NOTE:</b> This must never be changed into a publicly available method to avoid execution of arbitrary
+ * privileged actions within HV's protection domain.
+ */
+ private <T> T run(PrivilegedAction<T> action) {
+ return System.getSecurityManager() != null ? AccessController.doPrivileged( action ) : action.run();
+ }
+}
diff --git a/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java b/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java
new file mode 100644
index 0000000000..be60b5319a
--- /dev/null
+++ b/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java
@@ -0,0 +1,200 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.internal.metadata.aggregated;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.hibernate.validator.internal.engine.valuehandling.UnwrapMode;
+import org.hibernate.validator.internal.metadata.core.ConstraintHelper;
+import org.hibernate.validator.internal.metadata.core.ConstraintOrigin;
+import org.hibernate.validator.internal.metadata.core.MetaConstraint;
+import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
+import org.hibernate.validator.internal.metadata.raw.ConstrainedElement;
+import org.hibernate.validator.internal.util.CollectionHelper;
+import org.hibernate.validator.internal.util.logging.Log;
+import org.hibernate.validator.internal.util.logging.LoggerFactory;
+
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashMap;
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+
+/**
+ * Builds {@link ConstraintMetaData} instances for the
+ * {@link ConstrainedElement} objects representing one method or property in a
+ * type's inheritance hierarchy.
+ *
+ * @author Gunnar Morling
+ */
+public abstract class MetaDataBuilder {
+
+ private static final Log log = LoggerFactory.make();
+
+ protected final ConstraintHelper constraintHelper;
+
+ private final Class<?> beanClass;
+ private final Set<MetaConstraint<?>> constraints = newHashSet();
+ private final Map<Class<?>, Class<?>> groupConversions = newHashMap();
+ private boolean isCascading = false;
+ private UnwrapMode unwrapMode = UnwrapMode.AUTOMATIC;
+
+ protected MetaDataBuilder(Class<?> beanClass, ConstraintHelper constraintHelper) {
+ this.beanClass = beanClass;
+ this.constraintHelper = constraintHelper;
+ }
+
+ /**
+ * Whether this builder allows to add the given element or not. This is the
+ * case if the specified element relates to the same property or method with
+ * which this builder was instantiated.
+ *
+ * @param constrainedElement The element to check.
+ *
+ * @return <code>true</code> if the given element can be added to this
+ * builder, <code>false</code> otherwise.
+ */
+ public abstract boolean accepts(ConstrainedElement constrainedElement);
+
+ /**
+ * Adds the given element to this builder. It must be checked with
+ * {@link #accepts(ConstrainedElement)} before, whether this is allowed or
+ * not.
+ *
+ * @param constrainedElement The element to add.
+ */
+ public void add(ConstrainedElement constrainedElement) {
+ /*
+ * Make sure child annotation can override parent annotation with same type
+ */
+ for (MetaConstraint<?> constraint: constrainedElement.getConstraints()) {
+ if (!constraints.stream()
+ .filter(it->it.getDescriptor().getAnnotationType() == constraint.getDescriptor().getAnnotationType())
+ .findAny().isPresent()) {
+ constraints.add(constraint);
+ }
+ }
+// constraints.addAll( constrainedElement.getConstraints() );
+
+ isCascading = isCascading || constrainedElement.isCascading();
+ unwrapMode = constrainedElement.unwrapMode();
+
+ addGroupConversions( constrainedElement.getGroupConversions() );
+ }
+
+ /**
+ * Creates a new, read-only {@link ConstraintMetaData} object with all
+ * constraint information related to the method or property represented by
+ * this builder.
+ *
+ * @return A {@link ConstraintMetaData} object.
+ */
+ public abstract ConstraintMetaData build();
+
+ private void addGroupConversions(Map<Class<?>, Class<?>> groupConversions) {
+ for ( Entry<Class<?>, Class<?>> oneConversion : groupConversions.entrySet() ) {
+ if ( this.groupConversions.containsKey( oneConversion.getKey() ) ) {
+ throw log.getMultipleGroupConversionsForSameSourceException(
+ oneConversion.getKey(),
+ CollectionHelper.<Class<?>>asSet(
+ groupConversions.get( oneConversion.getKey() ),
+ oneConversion.getValue()
+ )
+ );
+ }
+ else {
+ this.groupConversions.put( oneConversion.getKey(), oneConversion.getValue() );
+ }
+ }
+ }
+
+ protected Map<Class<?>, Class<?>> getGroupConversions() {
+ return groupConversions;
+ }
+
+ protected Set<MetaConstraint<?>> getConstraints() {
+ return constraints;
+ }
+
+ protected boolean isCascading() {
+ return isCascading;
+ }
+
+ protected Class<?> getBeanClass() {
+ return beanClass;
+ }
+
+ public UnwrapMode unwrapMode() {
+ return unwrapMode;
+ }
+
+ /**
+ * Adapts the given constraints to the given bean type. In case a constraint
+ * is defined locally at the bean class the original constraint will be
+ * returned without any modifications. If a constraint is defined in the
+ * hierarchy (interface or super class) a new constraint will be returned
+ * with an origin of {@link org.hibernate.validator.internal.metadata.core.ConstraintOrigin#DEFINED_IN_HIERARCHY}. If a
+ * constraint is defined on an interface, the interface type will
+ * additionally be part of the constraint's groups (implicit grouping).
+ *
+ * @param constraints The constraints that shall be adapted. The constraints themselves
+ * will not be altered.
+ *
+ * @return A constraint adapted to the given bean type.
+ */
+ protected Set<MetaConstraint<?>> adaptOriginsAndImplicitGroups(Set<MetaConstraint<?>> constraints) {
+ Set<MetaConstraint<?>> adaptedConstraints = newHashSet();
+
+ for ( MetaConstraint<?> oneConstraint : constraints ) {
+ adaptedConstraints.add( adaptOriginAndImplicitGroup( oneConstraint ) );
+ }
+ return adaptedConstraints;
+ }
+
+ private <A extends Annotation> MetaConstraint<A> adaptOriginAndImplicitGroup(MetaConstraint<A> constraint) {
+ ConstraintOrigin definedIn = definedIn( beanClass, constraint.getLocation().getDeclaringClass() );
+
+ if ( definedIn == ConstraintOrigin.DEFINED_LOCALLY ) {
+ return constraint;
+ }
+
+ Class<?> constraintClass = constraint.getLocation().getDeclaringClass();
+
+ ConstraintDescriptorImpl<A> descriptor = new ConstraintDescriptorImpl<A>(
+ constraintHelper,
+ constraint.getLocation().getMember(),
+ constraint.getDescriptor().getAnnotation(),
+ constraint.getElementType(),
+ constraintClass.isInterface() ? constraintClass : null,
+ definedIn,
+ constraint.getDescriptor().getConstraintType()
+ );
+
+ return new MetaConstraint<A>(
+ descriptor,
+ constraint.getLocation()
+ );
+ }
+
+ /**
+ * @param rootClass The root class. That is the class for which we currently
+ * create a {@code BeanMetaData}
+ * @param hierarchyClass The class on which the current constraint is defined on
+ *
+ * @return Returns {@code ConstraintOrigin.DEFINED_LOCALLY} if the
+ * constraint was defined on the root bean,
+ * {@code ConstraintOrigin.DEFINED_IN_HIERARCHY} otherwise.
+ */
+ private ConstraintOrigin definedIn(Class<?> rootClass, Class<?> hierarchyClass) {
+ if ( hierarchyClass.equals( rootClass ) ) {
+ return ConstraintOrigin.DEFINED_LOCALLY;
+ }
+ else {
+ return ConstraintOrigin.DEFINED_IN_HIERARCHY;
+ }
+ }
+}
diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
index ef16548bf3..2afc3255e7 100644
--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
@@ -53,7 +53,7 @@ import io.onedev.server.git.config.GitConfig;
import io.onedev.server.model.support.RegistryLogin;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.plugin.docker.DockerExecutor.TestData;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.PKCS12CertExtractor;
import io.onedev.server.util.ServerConfig;
import io.onedev.server.util.concurrent.CapacityRunner;
@@ -133,7 +133,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
return new Commandline("docker");
}
- private String getImageOS(JobLogger jobLogger, String image) {
+ private String getImageOS(SimpleLogger jobLogger, String image) {
Commandline docker = newDocker();
docker.addArgs("image", "inspect", "-f", "{{.Os}}", image);
@@ -167,7 +167,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
return new File(Bootstrap.getSiteDir(), "cache");
}
- private String createNetwork(JobContext jobContext, boolean isWindows, JobLogger jobLogger) {
+ private String createNetwork(JobContext jobContext, boolean isWindows, SimpleLogger jobLogger) {
String network = getName() + "-" + jobContext.getProjectName() + "-"
+ jobContext.getBuildNumber() + "-" + jobContext.getRetried();
@@ -218,7 +218,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
return network;
}
- private void deleteNetwork(String network, JobLogger jobLogger) {
+ private void deleteNetwork(String network, SimpleLogger jobLogger) {
clearNetwork(network, jobLogger);
Commandline docker = newDocker();
@@ -241,7 +241,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}).checkReturnCode();
}
- private void clearNetwork(String network, JobLogger jobLogger) {
+ private void clearNetwork(String network, SimpleLogger jobLogger) {
Commandline docker = newDocker();
List<String> containerIds = new ArrayList<>();
@@ -302,7 +302,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
@SuppressWarnings("resource")
- private void startService(String network, JobService jobService, JobLogger jobLogger) {
+ private void startService(String network, JobService jobService, SimpleLogger jobLogger) {
jobLogger.log("Pulling service image...") ;
Commandline docker = newDocker();
docker.addArgs("pull", jobService.getImage());
@@ -449,7 +449,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
public void execute(String jobToken, JobContext jobContext) {
File hostBuildHome = FileUtils.createTempDir("onedev-build");
try {
- JobLogger jobLogger = jobContext.getLogger();
+ SimpleLogger jobLogger = jobContext.getLogger();
getCapacityRunner().call(new Callable<Void>() {
@SuppressWarnings("resource")
@@ -763,7 +763,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
}
- private void login(JobLogger jobLogger) {
+ private void login(SimpleLogger jobLogger) {
for (RegistryLogin login: getRegistryLogins()) {
if (login.getRegistryUrl() != null)
jobLogger.log(String.format("Login to docker registry '%s'...", login.getRegistryUrl()));
@@ -885,7 +885,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
@Override
- public void test(TestData testData, JobLogger jobLogger) {
+ public void test(TestData testData, SimpleLogger jobLogger) {
login(jobLogger);
jobLogger.log("Pulling image...");
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index c8606ecdf0..07ba3f47a7 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -54,7 +54,7 @@ import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;
import io.onedev.server.model.support.inputspec.SecretInput;
import io.onedev.server.plugin.executor.kubernetes.KubernetesExecutor.TestData;
import io.onedev.server.util.CollectionUtils;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.PKCS12CertExtractor;
import io.onedev.server.util.ServerConfig;
import io.onedev.server.web.editable.annotation.Editable;
@@ -64,7 +64,7 @@ import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.util.Testable;
@Editable(order=100, description="This executor runs build jobs as pods in a kubernetes cluster. "
- + "<b class='red'>Note:</b> Make sure server url is specified correctly in system "
+ + "<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system "
+ "setting as job pods need to access it to download source and artifacts")
@Horizontal
public class KubernetesExecutor extends JobExecutor implements Testable<TestData> {
@@ -179,7 +179,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
@Override
- public void test(TestData testData, JobLogger jobLogger) {
+ public void test(TestData testData, SimpleLogger jobLogger) {
execute(testData.getDockerImage(), KubernetesResource.TEST_JOB_TOKEN, jobLogger, null);
}
@@ -193,7 +193,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return cmdline;
}
- private String createResource(Map<Object, Object> resourceDef, Collection<String> secretsToMask, JobLogger jobLogger) {
+ private String createResource(Map<Object, Object> resourceDef, Collection<String> secretsToMask, SimpleLogger jobLogger) {
Commandline kubectl = newKubeCtl();
File file = null;
try {
@@ -234,7 +234,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void deleteNamespace(String namespace, JobLogger jobLogger) {
+ private void deleteNamespace(String namespace, SimpleLogger jobLogger) {
try {
Commandline cmd = newKubeCtl();
cmd.timeout(NAMESPACE_DELETION_TIMEOUT).addArgs("delete", "namespace", namespace);
@@ -261,7 +261,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private String createNamespace(@Nullable JobContext jobContext, JobLogger jobLogger) {
+ private String createNamespace(@Nullable JobContext jobContext, SimpleLogger jobLogger) {
String namespace = getName() + "-";
if (jobContext != null) {
namespace += jobContext.getProjectName().replace('.', '-').replace('_', '-') + "-"
@@ -362,7 +362,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return null;
}
- private OsInfo getBaselineOsInfo(Collection<NodeSelectorEntry> nodeSelector, JobLogger jobLogger) {
+ private OsInfo getBaselineOsInfo(Collection<NodeSelectorEntry> nodeSelector, SimpleLogger jobLogger) {
Commandline kubectl = newKubeCtl();
kubectl.addArgs("get", "nodes", "-o", "jsonpath={range .items[*]}{.status.nodeInfo.operatingSystem} {.status.nodeInfo.kernelVersion} {.spec.unschedulable}{'|'}{end}");
for (NodeSelectorEntry entry: nodeSelector)
@@ -399,7 +399,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
@Nullable
- private String createImagePullSecret(String namespace, JobLogger jobLogger) {
+ private String createImagePullSecret(String namespace, SimpleLogger jobLogger) {
if (!getRegistryLogins().isEmpty()) {
Map<Object, Object> auths = new LinkedHashMap<>();
for (RegistryLogin login: getRegistryLogins()) {
@@ -436,7 +436,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
@Nullable
- private String createTrustCertsConfigMap(String namespace, JobLogger jobLogger) {
+ private String createTrustCertsConfigMap(String namespace, SimpleLogger jobLogger) {
Map<String, String> configMapData = new LinkedHashMap<>();
ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
File keystoreFile = serverConfig.getKeystoreFile();
@@ -473,7 +473,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
private void startService(String namespace, JobContext jobContext, JobService jobService,
- @Nullable String imagePullSecretName, JobLogger jobLogger) {
+ @Nullable String imagePullSecretName, SimpleLogger jobLogger) {
jobLogger.log("Creating service pod from image " + jobService.getImage() + "...");
List<NodeSelectorEntry> nodeSelector = getNodeSelector();
@@ -634,7 +634,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return map;
}
- private void execute(String dockerImage, String jobToken, JobLogger jobLogger, @Nullable JobContext jobContext) {
+ private void execute(String dockerImage, String jobToken, SimpleLogger jobLogger, @Nullable JobContext jobContext) {
jobLogger.log("Checking cluster access...");
Commandline kubectl = newKubeCtl();
kubectl.addArgs("cluster-info");
@@ -1017,7 +1017,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return false;
}
- private void updateCacheLabels(String nodeName, JobContext jobContext, JobLogger jobLogger) {
+ private void updateCacheLabels(String nodeName, JobContext jobContext, SimpleLogger jobLogger) {
jobLogger.log("Updating cache labels on node...");
Commandline kubectl = newKubeCtl();
@@ -1102,7 +1102,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void watchPod(String namespace, String podName, StatusChecker statusChecker, JobLogger jobLogger) {
+ private void watchPod(String namespace, String podName, StatusChecker statusChecker, SimpleLogger jobLogger) {
Commandline kubectl = newKubeCtl();
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
@@ -1206,7 +1206,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void checkEventError(String namespace, String podName, JobLogger jobLogger) {
+ private void checkEventError(String namespace, String podName, SimpleLogger jobLogger) {
Commandline kubectl = newKubeCtl();
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
@@ -1276,7 +1276,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
private void collectContainerLog(String namespace, String podName, String containerName,
- @Nullable String logEndMessage, JobLogger jobLogger) {
+ @Nullable String logEndMessage, SimpleLogger jobLogger) {
Thread thread = Thread.currentThread();
AtomicReference<String> errorMessageRef = new AtomicReference<>(null);
AtomicReference<Instant> lastInstantRef = new AtomicReference<>(null);
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
index e8896c2f4b..de615382c5 100644
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
@@ -13,7 +13,7 @@ import io.onedev.commons.utils.LockUtils;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobReport;
import io.onedev.server.model.Build;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.validation.annotation.PathSegment;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -62,7 +62,7 @@ public class JobHtmlReport extends JobReport {
}
@Override
- public void process(Build build, File workspace, JobLogger logger) {
+ public void process(Build build, File workspace, SimpleLogger logger) {
File reportDir = new File(build.getReportDir(DIR), getReportName());
FileUtils.createDir(reportDir);
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java
index 0d9a468538..59ee3e0515 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java
@@ -13,7 +13,7 @@ import io.onedev.commons.utils.LockUtils;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobReport;
import io.onedev.server.model.Build;
-import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.validation.annotation.PathSegment;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -62,7 +62,7 @@ public class JobMarkdownReport extends JobReport {
}
@Override
- public void process(Build build, File workspace, JobLogger logger) {
+ public void process(Build build, File workspace, SimpleLogger logger) {
File reportDir = new File(build.getReportDir(DIR), getReportName());
FileUtils.createDir(reportDir);
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlCssResourceReference.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlCssResourceReference.java
deleted file mode 100644
index ae7fcedf6d..0000000000
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.plugin.sso.openid;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class CallbackUrlCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public CallbackUrlCssResourceReference() {
- super(CallbackUrlCssResourceReference.class, "callback-url.css");
- }
-
-}
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlPanel.html b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlPanel.html
index 30f9679a33..bbd36dade5 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlPanel.html
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlPanel.html
@@ -1,9 +1,5 @@
<wicket:panel>
- <div class="callback-url">
- <span title="This url will be required when registering OneDev to OpenID provider">
- <wicket:svg href="question-circle" class="icon"/>
- </span>
- <span class="name">Callback URL:</span> <span wicket:id="label" class="value"></span>
- <a wicket:id="copy"><wicket:svg href="copy" class="icon"></wicket:svg></a>
- </div>
+ <span class="badge badge-light-info" wicket:id="url"></span>
+ <a wicket:id="copy" class="ml-2"><wicket:svg href="copy" class="icon"></wicket:svg></a>
+ <div class="small text-muted mt-2">This callback url will be required when registering OneDev to OpenID provider</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlPanel.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlPanel.java
index 38fb232a60..b2848bb55a 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlPanel.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/CallbackUrlPanel.java
@@ -1,7 +1,5 @@
package io.onedev.server.plugin.sso.openid;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
@@ -21,14 +19,8 @@ public class CallbackUrlPanel extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Label("label", callbackUrl));
+ add(new Label("url", callbackUrl));
add(new CopyToClipboardLink("copy", Model.of(callbackUrl)));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new CallbackUrlCssResourceReference()));
- }
-
}
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
index 9a1af2a924..c4ca13303f 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
@@ -290,7 +290,7 @@ public class OpenIdConnector extends SsoConnector {
}
@Override
- public Component renderSubHeader(String componentId) {
+ public Component renderAdditionalInfo(String componentId) {
return new CallbackUrlPanel(componentId, getCallbackUri().toString());
}
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/callback-url.css b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/callback-url.css
deleted file mode 100644
index c2a67e94ff..0000000000
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/callback-url.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.callback-url .name {
- color: #999;
-}
\ No newline at end of file
diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
index 86a9fbbb45..9f49bba0eb 100644
--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
@@ -25,8 +25,9 @@ import io.onedev.server.util.ServerConfig;
import io.onedev.server.util.jetty.ClasspathAssetServlet;
import io.onedev.server.util.jetty.FileAssetServlet;
import io.onedev.server.util.jetty.ServletConfigurator;
+import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.component.markdown.AttachmentUploadServlet;
-import io.onedev.server.web.img.Img;
+import io.onedev.server.web.img.ImageScope;
import io.onedev.server.web.websocket.WebSocketManager;
public class ProductServletConfigurator implements ServletConfigurator {
@@ -89,7 +90,8 @@ public class ProductServletConfigurator implements ServletConfigurator {
context.addServlet(new ServletHolder(attachmentUploadServlet), "/attachment_upload");
- context.addServlet(new ServletHolder(new ClasspathAssetServlet(Img.class)), "/img/*");
+ context.addServlet(new ServletHolder(new ClasspathAssetServlet(ImageScope.class)), "/img/*");
+ context.addServlet(new ServletHolder(new ClasspathAssetServlet(IconScope.class)), "/icon/*");
context.getSessionHandler().addEventListener(new HttpSessionListener() {
@@ -112,7 +114,7 @@ public class ProductServletConfigurator implements ServletConfigurator {
context.addServlet(fileServletHolder, "/site/*");
context.addServlet(fileServletHolder, "/robots.txt");
- context.addServlet(new ServletHolder(jerseyServlet), "/rest/*");
+ context.addServlet(new ServletHolder(jerseyServlet), "/rest/*");
}
-
+
}
diff --git a/server-product/system/site/avatars/onedev.png b/server-product/system/site/avatars/onedev.png
index c252bab6e8..5932e639f1 100644
Binary files a/server-product/system/site/avatars/onedev.png and b/server-product/system/site/avatars/onedev.png differ