Skip to content

S
solo-1
Commit 766ebac8 authored by Liang Ding's avatar Liang Ding
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/2.1.0-dev'

parents 9909b1c1 a91bcdf5
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 143 deletions
README.md
View file @ 766ebac8
......@@ -82,8 +82,8 @@ JDK 环境准备好之后[下载](http://pan.baidu.com/share/link?shareid=541735
## 文档
* [用户指南](https://hacpai.com/article/1492881378588)：安装、配置、备份以及常见问题
* [开发指南](https://github.com/b3log/solo/wiki/Pre_dev)：开发环境、项目结构、框架说明
* [皮肤开发](https://github.com/b3log/solo/wiki/Develop_steps)：开发步骤、模版变量
* [开发指南](https://hacpai.com/article/1493822943172)：开发环境、项目结构、框架说明
* [皮肤开发](https://hacpai.com/article/1493814851007)：开发步骤、模版变量
* [插件开发](https://docs.google.com/document/pub?id=15H7Q3EBo-44v61Xp_epiYY7vK_gPJLkQaT7T1gkE64w&pli=1)：插件机制、处理流程
## 版本历史
......@@ -122,7 +122,6 @@ Solo 的诞生离不开以下开源项目：
* [H2](https://github.com/h2database/h2database)：Java SQL 数据库
* [Jetty](https://github.com/eclipse/jetty.project)：轻量级的 Java Web 容器
* [Latke](https://github.com/b3log/latke)：简洁高效的 Java Web 框架
* [NetBeans](https://netbeans.org)：全宇宙暂时排名第三的 IDE
* [IntelliJ IDEA](https://www.jetbrains.com/idea)：全宇宙暂时排名第二的 IDE
----
......
src/main/java/org/b3log/solo/Starter.java
View file @ 766ebac8
......@@ -39,7 +39,7 @@ import java.net.URI;
* </ul>
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.0.7, Dec 23, 2015
* @version 1.1.0.8, May 4, 2017
* @since 1.2.0
*/
public final class Starter {
......@@ -142,7 +142,7 @@ public final class Starter {
}
Latkes.setScanPath("org.b3log.solo"); // For Latke IoC
logger.info("Standalone mode, see [https://github.com/b3log/solo/wiki/standalone_mode] for more details.");
logger.info("Standalone mode, see [https://github.com/b3log/solo/issues/12037] for more details.");
Latkes.initRuntimeEnv();
String webappDirLocation = "src/main/webapp/"; // POM structure in dev env
......
src/main/resources/lang_en_US.properties
View file @ 766ebac8
......@@ -16,12 +16,13 @@
#
# Description: Solo language configurations(en_US).
# Version: 2.12.4.20, Apr 25, 2017
# Version: 2.13.4.20, May 3, 2017
# Author: Liang Ding
# Author: Liyuan Li
# Author: Dongxu Wang
#
sponsorLabel=Become a Sponsor
addBoldLabel=Add bold text
addItalicLabel=Add italic text
insertQuoteLabel=Insert a quote
......@@ -52,8 +53,6 @@ secretKey1Label=Secret Key:
domain1Label=Domain:
bucket1Label=Bucket:
qiniuLabel=Qiniu
contributorsLabel=Contributors
developersLabel=Developers
staticErrorLabel=<h1>Latke Configuraton Error</h1>\
<br>Please visit <a target='_blank' href='https://hacpai.com/article/1474087427032'>Latke \u914D\u7F6E\u5256\u6790</a> to solve it.
markdownHelpLabel=<dl><dt>Headings</dt><dd> # First-level heading</dd><dd> #### Fourth-level heading</dd></dl>\
......@@ -86,11 +85,9 @@ checkingVersionLabel=Checking for updates....
upToDateLabel=Your Solo is up to date ;-)
outOfDateLabel=Your Solo is out of date ;-(, download the latest version:
aboutLabel=About
aboutContentLabel=<p><a href="https://github.com/b3log/solo" target="_blank">Solo</a> \
aboutContentLabel=<p><a href="https://hacpai.com/tag/Solo" target="_blank">Solo</a> \
is an open source (<a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache License 2.0</a>) blogging program, which can run on a standard Servlet container.</p>\
<p><a href="http://b3log.org" target="_blank">B3log</a> advocates the rights of equality, freedom and passion, and we are trying to create a bran-new experience about individual blogging + community. Sound interesting? <a href="https://github.com/b3log/solo/wiki/Join_us" target="_blank">Join us</a>!</p>\
<a target="blank" href="http://b3log.org/donate.html">\
<div class="ico-alipay-me" alt="Alipay B3log" title="\u901A\u8FC7\u652F\u4ED8\u5B9D\u8FDB\u884C\u6350\u8D60"></div></a>
<p><a href="http://b3log.org" target="_blank">B3log</a> advocates the rights of equality, freedom and passion, and we are trying to create a bran-new experience about individual blogging + <a href="https://hacpai.com" target="_blank">community</a>. Sound interesting? <a href="https://hacpai.com/article/1463025124998" target="_blank">Join us</a>!</p>
confirmLabel=Confirm
adminConsoleLabel=Admin
adminIndexLabel=Admin Index
......
src/main/resources/lang_zh_CN.properties
View file @ 766ebac8
......@@ -16,12 +16,13 @@
#
# Description: Solo default language configurations(zh_CN).
# Version: 2.12.4.20, Apr 25, 2017
# Version: 2.13.4.20, May 3, 2017
# Author: Liang Ding
# Author: Liyuan Li
# Author: Dongxu Wang
#
sponsorLabel=\u6210\u4E3A\u8D5E\u52A9\u8005
addBoldLabel=\u6DFB\u52A0\u7C97\u4F53
addItalicLabel=\u6DFB\u52A0\u659C\u4F53
insertQuoteLabel=\u63D2\u5165\u5F15\u7528
......@@ -52,8 +53,6 @@ secretKey1Label=Secret Key\uFF1A
domain1Label=\u57DF\u540D\uFF1A
bucket1Label=Bucket\uFF1A
qiniuLabel=\u4E03\u725B
contributorsLabel=\u8D21\u732E\u8005
developersLabel=\u5F00\u53D1\u8005
staticErrorLabel=<h1><a href='https://hacpai.com/tag/Latke' target='_blank'>Latke</a> \u914D\u7F6E\u9519\u8BEF</h1>\
<br>\u8BF7\u6D4F\u89C8 <a target='_blank' href='https://hacpai.com/article/1474087427032'>Latke \u914D\u7F6E\u5256\u6790</a> \u4EE5\u89E3\u51B3\u8BE5\u95EE\u9898\u3002
markdownHelpLabel=<dl><dt>\u6807\u9898</dt><dd> # \u4E00\u7EA7\u6807\u9898</dd><dd> #### \u56DB\u7EA7\u6807\u9898</dd></dl>\
......@@ -86,11 +85,9 @@ checkingVersionLabel=\u6B63\u5728\u68C0\u67E5\u7248\u672C\u66F4\u65B0....
upToDateLabel=\u60A8\u6B63\u5728\u4F7F\u7528\u6700\u65B0\u7684 Solo ;-)
outOfDateLabel=\u60A8\u7684 Solo \u8FC7\u65F6\u4E86 ;-(\uFF0C\u8BF7\u4E0B\u8F7D\u6700\u65B0\u7248\u672C\uFF1A
aboutLabel=\u5173\u4E8E
aboutContentLabel=<p><a href="https://github.com/b3log/solo" target="_blank">Solo</a> \
aboutContentLabel=<p><a href="https://hacpai.com/tag/Solo" target="_blank">Solo</a> \
\u662F\u4E00\u6B3E\u5F00\u6E90\uFF08<a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache License 2.0</a>\uFF09\u7684\u535A\u5BA2\u7A0B\u5E8F\uFF0C\u4E0D\u4EC5\u53EF\u4EE5\u5728\u591A\u79CD\u4E91\u5E73\u53F0\u4E0A\u8FD0\u884C\uFF0C\u4E5F\u53EF\u4EE5\u5728\u6807\u51C6 Servlet \u5BB9\u5668\u4E0A\u8FD0\u884C\u3002</p>\
<p><a href="http://b3log.org" target="_blank">B3log</a> \u63D0\u5021\u5E73\u7B49\u3001\u81EA\u7531\u3001\u5954\u653E\uFF0C\u5E76\u6B63\u5728\u5C1D\u8BD5\u6784\u5EFA\u4E2A\u4EBA\u535A\u5BA2+\u8BBA\u575B\u7684\u4E92\u52A8\u4F53\u9A8C\u3002\u5982\u679C\u60A8\u6709\u5174\u8DA3\uFF0C<a href="https://github.com/b3log/solo/wiki/Join_us" target="_blank">\u52A0\u5165\u6211\u4EEC</a>\u5427\uFF01\
</p><a target="blank" href="http://b3log.org/donate.html">\
<div class="ico-alipay-me" alt="Alipay B3log" title="\u901A\u8FC7\u652F\u4ED8\u5B9D\u8FDB\u884C\u6350\u8D60"></div></a>
<p><a href="http://b3log.org" target="_blank">B3log</a> \u63D0\u5021\u5E73\u7B49\u3001\u81EA\u7531\u3001\u5954\u653E\uFF0C\u5E76\u6B63\u5728\u5C1D\u8BD5\u6784\u5EFA\u4E2A\u4EBA\u535A\u5BA2+<a href="https://hacpai.com" target="_blank">\u8BBA\u575B</a>\u7684\u4E92\u52A8\u4F53\u9A8C\u3002\u5982\u679C\u60A8\u6709\u5174\u8DA3\uFF0C<a href="https://hacpai.com/article/1463025124998" target="_blank">\u52A0\u5165\u6211\u4EEC</a>\u5427\uFF01</p>
confirmLabel=\u786E\u5B9A
adminConsoleLabel=\u540E\u53F0\u7BA1\u7406
adminIndexLabel=\u540E\u53F0\u9996\u9875
......
src/main/webapp/README.txt deleted 100644 → 0
View file @ 9909b1c1
A Java blogging system, feel free to create your or your team own blog.
Project home: https://github.com/b3log/solo
Request features/Report bugs: https://github.com/b3log/solo/issues/new
* QQ Qun: 13139268
* User Guide: https://github.com/b3log/solo/wiki/Pre_installation
* Dev Guide: https://github.com/b3log/solo/wiki/Pre_dev
* Skin Dev Guide: https://github.com/b3log/solo/wiki/Develop_steps
* Plugin Dev Guide: https://docs.google.com/document/pub?id=15H7Q3EBo-44v61Xp_epiYY7vK_gPJLkQaT7T1gkE64w&pli=1
====
B3log Index: http://b3log.org
B3log Team: https://github.com/b3log/solo/wiki/About_us
Join B3log Team: https://github.com/b3log/solo/wiki/Join_us
====
平等，自由，奔放
Equality, Freedom, Passion
;-)
src/main/webapp/WEB-INF/static-resources.xml
View file @ 766ebac8
......@@ -99,7 +99,6 @@
<include path="/plugins/**/*.htm"/>
<include path="/CHANGE_LOGS.html"/>
<include path="/README.txt"/>
<include path="/LICENSE.txt"/>
</static-files>
src/main/webapp/admin-about.ftl
View file @ 766ebac8
<style>
.about-developer .developer-title{
float: left;
width: 300px;
margin-left: 12px;
}
.about-developer .contributor-title{
margin-left: 18px;
float: left;
width: 300px;
margin-left: 12px;
}
.about-developer .developer-body{
float: left;
width: 300px;
}
.about-developer .contributor-body{
margin-left: 18px;
float: left;
width: 300px;
}
.about-developer .about-body ul{
width: 230px;
}
.about-developer .about-body ul li{
width: 100px;
float: left;
display: block;
}
</style>
<div class="module-panel">
<div class="module-header">
<h2>${aboutLabel}</h2>
......@@ -39,49 +8,18 @@
<img src="${staticServePath}/images/logo.png" alt="Solo" title="Solo" />
</a>
</div>
<div class="left" style="width: 73%">
<div class="left content-reset" style="width: 73%">
<div id="aboutLatest" class="about-margin">${checkingVersionLabel}</div>
${aboutContentLabel}
</div>
<span class="clear" />
</div>
<div class="module-body padding12 about-developer">
<div class="about-logo">
<!-- <a href="http://b3log.org" target="_blank">
<img src="${staticServePath}/images/developers.jpg" alt="Solo" title="Solo" />
</a>-->
<div style="width: 156px; height: 56px;"></div>
</div>
<div class="about-body">
<div class="left" style="width: 73%">
<div class="about-margin developer-title">${developersLabel}</div>
<div class="about-margin contributor-title">${contributorsLabel}</div>
</div>
<div class="left" style="width: 73%">
<div class="developer-body">
<ul>
<li><a target="_blank" href="http://88250.b3log.org">D</a></li>
<li><a target="_blank" href="http://vanessa.b3log.org">V</a></li>
<li><a target="_blank" href="mailto:wmainlove@gmail.com">mainlove</a></li>
<li><a target="_blank" href="http://people.apache.org/%7Edongxu">DX</a></li>
<li><a target="_blank" href="http://mizhichashao.com">大叔</a></li>
<li><a target="_blank" href="http://www.jiangzezhou.com">javen.jiang</a></li>
</ul>
</div>
<div class="contributor-body">
<ul>
<li><a target="_blank" href="http://www.ansen.org">An Shen</a></li>
<li><a target="_blank" href="http://www.bestck.net">Chevo</a></li>
<li><a target="_blank" href="https://github.com/paul-luo">破生</a></li>
<li><a target="_blank" href="http://xxk.b3log.org">宋诗献</a></li>
<li><a target="_blank" href="http://www.mynah.org">Lamb</a></li>
<li><a target="_blank" href="https://github.com/xiaomogui">大姨夫</a></li>
<ul class="about-list">
<li><a target="_blank" href="https://hacpai.com/article/1492881378588">用户指南</a></li>
<li><a target="_blank" href="https://hacpai.com/article/1493822943172">开发指南</a></li>
<li><a target="_blank" href="https://hacpai.com/article/1493814851007">皮肤开发指南</a></li>
</ul>
<button class="right" onclick="window.open('http://b3log.org/donate.html')">${sponsorLabel}</button>
</div>
</div>
</div>
<span class="clear" />
<br>
<span class="clear" /> <br/>
</div>
</div>
${plugins}
src/main/webapp/css/default-admin.css
View file @ 766ebac8
......@@ -17,7 +17,7 @@
* admin style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 2.2.7.4, Apr 25, 2017
* @version 2.3.7.4, May 5, 2017
*/
/* start resset */
......@@ -999,12 +999,13 @@ button#submitArticle:hover,
margin: 20px 0;
}
.ico-alipay-me {
background-image: url("../images/alipay-me.png");
font-size: 20px;
height: 24px;
margin: 20px 0;
width: 126px;
.content-reset .about-list li {
border: 0;
}
.content-reset .about-list li:hover {
background-color: #fff;
text-decoration: underline;
}
/* end about */
......
src/test/resources/README.txt deleted 100644 → 0
View file @ 9909b1c1
A Java blogging system, feel free to create your or your team own blog.
Project home: https://github.com/b3log/solo
Request features/Report bugs: https://github.com/b3log/solo/issues/new
* QQ Qun: 13139268
* User Guide: https://github.com/b3log/solo/wiki/Pre_installation
* Dev Guide: https://github.com/b3log/solo/wiki/Pre_dev
* Skin Dev Guide: https://github.com/b3log/solo/wiki/Develop_steps
* Plugin Dev Guide: https://docs.google.com/document/pub?id=15H7Q3EBo-44v61Xp_epiYY7vK_gPJLkQaT7T1gkE64w&pli=1
====
B3log Index: http://b3log.org
B3log Team: https://github.com/b3log/solo/wiki/About_us
Join B3log Team: https://github.com/b3log/solo/wiki/Join_us
====
平等，自由，奔放
Equality, Freedom, Passion
;-)
src/test/resources/WEB-INF/static-resources.xml
View file @ 766ebac8
......@@ -95,7 +95,6 @@
<include path="/plugins/**/*.htm" />
<include path="/CHANGE_LOGS.html" />
<include path="/README.txt" />
<include path="/LICENSE.txt" />
</static-files>
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