🎨 匿名机制 someone 改进 #31

88250 · Jun 23, 2020 · c34779d · c34779d
1 parent 5e89395
commit c34779d
Show file tree

Hide file tree

Showing 24 changed files with 60 additions and 106 deletions.
diff --git a/src/main/resources/skins/classic/article.ftl b/src/main/resources/skins/classic/article.ftl
@@ -304,13 +304,9 @@
                         <ul class="module-list">
                             <#list sideRelevantArticles as relevantArticle>
                                 <li<#if !relevantArticle_has_next> class="last"</#if>>
-                                    <#if "someone" != relevantArticle.articleAuthorName>
-                                    <a rel="nofollow"
-                                       href="${servePath}/member/${relevantArticle.articleAuthorName}"></#if>
-                                    <span class="avatar-small slogan tooltipped tooltipped-se" aria-label="${relevantArticle.articleAuthorName}"
-                                          style="background-image:url('${relevantArticle.articleAuthorThumbnailURL20}')"
-                                    ></span>
-                                    <#if "someone" != relevantArticle.articleAuthorName></a></#if>
+                                    <a rel="nofollow" href="${servePath}/member/${relevantArticle.articleAuthorName}">
+                                    <span class="avatar-small slogan tooltipped tooltipped-se" aria-label="${relevantArticle.articleAuthorName}" style="background-image:url('${relevantArticle.articleAuthorThumbnailURL20}')"></span>
+                                    </a>
                                     <a rel="nofollow" class="title fn-ellipsis" href="${servePath}${relevantArticle.articlePermalink}">${relevantArticle.articleTitleEmoj}</a>
                                 </li>
                             </#list>
@@ -330,13 +326,11 @@
                         <ul class="module-list">
                             <#list sideRandomArticles as randomArticle>
                                 <li<#if !randomArticle_has_next> class="last"</#if>>
-                                    <#if "someone" != randomArticle.articleAuthorName>
-                                    <a  rel="nofollow"
-                                        href="${servePath}/member/${randomArticle.articleAuthorName}"></#if>
+                                    <a rel="nofollow" href="${servePath}/member/${randomArticle.articleAuthorName}">
                                     <span class="avatar-small slogan tooltipped tooltipped-se"
                                           aria-label="${randomArticle.articleAuthorName}"
                                           style="background-image:url('${randomArticle.articleAuthorThumbnailURL20}')"></span>
-                                    <#if "someone" != randomArticle.articleAuthorName></a></#if>
+                                    </a>
                                     <a class="title fn-ellipsis" rel="nofollow" href="${servePath}${randomArticle.articlePermalink}">${randomArticle.articleTitleEmoj}</a>
                                 </li>
                             </#list>

diff --git a/src/main/resources/skins/classic/common/list-item.ftl b/src/main/resources/skins/classic/common/list-item.ftl
@@ -62,9 +62,7 @@
                     </#if>
                     <br>
                     <#if "" != article.articleLatestCmterName>
-                        <#if article.articleLatestCmterName != 'someone'>
-                                <a rel="nofollow" class="author" href="${servePath}/member/${article.articleLatestCmterName}"></#if><span class="author">${article.articleLatestCmterName}</span><#if article.articleLatestCmterName != 'someone'></a>
-                        </#if>
+                        <a rel="nofollow" class="author" href="${servePath}/member/${article.articleLatestCmterName}"></#if><span class="author">${article.articleLatestCmterName}</span></a>
                         ${article.cmtTimeAgo}${cmtLabel}
                     </#if>
                 </div>

diff --git a/src/main/resources/skins/classic/home/comments.ftl b/src/main/resources/skins/classic/home/comments.ftl
@@ -39,13 +39,10 @@
         <#if !(paginationPageCount?? && paginationPageCount!=0 && paginationPageCount!=1) && comment_index == userHomeComments?size - 1>
             last</#if>">
             <div>
-            <#if comment.commentArticleAuthorName != "someone">
             <a target="_blank" class="tooltipped tooltipped-n" rel="nofollow" href="${servePath}/member/${comment.commentArticleAuthorName}"
