Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
46161e3
article manager
muycode May 18, 2017
f9b8a3a
Merge branch 'master' into master
bjdevs May 18, 2017
d0e20ad
update
muycode May 23, 2017
331f2ec
Merge branch 'master' into master
bjdevs May 23, 2017
158d440
update
muycode May 24, 2017
07bfd8a
Merge branch 'master' into master
bjdevs May 24, 2017
548b9cc
update
muycode May 27, 2017
fdcccde
del application
muycode May 27, 2017
833f2be
del jcms
muycode May 27, 2017
dca2c8e
update
muycode May 27, 2017
2d1d5e9
update
muycode May 27, 2017
5f5fe0f
update
muycode Jun 7, 2017
b4a2c19
optimize
muycode Jun 7, 2017
9470d16
Merge branch 'master' into master
bjdevs Jun 7, 2017
4e40c89
update
muycode Jun 7, 2017
949e486
update
muycode Jun 8, 2017
e6d1efe
update
muycode Jun 14, 2017
26a5e08
Merge branch 'master' into master
bjdevs Jun 14, 2017
c09766c
‘update
muycode Jun 14, 2017
3b9c401
Merge remote-tracking branch 'upstream/master'
muycode Jun 15, 2017
14c7e8b
update
muycode Jun 15, 2017
cb3a7b8
Merge remote-tracking branch 'upstream/master'
muycode Jun 15, 2017
df23d62
update
muycode Jun 15, 2017
5f154a8
Merge remote-tracking branch 'upstream/master'
muycode Jun 15, 2017
5d2ec89
update
muycode Jun 16, 2017
feb960f
Merge remote-tracking branch 'upstream/master'
muycode Jun 16, 2017
0c3d942
update
muycode Jun 20, 2017
9225862
Revert "update"
muycode Jun 20, 2017
125539f
update
muycode Jun 20, 2017
d280008
Merge remote-tracking branch 'upstream/master'
muycode Jun 20, 2017
0b77dac
update
muycode Jun 20, 2017
4bb3a7a
update
muycode Jun 20, 2017
eb09927
Merge remote-tracking branch 'upstream/master'
muycode Jun 20, 2017
eb32ba8
update
muycode Jun 21, 2017
31429d2
Merge remote-tracking branch 'upstream/master'
muycode Jun 21, 2017
be8be11
update
muycode Jun 23, 2017
a8d99c1
Merge remote-tracking branch 'upstream/master'
muycode Jun 23, 2017
a811682
update
muycode Jun 26, 2017
29a2e9d
Merge remote-tracking branch 'upstream/master'
muycode Jun 26, 2017
b7f0bba
update
muycode Jun 26, 2017
51f8b2a
Merge remote-tracking branch 'upstream/master'
muycode Jun 26, 2017
c089004
update
muycode Jun 26, 2017
8477792
Merge remote-tracking branch 'upstream/master'
muycode Jun 26, 2017
b9c8870
update
muycode Jun 26, 2017
938837b
Merge remote-tracking branch 'upstream/master'
muycode Jun 26, 2017
df94695
update
muycode Jun 27, 2017
9f95777
Merge remote-tracking branch 'upstream/master'
muycode Jun 27, 2017
d2e6083
update
muycode Jun 27, 2017
952f145
Merge remote-tracking branch 'upstream/master'
muycode Jun 28, 2017
4392fa5
update
muycode Jun 28, 2017
c5197ae
update
muycode Jun 28, 2017
45b0878
update
muycode Jun 28, 2017
604101f
Merge remote-tracking branch 'upstream/master'
muycode Jun 28, 2017
b4e45ba
update
muycode Jun 28, 2017
91d86c0
Merge remote-tracking branch 'upstream/master'
muycode Jun 28, 2017
1799212
update
muycode Jun 28, 2017
4649f2e
Merge remote-tracking branch 'upstream/master'
muycode Jun 28, 2017
2015947
update
muycode Jun 29, 2017
c2a87ca
update
muycode Jul 4, 2017
6e267f4
Merge branch 'master' into master
bjdevs Jul 4, 2017
2a763d3
Merge remote-tracking branch 'upstream/master'
muycode Jul 4, 2017
9ff9bd7
update
muycode Jul 7, 2017
408cbb2
Merge branch 'master' of https://github.com/muycode/jcms
muycode Jul 7, 2017
428dc4d
Merge remote-tracking branch 'upstream/master'
muycode Jul 7, 2017
fc42a7d
Merge remote-tracking branch 'upstream/master'
muycode Jul 7, 2017
5c2aa70
Merge remote-tracking branch 'upstream/master'
muycode Jul 10, 2017
61a2b96
update
muycode Jul 10, 2017
8580500
Merge branch 'master' into master
bjdevs Jul 10, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/com/core/service/HomePageService.java
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ public void staticNotice(long userId) throws Exception {
*/
public String articlePublish(long id, String type) {
String staticResPrefix = config.getStaticResourceURLPrefix();
String listDomain = config.getListDomain();

ToolContext toolManagerContext = toolManager.createContext();

Expand Down Expand Up @@ -524,7 +525,7 @@ private Map<String, Object> staticOtherModules(int articleId, int different) thr
List<String[]> other;
int maxLimit = 4;
if (articleId == Constant.CATEGORY_ID_NEWS) {
maxLimit = 13;
maxLimit = 12;
} else if (articleId == Constant.CATEGORY_ID_DEPOSITORY) {
maxLimit = 7;
} else if (articleId == Constant.CATEGORY_ID_LIFE || articleId == Constant.CATEGORY_ID_ZIYUNFOGUO) {
Expand Down Expand Up @@ -694,12 +695,15 @@ private Map<String, Object> staticOtherModules(int articleId, int different) thr
public ObjectNode staticArticleList() {
ObjectNode objectNode = objectMapper.createObjectNode();
String staticResPrefix = config.getStaticResourceURLPrefix();
// String listDomain = config.getListDomain();

ToolContext toolManagerContext = toolManager.createContext();

String path = System.getProperty("webapp.root") + "WEB-INF" + File.separator + "admin";

//返回绑定的文件路径
toolManagerContext.put("resURLPrefix", staticResPrefix);
// toolManagerContext.put("listURLPrefix", listDomain);

create(path + "/articleList.jsp", "base/articleList.vm", toolManagerContext, "jsp");
create(path + "/photoList.jsp", "base/photoList.vm", toolManagerContext, "jsp");
Expand Down
25 changes: 20 additions & 5 deletions src/main/webapp/WEB-INF/admin/articleList.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,17 @@
<title>${winTitle}</title>
<meta name="author" content="4what"/>
<meta name="description" content="黄梅老祖寺 ${depict}"/>
<meta name="keywords" content="黄梅老祖寺 ${keyWord}"/>

<meta name="keywords" content="老祖寺,黄梅老祖寺,紫云山,${keyWord}"/>
<link rel="stylesheet" href="http://cache.amap.com/lbs/static/main.css?v=1.0?v=1.0" />
<link rel="stylesheet" type="text/css" href="http://www.hmlzs.me:8080/article/static/lzs/css/style.css"/>
<style type="text/css">
#container{
margin:0;
height:100%;
width:100%;
font-size:12px;
}
</style>
</head>

<body>
Expand All @@ -35,8 +43,7 @@
<div class="header">
<div class="wrapper">
<h1><a href="http://www.hmlzs.cn"><img src="http://www.hmlzs.me:8080/article/static/lzs/images/logo.png" alt="黄梅老祖寺"/></a></h1>

<form action="${listURLPrefix}/search" method="get" id="search-frm" class="search">
<form action="${listURLPrefix}search" method="get" id="search-frm" class="search">
<div>
<div class="keyword"><input type="text" name="kw" value=""/></div>
<input type="submit" name="" value="搜索" class="submit"/>
Expand Down Expand Up @@ -118,12 +125,16 @@

<script type="text/javascript" src=http://www.hmlzs.me:8080/article/static/lzs/js/jquery.qrcode.min.js></script>

<script type="text/javascript" src='http://webapi.amap.com/maps?v=1.3&key=aa83bb67a3b8592e7b3aaf2674b6a50b'></script>
<script src="http://cache.amap.com/lbs/static/es5.min.js"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=aa83bb67a3b8592e7b3aaf2674b6a50b&plugin=AMap.ToolBar"></script>

<script type="text/javascript" src="http://www.hmlzs.me:8080/article/static/lzs/js/map_main.js"></script>
<script type="text/javascript" src="http://webapi.amap.com/ui/1.0/main.js"></script>
<script type="text/javascript" src="http://www.hmlzs.me:8080/article/static/lzs/js/map.js"></script>




<!-- page analytics -->
<script type="text/javascript" src=http://www.hmlzs.me:8080/article/static/lzs/js/analytics.js></script>

Expand Down Expand Up @@ -208,6 +219,10 @@
var pageCnt = ${list.totalPage};
var page = ${list.pageNum};
var listUrl = ${listUrl};

$('#contact li:eq(2) > span').text("");
$('#contact li:eq(2)').css("text-align", "center");
$('#map_container').css("width", "270px");
</script>
<script type="text/javascript" src="http://www.hmlzs.me:8080/article/static/lzs/js/paginate.js"></script>
</body>
Expand Down
25 changes: 20 additions & 5 deletions src/main/webapp/WEB-INF/admin/photoList.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,17 @@
<title>${winTitle}</title>
<meta name="author" content="4what"/>
<meta name="description" content="黄梅老祖寺 ${depict}"/>
<meta name="keywords" content="黄梅老祖寺 ${keyWord}"/>

<meta name="keywords" content="老祖寺,黄梅老祖寺,紫云山,${keyWord}"/>
<link rel="stylesheet" href="http://cache.amap.com/lbs/static/main.css?v=1.0?v=1.0" />
<link rel="stylesheet" type="text/css" href="http://www.hmlzs.me:8080/article/static/lzs/css/style.css"/>
<style type="text/css">
#container{
margin:0;
height:100%;
width:100%;
font-size:12px;
}
</style>
</head>

<body>
Expand All @@ -35,8 +43,7 @@
<div class="header">
<div class="wrapper">
<h1><a href="http://www.hmlzs.cn"><img src="http://www.hmlzs.me:8080/article/static/lzs/images/logo.png" alt="黄梅老祖寺"/></a></h1>

<form action="${listURLPrefix}/search" method="get" id="search-frm" class="search">
<form action="${listURLPrefix}search" method="get" id="search-frm" class="search">
<div>
<div class="keyword"><input type="text" name="kw" value=""/></div>
<input type="submit" name="" value="搜索" class="submit"/>
Expand Down Expand Up @@ -114,12 +121,16 @@

<script type="text/javascript" src=http://www.hmlzs.me:8080/article/static/lzs/js/jquery.qrcode.min.js></script>

<script type="text/javascript" src='http://webapi.amap.com/maps?v=1.3&key=aa83bb67a3b8592e7b3aaf2674b6a50b'></script>
<script src="http://cache.amap.com/lbs/static/es5.min.js"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=aa83bb67a3b8592e7b3aaf2674b6a50b&plugin=AMap.ToolBar"></script>

<script type="text/javascript" src="http://www.hmlzs.me:8080/article/static/lzs/js/map_main.js"></script>
<script type="text/javascript" src="http://webapi.amap.com/ui/1.0/main.js"></script>
<script type="text/javascript" src="http://www.hmlzs.me:8080/article/static/lzs/js/map.js"></script>




<!-- page analytics -->
<script type="text/javascript" src=http://www.hmlzs.me:8080/article/static/lzs/js/analytics.js></script>

Expand Down Expand Up @@ -204,6 +215,10 @@
var pageCnt = ${list.totalPage};
var page = ${list.pageNum};
var listUrl = ${listUrl};

$('li > span:eq(2)').text("");
$('#contact > ul > li:gt(1)').css("text-align", "center");

</script>
<script type="text/javascript" src=http://www.hmlzs.me:8080/article/static/lzs/js/paginate.js></script>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Ext.define('Admin.view.content.headline.picture.PictureMainForm', {
xtype: 'panel',
region: 'center',
layout: 'form',
minHeight: 400,
// minHeight: 400,
border: false,
scrollable: 'y',
items: [
Expand Down
5 changes: 4 additions & 1 deletion src/main/webapp/app/temp/app/view/main/Main.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ Ext.define('Admin.view.main.Main', {
height: 60,
items: [
{
xtype: 'image',
/*xtype: 'image',
src: 'http://www.hmlzs.cn/static/lzs/images/logo.png',
userCls: 'admin-header-logo'*/
xtype: 'label',
html: '<a href="http://www.hmlzs.cn" target="_blank"><img src="http://www.hmlzs.cn/static/lzs/images/logo.png"></a>',
userCls: 'admin-header-logo'
},
/* {
Expand Down