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
Show whitespace changes
Inline Side-by-side
src/main/webapp/templets/1/default/index.htm deleted 100644 → 0
View file @ c791bf40
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm">
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
<script type="text/javascript" src="{ms:global.host/}/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script>
var ms = {
base:"http://store.mingsoft.net"
}
</script>
<script src="http://store.mingsoft.net/api/ms.web.mstore.js"></script>
</head>
<body>
<#include "head.htm">
<!-- <div class="ms-banner">
<img src="./images/banner.jpg">
</div> -->
<div id="indexVue">
<div id="banner_tabs" class="flexslider">
<ul class="slides">
<template v-for="banner in bannerList">
<li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
<p class="banner_tit animated fadeInLeft">铭飞MS平台</p>
<p class="banner_des animated fadeInRight">MCms系统永久完整开源</p>
</li>
<li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
<p class="banner_tit animated fadeInLeft">MStore</p>
<p class="banner_des animated fadeInRight">丰富强大的功能插件、海量精美的行业模板</p>
</li>
<li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
<p class="banner_tit animated fadeInLeft">优质的服务体验</p>
<p class="banner_des animated fadeInRight">人工远程协助服务、永久享受更新升级</p>
</li>
</template>
</ul>
<ul class="flex-direction-nav">
<li>
<a class="flex-prev" href="javascript:;">Previous</a>
</li>
<li>
<a class="flex-next" href="javascript:;">Next</a>
</li>
</ul>
</div>
<div class="ms-content-index">
<div class="ms-content-template">
<div>
<ul class="nav nav-tabs ms-index-tabs" role="tablist">
<li role="presentation" class="active">
<a href="#model" aria-controls="model" role="tab" data-toggle="tab">模板</a>
</li>
<li role="presentation">
<a href="#plug" aria-controls="plug" role="tab" data-toggle="tab">插件</a>
</li>
</ul>
<div class="ms-content-all">
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="model">
<div style="display: none;" class="ms-loading" v-show="!loading">
<img src="{ms:global.host/}/{ms:global.style/}/images/loading.gif" />
</div>
<div class="ms-model-content" style="display: none;" v-show="loading">
<template v-for="model in modelList">
<div class="ms-model-list">
<a class="ms-model-img" :href="model.upgraderVersionUrl" target="_blank">
<img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://store.mingsoft.net/'+model.img" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
</a>
<div class="ms-model-mobile-img" v-if="model.mobileImg != '' && model.mobileImg != undefined" style="background: url({ms:global.host/}/{ms:global.style/}/images/mobile.png)">
<div>
<img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://store.mingsoft.net/'+model.mobileImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
</div>
</div>
<div class="ms-model-info">
<span v-text="model.upgraderVersionName"></span>
<img class="ms-model-info-img" :src="model.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
<img :src="'{ms:global.host/}/{ms:global.style/}/images/level-'+model.upgraderVersionStart+'.png'" />
<div class="ms-model-type">模板</div>
</div>
</div>
</template>
<div class="ms-model-list" style="display: none;" v-show="loading">
<div class="ms-model-more">
<div onclick="window.open('http://store.mingsoft.net/mstoreShow.do')">查看更多</div>
</div>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="plug">
<div class="ms-model-content" style="display: none;" v-show="loading">
<template v-for="pulg in pulgList">
<div class="ms-model-list">
<a class="ms-model-img" :href="pulg.upgraderVersionUrl" target="_blank">
<img :src="'http://store.mingsoft.net/'+pulg.img" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
</a>
<div class="ms-model-info">
<span v-text="pulg.upgraderVersionName"></span>
<img class="ms-model-info-img" :src="pulg.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
<img :src="'{ms:global.host/}/{ms:global.style/}/images/level-'+pulg.upgraderVersionStart+'.png'" />
<div class="ms-model-type">插件</div>
</div>
</div>
</template>
<div class="ms-model-list" style="display: none;" v-show="loading">
<div class="ms-model-more">
<div onclick="window.open('http://store.mingsoft.net/mstoreShow.do')">查看更多</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ms-content-case">
<div class="ms-content-case-mian">
<div class="ms-content-case-title">
<div class="ms-content-case-title-words">网站案例</div>
<div class="ms-content-case-more">
<a href='{ms:global.url/}/149/index.html'>MORE>></a>
</div>
</div>
<div class="ms-content-case-list">
{ms:arclist typeid=149 size=6}
<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>
</div>
<div class="ms-content-main-case-click">
<a target="_blank" href="[field.source/]">点击查看</a>
</div>
</div>
</div>
{/ms:arclist}
</div>
</div>
</div>
<div class="ms-content-product">
<div class="ms-content-product-main">
<div class="ms-content-product-title">
<div class="ms-content-product-title-words">产品方向</div>
</div>
<div class="ms-content-product-list">
<ul class="ms-content-product-list-ul">
<li>
<div class="ms-content-product-list-img">
<a target="_blank" href="http://www.mingsoft.net/html/1/5523/index.html">
<img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu1.png"></a>
</div>
<div class="ms-content-product-list-content">
<div class="ms-content-product-list-content-title">
<a target="_blank" href="http://www.mingsoft.net/html/1/5523/index.html">铭飞建站系统MCMS</a></div>
<div class="ms-content-product-list-content-describe">纯Java开发，MCMS支持PC与MOBILE皮肤定制,同时使用MS团队移动JS插件，支持站群。</div></div>
</li>
<li>
<div class="ms-content-product-list-img">
<a target="_blank" href="http://www.mingsoft.net/html/1/5524/index.html">
<img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu2.jpg"></a>
</div>
<div class="ms-content-product-list-content">
<div class="ms-content-product-list-content-title">
<a target="_blank" href="http://www.mingsoft.net/html/1/5524/index.html">移动互联网</a></div>
<div class="ms-content-product-list-content-describe">重新定义移动开发，快速、开放、高性能，数据无缝对接，超过500个模块api 接口，方便实现各种应用。</div></div>
</li>
<li>
<div class="ms-content-product-list-img">
<a target="_blank" href="http://www.mingsoft.net/html/1/5526/index.html">
<img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu3.jpg"></a>
</div>
<div class="ms-content-product-list-content">
<div class="ms-content-product-list-content-title">
<a target="_blank" href="http://www.mingsoft.net/html/1/5526/index.html">铭飞物联网</a></div>
<div class="ms-content-product-list-content-describe">MS+物联网，让生产企业真正掌握企业命脉，实现互联网+生产，给企业插上信息化翅膀，共享、共荣大数据时代</div></div>
</li>
</ul>
</div>
</div>
</div>
<div class="ms-content-news">
<div class="ms-content-news-main">
<div class="ms-content-news-main-title">
<div class="ms-content-news-main-title-words">公司动态</div>
<div class="ms-content-news-main-title-more">
<a href='{ms:global.url/}/xinwenzhongxin/index.html'>MORE>></a>
</div>
</div>
<div class="ms-content-news-main-img-text">
{ms:arclist typeid=59 size=1}
<img src="{ms:global.host/}[field.litpic/]">
{/ms:arclist}
<ul class="ms-content-news-main-ul">
{ms:arclist typeid=59 size=6}
<li>
<a href="{ms:global.url/}[field.link/]">
<div class="ms-content-news-main-li-title">
<!-- <span class="ms-content-news-main-li-span">·</span> -->
<span class="">[field.title/]</span>
</div>
<div class="ms-content-news-main-li-time">[field.date?string("yyyy-mm-dd")/]</div>
</a>
</li>
{/ms:arclist}
</ul>
</div>
</div>
</div>
</div>
</div>
<#include "footer.htm">
</body>
</html>
<script type="text/javascript">
var index = new Vue({
el: "#indexVue",
data: {
bannerList: ['01', '02', '03', '04', '05'], //幻灯片列表
modelList: [], //模板列表
pulgList: [], //插件列表
loading: false, //加载状态
},
methods: {
query: function(data, type) {
var target = this;
ms.web.mstore.list(data, function(json) {
if(type == 'model') {
target.modelList = json.list;
} else {
target.pulgList = json.list;
target.loading = true;
}
});
},
imgMover: function() {
var _this = event.target;
var ms_top = ($(_this).height()) - 275;
if(ms_top < 0) {
ms_top = 0;
}
$(_this).stop(true);
$(_this).animate({
"top": -(ms_top)
}, 2500);
},
imgMout: function() {
var _this = event.target;
$(_this).stop(true);
$(_this).animate({
"top": 0
}, 2500);
},
},
mounted: function() {
var data = "upgraderVersionType=2&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=5&pageNo=1";
this.query(data, 'model');
var data = "upgraderVersionType=1&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=5&pageNo=1";
this.query(data, 'pulg');
/*幻灯*/
setTimeout(function() {
var bannerSlider = new Slider($('#banner_tabs'), {
time: 5000,
delay: 400,
event: 'hover',
auto: true,
mode: 'fade',
controller: $('#bannerCtrl'),
activeControllerCls: 'active'
});
$('#banner_tabs .flex-prev').click(function() {
bannerSlider.prev()
});
$('#banner_tabs .flex-next').click(function() {
bannerSlider.next()
});
}, 300)
},
})
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/js/demo.js deleted 100644 → 0
View file @ c791bf40
define(function(require, exports, module) {
var ms = require("ms");
var ajaxCfg = {
"type": "post",
"dataType": "json",
};
var mstore = "http://mstore.mingsoft.net/";//
return {
"version": "1.0.0",
mstore: {
list: function(data, func) {
if(validator.isNull(data)) {
return;
}
ajaxCfg.url = mstore + "/mstore/list.do";
ajaxCfg.params = data;
ms.ajax(ajaxCfg, func);
}
},
}
})
src/main/webapp/templets/1/default/js/jquery.sinaEmotion.js deleted 100644 → 0
View file @ c791bf40
/**
* @author 夏の寒风
* @time 2012-12-14
*/
//自定义hashtable
function Hashtable() {
this._hash = new Object();
this.put = function(key, value) {
if (typeof (key) != "undefined") {
if (this.containsKey(key) == false) {
this._hash[key] = typeof (value) == "undefined" ? null : value;
return true;
} else {
return false;
}
} else {
return false;
}
}
this.remove = function(key) { delete this._hash[key]; }
this.size = function() { var i = 0; for (var k in this._hash) { i++; } return i; }
this.get = function(key) { return this._hash[key]; }
this.containsKey = function(key) { return typeof (this._hash[key]) != "undefined"; }
this.clear = function() { for (var k in this._hash) { delete this._hash[k]; } }
}
var emotions = new Array();
var categorys = new Array();// 分组
var uSinaEmotionsHt = new Hashtable();
// 初始化缓存，页面仅仅加载一次就可以了
//替换
function AnalyticEmotion(s) {
if(typeof (s) != "undefined" && s != null) {
var sArr = s.match(/\[.*?\]/g);
if(!sArr){return s}
for(var i = 0; i < sArr.length; i++){
if(uSinaEmotionsHt.containsKey(sArr[i])) {
var reStr = "<img src=\"" + uSinaEmotionsHt.get(sArr[i]) + "\" height=\"20\" width=\"20\" />";
s = s.replace(sArr[i], reStr);
}
}
}
return s;
}
(function($){
$.fn.SinaEmotion = function(target){
var cat_current;
var cat_page;
$(this).click(function(event){
event.stopPropagation();
var eTop = target.offset().top + target.height() + 15;
var eLeft = target.offset().left - 1;
if($('#emotions .categorys')[0]){
$('#emotions').css({top: eTop, left: eLeft});
$('#emotions').toggle();
return;
}
$('body').append('<div id="emotions"></div>');
$('#emotions').css({top: eTop, left: eLeft});
$('#emotions').html('<div>正在加载，请稍候...</div>');
$('#emotions').click(function(event){
event.stopPropagation();
});
$('#emotions').html('<div style="float:right"><a href="javascript:void(0);" id="prev">&laquo;</a><a href="javascript:void(0);" id="next">&raquo;</a></div><div class="categorys"></div><div class="container"></div><div class="page"></div>');
$('#emotions #prev').click(function(){
showCategorys(cat_page - 1);
});
$('#emotions #next').click(function(){
showCategorys(cat_page + 1);
});
showCategorys();
showEmotions();
});
$('body').click(function(){
$('#emotions').remove();
});
$.fn.insertText = function(text){
this.each(function() {
if(this.tagName !== 'INPUT' && this.tagName !== 'TEXTAREA') {return;}
if (document.selection) {
this.focus();
var cr = document.selection.createRange();
cr.text = text;
cr.collapse();
cr.select();
}else if (this.selectionStart || this.selectionStart == '0') {
var
start = this.selectionStart,
end = this.selectionEnd;
this.value = this.value.substring(0, start)+ text+ this.value.substring(end, this.value.length);
this.selectionStart = this.selectionEnd = start+text.length;
}else {
this.value += text;
}
});
return this;
}
function showCategorys(){
var page = arguments[0]?arguments[0]:0;
if(page < 0 || page >= categorys.length / 5){
return;
}
$('#emotions .categorys').html('');
cat_page = page;
for(var i = page * 5; i < (page + 1) * 5 && i < categorys.length; ++i){
$('#emotions .categorys').append($('<a href="javascript:void(0);">' + categorys[i] + '</a>'));
}
$('#emotions .categorys a').click(function(){
showEmotions($(this).text());
});
$('#emotions .categorys a').each(function(){
if($(this).text() == cat_current){
$(this).addClass('current');
}
});
}
function showEmotions(){
var category = arguments[0]?arguments[0]:'默认';
var page = arguments[1]?arguments[1] - 1:0;
$('#emotions .container').html('');
$('#emotions .page').html('');
cat_current = category;
for(var i = page * 72; i < (page + 1) * 72 && i < emotions[category].length; ++i){
$('#emotions .container').append($('<a href="javascript:void(0);" title="' + emotions[category][i].name + '"><img src="' + emotions[category][i].icon + '" alt="' + emotions[category][i].name + '" width="22" height="22" /></a>'));
}
$('#emotions .container a').click(function(){
target.insertText($(this).attr('title'));
$('#emotions').remove();
});
for(var i = 1; i < emotions[category].length / 72 + 1; ++i){
$('#emotions .page').append($('<a href="javascript:void(0);"' + (i == page + 1?' class="current"':'') + '>' + i + '</a>'));
}
$('#emotions .page a').click(function(){
showEmotions(category, $(this).text());
});
$('#emotions .categorys a.current').removeClass('current');
$('#emotions .categorys a').each(function(){
if($(this).text() == category){
$(this).addClass('current');
}
});
}
}
})(jQuery);
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