From 17725677285470ca7dbf5da93e4235415545a7cf Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 26 Jun 2013 17:09:01 -0400 Subject: Support custom header logo images of 120x45 (issue 208) --- src/main/distrib/data/gitblit.properties | 7 ++ src/main/java/WEB-INF/web.xml | 15 +++- src/main/java/com/gitblit/LogoServlet.java | 93 +++++++++++++++++++++ .../java/com/gitblit/wicket/pages/RootPage.html | 2 +- src/main/java/logo.png | Bin 0 -> 2258 bytes src/main/resources/gitblit.css | 2 +- 6 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/gitblit/LogoServlet.java create mode 100644 src/main/java/logo.png (limited to 'src/main') diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index d5573a61..50b09f30 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -531,6 +531,13 @@ realm.minPasswordLength = 5 # SINCE 0.5.0 web.siteName = +# You may specify a different logo image for the header but it must be 120x45px. +# If the specified file does not exist, the default Gitblit logo will be used. +# +# SINCE 1.3.0 +# BASEFOLDER +web.headerLogo = ${baseFolder}/logo.png + # If *web.authenticateAdminPages*=true, users with "admin" role can create # repositories, create users, and edit repository metadata. # diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml index 573305c4..bf121663 100644 --- a/src/main/java/WEB-INF/web.xml +++ b/src/main/java/WEB-INF/web.xml @@ -140,7 +140,20 @@ PagesServlet /pages/* + + + + LogoServlet + com.gitblit.LogoServlet + + + LogoServlet + /logo.png + + - git/,feed/,zip/,federation/,rpc/,pages/,robots.txt,sparkleshare/ + git/,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,sparkleshare/ diff --git a/src/main/java/com/gitblit/LogoServlet.java b/src/main/java/com/gitblit/LogoServlet.java new file mode 100644 index 00000000..7402fc13 --- /dev/null +++ b/src/main/java/com/gitblit/LogoServlet.java @@ -0,0 +1,93 @@ +/* + * Copyright 2013 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gitblit; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * Handles requests for logo.png + * + * @author James Moger + * + */ +public class LogoServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + private static final long lastModified = System.currentTimeMillis(); + + public LogoServlet() { + super(); + } + + @Override + protected long getLastModified(HttpServletRequest req) { + File file = GitBlit.getFileOrFolder(Keys.web.headerLogo, "${baseFolder}/logo.png"); + if (file.exists()) { + return file.lastModified(); + } else { + return lastModified; + } + } + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + InputStream is = null; + try { + String contentType = null; + File file = GitBlit.getFileOrFolder(Keys.web.headerLogo, "${baseFolder}/logo.png"); + if (file.exists()) { + // custom logo + ServletContext context = request.getSession().getServletContext(); + contentType = context.getMimeType(file.getName()); + response.setContentLength((int) file.length()); + response.setDateHeader("Last-Modified", file.lastModified()); + is = new FileInputStream(file); + } else { + // default logo + response.setDateHeader("Last-Modified", lastModified); + is = getClass().getResourceAsStream("/logo.png"); + } + if (contentType == null) { + contentType = "image/png"; + } + response.setContentType(contentType); + OutputStream os = response.getOutputStream(); + byte[] buf = new byte[4096]; + int bytesRead = is.read(buf); + while (bytesRead != -1) { + os.write(buf, 0, bytesRead); + bytesRead = is.read(buf); + } + os.flush(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + is.close(); + } + } +} diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.html b/src/main/java/com/gitblit/wicket/pages/RootPage.html index 69cd5f0a..696ddfd7 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.html +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.html @@ -14,7 +14,7 @@ - +
diff --git a/src/main/java/logo.png b/src/main/java/logo.png new file mode 100644 index 00000000..e909530c Binary files /dev/null and b/src/main/java/logo.png differ diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index 6074b369..d10f3809 100644 --- a/src/main/resources/gitblit.css +++ b/src/main/resources/gitblit.css @@ -59,7 +59,7 @@ hr { } .navbar .brand { - padding: 10px 20px; + padding: 0px 10px 0px 20px; } .navbar .pull-right { -- cgit v1.2.3