-               aria-label="${comment.commentArticleAuthorName}"></#if>
+               aria-label="${comment.commentArticleAuthorName}">
                 <div class="avatar" style="background-image:url('${comment.commentArticleAuthorThumbnailURL}')"></div>
-            <#if comment.commentArticleAuthorName != "someone">
             </a>
-            </#if>
             </div>
             <div class="fn-flex-1">
                 <div class="fn-flex">

diff --git a/src/main/resources/skins/classic/home/following-articles.ftl b/src/main/resources/skins/classic/home/following-articles.ftl
@@ -37,11 +37,10 @@
         <#list userHomeFollowingArticles as article>
         <li class="fn-flex<#if !(paginationPageCount?? && paginationPageCount!=0 && paginationPageCount!=1) && article_index == userHomeFollowingArticles?size - 1>
              last</#if>">
-            <#if "someone" != article.articleAuthorName>
             <a aria-label="${article.articleAuthorName}" class="tooltipped tooltipped-s"
-               target="_blank" rel="nofollow" href="${servePath}/member/${article.articleAuthorName}"></#if>
+               target="_blank" rel="nofollow" href="${servePath}/member/${article.articleAuthorName}">
                 <div class="avatar" style="background-image:url('${article.articleAuthorThumbnailURL48}')"></div>
-                <#if "someone" != article.articleAuthorName></a></#if>
+            </a>
             <div class="fn-flex-1">
                 <h2>
                     <@icon article.articlePerfect article.articleType></@icon>

diff --git a/src/main/resources/skins/classic/home/notifications/at.ftl b/src/main/resources/skins/classic/home/notifications/at.ftl
@@ -24,11 +24,9 @@
     <#list atNotifications as notification>
     <li class="comment-list-item fn-flex<#if notification.hasRead> read</#if>">
         <#if 2 == notification.dataType>
-            <#if "someone" != notification.authorName>
             <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.authorName}">
-            </#if>
                 <div class="avatar tooltipped tooltipped-se" aria-label="${notification.authorName}" style="background-image:url('${notification.thumbnailURL}')"></div>
-            <#if "someone" != notification.authorName></a></#if>
+            </a>
             <#if !notification.atInArticle>
             <div class="fn-flex-1">
                 <div class="fn-flex">

diff --git a/src/main/resources/skins/classic/home/notifications/broadcast.ftl b/src/main/resources/skins/classic/home/notifications/broadcast.ftl
@@ -23,12 +23,11 @@
 <ul class="notification">
     <#list broadcastNotifications as notification>
     <li class="fn-flex<#if notification.hasRead> read</#if>">
-        <#if "someone" != notification.authorName>
-        <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.authorName}"></#if>
+        <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.authorName}">
             <div class="avata tooltipped tooltipped-se"  
                    aria-label="${notification.authorName}"
                  style="background-image:url('${notification.thumbnailURL}')"></div>
-        <#if "someone" != notification.authorName></a></#if>
+        </a>
         <div class="fn-flex-1 has-view">
             <h2>
                 <@icon notification.articlePerfect notification.articleType></@icon>

diff --git a/src/main/resources/skins/classic/home/notifications/commented.ftl b/src/main/resources/skins/classic/home/notifications/commented.ftl
@@ -23,12 +23,11 @@
 <ul class="notification">
     <#list commentedNotifications as notification>
     <li class="fn-flex comment-list-item<#if notification.hasRead> read</#if>">
-        <#if "someone" != notification.commentAuthorName>
-        <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.commentAuthorName}"></#if>
+        <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.commentAuthorName}">
             <div class="avatar tooltipped tooltipped-se"  
                    aria-label="${notification.commentAuthorName}"
                  style="background-image:url('${notification.commentAuthorThumbnailURL}')"></div>
-        <#if "someone" != notification.commentAuthorName></a></#if>
+        </a>
         <div class="fn-flex-1">
             <div class="fn-flex">
                 <h2 class="fn-flex-1">

