The Unified and Autonomous Development Platform
Fix issue #868 - Allow Customization of Site Icon
Robin Shen3429c62a0ab6
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.htmlindex 46b38ce293..6f906699f6 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@@ -13,6 +13,7 @@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 Setting">+ <a wicket:id="useDefaultLogo" class="btn btn-light-primary">Use Default Logo</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.javaindex 1140346da7..a00eaab5a0 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@@ -10,6 +10,7 @@ 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.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -22,6 +23,7 @@ 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.page.admin.AdministrationPage;+import io.onedev.server.web.util.ConfirmClickModifier;@SuppressWarnings("serial")public class BrandingSettingPage extends AdministrationPage {@@ -102,6 +104,22 @@ public class BrandingSettingPage extends AdministrationPage {form.add(saveButton);+ form.add(new Link<Void>("useDefaultLogo") {++ @Override+ public void onClick() {+ getLogoFile().delete();+ getSession().success("Using default logo now");+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLogoFile().exists());+ }++ }.add(new ConfirmClickModifier("Do you really want to use the default logo?")));+add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.html b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.htmlindex d2dbe0484e..b174088031 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.html@@ -7,7 +7,7 @@<meta name="Author" content="onedev.io" /><meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, shrink-to-fit=no"><meta wicket:id="robots" name="robots">- <link rel="icon" type="image/png" href="/~img/logo.png">+ <link wicket:id="icon" rel="icon" type="image/png" href="/~img/logo.png"><title wicket:id="pageTitle">OneDev</title></head><body>diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 50003c4784..04e48c8ab4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -207,6 +207,19 @@ public abstract class BasePage extends WebPage {}});++ add(new WebMarkupContainer("icon") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);++ File logoFile = new File(Bootstrap.getSiteDir(), "assets/logo.png");+ if (logoFile.exists())+ tag.put("href", "/logo.png?v=" + logoFile.lastModified());+ }++ });add(new Label("script", new LoadableDetachableModel<String>() {