Skip to content

T
test
Commit 2213facd authored by 雍欢's avatar 雍欢
Browse files
Options

修改web_app.name赋值方式，使项目可以部署到 / 下面

parent 1ff3e080
Show whitespace changes
Inline Side-by-side
Showing with 403 additions and 347 deletions
huigou-xt/src/main/webapp/Index.jsp
View file @ 2213facd
<%@ page contentType="text/html; charset=utf-8"%> <%@ page contentType="text/html; charset=utf-8" %>
<%@ page import="java.util.List,java.util.Map" %> <%@ page import="com.huigou.cache.DictUtil,com.huigou.context.ContextUtil" %>
<%@ page import="com.huigou.context.MessageSourceContext" %> <%@ page import="com.huigou.context.MessageSourceContext" %>
<%@ page import="com.huigou.context.ContextUtil" %>
<%@ page import="com.huigou.context.Operator" %> <%@ page import="com.huigou.context.Operator" %>
<%@ page import="com.huigou.util.Constants" %> <%@ page import="com.huigou.util.Constants" %>
<%@ page import="com.huigou.cache.DictUtil" %> <%@ page import="java.util.List" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ page import="java.util.Map" %>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="/WEB-INF/JSTLFunction.tld" prefix="f"%> <%@ taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
<%@ taglib uri="/WEB-INF/JSTLFunction.tld" prefix="f" %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <%
String serverHost = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
String basePath = serverHost + request.getContextPath();
request.setAttribute("basePath", basePath);
%>
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1, shrink-to-fit=no"/> <meta name="viewport"
content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1, shrink-to-fit=no"/>
<meta name="format-detection" content="telephone=no,email=no,address=no"> <meta name="format-detection" content="telephone=no,email=no,address=no">
<!--[if lt IE 8]> <!--[if lt IE 8]>
<meta http-equiv="refresh" content="0;url='ie.html'"/> <meta http-equiv="refresh" content="0;url='ie.html'"/>
<![endif]--> <![endif]-->
<title><c:out value="${f:systemParameter('SYSTEM.NAME')}" /></title> <title><c:out value="${f:systemParameter('SYSTEM.NAME')}"/></title>
<x:link href="/themes/font-face.css"/> <x:link href="/themes/font-face.css"/>
<script type="application/javascript">
var web_app = {name: '${basePath}'};
</script>
<x:base include="base,dialog"/> <x:base include="base,dialog"/>
<x:link href="/index/css/index.css"/> <x:link href="/index/css/index.css"/>
<x:link href="/themes/extend.css"/> <x:link href="/themes/extend.css"/>
...@@ -42,23 +50,23 @@ ...@@ -42,23 +50,23 @@
response.sendRedirect("Login.jsp"); response.sendRedirect("Login.jsp");
return; return;
} }
String token = (String)ContextUtil.getSession().getAttribute(Constants.CSRF_TOKEN); String token = (String) ContextUtil.getSession().getAttribute(Constants.CSRF_TOKEN);
if(token==null||token.equals("")){ if (token == null || token.equals("")) {
response.sendRedirect("Login.jsp"); response.sendRedirect("Login.jsp");
return; return;
} }
MessageSourceContext.setLocale(request, response); MessageSourceContext.setLocale(request, response);
request.setAttribute("token", token); request.setAttribute("token", token);
List<Map<String, Object>> i18nLanguages=DictUtil.getDictionaryList("i18nLanguage"); List<Map<String, Object>> i18nLanguages = DictUtil.getDictionaryList("i18nLanguage");
request.setAttribute("isI18nLanguage", false); request.setAttribute("isI18nLanguage", false);
if(i18nLanguages!=null&&i18nLanguages.size()>0){ if (i18nLanguages != null && i18nLanguages.size() > 0) {
request.setAttribute("isI18nLanguage", true); request.setAttribute("isI18nLanguage", true);
request.setAttribute("i18nLanguages", i18nLanguages); request.setAttribute("i18nLanguages", i18nLanguages);
} }
%> %>
<body class="fixed-sidebar full-height-layout gray-bg"> <body class="fixed-sidebar full-height-layout gray-bg">
<input type="hidden" id="csrfTokenElement" value="<%=token%>"/> <input type="hidden" id="csrfTokenElement" value="<%=token%>"/>
<div id="wrapper"> <div id="wrapper">
<!--左侧导航开始--> <!--左侧导航开始-->
<div class="navbar-default navbar-static-side" role="navigation"> <div class="navbar-default navbar-static-side" role="navigation">
<div class="nav-close"> <div class="nav-close">
...@@ -69,12 +77,14 @@ ...@@ -69,12 +77,14 @@
<li class="nav-header"> <li class="nav-header">
<div class="dropdown profile-element"> <div class="dropdown profile-element">
<div style="height:64px;"> <div style="height:64px;">
<img alt="image" id="showPersonPicture" class="img-circle" style="display:none;" src="<c:url value="/images/head.png"/>" width="64" height="64"/> <img alt="image" id="showPersonPicture" class="img-circle" style="display:none;"
src="<c:url value="/images/head.png"/>" width="64" height="64"/>
</div> </div>
<a data-toggle="dropdown" class="dropdown-toggle" href="javascript:void(0);"> <a data-toggle="dropdown" class="dropdown-toggle" href="javascript:void(0);">
<span class="block-overflow"> <span class="block-overflow">
<span class="block m-t-xs"> <span class="block m-t-xs">
<strong class="font-bold"><c:out value="${sessionScope.sessionOperatorAttribute.deptName}"/></strong> <strong class="font-bold"><c:out
value="${sessionScope.sessionOperatorAttribute.deptName}"/></strong>
</span> </span>
<span class="text-xs block"> <span class="text-xs block">
<c:out value="${sessionScope.sessionOperatorAttribute.name}"/> <c:out value="${sessionScope.sessionOperatorAttribute.name}"/>
...@@ -84,10 +94,16 @@ ...@@ -84,10 +94,16 @@
</a> </a>
<ul class="dropdown-menu animated fadeInRight m-t-xs"> <ul class="dropdown-menu animated fadeInRight m-t-xs">
<li> <li>
<a data-id="controlPanel" data-code="controlPanel" href="javascript:void(0);" data-url="/personOwn/forwardUsercontrol.do?codeId=setUserInfo" title="<x:message key="index.user.own.info"/>"><x:message key="index.user.own.info"/></a> <a data-id="controlPanel" data-code="controlPanel" href="javascript:void(0);"
data-url="/personOwn/forwardUsercontrol.do?codeId=setUserInfo"
title="<x:message key="index.user.own.info"/>"><x:message
key="index.user.own.info"/></a>
</li> </li>
<li> <li>
<a data-id="controlPanel" data-code="controlPanel" href="javascript:void(0);" data-url="/personOwn/forwardUsercontrol.do?codeId=setUserPassword" title="<x:message key="index.user.own.info"/>"><x:message key="index.user.own.password"/></a> <a data-id="controlPanel" data-code="controlPanel" href="javascript:void(0);"
data-url="/personOwn/forwardUsercontrol.do?codeId=setUserPassword"
title="<x:message key="index.user.own.info"/>"><x:message
key="index.user.own.password"/></a>
</li> </li>
<li class="divider"></li> <li class="divider"></li>
<li> <li>
...@@ -98,7 +114,8 @@ ...@@ -98,7 +114,8 @@
<div class="logo-element"><c:out value="${sessionScope.sessionOperatorAttribute.name}"/></div> <div class="logo-element"><c:out value="${sessionScope.sessionOperatorAttribute.name}"/></div>
</li> </li>
<li> <li>
<a data-code="homepage" href="javascript:void(0);" data-url="<c:url value="/homePage.do?csrfToken=${token}"/>"> <a data-code="homepage" href="javascript:void(0);"
data-url="<c:url value="/homePage.do?csrfToken=${token}"/>">
<i class="fa fa-home"></i> <i class="fa fa-home"></i>
<span class="nav-label"><x:message key="index.home.page"/></span> <span class="nav-label"><x:message key="index.home.page"/></span>
</a> </a>
...@@ -114,7 +131,8 @@ ...@@ -114,7 +131,8 @@
<div class="row border-bottom"> <div class="row border-bottom">
<div class="navbar navbar-static-top" role="navigation" style="margin-bottom:0"> <div class="navbar navbar-static-top" role="navigation" style="margin-bottom:0">
<div class="navbar-header" style="height:60px"> <div class="navbar-header" style="height:60px">
<a class="navbar-minimalize minimalize-styl-2 btn btn-primary" href="javascript:void(0);"><i class="fa fa-bars"></i></a> <a class="navbar-minimalize minimalize-styl-2 btn btn-primary" href="javascript:void(0);"><i
class="fa fa-bars"></i></a>
<div class="visible-lg visible-md" style="white-space: nowrap;"> <div class="visible-lg visible-md" style="white-space: nowrap;">
<c:import url="/index/navbarHeader.jsp"/> <c:import url="/index/navbarHeader.jsp"/>
</div> </div>
...@@ -163,9 +181,12 @@ ...@@ -163,9 +181,12 @@
<i class="fa fa-tasks"></i> <i class="fa fa-tasks"></i>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="javascript:void(0);" class="s-skin-0"><x:message key="index.skin.default"/></a></li> <li><a href="javascript:void(0);" class="s-skin-0"><x:message key="index.skin.default"/></a>
<li><a href="javascript:void(0);" class="s-skin-1"><x:message key="index.skin.blue"/></a></li> </li>
<li><a href="javascript:void(0);" class="s-skin-3"><x:message key="index.skin.yellow"/></a></li> <li><a href="javascript:void(0);" class="s-skin-1"><x:message key="index.skin.blue"/></a>
</li>
<li><a href="javascript:void(0);" class="s-skin-3"><x:message key="index.skin.yellow"/></a>
</li>
</ul> </ul>
</li> </li>
<li class="hidden-sm hidden-md hidden-lg"> <li class="hidden-sm hidden-md hidden-lg">
...@@ -181,7 +202,8 @@ ...@@ -181,7 +202,8 @@
</li> </li>
<li> <li>
<a href="javascript:void(0);" onclick="switchOperator()"> <a href="javascript:void(0);" onclick="switchOperator()">
<i class="fa fa-users"></i><span class="hidden-xs"><x:message key="index.switch.pos"/></span> <i class="fa fa-users"></i><span class="hidden-xs"><x:message
key="index.switch.pos"/></span>
</a> </a>
</li> </li>
<c:if test="${f:systemParameter('tenant.enable')=='true'}"> <c:if test="${f:systemParameter('tenant.enable')=='true'}">
...@@ -210,7 +232,8 @@ ...@@ -210,7 +232,8 @@
</button> </button>
<div class="page-tabs"> <div class="page-tabs">
<div class="page-tabs-content"> <div class="page-tabs-content">
<a href="javascript:void(0);" class="active ui_menuTab" data-id="homepage"><x:message key="index.home.page"/></a> <a href="javascript:void(0);" class="active ui_menuTab" data-id="homepage"><x:message
key="index.home.page"/></a>
</div> </div>
</div> </div>
<button class="roll-nav roll-right ui_tabRight"> <button class="roll-nav roll-right ui_tabRight">
...@@ -232,14 +255,17 @@ ...@@ -232,14 +255,17 @@
</a> </a>
</div> </div>
<div class="row" id="content-main"> <div class="row" id="content-main">
<iframe id="homepage" name="homepage" style="width:100%;height:100%;border:none 0;" frameborder="0" allowfullscreen="true" allowtransparency="true" data-id="homepage" src="<c:url value="/homePage.do?csrfToken=${token}"/>"></iframe> <iframe id="homepage" name="homepage" style="width:100%;height:100%;border:none 0;" frameborder="0"
allowfullscreen="true" allowtransparency="true" data-id="homepage"
src="<c:url value="/homePage.do?csrfToken=${token}"/>"></iframe>
</div> </div>
<div class="footer"> <div class="footer">
<div class="pull-left"> <div class="pull-left">
<c:out value="${f:systemParameter('SYSTEM.COPYRIGHT')}" escapeXml="false"/> <c:out value="${f:systemParameter('SYSTEM.COPYRIGHT')}" escapeXml="false"/>
</div> </div>
<div class="pull-right"> <div class="pull-right">
<span><i class="fa fa-user"></i>&nbsp;&nbsp;<c:out value="${sessionScope.sessionOperatorAttribute.fullDisplayName}"/></span> <span><i class="fa fa-user"></i>&nbsp;&nbsp;<c:out
value="${sessionScope.sessionOperatorAttribute.fullDisplayName}"/></span>
</div> </div>
</div> </div>
</div> </div>
...@@ -252,7 +278,8 @@ ...@@ -252,7 +278,8 @@
<a data-toggle="tab" href="#tab-1"><i class="fa fa-gear"></i><x:message key="index.theme"/></a> <a data-toggle="tab" href="#tab-1"><i class="fa fa-gear"></i><x:message key="index.theme"/></a>
</li> </li>
<c:if test="${isI18nLanguage}"> <c:if test="${isI18nLanguage}">
<li><a data-toggle="tab" href="#tab-2"><i class="fa fa-language"></i><x:message key="index.language"/></a></li> <li><a data-toggle="tab" href="#tab-2"><i class="fa fa-language"></i><x:message
key="index.language"/></a></li>
</c:if> </c:if>
<!--<li><a data-toggle="tab" href="#tab-3"> 项目进度 </a></li> --> <!--<li><a data-toggle="tab" href="#tab-3"> 项目进度 </a></li> -->
</ul> </ul>
...@@ -267,28 +294,34 @@ ...@@ -267,28 +294,34 @@
<div class="skin-setttings"> <div class="skin-setttings">
<div class="title"><x:message key="index.theme.setup"/></div> <div class="title"><x:message key="index.theme.setup"/></div>
<div class="setings-item"> <div class="setings-item">
<label class="checkbox-inline"><input type="checkbox" name="collapsemenu" id="collapsemenu">&nbsp;<x:message key="index.theme.collapsemenu"/></label> <label class="checkbox-inline"><input type="checkbox" name="collapsemenu" id="collapsemenu">&nbsp;<x:message
key="index.theme.collapsemenu"/></label>
</div> </div>
<div class="setings-item"> <div class="setings-item">
<label class="checkbox-inline"><input type="checkbox" name="fixednavbar" id="fixednavbar">&nbsp;<x:message key="index.theme.fixednavbar"/></label> <label class="checkbox-inline"><input type="checkbox" name="fixednavbar" id="fixednavbar">&nbsp;<x:message
key="index.theme.fixednavbar"/></label>
</div> </div>
<div class="setings-item"> <div class="setings-item">
<label class="checkbox-inline"><input type="checkbox" name="boxedlayout" id="boxedlayout">&nbsp;<x:message key="index.theme.boxedlayout"/></label> <label class="checkbox-inline"><input type="checkbox" name="boxedlayout" id="boxedlayout">&nbsp;<x:message
key="index.theme.boxedlayout"/></label>
</div> </div>
<div class="title"><x:message key="index.skin.setup"/></div> <div class="title"><x:message key="index.skin.setup"/></div>
<div class="setings-item default-skin nb"> <div class="setings-item default-skin nb">
<span class="skin-name"> <span class="skin-name">
<a href="javascript:void(0);" class="s-skin-0"><x:message key="index.skin.default"/></a> <a href="javascript:void(0);" class="s-skin-0"><x:message
key="index.skin.default"/></a>
</span> </span>
</div> </div>
<div class="setings-item blue-skin nb"> <div class="setings-item blue-skin nb">
<span class="skin-name"> <span class="skin-name">
<a href="javascript:void(0);" class="s-skin-1"><x:message key="index.skin.blue"/></a> <a href="javascript:void(0);" class="s-skin-1"><x:message
key="index.skin.blue"/></a>
</span> </span>
</div> </div>
<div class="setings-item yellow-skin nb"> <div class="setings-item yellow-skin nb">
<span class="skin-name"> <span class="skin-name">
<a href="javascript:void(0);" class="s-skin-3"><x:message key="index.skin.yellow"/></a> <a href="javascript:void(0);" class="s-skin-3"><x:message
key="index.skin.yellow"/></a>
</span> </span>
</div> </div>
</div> </div>
...@@ -302,12 +335,14 @@ ...@@ -302,12 +335,14 @@
</div> </div>
<div class="skin-setttings switch-language"> <div class="skin-setttings switch-language">
<c:forEach items="${i18nLanguages}" var="language" varStatus="i"> <c:forEach items="${i18nLanguages}" var="language" varStatus="i">
<c:set var="languageClassName" value="blue-skin" /> <c:set var="languageClassName" value="blue-skin"/>
<c:if test="${i.index%2==1}"> <c:if test="${i.index%2==1}">
<c:set var="languageClassName" value="yellow-skin" /> <c:set var="languageClassName" value="yellow-skin"/>
</c:if> </c:if>
<div class="setings-item nb <c:out value="${languageClassName}"/>"> <div class="setings-item nb <c:out value="${languageClassName}"/>">
<a href="javascript:void(0);" data-language="<c:out value="${language.value}"/>"><c:out value="${language.name}"/></a> <a href="javascript:void(0);"
data-language="<c:out value="${language.value}"/>"><c:out
value="${language.name}"/></a>
</div> </div>
</c:forEach> </c:forEach>
</div> </div>
...@@ -332,6 +367,6 @@ ...@@ -332,6 +367,6 @@
<span class="badge badge-warning pull-right">5</span> <span class="badge badge-warning pull-right">5</span>
<a class="open-small-chat"> <i class="fa fa-comments"></i></a> <a class="open-small-chat"> <i class="fa fa-comments"></i></a>
</div> --> </div> -->
</div> </div>
</body> </body>
</html> </>
\ No newline at end of file \ No newline at end of file
huigou-xt/src/main/webapp/WEB-INF/decorators/job.jsp
View file @ 2213facd
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
response.setHeader("Cache-Control","No-cache"); response.setHeader("Cache-Control","No-cache");
response.setDateHeader("Expires", -1); response.setDateHeader("Expires", -1);
response.setHeader("Cache-Control", "No-store"); response.setHeader("Cache-Control", "No-store");
String serverHost = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
String basePath = serverHost + request.getContextPath();
request.setAttribute("basePath", basePath);
%> %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
...@@ -27,6 +31,9 @@ ...@@ -27,6 +31,9 @@
<meta http-equiv="cache-control" content="no-cache"> <meta http-equiv="cache-control" content="no-cache">
<meta name="format-detection" content="telephone=no,email=no,address=no"> <meta name="format-detection" content="telephone=no,email=no,address=no">
<!--[if (gt IE 9)|!(IE)]><!--><x:link href="/themes/font-face.css"/><!--<![endif]--> <!--[if (gt IE 9)|!(IE)]><!--><x:link href="/themes/font-face.css"/><!--<![endif]-->
<script type="application/javascript">
var web_app = {name: '${basePath}'};
</script>
<x:base include="base,grid,tree,layout,dialog,combox,comboDialog,selectOrg,commonTree"/> <x:base include="base,grid,tree,layout,dialog,combox,comboDialog,selectOrg,commonTree"/>
<x:link href="/themes/extend.css"/> <x:link href="/themes/extend.css"/>
<!--[if lt IE 9]> <!--[if lt IE 9]>
......
huigou-xt/src/main/webapp/WEB-INF/decorators/main.jsp
View file @ 2213facd
<%@ page contentType="text/html; charset=UTF-8"%> <%@ page contentType="text/html; charset=UTF-8" %>
<%@ page import="com.huigou.context.ContextUtil" %> <%@ page import="com.huigou.context.ContextUtil" %>
<%@ page import="com.huigou.util.Constants" %> <%@ page import="com.huigou.util.Constants" %>
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator"%> <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
<%@ taglib uri="http://www.opensymphony.com/sitemesh/page" prefix="page"%> <%@ taglib uri="http://www.opensymphony.com/sitemesh/page" prefix="page" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x"%> <%@ taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
<%@ taglib uri="/WEB-INF/JSTLFunction.tld" prefix="f"%> <%@ taglib uri="/WEB-INF/JSTLFunction.tld" prefix="f" %>
<% <%
String token = (String)ContextUtil.getSession().getAttribute(Constants.CSRF_TOKEN); String token = (String) ContextUtil.getSession().getAttribute(Constants.CSRF_TOKEN);
response.setHeader("Pragma","No-cache"); response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control","No-cache"); response.setHeader("Cache-Control", "No-cache");
response.setDateHeader("Expires", -1); response.setDateHeader("Expires", -1);
response.setHeader("Cache-Control", "No-store"); response.setHeader("Cache-Control", "No-store");
String serverHost = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
String basePath = serverHost + request.getContextPath();
request.setAttribute("basePath", basePath);
%> %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1, shrink-to-fit=no"/> <meta name="viewport"
content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1, shrink-to-fit=no"/>
<!-- 360浏览器默认使用Webkit内核 --> <!-- 360浏览器默认使用Webkit内核 -->
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<title><decorator:title default="${f:systemParameter('SYSTEM.NAME')}"/></title> <title><decorator:title default="${f:systemParameter('SYSTEM.NAME')}"/></title>
...@@ -27,6 +32,9 @@ ...@@ -27,6 +32,9 @@
<meta http-equiv="cache-control" content="no-cache"> <meta http-equiv="cache-control" content="no-cache">
<meta name="format-detection" content="telephone=no,email=no,address=no"> <meta name="format-detection" content="telephone=no,email=no,address=no">
<!--[if (gt IE 9)|!(IE)]><!--><x:link href="/themes/font-face.css"/><!--<![endif]--> <!--[if (gt IE 9)|!(IE)]><!--><x:link href="/themes/font-face.css"/><!--<![endif]-->
<script type="application/javascript">
var web_app = {name: '${basePath}'};
</script>
<x:base include="base"/> <x:base include="base"/>
<x:link href="/themes/extend.css"/> <x:link href="/themes/extend.css"/>
<!--[if lt IE 9]> <!--[if lt IE 9]>
...@@ -35,13 +43,13 @@ ...@@ -35,13 +43,13 @@
<![endif]--> <![endif]-->
<decorator:head/> <decorator:head/>
<x:script src='/common/OPpermission.jsp'/> <x:script src='/common/OPpermission.jsp'/>
</head> </head>
<body> <body>
<input type="hidden" id="csrfTokenElement" value="<%=token%>"/> <input type="hidden" id="csrfTokenElement" value="<%=token%>"/>
<x:hidden name="isReadOnly" id="mainPageReadOnlyFlag"/> <x:hidden name="isReadOnly" id="mainPageReadOnlyFlag"/>
<div id="ui-screen-over-loading" class="ui-main-page-loading"></div> <div id="ui-screen-over-loading" class="ui-main-page-loading"></div>
<div class="main-package-over"> <div class="main-package-over">
<decorator:body/> <decorator:body/>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
huigou-xt/src/main/webapp/WEB-INF/decorators/print.jsp
View file @ 2213facd
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<% <%
String token = (String)ContextUtil.getSession().getAttribute(Constants.CSRF_TOKEN); String token = (String)ContextUtil.getSession().getAttribute(Constants.CSRF_TOKEN);
String serverHost = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
String basePath = serverHost + request.getContextPath();
request.setAttribute("basePath", basePath);
%> %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
...@@ -14,6 +17,9 @@ ...@@ -14,6 +17,9 @@
<title><decorator:title /></title> <title><decorator:title /></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="format-detection" content="telephone=no,email=no,address=no"> <meta name="format-detection" content="telephone=no,email=no,address=no">
<script type="application/javascript">
var web_app = {name: '${basePath}'};
</script>
<x:base include="base"/> <x:base include="base"/>
<x:link href="/themes/css/print.css"/> <x:link href="/themes/css/print.css"/>
<x:script src='/javaScript/print.js'/> <x:script src='/javaScript/print.js'/>
......
huigou-xt/src/main/webapp/system/bpm/FreeFlowBackQuery.jsp
View file @ 2213facd
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<head> <head>
<x:base include="layout,dialog,grid,dateTime" /> <x:base include="layout,dialog,grid,dateTime" />
<script src='<c:url value="/javaScript/UICtrl.js"/>' type="text/javascript"></script> <script src='<c:url value="/javaScript/UICtrl.js"/>' type="text/javascript"></script>
<script src='<c:url value="/javaScript/WEB_APP.js"/>' type="text/javascript"></script> <%--<script src='<c:url value="/javaScript/WEB_APP.js"/>' type="text/javascript"></script>--%>
<script src='<c:url value="/javaScript/common.js"/>' type="text/javascript"></script> <script src='<c:url value="/javaScript/common.js"/>' type="text/javascript"></script>
<script src='<c:url value="/system/bpm/FreeFlowBackQuery.js"/>' type="text/javascript"></script> <script src='<c:url value="/system/bpm/FreeFlowBackQuery.js"/>' type="text/javascript"></script>
</head> </head>
......
huigou-xt/src/main/webapp/template/simple/headBase.ftl
View file @ 2213facd
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<link href='${parameters.webApp?default("")?html}/themes/fontawesome/css/font-awesome.min.css' rel='stylesheet' type='text/css'/> <link href='${parameters.webApp?default("")?html}/themes/fontawesome/css/font-awesome.min.css' rel='stylesheet' type='text/css'/>
<link href='${parameters.webApp?default("")?html}/themes/css/style.css?v=20181010' rel='stylesheet' type='text/css'/> <link href='${parameters.webApp?default("")?html}/themes/css/style.css?v=20181010' rel='stylesheet' type='text/css'/>
<link href='${parameters.webApp?default("")?html}/themes/css/ui.css?v=20181009' rel='stylesheet' type='text/css'/> <link href='${parameters.webApp?default("")?html}/themes/css/ui.css?v=20181009' rel='stylesheet' type='text/css'/>
<script src='${parameters.webApp?default("")?html}/javaScript/WEB_APP.js' type='text/javascript'></script> <#-- <script src='${parameters.webApp?default("")?html}/javaScript/WEB_APP.js' type='text/javascript'></script>-->
<script src='${parameters.webApp?default("")?html}/lib/jquery/jquery.min.js' type='text/javascript'></script> <script src='${parameters.webApp?default("")?html}/lib/jquery/jquery.min.js' type='text/javascript'></script>
<script src='${parameters.webApp?default("")?html}/lib/jquery/jquery.json-2.4.min.js' type='text/javascript'></script> <script src='${parameters.webApp?default("")?html}/lib/jquery/jquery.json-2.4.min.js' type='text/javascript'></script>
<script src='${parameters.webApp?default("")?html}/lib/jquery/jquery.i18n.properties.js' type='text/javascript'></script> <script src='${parameters.webApp?default("")?html}/lib/jquery/jquery.i18n.properties.js' type='text/javascript'></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment