From fe2c60a48c38c4e697fc3b0b29afc086e2d3f2f3 Mon Sep 17 00:00:00 2001 From: datagear Date: Sat, 22 Sep 2018 13:17:36 +0800 Subject: [PATCH] =?UTF-8?q?[web]=E9=A1=B5=E9=9D=A2=E5=B7=A6=E4=B8=8A?= =?UTF-8?q?=E8=A7=92=E6=B7=BB=E5=8A=A0LOGO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/webapp/WEB-INF/jsp/include/html_logo.jsp | 13 +++++++++++++ datagear-web/src/main/webapp/WEB-INF/jsp/login.jsp | 1 + datagear-web/src/main/webapp/WEB-INF/jsp/main.jsp | 1 + .../src/main/webapp/WEB-INF/jsp/register.jsp | 1 + .../main/webapp/WEB-INF/jsp/register_success.jsp | 1 + .../src/main/webapp/WEB-INF/jsp/reset_password.jsp | 1 + .../src/main/webapp/static/theme/common.css | 11 +++++++++++ 7 files changed, 29 insertions(+) create mode 100644 datagear-web/src/main/webapp/WEB-INF/jsp/include/html_logo.jsp diff --git a/datagear-web/src/main/webapp/WEB-INF/jsp/include/html_logo.jsp b/datagear-web/src/main/webapp/WEB-INF/jsp/include/html_logo.jsp new file mode 100644 index 00000000..d04d94c3 --- /dev/null +++ b/datagear-web/src/main/webapp/WEB-INF/jsp/include/html_logo.jsp @@ -0,0 +1,13 @@ +<%-- +/* + * Copyright (c) 2018 by datagear.org. + */ +--%> +<%-- +依赖： +jsp_jstl.jsp +--%> +<%@ page language="java" pageEncoding="UTF-8"%> + diff --git a/datagear-web/src/main/webapp/WEB-INF/jsp/login.jsp b/datagear-web/src/main/webapp/WEB-INF/jsp/login.jsp index 5c5ce9fb..eb36114b 100644 --- a/datagear-web/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/datagear-web/src/main/webapp/WEB-INF/jsp/login.jsp @@ -39,6 +39,7 @@ if(loginUser == null)
+ <%@ include file="include/html_logo.jsp" %>
">
diff --git a/datagear-web/src/main/webapp/WEB-INF/jsp/main.jsp b/datagear-web/src/main/webapp/WEB-INF/jsp/main.jsp index 22890aef..c42f5429 100644 --- a/datagear-web/src/main/webapp/WEB-INF/jsp/main.jsp +++ b/datagear-web/src/main/webapp/WEB-INF/jsp/main.jsp @@ -1013,6 +1013,7 @@
+ <%@ include file="include/html_logo.jsp" %>
  • diff --git a/datagear-web/src/main/webapp/WEB-INF/jsp/register.jsp b/datagear-web/src/main/webapp/WEB-INF/jsp/register.jsp index 205690eb..5651f8e5 100644 --- a/datagear-web/src/main/webapp/WEB-INF/jsp/register.jsp +++ b/datagear-web/src/main/webapp/WEB-INF/jsp/register.jsp @@ -17,6 +17,7 @@
    + <%@ include file="include/html_logo.jsp" %>
    ">
    diff --git a/datagear-web/src/main/webapp/WEB-INF/jsp/register_success.jsp b/datagear-web/src/main/webapp/WEB-INF/jsp/register_success.jsp index 2f1105c1..ba36434d 100644 --- a/datagear-web/src/main/webapp/WEB-INF/jsp/register_success.jsp +++ b/datagear-web/src/main/webapp/WEB-INF/jsp/register_success.jsp @@ -21,6 +21,7 @@ String loginUrl = request.getContextPath() + "/login";
    + <%@ include file="include/html_logo.jsp" %>
    ">
    diff --git a/datagear-web/src/main/webapp/WEB-INF/jsp/reset_password.jsp b/datagear-web/src/main/webapp/WEB-INF/jsp/reset_password.jsp index 5eba40d4..7bd0c72d 100644 --- a/datagear-web/src/main/webapp/WEB-INF/jsp/reset_password.jsp +++ b/datagear-web/src/main/webapp/WEB-INF/jsp/reset_password.jsp @@ -40,6 +40,7 @@ String loginUrl = request.getContextPath() + "/login";
    + <%@ include file="include/html_logo.jsp" %>
    "> diff --git a/datagear-web/src/main/webapp/static/theme/common.css b/datagear-web/src/main/webapp/static/theme/common.css index a55348fb..288393ea 100644 --- a/datagear-web/src/main/webapp/static/theme/common.css +++ b/datagear-web/src/main/webapp/static/theme/common.css @@ -392,6 +392,17 @@ table.dataTable.no-footer{ -moz-box-sizing: border-box; -webkit-box-sizing: border-box; } +.main-page-head .logo{ + float: left; + vertical-align: middle; + margin-left: 0.1em; + margin-top: 0.2em; +} +.main-page-head .logo .logo-content{ + font-size: small; + font-weight: bold; + opacity: 0.7; +} .main-page-head .toolbar{ float: right; text-align: right;