Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
f0f5702e
Commit
f0f5702e
authored
May 21, 2017
by
Liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
fixed #12286
parent
501b0072
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
32 additions
and
35 deletions
+32
-35
src/main/webapp/css/default-admin.css
src/main/webapp/css/default-admin.css
+1
-2
src/main/webapp/css/default-base.css
src/main/webapp/css/default-base.css
+1
-0
src/main/webapp/images/emotions/em10.png
src/main/webapp/images/emotions/em10.png
+0
-0
src/main/webapp/images/emotions/emotions.png
src/main/webapp/images/emotions/emotions.png
+0
-0
src/main/webapp/js/lib/emojify.js-1.1.0/images/basic/sunglasses.png
...ebapp/js/lib/emojify.js-1.1.0/images/basic/sunglasses.png
+0
-0
src/main/webapp/js/page.js
src/main/webapp/js/page.js
+1
-5
src/main/webapp/skins/mobile/common-comment.ftl
src/main/webapp/skins/mobile/common-comment.ftl
+28
-0
src/main/webapp/skins/mobile/macro-comments.ftl
src/main/webapp/skins/mobile/macro-comments.ftl
+1
-28
No files found.
src/main/webapp/css/default-admin.css
View file @
f0f5702e
...
@@ -953,8 +953,7 @@ button#submitArticle:hover,
...
@@ -953,8 +953,7 @@ button#submitArticle:hover,
border-radius
:
3px
;
border-radius
:
3px
;
box-shadow
:
1px
1px
3px
#333333
;
box-shadow
:
1px
1px
3px
#333333
;
line-height
:
16px
;
line-height
:
16px
;
margin
:
24px
12px
;
margin
:
10px
;
padding
:
5px
;
text-align
:
center
;
text-align
:
center
;
}
}
...
...
src/main/webapp/css/default-base.css
View file @
f0f5702e
...
@@ -401,6 +401,7 @@ button:hover,.button:hover {
...
@@ -401,6 +401,7 @@ button:hover,.button:hover {
.em00
,
.em01
,
.em02
,
.em03
,
.em04
,
.em05
,
.em06
,
.em07
,
.em08
,
.em09
,
.em00
,
.em01
,
.em02
,
.em03
,
.em04
,
.em05
,
.em06
,
.em07
,
.em08
,
.em09
,
.em10
,
.em11
,
.em12
,
.em13
,
.em14
{
.em10
,
.em11
,
.em12
,
.em13
,
.em14
{
background-image
:
url("../images/emotions/emotions.png")
;
background-image
:
url("../images/emotions/emotions.png")
;
background-size
:
120px
;
float
:
left
;
float
:
left
;
height
:
24px
;
height
:
24px
;
margin-right
:
5px
;
margin-right
:
5px
;
...
...
src/main/webapp/images/emotions/em10.png
View replaced file @
501b0072
View file @
f0f5702e
650 Bytes
|
W:
|
H:
1.93 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/main/webapp/images/emotions/emotions.png
View replaced file @
501b0072
View file @
f0f5702e
12.3 KB
|
W:
|
H:
12.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/main/webapp/js/lib/emojify.js-1.1.0/images/basic/sunglasses.png
View replaced file @
501b0072
View file @
f0f5702e
650 Bytes
|
W:
|
H:
1.93 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/main/webapp/js/page.js
View file @
f0f5702e
...
@@ -614,11 +614,7 @@ $.extend(Page.prototype, {
...
@@ -614,11 +614,7 @@ $.extend(Page.prototype, {
result
.
userName
=
Util
.
getUserName
();
result
.
userName
=
Util
.
getUserName
();
}
}
if
(
typeof
(
addComment
)
===
"
undefined
"
)
{
// https://github.com/b3log/solo/issues/12246
that
.
addCommentAjax
(
Util
.
replaceEmString
(
result
.
cmtTpl
),
state
);
that
.
addCommentAjax
(
Util
.
replaceEmString
(
result
.
cmtTpl
),
state
);
}
else
{
// 1.9.0 向后兼容
that
.
addCommentAjax
(
addComment
(
result
,
state
),
state
);
}
}
}
});
});
}
}
...
...
src/main/webapp/skins/mobile/common-comment.ftl
0 → 100644
View file @
f0f5702e
<li id="${comment.oId}">
<div class="comwrap">
<div class="comtop"><!--TODO comment->comment_approved == '0') : comtop preview;-->
<img alt='${comment.commentName}' src='${comment.commentThumbnailURL}' class='avatar avatar-64 photo' height='64' width='64' />
<div class="com-author">
<#if "http://" == comment.commentURL>
<a>${comment.commentName}</a>
<#else>
<a href='${comment.commentURL}' rel='external nofollow' target="_blank" class='url'>${comment.commentName}</a>
</#if>
<#if comment.isReply>
@
<a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}">${comment.commentOriginalCommentName}</a>
</#if>
</div>
<#if article.commentable>
<div class="comdater">
<!--<span>TODO wptouch_moderate_comment_link(get_comment_ID())</span>-->
${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")}
<a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
</div>
</#if>
</div><!--end comtop-->
<div class="combody">
<p>${comment.commentContent}</p>
</div>
</div>
</li>
\ No newline at end of file
src/main/webapp/skins/mobile/macro-comments.ftl
View file @
f0f5702e
...
@@ -9,34 +9,7 @@
...
@@ -9,34 +9,7 @@
</#if>
</#if>
<ol class="commentlist" id="commentlist">
<ol class="commentlist" id="commentlist">
<#list commentList as comment>
<#list commentList as comment>
<li id="${comment.oId}">
<#include "common-comment.ftl"/>
<div class="comwrap">
<div class="comtop"><!--TODO comment->comment_approved == '0') : comtop preview;-->
<img alt='${comment.commentName}' src='${comment.commentThumbnailURL}' class='avatar avatar-64 photo' height='64' width='64' />
<div class="com-author">
<#if "http://" == comment.commentURL>
<a>${comment.commentName}</a>
<#else>
<a href='${comment.commentURL}' rel='external nofollow' target="_blank" class='url'>${comment.commentName}</a>
</#if>
<#if comment.isReply>
@
<a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}">${comment.commentOriginalCommentName}</a>
</#if>
</div>
<#if article.commentable>
<div class="comdater">
<!--<span>TODO wptouch_moderate_comment_link(get_comment_ID())</span>-->
${comment.commentDate?string("yyyy-MM-dd HH:mm:ss")}
<a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
</div>
</#if>
</div><!--end comtop-->
<div class="combody">
<p>${comment.commentContent}</p>
</div>
</div>
</li>
</#list>
</#list>
</ol>
</ol>
<#if article.commentable>
<#if article.commentable>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment