Skip to content
GitLab
Commit 7fa8137a authored by HuangBingGui's avatar HuangBingGui
Browse files

no commit message

parent 6c859da2
Hide whitespace changes
Inline Side-by-side
JeeSpringCloud/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/layouts/default.jsp
View file @ 7fa8137a
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By JeeSite</title> <title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By JeeSpring</title>
<%@include file="/WEB-INF/views/modules/cms/front/include/head.jsp" %> <%@include file="/WEB-INF/views/modules/cms/front/include/head.jsp" %>
<!-- Baidu tongji analytics --><script>var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src="//hm.baidu.com/hm.js?82116c626a8d504a5c0675073362ef6f";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s);})();</script> <!-- Baidu tongji analytics --><script>var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src="//hm.baidu.com/hm.js?82116c626a8d504a5c0675073362ef6f";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s);})();</script>
<sitemesh:head/> <sitemesh:head/>
......
JeeSpringCloud/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/frontGuestbook.jsp
View file @ 7fa8137a
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<head> <head>
<title>留言板</title> <title>留言板</title>
<meta name="decorator" content="cms_default_${site.theme}"/> <meta name="decorator" content="cms_default_${site.theme}"/>
<meta name="description" content="JeeSite ${site.description}" /> <meta name="description" content="JeeSpring ${site.description}" />
<meta name="keywords" content="JeeSite ${site.keywords}" /> <meta name="keywords" content="JeeSpring ${site.keywords}" />
<script src="${ctxStaticTheme}/lyb/jquery-1.7.1.min.js"></script> <script src="${ctxStaticTheme}/lyb/jquery-1.7.1.min.js"></script>
<script src="${ctxStaticTheme}/lyb/jquery.alerts.js" type="text/javascript"></script> <script src="${ctxStaticTheme}/lyb/jquery.alerts.js" type="text/javascript"></script>
<link href="${ctxStaticTheme}/lyb/jquery.alerts.css" rel="stylesheet" type="text/css" media="screen" /> <link href="${ctxStaticTheme}/lyb/jquery.alerts.css" rel="stylesheet" type="text/css" media="screen" />
......
JeeSpringCloud/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/frontIndex.jsp
View file @ 7fa8137a
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<head> <head>
<title>首页</title> <title>首页</title>
<meta name="decorator" content="cms_default_${site.theme}" /> <meta name="decorator" content="cms_default_${site.theme}" />
<meta name="description" content="JeeSite ${site.description}" /> <meta name="description" content="JeeSpring ${site.description}" />
<meta name="keywords" content="JeeSite ${site.keywords}" /> <meta name="keywords" content="JeeSpring ${site.keywords}" />
<style type="text/css"> <style type="text/css">
@charset "utf-8"; @charset "utf-8";
*{margin:0;padding:0;}.wz_17_wrapper a{ display:block;color: #FFF;text-decoration: none;} *{margin:0;padding:0;}.wz_17_wrapper a{ display:block;color: #FFF;text-decoration: none;}
......
JeeSpringCloud/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/layouts/default.jsp
View file @ 7fa8137a
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By JeeSite</title> <title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By JeeSpring</title>
<meta name="viewport" content="width=device-width,height=device-height,inital-scale=1.0,maximum-scale=1.0,user-scalable=no;"> <meta name="viewport" content="width=device-width,height=device-height,inital-scale=1.0,maximum-scale=1.0,user-scalable=no;">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
......
JeeSpringCloud/src/main/webapp/WEB-INF/views/modules/gen/genCodeForm.jsp
View file @ 7fa8137a
...@@ -45,8 +45,11 @@ ...@@ -45,8 +45,11 @@
<div class="col-sm-9 col-lg-10 col-xs-12"> <div class="col-sm-9 col-lg-10 col-xs-12">
<form:input path="packageName" htmlEscape="false" maxlength="500" <form:input path="packageName" htmlEscape="false" maxlength="500"
class="required form-control"/> class="required form-control"/>
<span class="help-inline">建议项目模块包：com.company.project.modules</span> <span class="help-inline">建议项目模块包：com.company.project.modules;</span>
<span class="help-inline">建议框架模块包：com.jeespring.modules</span> <span class="help-inline">建议框架模块包：com.jeespring.modules;</span><br>
<span class="help-inline">如果自定义框架模块包：com.*.*;</span><br>
<span class="help-inline">需要在application.xml内配置type-aliases-package:com.jeespring,com.company,com.*.*;</span><br>
<span class="help-inline">需要在JeeSpringDriver.java里面配置@ServletComponentScan;@ComponentScan;@MapperScan</span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
JeeSpringCloud/src/main/webapp/act/process-editor/editor-app/app.js
View file @ 7fa8137a
...@@ -239,7 +239,7 @@ activitiModeler ...@@ -239,7 +239,7 @@ activitiModeler
} }
// var totalAvailable = jQuery(window).height() - offset.top - mainHeader.height() - 21; // var totalAvailable = jQuery(window).height() - offset.top - mainHeader.height() - 21;
var totalAvailable = jQuery(window).height() - offset.top - mainHeader.height() - 42; // 隐藏顶部标题栏，调整下fix参数 ThinkGem var totalAvailable = jQuery(window).height() - offset.top - mainHeader.height() - 42; // 隐藏顶部标题栏，调整下fix参数 JeeSpring
canvas.height(totalAvailable - propSectionHeight); canvas.height(totalAvailable - propSectionHeight);
jQuery('#paletteSection').height(totalAvailable); jQuery('#paletteSection').height(totalAvailable);
......
JeeSpringCloud/src/main/webapp/act/process-editor/editor-app/i18n/en.json
View file @ 7fa8137a
{ {
"HEADER.BRAND" : "流程设计器", "HEADER.BRAND" : "流程设计器",
"HEADER.BRAND_TAGLINE" : "Powered by JeeSite.com", "HEADER.BRAND_TAGLINE" : "Powered by JeeSpring.com",
"PAGE.HEADER" : "thinkgem@163.com", "PAGE.HEADER" : "thinkgem@163.com",
"ACTION.OK" : "确定", "ACTION.OK" : "确定",
......
JeeSpringCloud/src/main/webapp/jeeSpringStatic/dist/js/app_iframe.js
View file @ 7fa8137a
...@@ -2497,6 +2497,7 @@ $(function () { ...@@ -2497,6 +2497,7 @@ $(function () {
var target=$(this).attr("target"); var target=$(this).attr("target");
if(!href) return false; if(!href) return false;
if(href.indexOf("javascript")>=0) return false; if(href.indexOf("javascript")>=0) return false;
if(title.indexOf("演示版不开放")>0) return false;
if(target=="_blank") { if(target=="_blank") {
window.open(href); window.open(href);
return false; return false;
......
JeeSpringCloud/src/main/webapp/static/common/jeespring.css
View file @ 7fa8137a
/*! /*!
* Copyright &copy; 2012-2013 <a href="http://www.jeespring.org/">JeeSite</a> All rights reserved. * Copyright &copy; 2012-2013 <a href="http://www.jeespring.org/">JeeSpring</a> All rights reserved.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
*/ */
......
JeeSpringCloud/src/main/webapp/static/common/login/app-midnight-blue.css
View file @ 7fa8137a
...@@ -6447,7 +6447,7 @@ button.close { ...@@ -6447,7 +6447,7 @@ button.close {
height: 108px; height: 108px;
} }
.login-page { .login-page {
background-image: url(../login/images/loginImg1.jpg); /*background-image: url(../login/images/loginImg1.jpg);*/
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
......
JeeSpringCloud/src/main/webapp/static/modules/cms/front/themes/basic/script.min.js
View file @ 7fa8137a
/*! /*!
* Copyright &copy; 2012-2013 <a href="http://www.jeespring.org/">JeeSite</a> All rights reserved. * Copyright &copy; 2012-2013 <a href="http://www.jeespring.org/">JeeSpring</a> All rights reserved.
*/ */
function addFavorite(b,a){if(!a){a=document.title}try{window.external.addFavorite(b,a)}catch(c){try{window.sidebar.addPanel(a,b,"")}catch(c){alert("加入收藏失败，请使用Ctrl+D进行添加")}}}function autoScroll(b){var a=$(b).find("ul:first li:first").height()+3;$(b).find("ul:first").animate({marginTop:"-"+a+"px"},"slow",function(){$(this).css({marginTop:"0px"}).find("li:first").appendTo(this)})}; function addFavorite(b,a){if(!a){a=document.title}try{window.external.addFavorite(b,a)}catch(c){try{window.sidebar.addPanel(a,b,"")}catch(c){alert("加入收藏失败，请使用Ctrl+D进行添加")}}}function autoScroll(b){var a=$(b).find("ul:first li:first").height()+3;$(b).find("ul:first").animate({marginTop:"-"+a+"px"},"slow",function(){$(this).css({marginTop:"0px"}).find("li:first").appendTo(this)})};
\ No newline at end of file
JeeSpringCloud/src/main/webapp/static/modules/cms/front/themes/basic/style.min.css
View file @ 7fa8137a
/*! /*!
* Copyright &copy; 2012-2013 <a href="http://www.jeespring.org/">JeeSite</a> All rights reserved. * Copyright &copy; 2012-2013 <a href="http://www.jeespring.org/">JeeSpring</a> All rights reserved.
*/a:link,a:visited{color:#282828;text-decoration:none}a:hover,a:active{color:#f00;text-decoration:underline}a.btn.btn-primary{color:#fff}body{padding-bottom:3px;font-size:14px}.navbar.navbar-fixed-top{_margin-bottom:10px}h4{border-left:3px solid #ddd;background-color:#f5f5f5;padding:5px;margin:10px 0 5px}h5{border-left:2px solid #ddd;background-color:#f5f5f5;padding:3px;margin:10px 0 5px}h6{padding:0;margin:5px 0}footer,footer a,footer .footer_nav a,footer .copyright a{line-height:20px;font-size:12px;color:#888}footer .footer_nav,footer .copyright{margin:5px 0}.breadcrumb{margin:10px 0 5px;padding:5px 10px} */a:link,a:visited{color:#282828;text-decoration:none}a:hover,a:active{color:#f00;text-decoration:underline}a.btn.btn-primary{color:#fff}body{padding-bottom:3px;font-size:14px}.navbar.navbar-fixed-top{_margin-bottom:10px}h4{border-left:3px solid #ddd;background-color:#f5f5f5;padding:5px;margin:10px 0 5px}h5{border-left:2px solid #ddd;background-color:#f5f5f5;padding:3px;margin:10px 0 5px}h6{padding:0;margin:5px 0}footer,footer a,footer .footer_nav a,footer .copyright a{line-height:20px;font-size:12px;color:#888}footer .footer_nav,footer .copyright{margin:5px 0}.breadcrumb{margin:10px 0 5px;padding:5px 10px}
\ No newline at end of file
Supports Markdown
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