diff --git a/src/main/resources/skins/classic/home/notifications/following.ftl b/src/main/resources/skins/classic/home/notifications/following.ftl
@@ -23,12 +23,11 @@
 <ul class="notification">
     <#list followingNotifications as notification>
     <li class="fn-flex<#if notification.hasRead> read</#if>">
-        <#if "someone" != notification.authorName>
-        <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.authorName}"></#if>
+        <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.authorName}">
             <div class="avatar tooltipped tooltipped-se" 
            aria-label="${notification.authorName}"
            style="background-image:url('${notification.thumbnailURL}')"></div>
-        <#if "someone" != notification.authorName></a></#if>
+        </a>
 
         <#if notification.isComment>
             <div class="fn-flex-1">

diff --git a/src/main/resources/skins/classic/home/notifications/reply.ftl b/src/main/resources/skins/classic/home/notifications/reply.ftl
@@ -23,12 +23,11 @@
 <ul class="notification">
     <#list replyNotifications as notification>
     <li class="fn-flex comment-list-item<#if notification.hasRead> read</#if>">
-        <#if "someone" != notification.commentAuthorName>
-        <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.commentAuthorName}"></#if>
+        <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.commentAuthorName}">
             <div class="avatar tooltipped tooltipped-se"  
                    aria-label="${notification.commentAuthorName}"
                  style="background-image:url('${notification.commentAuthorThumbnailURL}')"></div>
-        <#if "someone" != notification.commentAuthorName></a></#if>
+        </a>
         <div class="fn-flex-1">
             <div class="fn-flex">
                 <h2 class="fn-flex-1">

diff --git a/src/main/resources/skins/classic/home/watching-articles.ftl b/src/main/resources/skins/classic/home/watching-articles.ftl
@@ -37,11 +37,10 @@
         <#list userHomeFollowingArticles as article>
         <li class="fn-flex<#if !(paginationPageCount?? && paginationPageCount!=0 && paginationPageCount!=1) && article_index == userHomeFollowingArticles?size - 1>
              last</#if>">
-            <#if "someone" != article.articleAuthorName>
             <a aria-label="${article.articleAuthorName}" class="tooltipped tooltipped-s"
-               target="_blank" rel="nofollow" href="${servePath}/member/${article.articleAuthorName}"></#if>
+               target="_blank" rel="nofollow" href="${servePath}/member/${article.articleAuthorName}">
                 <div class="avatar" style="background-image:url('${article.articleAuthorThumbnailURL48}')"></div>
-                <#if "someone" != article.articleAuthorName></a></#if>
+            </a>
             <div class="fn-flex-1">
                 <h2>
                     <@icon article.articlePerfect article.articleType></@icon>

diff --git a/src/main/resources/skins/classic/side.ftl b/src/main/resources/skins/classic/side.ftl
@@ -78,12 +78,9 @@
         <ul class="module-list">
             <#list sideHotArticles as hotArticle>
             <li<#if !hotArticle_has_next> class="last"</#if>>
-                <#if "someone" != hotArticle.articleAuthorName>
-                <a rel="nofollow" href="${servePath}/member/${hotArticle.articleAuthorName}"></#if>
-                    <span class="avatar-small tooltipped tooltipped-se slogan"
-                          aria-label="${hotArticle.articleAuthorName}"
-                          style="background-image:url('${hotArticle.articleAuthorThumbnailURL20}')"></span>
-                    <#if "someone" != hotArticle.articleAuthorName></a></#if>
+                <a rel="nofollow" href="${servePath}/member/${hotArticle.articleAuthorName}">
+                    <span class="avatar-small tooltipped tooltipped-se slogan" aria-label="${hotArticle.articleAuthorName}" style="background-image:url('${hotArticle.articleAuthorThumbnailURL20}')"></span>
+                  </a>
                 <a rel="nofollow" class="title" href="${servePath}${hotArticle.articlePermalink}">${hotArticle.articleTitleEmoj}</a>
             </li>
             </#list>
@@ -134,12 +131,9 @@
         <ul class="module-list">
             <#list sideRandomArticles as randomArticle>
             <li<#if !randomArticle_has_next> class="last"</#if>>
-                <#if "someone" != randomArticle.articleAuthorName>
-                <a rel="nofollow" href="${servePath}/member/${randomArticle.articleAuthorName}"></#if>
-                    <span aria-label="${randomArticle.articleAuthorName}"
-                          style="background-image:url('${randomArticle.articleAuthorThumbnailURL20}')"
-                          class="avatar-small tooltipped tooltipped-se slogan"></span>
-                    <#if "someone" != randomArticle.articleAuthorName></a></#if>
+                <a rel="nofollow" href="${servePath}/member/${randomArticle.articleAuthorName}">
+                    <span aria-label="${randomArticle.articleAuthorName}" style="background-image:url('${randomArticle.articleAuthorThumbnailURL20}')" class="avatar-small tooltipped tooltipped-se slogan"></span>
+                </a>
                 <a class="title" rel="nofollow" href="${servePath}${randomArticle.articlePermalink}">${randomArticle.articleTitleEmoj}</a>
             </li>
             </#list>

diff --git a/src/main/resources/skins/mobile/article.ftl b/src/main/resources/skins/mobile/article.ftl
@@ -387,12 +387,10 @@
                         <ul class="module-list">
                             <#list sideRelevantArticles as relevantArticle>
                             <li<#if !relevantArticle_has_next> class="last"</#if>>
-                                <#if "someone" != relevantArticle.articleAuthorName>
                                 <a rel="nofollow" 
-                               href="${servePath}/member/${relevantArticle.articleAuthorName}"></#if>
-                                    <span class="avatar-small slogan"
-                                          style="background-image:url('${relevantArticle.articleAuthorThumbnailURL20}')"></span>
-                                    <#if "someone" != relevantArticle.articleAuthorName></a></#if>
+                               href="${servePath}/member/${relevantArticle.articleAuthorName}">
+                                    <span class="avatar-small slogan" style="background-image:url('${relevantArticle.articleAuthorThumbnailURL20}')"></span>
+                                </a>
                                 <a rel="nofollow" class="title" href="${servePath}${relevantArticle.articlePermalink}">${relevantArticle.articleTitleEmoj}</a>
                             </li>
                             </#list>
@@ -411,12 +409,10 @@
                         <ul class="module-list">
                             <#list sideRandomArticles as randomArticle>
                             <li<#if !randomArticle_has_next> class="last"</#if>>
-                                <#if "someone" != randomArticle.articleAuthorName>
                                 <a  rel="nofollow"
-                                href="${servePath}/member/${randomArticle.articleAuthorName}"></#if>
-                                    <span class="avatar-small slogan"
-                                          style="background-image:url('${randomArticle.articleAuthorThumbnailURL20}')"></span>
-                                    <#if "someone" != randomArticle.articleAuthorName></a></#if>
+                                href="${servePath}/member/${randomArticle.articleAuthorName}">
+                                    <span class="avatar-small slogan" style="background-image:url('${randomArticle.articleAuthorThumbnailURL20}')"></span>
+                                </a>
                                 <a class="title" rel="nofollow" href="${servePath}${randomArticle.articlePermalink}">${randomArticle.articleTitleEmoj}</a>
                             </li>
                             </#list>

diff --git a/src/main/resources/skins/mobile/home/comments.ftl b/src/main/resources/skins/mobile/home/comments.ftl
@@ -25,13 +25,10 @@
     <ul>
         <#list userHomeComments as comment>
         <li class="fn-flex comment-list-item">
-            <#if comment.commentArticleAuthorName != "someone">
             <a rel="nofollow" href="${servePath}/member/${comment.commentArticleAuthorName}" 
-               title="${comment.commentArticleAuthorName}"></#if>
+               title="${comment.commentArticleAuthorName}">
                 <div class="avatar" style="background-image:url('${comment.commentArticleAuthorThumbnailURL}')"></div>
-            <#if comment.commentArticleAuthorName != "someone">
             </a>
-            </#if>
             <div class="fn-flex-1">
                 <div>
                     <h2>

