Skip to content
GitLab
Commit c1b81d0d authored by wujj's avatar wujj
Browse files

Merge remote-tracking branch 'origin/5.2' 

# Conflicts:
#	doc/mcms-5.1.sql
#	pom.xml
parents c791bf40 1a95a697
Expand all Hide whitespace changes
Inline Side-by-side
src/main/webapp/template/1/江西省人民政府-web/index.htm 0 → 100644
View file @ c1b81d0d
This diff is collapsed.
src/main/webapp/template/1/江西省人民政府-web/list.htm 0 → 100644
View file @ c1b81d0d
This diff is collapsed.
src/main/webapp/template/1/江西省人民政府-web/search.htm 0 → 100644
View file @ c1b81d0d
<!--搜索区域 - start -->
<div class="search">
<div class="center">
<img
title=""
alt=""
src="{@ms:file global.logo/}"
class="logo" />
<div class="right">
<div class="top">
<a href="#"
>
政务邮箱
</a>
</div>
<div class="search">
<!--搜索 - start -->
<form id="searchDataForm" action="{ms:global.host/}/mcms/search.do" method="post" style="margin:0;padding:0;width:100%">
<div class="ms-search-input">
<div class="ms-search-input-div">
<!--输入框 - start -->
<input class="ms-input" placeholder="输入搜索关键字"/>
<!--输入框 -end -->
</div>
<div class="ms-search-button" onclick="document.getElementById('searchDataForm').submit();">
<i class="iconfont icon-fangdajing"></i>
<span>
搜索
</span>
</div>
</div>
</form> <!--搜索 -end -->
</div>
</div>
</div>
</div>
<!--搜索区域 -end -->
src/main/webapp/templets/1/default/about.htm deleted 100644 → 0
View file @ c791bf40
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/about_us.jpg) no-repeat center;">
<p class="banner_tit_about animated fadeInLeft">关于我们</p>
<p class="banner_tit_about_des animated fadeInRight">About us</p>
</div>
<div class="ms-content-about">
<div class="ms-content-main">
<#include "menu-left.htm"/>
<div class="ms-content-right">
<div class="ms-content-right-position">
<a href="{ms:global.host/}">首页</a>
<span>></span>
<a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
</div>
<div class="ms-content-right-main">
<div class="ms-content-right-main-title">{ms:field.title/}</div>
<div class="ms-content-right-main-content">{ms:field.content/}</div>
</div>
</div>
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
\ No newline at end of file
src/main/webapp/templets/1/default/advice.htm deleted 100644 → 0
View file @ c791bf40
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/talk_online.jpeg) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft">在线留言</p>
<p class="banner_tit_other_des animated fadeInRight">Talk online</p>
</div>
<div class="ms-content-advice">
<div class="ms-content-form-background">
<form class="ms-content-form" method="post" id="postForm">
<input class="ms-content-form-name" type="text" name="name" placeholder="姓名">
<input class="ms-content-form-phone" type="text" name="phone" placeholder="手机">
<textarea class="ms-content-form-message" name="words" placeholder="留言"></textarea>
<div class="ms-login-button">提交</div>
</form>
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
<script>
/* 表单提交 */
var flag = false;
$(".ms-login-button").click(function() {
if(!flag) {
$.ajax({
type: "POST",
url: "{ms:global.host/}/mdiy/post/7df6529f9eaa26da7ae4e01c7f73aa06.do",
data: $("#postForm").serialize(),
success: function(msg) {
flag = true;
alert("提交成功");
location.reload();
}
});
} else {
alert("您已经提交过了！");
}
})
/* 表单验证 */
function verification() {
if($('input[name="name"]').val().length > 0 && $('input[name="phone"]').val().length > 0 && $('.ms-content-form-message').val().length > 0) {
$('.ms-login-button').css("background-color", "#009aff");
$('.ms-login-button').css("pointer-events", 'visible');
$('.ms-login-button').css("color", "#fff");
} else {
$('.ms-login-button').css("background-color", "#fafafa");
$('.ms-login-button').css('pointer-events', "none");
$('.ms-login-button').css("color", "#ddd");
}
}
$('input[name="name"]').keyup(function() {
verification();
})
$('input[name="phone"]').keyup(function() {
verification();
})
$('.ms-content-form-message').keyup(function() {
verification();
})
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/case-list.htm deleted 100644 → 0
View file @ c791bf40
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/00.png) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft">案&nbsp;&nbsp;&nbsp;例</p>
<p class="banner_tit_other_des animated fadeInRight">Case list</p>
</div>
<div class="ms-content-case">
<div class="ms-content-main">
{ms:arclist size=6 ispaging=true}
<div class="ms-content-main-case">
<div class="ms-content-main-case-img">
<img src="{ms:global.host/}[field.litpic/]">
</div>
<div class="ms-content-main-case-explain">
<div class="ms-content-main-case-title">[field.title/]</div>
<div class="ms-content-main-case-content">
<p class="ms-content-main-case-written">
[field.content/]
</p>
<!-- <p class="ms-content-main-case-QRcode">
<img src="./images/1471918025445.png">
</p> -->
</div>
<div class="ms-content-main-case-click">
<a target="_blank" href="[field.source/]">点击查看</a>
</div>
</div>
</div>
{/ms:arclist}
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
<script type="text/javascript">
$(function() {
$('.ms-content-main-case').hover(function() {
$(this).find('.ms-content-main-case-explain').toggle();
});
});
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/contact.htm deleted 100644 → 0
View file @ c791bf40
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/contact_us.jpeg) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft" >联系我们</p>
<p class="banner_tit_other_des animated fadeInRight">Contact us</p>
</div>
<div class="ms-content-about">
<div class="ms-content-main">
<#include "menu-left.htm"/>
<div class="ms-content-right">
<div class="ms-content-right-position">
<a href="{ms:global.host/}">首页</a>
<span>></span>
<a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
</div>
<div class="ms-content-right-main">
<div class="ms-content-right-main-title">联系我们</div>
<div class="ms-content-right-main-content"><!-- {ms:field.content/} -->
<style type="text/css">
.BMap_Marker img{
width: 100%;
height: 100%;
}
html,body{margin:0;padding:0;}
.iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
.iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
</style>
<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
<body>
<!--百度地图容器-->
<div style="width:100%;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
</body>
<script type="text/javascript">
//创建和初始化地图函数：
function initMap(){
createMap();//创建地图
setMapEvent();//设置地图事件
addMapControl();//向地图添加控件
addMarker();//向地图中添加marker
}
//创建地图函数：
function createMap(){
var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
var point = new BMap.Point(116.737158,29.153633);//定义一个中心点坐标
map.centerAndZoom(point,9);//设定地图的中心点和坐标并将地图显示在地图容器中
window.map = map;//将map变量存储在全局
}
//地图事件设置函数：
function setMapEvent(){
map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
map.enableScrollWheelZoom();//启用地图滚轮放大缩小
map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
map.enableKeyboard();//启用键盘上下左右键移动地图
}
//地图控件添加函数：
function addMapControl(){
//向地图中添加缩放控件
var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_LARGE});
map.addControl(ctrl_nav);
//向地图中添加缩略图控件
var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:1});
map.addControl(ctrl_ove);
//向地图中添加比例尺控件
var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
map.addControl(ctrl_sca);
}
//标注点数组
var markerArr = [{title:"铭飞科技(景德镇)有限公司",content:"江西省景德镇市昌江区&nbsp;枫林佳苑&nbsp;15栋A区&nbsp;三单元&nbsp;302室",point:"117.187869|29.282949",isOpen:0,icon:{w:21,h:21,l:0,t:0,x:6,lb:5}}
,{title:"铭飞科技(南昌)办事处",content:"江西省南昌市青山湖区创新一路&nbsp;绿地新都会(西门)&nbsp;12栋2单元901室",point:"116.003117|28.683521",isOpen:0,icon:{w:21,h:21,l:0,t:0,x:6,lb:5}}
];
//创建marker
function addMarker(){
for(var i=0;i<markerArr.length;i++){
var json = markerArr[i];
var p0 = json.point.split("|")[0];
var p1 = json.point.split("|")[1];
var point = new BMap.Point(p0,p1);
var iconImg = createIcon(json.icon);
var marker = new BMap.Marker(point,{icon:iconImg});
var iw = createInfoWindow(i);
var label = new BMap.Label(json.title,{"offset":new BMap.Size(json.icon.lb-json.icon.x+10,-20)});
marker.setLabel(label);
map.addOverlay(marker);
label.setStyle({
borderColor:"#808080",
color:"#333",
cursor:"pointer"
});
(function(){
var index = i;
var _iw = createInfoWindow(i);
var _marker = marker;
_marker.addEventListener("click",function(){
this.openInfoWindow(_iw);
});
_iw.addEventListener("open",function(){
_marker.getLabel().hide();
})
_iw.addEventListener("close",function(){
_marker.getLabel().show();
})
label.addEventListener("click",function(){
_marker.openInfoWindow(_iw);
})
if(!!json.isOpen){
label.hide();
_marker.openInfoWindow(_iw);
}
})()
}
}
//创建InfoWindow
function createInfoWindow(i){
var json = markerArr[i];
var iw = new BMap.InfoWindow("<b class='iw_poi_title' title='" + json.title + "'>" + json.title + "</b><div class='iw_poi_content'>"+json.content+"</div>");
return iw;
}
//创建一个Icon
function createIcon(json){
var icon = new BMap.Icon("{ms:global.host/}/{ms:global.style/}/images/img-2.png", new BMap.Size(json.w,json.h),{imageOffset: new BMap.Size(-json.l,-json.t),infoWindowOffset:new BMap.Size(json.lb+5,1),offset:new BMap.Size(json.x,json.h)})
return icon;
}
initMap();//创建和初始化地图
</script>
</div>
</div>
</div>
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
\ No newline at end of file
src/main/webapp/templets/1/default/css/about.css deleted 100644 → 0
View file @ c791bf40
.ms-content-about{margin-top:20px;margin-bottom:40px}.ms-content-about a:link{color:#000;text-decoration:none}.ms-content-about a:visited{color:#000;text-decoration:none}.ms-content-about a:active{color:#000;text-decoration:none}.ms-content-about a:hover{color:#000;text-decoration:none}.ms-content-about .ms-content-main{width:1200px;overflow:hidden;margin:auto}.ms-content-about .ms-content-main .ms-content-left{width:230px;float:left;margin-right:20px}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-title{font-weight:bold;background-color:#009aff;color:#fff;height:40px;line-height:40px;width:190px;padding:0 20px}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul{background-color:#fff;margin-top:1px;width:230px}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul a:hover{color:#fff}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul a:hover li{background-color:#54bcfe}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul a{color:#999999}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul li{height:40px;line-height:40px;font-size:14px;cursor:pointer;padding:0 20px}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul li .ms-content-left-li-more{float:right}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul .ms-content-left-li-first{color:#fff}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul .ms-content-left-li-first li{background-color:#54bcfe}.ms-content-about .ms-content-main .ms-content-right{overflow:hidden}.ms-content-about .ms-content-main .ms-content-right a:visited{color:#000000}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-position{font-size:14px}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-position a:hover{color:#0099ff}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-position span{padding:0 5px}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-main{width:952px;background-color:#ffffff;min-height:450px;padding-bottom:20px}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-main .ms-content-right-main-content{margin:0 20px}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-main .ms-content-right-main-title{text-align:center;font-size:20px;padding-top:40px;padding-bottom:20px;border-bottom:1px solid #d0cfcf99 99;margin:20px}/*# sourceMappingURL=./about.css.map */
\ 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