Skip to content

The Unified and Autonomous Development Platform

Some minor bug fixes

Robin Shen029e8ffb97f6
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/CodeProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/CodeProcessor.java
index 8fe86cc9bc..c816094fa1 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/CodeProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/CodeProcessor.java
@@ -13,6 +13,7 @@ import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;
import org.jsoup.select.NodeTraversor;
import org.jsoup.select.NodeVisitor;
+import org.unbescape.html.HtmlEscape;
import com.google.common.base.Splitter;
@@ -57,7 +58,7 @@ public class CodeProcessor implements MarkdownProcessor {
}).traverse(rendered);
for (Element codeElement: codeElements) {
- String code = codeElement.html();
+ String code = HtmlEscape.unescapeHtml(codeElement.html());
String language = null;
String cssClasses = codeElement.attr("class");
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 78294c80e5..5912b9baf6 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
@@ -22,6 +22,15 @@
.text-diff>.head>div:last-child {
margin-right: 0;
}
+.text-diff>.body>tbody>tr.code {
+ background: inherit;
+ border: inherit;
+ border-radius: inherit;
+ padding: inherit;
+ margin: inherit;
+ font-family: inherit;
+ font-size: inherit;
+}
.text-diff>.body>tbody>tr>td.content>span.content-mark {
background: #CCCCFF;
}
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 e92fb4a6f8..42260dd2d2 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
@@ -19,7 +19,7 @@
<a class="do-emoji pull-left" title="Show emojis"><i class="fa fa-smile-o"></i></a>
<a class="do-mention pull-left" title="Mention someone"><i class="fa fa-at"></i></a>
<div class="reference pull-left dropdown">
- <a href="#" data-toggle="dropdown" title="Reference issue, build, or pull request"><i class="fa fa-hashtag"></i></a>
+ <a data-toggle="dropdown" title="Reference issue, build, or pull request"><i class="fa fa-hashtag"></i></a>
<ul class="dropdown-menu" aria-labelledby="dLabel">
<li><a class="do-reference" data-reference="issue"><i class="fa fa-bug fa-fw"></i> Reference Issue</a></li>
<li><a class="do-reference" data-reference="pull request"><i class="fa fa-ext fa-branch-compare fa-fw"></i> Reference Pull Request</a></li>
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 e15d32d906..b0fa51a7a3 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
@@ -58,7 +58,8 @@ body.fullscreen {
margin-right: 4px;
height: 24px;
}
-.markdown-editor>.head>.actions>div>a:hover, .markdown-editor>.head>.actions>div>a.active {
+.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;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java
index 7b42907be2..7f5febd447 100644
--- a/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java
@@ -107,6 +107,9 @@ public class ArtifactDownloadResource extends AbstractResource {
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
+
+ response.setContentLength(artifactFile.length());
+
response.setWriteCallback(new WriteCallback() {
@Override
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 00c8fa4bc0..6ba2e712cd 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
@@ -672,3 +672,12 @@ td.ellipsis {
vertical-align: middle !important;
}
+.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;
+}
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 12e37562dc..79431898fd 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
@@ -6,9 +6,9 @@
<div wicket:id="blobNavigator" class="blob-navigator pull-left"></div>
<div wicket:id="blobOperations" class="operations pull-right">
<a wicket:id="cloneOrDownload" title="Clone or download project" class="clone-or-download"><b>Clone or Download <i class="fa fa-caret-down"></i></b></a>
- <a wicket:id="history" title="Commit history of current path">History</a>
<a wicket:id="add" title="Add files to current directory">Add <i class="fa fa-caret-down"></i></a>
<a wicket:id="search" title="Search files, symbols and texts">Search <i class="fa fa-caret-down"></i></a>
+ <a wicket:id="history" title="Commit history of current path">History</a>
</div>
</div>
<!-- below is used to hold file navigator if there is not enough space in head -->
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
index 89833b45e5..83359b45dd 100644
--- 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
@@ -14,12 +14,3 @@
font-size: 16px;
margin-bottom: 12px;
}
-.push-instructions .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;
-}
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 22bfb77d85..b50961ef23 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
@@ -13,4 +13,13 @@
padding-top: 8px;
padding-bottom: 8px;
display: none;
-}
\ No newline at end of file
+}
+.source-edit>.code {
+ background: none;
+ border: none;
+ border-radius: none;
+ padding: 0;
+ margin: 0;
+ font-family: inherit;
+ font-size: inherit;
+}
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 7ba93734bd..e7abcf32f6 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,6 +1,15 @@
.source-view {
position: relative;
}
+.source-view>.code {
+ background: none;
+ border: none;
+ border-radius: none;
+ padding: 0;
+ margin: 0;
+ font-family: inherit;
+ font-size: inherit;
+}
.source-view>.comment {
background: white;
position: absolute;
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 9a302098a6..e921eb93c1 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
@@ -205,12 +205,6 @@ ul>li>a.code-comments.new .fa-circle {
.conflict-resolve-instruction .body>ul>li>.code {
margin-top: 8px;
- font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
- font-size: 13px;
- background: #F5F5F5;
- border: 1px dashed #BBB;
- border-radius: 4px;
- padding: 8px;
}
@media(min-width: 1150px) {