Skip to content

The Unified and Autonomous Development Platform

feat: Able to upload logo for dark mode (#1738)

Robin Shen8d2b7a280b6b
diff --git a/server-core/src/main/java/io/onedev/server/annotation/Image.java b/server-core/src/main/java/io/onedev/server/annotation/Image.java
new file mode 100644
index 0000000000..7072e077ae
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/annotation/Image.java
@@ -0,0 +1,19 @@
+package io.onedev.server.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Image {
+ String accept() default "image/*";
+
+ int width() default 128;
+
+ int height() default 128;
+
+ String backgroundColor() default "white";
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java
index 3799062a7b..b6423b7961 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java
@@ -2,19 +2,14 @@ package io.onedev.server.model.support.administration;
import java.io.Serializable;
-import javax.validation.constraints.NotEmpty;
-
-import io.onedev.server.annotation.Editable;
-
-@Editable
public class BrandingSetting implements Serializable {
private static final long serialVersionUID = 1L;
-
- private String name = "OneDev";
- @Editable(order=100, description="Specify brand name which will be displayed at left top of the screen")
- @NotEmpty
+ public static final String DEFAULT_NAME = "OneDev";
+
+ private String name = DEFAULT_NAME;
+
public String getName() {
return name;
}
@@ -22,5 +17,5 @@ public class BrandingSetting implements Serializable {
public void setName(String name) {
this.name = name;
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.html
index 771f3db937..1eefc42570 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.html
@@ -1,4 +1,4 @@
<wicket:panel>
<img wicket:id="custom" class="brand-logo">
- <svg wicket:id="onedev" class="brand-logo"/>
+ <svg wicket:id="default" class="brand-logo"/>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java
index dd5efead63..7694d8822d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java
@@ -1,31 +1,57 @@
package io.onedev.server.web.component.brandlogo;
-import java.io.File;
-
+import io.onedev.commons.bootstrap.Bootstrap;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.image.ExternalImage;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.LoadableDetachableModel;
-import io.onedev.commons.bootstrap.Bootstrap;
-import io.onedev.server.web.component.svg.SpriteImage;
+import javax.annotation.Nullable;
+import java.io.File;
+import java.io.Serializable;
@SuppressWarnings("serial")
public class BrandLogoPanel extends Panel {
-
- public BrandLogoPanel(String id) {
+
+ private final Boolean darkMode;
+
+ public BrandLogoPanel(String id, @Nullable Boolean darkMode) {
super(id);
+ this.darkMode = darkMode;
}
+ public BrandLogoPanel(String id) {
+ this(id, null);
+ }
+
private File getCustomLogoFile() {
- return new File(Bootstrap.getSiteDir(), "assets/logo.png");
+ if (isDarkMode())
+ return new File(Bootstrap.getSiteDir(), "assets/logo-dark.png");
+ else
+ return new File(Bootstrap.getSiteDir(), "assets/logo.png");
+ }
+
+ private boolean isDarkMode() {
+ if (darkMode != null)
+ return darkMode;
+ else
+ return ((BasePage) getPage()).isDarkMode();
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(new ExternalImage("custom", "/logo.png?v=" + getCustomLogoFile().lastModified()) {
+ add(new ExternalImage("custom", new LoadableDetachableModel<>() {
+ @Override
+ protected Serializable load() {
+ return "/" + getCustomLogoFile().getName() + "?v=" + getCustomLogoFile().lastModified();
+ }
+
+ }) {
@Override
protected void onConfigure() {
@@ -34,7 +60,7 @@ public class BrandLogoPanel extends Panel {
}
});
- add(new SpriteImage("onedev", "logo") {
+ add(new SpriteImage("default", "logo") {
@Override
protected void onConfigure() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/ImageUploadField.html b/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/ImageUploadField.html
new file mode 100644
index 0000000000..676c8eaaab
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/ImageUploadField.html
@@ -0,0 +1,8 @@
+<wicket:panel>
+ <div class="image-upload">
+ <input type="text" wicket:id="data">
+ <input wicket:id="fileInput" type="file" class="custom-fileinput">
+ <label wicket:id="fileLabel"><wicket:svg href="image" class="icon"></wicket:svg> Select file...</label>
+ <div class="preview"><img wicket:id="image" width="100%" height="100%" class="rounded border"></div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/ImageUploadField.java b/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/ImageUploadField.java
new file mode 100644
index 0000000000..889a0d6878
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/ImageUploadField.java
@@ -0,0 +1,101 @@
+package io.onedev.server.web.component.imagedata.upload;
+
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+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.WebComponent;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+@SuppressWarnings("serial")
+public class ImageUploadField extends FormComponentPanel<String> {
+
+ private final String accept;
+
+ private final int width;
+
+ private final int height;
+
+ private final String backgroundColor;
+
+ private TextField<String> dataField;
+
+ private AbstractPostAjaxBehavior behavior;
+
+ public ImageUploadField(String id, IModel<String> model, String accept,
+ int width, int height, String backgroundColor) {
+ super(id, model);
+ this.accept = accept;
+ this.width = width;
+ this.height = height;
+ this.backgroundColor = backgroundColor;
+ }
+
+ public ImageUploadField(String id, IModel<String> model) {
+ this(id, model, "image/*", 128, 128, "white");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(dataField = new TextField<>("data", Model.of(getModelObject())));
+
+ WebComponent fileInput = new WebComponent("fileInput");
+ fileInput.add(AttributeAppender.append("accept", accept));
+ fileInput.setOutputMarkupId(true);
+ add(fileInput);
+
+ add(new WebMarkupContainer("fileLabel") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.put("for", fileInput.getMarkupId());
+ }
+
+ });
+
+ var style = String.format("width: %dpx; height: %dpx; background-color: %s;",
+ width, height, backgroundColor);
+
+ var image = new WebMarkupContainer("image");
+ image.add(AttributeAppender.append("style", style));
+ add(image);
+
+ add(behavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ onImageUpdating(target);
+ }
+
+ });
+ }
+
+ @Override
+ public void convertInput() {
+ setConvertedInput(dataField.getConvertedInput());
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new ImageUploadFieldResourceReference()));
+
+ String script = String.format("onedev.server.imageUpload.onDomReady('%s', %s);",
+ getMarkupId(), behavior.getCallbackFunction());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ protected void onImageUpdating(AjaxRequestTarget target) {
+
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/ImageUploadFieldResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/ImageUploadFieldResourceReference.java
new file mode 100644
index 0000000000..6fac2e6785
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/ImageUploadFieldResourceReference.java
@@ -0,0 +1,31 @@
+package io.onedev.server.web.component.imagedata.upload;
+
+import io.onedev.server.web.asset.cropper.CropperResourceReference;
+import io.onedev.server.web.asset.fileupload.FileUploadCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import java.util.List;
+
+public class ImageUploadFieldResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public ImageUploadFieldResourceReference() {
+ super(ImageUploadFieldResourceReference.class, "image-upload.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(new CropperResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(new FileUploadCssResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ ImageUploadFieldResourceReference.class, "image-upload.css")));
+ return dependencies;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/image-upload.css b/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/image-upload.css
new file mode 100644
index 0000000000..d969475ddc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/image-upload.css
@@ -0,0 +1,12 @@
+.image-upload .preview {
+ margin-top: 10px;
+}
+.image-upload .preview img {
+ margin: 1px;
+}
+.image-upload.no-image .preview {
+ display: none;
+}
+.image-upload input[type="text"] {
+ display: none;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/image-upload.js b/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/image-upload.js
new file mode 100644
index 0000000000..9c12541db5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/imagedata/upload/image-upload.js
@@ -0,0 +1,26 @@
+onedev.server.imageUpload = {
+ onDomReady: function(containerId, callback) {
+ var $container = $("#" + containerId + ">.image-upload");
+ var $data = $container.find("input[type=text]")
+ var $image = $container.find("img");
+ var $file = $container.find("input[type=file]");
+ if ($data.val()) {
+ $image.attr("src", $data.val());
+ } else {
+ $container.addClass("no-image");
+ }
+ $file.change(function() {
+ if ($file[0].files && $file[0].files.length != 0) {
+ var file = $file[0].files[0];
+ var reader = new FileReader();
+ reader.readAsDataURL(file);
+ reader.addEventListener("load", function () {
+ callback();
+ $container.removeClass("no-image");
+ $image.attr("src", reader.result);
+ $data.val(reader.result);
+ }, false);
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/imagedata/viewer/ImageViewer.html b/server-core/src/main/java/io/onedev/server/web/component/imagedata/viewer/ImageViewer.html
new file mode 100644
index 0000000000..61a3dfd2be
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/imagedata/viewer/ImageViewer.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <img wicket:id="img">
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/imagedata/viewer/ImageViewer.java b/server-core/src/main/java/io/onedev/server/web/component/imagedata/viewer/ImageViewer.java
new file mode 100644
index 0000000000..5890527f8a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/imagedata/viewer/ImageViewer.java
@@ -0,0 +1,40 @@
+package io.onedev.server.web.component.imagedata.viewer;
+
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+
+@SuppressWarnings("serial")
+public class ImageViewer extends GenericPanel<String> {
+
+ private final int width;
+
+ private final int height;
+
+ private final String backgroundColor;
+
+ public ImageViewer(String id, IModel<String> model, int width, int height, String backgroundColor) {
+ super(id, model);
+ this.width = width;
+ this.height = height;
+ this.backgroundColor = backgroundColor;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new WebMarkupContainer("img") {
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.put("src", getModelObject());
+ var style = String.format("width: %dpx; height: %dpx; background-color: %s;",
+ width, height, backgroundColor);
+ tag.put("style", style);
+ }
+ });
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/image/ImageEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/image/ImageEditSupport.java
new file mode 100644
index 0000000000..e7b8e9c546
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/image/ImageEditSupport.java
@@ -0,0 +1,61 @@
+package io.onedev.server.web.editable.image;
+
+import io.onedev.server.annotation.Image;
+import io.onedev.server.web.component.imagedata.viewer.ImageViewer;
+import io.onedev.server.web.editable.*;
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
+import java.lang.reflect.AnnotatedElement;
+
+@SuppressWarnings("serial")
+public class ImageEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ var image = descriptor.getPropertyGetter().getAnnotation(Image.class);
+ if (image != null) {
+ return new PropertyContext<String>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {
+ return new PropertyViewer(componentId, descriptor) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ if (model.getObject() != null) {
+ return new ImageViewer(id, model, image.width(), image.height(),
+ image.backgroundColor());
+ } else {
+ return new EmptyValueLabel(id) {
+
+ @Override
+ protected AnnotatedElement getElement() {
+ return propertyDescriptor.getPropertyGetter();
+ }
+
+ };
+ }
+ }
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
+ return new ImagePropertyEditor(componentId, descriptor, model);
+ }
+
+ };
+ } else {
+ return null;
+ }
+
+ }
+
+ @Override
+ public int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/image/ImagePropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/image/ImagePropertyEditor.html
new file mode 100644
index 0000000000..a3fb69a967
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/image/ImagePropertyEditor.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <div wicket:id="input"></div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/image/ImagePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/image/ImagePropertyEditor.java
new file mode 100644
index 0000000000..2019578211
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/image/ImagePropertyEditor.java
@@ -0,0 +1,47 @@
+package io.onedev.server.web.editable.image;
+
+import io.onedev.server.annotation.Image;
+import io.onedev.server.web.component.imagedata.upload.ImageUploadField;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+@SuppressWarnings("serial")
+public class ImagePropertyEditor extends PropertyEditor<String> {
+
+ private ImageUploadField input;
+
+ public ImagePropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var image = descriptor.getPropertyGetter().getAnnotation(Image.class);
+ input = new ImageUploadField("input", Model.of(getModelObject()),
+ image.accept(), image.width(), image.height(), image.backgroundColor()) {
+ @Override
+ protected void onImageUpdating(AjaxRequestTarget target) {
+ onPropertyUpdating(target);
+ }
+ };
+ add(input);
+ input.setLabel(Model.of(getDescriptor().getDisplayName()));
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ return input.getConvertedInput();
+ }
+
+ @Override
+ public boolean needExplicitSubmit() {
+ return false;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/img/logo-dark.png b/server-core/src/main/java/io/onedev/server/web/img/logo-dark.png
new file mode 100644
index 0000000000..22dcc69d63
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/img/logo-dark.png differ
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 34d84747f9..d1486dc3e0 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
@@ -52,4 +52,11 @@
.milestone-type-management th.property-id,
.milestone-type-management td.property-id {
display: none;
+}
+
+.branding-setting .logo-preview>div {
+ background-color: white !important;
+}
+.branding-setting .dark-mode>.logo-preview>div {
+ background-color: var(--dark-mode-dark) !important;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.java
new file mode 100644
index 0000000000..b7bb04f958
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.java
@@ -0,0 +1,52 @@
+package io.onedev.server.web.page.admin.brandingsetting;
+
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Image;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+@Editable
+public class BrandSettingEditBean implements Serializable {
+
+ private String name;
+
+ private String logoData;
+
+ private String darkLogoData;
+
+ @Editable(order=100)
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=200, name="Logo for Light Mode", description = "Upload a 128x128 transparent png file to be used " +
+ "as logo for light mode")
+ @Image(accept = "image/png")
+ @NotEmpty
+ public String getLogoData() {
+ return logoData;
+ }
+
+ public void setLogoData(String logoData) {
+ this.logoData = logoData;
+ }
+
+ @Editable(order=200, name="Logo for Dark Mode", description = "Upload a 128x128 transparent png file to be used " +
+ "as logo for dark mode")
+ @Image(accept="image/png", backgroundColor = "#23232d")
+ @NotEmpty
+ public String getDarkLogoData() {
+ return darkLogoData;
+ }
+
+ public void setDarkLogoData(String darkLogoData) {
+ this.darkLogoData = darkLogoData;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.html
index ed77f8c423..28d37bf487 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.html
@@ -1,19 +1,10 @@
<wicket:extend>
<div class="card branding-setting">
<div class="card-body">
- <form wicket:id="brandingSetting" class="leave-confirm">
+ <form wicket:id="settings" class="leave-confirm mb-5">
<div wicket:id="editor" class="mb-4"></div>
- <div class="form-group">
- <label class="control-label">Logo <span class="text-danger">*</span></label>
- <div class="mb-2 logo-preview">
- <span wicket:id="logoPreview"></span>
- </div>
- <input wicket:id="logoUpload" type="file" accept="image/png">
- <div class="text-muted form-text">Upload a logo to be displayed at left top area of the screen.
- It should be a 128x128 transparent png file</div>
- </div>
- <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware mr-1" value="Save Settings">
- <a wicket:id="useDefaultLogo" class="btn btn-light-primary">Use Default Logo</a>
+ <input type="submit" class="btn btn-primary dirty-aware mr-2" value="Update">
+ <a wicket:id="useDefault" class="btn btn-secondary">Use Default</a>
</form>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java
index a4d34578b0..fd20c18eea 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.admin.brandingsetting;
+import com.google.common.io.Resources;
import io.onedev.commons.utils.FileUtils;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterManager;
@@ -9,119 +10,130 @@ import io.onedev.server.model.support.administration.BrandingSetting;
import io.onedev.server.web.component.brandlogo.BrandLogoPanel;
import io.onedev.server.web.component.fileupload.FileUploadField;
import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.img.ImageScope;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.util.ConfirmClickModifier;
+import org.apache.commons.codec.binary.Base64;
import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
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.form.upload.FileUpload;
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.request.mapper.parameter.PageParameters;
+import javax.annotation.Nullable;
import java.io.File;
import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.List;
public class BrandingSettingPage extends AdministrationPage {
- private List<FileUpload> uploads;
+ private static final String DATA_PREFIX = "data:image/png;base64,";
public BrandingSettingPage(PageParameters params) {
super(params);
}
- private static File getLogoFile() {
- return new File(OneDev.getAssetsDir(), "logo.png");
+ private static File getCustomLogoFile(boolean darkMode) {
+ if (darkMode)
+ return new File(OneDev.getAssetsDir(), "logo-dark.png");
+ else
+ return new File(OneDev.getAssetsDir(), "logo.png");
+ }
+
+ private String getLogoData(boolean darkMode) {
+ var file = getCustomLogoFile(darkMode);
+ if (file.exists()) {
+ try {
+ return DATA_PREFIX + Base64.encodeBase64String(FileUtils.readFileToByteArray(file));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ return getDefaultLogoData(darkMode);
+ }
}
+ private String getDefaultLogoData(boolean darkMode) {
+ try {
+ var fileName = darkMode?"logo-dark.png":"logo.png";
+ URL url = Resources.getResource(ImageScope.class, fileName);
+ return DATA_PREFIX + Base64.encodeBase64String(Resources.toByteArray(url));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private byte[] getLogoBytes(String logoData) {
+ return Base64.decodeBase64(logoData.substring(DATA_PREFIX.length()));
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
- BrandingSetting setting = OneDev.getInstance(SettingManager.class).getBrandingSetting();
-
- BeanEditor editor = BeanContext.edit("editor", setting);
+ var setting = getSettingManager().getBrandingSetting();
+ var bean = new BrandSettingEditBean();
+ bean.setName(setting.getName());
+ bean.setLogoData(getLogoData(false));
+ bean.setDarkLogoData(getLogoData(true));
- Button saveButton = new Button("save") {
-
+ var form = new Form<Void>("settings") {
@Override
- public void onSubmit() {
+ protected void onSubmit() {
super.onSubmit();
-
- if (uploads != null && !uploads.isEmpty()) {
- getClusterManager().runOnAllServers(new UpdateLogoTask(
- uploads.iterator().next().getBytes()));
+ setting.setName(bean.getName());
+ getSettingManager().saveBrandingSetting(setting);
+ if (!bean.getLogoData().equals(getDefaultLogoData(false))) {
+ var bytes = getLogoBytes(bean.getLogoData());
+ getClusterManager().runOnAllServers(new UpdateLogoTask(bytes, false));
}
- OneDev.getInstance(SettingManager.class).saveBrandingSetting(setting);
- getSession().success("Branding settings saved");
+ if (!bean.getDarkLogoData().equals(getDefaultLogoData(true))) {
+ var bytes = getLogoBytes(bean.getDarkLogoData());
+ getClusterManager().runOnAllServers(new UpdateLogoTask(bytes, true));
+ }
+ Session.get().success("Branding settings updated");
}
-
};
-
- Form<?> form = new Form<Void>("brandingSetting");
- form.setMultiPart(true);
- form.add(editor);
-
- form.add(new BrandLogoPanel("logoPreview"));
-
- form.add(new FileUploadField("logoUpload", new IModel<List<FileUpload>>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public List<FileUpload> getObject() {
- return uploads;
- }
-
- @Override
- public void setObject(List<FileUpload> object) {
- uploads = object;
- }
-
- }) {
-
- @Override
- protected String getHint() {
- return "Select file...";
- }
-
- @Override
- protected String getIcon() {
- return "image";
- }
-
- });
-
- form.add(saveButton);
-
- form.add(new Link<Void>("useDefaultLogo") {
+ add(form);
+ form.add(BeanContext.edit("editor", bean));
+ form.add(new Link<Void>("useDefault") {
@Override
public void onClick() {
- getClusterManager().runOnAllServers(new DeleteLogoTask());
- getSession().success("Using default logo now");
+ setting.setName(BrandingSetting.DEFAULT_NAME);
+ getSettingManager().saveBrandingSetting(setting);
+ getClusterManager().runOnAllServers(new UpdateLogoTask(null, false));
+ getClusterManager().runOnAllServers(new UpdateLogoTask(null, true));
+ setResponsePage(BrandingSettingPage.class);
+ Session.get().success("Default branding settings restored");
}
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getLogoFile().exists());
+ setVisible(!setting.getName().equals(BrandingSetting.DEFAULT_NAME)
+ || getCustomLogoFile(false).exists()
+ || getCustomLogoFile(true).exists());
}
-
- }.add(new ConfirmClickModifier("Do you really want to use the default logo?")));
-
- add(form);
+ });
}
@Override
protected Component newTopbarTitle(String componentId) {
return new Label(componentId, "Branding");
}
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
private ClusterManager getClusterManager() {
return OneDev.getInstance(ClusterManager.class);
@@ -131,14 +143,20 @@ public class BrandingSettingPage extends AdministrationPage {
private final byte[] logoBytes;
- UpdateLogoTask(byte[] logoBytes) {
+ private final boolean darkMode;
+
+ UpdateLogoTask(@Nullable byte[] logoBytes, boolean darkMode) {
this.logoBytes = logoBytes;
+ this.darkMode = darkMode;
}
@Override
public Void call() throws Exception {
try {
- FileUtils.writeByteArrayToFile(getLogoFile(), logoBytes);
+ if (logoBytes != null)
+ FileUtils.writeByteArrayToFile(getCustomLogoFile(darkMode), logoBytes);
+ else
+ FileUtils.deleteFile(getCustomLogoFile(darkMode));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -146,15 +164,5 @@ public class BrandingSettingPage extends AdministrationPage {
}
}
-
- private static class DeleteLogoTask implements ClusterTask<Void> {
-
- @Override
- public Void call() throws Exception {
- FileUtils.deleteFile(getLogoFile());
- return null;
- }
-
- }
}
\ No newline at end of file
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 fdffdcc8e9..6e3e63dcd0 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
@@ -158,7 +158,7 @@ public abstract class LayoutPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new BrandLogoPanel("brandLogo"));
+ add(new BrandLogoPanel("brandLogo", true));
add(new Label("brandName", new LoadableDetachableModel<String>() {
@Override
@@ -746,7 +746,7 @@ public abstract class LayoutPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new BrandLogoPanel("brandLogo"));
+ add(new BrandLogoPanel("brandLogo", null));
}
});
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
index 74d1b8163f..a70e6e98b3 100644
--- 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
@@ -56,7 +56,7 @@ public abstract class SimplePage extends BasePage {
protected abstract String getSubTitle();
protected Component newPageLogo(String componentId) {
- return new BrandLogoPanel(componentId);
+ return new BrandLogoPanel(componentId, null);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index a4f646dd31..e415318076 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,10 +1,3 @@
<wicket:extend>
<a wicket:id="test">test</a>
-
- <div class="bg-white p-5">
- <form wicket:id="form">
- <div wicket:id="bean"></div>
- <input type="submit" class="btn btn-primary" value="Update">
- </form>
- </div>
</wicket:extend>
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 f0e85c30ce..839209ea79 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
@@ -1,15 +1,19 @@
package io.onedev.server.web.page.test;
-import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.web.page.base.BasePage;
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.form.upload.FileUpload;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import java.util.List;
+
public class TestPage extends BasePage {
+ private List<FileUpload> uploads;
+
public TestPage(PageParameters params) {
super(params);
}