Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: set favicon to root #33

Merged
merged 1 commit into from
Dec 10, 2023
Merged

feat: set favicon to root #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=10" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title wicket:id="pageTitle">GeoServer</title>
<link href="#" rel="shortcut icon" wicket:id="faviconLink"/>
<link href="#" rel="shortcut icon" href="/favicon.ico"/>
<wicket:link>
<link rel="stylesheet" href="css/blueprint/screen.css" type="text/css" media="screen, projection" />
</wicket:link>
Expand Down
5 changes: 3 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.parameter.INamedParameters.Type;
import org.apache.wicket.request.mapper.parameter.PageParameters;
Expand Down Expand Up @@ -127,11 +126,13 @@ protected void commonBaseInit() {
}

// favicon
/* Overriding default geoserver behavior and implement georchestra root favicon
* directly in html to allow custom scripts overriding more easily
if (faviconReference == null) {
faviconReference = new PackageResourceReference(GeoServerBasePage.class, "favicon.ico");
}
String faviconUrl = RequestCycle.get().urlFor(faviconReference, null).toString();
add(new ExternalLink("faviconLink", faviconUrl, null));
add(new ExternalLink("faviconLink", faviconUrl, null));*/

// page title
add(
Expand Down
Loading