The Unified and Autonomous Development Platform
Minor UI improvements
Robin Shendd6e87328e20
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.htmlindex a1d61a4969..b3037b0a99 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.html@@ -1,12 +1,10 @@<wicket:panel><div wicket:id="content"></div><wicket:fragment wicket:id="noDiffFrag">- <div class="no-diff">- <div class="head">- <div wicket:id="title"></div>- </div>- <div class="body">- <svg wicket:id="icon" class="icon mr-1"></svg> <span wicket:id="message"></span>+ <div class="no-diff border rounded">+ <div wicket:id="title" class="head text-break py-2 px-3 border-bottom"></div>+ <div class="body p-3 d-flex align-items-center">+ <svg wicket:id="icon" class="icon mr-2"></svg> <i wicket:id="message"></i></div></div></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.javaindex 9fa49256ef..ec47d9fcd9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java@@ -4,8 +4,6 @@ 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.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;@@ -51,7 +49,7 @@ public class BlobDiffPanel extends Panel {if (warning)fragment.add(new SpriteImage("icon", "warning"));else- fragment.add(new SpriteImage("icon", "info"));+ fragment.add(new SpriteImage("icon", "info-circle"));fragment.add(new Label("message", message));return fragment;}@@ -142,13 +140,8 @@ public class BlobDiffPanel extends Panel {}}}-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new BlobDiffResourceReference()));- }+ @Overrideprotected void onDetach() {if (blameModel != null)blameModel.detach();diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffResourceReference.javadeleted file mode 100644index 4d2081bc3f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.diff.blob;--import org.apache.wicket.request.resource.CssResourceReference;--public class BlobDiffResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public BlobDiffResourceReference() {- super(BlobDiffResourceReference.class, "blob-diff.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/blob-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/blob-diff.cssdeleted file mode 100644index c70af5ef65..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/blob-diff.css+++ /dev/null@@ -1,13 +0,0 @@-.no-diff {- border: 1px solid #D8D8D8;- border-radius: 4px;- margin-bottom: 16px;-}-.no-diff>.head {- padding: 8px;- border-bottom: 1px solid #D8D8D8;-}-.no-diff>.body {- font-style: italic;- padding: 20px;-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.htmlindex 4a9f72713e..cc3d05d1fe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.html@@ -1,12 +1,13 @@<wicket:panel>- <table class="image-diff">- <tr>- <td class="old">- <img wicket:id="old" title="Before modification">- </td>- <td class="new">- <img wicket:id="new" title="After modification">- </td>- </tr>- </table>+ <div class="image-diff border rounded">+ <div wicket:id="title" class="border-bottom px-3 py-2 text-break"></div>+ <div class="content d-flex">+ <div class="old p-3 border-right w-50">+ <img wicket:id="old" class="w-100 h-100" title="Before modification">+ </div>+ <div class="new p-3 w-50">+ <img wicket:id="new" class="w-100 h-100" title="After modification">+ </div>+ </div>+ </div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.javaindex 2da1d4c7d1..ee3855dbb6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java@@ -1,8 +1,5 @@package io.onedev.server.web.component.diff.blob.image;-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.image.Image;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.resource.DynamicImageResource;@@ -13,6 +10,7 @@ import io.onedev.server.git.Blob;import io.onedev.server.git.BlobChange;import io.onedev.server.git.BlobIdent;import io.onedev.server.util.Provider;+import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle;@SuppressWarnings("serial")public class ImageDiffPanel extends Panel {@@ -29,6 +27,8 @@ public class ImageDiffPanel extends Panel {protected void onInitialize() {super.onInitialize();+ add(new BlobDiffTitle("title", change));+add(newImage("old", change.getOldBlobIdent(), new Provider<Blob>() {@Override@@ -74,12 +74,4 @@ public class ImageDiffPanel extends Panel {return image;}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new ImageDiffResourceReference()));- String script = String.format("onedev.server.imageDiff.onDomReady('%s');", getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffResourceReference.javadeleted file mode 100644index c38b9a6fd4..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffResourceReference.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.web.component.diff.blob.image;--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 ImageDiffResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public ImageDiffResourceReference() {- super(ImageDiffResourceReference.class, "image-diff.js");- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(ImageDiffPanel.class, "image-diff.css")));- return dependencies;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.cssdeleted file mode 100644index d96dd8279d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.css+++ /dev/null@@ -1,14 +0,0 @@-.image-diff {- border: 1px solid #D8D8D8;-}-.image-diff td {- padding: 16px;- width: 50%;-}-.image-diff td.old {- border-right: 1px solid #D8D8D8;-}-.image-diff img {- max-width: 100%;- max-height: 100%;-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.jsdeleted file mode 100644index 22335663b0..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.js+++ /dev/null@@ -1,7 +0,0 @@-onedev.server.imageDiff = {- onDomReady: function(containerId) {- $("#" + containerId + " img").on("load", function() {-// $(window).resize();- });- }-}\ No newline at end of file