Skip to content

S
solo-1
Commit 32af1c06 authored by Liang's avatar Liang
Browse files
Options

🚧 #12256

parent e5ec2661
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 58 deletions
src/main/java/org/b3log/solo/processor/util/Filler.java
View file @ 32af1c06
...@@ -57,7 +57,8 @@ import static org.b3log.solo.model.Article.ARTICLE_CONTENT; ...@@ -57,7 +57,8 @@ import static org.b3log.solo.model.Article.ARTICLE_CONTENT;
* Filler utilities. * Filler utilities.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.6.11.13, Apr 8, 2017 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.6.12.13, Apr 8, 2017
* @since 0.3.1 * @since 0.3.1
*/ */
@Service @Service
...@@ -755,7 +756,7 @@ public class Filler { ...@@ -755,7 +756,7 @@ public class Filler {
fillRecentComments(dataModel, preference); fillRecentComments(dataModel, preference);
} }
if (Templates.hasExpression(template, "<#list mostUsedCategories as tag>")) { if (Templates.hasExpression(template, "<#list mostUsedCategories as category>")) {
fillMostUsedCategories(dataModel, preference); fillMostUsedCategories(dataModel, preference);
} }
......
src/main/java/org/b3log/solo/service/ArticleQueryService.java
View file @ 32af1c06
...@@ -51,7 +51,8 @@ import static org.b3log.solo.model.Article.*; ...@@ -51,7 +51,8 @@ import static org.b3log.solo.model.Article.*;
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://blog.sweelia.com">ArmstrongCN</a> * @author <a href="http://blog.sweelia.com">ArmstrongCN</a>
* @author <a href="http://zephyr.b3log.org">Zephyr</a> * @author <a href="http://zephyr.b3log.org">Zephyr</a>
* @version 1.2.3.4, Apr 8, 2017 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.2.4.4, Apr 8, 2017
* @since 0.3.5 * @since 0.3.5
*/ */
@Service @Service
...@@ -177,8 +178,8 @@ public class ArticleQueryService { ...@@ -177,8 +178,8 @@ public class ArticleQueryService {
articleIds.add(tagArticles.optJSONObject(i).optString(Article.ARTICLE + "_" + Keys.OBJECT_ID)); articleIds.add(tagArticles.optJSONObject(i).optString(Article.ARTICLE + "_" + Keys.OBJECT_ID));
} }
query = new Query().setFilter(CompositeFilterOperator.and( query = new Query().setFilter(
new PropertyFilter(Keys.OBJECT_ID, FilterOperator.IN, articleIds))). new PropertyFilter(Keys.OBJECT_ID, FilterOperator.IN, articleIds)).
setPageCount(1).addSort(Keys.OBJECT_ID, SortDirection.DESCENDING); setPageCount(1).addSort(Keys.OBJECT_ID, SortDirection.DESCENDING);
final List<JSONObject> articles = new ArrayList<>(); final List<JSONObject> articles = new ArrayList<>();
......
src/main/webapp/css/default-admin.css
View file @ 32af1c06
...@@ -45,11 +45,6 @@ a:hover { ...@@ -45,11 +45,6 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
button.selected {
background: url("../images/bowknot/completed.png") no-repeat scroll right bottom transparent !important;
color: #D54121 !important;
border-color: #b0b5b9 !important;
}
@font-face { @font-face {
font-family: 'icomoon'; font-family: 'icomoon';
src:url('fonts/icomoon.eot?1450'); src:url('fonts/icomoon.eot?1450');
...@@ -178,6 +173,33 @@ button.selected { ...@@ -178,6 +173,33 @@ button.selected {
border-radius: 3px; border-radius: 3px;
box-shadow: inset 0 -1px 0 #bbb; box-shadow: inset 0 -1px 0 #bbb;
} }
button,
.completed-ck span {
padding: 6px 12px;
margin-bottom: 0;
font-size: 14px;
font-weight: 400;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
cursor: pointer;
user-select: none;
background-image: none;
border: 1px solid #1fb5ad;
border-radius: 4px;
background-color: #1fb5ad;
color: #fff;
height: auto;
outline: none;
line-height: 18px;
}
button:hover {
background-color: #1ca59e;
border-color: #1ca59e;
}
/* end reset */ /* end reset */
/* start ico */ /* start ico */
...@@ -417,7 +439,8 @@ a[class*=" icon-"]:hover { ...@@ -417,7 +439,8 @@ a[class*=" icon-"]:hover {
#tabsPanel_plugin-list, #tabsPanel_plugin-list,
#tabsPanel_page-list > div:first-child, #tabsPanel_page-list > div:first-child,
#tabsPanel_user-list > div:first-child, #tabsPanel_user-list > div:first-child,
#tabsPanel_link-list > div:first-child{ #tabsPanel_category-list > div:first-child,
#tabsPanel_link-list > div:first-child {
background-color: #FFF; background-color: #FFF;
border-radius: 4px; border-radius: 4px;
margin-bottom: 40px; margin-bottom: 40px;
...@@ -624,32 +647,6 @@ a[class*=" icon-"]:hover { ...@@ -624,32 +647,6 @@ a[class*=" icon-"]:hover {
.form input[type='text']:focus, .form input[type='password']:focus, .form textarea:focus { .form input[type='text']:focus, .form input[type='password']:focus, .form textarea:focus {
box-shadow: none; box-shadow: none;
border-color: #1fb5ad; border-color: #1fb5ad;
}
.form button,
.completed-ck span {
padding: 6px 12px;
margin-bottom: 0;
font-size: 14px;
font-weight: 400;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
cursor: pointer;
user-select: none;
background-image: none;
border: 1px solid #1fb5ad;
border-radius: 4px;
background-color: #1fb5ad;
color: #fff;
height: auto;
outline: none;
line-height: 18px;
}
.form button:hover {
background-color: #1ca59e;
border-color: #1ca59e;
} }
/* end form */ /* end form */
...@@ -872,9 +869,11 @@ button#submitArticle:hover, ...@@ -872,9 +869,11 @@ button#submitArticle:hover,
border-color: #b0b5b9; border-color: #b0b5b9;
} }
.completed-ck span.selected { .completed-ck span.selected,
color: #D54121; .signs button.selected {
background: url(../images/bowknot/completed.png) no-repeat right bottom; background-color: #1ca59e;
border-color: #1ca59e;
color: #fff;
} }
.dialog-background { .dialog-background {
background-color: #000000; background-color: #000000;
...@@ -903,7 +902,7 @@ button#submitArticle:hover, ...@@ -903,7 +902,7 @@ button#submitArticle:hover,
} }
.dialog-header-bg { .dialog-header-bg {
background: url("../images/icon.png") repeat scroll center bottom #F1F1F1; background: #F1F1F1;
border-color: #C0C0C0 #D9D9D9 #D9D9D9; border-color: #C0C0C0 #D9D9D9 #D9D9D9;
border-radius: 6px 6px 0 0; border-radius: 6px 6px 0 0;
border-style: solid; border-style: solid;
...@@ -928,7 +927,7 @@ button#submitArticle:hover, ...@@ -928,7 +927,7 @@ button#submitArticle:hover,
.dialog-main { .dialog-main {
background-color: #FFFFFF; background-color: #FFFFFF;
border: 2px solid #666666; border: 1px solid #666666;
border-color: #C0C0C0 #D9D9D9 #D9D9D9; border-color: #C0C0C0 #D9D9D9 #D9D9D9;
border-top-width: 0; border-top-width: 0;
padding: 12px; padding: 12px;
......
src/main/webapp/js/admin/categoryList.js
View file @ 32af1c06
...@@ -40,7 +40,7 @@ admin.categoryList = { ...@@ -40,7 +40,7 @@ admin.categoryList = {
width: 60 width: 60
}, { }, {
style: "padding-left: 12px;", style: "padding-left: 12px;",
text: Label.linkTitleLabel, text: Label.titleLabel,
index: "categoryTitle", index: "categoryTitle",
width: 230 width: 230
}, { }, {
...@@ -50,7 +50,7 @@ admin.categoryList = { ...@@ -50,7 +50,7 @@ admin.categoryList = {
width: 230 width: 230
}, { }, {
style: "padding-left: 12px;", style: "padding-left: 12px;",
text: Label.linkDescriptionLabel, text: Label.linkDescription1Label,
index: "categoryDesc", index: "categoryDesc",
minWidth: 180 minWidth: 180
}]); }]);
......
src/main/webapp/skins/9IPHP/category-articles.ftl
View file @ 32af1c06
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<@head title="${tag.tagTitle} - ${blogTitle}"> <@head title="${category.categoryTitle} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/> <meta name="keywords" content="${metaKeywords},${category.categoryTitle}"/>
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/> <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head> </@head>
</head> </head>
...@@ -14,8 +14,10 @@ ...@@ -14,8 +14,10 @@
<main> <main>
<div class="title"> <div class="title">
<h2 class="tip"><i class="icon-category"></i> <h2 class="tip"><i class="icon-category"></i>
&nbsp;${tag.tagTitle} &nbsp;${category.categoryTitle}
<small>${categoryLabel}</small> <small>${category.categoryDescription}</small>
</h2>
</div> </div>
<#include "article-list.ftl"> <#include "article-list.ftl">
</main> </main>
......
src/main/webapp/skins/9IPHP/lang/lang_en_US.properties
View file @ 32af1c06
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# #
# Description: B3log Solo language configurations(en_US). # Description: B3log Solo language configurations(en_US).
# Version: 1.1.0.0, Mar 14, 2017 # Version: 1.2.0.0, Apr 8, 2017
# Author: Liyuan Li # Author: Liyuan Li
# #
...@@ -27,4 +27,5 @@ readLabel=Read More ...@@ -27,4 +27,5 @@ readLabel=Read More
nextArticleLabel=Next nextArticleLabel=Next
previousArticleLabel=Previous previousArticleLabel=Previous
articleCP1Label=Please indicate the source: articleCP1Label=Please indicate the source:
viewCountLabel=View Count viewCountLabel=View Count
\ No newline at end of file cntLabel=
\ No newline at end of file
src/main/webapp/skins/9IPHP/lang/lang_zh_CN.properties
View file @ 32af1c06
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# #
# Description: B3log Solo default language configurations(zh_CN). # Description: B3log Solo default language configurations(zh_CN).
# Version: 1.1.0.0, Mar 14, 2017 # Version: 1.2.0.0, Apr 8, 2017
# Author: Liyuan Li # Author: Liyuan Li
# #
...@@ -27,4 +27,5 @@ readLabel=\u9605\u8BFB\u5168\u6587 ...@@ -27,4 +27,5 @@ readLabel=\u9605\u8BFB\u5168\u6587
nextArticleLabel=\u65B0\u4E00\u7BC7 nextArticleLabel=\u65B0\u4E00\u7BC7
previousArticleLabel=\u65E7\u4E00\u7BC7 previousArticleLabel=\u65E7\u4E00\u7BC7
articleCP1Label=\u8F6C\u8F7D\u8BF7\u6CE8\u660E\u6765\u6E90\uFF1A articleCP1Label=\u8F6C\u8F7D\u8BF7\u6CE8\u660E\u6765\u6E90\uFF1A
viewCountLabel=\u6D4F\u89C8\u6570 viewCountLabel=\u6D4F\u89C8\u6570
\ No newline at end of file cntLabel=\u4E2A
\ No newline at end of file
src/main/webapp/skins/9IPHP/side.ftl
View file @ 32af1c06
...@@ -6,14 +6,15 @@ ...@@ -6,14 +6,15 @@
</div> </div>
</#if> </#if>
<#if 0 != mostUsedTags?size> <#if 0 != mostUsedCategories?size>
<div class="module"> <div class="module">
<header><h2>${categoryLabel}</h2></header> <header><h2>${categoryLabel}</h2></header>
<main> <main>
<#list mostUsedTags as tag> <#list mostUsedCategories as category>
<a href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" <a href="${servePath}/category/${category.categoryURI}"
class="tag tooltipped tooltipped-n" aria-label="${tag.tagPublishedRefCount} ${countLabel}${articleLabel}"> aria-label="${category.categoryTagCnt} ${cntLabel}${tagsLabel}"
${tag.tagTitle}</a> class="tag tooltipped tooltipped-n">
${category.categoryTitle}</a>
</#list> </#list>
</main> </main>
</div> </div>
...@@ -26,7 +27,8 @@ ...@@ -26,7 +27,8 @@
<#list mostUsedTags as tag> <#list mostUsedTags as tag>
<a rel="tag" <a rel="tag"
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"
class="tag tooltipped tooltipped-n" aria-label="${tag.tagPublishedRefCount} ${countLabel}${articleLabel}"> class="tag tooltipped tooltipped-n"
aria-label="${tag.tagPublishedRefCount} ${countLabel}${articleLabel}">
${tag.tagTitle}</a> ${tag.tagTitle}</a>
</#list> </#list>
</main> </main>
......
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