Skip to content

The Unified and Autonomous Development Platform

Some minor css adjustment

Robin Shenf2e27208ef3f
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/graph/CommitGraphResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/commit/graph/CommitGraphResourceReference.java
deleted file mode 100644
index 90cd492a9e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/graph/CommitGraphResourceReference.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.onedev.server.web.component.commit.graph;
-
-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 org.apache.wicket.request.resource.CssResourceReference;
-
-import io.onedev.server.web.asset.snapsvg.SnapSvgResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class CommitGraphResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public CommitGraphResourceReference() {
- super(CommitGraphResourceReference.class, "commit-graph.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new SnapSvgResourceReference()));
- dependencies.add(CssHeaderItem.forReference(
- new CssResourceReference(CommitGraphResourceReference.class, "commit-graph.css")));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/graph/CommitGraphUtils.java b/server-core/src/main/java/io/onedev/server/web/component/commit/graph/CommitGraphUtils.java
deleted file mode 100644
index 86178ce0a6..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/graph/CommitGraphUtils.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.onedev.server.web.component.commit.graph;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.onedev.server.OneDev;
-
-public class CommitGraphUtils {
-
- public static void sort(List<RevCommit> commits, int from) {
- final Map<String, Long> hash2index = new HashMap<>();
- Map<String, RevCommit> hash2commit = new HashMap<>();
- for (int i=0; i<commits.size(); i++) {
- RevCommit commit = commits.get(i);
- hash2index.put(commit.name(), 1L*i*commits.size());
- hash2commit.put(commit.name(), commit);
- }
-
- Stack<RevCommit> stack = new Stack<>();
-
- for (int i=commits.size()-1; i>=from; i--)
- stack.push(commits.get(i));
-
- // commits are nearly ordered, so this should be fast
- while (!stack.isEmpty()) {
- RevCommit commit = stack.pop();
- long commitIndex = hash2index.get(commit.name());
- int count = 1;
- for (RevCommit parent: commit.getParents()) {
- String parentHash = parent.name();
- Long parentIndex = hash2index.get(parentHash);
- if (parentIndex != null && parentIndex.longValue()<commitIndex) {
- stack.push(hash2commit.get(parentHash));
- hash2index.put(parentHash, commitIndex+(count++));
- }
- }
- }
-
- commits.sort((o1, o2) -> {
- long value = hash2index.get(o1.name()) - hash2index.get(o2.name());
- if (value < 0)
- return -1;
- else if (value > 0)
- return 1;
- else
- return 0;
- });
- }
-
- public static String asJSON(List<RevCommit> commits) {
- Map<String, Integer> hash2index = new HashMap<>();
- int commitIndex = 0;
- for (int i=0; i<commits.size(); i++) {
- RevCommit commit = commits.get(i);
- if (commit != null)
- hash2index.put(commit.name(), commitIndex++);
- }
- List<List<Integer>> commitIndexes = new ArrayList<>();
- for (RevCommit commit: commits) {
- if (commit != null) {
- List<Integer> parentIndexes = new ArrayList<>();
- for (RevCommit parent: commit.getParents()) {
- Integer parentIndex = hash2index.get(parent.name());
- if (parentIndex != null)
- parentIndexes.add(parentIndex);
- }
- commitIndexes.add(parentIndexes);
- }
- }
- try {
- return OneDev.getInstance(ObjectMapper.class).writeValueAsString(commitIndexes);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/graph/commit-graph.css b/server-core/src/main/java/io/onedev/server/web/component/commit/graph/commit-graph.css
deleted file mode 100644
index cf09d130c7..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/graph/commit-graph.css
+++ /dev/null
@@ -1,108 +0,0 @@
-.commit-graph {
- position: absolute;
-}
-.commit-dot {
- fill: #53a8fd;
- stroke: #53a8fd;
-}
-.commit-line {
- stroke-width: 1px;
- stroke: #53a8fd;
- fill: none;
-}
-
-.commit-dot-color1 {
- fill: #53a8fd;
- stroke: #53a8fd;
-}
-.commit-line-color1 {
- stroke: #53a8fd;
-}
-
-.commit-dot-color2 {
- fill: #09c112;
- stroke: #09c112;
-}
-.commit-line-color2 {
- stroke: #09c112;
-}
-
-.commit-dot-color3 {
- fill: #ff4242;
- stroke: #ff4242;
-}
-.commit-line-color3 {
- stroke: #ff4242;
-}
-
-.commit-dot-color4 {
- fill: #0252a2;
- stroke: #0252a2;
-}
-.commit-line-color4 {
- stroke: #0252a2;
-}
-
-.commit-dot-color5 {
- fill: #056d0b;
- stroke: #056d0b;
-}
-.commit-line-color5 {
- stroke: #056d0b;
-}
-
-.commit-dot-color6 {
- fill: #b00000;
- stroke: #b00000;
-}
-.commit-line-color6 {
- stroke: #b00000;
-}
-
-.commit-dot-color7 {
- fill: #af29f8;
- stroke: #af29f8;
-}
-.commit-line-color7 {
- stroke: #af29f8;
-}
-
-.commit-dot-color8 {
- fill: #ee6c1e;
- stroke: #ee6c1e;
-}
-.commit-line-color8 {
- stroke: #ee6c1e;
-}
-
-.commit-dot-color9 {
- fill: #ef56cd;
- stroke: #ef56cd;
-}
-.commit-line-color9 {
- stroke: #ef56cd;
-}
-
-.commit-dot-color10 {
- fill: #630596;
- stroke: #630596;
-}
-.commit-line-color10 {
- stroke: #630596;
-}
-
-.commit-dot-color11 {
- fill: #8e4509;
- stroke: #8e4509;
-}
-.commit-line-color11 {
- stroke: #8e4509;
-}
-
-.commit-dot-color12 {
- fill: #9b0f7b;
- stroke: #9b0f7b;
-}
-.commit-line-color12 {
- stroke: #9b0f7b;
-}
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 43cb162576..cc733c2acb 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
@@ -7,6 +7,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Stack;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
@@ -21,7 +22,6 @@ import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
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.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -48,6 +48,8 @@ import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import io.onedev.commons.utils.StringUtils;
@@ -69,8 +71,6 @@ import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.behavior.CommitQueryBehavior;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
-import io.onedev.server.web.component.commit.graph.CommitGraphResourceReference;
-import io.onedev.server.web.component.commit.graph.CommitGraphUtils;
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;
@@ -176,13 +176,13 @@ public abstract class CommitListPanel extends Panel {
commits.last.add(revWalk.parseCommit(ObjectId.fromString(commitHashes.get(i))));
}
- CommitGraphUtils.sort(commits.last, 0);
+ sort(commits.last, 0);
commits.current = new ArrayList<>(commits.last);
for (int i=lastMaxCount; i<commitHashes.size(); i++)
commits.current.add(revWalk.parseCommit(ObjectId.fromString(commitHashes.get(i))));
- CommitGraphUtils.sort(commits.current, lastMaxCount);
+ sort(commits.current, lastMaxCount);
commits.last = separateByDate(commits.last);
commits.current = separateByDate(commits.current);
@@ -631,15 +631,81 @@ public abstract class CommitListPanel extends Panel {
}
private String renderCommitGraph() {
- String jsonOfCommits = CommitGraphUtils.asJSON(commitsModel.getObject().current);
- return String.format("onedev.server.commitGraph.render('%s', %s);", body.getMarkupId(), jsonOfCommits);
+ String jsonOfCommits = asJSON(commitsModel.getObject().current);
+ return String.format("onedev.server.commitList.renderGraph('%s', %s);", body.getMarkupId(), jsonOfCommits);
}
+ private void sort(List<RevCommit> commits, int from) {
+ final Map<String, Long> hash2index = new HashMap<>();
+ Map<String, RevCommit> hash2commit = new HashMap<>();
+ for (int i=0; i<commits.size(); i++) {
+ RevCommit commit = commits.get(i);
+ hash2index.put(commit.name(), 1L*i*commits.size());
+ hash2commit.put(commit.name(), commit);
+ }
+
+ Stack<RevCommit> stack = new Stack<>();
+
+ for (int i=commits.size()-1; i>=from; i--)
+ stack.push(commits.get(i));
+
+ // commits are nearly ordered, so this should be fast
+ while (!stack.isEmpty()) {
+ RevCommit commit = stack.pop();
+ long commitIndex = hash2index.get(commit.name());
+ int count = 1;
+ for (RevCommit parent: commit.getParents()) {
+ String parentHash = parent.name();
+ Long parentIndex = hash2index.get(parentHash);
+ if (parentIndex != null && parentIndex.longValue()<commitIndex) {
+ stack.push(hash2commit.get(parentHash));
+ hash2index.put(parentHash, commitIndex+(count++));
+ }
+ }
+ }
+
+ commits.sort((o1, o2) -> {
+ long value = hash2index.get(o1.name()) - hash2index.get(o2.name());
+ if (value < 0)
+ return -1;
+ else if (value > 0)
+ return 1;
+ else
+ return 0;
+ });
+ }
+
+ private String asJSON(List<RevCommit> commits) {
+ Map<String, Integer> hash2index = new HashMap<>();
+ int commitIndex = 0;
+ for (int i=0; i<commits.size(); i++) {
+ RevCommit commit = commits.get(i);
+ if (commit != null)
+ hash2index.put(commit.name(), commitIndex++);
+ }
+ List<List<Integer>> commitIndexes = new ArrayList<>();
+ for (RevCommit commit: commits) {
+ if (commit != null) {
+ List<Integer> parentIndexes = new ArrayList<>();
+ for (RevCommit parent: commit.getParents()) {
+ Integer parentIndex = hash2index.get(parent.name());
+ if (parentIndex != null)
+ parentIndexes.add(parentIndex);
+ }
+ commitIndexes.add(parentIndexes);
+ }
+ }
+ try {
+ return OneDev.getInstance(ObjectMapper.class).writeValueAsString(commitIndexes);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new CommitListResourceReference()));
- response.render(JavaScriptHeaderItem.forReference(new CommitGraphResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new CommitListResourceReference()));
response.render(OnDomReadyHeaderItem.forScript(renderCommitGraph()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListResourceReference.java
index 90252339c0..16cf3309ab 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListResourceReference.java
@@ -1,13 +1,30 @@
package io.onedev.server.web.component.commit.list;
+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.snapsvg.SnapSvgResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
-public class CommitListResourceReference extends BaseDependentCssResourceReference {
+public class CommitListResourceReference extends BaseDependentResourceReference {
private static final long serialVersionUID = 1L;
public CommitListResourceReference() {
- super(CommitListResourceReference.class, "commit-list.css");
+ super(CommitListResourceReference.class, "commit-list.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(new SnapSvgResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ CommitListResourceReference.class, "commit-list.css")));
+ return dependencies;
}
}
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 410cb4b1a9..ba2a3a5a6e 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,6 +1,3 @@
-.commit-list {
- position: relative;
-}
.commit-list>.head {
position: relative;
}
@@ -18,6 +15,9 @@
margin-right: 0;
}
+.commit-list>.body {
+ position: relative;
+}
.commit-list>.body .no-commits {
font-size: 16px;
}
@@ -87,6 +87,116 @@
border-bottom: 1px solid #EEE;
}
+.commit-graph {
+ position: absolute;
+ top: 0;
+}
+.commit-dot {
+ fill: #53a8fd;
+ stroke: #53a8fd;
+}
+.commit-line {
+ stroke-width: 1px;
+ stroke: #53a8fd;
+ fill: none;
+}
+
+.commit-dot-color1 {
+ fill: #53a8fd;
+ stroke: #53a8fd;
+}
+.commit-line-color1 {
+ stroke: #53a8fd;
+}
+
+.commit-dot-color2 {
+ fill: #09c112;
+ stroke: #09c112;
+}
+.commit-line-color2 {
+ stroke: #09c112;
+}
+
+.commit-dot-color3 {
+ fill: #ff4242;
+ stroke: #ff4242;
+}
+.commit-line-color3 {
+ stroke: #ff4242;
+}
+
+.commit-dot-color4 {
+ fill: #0252a2;
+ stroke: #0252a2;
+}
+.commit-line-color4 {
+ stroke: #0252a2;
+}
+
+.commit-dot-color5 {
+ fill: #056d0b;
+ stroke: #056d0b;
+}
+.commit-line-color5 {
+ stroke: #056d0b;
+}
+
+.commit-dot-color6 {
+ fill: #b00000;
+ stroke: #b00000;
+}
+.commit-line-color6 {
+ stroke: #b00000;
+}
+
+.commit-dot-color7 {
+ fill: #af29f8;
+ stroke: #af29f8;
+}
+.commit-line-color7 {
+ stroke: #af29f8;
+}
+
+.commit-dot-color8 {
+ fill: #ee6c1e;
+ stroke: #ee6c1e;
+}
+.commit-line-color8 {
+ stroke: #ee6c1e;
+}
+
+.commit-dot-color9 {
+ fill: #ef56cd;
+ stroke: #ef56cd;
+}
+.commit-line-color9 {
+ stroke: #ef56cd;
+}
+
+.commit-dot-color10 {
+ fill: #630596;
+ stroke: #630596;
+}
+.commit-line-color10 {
+ stroke: #630596;
+}
+
+.commit-dot-color11 {
+ fill: #8e4509;
+ stroke: #8e4509;
+}
+.commit-line-color11 {
+ stroke: #8e4509;
+}
+
+.commit-dot-color12 {
+ fill: #9b0f7b;
+ stroke: #9b0f7b;
+}
+.commit-line-color12 {
+ stroke: #9b0f7b;
+}
+
@media(max-width: 991px) {
.commit-list li.commit .hash, .commit-list li.commit .browse {
display: none;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/graph/commit-graph.js b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.js
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/web/component/commit/graph/commit-graph.js
rename to server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.js
index 2ccdcccbe2..b0da06e20c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/graph/commit-graph.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.js
@@ -1,13 +1,13 @@
-onedev.server.commitGraph = {
- render: function(containerId, commits) {
+onedev.server.commitList = {
+ renderGraph: function(containerId, commits) {
var $commitList = $("#" + containerId + ">ul");
if ($commitList.prev("svg").length == 0)
$commitList.before("<svg class='commit-graph'></svg>");
var $graph = $commitList.prev("svg");
- onedev.server.commitGraph.populateData($graph, commits);
- onedev.server.commitGraph.drawGraph($graph);
+ onedev.server.commitList.populateGraphData($graph, commits);
+ onedev.server.commitList.drawGraph($graph);
var paper = Snap($graph[0]);
function getCommitDot(e) {
@@ -32,7 +32,7 @@ onedev.server.commitGraph = {
* commits is an array of ordered commit object, and the commit object is itself a
* list of parent indexes
*/
- populateData: function($graph, commits) {
+ populateGraphData: function($graph, commits) {
var columnsLimit = 12;
var colorsLimit = 12;
@@ -432,7 +432,7 @@ $(function() {
return;
e.stopPropagation();
$(".commit-graph").each(function() {
- onedev.server.commitGraph.drawGraph($(this));
+ onedev.server.commitList.drawGraph($(this));
});
});
});
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 26b6a3aaf9..63a52ddacb 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
@@ -269,6 +269,7 @@ body.fullscreen {
border: 1px dashed #BBB;
background: #F9F9F9;
position: relative;
+ word-break: normal;
}
.markdown-rendered blockquote {
font-size: 15px;
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 e7067c501e..069736ee95 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
@@ -857,15 +857,6 @@ onedev.server.markdown = {
},
initRendered: function($rendered) {
- if (!onedev.server.util.isDevice()) {
- $rendered.find("pre.highlight").each(function() {
- var ps = new PerfectScrollbar(this);
- $(this).addClass("resize-aware").on("resized", function() {
- ps.update();
- });
- });
- }
-
$rendered.find("span.header-anchor").parent().addClass("header-anchor");
$rendered.find("a.header-anchor").each(function() {
var $headerAnchor = $(this);
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 16ee233c84..9d888e1928 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
@@ -539,9 +539,6 @@ a.input-clear.input-group-clear {
border: none;
border-left: 6px solid;
}
-.alert a {
- font-weight: bold;
-}
.alert-info {
border-color: #46A7D8;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
index 759f67fe02..b868c1f1b5 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
@@ -7,7 +7,6 @@ import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.web.util.WicketUtils;
@Singleton
public class BuildEventBroadcaster {
@@ -21,18 +20,16 @@ public class BuildEventBroadcaster {
@Listen
public void on(BuildEvent event) {
- PageKey pageKey = WicketUtils.getPageKey();
-
Project project = event.getProject();
Build build = event.getBuild();
webSocketManager.notifyObservableChange(Build.getWebSocketObservable(build.getId()), null);
String observable = "commit-status:" + project.getId() + ":" + build.getCommitHash();
- webSocketManager.notifyObservableChange(observable, pageKey);
+ webSocketManager.notifyObservableChange(observable, null);
observable = "job-status:" + project.getId() + ":" + build.getCommitHash() + ":" + build.getJobName();
- webSocketManager.notifyObservableChange(observable, pageKey);
+ webSocketManager.notifyObservableChange(observable, null);
}
}
\ No newline at end of file