朋友圈支持图片显示;手机端新增全局公告提示;更新部分页面;优化部分效果
This commit is contained in:
+36
-14
@@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="https://www.thymeleaf.org"
|
||||
th:replace="~{modules/layouts/layout :: layout(_head = null,_content = ~{::content},_title = ${title + ' - ' + site.title})}">
|
||||
th:replace="~{modules/layouts/layout :: layout(_head = null,_content = ~{::content},_title = ${title + ' - ' + site.title})}">
|
||||
|
||||
<th:block th:fragment="content">
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<li>
|
||||
<!-- 全部按钮 -->
|
||||
<a th:attr="data-href=@{/friends}"
|
||||
th:classappend="${#lists.isEmpty(param.author) ? 'active' : ''}" class="cat-link">
|
||||
th:classappend="${#lists.isEmpty(param.author) ? 'active' : ''}" class="cat-link">
|
||||
全部<span></span>
|
||||
</a>
|
||||
</li>
|
||||
@@ -27,8 +27,8 @@
|
||||
<th:block th:each="author : ${authors}">
|
||||
<li>
|
||||
<a th:attr="data-href=@{|/friends?author=${author}|}"
|
||||
th:classappend="${#strings.equals(param.author, author) ? 'active' : ''}"
|
||||
th:text="${author}" class="cat-link">
|
||||
th:classappend="${#strings.equals(param.author, author) ? 'active' : ''}"
|
||||
th:text="${author}" class="cat-link">
|
||||
<span></span>
|
||||
</a>
|
||||
</li>
|
||||
@@ -38,10 +38,9 @@
|
||||
|
||||
<div id="post_item" class="moment_list">
|
||||
|
||||
<div th:each="postInfo, iterstat: ${friends.items}"
|
||||
th:id="${'post-'+postInfo.metadata.name}"
|
||||
class="loop_content p_item moment_item uk-animation-slide-bottom-small"
|
||||
th:with="spec = ${postInfo.spec}">
|
||||
<div th:each="postInfo, iterstat: ${friends.items}" th:id="${'post-'+postInfo.metadata.name}"
|
||||
class="loop_content p_item moment_item uk-animation-slide-bottom-small"
|
||||
th:with="spec = ${postInfo.spec}">
|
||||
|
||||
<div class="p_item_inner">
|
||||
|
||||
@@ -58,7 +57,7 @@
|
||||
</div>
|
||||
|
||||
<time itemprop="datePublished"
|
||||
th:datetime="${#dates.format(spec.pubDate, 'yyyy-MM-dd HH:mm')}">
|
||||
th:datetime="${#dates.format(spec.pubDate, 'yyyy-MM-dd HH:mm')}">
|
||||
<th:block th:replace="~{modules/widgets/time :: time(${spec.pubDate})}">
|
||||
</th:block>
|
||||
</time>
|
||||
@@ -72,9 +71,34 @@
|
||||
<div th:utext="${spec.description}"></div>
|
||||
</a>
|
||||
</div>
|
||||
<!-- 图片列表 -->
|
||||
<div class="img_list img-dynamic-container">
|
||||
<div class="list_inner"
|
||||
th:with="isImgList=${#strings.startsWith(spec.title, 'img:::')}"
|
||||
th:attr="num=${isImgList ? #arrays.length(#strings.substringAfter(spec.title, 'img:::').split(',')) : 0}">
|
||||
<!-- 只有识别为图片列表时才渲染 -->
|
||||
<th:block th:if="${isImgList}">
|
||||
<!-- 去掉前缀,分割数组 -->
|
||||
<th:block
|
||||
th:with="imgArray=${#strings.substringAfter(spec.title, 'img:::').split(',')}">
|
||||
<th:block th:each="url : ${imgArray}"
|
||||
th:with="cleanUrl=${#strings.trim(url)}">
|
||||
<span class="fancybox mo_img"
|
||||
th:if="${not #strings.isEmpty(cleanUrl)}"
|
||||
th:href="|/upload/image-host/${cleanUrl}|"
|
||||
th:data-fancybox="${'post-' + postInfo.metadata.name}">
|
||||
<img class="lazy"
|
||||
src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
|
||||
th:data-src="|/upload/image-host/${cleanUrl}|"
|
||||
alt="">
|
||||
</span>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -88,11 +112,9 @@
|
||||
<!-- 分页:必须保持在 blog_list_inner 里面 -->
|
||||
<th:block th:if="${friends.totalPages>1}">
|
||||
<div id="t_pagination">
|
||||
<div class="post-paging"
|
||||
th:if="${friends.hasNext()}">
|
||||
<div class="post-paging" th:if="${friends.hasNext()}">
|
||||
<!-- 直接使用后端生成的完整 nextUrl -->
|
||||
<a th:data="${friends.nextUrl}"
|
||||
th:text="${theme.config.base_set.site_page}">
|
||||
<a th:data="${friends.nextUrl}" th:text="${theme.config.base_set.site_page}">
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user