Skip to content

S
solo
Commit fc807440 authored by D's avatar D Committed by GitHub
Browse files
Options

Merge pull request #12151 from b3log/1.6.0 

1.6.0
parents 39beb5ba 22347e08
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 387 additions and 3133 deletions
pom.xml
View file @ fc807440
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: Solo POM. Description: Solo POM.
Version: 3.12.1.25, Aug 10, 2016 Version: 3.13.1.25, Aug 19, 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>
--> -->
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<jsoup.version>1.9.1</jsoup.version> <jsoup.version>1.9.1</jsoup.version>
<pegdown.version>1.6.0</pegdown.version> <pegdown.version>1.6.0</pegdown.version>
<qiniu.version>7.0.4.1</qiniu.version> <qiniu.version>7.0.4.1</qiniu.version>
<jetty.version>9.2.13.v20150730</jetty.version> <jetty.version>9.2.7.v20150116</jetty.version>
<commons-cli.version>1.3.1</commons-cli.version> <commons-cli.version>1.3.1</commons-cli.version>
<emoji-java.version>3.0.0</emoji-java.version> <emoji-java.version>3.0.0</emoji-java.version>
<jodd.version>3.6.6</jodd.version> <jodd.version>3.6.6</jodd.version>
...@@ -376,28 +376,20 @@ ...@@ -376,28 +376,20 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.mortbay.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>8.1.14.v20131031</version> <version>${jetty.version}</version>
<configuration> <configuration>
<connectors> <httpConnector>
<connector implementation="org.eclipse.jetty.server.bio.SocketConnector"> <port>8080</port>
<port>8080</port> </httpConnector>
</connector>
</connectors>
<stopKey>stop</stopKey> <stopKey>stop</stopKey>
<stopPort>4502</stopPort> <stopPort>4501</stopPort>
<webAppConfig>
<systemProperties> <contextPath>/</contextPath>
<systemProperty> </webAppConfig>
<name>org.eclipse.jetty.server.Request.maxFormContentSize</name> <scanIntervalSeconds>1</scanIntervalSeconds>
<value>10485760</value>
</systemProperty>
</systemProperties>
<reload>manual</reload>
</configuration> </configuration>
</plugin> </plugin>
......
src/main/webapp/admin-article.ftl
View file @ fc807440
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
</div> </div>
<div> <div>
<label>${content1Label}</label> <label>${content1Label}</label>
</div>
<div>
<textarea id="articleContent" name="articleContent" <textarea id="articleContent" name="articleContent"
style="height: 500px;width:100%;"></textarea> style="height: 500px;width:100%;"></textarea>
</div> </div>
...@@ -22,8 +20,6 @@ ...@@ -22,8 +20,6 @@
</div> </div>
<div> <div>
<label>${abstract1Label}</label> <label>${abstract1Label}</label>
</div>
<div>
<textarea id="abstract" style="height: 200px;width: 100%;" name="abstract"></textarea> <textarea id="abstract" style="height: 200px;width: 100%;" name="abstract"></textarea>
</div> </div>
<div> <div>
...@@ -40,7 +36,7 @@ ...@@ -40,7 +36,7 @@
<div> <div>
<span class="signs"> <span class="signs">
<label>${sign1Label}</label> <label>${sign1Label}</label>
<button style="margin-left: 0px;" id="articleSign1">${signLabel} 1</button> <button style="margin-left: 0px;" id="articleSign1" class="selected">${signLabel} 1</button>
<button id="articleSign2">${signLabel} 2</button> <button id="articleSign2">${signLabel} 2</button>
<button id="articleSign3">${signLabel} 3</button> <button id="articleSign3">${signLabel} 3</button>
<button id="articleSign0">${noSignLabel}</button> <button id="articleSign0">${noSignLabel}</button>
......
src/main/webapp/admin-index.ftl
View file @ fc807440
...@@ -19,9 +19,8 @@ ...@@ -19,9 +19,8 @@
</a> </a>
<span class="right"> <span class="right">
<span>${userName}</span><a href="${servePath}" title='${indexLabel}'>${indexLabel}</a><a href='javascript:admin.logout();' title='${logoutLabel}'>${logoutLabel}</a> <a href="${servePath}" title='${indexLabel}'>${indexLabel}</a><a href='javascript:admin.logout();' title='${logoutLabel}'>${logoutLabel}</a>
</span> </span>
<div class="clear"></div>
</div> </div>
<div id="tabs"> <div id="tabs">
<ul> <ul>
...@@ -33,7 +32,7 @@ ...@@ -33,7 +32,7 @@
</div> </div>
</li> </li>
<li> <li>
<div onclick="admin.collapseNav(this)"> <div id="tabArticleTitle" class="tab-current" onclick="admin.collapseNav(this)">
<span class="left postIcon"></span> <span class="left postIcon"></span>
${articleLabel} ${articleLabel}
<span class="ico-arrow-up"></span> <span class="ico-arrow-up"></span>
...@@ -125,6 +124,7 @@ ...@@ -125,6 +124,7 @@
<div id="tabsPanel_plugin-list" class="none"></div> <div id="tabsPanel_plugin-list" class="none"></div>
<div id="tabsPanel_about" class="none"></div> <div id="tabsPanel_about" class="none"></div>
</div> </div>
<div class="clear"></div>
<div class="footer"> <div class="footer">
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version} Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version}
</div> </div>
......
src/main/webapp/admin-link-list.ftl
View file @ fc807440
<div id="linkTable"></div> <div>
<div id="linkPagination" class="margin12 right"></div> <div id="linkTable"></div>
<div id="linkPagination" class="margin12 right"></div>
</div>
<div class="clear"></div> <div class="clear"></div>
<table class="form" width="100%" cellpadding="0px" cellspacing="9px"> <table class="form" width="100%" cellpadding="0px" cellspacing="9px">
<thead> <thead>
......
src/main/webapp/admin-preference.ftl
View file @ fc807440
<div id="tabPreference" class="sub-tabs"> <div id="tabPreference" class="sub-tabs fn-clear">
<ul> <ul>
<li> <li>
<div id="tabPreference_config"> <div id="tabPreference_config">
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</div> </div>
<div id="tabPreferencePanel" class="sub-tabs-main"> <div id="tabPreferencePanel" class="sub-tabs-main">
<div id="tabPreferencePanel_config"> <div id="tabPreferencePanel_config">
<table class="form" width="98%" cellpadding="0" cellspacing="9px"> <table class="form" width="100%" cellpadding="0" cellspacing="9px">
<tbody> <tbody>
<tr> <tr>
<td colspan="2" align="right"> <td colspan="2" align="right">
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</table> </table>
</div> </div>
<div id="tabPreferencePanel_solo" class="none"> <div id="tabPreferencePanel_solo" class="none">
<table class="form" width="98%" cellpadding="0" cellspacing="9px"> <table class="form" width="100%" cellpadding="0" cellspacing="9px">
<tbody> <tbody>
<tr> <tr>
<th width="80px"> <th width="80px">
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
</table> </table>
</div> </div>
<div id="tabPreferencePanel_setting" class="none"> <div id="tabPreferencePanel_setting" class="none">
<table class="form" width="98%" cellpadding="0" cellspacing="9px"> <table class="form" width="100%" cellpadding="0" cellspacing="9px">
<tbody> <tbody>
<tr> <tr>
<td colspan="2" align="right"> <td colspan="2" align="right">
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="tabPreferencePanel_signs" class="none"> <div id="tabPreferencePanel_signs" class="none">
<table class="form" width="98%" cellpadding="0" cellspacing="9px"> <table class="form" width="100%" cellpadding="0" cellspacing="9px">
<tbody> <tbody>
<tr> <tr>
<th colspan="2"> <th colspan="2">
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
</table> </table>
</div> </div>
<div id="tabPreferencePanel_qiniu" class="none"> <div id="tabPreferencePanel_qiniu" class="none">
<table class="form" width="98%" cellpadding="0" cellspacing="9px"> <table class="form" width="100%" cellpadding="0" cellspacing="9px">
<tbody> <tbody>
<tr> <tr>
<th colspan="2"> <th colspan="2">
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
</th> </th>
</tr> </tr>
<tr> <tr>
<th> <th width="120">
<label for="qiniuAccessKey">${accessKey1Label}</label> <label for="qiniuAccessKey">${accessKey1Label}</label>
</th> </th>
<td> <td>
......
src/main/webapp/admin-user-list.ftl
View file @ fc807440
<div id="userTable"></div> <div>
<div id="userPagination" class="margin12 right"></div> <div id="userTable"></div>
<div id="userPagination" class="margin12 right"></div>
</div>
<div class="clear"></div> <div class="clear"></div>
<table class="form" width="100%" cellpadding="0px" cellspacing="9px"> <table class="form" width="100%" cellpadding="0px" cellspacing="9px">
<thead> <thead>
......
src/main/webapp/css/default-admin.css
View file @ fc807440
This diff is collapsed.
src/main/webapp/css/default-base.css
View file @ fc807440
...@@ -138,6 +138,16 @@ button:hover,.button:hover { ...@@ -138,6 +138,16 @@ button:hover,.button:hover {
overflow: hidden; overflow: hidden;
} }
.fn-clear:before,
.fn-clear:after {
display: table;
content: "";
}
.fn-clear:after {
clear: both;
}
.none { .none {
display: none; display: none;
} }
......
src/main/webapp/js/admin/admin.js
View file @ fc807440
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.0.2.2, May 28, 2013 * @version 1.0.2.2, May 28, 2013
*/ */
var Admin = function() { var Admin = function () {
this.register = {}; this.register = {};
// 工具栏下的工具 // 工具栏下的工具
this.tools = ['#page-list', '#file-list', '#link-list', '#preference', this.tools = ['#page-list', '#file-list', '#link-list', '#preference',
...@@ -33,13 +33,13 @@ $.extend(Admin.prototype, { ...@@ -33,13 +33,13 @@ $.extend(Admin.prototype, {
/** /**
* @description 登出 * @description 登出
*/ */
logout: function() { logout: function () {
window.location.href = latkeConfig.servePath + "/logout?goto=" + latkeConfig.servePath; window.location.href = latkeConfig.servePath + "/logout?goto=" + latkeConfig.servePath;
}, },
/** /**
* @description 清除提示 * @description 清除提示
*/ */
clearTip: function() { clearTip: function () {
$("#tipMsg").text(""); $("#tipMsg").text("");
$("#loadMsg").text(""); $("#loadMsg").text("");
}, },
...@@ -47,7 +47,7 @@ $.extend(Admin.prototype, { ...@@ -47,7 +47,7 @@ $.extend(Admin.prototype, {
* @description 根据当前页数设置 hash * @description 根据当前页数设置 hash
* @param {Int} currentPage 当前页 * @param {Int} currentPage 当前页
*/ */
setHashByPage: function(currentPage) { setHashByPage: function (currentPage) {
var hash = window.location.hash, var hash = window.location.hash,
hashList = hash.split("/"); hashList = hash.split("/");
if (/^\d*$/.test(hashList[hashList.length - 1])) { if (/^\d*$/.test(hashList[hashList.length - 1])) {
...@@ -61,13 +61,13 @@ $.extend(Admin.prototype, { ...@@ -61,13 +61,13 @@ $.extend(Admin.prototype, {
* @description 设置某个 tab 被选择 * @description 设置某个 tab 被选择
* @param {Stirng} id id tab id * @param {Stirng} id id tab id
*/ */
selectTab: function(id) { selectTab: function (id) {
window.location.hash = "#" + id; window.location.hash = "#" + id;
}, },
/** /**
* @description 根据当前 hash 解析出当前页数及 hash 数组。 * @description 根据当前 hash 解析出当前页数及 hash 数组。
*/ */
analyseHash: function() { analyseHash: function () {
var hash = window.location.hash; var hash = window.location.hash;
var tag = hash.substr(1, hash.length - 1); var tag = hash.substr(1, hash.length - 1);
var tagList = tag.split("/"); var tagList = tag.split("/");
...@@ -86,7 +86,8 @@ $.extend(Admin.prototype, { ...@@ -86,7 +86,8 @@ $.extend(Admin.prototype, {
/** /**
* @description 根据当前 hash 设置当前 tab * @description 根据当前 hash 设置当前 tab
*/ */
setCurByHash: function() { setCurByHash: function () {
$(window).scrollTop(0);
$("#tipMsg").text(""); $("#tipMsg").text("");
var tags = admin.analyseHash(); var tags = admin.analyseHash();
var tab = tags.hashList[1], var tab = tags.hashList[1],
...@@ -103,7 +104,7 @@ $.extend(Admin.prototype, { ...@@ -103,7 +104,7 @@ $.extend(Admin.prototype, {
if (tab !== "article") { if (tab !== "article") {
admin.article.clearDraftTimer(); admin.article.clearDraftTimer();
} else if (tab === "article") { } else if (tab === "article") {
admin.article.autoSaveDraftTimer = setInterval(function() { admin.article.autoSaveDraftTimer = setInterval(function () {
admin.article._autoSaveToDraft(); admin.article._autoSaveToDraft();
}, admin.article.AUTOSAVETIME); }, admin.article.AUTOSAVETIME);
} }
...@@ -157,7 +158,7 @@ $.extend(Admin.prototype, { ...@@ -157,7 +158,7 @@ $.extend(Admin.prototype, {
if ($("#tabsPanel_" + tab).length === 1) { if ($("#tabsPanel_" + tab).length === 1) {
if ($("#tabsPanel_" + tab).html().replace(/\s/g, "") === "") { if ($("#tabsPanel_" + tab).html().replace(/\s/g, "") === "") {
// 还未加载 HTML // 还未加载 HTML
$("#tabsPanel_" + tab).load("admin-" + tab + ".do", function() { $("#tabsPanel_" + tab).load("admin-" + tab + ".do", function () {
// 页面加载完后，回调初始函数 // 页面加载完后，回调初始函数
if (tab === "article" && admin.article.status.id) { if (tab === "article" && admin.article.status.id) {
// 当文章页面编辑器未初始化时，调用更新文章需先初始化编辑器 // 当文章页面编辑器未初始化时，调用更新文章需先初始化编辑器
...@@ -202,7 +203,7 @@ $.extend(Admin.prototype, { ...@@ -202,7 +203,7 @@ $.extend(Admin.prototype, {
/** /**
* @description 初始化整个后台 * @description 初始化整个后台
*/ */
init: function() { init: function () {
//window.onerror = Util.error; //window.onerror = Util.error;
Util.killIE(); Util.killIE();
...@@ -212,9 +213,9 @@ $.extend(Admin.prototype, { ...@@ -212,9 +213,9 @@ $.extend(Admin.prototype, {
$("#tabs").tabs(); $("#tabs").tabs();
// tipMsg // tipMsg
setInterval(function() { setInterval(function () {
if ($("#tipMsg").text() !== "") { if ($("#tipMsg").text() !== "") {
setTimeout(function() { setTimeout(function () {
$("#tipMsg").text(""); $("#tipMsg").text("");
}, 7000); }, 7000);
} }
...@@ -225,20 +226,25 @@ $.extend(Admin.prototype, { ...@@ -225,20 +226,25 @@ $.extend(Admin.prototype, {
* @description tools and article collapse * @description tools and article collapse
* @param {Bom} it 触发事件对象 * @param {Bom} it 触发事件对象
*/ */
collapseNav: function(it) { collapseNav: function (it) {
var subNav = $(it).next(); var subNav = $(it).next();
subNav.slideToggle("normal", function() { subNav.slideToggle("normal", function () {
if (this.style.display !== "none") { if (this.style.display !== "none") {
$(it).find(".ico-arrow-down")[0].className = "ico-arrow-up"; $(it).find(".ico-arrow-down")[0].className = "ico-arrow-up";
$(it).addClass('tab-current');
} else { } else {
$(it).find(".ico-arrow-up")[0].className = "ico-arrow-down"; $(it).find(".ico-arrow-up")[0].className = "ico-arrow-down";
$(it).removeClass('tab-current');
} }
$('#tabs > ul').height('auto');
$('#tabs > ul').height($('#tabs > ul').height() + 80);
}); });
}, },
/** /**
* @description 后台及当前页面所需插件初始化完后，对权限进行控制及当前页面属于 tools 时，tools 选项需展开。 * @description 后台及当前页面所需插件初始化完后，对权限进行控制及当前页面属于 tools 时，tools 选项需展开。
*/ */
inited: function() { inited: function () {
// Removes functions with the current user role // Removes functions with the current user role
if (Label.userRole !== "adminRole") { if (Label.userRole !== "adminRole") {
for (var i = 0; i < this.adTools.length; i++) { for (var i = 0; i < this.adTools.length; i++) {
......
src/main/webapp/js/admin/article.js
View file @ fc807440
...@@ -308,7 +308,7 @@ admin.article = { ...@@ -308,7 +308,7 @@ admin.article = {
} }
$("#tagCheckboxPanel>span").remove(""); $("#tagCheckboxPanel>span").remove("");
var spans = ""; var spans = "";
for (var i = 0; i < result.tags.length; i++) { for (var i = 0; i < result.tags.length; i++) {
spans += "<span>" + result.tags[i].tagTitle + "</span>"; spans += "<span>" + result.tags[i].tagTitle + "</span>";
...@@ -383,42 +383,11 @@ admin.article = { ...@@ -383,42 +383,11 @@ admin.article = {
*/ */
init: function (fun) { init: function (fun) {
this.currentEditorType = Label.editorType; this.currentEditorType = Label.editorType;
// Inits Signs.
$.ajax({
url: latkeConfig.servePath + "/console/signs/",
type: "GET",
cache: false,
success: function (result, textStatus) {
$("#tipMsg").text(result.msg);
if (!result.sc) {
$("#loadMsg").text("");
return;
}
$(".signs button").each(function (i) {
// Sets signs.
if (i === result.signs.length) {
$("#articleSign1").addClass("selected");
} else {
$("#articleSign" + result.signs[i].oId).tip({
content: result.signs[i].signHTML === "" ? Label.signIsNullLabel :
result.signs[i].signHTML.replace(/\n/g, "").replace(/<script.*<\/script>/ig, ""),
position: "top"
});
}
// Binds checkbox event.
$(this).click(function () {
if (this.className !== "selected") {
$(".signs button").each(function () {
this.className = "";
});
this.className = "selected";
}
});
});
$("#loadMsg").text(""); // Inits Signs.
} $(".signs button").click(function (i) {
$(".signs button").removeClass('selected');
$(this).addClass('selected');
}); });
// For tag auto-completion // For tag auto-completion
...@@ -459,8 +428,8 @@ admin.article = { ...@@ -459,8 +428,8 @@ admin.article = {
} else { } else {
admin.article.add(true); admin.article.add(true);
} }
}); }
);
$("#saveArticle").click(function () { $("#saveArticle").click(function () {
if (admin.article.status.id) { if (admin.article.status.id) {
admin.article.update(admin.article.status.isArticle); admin.article.update(admin.article.status.isArticle);
...@@ -478,26 +447,26 @@ admin.article = { ...@@ -478,26 +447,26 @@ admin.article = {
url: "http://upload.qiniu.com/", url: "http://upload.qiniu.com/",
add: function (e, data) { add: function (e, data) {
filename = data.files[0].name; filename = data.files[0].name;
data.submit(); data.submit();
}, },
formData: function (form) { formData: function (form) {
var data = form.serializeArray(); var data = form.serializeArray();
var ext = filename.substring(filename.lastIndexOf(".") + 1); var ext = filename.substring(filename.lastIndexOf(".") + 1);
data.push({name: 'key', value: getUUID() + "." + ext}); data.push({name: 'key', value: getUUID() + "." + ext});
data.push({name: 'token', value: qiniu.qiniuUploadToken}); data.push({name: 'token', value: qiniu.qiniuUploadToken});
return data; return data;
}, },
done: function (e, data) { done: function (e, data) {
var qiniuKey = data.result.key; var qiniuKey = data.result.key;
if (!qiniuKey) { if (!qiniuKey) {
alert("Upload error"); alert("Upload error");
return; return;
} }
$('#articleUpload').after('<div id="uploadContent">!<a target="_blank" href="http://' + qiniu.qiniuDomain + qiniuKey + '">[' + filename + ']</a>(http://' $('#articleUpload').after('<div id="uploadContent">!<a target="_blank" href="http://' + qiniu.qiniuDomain + qiniuKey + '">[' + filename + ']</a>(http://'
+ qiniu.qiniuDomain + qiniuKey + ')</div>'); + qiniu.qiniuDomain + qiniuKey + ')</div>');
}, },
...@@ -694,14 +663,15 @@ admin.register.article = { ...@@ -694,14 +663,15 @@ admin.register.article = {
function getUUID() { function getUUID() {
var d = new Date().getTime(); var d = new Date().getTime();
var ret = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { var ret = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
var r = (d + Math.random()*16)%16 | 0; var r = (d + Math.random() * 16) % 16 | 0;
d = Math.floor(d/16); d = Math.floor(d / 16);
return (c=='x' ? r : (r&0x3|0x8)).toString(16); return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
}); });
ret = ret.replace(new RegExp("-", 'g'), ""); ret = ret.replace(new RegExp("-", 'g'), "");
return ret; return ret;
}; }
;
src/main/webapp/js/admin/articleList.js
View file @ fc807440
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.5, May 28, 2013 * @version 1.0.2.5, Aug 23, 2016
*/ */
/* article-list 相关操作 */ /* article-list 相关操作 */
...@@ -82,7 +82,7 @@ admin.articleList = { ...@@ -82,7 +82,7 @@ admin.articleList = {
articleData = []; articleData = [];
for (var i = 0; i < articles.length; i++) { for (var i = 0; i < articles.length; i++) {
articleData[i] = {}; articleData[i] = {};
articleData[i].title = "<a href='" + latkeConfig.servePath + articles[i].articlePermalink + "' target='_blank' title='" + articles[i].articleTitle + "' class='no-underline'>" articleData[i].title = "<a href=\"" + latkeConfig.servePath + articles[i].articlePermalink + "\" target='_blank' title='" + articles[i].articleTitle + "' class='no-underline'>"
+ articles[i].articleTitle + "</a><span class='table-tag'>" + articles[i].articleTags + "</span>"; + articles[i].articleTitle + "</a><span class='table-tag'>" + articles[i].articleTags + "</span>";
articleData[i].date = $.bowknot.getDate(articles[i].articleCreateTime); articleData[i].date = $.bowknot.getDate(articles[i].articleCreateTime);
articleData[i].comments = articles[i].articleCommentCount; articleData[i].comments = articles[i].articleCommentCount;
......
src/main/webapp/js/admin/preference.js
View file @ fc807440
...@@ -99,10 +99,6 @@ admin.preference = { ...@@ -99,10 +99,6 @@ admin.preference = {
var signs = eval('(' + preference.signs + ')'); var signs = eval('(' + preference.signs + ')');
for (var j = 1; j < signs.length; j++) { for (var j = 1; j < signs.length; j++) {
$("#preferenceSign" + j).val(signs[j].signHTML); $("#preferenceSign" + j).val(signs[j].signHTML);
$("#preferenceSignButton" + j).tip({
content: signs[j].signHTML === "" ? Label.signIsNullLabel : signs[j].signHTML.replace(/\n/g, "").replace(/<script.*<\/script>/ig, ""),
position: "bottom"
});
} }
$("#articleListDisplay").val(preference.articleListStyle); $("#articleListDisplay").val(preference.articleListStyle);
......
src/main/webapp/js/admin/tablePaginate.js
View file @ fc807440
...@@ -59,8 +59,8 @@ $.extend(TablePaginate.prototype, { ...@@ -59,8 +59,8 @@ $.extend(TablePaginate.prototype, {
}, },
"currentPage": 1, "currentPage": 1,
"errorMessage": Label.inputErrorLabel, "errorMessage": Label.inputErrorLabel,
"nextPageText": Label.nextPagePabel, "nextPageText": '>',
"previousPageText": Label.previousPageLabel, "previousPageText": '<',
"goText": Label.gotoLabel, "goText": Label.gotoLabel,
"type": "custom", "type": "custom",
"custom": [1], "custom": [1],
......
src/main/webapp/js/admin/userList.js
View file @ fc807440
...@@ -107,7 +107,7 @@ admin.userList = { ...@@ -107,7 +107,7 @@ admin.userList = {
} else { } else {
userData[i].expendRow = "<a href='javascript:void(0)' onclick=\"admin.userList.get('" + userData[i].expendRow = "<a href='javascript:void(0)' onclick=\"admin.userList.get('" +
users[i].oId + "', '" + users[i].userRole + "')\">" + Label.updateLabel + "</a>\ users[i].oId + "', '" + users[i].userRole + "')\">" + Label.updateLabel + "</a>\
<a href='javascript:void(0)' onclick=\"admin.userList.del('" + users[i].oId + "', '" + users[i].userName + "')\">" + Label.removeLabel + "</a>" + <a href='javascript:void(0)' onclick=\"admin.userList.del('" + users[i].oId + "', '" + users[i].userName + "')\">" + Label.removeLabel + "</a> " +
"<a href='javascript:void(0)' onclick=\"admin.userList.changeRole('" + users[i].oId + "')\">" + Label.changeRoleLabel + "</a>"; "<a href='javascript:void(0)' onclick=\"admin.userList.changeRole('" + users[i].oId + "')\">" + Label.changeRoleLabel + "</a>";
if ("defaultRole" === users[i].userRole) { if ("defaultRole" === users[i].userRole) {
userData[i].isAdmin = Label.commonUserLabel; userData[i].isAdmin = Label.commonUserLabel;
...@@ -358,7 +358,5 @@ admin.userList = { ...@@ -358,7 +358,5 @@ admin.userList = {
admin.register["user-list"] = { admin.register["user-list"] = {
"obj": admin.userList, "obj": admin.userList,
"init": admin.userList.init, "init": admin.userList.init,
"refresh": function() { "refresh": admin.userList.getList
admin.clearTip();
}
} }
\ No newline at end of file
src/main/webapp/skins/mobile/article.ftl
View file @ fc807440
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
<li class="noborder"><a href="http://reddit.com/submit?url=${servePath}/?p=12&title=${article.articleTitle}" target="_blank"><img src="${staticServePath}/skins/${skinDirName}/themes/core/core-images/bookmarks/reddit.jpg" alt="" /> Reddit</a></li> <li class="noborder"><a href="http://reddit.com/submit?url=${servePath}/?p=12&title=${article.articleTitle}" target="_blank"><img src="${staticServePath}/skins/${skinDirName}/themes/core/core-images/bookmarks/reddit.jpg" alt="" /> Reddit</a></li>
</ul> </ul>
</div> </div>
<div id="externalRelevantArticles" class="post"></div>
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
......
src/main/webapp/skins/mobile/js/l10n.min.js
View file @ fc807440
/*
* 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/mobile/skin.properties
View file @ fc807440
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
name=Mobile name=Mobile
version=0.1.5 version=0.1.5
forSolo=1.5.0 forSolo=1.6.0
memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002 memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002
src/main/webapp/skins/next/article.ftl
View file @ fc807440
...@@ -78,13 +78,16 @@ ...@@ -78,13 +78,16 @@
</footer> </footer>
</article> </article>
</div> </div>
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
<div id="externalRelevantArticles"></div>
<#include "side.ftl"> <#include "side.ftl">
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">
<@comment_script oId=article.oId> <@comment_script oId=article.oId>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
<#if 0 != externalRelevantArticlesDisplayCount>
page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>");
</#if>
</@comment_script> </@comment_script>
</body> </body>
</html> </html>
src/main/webapp/skins/next/css/next.css
View file @ fc807440
...@@ -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.0.1, Jul 10, 2016 * @version 0.1.1.1, Aug 23, 2016
*/ */
/* start reset */ /* start reset */
html { html {
...@@ -703,6 +703,14 @@ img { ...@@ -703,6 +703,14 @@ img {
border-bottom: none; border-bottom: none;
width: 50%; width: 50%;
} }
#externalRelevantArticles h4 {
margin-bottom: 0;
}
#externalRelevantArticles ul {
margin-top: 5px;
}
/* end article */ /* end article */
/* start comments */ /* start comments */
......
src/main/webapp/skins/next/css/next.min.css
View file @ fc807440
This diff is collapsed.
src/main/webapp/skins/next/js/next.min.js
View file @ fc807440
/*
* 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})):($(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(); 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
src/main/webapp/skins/next/side.ftl
View file @ fc807440
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</#if> </#if>
<nav> <nav>
<div class="site-state-item"> <div class="site-state-item">
<a href="/archives"> <a href="${servePath}/archives.html">
<span class="site-state-item-count">${statistic.statisticPublishedBlogArticleCount}</span> <span class="site-state-item-count">${statistic.statisticPublishedBlogArticleCount}</span>
<span class="site-state-item-name">${articleLabel}</span> <span class="site-state-item-name">${articleLabel}</span>
</a> </a>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</div> </div>
<div class="site-state-item site-state-tags"> <div class="site-state-item site-state-tags">
<a href="/tags"> <a href="${servePath}/dynamic.html">
<span class="site-state-item-count">${statistic.statisticPublishedBlogCommentCount}</span> <span class="site-state-item-count">${statistic.statisticPublishedBlogCommentCount}</span>
<span class="site-state-item-name">${commentLabel}</span> <span class="site-state-item-name">${commentLabel}</span>
</a> </a>
......
src/main/webapp/skins/next/skin.properties
View file @ fc807440
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
name=next name=next
version=1.0.0 version=1.0.0
forSolo=1.5.0 forSolo=1.6.0
memo=https://github.com/iissnan/hexo-theme-next memo=https://github.com/iissnan/hexo-theme-next
src/main/webapp/skins/yilia/archive-articles.ftl deleted 100644 → 0
View file @ 39beb5ba
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${archiveDate.archiveDateYear}${archiveDate.archiveDateMonth}"/>
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<h2 class="classify-name">
${archive1Label}
<#if "en" == localeString?substring(0, 2)>
${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount})
<#else>
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} (${archiveDate.archiveDatePublishedArticleCount})
</#if>
</h2>
<#include "article-list.ftl">
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/yilia/archives.ftl deleted 100644 → 0
View file @ 39beb5ba
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${blogTitle}">
<meta name="keywords" content="${metaKeywords},${archiveLabel}"/>
<meta name="description" content="${metaDescription},${archiveLabel}"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main class="classify">
<article>
<header>
<h2>
<a rel="archive" href="${servePath}/archives.html">
${archiveLabel}
</a>
</h2>
</header>
<#if 0 != archiveDates?size>
<ul class="tags fn-clear">
<#list archiveDates as archiveDate>
<li>
<#if "en" == localeString?substring(0, 2)>
<a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})</a>
<#else>
<a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})</a>
</#if>
</li>
</#list>
</ul>
</#if>
</article>
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/yilia/article-list.ftl deleted 100644 → 0
View file @ 39beb5ba
<#list articles as article>
<article>
<header>
<h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
${updatedLabel}
</sup>
</#if>
</h2>
<time><span class="icon-date"></span> ${article.articleCreateDate?string("yyyy-MM-dd")}</time>
</header>
<section class="abstract">
${article.articleAbstract}
</section>
<footer class="tags">
<span class="icon-tag"></span> &nbsp;
<#list article.articleTags?split(",") as articleTag>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a>
</#list>
<a rel="nofollow" href="${servePath}/authors/${article.authorId}">
<img class="avatar" title="${article.authorName}" alt="${article.authorName}" src="${article.authorThumbnailURL}"/>
</a>
</footer>
</article>
</#list>
<#if 0 != paginationPageCount>
<nav class="pagination">
<#if 1 != paginationPageNums?first>
<a href="${servePath}${path}/${paginationPreviousPageNum}" class="extend">${previousPageLabel}</a>
<a class="page-num" href="${servePath}${path}/1">1</a> ...
</#if>
<#list paginationPageNums as paginationPageNum>
<#if paginationPageNum == paginationCurrentPageNum>
<span class="current page-num">${paginationPageNum}</span>
<#else>
<a class="page-num" href="${servePath}${path}/${paginationPageNum}">${paginationPageNum}</a>
</#if>
</#list>
<#if paginationPageNums?last != paginationPageCount> ...
<a href="${servePath}${path}/${paginationPageCount}" class="page-num">${paginationPageCount}</a>
<a href="${servePath}${path}/${paginationNextPageNum}" class="extend">${nextPagePabel}</a>
</#if>
</nav>
</#if>
\ No newline at end of file
src/main/webapp/skins/yilia/article.ftl deleted 100644 → 0
View file @ 39beb5ba
<#include "macro-head.ftl">
<#include "macro-comments.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${article.articleTitle} - ${blogTitle}">
<meta name="keywords" content="${article.articleTags}" />
<meta name="description" content="${article.articleAbstract?html}" />
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<article class="post article-body">
<header>
<h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
${updatedLabel}
</sup>
</#if>
</h2>
<time><span class="icon-date"></span> ${article.articleCreateDate?string("yyyy-MM-dd")}</time>
<section class="tags">
<span class="icon-tag"></span> &nbsp;
<#list article.articleTags?split(",") as articleTag>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a>
</#list>
<a rel="nofollow" href="${servePath}/authors/${article.authorId}">
<img class="avatar" title="${article.authorName}" alt="${article.authorName}" src="${article.authorThumbnailURL}"/>
</a>
</section>
</header>
<section class="abstract">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
</div>
</#if>
<#if nextArticlePermalink?? || previousArticlePermalink??>
<aside class="fn-clear">
<#if previousArticlePermalink??>
<a class="fn-left" rel="prev" href="${servePath}${previousArticlePermalink}">
<strong>&lt;</strong> ${previousArticleTitle}
</a>
</#if>
<#if nextArticlePermalink??>
<a class="fn-right" rel="next" href="${servePath}${nextArticlePermalink}">
${nextArticleTitle} <strong>&gt;</strong>
</a>
</#if>
</aside>
</#if>
</section>
<footer class="fn-clear share">
<div class="fn-right">
<span class="icon icon-t-weibo" data-type="tencent"></span>
<span class="icon icon-weibo" data-type="weibo"></span>
<span class="icon icon-twitter" data-type="twitter"></span>
<span class="icon icon-gplus" data-type="google"></span>
</div>
</footer>
</article>
<@comments commentList=articleComments article=article></@comments>
<#include "footer.ftl">
<@comment_script oId=article.oId>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
</@comment_script>
</main>
</body>
</html>
src/main/webapp/skins/yilia/author-articles.ftl deleted 100644 → 0
View file @ 39beb5ba
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${authorName} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${authorName}"/>
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<h2 class="classify-name">
${author1Label}${authorName}
</h2>
<#include "article-list.ftl">
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/yilia/css/fonts/icomoon.svg deleted 100644 → 0
View file @ 39beb5ba
This diff is collapsed.
src/main/webapp/skins/yilia/css/fonts/selection.json deleted 100644 → 0
View file @ 39beb5ba
This diff is collapsed.
src/main/webapp/skins/yilia/css/yilia.css deleted 100644 → 0
View file @ 39beb5ba
This diff is collapsed.
src/main/webapp/skins/yilia/css/yilia.min.css deleted 100644 → 0
View file @ 39beb5ba
This diff is collapsed.
src/main/webapp/skins/yilia/dynamic.ftl deleted 100644 → 0
View file @ 39beb5ba
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${blogTitle}">
<meta name="keywords" content="${metaKeywords},${dynamicLabel}"/>
<meta name="description" content="${metaDescription},${dynamicLabel}"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main class="dynamic">
<#if 0 != recentComments?size>
<ul class="comments">
<#list recentComments as comment>
<#if comment_index < 6>
<li>
<img class="avatar" title="${comment.commentName}"
alt="${comment.commentName}" src="${comment.commentThumbnailURL}">
<div class="content">
<div class="fn-clear post-meta">
<span class="fn-left">
<#if "http://" == comment.commentURL>
<span>${comment.commentName}</span>
<#else>
<a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
</#if>
<time>${comment.commentDate?string("yy-MM-dd HH")}</time>
</span>
<a class="fn-right" href="${servePath}${comment.commentSharpURL}">${viewLabel}»</a>
</div>
<div class="comment-content">
${comment.commentContent}
</div>
</div>
</li>
</#if>
</#list>
</ul>
</#if>
<#if 0 != mostCommentArticles?size || 0 != mostViewCountArticles?size>
<#if 0 != mostCommentArticles?size>
<article>
<header>
<h2>
${mostCommentArticlesLabel}
</h2>
</header>
<ul>
<#list mostCommentArticles as article>
<li>
<a href="${servePath}${article.articlePermalink}" title="${article.articleTitle}" rel="nofollow">
${article.articleTitle}
</a>
<span data-ico="&#xe14e;">
${article.articleCommentCount}
</span>
</li>
</#list>
</ul>
</article>
</#if>
<#if 0 != mostViewCountArticles?size>
<article>
<header>
<h2>
${mostViewCountArticlesLabel}
</h2>
</header>
<ul>
<#list mostViewCountArticles as article>
<li>
<a href="${servePath}${article.articlePermalink}" title="${article.articleTitle}" rel="nofollow">
${article.articleTitle}
</a>
<span data-ico="&#xe185;">
${article.articleViewCount}
</span>
</li>
</#list>
</ul>
</article>
</#if>
</#if>
<#include "footer.ftl">
</main>
<script>
var $commentContents = $(".comments .comment-content");
for (var i = 0; i < $commentContents.length; i++) {
var str = $commentContents[i].innerHTML;
$commentContents[i].innerHTML = Util.replaceEmString(str);
}
</script>
</body>
</html>
src/main/webapp/skins/yilia/footer.ftl deleted 100644 → 0
View file @ 39beb5ba
<footer class="footer">
<div class="fn-clear">
<span class="fn-right">
${viewCount1Label}${statistic.statisticBlogViewCount}
&nbsp;
${articleCount1Label}${statistic.statisticPublishedBlogArticleCount}
&nbsp;
${commentCount1Label}${statistic.statisticPublishedBlogCommentCount}
&nbsp;
${onlineVisitor1Label}${onlineVisitorCnt}
</span>
</div>
<div class="fn-clear">
<a href="${servePath}">${blogTitle}</a>
&copy; ${year}
${footerContent}
<span class="fn-right">
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> •
<a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version}
</span>
</div>
<span onclick="Util.goTop()" class="icon-goup"></span>
</footer>
<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
<script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
<script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/${skinDirName}${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
<script type="text/javascript">
var latkeConfig = {
"servePath": "${servePath}",
"staticServePath": "${staticServePath}",
"isLoggedIn": "${isLoggedIn?string}",
"userName": "${userName}"
};
var Label = {
"skinDirName": "${skinDirName}",
"em00Label": "${em00Label}",
"em01Label": "${em01Label}",
"em02Label": "${em02Label}",
"em03Label": "${em03Label}",
"em04Label": "${em04Label}",
"em05Label": "${em05Label}",
"em06Label": "${em06Label}",
"em07Label": "${em07Label}",
"em08Label": "${em08Label}",
"em09Label": "${em09Label}",
"em10Label": "${em10Label}",
"em11Label": "${em11Label}",
"em12Label": "${em12Label}",
"em13Label": "${em13Label}",
"em14Label": "${em14Label}"
};
</script>
${plugins}
src/main/webapp/skins/yilia/index.ftl deleted 100644 → 0
View file @ 39beb5ba
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${blogTitle}">
<#if metaKeywords??>
<meta name="keywords" content="${metaKeywords}"/>
</#if>
<#if metaDescription??>
<meta name="description" content="${metaDescription}"/>
</#if>
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<#include "article-list.ftl">
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/yilia/js/yilia.js deleted 100644 → 0
View file @ 39beb5ba
/*
* 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.
*/
/**
* @fileoverview util and every page should be used.
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.2.0.0, Nov 3, 2015
*/
/**
* @description yilia 皮肤脚本
* @static
*/
var Yilia = {
/**
* @description 页面初始化
*/
init: function () {
Util.killIE();
this.resetTags();
$(window).scroll(function () {
if ($("article").length > 0 && $("article.post").length === 0) {
$("article:not(.show)").each(function () {
if ($(this).offset().top <= $(window).scrollTop() + $(window).height() - $(this).height() / 7) {
$(this).addClass("show");
}
});
}
if ($(window).scrollTop() > $(window).height()) {
$(".icon-goup").show();
} else {
$(".icon-goup").hide();
}
if ($("article.post").length === 1) {
$("article.post").addClass('show');
}
});
$(window).scroll();
},
resetTags: function () {
$("a.tag").each(function (i) {
$(this).addClass("color" + Math.ceil(Math.random() * 4));
});
},
share: function () {
$(".share span").click(function () {
var key = $(this).data("type");
var title = encodeURIComponent($("title").text()),
url = $(".post-title a").attr('href') ? $(".post-title a").attr('href') : location,
pic = $(".post-content img:eq(0)").attr("src");
var urls = {};
urls.tencent = "http://share.v.t.qq.com/index.php?c=share&a=index&title=" + title +
"&url=" + url + "&pic=" + pic;
urls.weibo = "http://v.t.sina.com.cn/share/share.php?title=" +
title + "&url=" + url + "&pic=" + pic;
urls.google = "https://plus.google.com/share?url=" + url;
urls.twitter = "https://twitter.com/intent/tweet?status=" + title + " " + url;
window.open(urls[key], "_blank", "top=100,left=200,width=648,height=618");
});
}
};
Yilia.init();
\ No newline at end of file
src/main/webapp/skins/yilia/js/yilia.min.js deleted 100644 → 0
View file @ 39beb5ba
/*
* 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 Yilia={init:function(){Util.killIE(),this.resetTags(),$(window).scroll(function(){$("article").length>0&&0===$("article.post").length&&$("article:not(.show)").each(function(){$(this).offset().top<=$(window).scrollTop()+$(window).height()-$(this).height()/7&&$(this).addClass("show")}),$(window).scrollTop()>$(window).height()?$(".icon-goup").show():$(".icon-goup").hide(),1===$("article.post").length&&$("article.post").addClass("show")}),$(window).scroll()},resetTags:function(){$("a.tag").each(function(t){$(this).addClass("color"+Math.ceil(4*Math.random()))})},share:function(){$(".share span").click(function(){var t=$(this).data("type"),i=encodeURIComponent($("title").text()),o=$(".post-title a").attr("href")?$(".post-title a").attr("href"):location,e=$(".post-content img:eq(0)").attr("src"),n={};n.tencent="http://share.v.t.qq.com/index.php?c=share&a=index&title="+i+"&url="+o+"&pic="+e,n.weibo="http://v.t.sina.com.cn/share/share.php?title="+i+"&url="+o+"&pic="+e,n.google="https://plus.google.com/share?url="+o,n.twitter="https://twitter.com/intent/tweet?status="+i+" "+o,window.open(n[t],"_blank","top=100,left=200,width=648,height=618")})}};Yilia.init();
\ No newline at end of file
src/main/webapp/skins/yilia/lang/lang_en_US.properties deleted 100644 → 0
View file @ 39beb5ba
#
# 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.
#
#
# Description: B3log Solo language configurations(en_US).
# Version: 1.0.0.1, Jun 19, 2015
# Author: Liyuan Li
#
subscribeLabel=Subscribe
dynamicLabel=Dynamic
adminConsoleLabel=Admin
adminIndexLabel=Admin Index
postArticleLabel=Post
articleListLabel=Articles
commentListLabel=Comments
draftListLabel=Drafts
userManageLabel=Users
commonUserLabel=Common User
addUserLabel=Add User
updateUserLabel=Update User
linkManagementLabel=Links
pluginMgmtLabel=Plugins
pluginNameLabel=Name
versionLabel=Version
statusLabel=Status
enabledLabel=Enabled
disabledLabel=Disabled
enableLabel=Enable
disableLabel=Disable
preferenceLabel=Preference
localeString1Label=Language:
timeZoneId1Label=Time Zone:
adminLabel=Admin
administratorLabel=Administrator
loginLabel=Login
logoutLabel=Logout
initLabel=Initial
popTagsLabel=Popular Tags
tag1Label=Tag:
tags1Label=Tags:
recentArticlesLabel=Recent Articles
recentCommentsLabel=Recent Comments
postCommentsLabel=Post Comment
mostCommentArticlesLabel=Most Comment Articles
mostViewCountArticlesLabel=Most View Articles
em00Label=Smile
em01Label=Laughter
em02Label=Happy
em03Label=Sad
em04Label=Cry
em05Label=No Comments
em06Label=Fidget
em07Label=Angry
em08Label=Look Around
em09Label=Surprise
em10Label=Cool
em11Label=Cheeky
em12Label=Heart
em13Label=Heart Broken
em14Label=Devil
linkLabel=Friend Links
sumLabel=
pageLabel=Page
commentLabel=Comment
linkTitleLabel=Link Title
linkTitle1Label=Title:
updateLabel=Update
removeLabel=Remove
putTopLabel=Put Top
cancelPutTopLabel=Cancel Put Top
downloadCountLabel=Count
sizeLabel=Size
uploadDateLabel=Upload Date
downloadURLLabel=Download URL
downloadLabel=Download
createDateLabel=Create Date
updateDateLabel=Update Date
titleLabel=Title
title1Label=Title:
content1Label=Content:
abstract1Label=Summary:
publishLabel=Publish
unPublishLabel=Un Publish
urlLabel=URL
url1Label=URL (start protocol, e.g.: http://):
addLinkLabel=Add Link
updateLinkLabel=Update Link
archiveLabel=Archive
archive1Label=archive:
yearLabel=
monthLabel=
pageLabel=Page
pageMgmtLabel=Pages
othersLabel=Others
fileListLabel=Files
submitUploadLabel=Upload
fileNameLabel=File Name
paramSettingsLabel=Parameters
skinLabel=Skins
signLabel=Signs
sign1Label=Signs:
noSignLabel=No Signs
signIsNullLabel=This Sign is Null
statisticLabel=Blog Statistic
viewLabel=View
countLabel=Posts
viewCount1Label=View Count:
articleCount1Label=Article Count:
commentCountLabel=Comment Count
commentCount1Label=Comment Count:
commentEmotions1Label=Emotions:
commentEmotionsLabel=Emotions
commentName1Label=Name:
commentNameLabel=Name
commentEmail1Label=Email:
commentEmailLabel=Email
commentURL1Label=URL:
commentURLLabel=URL
commentContent1Label=Content:
commentContentLabel=Content
getDateLabel=Get Date
getArticleLabel=Get Article
selectDateLabel=Select Date
selectDate1Label=Select Date:
importLabel=Import
chooseBlog1Label=Choose Blog:
blogArticleImportLabel=Article Import
userName1Label=Username:
userPassword1Label=Password:
categoryLabel=Category
noticeBoard1Label=Notice Board:
noticeBoardLabel=Notice Board
htmlhead1Label=HTML head:
indexTagDisplayCnt1Label=Index Tag Display Count:
indexRecentArticleDisplayCnt1Label=Recent Article Display Count:
indexRecentCommentDisplayCnt1Label=Recent Comment Display Count:
indexMostCommentArticleDisplayCnt1Label=Most Comment Article Display Count:
indexMostViewArticleDisplayCnt1Label=Most View Article Display Count:
relevantArticlesDisplayCnt1Label=Relevant Article Display Count:
randomArticlesDisplayCnt1Label=Random Article Display Count:
externalRelevantArticlesDisplayCnt1Label=External Relevant Article Display Count:
windowSize1Label=Pagination Window Size:
pageSize1Label=Pagination Page Size:
blogTitle1Label=Blog Title:
blogSubtitle1Label=Blog Subtitle:
blogHost1Label=Blog Host:
submmitCommentLabel=Commit Comment
saveLabel=Save
tagLabel=Tag
tagsLabel=Tags
importedLabel=Imported
captcha1Label=Captcha:
captchaLabel=Captcha
indexLabel=Index
nextArticle1Label=Next:
previousArticle1Label=Previous:
updatedLabel=Updated!
topArticleLabel=Top!
CSDNBlogLabel=CSDN Blog
BlogJavaLabel=BlogJava
CnBlogsLabel=CnBlogs
previousPageLabel=Previous Page
nextPagePabel=Next Page
firstPageLabel=First Page
lastPageLabel=Last Page
returnTo1Label=Return to:
tencentLabel=Tencent
appKey1Label=App Key:
appSecret1Label=App Secret:
postToTencentMicroblogWhilePublishArticleLabel=Post to Tencent microblog while publish an article:
postToCommunityLabel=Post to Community:
authorizeTencentMicroblog1Label=Click to authorize:
googleLabel=Google
OAuthConsumerSecret1Label=OAuth Consumer Secret:
atomLabel=Atom
relevantArticles1Label=Relevant Articles:
randomArticles1Label=Random Articles:
externalRelevantArticles1Label=External Relevant Articles:
metaKeywords1Label=Meta Keywords:
metaDescription1Label=Meta Description:
removeUnusedTagsLabel=Remove Unused Tags
goTopLabel=Top
permalink1Label=Permalink:
permalinkLabel=Permalink
b3logLabel=<span style="color: orange;">B</span><span style="color: blue;"><sup>3</sup></span><span style="color: green;">L</span><span style="color: red;">O</span><span style="color: blue;">G</span>
killBrowserLabel=<h2>Let's kill outdated and insecure browser!</h2><p>Let's kill outdated and insecure browser for browser evolution, human progress and better experience.</p><p>You can download</p><ul><li><a href="http://www.mozilla.com/" target="_blank">Firefox</a></li><li><a href="http://www.google.com/chrome" target="_blank">Chrome</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">Maxthon</a> and <a href="http://www.google.com" target="_blank">so on</a>.</li></ul>
readmoreLabel=Read more\u00bb
readmore2Label=Read more
replyLabel=Reply\u00bb
homeLabel=Home
enableArticleUpdateHint1Label=Enable Article Update Hint:
allowVisitDraftViaPermalink1Label=Allow Visit Draft Via Link:
author1Label=Author:
authorLabel=Author
keyOfSolo1Label=Solo Key:
articleLabel=Article
tagArticlesLabel=Tag Articles
dateArticlesLabel=Archive Date Articles
authorArticlesLabel=Author Articles
indexArticleLabel=Index Articles
allTagsLabel=Tag Cloud
customizedPageLabel=Customized Page
killBrowserPageLabel=Kill Browser Page
pageNumLabel=Page Number
####
forbiddenLabel=Forbidden Access!
sorryLabel=Sorry!
notFoundLabel=Not Found!
unPulbishSuccLabel=Un Publish Successfully
unPulbishFailLabel=Un Publish Fail
removeSuccLabel=Remove Successfully
removeFailLabel=Remove Fail
removeUserFailSkinNeedMulUsersLabel=Remove Fail, the current skin need multiple users!
putTopSuccLabel=Put Top Successfully
putTopFailLabel=Put Top Fail
cancelTopSuccLabel=Cancel Top Successfully
cancelTopFailLabel=Cancel Top Fail
addSuccLabel=Add Successfully
addFailLabel=Add Fail
updateSuccLabel=Update Successfully
updateFailLabel=Update Fail
updatePreferenceFailNeedMulUsersLabel=Update Fail, the selected skin need multiple users!
setFailLabel=Set Fail
setSuccLabel=Set Successfully
getFailLabel=Get Fail
noSettingLabel=No Setting
getSuccLabel=Get Successfully
importSuccLabel=Import Successfully :-)
importFailLabel=Some Import Fail %>_<%
noCommentLabel=No Comment
captchaErrorLabel=Captcha Error
inputErrorLabel=Input Error!
gotoLabel=Go
nameEmptyLabel=Username is empty
passwordEmptyLabel=Password is empty
blogEmptyLabel=Blogging service is empty
blogArticleEmptyLabel=Please select articles
nameTooLongLabel=Sorry, your username must be between 2 and 20 characters long.
mailCannotEmptyLabel=Mail is empty
mailInvalidLabel=Mail is invalid
commentContentCannotEmptyLabel=Sorry, your content must be between 2 and 500 characters long.
captchaCannotEmptyLabel=Captcha is empty
loadingLabel=Loading....
titleEmptyLabel=Title is empty
contentEmptyLabel=Content is empty
orderEmptyLabel=Order is empty
abstractEmptyLabel=Abstract is empty
tagsEmptyLabel=Tags is empty
addressEmptyLabel=Address is empty
noAuthorizationURLLabel=Can not retrieve authorization URL from Google, please \
make sure the <em>Consumer Secret</em> you typed in and then try again.
duplicatedPermalinkLabel=Duplicated permalink!
invalidPermalinkFormatLabel=Invalid permalink format!
duplicatedEmailLabel=Duplicated email!
refreshAndRetryLabel=Please refresh and try again!
editorLeaveLabel=Content is not null, Do you leave\uff1f
editorPostLabel=Content is not null, Do you clear\uff1f
####
confirmRemoveLabel=Are You Sure?
confirmInitLabel=Are You Sure?
src/main/webapp/skins/yilia/lang/lang_zh_CN.properties deleted 100644 → 0
View file @ 39beb5ba
This diff is collapsed.
src/main/webapp/skins/yilia/links.ftl deleted 100644 → 0
View file @ 39beb5ba
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${blogTitle}">
<meta name="keywords" content="${metaKeywords},${linkLabel}"/>
<meta name="description" content="${metaDescription},${linkLabel}"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main class="classify">
<article>
<header>
<h2>
<a rel="archive" href="${servePath}/links.html">
${linkLabel}
</a>
</h2>
</header>
<#if 0 != links?size>
<ul class="tags fn-clear">
<#list links as link>
<li>
<a rel="friend" href="${link.linkAddress}" class="tag"
title="${link.linkDescription}" target="_blank">
<img src="${faviconAPI}<#list link.linkAddress?split('/') as x><#if x_index=2>${x}<#break></#if></#list>" width="16" height="16" />
${link.linkTitle}
</a>
</li>
</#list>
</ul>
</#if>
</article>
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/yilia/macro-comments.ftl deleted 100644 → 0
View file @ 39beb5ba
<#macro comments commentList article>
<ul class="comments" id="comments">
<#list commentList as comment>
<li id="${comment.oId}">
<img class="avatar" title="${comment.commentName}" src="${comment.commentThumbnailURL}">
<div class="content">
<div class="fn-clear post-meta">
<span class="fn-left">
<#if "http://" == comment.commentURL>
<a>${comment.commentName}</a>
<#else>
<a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
</#if>
<#if comment.isReply>
@
<a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}"
onmouseover="page.showComment(this, '${comment.commentOriginalCommentId}', 23);"
onmouseout="page.hideComment('${comment.commentOriginalCommentId}')"
>${comment.commentOriginalCommentName}</a>
</#if>
<time>${comment.commentDate?string("yyyy-MM-dd")}</time>
</span>
<#if article.commentable>
<a class="fn-right" href="javascript:replyTo('${comment.oId}')">${replyLabel}</a>
</#if>
</div>
<div class="comment-content">
${comment.commentContent}
</div>
</div>
</li>
</#list>
</ul>
<#if article.commentable>
<div class="comment-body fn-wrap">
<table id="commentForm" class="form">
<tbody>
<#if !isLoggedIn>
<tr>
<td>
<input placeholder="${commentNameLabel}" type="text" class="normalInput" id="commentName"/>
</td>
</tr>
<tr>
<td>
<input placeholder="${commentEmailLabel}" type="email" class="normalInput" id="commentEmail"/>
</td>
</tr>
<tr>
<td>
<input placeholder="${commentURLLabel}" type="url" id="commentURL"/>
</td>
</tr>
</#if>
<tr>
<td id="emotions">
<span class="em00" title="${em00Label}"></span>
<span class="em01" title="${em01Label}"></span>
<span class="em02" title="${em02Label}"></span>
<span class="em03" title="${em03Label}"></span>
<span class="em04" title="${em04Label}"></span>
<span class="em05" title="${em05Label}"></span>
<span class="em06" title="${em06Label}"></span>
<span class="em07" title="${em07Label}"></span>
<span class="em08" title="${em08Label}"></span>
<span class="em09" title="${em09Label}"></span>
<span class="em10" title="${em10Label}"></span>
<span class="em11" title="${em11Label}"></span>
<span class="em12" title="${em12Label}"></span>
<span class="em13" title="${em13Label}"></span>
<span class="em14" title="${em14Label}"></span>
</td>
</tr>
<tr>
<td>
<textarea rows="10" cols="96" id="comment"></textarea>
</td>
</tr>
<#if !isLoggedIn>
<tr>
<td>
<input style="width:50%" placeholder="${captchaLabel}" type="text" class="normalInput" id="commentValidate"/>
<img id="captcha" alt="validate" src="${servePath}/captcha.do" />
</td>
</tr>
</#if>
<tr>
<td colspan="2" align="right">
<span class="error-msg" id="commentErrorTip"></span>
<button id="submitCommentButton" onclick="page.submitComment();">${submmitCommentLabel}</button>
</td>
</tr>
</tbody>
</table>
</div>
</#if>
</#macro>
<#macro comment_script oId>
<script type="text/javascript" src="${staticServePath}/js/page${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
<script type="text/javascript">
var page = new Page({
"nameTooLongLabel": "${nameTooLongLabel}",
"mailCannotEmptyLabel": "${mailCannotEmptyLabel}",
"mailInvalidLabel": "${mailInvalidLabel}",
"commentContentCannotEmptyLabel": "${commentContentCannotEmptyLabel}",
"captchaCannotEmptyLabel": "${captchaCannotEmptyLabel}",
"loadingLabel": "${loadingLabel}",
"oId": "${oId}",
"skinDirName": "${skinDirName}",
"blogHost": "${blogHost}",
"randomArticles1Label": "${randomArticles1Label}",
"externalRelevantArticles1Label": "${externalRelevantArticles1Label}"
});
var addComment = function (result, state) {
var commentable = $("#commentForm").length === 0 ? false : true;
var commentHTML = '<li id="' + result.oId +
'"><img class="avatar" title="'
+ result.userName + '" src="' + result.commentThumbnailURL + '"><div class="content">'
+ '<div class="fn-clear post-meta"><span class="fn-left">' + result.replyNameHTML;
if (state !== "") {
var commentOriginalCommentName = $("#" + page.currentCommentId).find(".post-meta a").first().text();
commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
+ 'onmouseover="page.showComment(this, \'' + page.currentCommentId + '\', 23);"'
+ 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>';
}
commentHTML += ' <time>' + result.commentDate
+ '</time></span>';
if (commentable) {
commentHTML += '<a class="fn-right" href="javascript:replyTo(\'' + result.oId + '\');">${replyLabel}</a>';
}
commentHTML += '</div><div class="comment-content">' +
Util.replaceEmString($("#comment" + state).val())
+ '</div></div></li>';
return commentHTML;
};
var replyTo = function (id) {
var commentFormHTML = "<table class='form comment-reply' id='replyForm'>";
page.addReplyForm(id, commentFormHTML);
};
(function () {
Yilia.share();
page.load();
// emotions
page.replaceCommentsEm(".comments .comment-content");
<#nested>
})();
</script>
</#macro>
\ No newline at end of file
src/main/webapp/skins/yilia/macro-head.ftl deleted 100644 → 0
View file @ 39beb5ba
<#macro head title>
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<meta http-equiv="Window-target" content="_top" />
<link rel="stylesheet" type="text/css" href="//fonts.useso.com/css?family=Merriweather:300,700,700italic,300italic|Open+Sans:700,400" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
${htmlHead}
</#macro>
\ No newline at end of file
src/main/webapp/skins/yilia/page.ftl deleted 100644 → 0
View file @ 39beb5ba
<#include "macro-head.ftl">
<#include "macro-comments.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${page.pageTitle} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${page.pageTitle}" />
<meta name="description" content="${metaDescription}" />
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<article class="post article-body">
<section class="abstract">
${page.pageContent}
</section>
<footer class="fn-clear share">
<div class="fn-right">
<span class="icon icon-t-weibo" data-type="tencent"></span>
<span class="icon icon-weibo" data-type="weibo"></span>
<span class="icon icon-twitter" data-type="twitter"></span>
<span class="icon icon-gplus" data-type="google"></span>
</div>
</footer>
</article>
<@comments commentList=pageComments article=page></@comments>
<#include "footer.ftl">
<@comment_script oId=page.oId></@comment_script>
</main>
</body>
</html>
src/main/webapp/skins/yilia/side.ftl deleted 100644 → 0
View file @ 39beb5ba
<div class="side">
<div class="overlay"></div>
<header class="content">
<a href="${servePath}">
<img class="avatar" src="${adminUser.userAvatar}" title="${userName}"/>
</a>
<hgroup>
<h1>
<a href="${servePath}">${blogTitle}</a>
</h1>
</hgroup>
<#if "" != noticeBoard>
<p class="subtitle">
${blogSubtitle}
</p>
</#if>
<nav>
<ul>
<#list pageNavigations as page>
<li>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}">${page.pageTitle}</a>
</li>
</#list>
<li>
<a href="${servePath}/dynamic.html">${dynamicLabel}</a>
</li>
<li>
<a href="${servePath}/tags.html">${allTagsLabel}</a>
</li>
<li>
<a href="${servePath}/archives.html">${archiveLabel}</a>
</li>
<li>
<a href="${servePath}/links.html">${linkLabel}</a>
</li>
</ul>
</nav>
</header>
<footer>
<#if noticeBoard??>
<div>${noticeBoard}</div>
</#if>
<#if isLoggedIn>
<a href="${servePath}/admin-index.do#main" title="${adminLabel}" class="icon-setting"></a>
&nbsp; &nbsp;
<a title="${logoutLabel}" class="icon-logout" href="${logoutURL}"></a>
<#else>
<a title="${loginLabel}" href="${loginURL}" class="icon-login"></a>
&nbsp; &nbsp;
<a href="${servePath}/register" title="${registerLabel}" class="icon-register"></a>
</#if> &nbsp; &nbsp;
<a rel="alternate" href="${servePath}/blog-articles-rss.do" title="${subscribeLabel}" class="icon-rss"></a>
</footer>
</div>
\ No newline at end of file
src/main/webapp/skins/yilia/skin.properties deleted 100644 → 0
View file @ 39beb5ba
#
# 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.
#
#
# Description: yilia skin.
# Version: 0.1.0.0, Nov 1, 2015
# Author: Liyuan Li
#
name=yilia
version=1.0.0
forSolo=1.5.0
memo=http://litten.github.io/
src/main/webapp/skins/yilia/tag-articles.ftl deleted 100644 → 0
View file @ 39beb5ba
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${tag.tagTitle} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/>
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<h2 class="classify-name">
${tag1Label}
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}">
${tag.tagTitle}
(${tag.tagPublishedRefCount})
</a>
</h2>
<#include "article-list.ftl">
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/yilia/tags.ftl deleted 100644 → 0
View file @ 39beb5ba
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${allTagsLabel} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${allTagsLabel}"/>
<meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main class="classify">
<article>
<header>
<h2>
<a rel="archive" href="${servePath}/tags.html">
${tagLabel}
</a>
</h2>
</header>
<ul class="tags fn-clear">
<#list tags as tag>
<li>
<a rel="tag" class="tag" data-count="${tag.tagPublishedRefCount}"
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" title="${tag.tagTitle}">
<span>${tag.tagTitle}</span>
(<b>${tag.tagPublishedRefCount}</b>)
</a>
</li>
</#list>
</ul>
</article>
<#include "footer.ftl">
</main>
</body>
</html>
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