This commit is contained in:
Van 2018-09-25 12:22:43 +08:00
parent 73c125c9f0
commit c72a9f3835
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
4 changed files with 16 additions and 43 deletions

View File

@ -216,49 +216,15 @@
</div>
</div>
</div>
<#include "bottom.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div>
<script type="text/javascript" src="${staticServePath}/js/lib/compress/pjax.min.js" charset="utf-8"></script>
<script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}"
charset="utf-8"></script>
<#include "footer.ftl">
<script type="text/javascript"
src="${staticServePath}/skins/${skinDirName}/js/jquery.qrcode${miniPostfix}.js"></script>
<script type="text/javascript"
src="${staticServePath}/skins/${skinDirName}/js/common${miniPostfix}.js?${staticResourceVersion}"
charset="utf-8"></script>
<script type="text/javascript">
var latkeConfig = {
'servePath': "${servePath}",
'staticServePath': "${staticServePath}",
'isLoggedIn': "${isLoggedIn?string}",
'userName': "${userName}",
}
var Label = {
'skinDirName': "${skinDirName}",
'em00Label': "${em00Label}",
'em01Label': "${em01Label}",
'em02Label': "${em02Label}",
'em03Label': "${em03Label}",
'em04Label': "${em04Label}",
'em05Label': "${em05Label}",
'em06Label': "${em06Label}",
'em07Label': "${em07Label}",
'em08Label': "${em08Label}",
'em09Label': "${em09Label}",
'em10Label': "${em10Label}",
'em11Label': "${em11Label}",
'em12Label': "${em12Label}",
'em13Label': "${em13Label}",
'em14Label': "${em14Label}",
}
Util.killIE()
Util.parseMarkdown('content-reset')
Skin.initArticle()
</script>
<!---- pjax {#pjax} start ----></#if>
<#if pjax><!---- pjax {#pjax} start ----></#if>
<@comment_script oId=article.oId>
Skin.initArticle()
Skin.initComment = function (articleOId, articleTags) {
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
<#if 0 != randomArticlesDisplayCount>
@ -273,7 +239,7 @@
}
Skin.initComment('${article.oId}', "<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>")
</@comment_script>
<!---- pjax {#pjax} end ----></#if>
<#if pjax><!---- pjax {#pjax} end ----></#if>
${plugins}
</body>
</html>

View File

@ -1033,6 +1033,10 @@ blockquote {
margin-left: 5px;
}
.article__comment .comment__body .content-reset {
min-height: 40px;
}
.article__comment .comment__user,
.article__comment .comment__user a {
color: rgb(3, 168, 124);

View File

@ -55,12 +55,11 @@ var Skin = {
if (!$('#articleSideShare .article__code').qrcode) {
$.ajax({
method: "GET",
url: latkeConfig.staticServePath + '/js/jquery.qrcode.min.js',
url: latkeConfig.staticServePath + '/skins/Medium/js/jquery.qrcode.min.js',
dataType: "script",
cache: true
});
}
Skin.initArticle();
}
})
},

View File

@ -29,6 +29,8 @@
</head>
<body>
<#include "header.ftl">
<div id="pjax">
<#if pjax><!---- pjax {#pjax} start ----></#if>
<#include "nav.ftl">
<div class="main">
<#if noticeBoard??>
@ -47,10 +49,12 @@
<div class="article__bottom">
<@comments commentList=pageComments article=page></@comments>
</div>
<div style="margin: 0 20px">
<#include "bottom.ftl">
<#include "footer.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div>
<#include "footer.ftl">
<#if pjax><!---- pjax {#pjax} start ----></#if>
<@comment_script oId=page.oId></@comment_script>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</body>
</html>