The Unified and Autonomous Development Platform
Minor UI change
Robin Shen49b3b31fbf1e
diff --git a/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java b/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.javaindex 3620524f20..ea9a5063d8 100644--- a/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java+++ b/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java@@ -13,7 +13,6 @@ import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.HtmlUtils;import io.onedev.server.util.PropertyChange;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;@@ -66,18 +65,18 @@ public class ActivityDetail implements Serializable {builder.append("<tr>");if (changes.size() != 1 || !hideNameIfOnlyOneRow) {builder.append(" <td style='padding:0.4em 0.6em; font-size:0.9em; border-bottom:1px solid #EBEDF3; text-align:left;'>");- builder.append(HtmlEscape.escapeHtml5(change.getName()));+ builder.append("<pre style='margin:0;'>" + HtmlEscape.escapeHtml5(change.getName()) + "</pre>");builder.append(" </td>");}builder.append(" <td style='padding:0.4em 0.6em; font-size:0.9em; border-bottom:1px solid #EBEDF3; text-align:left;'>");if (change.getOldValue() != null)- builder.append(HtmlUtils.formatAsHtml(change.getOldValue()));+ builder.append("<pre style='margin:0;'>" + HtmlEscape.escapeHtml5(change.getOldValue()) + "</pre>");elsebuilder.append("<i>empty</i>");builder.append(" </td>");builder.append(" <td style='padding:0.4em 0.6em; font-size:0.9em; border-bottom:1px solid #EBEDF3; font-size:0.9em; text-align:left;'>");if (change.getNewValue() != null)- builder.append(HtmlUtils.formatAsHtml(change.getNewValue()));+ builder.append("<pre style='margin:0;'>" + HtmlEscape.escapeHtml5(change.getNewValue()) + "</pre>");elsebuilder.append("<i>empty</i>");builder.append(" </td>");diff --git a/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java b/server-core/src/main/java/io/onedev/server/util/HtmlUtils.javaindex bc597a4003..fe53e5fdbd 100644--- a/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java@@ -11,12 +11,9 @@ import org.jsoup.nodes.Node;import org.jsoup.nodes.TextNode;import org.jsoup.safety.Cleaner;import org.jsoup.safety.Safelist;-import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;-import io.onedev.commons.utils.StringUtils;-public class HtmlUtils {private static final String[] SAFE_TAGS = new String[] { "h1", "h2", "h3", "h4", "h5", "h6", "h7", "h8", "br", "b",@@ -109,17 +106,4 @@ public class HtmlUtils {return Jsoup.parseBodyFragment(html, "http://localhost/sanitize");}- /**- * Escape text and preserving line breaks and white spaces- * @param text- * @return- */- public static String formatAsHtml(String text) {- text = HtmlEscape.escapeHtml5(text);- text = StringUtils.replace(text, "\n", "<br>");- text = StringUtils.replace(text, " ", " ");- text = StringUtils.replace(text, "\t", " ");- return text;- }-}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.cssindex da2cd433c1..8fccfb1a69 100644--- 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@@ -255,7 +255,7 @@ code {}pre {display: block;- font-size: 87.5%;+ font-size: 100%;color: var(--dark);}pre code {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.javaindex 1aa2ce6a7d..84d7879966 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java@@ -2,8 +2,8 @@ package io.onedev.server.web.editable.string;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;+import org.unbescape.html.HtmlEscape;-import io.onedev.server.util.HtmlUtils;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyViewer;@@ -21,7 +21,7 @@ public class StringPropertyViewer extends PropertyViewer {@Overrideprotected Component newContent(String id, PropertyDescriptor descriptor) {if (value != null)- return new Label(id, HtmlUtils.formatAsHtml(value)).setEscapeModelStrings(false);+ return new Label(id, "<pre class='mb-0'>" + HtmlEscape.escapeHtml5(value) + "</pre>").setEscapeModelStrings(false);elsereturn new EmptyValueLabel(id, descriptor.getPropertyGetter());}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.htmlindex d77a0b2026..1d727847af 100644--- 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@@ -1,4 +1,4 @@<wicket:extend>- <div wicket:id="inUseDetail" class="mb-5 text-left alert alert-light"></div>+ <pre wicket:id="inUseDetail" class="mb-5 text-left alert alert-light font-size-sm"></pre><a class="btn btn-primary" href="javascript:window.history.back();">Go Back</a></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.javaindex 704eaaa9ae..975abdba5c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.java@@ -8,8 +8,8 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.request.http.WebResponse;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.unbescape.html.HtmlEscape;-import io.onedev.server.util.HtmlUtils;import io.onedev.server.util.usage.InUseException;import io.onedev.server.web.page.simple.SimplePage;@@ -27,7 +27,7 @@ public class InUseErrorPage extends SimplePage {protected void onInitialize() {super.onInitialize();- add(new Label("inUseDetail", HtmlUtils.formatAsHtml(exception.getMessage())).setEscapeModelStrings(false));+ add(new Label("inUseDetail", HtmlEscape.escapeHtml5(exception.getMessage())).setEscapeModelStrings(false));}@Override