Commit 62c872b2 authored by Liang Ding's avatar Liang Ding

Merge remote-tracking branch 'origin/3.0.0-dev' into 3.0.0-dev

parents ff02041b 88c7acb5
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
   
<span id="postToCommunityPanel"> <span id="postToCommunityPanel">
<label class="checkbox"> <label class="checkbox">
<input id="postToCommunity" type="checkbox" /> <input id="postToCommunity" type="checkbox" checked="checked" />
<a href="https://hacpai.com/article/1546941897596" target="_blank">${syncToCommunityLabel}</a> <a href="https://hacpai.com/article/1546941897596" target="_blank">${syncToCommunityLabel}</a>
</label> </label>
</span> </span>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
}; };
var Label = { var Label = {
"uploadMsg": '${uploadMsg}',
"uploadToken": "${uploadToken}", "uploadToken": "${uploadToken}",
"uploadURL": "${uploadURL}", "uploadURL": "${uploadURL}",
"markedAvailable": ${markedAvailable?c}, "markedAvailable": ${markedAvailable?c},
......
...@@ -156,7 +156,7 @@ admin.article = { ...@@ -156,7 +156,7 @@ admin.article = {
if ($('#articleThumbnail').prop('checked')) { if ($('#articleThumbnail').prop('checked')) {
var bgImage = $('.thumbnail__img').css('background-image') var bgImage = $('.thumbnail__img').css('background-image')
articleContent = '![](' + bgImage.substring(5, bgImage.length - 2) + articleContent = '![](' + bgImage.substring(5, bgImage.length - 2).replace('w/768', 'w/960').replace('h/432', 'h/540') +
')\n\n' + articleContent ')\n\n' + articleContent
} }
...@@ -334,19 +334,12 @@ admin.article = { ...@@ -334,19 +334,12 @@ admin.article = {
$('#unSubmitArticle').hide() $('#unSubmitArticle').hide()
$('#saveArticle').show() $('#saveArticle').show()
} }
if (this.status.articleHadBeenPublished) {
$('#postToCommunityPanel').hide()
} else {
$('#postToCommunityPanel').show()
}
} else { } else {
$('#submitArticle').show() $('#submitArticle').show()
$('#unSubmitArticle').hide() $('#unSubmitArticle').hide()
$('#saveArticle').show() $('#saveArticle').show()
$('#postToCommunityPanel').show() $('#postToCommunityPanel').show()
} }
$('#postToCommunity').attr('checked', 'checked')
}, },
/** /**
* @description 清除发布文章页面的输入框的内容 * @description 清除发布文章页面的输入框的内容
...@@ -393,6 +386,8 @@ admin.article = { ...@@ -393,6 +386,8 @@ admin.article = {
$(this).addClass('selected') $(this).addClass('selected')
}) })
$('#tipMsg').text(Label.uploadMsg)
// For tag auto-completion // For tag auto-completion
$.ajax({// Gets all tags $.ajax({// Gets all tags
url: latkeConfig.servePath + '/console/tags', url: latkeConfig.servePath + '/console/tags',
...@@ -623,7 +618,7 @@ admin.register.article = { ...@@ -623,7 +618,7 @@ admin.register.article = {
admin.editors.abstractEditor.setContent('') admin.editors.abstractEditor.setContent('')
admin.editors.articleEditor.setContent('') admin.editors.articleEditor.setContent('')
$('#loadMsg').text('') $('#loadMsg').text('')
$('#tipMsg').text('') $('#tipMsg').text(Label.uploadMsg)
}, },
} }
......
This diff is collapsed.
Subproject commit bb908f197414ccdff6c24ed282ccc018efd5cebc Subproject commit 2248d25866e509e090ab43c4a653f9646419d376
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment