From 7b402a3c8b36189187ccbb48df9d1047151c9651 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Tue, 17 May 2016 18:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/webapp/WEB-INF/template/common/common.macro.ftl    | 2 ++
 xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl         | 1 +
 .../src/main/webapp/WEB-INF/template/jobinfo/index.ftl          | 1 -
 xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl | 1 -
 xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl        | 1 -
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
index c056d041..75aa31ae 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
@@ -46,6 +46,8 @@
     <script src="${request.contextPath}/static/plugins/pace/pace.min.js"></script>
     <script src="${request.contextPath}/static/plugins/jquery/jquery.cookie.js"></script>
     <script src="${request.contextPath}/static/js/common.1.js"></script>
+    
+    <script>var base_url = '${request.contextPath}';</script>
 </#macro>
 
 <#macro commonHeader>
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
index e489f5d5..efae5723 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
@@ -70,5 +70,6 @@
 	<@netCommon.commonFooter />
 </div>
 <@netCommon.commonScript />
+<@netCommon.comAlert />
 </body>
 </html>
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl
index 393a0147..ba0b97c6 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl
@@ -230,7 +230,6 @@
 <!-- daterangepicker -->
 <script src="${request.contextPath}/static/adminlte/plugins/daterangepicker/moment.min.js"></script>
 <script src="${request.contextPath}/static/adminlte/plugins/daterangepicker/daterangepicker.js"></script>
-<script>var base_url = '${request.contextPath}';</script>
 <script src="${request.contextPath}/static/js/jobinfo.index.1.js"></script>
 </body>
 </html>
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl
index 80bf9dee..d4f6cf2c 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl
@@ -107,7 +107,6 @@
 <!-- daterangepicker -->
 <script src="${request.contextPath}/static/adminlte/plugins/daterangepicker/moment.min.js"></script>
 <script src="${request.contextPath}/static/adminlte/plugins/daterangepicker/daterangepicker.js"></script>
-<script>var base_url = '${request.contextPath}';</script>
 <script src="${request.contextPath}/static/js/joblog.index.1.js"></script>
 </body>
 </html>
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl
index 23db39ad..3991d730 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl
@@ -41,7 +41,6 @@
 <@netCommon.comAlert />
 <script src="${request.contextPath}/static/plugins/jquery/jquery.validate.min.js"></script>
 <script src="${request.contextPath}/static/plugins/iCheck/icheck.min.js"></script>
-<script>var base_url = '${request.contextPath}';</script>
 <script src="${request.contextPath}/static/js/login.1.js"></script>
 
 </body>