diff --git a/src/main/resources/skins/mobile/home/following-articles.ftl b/src/main/resources/skins/mobile/home/following-articles.ftl
@@ -25,11 +25,10 @@
     <ul class="fn-clear">
         <#list userHomeFollowingArticles as article>
         <li class="fn-flex read">
-            <#if "someone" != article.articleAuthorName>
             <a title="${article.articleAuthorName}"
-               target="_blank" rel="nofollow" href="${servePath}/member/${article.articleAuthorName}"></#if>
+               target="_blank" rel="nofollow" href="${servePath}/member/${article.articleAuthorName}">
                 <div class="avatar" style="background-image:url('${article.articleAuthorThumbnailURL48}')"></div>
-            <#if "someone" != article.articleAuthorName></a></#if>
+            </a>
             <div class="fn-flex-1 has-view">
                 <h2>
                     <@icon article.articlePerfect article.articleType></@icon>

diff --git a/src/main/resources/skins/mobile/home/notifications/at.ftl b/src/main/resources/skins/mobile/home/notifications/at.ftl
@@ -24,11 +24,10 @@
     <#list atNotifications as notification>
     <li class="comment-list-item fn-flex<#if notification.hasRead> read</#if>">
         <#if 2 == notification.dataType>
-            <#if "someone" != notification.authorName>
             <a rel="nofollow" href="${servePath}/member/${notification.authorName}"
-               title="${notification.authorName}"></#if>
+               title="${notification.authorName}">
                 <div class="avatar" style="background-image:url('${notification.thumbnailURL}')"></div>
-            <#if "someone" != notification.authorName></a></#if>
+            </a>
             <#if !notification.atInArticle>
             <div class="fn-flex-1">
                 <div>

diff --git a/src/main/resources/skins/mobile/home/notifications/broadcast.ftl b/src/main/resources/skins/mobile/home/notifications/broadcast.ftl
@@ -23,11 +23,10 @@
 <ul class="notification">
     <#list broadcastNotifications as notification>
     <li class="fn-flex<#if notification.hasRead> read</#if>">
-        <#if "someone" != notification.authorName>
         <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.authorName}" 
-           title="${notification.authorName}"></#if>
+           title="${notification.authorName}">
             <div class="avatar" style="background-image:url('${notification.thumbnailURL}')"></div>
-        <#if "someone" != notification.authorName></a></#if>
+        </a>
         <div class="fn-flex-1 has-view">
             <h2>
                 <@icon notification.articlePerfect notification.articleType></@icon>

diff --git a/src/main/resources/skins/mobile/home/notifications/commented.ftl b/src/main/resources/skins/mobile/home/notifications/commented.ftl
@@ -23,11 +23,10 @@
 <ul class="notification">
     <#list commentedNotifications as notification>
     <li class="fn-flex comment-list-item<#if notification.hasRead> read</#if>">
-        <#if "someone" != notification.commentAuthorName>
         <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.commentAuthorName}" 
-           title="${notification.commentAuthorName}"></#if>
+           title="${notification.commentAuthorName}">
             <div class="avatar" style="background-image:url('${notification.commentAuthorThumbnailURL}')"></div>
-        <#if "someone" != notification.commentAuthorName></a></#if>
+        </a>
         <div class="fn-flex-1">
             <div>
                 <h2>

diff --git a/src/main/resources/skins/mobile/home/notifications/following.ftl b/src/main/resources/skins/mobile/home/notifications/following.ftl
@@ -23,11 +23,10 @@
 <ul class="notification">
     <#list followingNotifications as notification>
     <li class="fn-flex<#if notification.hasRead> read</#if>">
-        <#if "someone" != notification.authorName>
         <a target="_blank" rel="nofollow" href="${servePath}/member/${notification.authorName}" 
-           title="${notification.authorName}"></#if>
+           title="${notification.authorName}">
             <div class="avatar" style="background-image:url('${notification.thumbnailURL}')"></div>
-        <#if "someone" != notification.authorName></a></#if>
+        </a>
 
         <#if notification.isComment>
             <div class="fn-flex-1">