Skip to content

S
solo
Commit fb8bcf9e authored by Liang Ding's avatar Liang Ding
Browse files
Options

发布 - 1.6.0

parent 9326c7ed
Expand all Show whitespace changes
Inline Side-by-side
Showing with 259 additions and 236 deletions
CHANGE_LOGS.html
View file @ fb8bcf9e
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head> </head>
<body> <body>
<h2>Release 1.6.0 - Sep 8, 2016</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12147">12147 用户管理翻页失败</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
<li><a href="https://github.com/b3log/solo/issues/12153">12153 语言设置为 English 时首页报错</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
<li><a href="https://github.com/b3log/solo/issues/12150">12150 新版后台 UI</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
</ul>
<h2>Release 1.5.0 - Aug 10, 2016</h2> <h2>Release 1.5.0 - Aug 10, 2016</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12130">12130 MySQL 数据导出 SQL 文件</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li> <li><a href="https://github.com/b3log/solo/issues/12130">12130 MySQL 数据导出 SQL 文件</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
......
pom.xml
View file @ fb8bcf9e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: Solo POM. Description: Solo POM.
Version: 3.13.1.25, Aug 19, 2016 Version: 3.14.1.25, Sep 8, 2016
Author: <a href="http://88250.b3log.org">Liang Ding</a> Author: <a href="http://88250.b3log.org">Liang Ding</a>
Author: <a href="http://www.annpeter.cn">Ann Peter</a> Author: <a href="http://www.annpeter.cn">Ann Peter</a>
--> -->
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<artifactId>solo</artifactId> <artifactId>solo</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>Solo</name> <name>Solo</name>
<version>1.5.0</version> <version>1.6.0</version>
<description> <description>
A blogging system written in Java, feel free to create your or your team own blog. 一个用 Java 实现的博客系统，为你或你的团队创建个博客吧。 A blogging system written in Java, feel free to create your or your team own blog. 一个用 Java 实现的博客系统，为你或你的团队创建个博客吧。
</description> </description>
......
src/main/java/org/b3log/solo/SoloServletListener.java
View file @ fb8bcf9e
...@@ -60,7 +60,7 @@ import org.json.JSONObject; ...@@ -60,7 +60,7 @@ import org.json.JSONObject;
* Solo Servlet listener. * Solo Servlet listener.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.8.2.15, Aug 10, 2016 * @version 1.9.2.15, Sep 8, 2016
* @since 0.3.1 * @since 0.3.1
*/ */
public final class SoloServletListener extends AbstractServletListener { public final class SoloServletListener extends AbstractServletListener {
...@@ -68,7 +68,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -68,7 +68,7 @@ public final class SoloServletListener extends AbstractServletListener {
/** /**
* Solo version. * Solo version.
*/ */
public static final String VERSION = "1.5.0"; public static final String VERSION = "1.6.0";
/** /**
* Logger. * Logger.
......
src/main/java/org/b3log/solo/service/UpgradeService.java
View file @ fb8bcf9e
...@@ -46,7 +46,7 @@ import org.json.JSONObject; ...@@ -46,7 +46,7 @@ import org.json.JSONObject;
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a> * @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
* @version 1.2.0.6, Aug 10, 2016 * @version 1.2.0.7, Sep 8, 2016
* @since 1.2.0 * @since 1.2.0
*/ */
@Service @Service
...@@ -111,7 +111,7 @@ public class UpgradeService { ...@@ -111,7 +111,7 @@ public class UpgradeService {
/** /**
* Old version. * Old version.
*/ */
private static final String FROM_VER = "1.4.0"; private static final String FROM_VER = "1.5.0";
/** /**
* New version. * New version.
......
src/main/webapp/CHANGE_LOGS.html
View file @ fb8bcf9e
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head> </head>
<body> <body>
<h2>Release 1.6.0 - Sep 8, 2016</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12147">12147 用户管理翻页失败</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
<li><a href="https://github.com/b3log/solo/issues/12153">12153 语言设置为 English 时首页报错</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
<li><a href="https://github.com/b3log/solo/issues/12150">12150 新版后台 UI</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
</ul>
<h2>Release 1.5.0 - Aug 10, 2016</h2> <h2>Release 1.5.0 - Aug 10, 2016</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12130">12130 MySQL 数据导出 SQL 文件</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li> <li><a href="https://github.com/b3log/solo/issues/12130">12130 MySQL 数据导出 SQL 文件</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
......
src/main/webapp/css/default-admin.min.css
View file @ fb8bcf9e
This diff is collapsed.
src/main/webapp/css/default-base.min.css
View file @ fb8bcf9e
This diff is collapsed.
src/main/webapp/js/admin/latkeAdmin.js
View file @ fb8bcf9e
This diff is collapsed.
src/main/webapp/js/admin/latkeAdmin.min.js
View file @ fb8bcf9e
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/skins/mobile/js/l10n.min.js
View file @ fb8bcf9e
/*
* Copyright (c) 2010-2016, b3log.org & hacpai.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
function convertEntities(t){var e,n;if(e=function(t){if(/&[^;]+;/.test(t)){var e=document.createElement("div");return e.innerHTML=t,e.firstChild?e.firstChild.nodeValue:t}return t},"string"==typeof t)return e(t);if("object"==typeof t)for(n in t)"string"==typeof t[n]&&(t[n]=e(t[n]));return t} function convertEntities(t){var e,n;if(e=function(t){if(/&[^;]+;/.test(t)){var e=document.createElement("div");return e.innerHTML=t,e.firstChild?e.firstChild.nodeValue:t}return t},"string"==typeof t)return e(t);if("object"==typeof t)for(n in t)"string"==typeof t[n]&&(t[n]=e(t[n]));return t}
\ No newline at end of file
src/main/webapp/skins/next/css/next.css
View file @ fb8bcf9e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* skin next style * skin next style
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.1.2.1, Aug 26, 2016 * @version 0.2.2.1, Sep 6, 2016
*/ */
/* start reset */ /* start reset */
html { html {
...@@ -250,8 +250,10 @@ img { ...@@ -250,8 +250,10 @@ img {
/* start framework */ /* start framework */
.wrapper { .wrapper {
width: 700px; max-width: 700px;
min-width: 600px;
margin: 0 auto; margin: 0 auto;
padding: 0 10px;
} }
.main { .main {
...@@ -263,12 +265,11 @@ img { ...@@ -263,12 +265,11 @@ img {
.header { .header {
background: #f5f5f5; background: #f5f5f5;
margin-bottom: 80px; margin-bottom: 80px;
padding: 40px 45px; padding: 40px 0px;
} }
.logo-wrap { .logo-wrap {
float: left; float: left;
margin-left: -20px;
overflow: hidden; overflow: hidden;
top: 0; top: 0;
opacity: 0; opacity: 0;
...@@ -386,6 +387,10 @@ img { ...@@ -386,6 +387,10 @@ img {
-webkit-transform: translateZ(0); -webkit-transform: translateZ(0);
} }
.sidebar-toggle.has-toc .sidebar-toggle-line{
background: #87daff;
}
.sidebar-toggle-line { .sidebar-toggle-line {
position: relative; position: relative;
display: inline-block; display: inline-block;
...@@ -570,6 +575,34 @@ img { ...@@ -570,6 +575,34 @@ img {
font-size: 14px; font-size: 14px;
line-height: 2; line-height: 2;
} }
.sidebar section {
opacity: 0;
position: relative;
}
.sidebar > ul > li {
display: inline-block;
cursor: pointer;
border-bottom: 1px solid transparent;
font-size: 14px;
color: #555;
}
.sidebar > ul > li:hover {
color: #f5f5f5;
}
.sidebar > ul > li.current {
color: #87daff;
border-bottom-color: #87daff;
}
.sidebar > ul > li:last-child {
margin-left: 10px;
}
/* end side */ /* end side */
/* start list*/ /* start list*/
...@@ -714,6 +747,11 @@ img { ...@@ -714,6 +747,11 @@ img {
.article-body { .article-body {
overflow: auto; overflow: auto;
text-align: justify;
}
.article-body p {
margin: 0 0 25px 0;
} }
/* end article */ /* end article */
...@@ -940,13 +978,18 @@ ul.comments .comment-meta time { ...@@ -940,13 +978,18 @@ ul.comments .comment-meta time {
/* end archives */ /* end archives */
/* start responsive */ /* start responsive */
@media (max-width: 1000px) {
.sidebar-toggle,
.sidebar {
display: none;
}
@media (max-width: 700px) { body {
.b3-solo-list { padding-right: 0 !important;
margin: 0;
padding: 0;
} }
}
@media (max-width: 700px) {
.page-archive .posts-collapse .archive-move-on { .page-archive .posts-collapse .archive-move-on {
margin-left: 5px; margin-left: 5px;
} }
...@@ -954,9 +997,6 @@ ul.comments .comment-meta time { ...@@ -954,9 +997,6 @@ ul.comments .comment-meta time {
.posts-collapse { .posts-collapse {
margin-left: 10px; margin-left: 10px;
} }
}
@media (max-width: 500px) {
pre { pre {
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
...@@ -976,7 +1016,6 @@ ul.comments .comment-meta time { ...@@ -976,7 +1016,6 @@ ul.comments .comment-meta time {
.logo-line-after, .logo-line-after,
.menu, .menu,
.site-search, .site-search,
.sidebar-toggle,
.back-to-top { .back-to-top {
display: none; display: none;
} }
...@@ -995,17 +1034,8 @@ ul.comments .comment-meta time { ...@@ -995,17 +1034,8 @@ ul.comments .comment-meta time {
display: none; display: none;
} }
.header .wrapper {
padding: 0 10px;
}
.logo-wrap .site-title {
margin-left: 10px;
}
.wrapper { .wrapper {
width: auto; min-width: inherit;
margin: 0 10px;
} }
.btn-bar { .btn-bar {
...@@ -1032,6 +1062,12 @@ ul.comments .comment-meta time { ...@@ -1032,6 +1062,12 @@ ul.comments .comment-meta time {
.footer { .footer {
text-align: center; text-align: center;
font-size: 12px;
padding: 10px 0;
}
.footer .fn-right {
float: none;
} }
} }
/* end responsive */ /* end responsive */
\ No newline at end of file
src/main/webapp/skins/next/footer.ftl
View file @ fb8bcf9e
<footer class="footer"> <footer class="footer">
<div class="wrapper"> <div class="wrapper fn-clear">
<a href="${servePath}">${blogTitle}</a> • <a href="${servePath}">${blogTitle}</a> •
${onlineVisitor1Label}${onlineVisitorCnt} <br/> ${onlineVisitor1Label}${onlineVisitorCnt} <br/>
&copy; ${year} &copy; ${year}
...@@ -39,7 +39,9 @@ ...@@ -39,7 +39,9 @@
"em11Label": "${em11Label}", "em11Label": "${em11Label}",
"em12Label": "${em12Label}", "em12Label": "${em12Label}",
"em13Label": "${em13Label}", "em13Label": "${em13Label}",
"em14Label": "${em14Label}" "em14Label": "${em14Label}",
"tocLabel": "${tocLabel}",
"siteViewLabel": "${siteViewLabel}"
}; };
</script> </script>
${plugins} ${plugins}
src/main/webapp/skins/next/js/next.js
View file @ fb8bcf9e
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* @fileoverview util and every page should be used. * @fileoverview util and every page should be used.
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.1.1.0, Jul 30, 2016 * @version 0.2.1.0, Sep 6, 2016
*/ */
/** /**
...@@ -37,6 +37,7 @@ var NexT = { ...@@ -37,6 +37,7 @@ var NexT = {
$sidebar.animate({ $sidebar.animate({
right: -320 right: -320
}); });
$sidebar.find('section').css('opacity', 0);
} else { } else {
$(this).addClass('sidebar-active'); $(this).addClass('sidebar-active');
$('body').animate({ $('body').animate({
...@@ -44,6 +45,10 @@ var NexT = { ...@@ -44,6 +45,10 @@ var NexT = {
}); });
$sidebar.animate({ $sidebar.animate({
right: 0 right: 0
}, function () {
$sidebar.find('section:first').animate({
'opacity': 1
});
}); });
} }
}); });
...@@ -54,6 +59,7 @@ var NexT = { ...@@ -54,6 +59,7 @@ var NexT = {
$(document).ready(function () { $(document).ready(function () {
setTimeout(function () { setTimeout(function () {
// logo animate
$('.logo-wrap').css('opacity', 1); $('.logo-wrap').css('opacity', 1);
$('.logo-line-before i').animate({ $('.logo-line-before i').animate({
'left': '0' 'left': '0'
...@@ -66,6 +72,11 @@ var NexT = { ...@@ -66,6 +72,11 @@ var NexT = {
}); });
$('.main').css('opacity', 1).animate({ $('.main').css('opacity', 1).animate({
'top': '0' 'top': '0'
}, function () {
// 当有文章页面有目录时，回调不放这里，侧边栏就会一片空白
if ($('.b3-solo-list li').length > 0 && $(window).width() > 1000) {
$('.sidebar-toggle').click();
}
}); });
}); });
...@@ -79,9 +90,44 @@ var NexT = { ...@@ -79,9 +90,44 @@ var NexT = {
}); });
}, },
initArticle: function () { initArticle: function () {
if ($('.b3-solo-list li').length > 0 && $(window).width() > 700) { if ($('.b3-solo-list li').length > 0 && $(window).width() > 1000) {
$('.sidebar').html($('.b3-solo-list')); // add color to sidebar menu
$('.sidebar-toggle').click(); $('.sidebar-toggle').addClass('has-toc');
// append toc to sidebar menu
var articleTocHTML = '<ul><li class="current" data-tab="toc">' + Label.tocLabel + '</li><li data-tab="site">' + Label.siteViewLabel + '</li></ul><section></section>';
$('.sidebar').prepend(articleTocHTML);
var $sectionF = $('.sidebar section:first').html($('.b3-solo-list')),
$sectionL = $('.sidebar section:last');
// 切换 tab
$('.sidebar > ul > li').click(function () {
if ($(this).data('tab') === 'toc') {
$sectionL.animate({
"opacity": '0',
"top": '-50px'
}, 300, function () {
$sectionF.show().css('top', '-50px');
$sectionF.animate({
"opacity": '1',
"top": '0'
}, 300);
});
} else {
$sectionF.animate({
"opacity": '0',
"top": '-50px'
}, 300, function () {
$sectionF.hide().css('top', '-50px');
$sectionL.animate({
"opacity": '1',
"top": '0'
}, 300);
});
}
$('.sidebar > ul > li').removeClass('current');
$(this).addClass('current');
});
} }
} }
}; };
......
src/main/webapp/skins/next/js/next.min.js
View file @ fb8bcf9e
var NexT={init:function(){$(".sidebar-toggle").click(function(){var i=$(".sidebar");$(this).hasClass("sidebar-active")?($(this).removeClass("sidebar-active"),$("body").animate({"padding-right":0}),i.animate({right:-320})):($(this).addClass("sidebar-active"),$("body").animate({"padding-right":320}),i.animate({right:0}))}),$(".site-nav-toggle").click(function(){$(".site-nav").slideToggle()}),$(document).ready(function(){setTimeout(function(){$(".logo-wrap").css("opacity",1),$(".logo-line-before i").animate({left:"0"},function(){$(".site-title").css("opacity",1).animate({top:0},function(){$(".menu").css("opacity",1).animate({"margin-top":"15px"}),$(".main").css("opacity",1).animate({top:"0"})})}),$(".logo-line-after i").animate({right:"0"})},500)})},initArticle:function(){$(".b3-solo-list li").length>0&&$(window).width()>700&&($(".sidebar").html($(".b3-solo-list")),$(".sidebar-toggle").click())}};NexT.init(); /*
\ No newline at end of file * Copyright (c) 2010-2016, b3log.org & hacpai.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
var NexT={init:function(){$(".sidebar-toggle").click(function(){var i=$(".sidebar");$(this).hasClass("sidebar-active")?($(this).removeClass("sidebar-active"),$("body").animate({"padding-right":0}),i.animate({right:-320}),i.find("section").css("opacity",0)):($(this).addClass("sidebar-active"),$("body").animate({"padding-right":320}),i.animate({right:0},function(){i.find("section:first").animate({opacity:1})}))}),$(".site-nav-toggle").click(function(){$(".site-nav").slideToggle()}),$(document).ready(function(){setTimeout(function(){$(".logo-wrap").css("opacity",1),$(".logo-line-before i").animate({left:"0"},function(){$(".site-title").css("opacity",1).animate({top:0},function(){$(".menu").css("opacity",1).animate({"margin-top":"15px"}),$(".main").css("opacity",1).animate({top:"0"},function(){$(".b3-solo-list li").length>0&&$(window).width()>1e3&&$(".sidebar-toggle").click()})})}),$(".logo-line-after i").animate({right:"0"})},500)})},initArticle:function(){if($(".b3-solo-list li").length>0&&$(window).width()>1e3){$(".sidebar-toggle").addClass("has-toc");var i='<ul><li class="current" data-tab="toc">'+Label.tocLabel+'</li><li data-tab="site">'+Label.siteViewLabel+"</li></ul><section></section>";$(".sidebar").prepend(i);var t=$(".sidebar section:first").html($(".b3-solo-list")),a=$(".sidebar section:last");$(".sidebar > ul > li").click(function(){"toc"===$(this).data("tab")?a.animate({opacity:"0",top:"-50px"},300,function(){t.show().css("top","-50px"),t.animate({opacity:"1",top:"0"},300)}):t.animate({opacity:"0",top:"-50px"},300,function(){t.hide().css("top","-50px"),a.animate({opacity:"1",top:"0"},300)}),$(".sidebar > ul > li").removeClass("current"),$(this).addClass("current")})}}};NexT.init();
\ No newline at end of file
src/main/webapp/skins/next/lang/lang_en_US.properties
View file @ fb8bcf9e
...@@ -16,11 +16,13 @@ ...@@ -16,11 +16,13 @@
# #
# Description: B3log Solo language configurations(en_US). # Description: B3log Solo language configurations(en_US).
# Version: 1.0.1.2, Sep 4, 2015 # Version: 1.1.1.2, Sep 6, 2016
# Author: Liyuan Li # Author: Liyuan Li
# Author: Liang Ding # Author: Liang Ding
# #
tocLabel=\u6587\u7ae0\u76ee\u5f55
siteViewLabel=\u7ad9\u70b9\u6982\u89c8
viewsLabel=Heat viewsLabel=Heat
cmtLabel=Comments cmtLabel=Comments
postTimeLabel=Post At postTimeLabel=Post At
......
src/main/webapp/skins/next/lang/lang_zh_CN.properties
View file @ fb8bcf9e
...@@ -16,10 +16,12 @@ ...@@ -16,10 +16,12 @@
# #
# Description: B3log Solo default language configurations(zh_CN). # Description: B3log Solo default language configurations(zh_CN).
# Version: 1.0.0.1, Jul 30, 2016 # Version: 1.1.1.2, Sep 6, 2016
# Author: Liyuan Li # Author: Liyuan Li
# #
tocLabel=\u6587\u7ae0\u76ee\u5f55
siteViewLabel=\u7ad9\u70b9\u6982\u89c8
viewsLabel=\u70ed\u5ea6 viewsLabel=\u70ed\u5ea6
cmtLabel=\u6761\u8bc4\u8bba cmtLabel=\u6761\u8bc4\u8bba
postTimeLabel=\u53d1\u8868\u4e8e postTimeLabel=\u53d1\u8868\u4e8e
......
Markdown is supported
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