diff --git a/src/main/java/org/b3log/solo/service/DataModelService.java b/src/main/java/org/b3log/solo/service/DataModelService.java index 01275bc5..598ba081 100644 --- a/src/main/java/org/b3log/solo/service/DataModelService.java +++ b/src/main/java/org/b3log/solo/service/DataModelService.java @@ -227,7 +227,7 @@ public void fillIndexArticles(final RequestContext context, final Map pageNums = Paginator.paginate(currentPageNum, pageSize, pageCount, windowSize); - if (0 != pageNums.size()) { + if (!pageNums.isEmpty()) { dataModel.put(Pagination.PAGINATION_FIRST_PAGE_NUM, pageNums.get(0)); dataModel.put(Pagination.PAGINATION_LAST_PAGE_NUM, pageNums.get(pageNums.size() - 1)); } @@ -784,7 +784,6 @@ public void fillCharts(final RequestContext context, final Map d if (archiveDates3.size() > 20) { archiveDates3 = archiveDates3.subList(0, 20); } - dataModel.put("latestArchives", archiveDates3); } catch (Exception ignored) { } diff --git a/src/main/webapp/admin/admin-index.ftl b/src/main/webapp/admin/admin-index.ftl index e0c80a89..82620dad 100644 --- a/src/main/webapp/admin/admin-index.ftl +++ b/src/main/webapp/admin/admin-index.ftl @@ -191,9 +191,11 @@ diff --git a/src/main/webapp/admin/admin-main.ftl b/src/main/webapp/admin/admin-main.ftl index 01af1aa3..91e2cb0e 100644 --- a/src/main/webapp/admin/admin-main.ftl +++ b/src/main/webapp/admin/admin-main.ftl @@ -88,9 +88,9 @@ labels: [ <#list categories as category> - <#if category.categoryPublishedArticleCount != 0> - "${category.categoryTitle}", - + <#if category.categoryPublishedArticleCount != 0> + "${category.categoryTitle}", + ] }; diff --git a/src/main/webapp/skins/bolo-fantastic/article-list.ftl b/src/main/webapp/skins/bolo-fantastic/article-list.ftl index 63cf6431..5d10e7fa 100644 --- a/src/main/webapp/skins/bolo-fantastic/article-list.ftl +++ b/src/main/webapp/skins/bolo-fantastic/article-list.ftl @@ -117,34 +117,36 @@
- - +
\ No newline at end of file